From fdfc4a28ef74c80a64681826999e7a2e4335b979 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 16 Mar 2010 05:20:49 +0300 Subject: [PATCH 001/321] Added Win64 configuration Assembler code replaced by intrinsic --- CHANGES.txt | 780 ++--- COPYING.txt | 914 +++--- Microsoft.DTfW.DHL.manifest | 14 +- README.html | 1558 +++++----- callstack.cpp | 880 +++--- callstack.h | 232 +- codeproject-article.html | 666 ++--- console/README.txt | 72 +- console/main.c | 48 +- console/main.cpp | 48 +- console/vldconsole.sln | 40 +- console/vldconsole.vcproj | 534 ++-- crtmfcpatch.h | 1924 +++++++------ map.h | 714 ++--- mfc/README.txt | 56 +- mfc/StdAfx.cpp | 16 +- mfc/StdAfx.h | 54 +- mfc/res/vldmfc.rc2 | 26 +- mfc/resource.h | 42 +- mfc/vldmfc.cpp | 142 +- mfc/vldmfc.h | 92 +- mfc/vldmfc.rc | 420 +-- mfc/vldmfc.sln | 40 +- mfc/vldmfc.vcproj | 706 ++--- mfc/vldmfcdlg.cpp | 338 +-- mfc/vldmfcdlg.h | 92 +- ntapi.cpp | 65 +- ntapi.h | 114 +- resource.h | 28 +- set.h | 674 ++--- setup/COPYING.txt | 678 ++--- setup/license-free.txt | 46 +- setup/vld-setup.nsi | 538 ++-- stdafx.cpp | 8 + stdafx.h | 14 + testsuite/testsuite.cpp | 755 ++--- testsuite/testsuite.vcproj | 741 +++-- tree.h | 1570 +++++----- utility.cpp | 1670 ++++++----- utility.h | 225 +- vld.cpp | 5446 +++++++++++++++++------------------ vld.dll.dependency.manifest | 8 - vld.h | 194 +- vld.ini | 310 +- vld.rc | 202 +- vld.sln | 68 +- vld.vcproj | 722 +++-- vldapi.cpp | 138 +- vldheap.cpp | 425 +-- vldheap.h | 188 +- vldint.h | 583 ++-- 51 files changed, 13154 insertions(+), 12704 deletions(-) create mode 100644 stdafx.cpp create mode 100644 stdafx.h delete mode 100644 vld.dll.dependency.manifest diff --git a/CHANGES.txt b/CHANGES.txt index 649d62cf..3ddcdfd2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,390 +1,390 @@ -Visual Leak Detector (VLD) Version 1.9h (beta) - - Change Log / Release Notes - -1.9h beta (24 February 2009) ----------------------------- - Enhancements: - + Added support to work with Visual Studio 2008. - - Known Bugs/Restrictions: - + Same bugs/restrictions as version 1.9f. - - -1.9g beta (16 April 2008) ----------------------------- - Bugs Fixed: - + Another deadlock condition may occur when loading DLLs into the process - being debugged. Special thanks to Eric Bissonnette and Kristian Paradis for - contributing this patch. - - Known Bugs/Restrictions: - + Same bugs/restrictions as version 1.9f. - - -1.9f beta (18 November 2006) ----------------------------- - Bugs Fixed: - + Deadlocks or access violations may occur when loading DLLs into - multithreaded processes. - - + In multithreaded programs, if the main thread terminates before other - threads in the process, then Visual Leak Detector may cause an access - violation while generating the memory leak report. - - Known Bugs/Restrictions: - + Memory allocations made through calls to functions loaded from a DLL using - delayed loading may not be detected. - - + Support for programs that use MFC 7.0 or MFC 7.1 is not complete yet. Some - memory leaks from such MFC-based programs may not be detected. - - + Visual Leak Detector may report leaks internal to Visual Leak Detector - if the main thread of the process terminates while other threads are still - running. - - + If more than one copy of the same C Runtime DLL is loaded in the process at - the same time, then some leaks may go undetected (note that loading more - than one copy of the C Runtime DLL into a process at the same time is - probably a bad idea to begin with). - - -1.9e beta (16 November 2006) ----------------------------- - New Features/Enhancements: - + Added a master on/off switch configuration option to vld.ini that can be - used to completely disable Visual Leak Detector. - - Bugs Fixed: - + Numerous deadlock situations. The multithread synchronization scheme has - been completely re-written which should make deadlocks in VLD much less - likey to happen. - - + An access violation will occur in VLD if GetProcAddress is called to obtain - an export's address by ordinal, for certain libraries. - - + Problems may potentially occur when the program being debugged exits due to - the Debug Help Library having been detached from the process too early. - Symptoms might include access violation exceptions or other erratic behavior - just as the program exits and while VLD is generating the leak report. - - + The copy of vld.ini installed in VLD's installation directory overrides any - other copies of vld.ini that are created, even copies placed in the - working directory of the program being debugged. - - Known Bugs/Restrictions: - + Memory allocations made through calls to functions loaded from a DLL using - delayed loading may not be detected. - - + Support for programs that use MFC 7.0 or MFC 7.1 is not complete yet. Some - memory leaks from such MFC-based programs may not be detected. - - + If more than one copy of the same C Runtime DLL is loaded in the process at - the same time, then some leaks may go undetected (note that loading more - than one copy of the C Runtime DLL into a process at the same time is - probably a bad idea to begin with). - - -1.9d beta (12 November 2006) ----------------------------- - Bugs Fixed: - + Failed assertion "freed == TRUE" pops up when running a program with VLD - without the debugger attached. - - + Some, but not all, multithreaded programs that dynamically load and unload - many DLLs have been known to experience problems, such as deadlocks or - exceptions, when used with VLD. - - + Failed assertion "exportmodule != NULL" pops up when running some programs - with VLD. - - + VLD fails to show file names or function names in the memory leak report for - some programs that are linked with the dynamic CRT library. - - + Access violation exceptions are thrown, but caught by the operating system, - when running some programs with VLD. - - -1.9c beta (6 November 2006) ---------------------------- - New Features/Enhancments: - + New NSIS installer makes setting up and using VLD much easier. - - + No need to manually copy dbghelp.dll to the right location, VLD will always - find the right version. - - + MFC 8.0 is now fully supported. - - + The memory leak report is now written to the output window much faster. - Support has been added, through a new configuration option, to slow down - the report output for older versions of Visual Studio that have trouble - when it is written too quickly. - - Bugs Fixed: - + All known compatibilities with Visual Studio 2005 have been eliminated. - - + Leaks from calloc may go undetected. - - + Leaks from vector new operator may go undetected. - - + VLDDisable and VLDEnable do not work as expected; some memory leaks that - should be ignored by VLD due to a previous call to VLDDisable are still - reported. - - + Unloading and reloading a previously loaded module may cause leaks that - occur in the module after it was reloaded to go undetected. - - + If vld.h is included in a release build, then the compiler will generate - errors if the VLDEnable or VLDDisable APIs have been used. - - -1.9b beta (26 October 2006) ---------------------------- - Bugs Fixed: - + Source compiles under Visual Studio 2005 and the binaries are compatible - with applications that link with the Visual Studio 2005 C Runtime Library - (msvcr80d.dll). - - Known Restrictions in this Release: - + Memory allocations made through calls to functions loaded from a DLL using - delayed loading may not be detected. - - + Support for programs that use MFC 7.0, MFC 7.1, or MFC 8.0 is not complete - yet. Some memory leaks from such MFC-based programs may not be detected. A - workaround for this restriction is to forcefully include the MFC DLLs in - memory leak detection, by setting the "ForceIncludeModules" configuration - option to: "mfc70d.dll mfc71d.dll mfc80d.dll" and explicitly adding vld.lib - as an input file on the linker command line (can be added through project - settings by adding it to the list of library modules in the linker options). - This restriction does not apply to programs that use MFC 4.2, which is fully - supported. - - -1.9a beta (9 March 2006) ------------------------- - New Features/Enhancments: - + All new leak detection engine detects most, if not all, in-process memory - leaks, not just leaks from "new" or "malloc", including COM-based leaks. - - + Packaged as an easier-to-use DLL. There's no longer any need to carefully - decide which modules should be linked with the VLD library. Instead, you - just include the vld.h header file in at least one source file from each - module (DLL or EXE) to be included in memory leak detection. - - + Configuration is done from an INI file instead of using preprocessor macros. - This allows VLD's configuration to be changed without needing to recompile - the program. - - + Many new configuration options have been added. One of the most often - requested option that has been added is the option to save the leak report - to a file instead of, or in addition to, the debugger. - - Bugs Fixed: - + The improved design of the new leak detection engine has resolved all of the - previously known restrictions in version 1.0. - - Known Restrictions in this Release: - + Memory allocations made through calls to functions loaded from a DLL using - delayed loading may not be detected. - - + Support for programs that use MFC 7.0, MFC 7.1, or MFC 8.0 is not complete - yet. Some memory leaks from such MFC-based programs may not be detected. A - workaround for this restriction is to forcefully include the MFC DLLs in - memory leak detection, by setting the "ForceIncludeModules" configuration - option to: "mfc70d.dll mfc71d.dll mfc80d.dll" and explicitly adding vld.lib - as an input file on the linker command line (can be added through project - settings by adding it to the list of library modules in the linker options). - This restriction does not apply to programs that use MFC 4.2, which is fully - supported. - - -1.0 (5 August 2005) -------------------- - New Features/Enhancements: - + Memory leak detection can now be selectively disabled and enabled at - runtime, using provided APIs. This provides a straightforward way of - allowing VLD to selectively "ignore" certain allocations. It can also be - used to disable VLD altogether at runtime, improving application performance - without needing to recompile. - - + If there are multiple identical memory leaks (i.e. leaks that originate from - the same call stack and that leak the same size memory block) then VLD can - optionally aggregate all of the repeated leaks, showing only the first such - leaked block in detail in the memory leak report. A tally of the total - number of leaks that match that particular size and call stack accompanies - the information for that leak. - - + When VLD is initialized at program startup, the library type which was - linked-in is displayed. This can help verify that the expected VLD library - (either single-threaded static, multithreaded static, or multithreaded DLL) - is being linked with your program. - - + The Visual Leak Detector name is displayed on most messages output to the - debugger to easily differentiate VLD's output from the output produced by - the built-in memory leak detector. - - + If any of the compile-time configuration options have been changed from - their default values, then the current state of the option is displayed in - the debugger when VLD is initialized. - - + VLD's memory leak self-checking capability (checking for leaks in VLD - itself) can be verified using a new preprocessor macro that allows VLD to - perform a self-test at runtime. - - Bugs Fixed: - + If the MFC libraries are statically linked to the program being debugged, - then MFC will erroneously report memory leaks in the Visual Leak Detector - code and may cause an access violation while attempting to report the false - memory leaks. These bogus leaks are always reported as "client block at -
, subtype bf42" and are claimed to be "invalid objects". - - + VLD will leak a fixed-sized block of memory when the program exits if VLD - failed to initialize because the Debug Help library (dbghelp.dll) could not - be loaded. - - + In multithreaded programs, if the program's main thread terminates before - other threads in the same process, then VLD may cause an access violation - while freeing resources used internally by VLD. - - -0.9i beta (30 April 2005) -------------------------- - New Features/Enhancements: - + Added support in the source code for x64 architecture. The pre-built - libraries will continue to support 32-bit only. If you need 64-bit support - you'll need to build 64-bit versions of the libraries from source. Note that - x64 is the only 64-bit architecture supported at this time. Itanium (aka - IA-64) is NOT currently supported. - - Bugs Fixed: - + VLD does not report memory leaks that are the result of a failure to free - memory allocated via a call to realloc(). - + In multithreaded programs, if the program's main thread terminates before - other threads in the same process, then VLD may cause an access violation - while checking for memory leaks. - + If VLD cannot find the source file and line number information for a program - address, the last known file and line number will be repeated in the call - stack section of the memory leak report. The correct behavior should be for - VLD to print "File and line number not available" for that call stack entry. - - -0.9h beta (22 April 2005) -------------------------- - Bugs Fixed: - + Access Violations occur at random places within the VLD code when using - VLD version 0.9g. - + When using VLD version 0.9g, VLD may fail to report some memory leaks. - - -0.9g beta (22 April 2005) -------------------------- - New Features/Enhancements: - + Replaced the temporary internal search algorithm with a permanent search - algorithm that is much faster. Programs that dynamically allocate a large - number of memory blocks (tens of thousands or more) will see the most - significant performance boost from this version of VLD versus the previous - version. Overall, this is the fastest version of VLD released to date. - - -0.9f beta (13 April 2005) -------------------------- - New Features/Enhancements: - + Changed the internal search algorithm to a temporary simpler, but - more stable algorithm. A permanent algorithm which should be much - more efficient will be in a forthcoming release. - - Bugs Fixed: - + Access Violation at line 319 in vldutil.cpp may occur when running a - program linked with the VLD library. - - -0.9e beta (12 April 2005) -------------------------- - New Features/Enhancements: - + VLD no longer uses any STL containers or STL strings. This solves all of the - compatibility problems with Visual Studio .NET when using the pre-built - VLD libraries. - - + The configuration preprocessor macros now work with C programs without the - need to call VLDConfigure from within the program being debugged. - Because VLDConfigure is now obsolete, it has been removed. - - + One new source file (vldutil.cpp) and one new header (vldutil.h) have been - added. They contain utility functions and utility classes that replace - functionality previously performed by STL containers and strings. - - + The VisualLeakDetector global class object is now constructed at C runtime - initialization (i.e. it resides in the "compiler" initialization area). - Because VLD no longer uses any STL components, there is no longer the risk - that VLD will conflict with any STL libraries that also are constructed at - C runtime initialization. The end result is that VLD starts running earlier - and is destroyed later, which leads to more accurate leak detection. - - Bugs Fixed: - + Linking to the VLD 0.9d libraries from the VLD distribution under Visual - Studio .NET results in a number of linker "unresolved external symbol" - errors. Unresolved symbols include "__declspec(dllimport) void __cdecl - std::_Xran(void)" and "__declspec(dllimport) private: void __thiscall - std::basic_string,class std::allocator >::_Eos(unsigned int)", among others. - - + Call stacks do not appear in the memory leak report when linking against - release VLD libraries built from source with Visual Studio .NET. - - + If the preprocessor macro VLD_MAX_DATA_DUMP is defined as 0 (zero), then VLD - will get stuck in an infinite loop, repeatedly printing the same information - while attempting to display the memory leak report in the debugger's output - window. - - -0.9d beta (30 March 2005) -------------------------- - New Features/Enhancements: - + This version of VLD brings with it some major changes to the way VLD - interfaces with programs that use it. Instead of requiring that VLD be built - from source and then linked with the application, VLD is now packaged as a - pre-built static library. For those who just want to use VLD and are not - interested in modifying the source, this eliminates the complexities of - building VLD from source. A single header file, vld.h, has been added. To - link with the static library, this header needs to be included in one of the - program's source files. Please see the README.txt file for details on how - these changes affect how to use Visual Leak Detector. - - + The Microsoft Debug Help Library (dbghelp.dll) version 6.3 is now included - with the VLD distribution. - - -0.9c beta (17 March 2005) -------------------------- - Bugs Fixed: - + Compile error, "error C2039: 'size' : is not a member of '_CrtMemBlockHeader'" - occurs at line 644 of vld.cpp when building VLD with the VLD_MAX_DATA_DUMP - preprocessor macro defined. - - -0.9b beta (15 March 2005) -------------------------- - Bugs Fixed: - + VLD fails to detect memory leaks in class constructors if the objects - constructed are global objects. - - + If a debug executable is built with certain compiler optimizations turned on, - specifically frame pointer omission optimization or automatic inlining, then - theoretically VLD may produce incomplete or inaccurate stack traces or might - fail to produce stack traces altogether. - - -0.9a beta (12 March 2005) -------------------------- - Initial Public Release - - - - - - - - - - - - +Visual Leak Detector (VLD) Version 1.9h (beta) + + Change Log / Release Notes + +1.9h beta (24 February 2009) +---------------------------- + Enhancements: + + Added support to work with Visual Studio 2008. + + Known Bugs/Restrictions: + + Same bugs/restrictions as version 1.9f. + + +1.9g beta (16 April 2008) +---------------------------- + Bugs Fixed: + + Another deadlock condition may occur when loading DLLs into the process + being debugged. Special thanks to Eric Bissonnette and Kristian Paradis for + contributing this patch. + + Known Bugs/Restrictions: + + Same bugs/restrictions as version 1.9f. + + +1.9f beta (18 November 2006) +---------------------------- + Bugs Fixed: + + Deadlocks or access violations may occur when loading DLLs into + multithreaded processes. + + + In multithreaded programs, if the main thread terminates before other + threads in the process, then Visual Leak Detector may cause an access + violation while generating the memory leak report. + + Known Bugs/Restrictions: + + Memory allocations made through calls to functions loaded from a DLL using + delayed loading may not be detected. + + + Support for programs that use MFC 7.0 or MFC 7.1 is not complete yet. Some + memory leaks from such MFC-based programs may not be detected. + + + Visual Leak Detector may report leaks internal to Visual Leak Detector + if the main thread of the process terminates while other threads are still + running. + + + If more than one copy of the same C Runtime DLL is loaded in the process at + the same time, then some leaks may go undetected (note that loading more + than one copy of the C Runtime DLL into a process at the same time is + probably a bad idea to begin with). + + +1.9e beta (16 November 2006) +---------------------------- + New Features/Enhancements: + + Added a master on/off switch configuration option to vld.ini that can be + used to completely disable Visual Leak Detector. + + Bugs Fixed: + + Numerous deadlock situations. The multithread synchronization scheme has + been completely re-written which should make deadlocks in VLD much less + likey to happen. + + + An access violation will occur in VLD if GetProcAddress is called to obtain + an export's address by ordinal, for certain libraries. + + + Problems may potentially occur when the program being debugged exits due to + the Debug Help Library having been detached from the process too early. + Symptoms might include access violation exceptions or other erratic behavior + just as the program exits and while VLD is generating the leak report. + + + The copy of vld.ini installed in VLD's installation directory overrides any + other copies of vld.ini that are created, even copies placed in the + working directory of the program being debugged. + + Known Bugs/Restrictions: + + Memory allocations made through calls to functions loaded from a DLL using + delayed loading may not be detected. + + + Support for programs that use MFC 7.0 or MFC 7.1 is not complete yet. Some + memory leaks from such MFC-based programs may not be detected. + + + If more than one copy of the same C Runtime DLL is loaded in the process at + the same time, then some leaks may go undetected (note that loading more + than one copy of the C Runtime DLL into a process at the same time is + probably a bad idea to begin with). + + +1.9d beta (12 November 2006) +---------------------------- + Bugs Fixed: + + Failed assertion "freed == TRUE" pops up when running a program with VLD + without the debugger attached. + + + Some, but not all, multithreaded programs that dynamically load and unload + many DLLs have been known to experience problems, such as deadlocks or + exceptions, when used with VLD. + + + Failed assertion "exportmodule != NULL" pops up when running some programs + with VLD. + + + VLD fails to show file names or function names in the memory leak report for + some programs that are linked with the dynamic CRT library. + + + Access violation exceptions are thrown, but caught by the operating system, + when running some programs with VLD. + + +1.9c beta (6 November 2006) +--------------------------- + New Features/Enhancments: + + New NSIS installer makes setting up and using VLD much easier. + + + No need to manually copy dbghelp.dll to the right location, VLD will always + find the right version. + + + MFC 8.0 is now fully supported. + + + The memory leak report is now written to the output window much faster. + Support has been added, through a new configuration option, to slow down + the report output for older versions of Visual Studio that have trouble + when it is written too quickly. + + Bugs Fixed: + + All known compatibilities with Visual Studio 2005 have been eliminated. + + + Leaks from calloc may go undetected. + + + Leaks from vector new operator may go undetected. + + + VLDDisable and VLDEnable do not work as expected; some memory leaks that + should be ignored by VLD due to a previous call to VLDDisable are still + reported. + + + Unloading and reloading a previously loaded module may cause leaks that + occur in the module after it was reloaded to go undetected. + + + If vld.h is included in a release build, then the compiler will generate + errors if the VLDEnable or VLDDisable APIs have been used. + + +1.9b beta (26 October 2006) +--------------------------- + Bugs Fixed: + + Source compiles under Visual Studio 2005 and the binaries are compatible + with applications that link with the Visual Studio 2005 C Runtime Library + (msvcr80d.dll). + + Known Restrictions in this Release: + + Memory allocations made through calls to functions loaded from a DLL using + delayed loading may not be detected. + + + Support for programs that use MFC 7.0, MFC 7.1, or MFC 8.0 is not complete + yet. Some memory leaks from such MFC-based programs may not be detected. A + workaround for this restriction is to forcefully include the MFC DLLs in + memory leak detection, by setting the "ForceIncludeModules" configuration + option to: "mfc70d.dll mfc71d.dll mfc80d.dll" and explicitly adding vld.lib + as an input file on the linker command line (can be added through project + settings by adding it to the list of library modules in the linker options). + This restriction does not apply to programs that use MFC 4.2, which is fully + supported. + + +1.9a beta (9 March 2006) +------------------------ + New Features/Enhancments: + + All new leak detection engine detects most, if not all, in-process memory + leaks, not just leaks from "new" or "malloc", including COM-based leaks. + + + Packaged as an easier-to-use DLL. There's no longer any need to carefully + decide which modules should be linked with the VLD library. Instead, you + just include the vld.h header file in at least one source file from each + module (DLL or EXE) to be included in memory leak detection. + + + Configuration is done from an INI file instead of using preprocessor macros. + This allows VLD's configuration to be changed without needing to recompile + the program. + + + Many new configuration options have been added. One of the most often + requested option that has been added is the option to save the leak report + to a file instead of, or in addition to, the debugger. + + Bugs Fixed: + + The improved design of the new leak detection engine has resolved all of the + previously known restrictions in version 1.0. + + Known Restrictions in this Release: + + Memory allocations made through calls to functions loaded from a DLL using + delayed loading may not be detected. + + + Support for programs that use MFC 7.0, MFC 7.1, or MFC 8.0 is not complete + yet. Some memory leaks from such MFC-based programs may not be detected. A + workaround for this restriction is to forcefully include the MFC DLLs in + memory leak detection, by setting the "ForceIncludeModules" configuration + option to: "mfc70d.dll mfc71d.dll mfc80d.dll" and explicitly adding vld.lib + as an input file on the linker command line (can be added through project + settings by adding it to the list of library modules in the linker options). + This restriction does not apply to programs that use MFC 4.2, which is fully + supported. + + +1.0 (5 August 2005) +------------------- + New Features/Enhancements: + + Memory leak detection can now be selectively disabled and enabled at + runtime, using provided APIs. This provides a straightforward way of + allowing VLD to selectively "ignore" certain allocations. It can also be + used to disable VLD altogether at runtime, improving application performance + without needing to recompile. + + + If there are multiple identical memory leaks (i.e. leaks that originate from + the same call stack and that leak the same size memory block) then VLD can + optionally aggregate all of the repeated leaks, showing only the first such + leaked block in detail in the memory leak report. A tally of the total + number of leaks that match that particular size and call stack accompanies + the information for that leak. + + + When VLD is initialized at program startup, the library type which was + linked-in is displayed. This can help verify that the expected VLD library + (either single-threaded static, multithreaded static, or multithreaded DLL) + is being linked with your program. + + + The Visual Leak Detector name is displayed on most messages output to the + debugger to easily differentiate VLD's output from the output produced by + the built-in memory leak detector. + + + If any of the compile-time configuration options have been changed from + their default values, then the current state of the option is displayed in + the debugger when VLD is initialized. + + + VLD's memory leak self-checking capability (checking for leaks in VLD + itself) can be verified using a new preprocessor macro that allows VLD to + perform a self-test at runtime. + + Bugs Fixed: + + If the MFC libraries are statically linked to the program being debugged, + then MFC will erroneously report memory leaks in the Visual Leak Detector + code and may cause an access violation while attempting to report the false + memory leaks. These bogus leaks are always reported as "client block at +
, subtype bf42" and are claimed to be "invalid objects". + + + VLD will leak a fixed-sized block of memory when the program exits if VLD + failed to initialize because the Debug Help library (dbghelp.dll) could not + be loaded. + + + In multithreaded programs, if the program's main thread terminates before + other threads in the same process, then VLD may cause an access violation + while freeing resources used internally by VLD. + + +0.9i beta (30 April 2005) +------------------------- + New Features/Enhancements: + + Added support in the source code for x64 architecture. The pre-built + libraries will continue to support 32-bit only. If you need 64-bit support + you'll need to build 64-bit versions of the libraries from source. Note that + x64 is the only 64-bit architecture supported at this time. Itanium (aka + IA-64) is NOT currently supported. + + Bugs Fixed: + + VLD does not report memory leaks that are the result of a failure to free + memory allocated via a call to realloc(). + + In multithreaded programs, if the program's main thread terminates before + other threads in the same process, then VLD may cause an access violation + while checking for memory leaks. + + If VLD cannot find the source file and line number information for a program + address, the last known file and line number will be repeated in the call + stack section of the memory leak report. The correct behavior should be for + VLD to print "File and line number not available" for that call stack entry. + + +0.9h beta (22 April 2005) +------------------------- + Bugs Fixed: + + Access Violations occur at random places within the VLD code when using + VLD version 0.9g. + + When using VLD version 0.9g, VLD may fail to report some memory leaks. + + +0.9g beta (22 April 2005) +------------------------- + New Features/Enhancements: + + Replaced the temporary internal search algorithm with a permanent search + algorithm that is much faster. Programs that dynamically allocate a large + number of memory blocks (tens of thousands or more) will see the most + significant performance boost from this version of VLD versus the previous + version. Overall, this is the fastest version of VLD released to date. + + +0.9f beta (13 April 2005) +------------------------- + New Features/Enhancements: + + Changed the internal search algorithm to a temporary simpler, but + more stable algorithm. A permanent algorithm which should be much + more efficient will be in a forthcoming release. + + Bugs Fixed: + + Access Violation at line 319 in vldutil.cpp may occur when running a + program linked with the VLD library. + + +0.9e beta (12 April 2005) +------------------------- + New Features/Enhancements: + + VLD no longer uses any STL containers or STL strings. This solves all of the + compatibility problems with Visual Studio .NET when using the pre-built + VLD libraries. + + + The configuration preprocessor macros now work with C programs without the + need to call VLDConfigure from within the program being debugged. + Because VLDConfigure is now obsolete, it has been removed. + + + One new source file (vldutil.cpp) and one new header (vldutil.h) have been + added. They contain utility functions and utility classes that replace + functionality previously performed by STL containers and strings. + + + The VisualLeakDetector global class object is now constructed at C runtime + initialization (i.e. it resides in the "compiler" initialization area). + Because VLD no longer uses any STL components, there is no longer the risk + that VLD will conflict with any STL libraries that also are constructed at + C runtime initialization. The end result is that VLD starts running earlier + and is destroyed later, which leads to more accurate leak detection. + + Bugs Fixed: + + Linking to the VLD 0.9d libraries from the VLD distribution under Visual + Studio .NET results in a number of linker "unresolved external symbol" + errors. Unresolved symbols include "__declspec(dllimport) void __cdecl + std::_Xran(void)" and "__declspec(dllimport) private: void __thiscall + std::basic_string,class std::allocator >::_Eos(unsigned int)", among others. + + + Call stacks do not appear in the memory leak report when linking against + release VLD libraries built from source with Visual Studio .NET. + + + If the preprocessor macro VLD_MAX_DATA_DUMP is defined as 0 (zero), then VLD + will get stuck in an infinite loop, repeatedly printing the same information + while attempting to display the memory leak report in the debugger's output + window. + + +0.9d beta (30 March 2005) +------------------------- + New Features/Enhancements: + + This version of VLD brings with it some major changes to the way VLD + interfaces with programs that use it. Instead of requiring that VLD be built + from source and then linked with the application, VLD is now packaged as a + pre-built static library. For those who just want to use VLD and are not + interested in modifying the source, this eliminates the complexities of + building VLD from source. A single header file, vld.h, has been added. To + link with the static library, this header needs to be included in one of the + program's source files. Please see the README.txt file for details on how + these changes affect how to use Visual Leak Detector. + + + The Microsoft Debug Help Library (dbghelp.dll) version 6.3 is now included + with the VLD distribution. + + +0.9c beta (17 March 2005) +------------------------- + Bugs Fixed: + + Compile error, "error C2039: 'size' : is not a member of '_CrtMemBlockHeader'" + occurs at line 644 of vld.cpp when building VLD with the VLD_MAX_DATA_DUMP + preprocessor macro defined. + + +0.9b beta (15 March 2005) +------------------------- + Bugs Fixed: + + VLD fails to detect memory leaks in class constructors if the objects + constructed are global objects. + + + If a debug executable is built with certain compiler optimizations turned on, + specifically frame pointer omission optimization or automatic inlining, then + theoretically VLD may produce incomplete or inaccurate stack traces or might + fail to produce stack traces altogether. + + +0.9a beta (12 March 2005) +------------------------- + Initial Public Release + + + + + + + + + + + + diff --git a/COPYING.txt b/COPYING.txt index a6bd700d..073dd57f 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -1,458 +1,458 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/Microsoft.DTfW.DHL.manifest b/Microsoft.DTfW.DHL.manifest index 55dc5d9c..f78f4e36 100644 --- a/Microsoft.DTfW.DHL.manifest +++ b/Microsoft.DTfW.DHL.manifest @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/README.html b/README.html index 1eac0e8c..87b94694 100644 --- a/README.html +++ b/README.html @@ -1,780 +1,780 @@ - - - - - - - - - - Visual Leak Detector (Beta) - - - - - - - - -
- -

Visual Leak Detector 1.9h (Beta)

- -

Enhanced Memory Leak Detection for Visual C++

- -
- - - - -
- - - - - - -

Introduction

- -

Visual C++ provides built-in memory leak detection, but its capabilities are minimal at best. This memory leak - detector was created as a free alternative to the built-in memory leak detector provided with Visual C++. Here - are some of Visual Leak Detector's features, none of which exist in the built-in detector:

- -
    -
  • Provides a complete stack trace for each leaked block, including source file and line number information when - available.
    • - -
  • Detects most, if not all, types of in-process memory leaks including COM-based leaks, and pure Win32 heap-based - leaks.
    • - -
  • Selected modules (DLLs or even the main EXE) can be excluded from leak detection.
    • - -
  • Provides complete data dumps (in hex and ASCII) of leaked blocks.
    • - -
  • Customizable memory leak report: can be saved to a file or sent to the debugger and can include a variable level - of detail.
    • -
- -

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 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 me a note. Or, if you'd - prefer, you can contribute a small donation. Both are very appreciated.

- - - - -

Using Visual Leak Detector

- -

This section briefly describes the basics of using Visual Leak Detector (VLD).

- -

Important! : Before using VLD with any Visual C++ project, you must first add the Visual Leak - Detector include and library directories to the Visual C++ include and library directory search paths:

- -
    -
  • Visual C++ 8 and 9: Go to Tools -> Options -> Projects and Solutions -> VC++ Directories. - Select "Include files" from the "Show Directories For" drop-down menu. Add the - include subdirectory from the Visual Leak Detector installation directory. Move it - to the bottom of the list. Then select "Library files" from the drop-down menu and add the - lib subdirectory from the Visual Leak Detector installation directory. Again, move - it to the bottom of the list.
    • - -
  • Visual C++ 7: Go to Project Properties -> C/C++ -> General -> Additional Include - Directories and add the include subdirectory from the Visual Leak Detector - installation directory. Move it to the bottom of the list. Then select Additional Library Directories and add - the lib subdirectory from the Visual Leak Detector installation directory. Again, - move it to the bottom of the list.
    • - -
  • Visual C++ 6: Go to Tools -> Options -> Directories. Select "Include files" from - the "Show Directories For" drop-down menu. Add the include subdirectory - from the Visual Leak Detector installation directory. Move it to the bottom of the list. Then select "Library - files" from the drop-down menu and add the lib subdirectory from the Visual Leak - Detector installation directory. Again, move it to the bottom of the list.
    • -
- -

To use VLD with your project, follow these simple steps:

- -
    -
  1. In at least one C/C++ source file from your program, include the vld.h header - file. It should not matter which file you add the include statement to. It also should not matter in what order - the header is included in relation to other headers. The only exception is - stdafx.h (or any other precompiled header). A precompiled header, such as - stdafx.h, must always be the first header included in a source file, so - vld.h must be included after any precompiled headers.
    2. - -
  2. If your program contains one or more DLLs that you would also like to check for memory leaks, then also include - vld.h in at least one source file from each DLL to be included in leak - detection.
    3. - -
  3. Build the debug version of your program.
    4. -
- -

Note: Unlike earlier (pre-1.9) versions of VLD, it is now acceptable to include - vld.h in every source file, or to include it in a common header that is included by - many or all source files. Only one copy of the VLD code will be loaded into the process, regardless of how many - source files include vld.h.

- -

VLD will detect memory leaks in your program whenever you run the debug version. When you run the program under the - Visual C++ debugger, a report of all the memory leaks detected will be displayed in the debugger's output window - when your program exits (the report can optionally be saved to a file instead, see - ReportFile under Configuration Options). Double-clicking on a - source file's line number in the memory leak report will take you to that file and line in the editor window, - allowing easy navigation of the code path leading up to the allocation that resulted in the memory leak.

- -

Note: When you build release versions of your program, VLD will not be linked into the - executable. So it is safe to leave vld.h included in your source files when doing - release builds. Doing so will not result in any performance degradation or any other undesirable overhead.

- - - - -

Configuration Options

- -

There are a several configuration options that control specific aspects of VLD's operation. These configuration - options are stored in the vld.ini configuration file. By default, the configuration - file should be in the Visual Leak Detector installation directory. However, the configuration file can be copied to - the program's working directory, in which case the configuration settings in that copy of - vld.ini will apply only when debugging that one program.

- -
-
VLD
-
-

This option acts as a master on/off switch. By default, this option is set to "on". To completely - disable Visual Leak Detector at runtime, set this option to "off". When VLD is turned off using this - option, it will do nothing but print a message to the debugger indicating that it has been turned off.

-
- -
AggregateDuplicates
-
-

Normally, VLD displays each individual leaked block in detail. Setting this option to "yes" will make VLD - aggregate all leaks that share the same size and call stack under a single entry in the memory leak report. - Only the first leaked block will be reported in detail. No other identical leaks will be displayed. Instead, - a tally showing the total number of leaks matching that size and call stack will be shown. This can be useful - if there are only a few sources of leaks, but those few sources are repeatedly leaking a very large number of - memory blocks.

-
- -
ForceIncludeModules
-
-

In some rare cases, it may be necessary to include a module in leak detection, but it may not be possible to - include vld.h in any of the module's sources. In such cases, this option can be - used to force VLD to include those modules in leak detection. List the names of the modules (DLLs) to be - forcefully included in leak detection. If you do use this option, it's advisable to also add - vld.lib to the list of library modules in the linker options of your project's - settings.

- -

Caution: Use this option only when absolutely necessary. In some situations, - use of this option may result in unpredictable behavior including false leak reports and/or crashes. It's - best to stay away from this option unless you are sure you understand what you are doing.

-
- -
MaxDataDump
-
-

Set this option to an integer value to limit the amount of data displayed in memory block data dumps. When - this number of bytes of data have been dumped, the dump will stop. This can be useful if any of the leaked - blocks are very large and the debugger's output window becomes too cluttered. You can set this option to 0 - (zero) if you want to suppress data dumps altogether.

-
- -
MaxTraceFrames
-
-

By default, VLD will trace the call stack for each allocated block as far back as possible. Each frame traced - adds additional overhead (in both CPU time and memory usage) to your debug executable. If you'd like to limit - this overhead, you can define this macro to an integer value. The stack trace will stop when it has traced - this number of frames. The frame count may include some of the "internal" frames which, by default, are not - displayed in the debugger's output window (see TraceInternalFrames below). In - some cases there may be about three or four "internal" frames at the beginning of the call stack. Keep this - in mind when using this macro, or you may not see the number of frames you expect.

-
- -
ReportEncoding
-
-

When the memory leak report is saved to a file, the report may optionally be Unicode encoded instead of using - the default ASCII encoding. This might be useful if the data contained in leaked blocks is likely to consist - of Unicode text. Set this option to "unicode" to generate a Unicode encoded report.

-
- -
ReportFile
-
-

Use this option to specify the name and location of the file in which to save the memory leak report when - using a file as the report destination, as specified by the ReportTo option. If - no file is specified here, then VLD will save the report in a file named "memory_leak_report.txt" in the - working directory of the program.

-
- -
ReportTo
-
-

The memory leak report may be sent to a file in addition to, or instead of, the debugger. Use this option to - specify which type of destination to use. Specify one of "debugger" (the default), "file", or "both".

-
- -
SelfTest
-
-

VLD has the ability to check itself for memory leaks. This feature is always active. Every time you run VLD, - in addition to checking your own program for memory leaks, it is also checking itself for leaks. Setting this - option to "on" forces VLD to intentionally leak a small amount of memory: a 21-character block filled with - the text "Memory Leak Self-Test". This provides a way to test VLD's ability to check itself for memory leaks - and verify that this capability is working correctly. This option is usually only useful for debugging VLD - itself.

-
- -
SlowDebuggerDump
-
-

If enabled, this option causes Visual Leak Detector to write the memory leak report to the debugger's output - window at a slower than normal rate. This option is specifically designed to work around a known issue with - some older versions of Visual Studio where some data sent to the output window might be lost if it is sent - too quickly. If you notice that some information seems to be missing from the memory leak report, try turning - this on.

-
- -
StackWalkMethod
-
-

Selects the method to be used for walking the stack to obtain call stacks for allocated memory blocks. The - default "fast" method may not always be able to successfully trace completely through all call stacks. In - such cases, the "safe" method may prove to be more reliable in obtaining the full stack trace. The - disadvantage with the "safe" method is that it is significantly slower than the "fast" method and will - probably result in very noticeable performance degradation of the program being debugged. In most cases it - should be okay to leave this option set to "fast". If you experience problems getting VLD to show call - stacks, you can try setting this option to "safe".

- -

If you do use the "safe" method, and notice a significant performance decrease, you may want to consider - using the MaxTraceFrames option to limit the number of frames traced to a - relatively small number. This can reduce the amount of time spent tracing the stack by a very large - amount.

-
- -
StartDisabled
-
-

Set this option to "yes" to disable memory leak detection initially. This can be useful if you need to be - able to selectively enable memory leak detection from runtime, without needing to rebuild the executable; - however, this option should be used with caution. Any memory leaks that may occur before memory leak - detection is enabled at runtime will go undetected. For example, if the constructor of some global variable - allocates memory before execution reaches a subsequent call to VLDEnable, then - VLD will not be able to detect if the memory allocated by the global variable is never freed. Refer to the - following section on controlling leak detection at runtime for details on using the - runtime APIs which can be useful in conjunction with this option.

-
- -
TraceInternalFrames
-
-

This option determines whether or not all frames of the call stack, including frames internal to the heap, - are traced. There will always be a number of frames on the call stack which are internal to Visual Leak - Detector and C/C++ or Win32 heap APIs that aren't generally useful for determining the cause of a leak. - Normally these frames are skipped during the stack trace, which somewhat reduces the time spent tracing and - amount of data collected and stored in memory. Including all frames in the stack trace, all the way down into - VLD's own code can, however, be useful for debugging VLD itself.

-
-
- - - - -

Controlling Leak Detection at Runtime

- -

Using the default configuration, VLD's memory leak detection will be enabled during the entire run of your program. - In certain scenarios it may be desirable to selectively disable memory leak detection in certain segments of your - code. VLD provides simple APIs for controlling the state of memory leak detection at runtime. To access these APIs, - include vld.h in the source file that needs to use them.

- -
-
VLDDisable
-
-

This function disables memory leak detection. After calling this function, memory leak detection will remain - disabled until it is explicitly re-enabled via a call to VLDEnable.

- - 
void VLDDisable (void);
- -

Arguments:

- -

This function accepts no arguments.

- -

Return Value:

- -

None (this function always succeeds).

- -

Notes:

- -

This function controls memory leak detection on a per-thread basis. In other words, calling this function - disables memory leak detection for only the thread that called the function. Memory leak detection will - remain enabled for any other threads in the same process. This insulates the programmer from having to - synchronize multiple threads that disable and enable memory leak detection. However, note also that this - means that in order to disable memory leak detection process-wide, this function must be called from every - thread in the process.

-
- - -
VLDEnable
-
-

This function enables memory leak detection if it was previously disabled. After calling this function, - memory leak detection will remain enabled unless it is explicitly disabled again via a call to - VLDDisable().

- - 
void VLDEnable (void);
- -

Arguments:

- -

This function accepts no arguments.

- -

Return Value:

- -

None (this function always succeeds).

- -

Notes:

- -

This function controls memory leak detection on a per-thread basis. See the remarks for - VLDDisable regarding multithreading and memory leak detection for details. - Those same concepts also apply to this function.

-
-
- - - - -

Building Visual Leak Detector from Source

- -

Because Visual Leak Detector is open source, it can be built from source if you want to tweak it to your - liking. As of Visual Studio 2008, the source can usually be built out-of-the-box without downloading or installing - any other tools. If you are using Visual Studio 2008 (or later), you can skip ahead to - Executing Your Built vld.dll. - -

Users with older versions of Visual Studio should continue reading here and follow the instructions in the next - subsection.

- -

For Older Versions of Visual Studio

- -

The most difficult part about building VLD from source is getting your build environment correctly set up. - But if you follow these instructions carefully, the process should be fairly painless.

- -
    -
  1. VLD depends on the Debug Help Library. This library is part of - Debugging Tools for Windows (DTfW). - Download and install DTfW in order to install the required headers and libraries. I recommend installing version - 6.5 of DTfW, or later. Newer versions tend to work fine, but older versions will probably not work. Be sure to - manually select to install the SDK files during the DTfW installation or the headers and libraries will not be - installed (they are not always installed with a default installation).
    2. - -
  2. Visual C++ will need to be made aware of where it can find the Debug Help Library header and library files. - Add the sdk\inc and sdk\lib subdirectories from the - DTfW installation directory to the include and library search paths in Visual C++. (See the section above - on using Visual Leak Detector on instructions for adding to these search paths). -
    3. - -
  3. VLD also requires a reasonably up-to-date Platform SDK. It is known to work with the latest SDK (as of this - writing) which is the Windows Server 2003 R2 SDK. It should also work with earlier SDKs, such as the Windows XP - SP2 SDK or may even work with SDKs as old as the February 2003 SDK. If in doubt, - update - your Platform SDK to the latest version.
    4. - -
  4. Again, Visual C++ will need to know where to find the Platform SDK headers and libraries. Add the - Include and Lib subdirectories from the - Platform SDK installation directory to the Include and Library search paths, respectively. The - Platform SDK directories should be placed just after the DTfW directories.
    5. -
- -

To summarize, your Visual C++ include search path should look something like this:

- -
    -
  • C:\Program Files\Debugging Tools for Windows\sdk\inc
    • - -
  • C:\Program Files\Microsoft Platform SDK\Include
    • - -
  • C:\Program Files\Microsoft Visual Studio\VCx\Include
    • - -
  • ...
    • -
- -

And your Visual C++ library search path should look like this:

- -
    -
  • C:\Program Files\Debugging Tools for Windows\sdk\lib
    • - -
  • C:\Program Files\Microsoft Platform SDK\Lib
    • - -
  • C:\Program Files\Microsoft Visual Studio\VCx\Lib
    • - -
  • ...
    • -
- -

In the above examples, "VCx" could be "VC", "VC7", or "VC98" (or possibly other values) depending on which version of - Visual Studio you have installed. Also, the name of your Platform SDK directory will probably be different from - the example depending on which version of the Platform SDK you have installed.

- -

Once you have completed all of the above steps, your build environment should be ready. To build VLD, just open the - vld.sln solution file and do a full build.

- -

Executing Your Built vld.dll

- -

When actually running the built project, vld.dll will expect to find the Debug Help - Library as a private assembly. The private assembly must be located in the same directory as - vld.dll (either the Release or - Debug directory by default). Otherwise, when VLD is loaded, an error message will pop - up indicating that the program failed to initialize, and you will see a message similar to the following in the - debugger's output window:

-

LDR: LdrpWalkImportDescriptor() failed to probe C:\Projects\vld\Release\vld.dll for its manifest, - ntstatus 0xc0150002

- -

To ensure that vld.dll finds the required private assembly, you need to copy - dbghelp.dll and Microsoft.DTfW.DHL.manifest to the - same directory that vld.dll is in.

- - - - -

Windows x64 Support

- -

Currently VLD will not build on x64 due to limitations of the x64 compiler. Some efforts have been undertaken to - get it working in a 64-bit environment, but have not yet been successful. If you need 64-bit support and run into - problems trying to build the source in 64-bit mode, please let me know. - I'll be glad to assist in getting the 64-bit code working properly, if at all possible.

- - - - -

Frequently Asked Questions

- -
-
When I try to compile my program with VLD, it fails and the compiler gives this error: Cannot open include file: - 'vld.h': No such file or directory.
-
-

The compiler can't find the header file that VLD installed. This probably means that VLD's include - subdirectory has not been added to the Visual C++ include search path. See the section above about - Using Visual Leak Detector for instructions on how to add VLD's directories to the search - path.

-
-
In the memory leak report, the callstack contains many lines that say - "File and line number unvailable" or "Function name unavailable".
-
-

This may mean that VLD couldn't find the symbol database for your program. The symbol database is ususally in - a file named [my-program-name].pdb. If this file is not located in the same - directory as the program itself, then VLD will probably not find it and can't show any file or function - names.

-
-
- - - - -

Known Restrictions

- -

Known restrictions/limitations in this version of VLD include:

- -
    -
  • Memory allocations made through calls to functions loaded from a DLL using delayed loading may not be - detected.
    • - -
  • Support for programs that use MFC 7.0 or MFC 7.1 is not complete yet. Some memory leaks from such MFC-based - programs may not be detected. A possible workaround for this restriction is to try forcefully including the MFC - DLLs in memory leak detection, by setting the ForceIncludeModules configuration - option to: "mfc70d.dll mfc71d.dll" and explicitly adding vld.lib as an input file - on the linker command line (can be added through project settings by adding it to the list of library modules in - the linker options). This restriction does not apply to programs that use MFC 4.2, MFC 8.0, or MFC 9.0, which are - all fully supported.
    • - -
  • Visual Leak Detector may report leaks internal to Visual Leak Detector if the main thread of the process - terminates while other threads are still running.
    • - -
  • On Windows 2000 and earlier operating systems, you may need to manually add the - bin subdirectory from the Visual Leak Detector installation directory to the system - PATH environment variable. Also, dbghelp.dll will probably need to be manually copied - to the directory where the program being debugged resides. Otherwise the system may not find the required DLLs when - running VLD.
    • - -
  • If more than one copy of the same C Runtime DLL is loaded in the process at the same time, then some leaks may - go undetected (note that loading more than one copy of the C Runtime DLL at the same time is probably a bad idea - to begin with).
    • -
- - - -

Contributing

- -

I 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 hop onto - GitHub (accounts are free) and issue pull requests for changes that you've made and - would like to share.

- -

Git Repository URL: git://github.com/dmoulding/vld.git

- -

License

- -

Visual Leak Detector is distributed under the terms of the - GNU Lesser General Public License. This license allows you to - use the VLD library with your own programs without restriction. However, if you build a program (or another library) - that is based on the VLD source code, or uses parts of the VLD source code in it, then some restrictions - will apply. What this means is that you are free to ship and use the distributed version of the VLD DLL with regular - commercial programs. But if you create a modified version of VLD, that modified version must remain "free software". - See the COPYING.txt file for details.

- -

The Debug Help Library (dbghelp.dll) and Microsoft C Runtime Library - (msvcr80.dll) distributed with this software are not part of - Visual Leak Detector and are not covered under the terms of the GNU Lesser General Public License. They are - separately copyrighted works of Microsoft Corporation. Microsoft reserves all its rights to its copyrights in the - Debug Help Library and Microsoft C Runtime Library. Neither your use of the Visual Leak Detector software, - nor your license under the GNU Lesser General Public license grant you any rights to use the Debug Help Library or - Microsoft C Runtime Library in ANY WAY (for example, redistributing them) that would infringe upon - Microsoft Corporation's copyright in the Debug Help Library or Microsoft C Runtime Library.

- -

NO WARRANTY

- -

BECAUSE VISUAL LEAK DETECTOR ("THE SOFTWARE") IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE SOFTWARE, TO - THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER - PARTIES PROVIDE THE SOFTWARE "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE - QUALITY AND PERFORMANCE OF THE SOFTWARE IS WITH YOU. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION.

- -

IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY - WHO MAY MODIFY AND/OR REDISTRIBUTE THE SOFTWARE AS PERMITTED BY THE LICENSING TERMS SET FORTH ABOVE, BE LIABLE TO YOU - FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY - TO USE THE SOFTWARE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED - BY YOU OR THIRD PARTIES OR A FAILURE OF THE SOFTWARE TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

- - - - -

Contacting the Author

- -

Please forward any bug reports, questions, comments or suggestions to me at -dmoulding@gmail.com.

- -

Donations to help support ongoing development of Visual Leak Detector are very appreciated!

- -
-
- - - -
-
- - - -

Additional Developers Wanted

- -

This project is looking for additional developers who have the time, knowledge, and talent, to help make VLD continue - to be a useful utility for the Windows developer community. If you feel that you or someone you know would be - interested in becoming an active member of the Visual Leak Detector development team, please let me know.

- - - -

- Valid XHTML 1.0! - Valid CSS! -

- - - - - -
- - - + + + + + + + + + + Visual Leak Detector (Beta) + + + + + + + + +
+ +

Visual Leak Detector 1.9h (Beta)

+ +

Enhanced Memory Leak Detection for Visual C++

+ +
+ + + + +
+ + + + + + +

Introduction

+ +

Visual C++ provides built-in memory leak detection, but its capabilities are minimal at best. This memory leak + detector was created as a free alternative to the built-in memory leak detector provided with Visual C++. Here + are some of Visual Leak Detector's features, none of which exist in the built-in detector:

+ +
    +
  • Provides a complete stack trace for each leaked block, including source file and line number information when + available.
    • + +
  • Detects most, if not all, types of in-process memory leaks including COM-based leaks, and pure Win32 heap-based + leaks.
    • + +
  • Selected modules (DLLs or even the main EXE) can be excluded from leak detection.
    • + +
  • Provides complete data dumps (in hex and ASCII) of leaked blocks.
    • + +
  • Customizable memory leak report: can be saved to a file or sent to the debugger and can include a variable level + of detail.
    • +
+ +

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 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 me a note. Or, if you'd + prefer, you can contribute a small donation. Both are very appreciated.

+ + + + +

Using Visual Leak Detector

+ +

This section briefly describes the basics of using Visual Leak Detector (VLD).

+ +

Important! : Before using VLD with any Visual C++ project, you must first add the Visual Leak + Detector include and library directories to the Visual C++ include and library directory search paths:

+ +
    +
  • Visual C++ 8 and 9: Go to Tools -> Options -> Projects and Solutions -> VC++ Directories. + Select "Include files" from the "Show Directories For" drop-down menu. Add the + include subdirectory from the Visual Leak Detector installation directory. Move it + to the bottom of the list. Then select "Library files" from the drop-down menu and add the + lib subdirectory from the Visual Leak Detector installation directory. Again, move + it to the bottom of the list.
    • + +
  • Visual C++ 7: Go to Project Properties -> C/C++ -> General -> Additional Include + Directories and add the include subdirectory from the Visual Leak Detector + installation directory. Move it to the bottom of the list. Then select Additional Library Directories and add + the lib subdirectory from the Visual Leak Detector installation directory. Again, + move it to the bottom of the list.
    • + +
  • Visual C++ 6: Go to Tools -> Options -> Directories. Select "Include files" from + the "Show Directories For" drop-down menu. Add the include subdirectory + from the Visual Leak Detector installation directory. Move it to the bottom of the list. Then select "Library + files" from the drop-down menu and add the lib subdirectory from the Visual Leak + Detector installation directory. Again, move it to the bottom of the list.
    • +
+ +

To use VLD with your project, follow these simple steps:

+ +
    +
  1. In at least one C/C++ source file from your program, include the vld.h header + file. It should not matter which file you add the include statement to. It also should not matter in what order + the header is included in relation to other headers. The only exception is + stdafx.h (or any other precompiled header). A precompiled header, such as + stdafx.h, must always be the first header included in a source file, so + vld.h must be included after any precompiled headers.
    2. + +
  2. If your program contains one or more DLLs that you would also like to check for memory leaks, then also include + vld.h in at least one source file from each DLL to be included in leak + detection.
    3. + +
  3. Build the debug version of your program.
    4. +
+ +

Note: Unlike earlier (pre-1.9) versions of VLD, it is now acceptable to include + vld.h in every source file, or to include it in a common header that is included by + many or all source files. Only one copy of the VLD code will be loaded into the process, regardless of how many + source files include vld.h.

+ +

VLD will detect memory leaks in your program whenever you run the debug version. When you run the program under the + Visual C++ debugger, a report of all the memory leaks detected will be displayed in the debugger's output window + when your program exits (the report can optionally be saved to a file instead, see + ReportFile under Configuration Options). Double-clicking on a + source file's line number in the memory leak report will take you to that file and line in the editor window, + allowing easy navigation of the code path leading up to the allocation that resulted in the memory leak.

+ +

Note: When you build release versions of your program, VLD will not be linked into the + executable. So it is safe to leave vld.h included in your source files when doing + release builds. Doing so will not result in any performance degradation or any other undesirable overhead.

+ + + + +

Configuration Options

+ +

There are a several configuration options that control specific aspects of VLD's operation. These configuration + options are stored in the vld.ini configuration file. By default, the configuration + file should be in the Visual Leak Detector installation directory. However, the configuration file can be copied to + the program's working directory, in which case the configuration settings in that copy of + vld.ini will apply only when debugging that one program.

+ +
+
VLD
+
+

This option acts as a master on/off switch. By default, this option is set to "on". To completely + disable Visual Leak Detector at runtime, set this option to "off". When VLD is turned off using this + option, it will do nothing but print a message to the debugger indicating that it has been turned off.

+
+ +
AggregateDuplicates
+
+

Normally, VLD displays each individual leaked block in detail. Setting this option to "yes" will make VLD + aggregate all leaks that share the same size and call stack under a single entry in the memory leak report. + Only the first leaked block will be reported in detail. No other identical leaks will be displayed. Instead, + a tally showing the total number of leaks matching that size and call stack will be shown. This can be useful + if there are only a few sources of leaks, but those few sources are repeatedly leaking a very large number of + memory blocks.

+
+ +
ForceIncludeModules
+
+

In some rare cases, it may be necessary to include a module in leak detection, but it may not be possible to + include vld.h in any of the module's sources. In such cases, this option can be + used to force VLD to include those modules in leak detection. List the names of the modules (DLLs) to be + forcefully included in leak detection. If you do use this option, it's advisable to also add + vld.lib to the list of library modules in the linker options of your project's + settings.

+ +

Caution: Use this option only when absolutely necessary. In some situations, + use of this option may result in unpredictable behavior including false leak reports and/or crashes. It's + best to stay away from this option unless you are sure you understand what you are doing.

+
+ +
MaxDataDump
+
+

Set this option to an integer value to limit the amount of data displayed in memory block data dumps. When + this number of bytes of data have been dumped, the dump will stop. This can be useful if any of the leaked + blocks are very large and the debugger's output window becomes too cluttered. You can set this option to 0 + (zero) if you want to suppress data dumps altogether.

+
+ +
MaxTraceFrames
+
+

By default, VLD will trace the call stack for each allocated block as far back as possible. Each frame traced + adds additional overhead (in both CPU time and memory usage) to your debug executable. If you'd like to limit + this overhead, you can define this macro to an integer value. The stack trace will stop when it has traced + this number of frames. The frame count may include some of the "internal" frames which, by default, are not + displayed in the debugger's output window (see TraceInternalFrames below). In + some cases there may be about three or four "internal" frames at the beginning of the call stack. Keep this + in mind when using this macro, or you may not see the number of frames you expect.

+
+ +
ReportEncoding
+
+

When the memory leak report is saved to a file, the report may optionally be Unicode encoded instead of using + the default ASCII encoding. This might be useful if the data contained in leaked blocks is likely to consist + of Unicode text. Set this option to "unicode" to generate a Unicode encoded report.

+
+ +
ReportFile
+
+

Use this option to specify the name and location of the file in which to save the memory leak report when + using a file as the report destination, as specified by the ReportTo option. If + no file is specified here, then VLD will save the report in a file named "memory_leak_report.txt" in the + working directory of the program.

+
+ +
ReportTo
+
+

The memory leak report may be sent to a file in addition to, or instead of, the debugger. Use this option to + specify which type of destination to use. Specify one of "debugger" (the default), "file", or "both".

+
+ +
SelfTest
+
+

VLD has the ability to check itself for memory leaks. This feature is always active. Every time you run VLD, + in addition to checking your own program for memory leaks, it is also checking itself for leaks. Setting this + option to "on" forces VLD to intentionally leak a small amount of memory: a 21-character block filled with + the text "Memory Leak Self-Test". This provides a way to test VLD's ability to check itself for memory leaks + and verify that this capability is working correctly. This option is usually only useful for debugging VLD + itself.

+
+ +
SlowDebuggerDump
+
+

If enabled, this option causes Visual Leak Detector to write the memory leak report to the debugger's output + window at a slower than normal rate. This option is specifically designed to work around a known issue with + some older versions of Visual Studio where some data sent to the output window might be lost if it is sent + too quickly. If you notice that some information seems to be missing from the memory leak report, try turning + this on.

+
+ +
StackWalkMethod
+
+

Selects the method to be used for walking the stack to obtain call stacks for allocated memory blocks. The + default "fast" method may not always be able to successfully trace completely through all call stacks. In + such cases, the "safe" method may prove to be more reliable in obtaining the full stack trace. The + disadvantage with the "safe" method is that it is significantly slower than the "fast" method and will + probably result in very noticeable performance degradation of the program being debugged. In most cases it + should be okay to leave this option set to "fast". If you experience problems getting VLD to show call + stacks, you can try setting this option to "safe".

+ +

If you do use the "safe" method, and notice a significant performance decrease, you may want to consider + using the MaxTraceFrames option to limit the number of frames traced to a + relatively small number. This can reduce the amount of time spent tracing the stack by a very large + amount.

+
+ +
StartDisabled
+
+

Set this option to "yes" to disable memory leak detection initially. This can be useful if you need to be + able to selectively enable memory leak detection from runtime, without needing to rebuild the executable; + however, this option should be used with caution. Any memory leaks that may occur before memory leak + detection is enabled at runtime will go undetected. For example, if the constructor of some global variable + allocates memory before execution reaches a subsequent call to VLDEnable, then + VLD will not be able to detect if the memory allocated by the global variable is never freed. Refer to the + following section on controlling leak detection at runtime for details on using the + runtime APIs which can be useful in conjunction with this option.

+
+ +
TraceInternalFrames
+
+

This option determines whether or not all frames of the call stack, including frames internal to the heap, + are traced. There will always be a number of frames on the call stack which are internal to Visual Leak + Detector and C/C++ or Win32 heap APIs that aren't generally useful for determining the cause of a leak. + Normally these frames are skipped during the stack trace, which somewhat reduces the time spent tracing and + amount of data collected and stored in memory. Including all frames in the stack trace, all the way down into + VLD's own code can, however, be useful for debugging VLD itself.

+
+
+ + + + +

Controlling Leak Detection at Runtime

+ +

Using the default configuration, VLD's memory leak detection will be enabled during the entire run of your program. + In certain scenarios it may be desirable to selectively disable memory leak detection in certain segments of your + code. VLD provides simple APIs for controlling the state of memory leak detection at runtime. To access these APIs, + include vld.h in the source file that needs to use them.

+ +
+
VLDDisable
+
+

This function disables memory leak detection. After calling this function, memory leak detection will remain + disabled until it is explicitly re-enabled via a call to VLDEnable.

+ + 
void VLDDisable (void);
+ +

Arguments:

+ +

This function accepts no arguments.

+ +

Return Value:

+ +

None (this function always succeeds).

+ +

Notes:

+ +

This function controls memory leak detection on a per-thread basis. In other words, calling this function + disables memory leak detection for only the thread that called the function. Memory leak detection will + remain enabled for any other threads in the same process. This insulates the programmer from having to + synchronize multiple threads that disable and enable memory leak detection. However, note also that this + means that in order to disable memory leak detection process-wide, this function must be called from every + thread in the process.

+
+ + +
VLDEnable
+
+

This function enables memory leak detection if it was previously disabled. After calling this function, + memory leak detection will remain enabled unless it is explicitly disabled again via a call to + VLDDisable().

+ + 
void VLDEnable (void);
+ +

Arguments:

+ +

This function accepts no arguments.

+ +

Return Value:

+ +

None (this function always succeeds).

+ +

Notes:

+ +

This function controls memory leak detection on a per-thread basis. See the remarks for + VLDDisable regarding multithreading and memory leak detection for details. + Those same concepts also apply to this function.

+
+
+ + + + +

Building Visual Leak Detector from Source

+ +

Because Visual Leak Detector is open source, it can be built from source if you want to tweak it to your + liking. As of Visual Studio 2008, the source can usually be built out-of-the-box without downloading or installing + any other tools. If you are using Visual Studio 2008 (or later), you can skip ahead to + Executing Your Built vld.dll. + +

Users with older versions of Visual Studio should continue reading here and follow the instructions in the next + subsection.

+ +

For Older Versions of Visual Studio

+ +

The most difficult part about building VLD from source is getting your build environment correctly set up. + But if you follow these instructions carefully, the process should be fairly painless.

+ +
    +
  1. VLD depends on the Debug Help Library. This library is part of + Debugging Tools for Windows (DTfW). + Download and install DTfW in order to install the required headers and libraries. I recommend installing version + 6.5 of DTfW, or later. Newer versions tend to work fine, but older versions will probably not work. Be sure to + manually select to install the SDK files during the DTfW installation or the headers and libraries will not be + installed (they are not always installed with a default installation).
    2. + +
  2. Visual C++ will need to be made aware of where it can find the Debug Help Library header and library files. + Add the sdk\inc and sdk\lib subdirectories from the + DTfW installation directory to the include and library search paths in Visual C++. (See the section above + on using Visual Leak Detector on instructions for adding to these search paths). +
    3. + +
  3. VLD also requires a reasonably up-to-date Platform SDK. It is known to work with the latest SDK (as of this + writing) which is the Windows Server 2003 R2 SDK. It should also work with earlier SDKs, such as the Windows XP + SP2 SDK or may even work with SDKs as old as the February 2003 SDK. If in doubt, + update + your Platform SDK to the latest version.
    4. + +
  4. Again, Visual C++ will need to know where to find the Platform SDK headers and libraries. Add the + Include and Lib subdirectories from the + Platform SDK installation directory to the Include and Library search paths, respectively. The + Platform SDK directories should be placed just after the DTfW directories.
    5. +
+ +

To summarize, your Visual C++ include search path should look something like this:

+ +
    +
  • C:\Program Files\Debugging Tools for Windows\sdk\inc
    • + +
  • C:\Program Files\Microsoft Platform SDK\Include
    • + +
  • C:\Program Files\Microsoft Visual Studio\VCx\Include
    • + +
  • ...
    • +
+ +

And your Visual C++ library search path should look like this:

+ +
    +
  • C:\Program Files\Debugging Tools for Windows\sdk\lib
    • + +
  • C:\Program Files\Microsoft Platform SDK\Lib
    • + +
  • C:\Program Files\Microsoft Visual Studio\VCx\Lib
    • + +
  • ...
    • +
+ +

In the above examples, "VCx" could be "VC", "VC7", or "VC98" (or possibly other values) depending on which version of + Visual Studio you have installed. Also, the name of your Platform SDK directory will probably be different from + the example depending on which version of the Platform SDK you have installed.

+ +

Once you have completed all of the above steps, your build environment should be ready. To build VLD, just open the + vld.sln solution file and do a full build.

+ +

Executing Your Built vld.dll

+ +

When actually running the built project, vld.dll will expect to find the Debug Help + Library as a private assembly. The private assembly must be located in the same directory as + vld.dll (either the Release or + Debug directory by default). Otherwise, when VLD is loaded, an error message will pop + up indicating that the program failed to initialize, and you will see a message similar to the following in the + debugger's output window:

+

LDR: LdrpWalkImportDescriptor() failed to probe C:\Projects\vld\Release\vld.dll for its manifest, + ntstatus 0xc0150002

+ +

To ensure that vld.dll finds the required private assembly, you need to copy + dbghelp.dll and Microsoft.DTfW.DHL.manifest to the + same directory that vld.dll is in.

+ + + + +

Windows x64 Support

+ +

Currently VLD will not build on x64 due to limitations of the x64 compiler. Some efforts have been undertaken to + get it working in a 64-bit environment, but have not yet been successful. If you need 64-bit support and run into + problems trying to build the source in 64-bit mode, please let me know. + I'll be glad to assist in getting the 64-bit code working properly, if at all possible.

+ + + + +

Frequently Asked Questions

+ +
+
When I try to compile my program with VLD, it fails and the compiler gives this error: Cannot open include file: + 'vld.h': No such file or directory.
+
+

The compiler can't find the header file that VLD installed. This probably means that VLD's include + subdirectory has not been added to the Visual C++ include search path. See the section above about + Using Visual Leak Detector for instructions on how to add VLD's directories to the search + path.

+
+
In the memory leak report, the callstack contains many lines that say + "File and line number unvailable" or "Function name unavailable".
+
+

This may mean that VLD couldn't find the symbol database for your program. The symbol database is ususally in + a file named [my-program-name].pdb. If this file is not located in the same + directory as the program itself, then VLD will probably not find it and can't show any file or function + names.

+
+
+ + + + +

Known Restrictions

+ +

Known restrictions/limitations in this version of VLD include:

+ +
    +
  • Memory allocations made through calls to functions loaded from a DLL using delayed loading may not be + detected.
    • + +
  • Support for programs that use MFC 7.0 or MFC 7.1 is not complete yet. Some memory leaks from such MFC-based + programs may not be detected. A possible workaround for this restriction is to try forcefully including the MFC + DLLs in memory leak detection, by setting the ForceIncludeModules configuration + option to: "mfc70d.dll mfc71d.dll" and explicitly adding vld.lib as an input file + on the linker command line (can be added through project settings by adding it to the list of library modules in + the linker options). This restriction does not apply to programs that use MFC 4.2, MFC 8.0, or MFC 9.0, which are + all fully supported.
    • + +
  • Visual Leak Detector may report leaks internal to Visual Leak Detector if the main thread of the process + terminates while other threads are still running.
    • + +
  • On Windows 2000 and earlier operating systems, you may need to manually add the + bin subdirectory from the Visual Leak Detector installation directory to the system + PATH environment variable. Also, dbghelp.dll will probably need to be manually copied + to the directory where the program being debugged resides. Otherwise the system may not find the required DLLs when + running VLD.
    • + +
  • If more than one copy of the same C Runtime DLL is loaded in the process at the same time, then some leaks may + go undetected (note that loading more than one copy of the C Runtime DLL at the same time is probably a bad idea + to begin with).
    • +
+ + + +

Contributing

+ +

I 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 hop onto + GitHub (accounts are free) and issue pull requests for changes that you've made and + would like to share.

+ +

Git Repository URL: git://github.com/dmoulding/vld.git

+ +

License

+ +

Visual Leak Detector is distributed under the terms of the + GNU Lesser General Public License. This license allows you to + use the VLD library with your own programs without restriction. However, if you build a program (or another library) + that is based on the VLD source code, or uses parts of the VLD source code in it, then some restrictions + will apply. What this means is that you are free to ship and use the distributed version of the VLD DLL with regular + commercial programs. But if you create a modified version of VLD, that modified version must remain "free software". + See the COPYING.txt file for details.

+ +

The Debug Help Library (dbghelp.dll) and Microsoft C Runtime Library + (msvcr80.dll) distributed with this software are not part of + Visual Leak Detector and are not covered under the terms of the GNU Lesser General Public License. They are + separately copyrighted works of Microsoft Corporation. Microsoft reserves all its rights to its copyrights in the + Debug Help Library and Microsoft C Runtime Library. Neither your use of the Visual Leak Detector software, + nor your license under the GNU Lesser General Public license grant you any rights to use the Debug Help Library or + Microsoft C Runtime Library in ANY WAY (for example, redistributing them) that would infringe upon + Microsoft Corporation's copyright in the Debug Help Library or Microsoft C Runtime Library.

+ +

NO WARRANTY

+ +

BECAUSE VISUAL LEAK DETECTOR ("THE SOFTWARE") IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE SOFTWARE, TO + THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER + PARTIES PROVIDE THE SOFTWARE "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE + QUALITY AND PERFORMANCE OF THE SOFTWARE IS WITH YOU. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL + NECESSARY SERVICING, REPAIR OR CORRECTION.

+ +

IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY + WHO MAY MODIFY AND/OR REDISTRIBUTE THE SOFTWARE AS PERMITTED BY THE LICENSING TERMS SET FORTH ABOVE, BE LIABLE TO YOU + FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY + TO USE THE SOFTWARE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED + BY YOU OR THIRD PARTIES OR A FAILURE OF THE SOFTWARE TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR + OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

+ + + + +

Contacting the Author

+ +

Please forward any bug reports, questions, comments or suggestions to me at +dmoulding@gmail.com.

+ +

Donations to help support ongoing development of Visual Leak Detector are very appreciated!

+ +
+
+ + + +
+
+ + + +

Additional Developers Wanted

+ +

This project is looking for additional developers who have the time, knowledge, and talent, to help make VLD continue + to be a useful utility for the Windows developer community. If you feel that you or someone you know would be + interested in becoming an active member of the Visual Leak Detector development team, please let me know.

+ + + +

+ Valid XHTML 1.0! + Valid CSS! +

+ + + + + +
+ + + \ No newline at end of file diff --git a/callstack.cpp b/callstack.cpp index 73962113..34b18566 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -1,442 +1,438 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - CallStack Class Implementations -// Copyright (c) 2005-2009 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#include -#include -#ifndef __out_xcount -#define __out_xcount(x) // Workaround for the specstrings.h bug in the Platform SDK. -#endif -#define DBGHELP_TRANSLATE_TCHAR -#include // Provides symbol handling services. -#define VLDBUILD -#include "callstack.h" // This class' header. -#include "utility.h" // Provides various utility functions. -#include "vldheap.h" // Provides internal new and delete operators. -#include "vldint.h" // Provides access to VLD internals. - -#define MAXSYMBOLNAMELENGTH 256 - -// Imported global variables. -extern HANDLE currentprocess; -extern HANDLE currentthread; -extern CRITICAL_SECTION stackwalklock; -extern CRITICAL_SECTION symbollock; - -// Constructor - Initializes the CallStack with an initial size of zero and one -// Chunk of capacity. -// -CallStack::CallStack () -{ - m_capacity = CALLSTACKCHUNKSIZE; - m_size = 0; - m_status = 0x0; - m_store.next = NULL; - m_topchunk = &m_store; - m_topindex = 0; -} - -// Copy Constructor - For efficiency, we want to avoid ever making copies of -// CallStacks (only pointer passing or reference passing should be performed). -// The sole purpose of this copy constructor is to ensure that no copying is -// being done inadvertently. -// -CallStack::CallStack (const CallStack &) -{ - // Don't make copies of CallStacks! - assert(FALSE); -} - -// Destructor - Frees all memory allocated to the CallStack. -// -CallStack::~CallStack () -{ - CallStack::chunk_t *chunk = m_store.next; - CallStack::chunk_t *temp; - - while (chunk) { - temp = chunk; - chunk = temp->next; - delete temp; - } -} - -// operator = - Assignment operator. For efficiency, we want to avoid ever -// making copies of CallStacks (only pointer passing or reference passing -// should be performed). The sole purpose of this assignment operator is to -// ensure that no copying is being done inadvertently. -// -CallStack& CallStack::operator = (const CallStack &) -{ - // Don't make copies of CallStacks! - assert(FALSE); - return *this; -} - -// operator == - Equality operator. Compares the CallStack to another CallStack -// for equality. Two CallStacks are equal if they are the same size and if -// every frame in each is identical to the corresponding frame in the other. -// -// other (IN) - Reference to the CallStack to compare the current CallStack -// against for equality. -// -// Return Value: -// -// Returns true if the two CallStacks are equal. Otherwise returns false. -// -BOOL CallStack::operator == (const CallStack &other) const -{ - const CallStack::chunk_t *chunk = &m_store; - UINT32 index; - const CallStack::chunk_t *otherchunk = &other.m_store; - const CallStack::chunk_t *prevchunk = NULL; - - if (m_size != other.m_size) { - // They can't be equal if the sizes are different. - return FALSE; - } - - // Walk the chunk list and within each chunk walk the frames array until we - // either find a mismatch, or until we reach the end of the call stacks. - while (prevchunk != m_topchunk) { - for (index = 0; index < ((chunk == m_topchunk) ? m_topindex : CALLSTACKCHUNKSIZE); index++) { - if (chunk->frames[index] != otherchunk->frames[index]) { - // Found a mismatch. They are not equal. - return FALSE; - } - } - prevchunk = chunk; - chunk = chunk->next; - otherchunk = otherchunk->next; - } - - // Reached the end of the call stacks. They are equal. - return TRUE; -} - -// operator [] - Random access operator. Retrieves the frame at the specified -// index. -// -// Note: We give up a bit of efficiency here, in favor of efficiency of push -// operations. This is because walking of a CallStack is done infrequently -// (only if a leak is found), whereas pushing is done very frequently (for -// each frame in the program's call stack when the program allocates some -// memory). -// -// - index (IN): Specifies the index of the frame to retrieve. -// -// Return Value: -// -// Returns the program counter for the frame at the specified index. If the -// specified index is out of range for the CallStack, the return value is -// undefined. -// -SIZE_T CallStack::operator [] (UINT32 index) const -{ - UINT32 count; - const CallStack::chunk_t *chunk = &m_store; - UINT32 chunknumber = index / CALLSTACKCHUNKSIZE; - - for (count = 0; count < chunknumber; count++) { - chunk = chunk->next; - } - - return chunk->frames[index % CALLSTACKCHUNKSIZE]; -} - -// clear - Resets the CallStack, returning it to a state where no frames have -// been pushed onto it, readying it for reuse. -// -// Note: Calling this function does not release any memory allocated to the -// CallStack. We give up a bit of memory-usage efficiency here in favor of -// performance of push operations. -// -// Return Value: -// -// None. -// -VOID CallStack::clear () -{ - m_size = 0; - m_topchunk = &m_store; - m_topindex = 0; -} - -// dump - Dumps a nicely formatted rendition of the CallStack, including -// symbolic information (function names and line numbers) if available. -// -// Note: The symbol handler must be initialized prior to calling this -// function. -// -// - showinternalframes (IN): If true, then all frames in the CallStack will be -// dumped. Otherwise, frames internal to the heap will not be dumped. -// -// Return Value: -// -// None. -// -VOID CallStack::dump (BOOL showinternalframes) const -{ - DWORD displacement; - DWORD64 displacement64; - BOOL foundline; - UINT32 frame; - SYMBOL_INFO *functioninfo; - LPWSTR functionname; - SIZE_T programcounter; - IMAGEHLP_LINE64 sourceinfo = { 0 }; - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; - - if (m_status & CALLSTACK_STATUS_INCOMPLETE) { - // This call stack appears to be incomplete. Using StackWalk64 may be - // more reliable. - report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" - L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" - L" complete stack trace.\n"); - } - - // Initialize structures passed to the symbol handler. - functioninfo = (SYMBOL_INFO*)&symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; - sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - - // Iterate through each frame in the call stack. - for (frame = 0; frame < m_size; frame++) { - // Try to get the source file and line number associated with - // this program counter address. - programcounter = (*this)[frame]; - EnterCriticalSection(&symbollock); - if ((foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo)) == TRUE) { - if (!showinternalframes) { - _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); - if (wcsstr(sourceinfo.FileName, L"afxmem.cpp") || - wcsstr(sourceinfo.FileName, L"dbgheap.c") || - wcsstr(sourceinfo.FileName, L"malloc.c") || - wcsstr(sourceinfo.FileName, L"new.cpp") || - wcsstr(sourceinfo.FileName, L"newaop.cpp")) { - // Don't show frames in files internal to the heap. - continue; - } - } - } - - // Try to get the name of the function containing this program - // counter address. - if (SymFromAddrW(currentprocess, (*this)[frame], &displacement64, functioninfo)) { - functionname = functioninfo->Name; - } - else { - functionname = L"(Function name unavailable)"; - } - LeaveCriticalSection(&symbollock); - - // Display the current stack frame's information. - if (foundline) { - report(L" %s (%d): %s\n", sourceinfo.FileName, sourceinfo.LineNumber, functionname); - } - else { - report(L" " ADDRESSFORMAT L" (File and line number not available): ", (*this)[frame]); - report(L"%s\n", functionname); - } - } -} - -// push_back - Pushes a frame's program counter onto the CallStack. Pushes are -// always appended to the back of the chunk list (aka the "top" chunk). -// -// Note: This function will allocate additional memory as necessary to make -// room for new program counter addresses. -// -// - programcounter (IN): The program counter address of the frame to be pushed -// onto the CallStack. -// -// Return Value: -// -// None. -// -VOID CallStack::push_back (const SIZE_T programcounter) -{ - CallStack::chunk_t *chunk; - - if (m_size == m_capacity) { - // At current capacity. Allocate additional storage. - chunk = new CallStack::chunk_t; - chunk->next = NULL; - m_topchunk->next = chunk; - m_topchunk = chunk; - m_topindex = 0; - m_capacity += CALLSTACKCHUNKSIZE; - } - else if (m_topindex == CALLSTACKCHUNKSIZE) { - // There is more capacity, but not in this chunk. Go to the next chunk. - // Note that this only happens if this CallStack has previously been - // cleared (clearing resets the data, but doesn't give up any allocated - // space). - m_topchunk = m_topchunk->next; - m_topindex = 0; - } - - m_topchunk->frames[m_topindex++] = programcounter; - m_size++; -} - -// getstacktrace - Traces the stack as far back as possible, or until 'maxdepth' -// frames have been traced. Populates the CallStack with one entry for each -// stack frame traced. -// -// Note: This function uses a very efficient method to walk the stack from -// frame to frame, so it is quite fast. However, unconventional stack frames -// (such as those created when frame pointer omission optimization is used) -// will not be successfully walked by this function and will cause the -// stack trace to terminate prematurely. -// -// - maxdepth (IN): Maximum number of frames to trace back. -// -// - framepointer (IN): Frame (base) pointer at which to begin the stack trace. -// If NULL, then the stack trace will begin at this function. -// -// Return Value: -// -// None. -// -VOID FastCallStack::getstacktrace (UINT32 maxdepth, SIZE_T *framepointer) -{ - UINT32 count = 0; - - if (framepointer == NULL) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - FRAMEPOINTER(framepointer); - } - - while (count < maxdepth) { - if ((SIZE_T*)*framepointer < framepointer) { - if ((SIZE_T*)*framepointer == NULL) { - // Looks like we reached the end of the stack. - break; - } - else { - // Invalid frame pointer. Frame pointer addresses should always - // increase as we move up the stack. - m_status |= CALLSTACK_STATUS_INCOMPLETE; - break; - } - } - if ((SIZE_T)*framepointer & (sizeof(SIZE_T*) - 1)) { - // Invalid frame pointer. Frame pointer addresses should always - // be aligned to the size of a pointer. This probably means that - // we've encountered a frame that was created by a module built with - // frame pointer omission (FPO) optimization turned on. - m_status |= CALLSTACK_STATUS_INCOMPLETE; - break; - } - if (IsBadReadPtr((SIZE_T*)*framepointer, sizeof(SIZE_T*))) { - // Bogus frame pointer. Again, this probably means that we've - // encountered a frame built with FPO optimization. - m_status |= CALLSTACK_STATUS_INCOMPLETE; - break; - } - count++; - push_back(*(framepointer + 1)); - framepointer = (SIZE_T*)*framepointer; - } -} - -// getstacktrace - Traces the stack as far back as possible, or until 'maxdepth' -// frames have been traced. Populates the CallStack with one entry for each -// stack frame traced. -// -// Note: This function uses a documented Windows API to walk the stack. This -// API is supposed to be the most reliable way to walk the stack. It claims -// to be able to walk stack frames that do not follow the conventional stack -// frame layout. However, this robustness comes at a cost: it is *extremely* -// slow compared to walking frames by following frame (base) pointers. -// -// - maxdepth (IN): Maximum number of frames to trace back. -// -// - framepointer (IN): Frame (base) pointer at which to begin the stack trace. -// If NULL, then the stack trace will begin at this function. -// -// Return Value: -// -// None. -// -VOID SafeCallStack::getstacktrace (UINT32 maxdepth, SIZE_T *framepointer) -{ - DWORD architecture; - CONTEXT context; - UINT32 count = 0; - STACKFRAME64 frame; - SIZE_T programcounter; - SIZE_T stackpointer; - - if (framepointer == NULL) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - FRAMEPOINTER(framepointer); - } - - // Get the required values for initialization of the STACKFRAME64 structure - // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame. -#if defined(_M_IX86) || defined(_M_X64) - architecture = X86X64ARCHITECTURE; - programcounter = *(framepointer + 1); - stackpointer = *framepointer; // An approximation. - context.BPREG = *framepointer; - context.IPREG = programcounter; - context.SPREG = stackpointer; -#else -// If you want to retarget Visual Leak Detector to another processor -// architecture then you'll need to provide architecture-specific code to -// obtain the program counter and stack pointer from the given frame pointer. -#error "Visual Leak Detector is not supported on this architecture." -#endif // _M_IX86 || _M_X64 - - // Initialize the STACKFRAME64 structure. - memset(&frame, 0x0, sizeof(frame)); - frame.AddrFrame.Offset = *framepointer; - frame.AddrFrame.Mode = AddrModeFlat; - frame.AddrPC.Offset = programcounter; - frame.AddrPC.Mode = AddrModeFlat; - frame.AddrStack.Offset = stackpointer; - frame.AddrStack.Mode = AddrModeFlat; - - // Walk the stack. - EnterCriticalSection(&stackwalklock); - while (count < maxdepth) { - count++; - if (!StackWalk64(architecture, currentprocess, currentthread, &frame, &context, NULL, - SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { - // Couldn't trace back through any more frames. - break; - } - if (frame.AddrFrame.Offset == 0) { - // End of stack. - break; - } - - // Push this frame's program counter onto the CallStack. - push_back((SIZE_T)frame.AddrPC.Offset); - } - LeaveCriticalSection(&stackwalklock); -} +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - CallStack Class Implementations +// Copyright (c) 2005-2009 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#include "stdafx.h" +#define VLDBUILD +#include "callstack.h" // This class' header. +#include "utility.h" // Provides various utility functions. +#include "vldheap.h" // Provides internal new and delete operators. +#include "vldint.h" // Provides access to VLD internals. + +#define MAXSYMBOLNAMELENGTH 256 + +// Imported global variables. +extern HANDLE currentprocess; +extern HANDLE currentthread; +extern CRITICAL_SECTION stackwalklock; +extern CRITICAL_SECTION symbollock; + +// Constructor - Initializes the CallStack with an initial size of zero and one +// Chunk of capacity. +// +CallStack::CallStack () +{ + m_capacity = CALLSTACKCHUNKSIZE; + m_size = 0; + m_status = 0x0; + m_store.next = NULL; + m_topchunk = &m_store; + m_topindex = 0; +} + +// Copy Constructor - For efficiency, we want to avoid ever making copies of +// CallStacks (only pointer passing or reference passing should be performed). +// The sole purpose of this copy constructor is to ensure that no copying is +// being done inadvertently. +// +CallStack::CallStack (const CallStack &) +{ + // Don't make copies of CallStacks! + assert(FALSE); +} + +// Destructor - Frees all memory allocated to the CallStack. +// +CallStack::~CallStack () +{ + CallStack::chunk_t *chunk = m_store.next; + CallStack::chunk_t *temp; + + while (chunk) { + temp = chunk; + chunk = temp->next; + delete temp; + } +} + +// operator = - Assignment operator. For efficiency, we want to avoid ever +// making copies of CallStacks (only pointer passing or reference passing +// should be performed). The sole purpose of this assignment operator is to +// ensure that no copying is being done inadvertently. +// +CallStack& CallStack::operator = (const CallStack &) +{ + // Don't make copies of CallStacks! + assert(FALSE); + return *this; +} + +// operator == - Equality operator. Compares the CallStack to another CallStack +// for equality. Two CallStacks are equal if they are the same size and if +// every frame in each is identical to the corresponding frame in the other. +// +// other (IN) - Reference to the CallStack to compare the current CallStack +// against for equality. +// +// Return Value: +// +// Returns true if the two CallStacks are equal. Otherwise returns false. +// +BOOL CallStack::operator == (const CallStack &other) const +{ + const CallStack::chunk_t *chunk = &m_store; + UINT32 index; + const CallStack::chunk_t *otherchunk = &other.m_store; + const CallStack::chunk_t *prevchunk = NULL; + + if (m_size != other.m_size) { + // They can't be equal if the sizes are different. + return FALSE; + } + + // Walk the chunk list and within each chunk walk the frames array until we + // either find a mismatch, or until we reach the end of the call stacks. + while (prevchunk != m_topchunk) { + for (index = 0; index < ((chunk == m_topchunk) ? m_topindex : CALLSTACKCHUNKSIZE); index++) { + if (chunk->frames[index] != otherchunk->frames[index]) { + // Found a mismatch. They are not equal. + return FALSE; + } + } + prevchunk = chunk; + chunk = chunk->next; + otherchunk = otherchunk->next; + } + + // Reached the end of the call stacks. They are equal. + return TRUE; +} + +// operator [] - Random access operator. Retrieves the frame at the specified +// index. +// +// Note: We give up a bit of efficiency here, in favor of efficiency of push +// operations. This is because walking of a CallStack is done infrequently +// (only if a leak is found), whereas pushing is done very frequently (for +// each frame in the program's call stack when the program allocates some +// memory). +// +// - index (IN): Specifies the index of the frame to retrieve. +// +// Return Value: +// +// Returns the program counter for the frame at the specified index. If the +// specified index is out of range for the CallStack, the return value is +// undefined. +// +SIZE_T CallStack::operator [] (UINT32 index) const +{ + UINT32 count; + const CallStack::chunk_t *chunk = &m_store; + UINT32 chunknumber = index / CALLSTACKCHUNKSIZE; + + for (count = 0; count < chunknumber; count++) { + chunk = chunk->next; + } + + return chunk->frames[index % CALLSTACKCHUNKSIZE]; +} + +// clear - Resets the CallStack, returning it to a state where no frames have +// been pushed onto it, readying it for reuse. +// +// Note: Calling this function does not release any memory allocated to the +// CallStack. We give up a bit of memory-usage efficiency here in favor of +// performance of push operations. +// +// Return Value: +// +// None. +// +VOID CallStack::clear () +{ + m_size = 0; + m_topchunk = &m_store; + m_topindex = 0; +} + +// dump - Dumps a nicely formatted rendition of the CallStack, including +// symbolic information (function names and line numbers) if available. +// +// Note: The symbol handler must be initialized prior to calling this +// function. +// +// - showinternalframes (IN): If true, then all frames in the CallStack will be +// dumped. Otherwise, frames internal to the heap will not be dumped. +// +// Return Value: +// +// None. +// +VOID CallStack::dump (BOOL showinternalframes) const +{ + DWORD displacement; + DWORD64 displacement64; + BOOL foundline; + UINT32 frame; + SYMBOL_INFO *functioninfo; + LPWSTR functionname; + SIZE_T programcounter; + IMAGEHLP_LINE64 sourceinfo = { 0 }; + BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; + + if (m_status & CALLSTACK_STATUS_INCOMPLETE) { + // This call stack appears to be incomplete. Using StackWalk64 may be + // more reliable. + report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" + L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" + L" complete stack trace.\n"); + } + + // Initialize structures passed to the symbol handler. + functioninfo = (SYMBOL_INFO*)&symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + + // Iterate through each frame in the call stack. + for (frame = 0; frame < m_size; frame++) { + // Try to get the source file and line number associated with + // this program counter address. + programcounter = (*this)[frame]; + EnterCriticalSection(&symbollock); + if ((foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo)) == TRUE) { + if (!showinternalframes) { + _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); + if (wcsstr(sourceinfo.FileName, L"afxmem.cpp") || + wcsstr(sourceinfo.FileName, L"dbgheap.c") || + wcsstr(sourceinfo.FileName, L"malloc.c") || + wcsstr(sourceinfo.FileName, L"new.cpp") || + wcsstr(sourceinfo.FileName, L"newaop.cpp")) { + // Don't show frames in files internal to the heap. + continue; + } + } + } + + // Try to get the name of the function containing this program + // counter address. + if (SymFromAddrW(currentprocess, (*this)[frame], &displacement64, functioninfo)) { + functionname = functioninfo->Name; + } + else { + functionname = L"(Function name unavailable)"; + } + LeaveCriticalSection(&symbollock); + + // Display the current stack frame's information. + if (foundline) { + report(L" %s (%d): %s\n", sourceinfo.FileName, sourceinfo.LineNumber, functionname); + } + else { + report(L" " ADDRESSFORMAT L" (File and line number not available): ", (*this)[frame]); + report(L"%s\n", functionname); + } + } +} + +// push_back - Pushes a frame's program counter onto the CallStack. Pushes are +// always appended to the back of the chunk list (aka the "top" chunk). +// +// Note: This function will allocate additional memory as necessary to make +// room for new program counter addresses. +// +// - programcounter (IN): The program counter address of the frame to be pushed +// onto the CallStack. +// +// Return Value: +// +// None. +// +VOID CallStack::push_back (const SIZE_T programcounter) +{ + CallStack::chunk_t *chunk; + + if (m_size == m_capacity) { + // At current capacity. Allocate additional storage. + chunk = new CallStack::chunk_t; + chunk->next = NULL; + m_topchunk->next = chunk; + m_topchunk = chunk; + m_topindex = 0; + m_capacity += CALLSTACKCHUNKSIZE; + } + else if (m_topindex == CALLSTACKCHUNKSIZE) { + // There is more capacity, but not in this chunk. Go to the next chunk. + // Note that this only happens if this CallStack has previously been + // cleared (clearing resets the data, but doesn't give up any allocated + // space). + m_topchunk = m_topchunk->next; + m_topindex = 0; + } + + m_topchunk->frames[m_topindex++] = programcounter; + m_size++; +} + +// getstacktrace - Traces the stack as far back as possible, or until 'maxdepth' +// frames have been traced. Populates the CallStack with one entry for each +// stack frame traced. +// +// Note: This function uses a very efficient method to walk the stack from +// frame to frame, so it is quite fast. However, unconventional stack frames +// (such as those created when frame pointer omission optimization is used) +// will not be successfully walked by this function and will cause the +// stack trace to terminate prematurely. +// +// - maxdepth (IN): Maximum number of frames to trace back. +// +// - framepointer (IN): Frame (base) pointer at which to begin the stack trace. +// If NULL, then the stack trace will begin at this function. +// +// Return Value: +// +// None. +// +VOID FastCallStack::getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer) +{ + UINT32 count = 0; + + if (framepointer == NULL) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + ADDRESS_OF_RETURN_ADDRESS(framepointer); + framepointer--; + } + + while (count < maxdepth) { + if (*framepointer < (UINT)framepointer) { + if (*framepointer == NULL) { + // Looks like we reached the end of the stack. + break; + } + else { + // Invalid frame pointer. Frame pointer addresses should always + // increase as we move up the stack. + m_status |= CALLSTACK_STATUS_INCOMPLETE; + break; + } + } + if (*framepointer & (sizeof(UINT_PTR*) - 1)) { + // Invalid frame pointer. Frame pointer addresses should always + // be aligned to the size of a pointer. This probably means that + // we've encountered a frame that was created by a module built with + // frame pointer omission (FPO) optimization turned on. + m_status |= CALLSTACK_STATUS_INCOMPLETE; + break; + } + if (IsBadReadPtr((UINT*)*framepointer, sizeof(UINT_PTR*))) { + // Bogus frame pointer. Again, this probably means that we've + // encountered a frame built with FPO optimization. + m_status |= CALLSTACK_STATUS_INCOMPLETE; + break; + } + count++; + push_back(*(framepointer + 1)); + framepointer = (UINT_PTR*)*framepointer; + } +} + +// getstacktrace - Traces the stack as far back as possible, or until 'maxdepth' +// frames have been traced. Populates the CallStack with one entry for each +// stack frame traced. +// +// Note: This function uses a documented Windows API to walk the stack. This +// API is supposed to be the most reliable way to walk the stack. It claims +// to be able to walk stack frames that do not follow the conventional stack +// frame layout. However, this robustness comes at a cost: it is *extremely* +// slow compared to walking frames by following frame (base) pointers. +// +// - maxdepth (IN): Maximum number of frames to trace back. +// +// - framepointer (IN): Frame (base) pointer at which to begin the stack trace. +// If NULL, then the stack trace will begin at this function. +// +// Return Value: +// +// None. +// +VOID SafeCallStack::getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer) +{ + DWORD architecture; + CONTEXT context; + UINT32 count = 0; + STACKFRAME64 frame; + SIZE_T programcounter; + SIZE_T stackpointer; + + if (framepointer == NULL) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + ADDRESS_OF_RETURN_ADDRESS(framepointer); + framepointer--; + } + + // Get the required values for initialization of the STACKFRAME64 structure + // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame. +#if defined(_M_IX86) || defined(_M_X64) + architecture = X86X64ARCHITECTURE; + programcounter = *(framepointer + 1); + stackpointer = *framepointer; // An approximation. + context.BPREG = *framepointer; + context.IPREG = programcounter; + context.SPREG = stackpointer; +#else +// If you want to retarget Visual Leak Detector to another processor +// architecture then you'll need to provide architecture-specific code to +// obtain the program counter and stack pointer from the given frame pointer. +#error "Visual Leak Detector is not supported on this architecture." +#endif // _M_IX86 || _M_X64 + + // Initialize the STACKFRAME64 structure. + memset(&frame, 0x0, sizeof(frame)); + frame.AddrFrame.Offset = *framepointer; + frame.AddrFrame.Mode = AddrModeFlat; + frame.AddrPC.Offset = programcounter; + frame.AddrPC.Mode = AddrModeFlat; + frame.AddrStack.Offset = stackpointer; + frame.AddrStack.Mode = AddrModeFlat; + + // Walk the stack. + EnterCriticalSection(&stackwalklock); + while (count < maxdepth) { + count++; + if (!StackWalk64(architecture, currentprocess, currentthread, &frame, &context, NULL, + SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { + // Couldn't trace back through any more frames. + break; + } + if (frame.AddrFrame.Offset == 0) { + // End of stack. + break; + } + + // Push this frame's program counter onto the CallStack. + push_back((SIZE_T)frame.AddrPC.Offset); + } + LeaveCriticalSection(&stackwalklock); +} diff --git a/callstack.h b/callstack.h index 68aa6094..d35191e1 100644 --- a/callstack.h +++ b/callstack.h @@ -1,116 +1,116 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - CallStack Class Definitions -// Copyright (c) 2005-2006 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifndef VLDBUILD -#error \ -"This header should only be included by Visual Leak Detector when building it from source. \ -Applications should never include this header." -#endif - -#include - -#define CALLSTACKCHUNKSIZE 32 // Number of frame slots in each CallStack chunk. - -//////////////////////////////////////////////////////////////////////////////// -// -// The CallStack Class -// -// CallStack objects can be used for obtaining, storing, and displaying the -// call stack at a given point during program execution. -// -// The primary data structure used by the CallStack is similar in concept to -// a STL vector, but is specifically tailored for use by VLD, making it more -// efficient than a standard STL vector. -// -// Inside the CallStack are a number of "chunks" which are arranged in a -// linked list. Each chunk contains an array of frames (each frame is -// represented by a program counter address). If we run out of space when -// pushing new frames onto an existing chunk in the CallStack chunk list, -// then a new chunk is allocated and appended to the end of the list. In this -// way, the CallStack can grow dynamically as needed. New frames are always -// pushed onto the chunk at the end of the list known as the "top" chunk. -// -class CallStack -{ -public: - CallStack (); - CallStack (const CallStack &other); - ~CallStack (); - - // Public APIs - see each function definition for details. - VOID clear (); - VOID dump (BOOL showinternalframes) const; - virtual VOID getstacktrace (UINT32 maxdepth, SIZE_T *framepointer) = 0; - CallStack& operator = (const CallStack &other); - BOOL operator == (const CallStack &other) const; - SIZE_T operator [] (UINT32 index) const; - VOID push_back (const SIZE_T programcounter); - -protected: - // Protected data. - UINT32 m_status; // Status flags: -#define CALLSTACK_STATUS_INCOMPLETE 0x1 // If set, the stack trace stored in this CallStack appears to be incomplete. - -private: - // The chunk list is made of a linked list of Chunks. - typedef struct chunk_s { - struct chunk_s *next; // Pointer to the next chunk in the chunk list. - SIZE_T frames [CALLSTACKCHUNKSIZE]; // Pushed frames (program counter addresses) are stored in this array. - } chunk_t; - - // Private data. - UINT32 m_capacity; // Current capacity limit (in frames) - UINT32 m_size; // Current size (in frames) - CallStack::chunk_t m_store; // Pointer to the underlying data store (i.e. head of the chunk list) - CallStack::chunk_t *m_topchunk; // Pointer to the chunk at the top of the stack - UINT32 m_topindex; // Index, within the top chunk, of the top of the stack -}; - - -//////////////////////////////////////////////////////////////////////////////// -// -// The FastCallStack Class -// -// This class is a specialization of the CallStack class which provides a -// very fast stack tracing function. -// -class FastCallStack : public CallStack -{ -public: - VOID getstacktrace (UINT32 maxdepth, SIZE_T *framepointer); -}; - -//////////////////////////////////////////////////////////////////////////////// -// -// The SafeCallStack Class -// -// This class is a specialization of the CallStack class which provides a -// more robust, but quite slow, stack tracing function. -// -class SafeCallStack : public CallStack -{ -public: - VOID getstacktrace (UINT32 maxdepth, SIZE_T *framepointer); -}; +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - CallStack Class Definitions +// Copyright (c) 2005-2006 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifndef VLDBUILD +#error \ +"This header should only be included by Visual Leak Detector when building it from source. \ +Applications should never include this header." +#endif + +#include + +#define CALLSTACKCHUNKSIZE 32 // Number of frame slots in each CallStack chunk. + +//////////////////////////////////////////////////////////////////////////////// +// +// The CallStack Class +// +// CallStack objects can be used for obtaining, storing, and displaying the +// call stack at a given point during program execution. +// +// The primary data structure used by the CallStack is similar in concept to +// a STL vector, but is specifically tailored for use by VLD, making it more +// efficient than a standard STL vector. +// +// Inside the CallStack are a number of "chunks" which are arranged in a +// linked list. Each chunk contains an array of frames (each frame is +// represented by a program counter address). If we run out of space when +// pushing new frames onto an existing chunk in the CallStack chunk list, +// then a new chunk is allocated and appended to the end of the list. In this +// way, the CallStack can grow dynamically as needed. New frames are always +// pushed onto the chunk at the end of the list known as the "top" chunk. +// +class CallStack +{ +public: + CallStack (); + CallStack (const CallStack &other); + ~CallStack (); + + // Public APIs - see each function definition for details. + VOID clear (); + VOID dump (BOOL showinternalframes) const; + virtual VOID getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer) = 0; + CallStack& operator = (const CallStack &other); + BOOL operator == (const CallStack &other) const; + SIZE_T operator [] (UINT32 index) const; + VOID push_back (const SIZE_T programcounter); + +protected: + // Protected data. + UINT32 m_status; // Status flags: +#define CALLSTACK_STATUS_INCOMPLETE 0x1 // If set, the stack trace stored in this CallStack appears to be incomplete. + +private: + // The chunk list is made of a linked list of Chunks. + typedef struct chunk_s { + struct chunk_s *next; // Pointer to the next chunk in the chunk list. + SIZE_T frames [CALLSTACKCHUNKSIZE]; // Pushed frames (program counter addresses) are stored in this array. + } chunk_t; + + // Private data. + UINT32 m_capacity; // Current capacity limit (in frames) + UINT32 m_size; // Current size (in frames) + CallStack::chunk_t m_store; // Pointer to the underlying data store (i.e. head of the chunk list) + CallStack::chunk_t *m_topchunk; // Pointer to the chunk at the top of the stack + UINT32 m_topindex; // Index, within the top chunk, of the top of the stack +}; + + +//////////////////////////////////////////////////////////////////////////////// +// +// The FastCallStack Class +// +// This class is a specialization of the CallStack class which provides a +// very fast stack tracing function. +// +class FastCallStack : public CallStack +{ +public: + VOID getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer); +}; + +//////////////////////////////////////////////////////////////////////////////// +// +// The SafeCallStack Class +// +// This class is a specialization of the CallStack class which provides a +// more robust, but quite slow, stack tracing function. +// +class SafeCallStack : public CallStack +{ +public: + VOID getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer); +}; diff --git a/codeproject-article.html b/codeproject-article.html index 21e4343c..e914e705 100644 --- a/codeproject-article.html +++ b/codeproject-article.html @@ -1,334 +1,334 @@ - - - -

Please choose 'View Source' in your browser to view the HTML, or -File | Save to save this file to your hard drive for editing.

-
- - - - - - -

Screenshot of Visual Studio 6.0 with Visual Leak Detector's memory leak report displayed.

-

Table of Contents

- -

Introduction

-

Visual C++ provides built-in memory leak detection, but its capabilities are minimal at best. This memory leak detector was created as a free alternative to the built-in memory leak detector provided with Visual C++. Here are some of Visual Leak Detector's features, none of which exist in the built-in detector:

-
    -
  • Provides a complete stack trace for each leaked block, including source file and line number information when available. -
  • Provides complete data dumps (in hex and ASCII) of leaked blocks. -
  • Customizable level of detail in the memory leak report.
-

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. Here are some key advantages that Visual Leak Detector has over many other free alternatives:

-
    -
  • Visual Leak Detector is cleanly packaged as an easy-to-use library. You don't need to compile its source code to use it. And you only need to make minor additions to your own source code to integrate it with your program. -
  • In addition to providing stack traces with source files, line numbers, and function names, Visual Leak Detector also provides data dumps. -
  • It works with both C++ and C programs (compatible with both new/delete and malloc/free). -
  • The full source code to the library is included and it is well documented, so it is easy to customize it to suit your needs.
-

Visual Leak Detector is licensed free of charge as a service to the Windows developer community.

-

What's New?

-

14 November 2006: A new beta version of has been posted. This version fixes a few bugs, most notably a deadlock bug and a couple of failed assertion bugs, that were identified in the 1.9c beta.

-

Note that the beta version does not have the same limitations of the 1.0 version. Whereas 1.0 can only detect leaks resulting from new or malloc, the beta can detect many different classes of leaks.

-

Please also note that the article below describes the inner workings of the 1.0 version. Because the beta version might change significantly before the next official release, the article will not be updated to reflect the design of the beta version until the official release is complete.

-

Using Visual Leak Detector

-

This section briefly describes the basics of using Visual Leak Detector (VLD). For a more in-depth discussion of the configuration options, runtime APIs, and a discussion of the more advanced usage scenarios (such as using VLD with DLLs), please see the full documentation included in the downloadable Zip files.

-

To use VLD with your project, follow these simple steps:

-
    -
  1. Copy the VLD library (*.lib) files to your Visual C++ installation's "lib" subdirectory. -
  2. Copy the VLD header files (vld.h and vldapi.h) to your Visual C++ installation's "include" subdirectory. -
  3. In the source file containing your program's main entry point, include the vld.h header file. It's best, but not absolutely required, to include this header before any other header files, except for stdafx.h. If the source file, include stdafx.h, then vld.h should be included after it. -
  4. If you are running Windows 2000 or earlier, then you will need to copy dbghelp.dll to the directory where the executable being debugged resides. -
  5. Build the debug version of your project.
-

VLD will detect memory leaks in your program whenever you run the debug version under the Visual C++ debugger. A report of all the memory leaks detected will be displayed in the debugger's output window when your program exits. Double-clicking on a source file's line number in the memory leak report will take you to that file and line in the editor window, allowing easy navigation of the code path leading up to the allocation that resulted in a memory leak.

-

Note: When you build release versions of your program, VLD will not be linked into the executable. So it is safe to leave vld.h included in your source files when doing release builds. Doing so will not result in any performance degradation or any other undesirable overhead.

-

Making a Memory Leak Detector

-

The goal of Visual Leak Detector was to build a better replacement for the memory leak detector built-in to Visual C++. With that in mind, I set out to use the same method used by the built-in detector, namely the CRT Debug Heap. But this new detector would provide enhancements -- primarily full stack traces, which can be extremely helpful for finding and fixing leaks.

-

The Built-In Detector

-

The built-in detector is pretty simple really. When a program is exiting, the CRT runs a bunch of cleanup code after main returns. If the built-in detector is enabled, then it runs a memory leak check as part of the cleanup procedure. The memory leak check simply looks at the debug heap: if there are any user blocks still allocated on the debug heap, then they must be memory leaks. The debug version of malloc stores the file and line number that allocated each block in the block's header at the time it is allocated. When the built-in detector identifies a memory leak, it simply peers inside the block header to get the file and line number. It then reports that information to the debugger where it is displayed.

-

Note that the built-in detector detects leaks without doing any monitoring of allocations or frees. It simply takes a snapshot of the heap just before the process terminates and determines if there are any leaks based on that snapshot. A snapshot of the heap only tells us if there are leaks; it does not tell us how they were leaked. Clearly, to determine the "how" we also need to obtain a stack trace. But to obtain a stack trace, we need to be able to monitor every allocation on-the-fly at runtime. This is what will distinguish our leak detector from the built-in one.

-

Allocation Hooking

-

Luckily for us, Microsoft has provided an easy way to monitor every allocation made from the debug heap: allocation hooks. An allocation hook is simply a user-supplied callback function that will be called just before each allocation is made from the debug heap. Microsoft has provided a function, _CrtSetAllocHook, which registers the allocation hook function with the debug heap. When the debug heap calls the allocation hook, one of the arguments passed is an ID number that uniquely identifies each allocation -- it's basically a serial number for each memory block allocated. There's not enough room in the memory block header for us to record any information directly in it, but we can use this unique ID number as a key to map each block to any data that we want to record.

-

Walking the Stack

-

Now that we have a way to be notified every time a block is allocated, as well as a way to uniquely identify each allocation, all that's left to do is to record the call stack each time an allocation occurs. We could conceivably attempt to unwind the stack ourselves using inline assembly. But stack frames can be organized in different ways, depending on compiler optimizations and calling conventions, so it could become complicated to do it that way. Once again, Microsoft has provided us with a tool to help us out. This time it is a function that we can call iteratively to walk the stack, frame by frame. That function is StackWalk64. It is part of the Debug Help Library (dbghelp.dll). As long as we provide it with the information that it needs to establish a starting "frame of reference", so to speak, it can examine our stack from there and reliably unwind it for us. Each time StackWalk64 is called, it gives back a STACKFRAME64 structure that can be reused as input for the next call to StackWalk64. It can be repeatedly called this way until the end of the stack is reached.

-

Initializing the Memory Leak Detector

-

We now have the beginnings of a better memory leak detector. We can monitor every allocation, and for each allocation monitored, we can obtain and record a stack trace. The only challenge that remains is to ensure that the allocation hook function is registered with the debug heap as soon as the program starts executing. This can be very simply solved by creating a global instance of a C++ class object. The constructor will run when the program is initialized. From the constructor, we can call _CrtSetAllocHook to register our allocation hook function. But wait, what if the program we are debugging already has other global C++ class objects that allocate memory? How can we ensure that our constructor will be called first, and that our allocation hook function will be installed before any other global objects are constructed? Unfortunately, the C++ specification does not spell out any rules for deciding in which order to construct global objects. So there are no absolute guarantees that our constructor will be called first. But we can come very close to guaranteeing it. We can leverage a compiler-specific preprocessor directive that explicitly tells the compiler to ensure that our global variable is constructed as soon as possible: #pragma init_seg (compiler). This directive tells the compiler to place our global object in the "compiler" initialization segment. Objects in this segment are the first to be constructed. Next, objects in the "library" segment are constructed, and objects in the "user" segment are constructed last. The "user" segment is the default segment for global objects. Generally speaking, no normal user objects should ever be placed in the "compiler" segment, so this provides a reasonable amount of certainty that our global object will be constructed before any user objects.

-

Detecting Memory Leaks

-

Because global objects are destroyed in the inverse order they are constructed, our global object will be destroyed after any user objects. We can then examine the heap, just like the built-in detector does. If we find a block on the heap that has not been freed, it is a leak and we can look up its call stack using the unique ID number recorded by our allocation hook function. An STL map would work fine here for mapping the ID number to the call stacks. I didn't use an STL map because I wanted my library to be compatible with both new and old versions of Visual C++. The STL from older versions is incompatible with the newer versions, so I couldn't use STL components. But the good news is that this gave me the opportunity to create a data structure similar in concept to the STL map, but with specific optimizations for use with my memory leak detector.

-

Do you remember that the built-in leak detector peers inside the memory block to get the name of the file and the line number where the block was allocated? Well, all we have for our call stack is a bunch of program addresses. Dumping all those hex numbers to the debugger wouldn't be of much use. To make those addresses more meaningful, we need to translate them to human readable information: files and line numbers (and function names too). Once again, Microsoft comes through with the tools that will help us do our job: the symbol handler APIs. Like StackWalk64, they also happen to be part of the Debug Help Library. I won't dwell on them in detail here, because there are a lot of them and they're pretty simple to use. They don't require as much ingenuity to use as StackWalk64 does. We can use two of the symbol handler APIs to get the filenames, line numbers, and function names that we want. The aptly named SymGetLineFromAddr64 translates addresses into source filenames and line numbers. Its sister API, SymFromAddr translates addresses into symbol names. For program addresses, which are what we have, the corresponding symbol name will be the name of the function containing that program address.

-

Key Parts of the Source Code

-

In case you got bored with the above section and skipped ahead, I'll summarize it here. In a nutshell, this memory leak detector works like this:

-
    -
  1. A global object is automatically constructed. It is the first object constructed. The constructor registers our allocation hook function. -
  2. Every allocation eventually calls our allocation hook function. The allocation hook function obtains and records the call stack for each allocation. The call stack information is recorded in a specialized STL-like map. -
  3. When the program terminates, the global object is the last object destroyed. It examines the heap and identifies leaks. Leaked blocks are looked up in the map and matched with their corresponding call stack. The resulting data is sent to the debugger to be displayed.
-

Step 1: Registering the Allocation Hook

-

Here is the VisualLeakDetector class constructor. Note the call to _CrtSetAllocHook. This is where our callback function, allochook, is registered with the debug heap. The call to linkdebughelplibrary performs an explicit dynamic link with the Debug Help Library (dbghelp.dll). Because VLD is itself a library, implicitly linking with the Debug Help Library through the import library dbghelp.lib is undesirable; it would make the VLD library dependent on dbghelp.lib at link-time. dbghelp.lib will not be present on many Windows computers and it's not redistributable, so we need to link with the DLL at runtime in order to bypass the import library. There is a lot of other stuff going on in here as well, but most of it has to do with custom configuration options that VLD supports.

// Constructor - Dynamically links with the Debug Help Library and installs the
-//   allocation hook function so that the C runtime's debug heap manager will
-//   call the hook function for every heap request.
-//
-VisualLeakDetector::VisualLeakDetector ()
-{
-    // Initialize private data.
-    m_mallocmap    = new BlockMap;
-    m_process      = GetCurrentProcess();
-    m_selftestfile = __FILE__;
-    m_status       = 0x0;
-    m_thread       = GetCurrentThread();
-    m_tlsindex     = TlsAlloc();
-
-    if (_VLD_configflags & VLD_CONFIG_SELF_TEST) {
-        // Self-test mode has been enabled.
-        // Intentionally leak a small amount of
-        // memory so that memory leak self-checking can be verified.
-        strncpy(new char [21], "Memory Leak Self-Test", 21);
-        m_selftestline = __LINE__;
-    }
-
-    if (m_tlsindex == TLS_OUT_OF_INDEXES) {
-        report("ERROR: Visual Leak Detector:" 
-               " Couldn't allocate thread local storage.\n");
-    }
-    else if (linkdebughelplibrary()) {
-        // Register our allocation hook function with the debug heap.
-        m_poldhook = _CrtSetAllocHook(allochook);
-        report("Visual Leak Detector " 
-               "Version "VLD_VERSION" installed ("VLD_LIBTYPE").\n");
-        reportconfig();
-        if (_VLD_configflags & VLD_CONFIG_START_DISABLED) {
-            // Memory leak detection will initially be disabled.
-            m_status |= VLD_STATUS_NEVER_ENABLED;
-        }
-
-        m_status |= VLD_STATUS_INSTALLED;
-        return;
-    }
-    
-    report("Visual Leak Detector is NOT installed!\n");
-}
-

Step 2: Walking the Stack

-

Here is the function responsible for obtaining call stacks. This is perhaps the trickiest part of the entire program. Setting up for the first call to StackWalk64 is where the tricky bit is. To start the stack trace, StackWalk64 needs to know exactly where on the stack to begin walking. It never assumes that we want to start tracing from the current stack frame. This requires that we provide it with the address of the current frame, as well as the current program address. I've seen other examples that attempt to get this information by calling GetThreadContext to retrieve the current thread's context, which would contain both of the required addresses. But, as its documentation clearly states, GetThreadContext can't be relied upon to get valid information for a running thread. By definition, this means that GetThreadContext can't get a valid context for the current thread. A better approach is to get the required addresses directly, and the only way to do that is with inline assembly.

-

Obtaining the address of the current frame is easy: it's stored in a CPU register (EBP) that we can directly read it from. The program address is a little harder to obtain. Though there is a CPU register (EIP) that always contains the current program address, on Intel x86 CPUs, it can't be read by software. But we can get the same address in a round-about way, by calling another function and from within that function obtaining the return address. The return address is the same as the program address that called the function. For this, I've created a separate function, getprogramcounterx86x64. Since we're already doing inline assembly, we could write a simple function call in assembly, instead of writing another C++ function, but to keep it easier to understand, I've used C++ wherever it's possible to do so.

-

In the following code, pStackWalk64, pSymFunctionTableAccess64 and pSymGetModuleBase64 are all pointers to the functions exported by dbghelp.dll.

// getstacktrace - Traces the stack, starting from this function, as far
-//   back as possible.
-//
-//  - callstack (OUT): Pointer to an empty CallStack to be populated with
-//    entries from the stack trace.
-//
-//  Return Value:
-//
-//    None.
-//
-void VisualLeakDetector::getstacktrace (CallStack *callstack)
-{
-    DWORD        architecture;
-    CONTEXT      context;
-    unsigned int count = 0;
-    STACKFRAME64 frame;
-    DWORD_PTR    framepointer;
-    DWORD_PTR    programcounter;
-
-    // Get the required values for initialization of the STACKFRAME64 structure
-    // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame.
-#if defined(_M_IX86) || defined(_M_X64)
-    architecture = X86X64ARCHITECTURE;
-    programcounter = getprogramcounterx86x64();
-    __asm mov [framepointer], BPREG // Get the frame pointer (aka base pointer)
-#else
-// If you want to retarget Visual Leak Detector to another processor
-// architecture then you'll need to provide architecture-specific code to
-// retrieve the current frame pointer and program counter in order to initialize
-// the STACKFRAME64 structure below.
-#error "Visual Leak Detector is not supported on this architecture."
-#endif // defined(_M_IX86) || defined(_M_X64)
-
-    // Initialize the STACKFRAME64 structure.
-    memset(&frame, 0x0, sizeof(frame));
-    frame.AddrPC.Offset    = programcounter;
-    frame.AddrPC.Mode      = AddrModeFlat;
-    frame.AddrFrame.Offset = framepointer;
-    frame.AddrFrame.Mode   = AddrModeFlat;
-
-    // Walk the stack.
-    while (count < _VLD_maxtraceframes) {
-        count++;
-        if (!pStackWalk64(architecture, m_process, m_thread, 
-             &frame, &context, NULL, pSymFunctionTableAccess64, 
-             pSymGetModuleBase64, NULL)) {
-            // Couldn't trace back through any more frames.
-            break;
-        }
-        if (frame.AddrFrame.Offset == 0) {
-            // End of stack.
-            break;
-        }
-
-        // Push this frame's program counter onto the provided CallStack.
-        callstack->push_back((DWORD_PTR)frame.AddrPC.Offset);
-    }
-}
-

And here is the function that retrieves the EIP register. Again, this has to be done as a separate function call because there is no way for the software to directly read the EIP register. But the same value can be obtained by making a function call, and then from within the called function getting the return address. The return address is the program address that made the function call, and it is pushed onto the stack when the function call is made. We get it by copying it from the stack.

// getprogramcounterx86x64 - Helper function that retrieves the program counter
-//   for getstacktrace() on Intel x86 or x64 architectures.
-//
-//  Note: Inlining of this function must be disabled. The whole purpose of this
-//    function's existence depends upon it being a *called* function.
-//
-//  Return Value:
-//
-//    Returns the caller's program address.
-//
-#if defined(_M_IX86) || defined(_M_X64)
-#pragma auto_inline(off)
-DWORD_PTR VisualLeakDetector::getprogramcounterx86x64 ()
-{
-    DWORD_PTR programcounter;
-
-    // Get the return address out of the current stack frame
-    __asm mov AXREG, [BPREG + SIZEOFPTR]
-    // Put the return address into the variable we'll return
-    __asm mov [programcounter], AXREG
-
-    return programcounter;
-}
-#pragma auto_inline(on)
-#endif // defined(_M_IX86) || defined(_M_X64)
-

Step 3: Generating a Better Memory Leak Report

-

Finally, here is the function that converts the program addresses obtained while walking the stack into useful symbol names. Note that the address-to-symbol conversion code is only run if memory leaks are detected. This avoids having to do symbol lookups on-the-fly while the program is running, which would add considerable additional overhead. Not to mention that it just doesn't make sense to store (large) symbol names for later retrieval when you can store (small) addresses instead.

-

The CRT doesn't expose any documented method for gaining access to its internal linked-list of allocated memory blocks. This linked list is what is used by the built-in detector for taking a "snapshot" of the heap to determine if there are any memory leaks. I've come up with a very simple trick to gain access to the list. Any time a new memory block is allocated, it happens to be placed at the beginning of the linked-list. So, to get a pointer to the head of the list, I just allocate a temporary memory block. That block's address can be converted to the address of the containing _CrtMemBlockHeader structure and now I have a pointer to the beginning of the linked list.

-

In the following code, pSymSetOptions, pSymInitialize, pSymGetLineFromAddr64, and pSymFromAddr are all pointers to the functions exported by dbghelp.dll. The report function is just a custom wrapper around OutputDebugString which sends messages to the debugger for display in the debugger's output window.

-

This function is quite long. To cut down on clutter, I've removed all of the uninteresting and trivial parts. To see this function in its entirety, please download the source ZIP file.

// reportleaks - Generates a memory leak report when the program terminates if
-//   leaks were detected. The report is displayed in the debug output window.
-//
-//  Return Value:
-//
-//    None.
-//
-void VisualLeakDetector::reportleaks ()
-{
-
-    ...
-
-    // Initialize the symbol handler. We use it for obtaining source file/line
-    // number information and function names for the memory leak report.
-    symbolpath = buildsymbolsearchpath();
-    pSymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME);
-    if (!pSymInitialize(m_process, symbolpath, TRUE)) {
-        report("WARNING: Visual Leak Detector: The symbol handler" 
-               " failed to initialize (error=%lu).\n"
-               "    Stack traces will probably not be available" 
-               " for leaked blocks.\n", GetLastError());
-    }
-
-    ...
-
-#ifdef _MT
-    _mlock(_HEAP_LOCK);
-#endif // _MT
-    pheap = new char;
-    pheader = pHdr(pheap)->pBlockHeaderNext;
-    delete pheap;
-    while (pheader) {
-
-        ...
-
-        callstack = m_mallocmap->find(pheader->lRequest);
-        if (callstack) {
-
-            ...
-
-            // Iterate through each frame in the call stack.
-            for (frame = 0; frame < callstack->size(); frame++) {
-                // Try to get the source file and line number associated with
-                // this program counter address.
-                if (pSymGetLineFromAddr64(m_process, 
-                   (*callstack)[frame], &displacement, &sourceinfo)) {
-
-                    ...
-
-                }
-
-                // Try to get the name of the function containing this program
-                // counter address.
-                if (pSymFromAddr(m_process, (*callstack)[frame], 
-                    &displacement64, pfunctioninfo)) {
-                    functionname = pfunctioninfo->Name;
-                }
-                else {
-                    functionname = "(Function name unavailable)";
-                }
-
-                ...
-
-            }
-
-            ...
-
-        }
-        pheader = pheader->pBlockHeaderNext;
-    }
-#ifdef _MT
-    _munlock(_HEAP_LOCK);
-#endif // _MT
-
-    ...
-
-}
-

Known Bugs and Restrictions

-

There are currently no known bugs in the latest release, but there are some known restrictions:

-
    -
  • VLD does not detect COM leaks, out-of-process resource leaks, or any other types of memory leaks that are not associated with the CRT heap. In simpler terms, VLD only detects memory leaks that are the result of calls to new or malloc. Keep in mind that VLD was created as an alternative to the built-in memory leak detector, which also only detects leaks from new and malloc. -
  • VLD is not compatible with version 6.5 of the Debug Help Library (dbghelp.dll). The recommended version of dbghelp.dll to use with VLD is 6.3. Version 6.3 is included in the VLD distribution. -
  • The pre-compiled libraries included in the VLD distribution may not be compatible with Visual Studio 2005. If you need to use VLD with Visual Studio 2005, building VLD from source in Visual Studio 2005 should create compatible libraries.
-

Credits

-
    -
  • Thanks to Alexandre Nikolov for quickly discovering the bug in 0.9e and helping to slap together a quick fix. -
  • Credit for the idea of how to make VLD's global class VisualLeakDetector object get constructed before any other user global objects goes to cmk. Thanks cmk! -
  • Thanks to Nitrogenycs (aka Matthias) for discovering the VLD_MAX_DATA_DUMP infinite loop bug. -
  • Thanks to hsvcs (aka Holger) for discovering the VLD_MAX_DATA_DUMP compilation bug. -
  • Thanks to Don Clugston for pointing out to me that people sometimes do build optimized debug executables, and that I need to watch out for that.
-

References

-

Here are some links to useful related articles and resources:

- -

License

-

Visual Leak Detector is distributed under the terms of the GNU Lesser General Public License. See the documentation included in the downloadable ZIP files for detailed licensing information.

-

History

-

This list gives a brief overview of the changes made from release to release. For a detailed description of changes made in each release, please see the change log, CHANGES.txt, in the downloadable ZIP files.

-
    -
  • 14 November 2006: Version 1.9d beta - Fixed a deadlock bug that may occur in multithreaded programs. Also fixed a two failed assertion bugs.
    • -
  • 6 November 2006: Version 1.9c beta - New installer to make starting out with VLD easier. All known incompatibilities with Visual Studio 2005 have been fixed. -
  • 9 March 2006: Version 1.9a beta - Entirely new leak detection engine detects most, if not all, in-process memory leaks not just leaks from new or malloc. Added many other new convenience features as well. -
  • 5 August 2005: Version 1.0 - A couple of new features have been added, and a few bugs have been fixed. Major revisions have been made to this article to bring it up to date with respect to the 1.0 release. -
  • 2 May 2005: Version 0.9i beta - This release fixed several bugs. It also includes support for Windows x64. -
  • 22 April 2005: Version 0.9h beta - This release contains a crucial fix for an internal logic bug in version 0.9g. -
  • 22 April 2005: Version 0.9g beta - This release contains a vastly improved internal search/sort algorithm that results in a significant overall performance boost. -
  • 13 April 2005: Version 0.9f beta - This provides a quick fix for a bug in 0.9e that can cause crashes. -
  • 12 April 2005: Version 0.9e beta - Solves compatibility problems between the pre-built libraries and Visual Studio .NET by removing the use of STL components (the pre-built libraries are built in Visual Studio 6.0 and the STL is not compatible between .NET and 6.0). -
  • 30 March 2005: Version 0.9d beta - First release of VLD as a set of pre-built libraries. -
  • 17 March 2005: Version 0.9c beta - Fixed a compilation error if VLD_MAX_DATA_DUMP is defined. -
  • 15 March 2005: Version 0.9b beta - Improved ability to detect leaks in global C++ object constructors. -
  • 12 March 2005: Version 0.9a beta - Initial public release.
- - - + + + +

Please choose 'View Source' in your browser to view the HTML, or +File | Save to save this file to your hard drive for editing.

+
+ + + + + + +

Screenshot of Visual Studio 6.0 with Visual Leak Detector's memory leak report displayed.

+

Table of Contents

+ +

Introduction

+

Visual C++ provides built-in memory leak detection, but its capabilities are minimal at best. This memory leak detector was created as a free alternative to the built-in memory leak detector provided with Visual C++. Here are some of Visual Leak Detector's features, none of which exist in the built-in detector:

+
    +
  • Provides a complete stack trace for each leaked block, including source file and line number information when available. +
  • Provides complete data dumps (in hex and ASCII) of leaked blocks. +
  • Customizable level of detail in the memory leak report.
+

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. Here are some key advantages that Visual Leak Detector has over many other free alternatives:

+
    +
  • Visual Leak Detector is cleanly packaged as an easy-to-use library. You don't need to compile its source code to use it. And you only need to make minor additions to your own source code to integrate it with your program. +
  • In addition to providing stack traces with source files, line numbers, and function names, Visual Leak Detector also provides data dumps. +
  • It works with both C++ and C programs (compatible with both new/delete and malloc/free). +
  • The full source code to the library is included and it is well documented, so it is easy to customize it to suit your needs.
+

Visual Leak Detector is licensed free of charge as a service to the Windows developer community.

+

What's New?

+

14 November 2006: A new beta version of has been posted. This version fixes a few bugs, most notably a deadlock bug and a couple of failed assertion bugs, that were identified in the 1.9c beta.

+

Note that the beta version does not have the same limitations of the 1.0 version. Whereas 1.0 can only detect leaks resulting from new or malloc, the beta can detect many different classes of leaks.

+

Please also note that the article below describes the inner workings of the 1.0 version. Because the beta version might change significantly before the next official release, the article will not be updated to reflect the design of the beta version until the official release is complete.

+

Using Visual Leak Detector

+

This section briefly describes the basics of using Visual Leak Detector (VLD). For a more in-depth discussion of the configuration options, runtime APIs, and a discussion of the more advanced usage scenarios (such as using VLD with DLLs), please see the full documentation included in the downloadable Zip files.

+

To use VLD with your project, follow these simple steps:

+
    +
  1. Copy the VLD library (*.lib) files to your Visual C++ installation's "lib" subdirectory. +
  2. Copy the VLD header files (vld.h and vldapi.h) to your Visual C++ installation's "include" subdirectory. +
  3. In the source file containing your program's main entry point, include the vld.h header file. It's best, but not absolutely required, to include this header before any other header files, except for stdafx.h. If the source file, include stdafx.h, then vld.h should be included after it. +
  4. If you are running Windows 2000 or earlier, then you will need to copy dbghelp.dll to the directory where the executable being debugged resides. +
  5. Build the debug version of your project.
+

VLD will detect memory leaks in your program whenever you run the debug version under the Visual C++ debugger. A report of all the memory leaks detected will be displayed in the debugger's output window when your program exits. Double-clicking on a source file's line number in the memory leak report will take you to that file and line in the editor window, allowing easy navigation of the code path leading up to the allocation that resulted in a memory leak.

+

Note: When you build release versions of your program, VLD will not be linked into the executable. So it is safe to leave vld.h included in your source files when doing release builds. Doing so will not result in any performance degradation or any other undesirable overhead.

+

Making a Memory Leak Detector

+

The goal of Visual Leak Detector was to build a better replacement for the memory leak detector built-in to Visual C++. With that in mind, I set out to use the same method used by the built-in detector, namely the CRT Debug Heap. But this new detector would provide enhancements -- primarily full stack traces, which can be extremely helpful for finding and fixing leaks.

+

The Built-In Detector

+

The built-in detector is pretty simple really. When a program is exiting, the CRT runs a bunch of cleanup code after main returns. If the built-in detector is enabled, then it runs a memory leak check as part of the cleanup procedure. The memory leak check simply looks at the debug heap: if there are any user blocks still allocated on the debug heap, then they must be memory leaks. The debug version of malloc stores the file and line number that allocated each block in the block's header at the time it is allocated. When the built-in detector identifies a memory leak, it simply peers inside the block header to get the file and line number. It then reports that information to the debugger where it is displayed.

+

Note that the built-in detector detects leaks without doing any monitoring of allocations or frees. It simply takes a snapshot of the heap just before the process terminates and determines if there are any leaks based on that snapshot. A snapshot of the heap only tells us if there are leaks; it does not tell us how they were leaked. Clearly, to determine the "how" we also need to obtain a stack trace. But to obtain a stack trace, we need to be able to monitor every allocation on-the-fly at runtime. This is what will distinguish our leak detector from the built-in one.

+

Allocation Hooking

+

Luckily for us, Microsoft has provided an easy way to monitor every allocation made from the debug heap: allocation hooks. An allocation hook is simply a user-supplied callback function that will be called just before each allocation is made from the debug heap. Microsoft has provided a function, _CrtSetAllocHook, which registers the allocation hook function with the debug heap. When the debug heap calls the allocation hook, one of the arguments passed is an ID number that uniquely identifies each allocation -- it's basically a serial number for each memory block allocated. There's not enough room in the memory block header for us to record any information directly in it, but we can use this unique ID number as a key to map each block to any data that we want to record.

+

Walking the Stack

+

Now that we have a way to be notified every time a block is allocated, as well as a way to uniquely identify each allocation, all that's left to do is to record the call stack each time an allocation occurs. We could conceivably attempt to unwind the stack ourselves using inline assembly. But stack frames can be organized in different ways, depending on compiler optimizations and calling conventions, so it could become complicated to do it that way. Once again, Microsoft has provided us with a tool to help us out. This time it is a function that we can call iteratively to walk the stack, frame by frame. That function is StackWalk64. It is part of the Debug Help Library (dbghelp.dll). As long as we provide it with the information that it needs to establish a starting "frame of reference", so to speak, it can examine our stack from there and reliably unwind it for us. Each time StackWalk64 is called, it gives back a STACKFRAME64 structure that can be reused as input for the next call to StackWalk64. It can be repeatedly called this way until the end of the stack is reached.

+

Initializing the Memory Leak Detector

+

We now have the beginnings of a better memory leak detector. We can monitor every allocation, and for each allocation monitored, we can obtain and record a stack trace. The only challenge that remains is to ensure that the allocation hook function is registered with the debug heap as soon as the program starts executing. This can be very simply solved by creating a global instance of a C++ class object. The constructor will run when the program is initialized. From the constructor, we can call _CrtSetAllocHook to register our allocation hook function. But wait, what if the program we are debugging already has other global C++ class objects that allocate memory? How can we ensure that our constructor will be called first, and that our allocation hook function will be installed before any other global objects are constructed? Unfortunately, the C++ specification does not spell out any rules for deciding in which order to construct global objects. So there are no absolute guarantees that our constructor will be called first. But we can come very close to guaranteeing it. We can leverage a compiler-specific preprocessor directive that explicitly tells the compiler to ensure that our global variable is constructed as soon as possible: #pragma init_seg (compiler). This directive tells the compiler to place our global object in the "compiler" initialization segment. Objects in this segment are the first to be constructed. Next, objects in the "library" segment are constructed, and objects in the "user" segment are constructed last. The "user" segment is the default segment for global objects. Generally speaking, no normal user objects should ever be placed in the "compiler" segment, so this provides a reasonable amount of certainty that our global object will be constructed before any user objects.

+

Detecting Memory Leaks

+

Because global objects are destroyed in the inverse order they are constructed, our global object will be destroyed after any user objects. We can then examine the heap, just like the built-in detector does. If we find a block on the heap that has not been freed, it is a leak and we can look up its call stack using the unique ID number recorded by our allocation hook function. An STL map would work fine here for mapping the ID number to the call stacks. I didn't use an STL map because I wanted my library to be compatible with both new and old versions of Visual C++. The STL from older versions is incompatible with the newer versions, so I couldn't use STL components. But the good news is that this gave me the opportunity to create a data structure similar in concept to the STL map, but with specific optimizations for use with my memory leak detector.

+

Do you remember that the built-in leak detector peers inside the memory block to get the name of the file and the line number where the block was allocated? Well, all we have for our call stack is a bunch of program addresses. Dumping all those hex numbers to the debugger wouldn't be of much use. To make those addresses more meaningful, we need to translate them to human readable information: files and line numbers (and function names too). Once again, Microsoft comes through with the tools that will help us do our job: the symbol handler APIs. Like StackWalk64, they also happen to be part of the Debug Help Library. I won't dwell on them in detail here, because there are a lot of them and they're pretty simple to use. They don't require as much ingenuity to use as StackWalk64 does. We can use two of the symbol handler APIs to get the filenames, line numbers, and function names that we want. The aptly named SymGetLineFromAddr64 translates addresses into source filenames and line numbers. Its sister API, SymFromAddr translates addresses into symbol names. For program addresses, which are what we have, the corresponding symbol name will be the name of the function containing that program address.

+

Key Parts of the Source Code

+

In case you got bored with the above section and skipped ahead, I'll summarize it here. In a nutshell, this memory leak detector works like this:

+
    +
  1. A global object is automatically constructed. It is the first object constructed. The constructor registers our allocation hook function. +
  2. Every allocation eventually calls our allocation hook function. The allocation hook function obtains and records the call stack for each allocation. The call stack information is recorded in a specialized STL-like map. +
  3. When the program terminates, the global object is the last object destroyed. It examines the heap and identifies leaks. Leaked blocks are looked up in the map and matched with their corresponding call stack. The resulting data is sent to the debugger to be displayed.
+

Step 1: Registering the Allocation Hook

+

Here is the VisualLeakDetector class constructor. Note the call to _CrtSetAllocHook. This is where our callback function, allochook, is registered with the debug heap. The call to linkdebughelplibrary performs an explicit dynamic link with the Debug Help Library (dbghelp.dll). Because VLD is itself a library, implicitly linking with the Debug Help Library through the import library dbghelp.lib is undesirable; it would make the VLD library dependent on dbghelp.lib at link-time. dbghelp.lib will not be present on many Windows computers and it's not redistributable, so we need to link with the DLL at runtime in order to bypass the import library. There is a lot of other stuff going on in here as well, but most of it has to do with custom configuration options that VLD supports.

// Constructor - Dynamically links with the Debug Help Library and installs the
+//   allocation hook function so that the C runtime's debug heap manager will
+//   call the hook function for every heap request.
+//
+VisualLeakDetector::VisualLeakDetector ()
+{
+    // Initialize private data.
+    m_mallocmap    = new BlockMap;
+    m_process      = GetCurrentProcess();
+    m_selftestfile = __FILE__;
+    m_status       = 0x0;
+    m_thread       = GetCurrentThread();
+    m_tlsindex     = TlsAlloc();
+
+    if (_VLD_configflags & VLD_CONFIG_SELF_TEST) {
+        // Self-test mode has been enabled.
+        // Intentionally leak a small amount of
+        // memory so that memory leak self-checking can be verified.
+        strncpy(new char [21], "Memory Leak Self-Test", 21);
+        m_selftestline = __LINE__;
+    }
+
+    if (m_tlsindex == TLS_OUT_OF_INDEXES) {
+        report("ERROR: Visual Leak Detector:" 
+               " Couldn't allocate thread local storage.\n");
+    }
+    else if (linkdebughelplibrary()) {
+        // Register our allocation hook function with the debug heap.
+        m_poldhook = _CrtSetAllocHook(allochook);
+        report("Visual Leak Detector " 
+               "Version "VLD_VERSION" installed ("VLD_LIBTYPE").\n");
+        reportconfig();
+        if (_VLD_configflags & VLD_CONFIG_START_DISABLED) {
+            // Memory leak detection will initially be disabled.
+            m_status |= VLD_STATUS_NEVER_ENABLED;
+        }
+
+        m_status |= VLD_STATUS_INSTALLED;
+        return;
+    }
+    
+    report("Visual Leak Detector is NOT installed!\n");
+}
+

Step 2: Walking the Stack

+

Here is the function responsible for obtaining call stacks. This is perhaps the trickiest part of the entire program. Setting up for the first call to StackWalk64 is where the tricky bit is. To start the stack trace, StackWalk64 needs to know exactly where on the stack to begin walking. It never assumes that we want to start tracing from the current stack frame. This requires that we provide it with the address of the current frame, as well as the current program address. I've seen other examples that attempt to get this information by calling GetThreadContext to retrieve the current thread's context, which would contain both of the required addresses. But, as its documentation clearly states, GetThreadContext can't be relied upon to get valid information for a running thread. By definition, this means that GetThreadContext can't get a valid context for the current thread. A better approach is to get the required addresses directly, and the only way to do that is with inline assembly.

+

Obtaining the address of the current frame is easy: it's stored in a CPU register (EBP) that we can directly read it from. The program address is a little harder to obtain. Though there is a CPU register (EIP) that always contains the current program address, on Intel x86 CPUs, it can't be read by software. But we can get the same address in a round-about way, by calling another function and from within that function obtaining the return address. The return address is the same as the program address that called the function. For this, I've created a separate function, getprogramcounterx86x64. Since we're already doing inline assembly, we could write a simple function call in assembly, instead of writing another C++ function, but to keep it easier to understand, I've used C++ wherever it's possible to do so.

+

In the following code, pStackWalk64, pSymFunctionTableAccess64 and pSymGetModuleBase64 are all pointers to the functions exported by dbghelp.dll.

// getstacktrace - Traces the stack, starting from this function, as far
+//   back as possible.
+//
+//  - callstack (OUT): Pointer to an empty CallStack to be populated with
+//    entries from the stack trace.
+//
+//  Return Value:
+//
+//    None.
+//
+void VisualLeakDetector::getstacktrace (CallStack *callstack)
+{
+    DWORD        architecture;
+    CONTEXT      context;
+    unsigned int count = 0;
+    STACKFRAME64 frame;
+    DWORD_PTR    framepointer;
+    DWORD_PTR    programcounter;
+
+    // Get the required values for initialization of the STACKFRAME64 structure
+    // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame.
+#if defined(_M_IX86) || defined(_M_X64)
+    architecture = X86X64ARCHITECTURE;
+    programcounter = getprogramcounterx86x64();
+    __asm mov [framepointer], BPREG // Get the frame pointer (aka base pointer)
+#else
+// If you want to retarget Visual Leak Detector to another processor
+// architecture then you'll need to provide architecture-specific code to
+// retrieve the current frame pointer and program counter in order to initialize
+// the STACKFRAME64 structure below.
+#error "Visual Leak Detector is not supported on this architecture."
+#endif // defined(_M_IX86) || defined(_M_X64)
+
+    // Initialize the STACKFRAME64 structure.
+    memset(&frame, 0x0, sizeof(frame));
+    frame.AddrPC.Offset    = programcounter;
+    frame.AddrPC.Mode      = AddrModeFlat;
+    frame.AddrFrame.Offset = framepointer;
+    frame.AddrFrame.Mode   = AddrModeFlat;
+
+    // Walk the stack.
+    while (count < _VLD_maxtraceframes) {
+        count++;
+        if (!pStackWalk64(architecture, m_process, m_thread, 
+             &frame, &context, NULL, pSymFunctionTableAccess64, 
+             pSymGetModuleBase64, NULL)) {
+            // Couldn't trace back through any more frames.
+            break;
+        }
+        if (frame.AddrFrame.Offset == 0) {
+            // End of stack.
+            break;
+        }
+
+        // Push this frame's program counter onto the provided CallStack.
+        callstack->push_back((DWORD_PTR)frame.AddrPC.Offset);
+    }
+}
+

And here is the function that retrieves the EIP register. Again, this has to be done as a separate function call because there is no way for the software to directly read the EIP register. But the same value can be obtained by making a function call, and then from within the called function getting the return address. The return address is the program address that made the function call, and it is pushed onto the stack when the function call is made. We get it by copying it from the stack.

// getprogramcounterx86x64 - Helper function that retrieves the program counter
+//   for getstacktrace() on Intel x86 or x64 architectures.
+//
+//  Note: Inlining of this function must be disabled. The whole purpose of this
+//    function's existence depends upon it being a *called* function.
+//
+//  Return Value:
+//
+//    Returns the caller's program address.
+//
+#if defined(_M_IX86) || defined(_M_X64)
+#pragma auto_inline(off)
+DWORD_PTR VisualLeakDetector::getprogramcounterx86x64 ()
+{
+    DWORD_PTR programcounter;
+
+    // Get the return address out of the current stack frame
+    __asm mov AXREG, [BPREG + SIZEOFPTR]
+    // Put the return address into the variable we'll return
+    __asm mov [programcounter], AXREG
+
+    return programcounter;
+}
+#pragma auto_inline(on)
+#endif // defined(_M_IX86) || defined(_M_X64)
+

Step 3: Generating a Better Memory Leak Report

+

Finally, here is the function that converts the program addresses obtained while walking the stack into useful symbol names. Note that the address-to-symbol conversion code is only run if memory leaks are detected. This avoids having to do symbol lookups on-the-fly while the program is running, which would add considerable additional overhead. Not to mention that it just doesn't make sense to store (large) symbol names for later retrieval when you can store (small) addresses instead.

+

The CRT doesn't expose any documented method for gaining access to its internal linked-list of allocated memory blocks. This linked list is what is used by the built-in detector for taking a "snapshot" of the heap to determine if there are any memory leaks. I've come up with a very simple trick to gain access to the list. Any time a new memory block is allocated, it happens to be placed at the beginning of the linked-list. So, to get a pointer to the head of the list, I just allocate a temporary memory block. That block's address can be converted to the address of the containing _CrtMemBlockHeader structure and now I have a pointer to the beginning of the linked list.

+

In the following code, pSymSetOptions, pSymInitialize, pSymGetLineFromAddr64, and pSymFromAddr are all pointers to the functions exported by dbghelp.dll. The report function is just a custom wrapper around OutputDebugString which sends messages to the debugger for display in the debugger's output window.

+

This function is quite long. To cut down on clutter, I've removed all of the uninteresting and trivial parts. To see this function in its entirety, please download the source ZIP file.

// reportleaks - Generates a memory leak report when the program terminates if
+//   leaks were detected. The report is displayed in the debug output window.
+//
+//  Return Value:
+//
+//    None.
+//
+void VisualLeakDetector::reportleaks ()
+{
+
+    ...
+
+    // Initialize the symbol handler. We use it for obtaining source file/line
+    // number information and function names for the memory leak report.
+    symbolpath = buildsymbolsearchpath();
+    pSymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME);
+    if (!pSymInitialize(m_process, symbolpath, TRUE)) {
+        report("WARNING: Visual Leak Detector: The symbol handler" 
+               " failed to initialize (error=%lu).\n"
+               "    Stack traces will probably not be available" 
+               " for leaked blocks.\n", GetLastError());
+    }
+
+    ...
+
+#ifdef _MT
+    _mlock(_HEAP_LOCK);
+#endif // _MT
+    pheap = new char;
+    pheader = pHdr(pheap)->pBlockHeaderNext;
+    delete pheap;
+    while (pheader) {
+
+        ...
+
+        callstack = m_mallocmap->find(pheader->lRequest);
+        if (callstack) {
+
+            ...
+
+            // Iterate through each frame in the call stack.
+            for (frame = 0; frame < callstack->size(); frame++) {
+                // Try to get the source file and line number associated with
+                // this program counter address.
+                if (pSymGetLineFromAddr64(m_process, 
+                   (*callstack)[frame], &displacement, &sourceinfo)) {
+
+                    ...
+
+                }
+
+                // Try to get the name of the function containing this program
+                // counter address.
+                if (pSymFromAddr(m_process, (*callstack)[frame], 
+                    &displacement64, pfunctioninfo)) {
+                    functionname = pfunctioninfo->Name;
+                }
+                else {
+                    functionname = "(Function name unavailable)";
+                }
+
+                ...
+
+            }
+
+            ...
+
+        }
+        pheader = pheader->pBlockHeaderNext;
+    }
+#ifdef _MT
+    _munlock(_HEAP_LOCK);
+#endif // _MT
+
+    ...
+
+}
+

Known Bugs and Restrictions

+

There are currently no known bugs in the latest release, but there are some known restrictions:

+
    +
  • VLD does not detect COM leaks, out-of-process resource leaks, or any other types of memory leaks that are not associated with the CRT heap. In simpler terms, VLD only detects memory leaks that are the result of calls to new or malloc. Keep in mind that VLD was created as an alternative to the built-in memory leak detector, which also only detects leaks from new and malloc. +
  • VLD is not compatible with version 6.5 of the Debug Help Library (dbghelp.dll). The recommended version of dbghelp.dll to use with VLD is 6.3. Version 6.3 is included in the VLD distribution. +
  • The pre-compiled libraries included in the VLD distribution may not be compatible with Visual Studio 2005. If you need to use VLD with Visual Studio 2005, building VLD from source in Visual Studio 2005 should create compatible libraries.
+

Credits

+
    +
  • Thanks to Alexandre Nikolov for quickly discovering the bug in 0.9e and helping to slap together a quick fix. +
  • Credit for the idea of how to make VLD's global class VisualLeakDetector object get constructed before any other user global objects goes to cmk. Thanks cmk! +
  • Thanks to Nitrogenycs (aka Matthias) for discovering the VLD_MAX_DATA_DUMP infinite loop bug. +
  • Thanks to hsvcs (aka Holger) for discovering the VLD_MAX_DATA_DUMP compilation bug. +
  • Thanks to Don Clugston for pointing out to me that people sometimes do build optimized debug executables, and that I need to watch out for that.
+

References

+

Here are some links to useful related articles and resources:

+ +

License

+

Visual Leak Detector is distributed under the terms of the GNU Lesser General Public License. See the documentation included in the downloadable ZIP files for detailed licensing information.

+

History

+

This list gives a brief overview of the changes made from release to release. For a detailed description of changes made in each release, please see the change log, CHANGES.txt, in the downloadable ZIP files.

+
    +
  • 14 November 2006: Version 1.9d beta - Fixed a deadlock bug that may occur in multithreaded programs. Also fixed a two failed assertion bugs.
    • +
  • 6 November 2006: Version 1.9c beta - New installer to make starting out with VLD easier. All known incompatibilities with Visual Studio 2005 have been fixed. +
  • 9 March 2006: Version 1.9a beta - Entirely new leak detection engine detects most, if not all, in-process memory leaks not just leaks from new or malloc. Added many other new convenience features as well. +
  • 5 August 2005: Version 1.0 - A couple of new features have been added, and a few bugs have been fixed. Major revisions have been made to this article to bring it up to date with respect to the 1.0 release. +
  • 2 May 2005: Version 0.9i beta - This release fixed several bugs. It also includes support for Windows x64. +
  • 22 April 2005: Version 0.9h beta - This release contains a crucial fix for an internal logic bug in version 0.9g. +
  • 22 April 2005: Version 0.9g beta - This release contains a vastly improved internal search/sort algorithm that results in a significant overall performance boost. +
  • 13 April 2005: Version 0.9f beta - This provides a quick fix for a bug in 0.9e that can cause crashes. +
  • 12 April 2005: Version 0.9e beta - Solves compatibility problems between the pre-built libraries and Visual Studio .NET by removing the use of STL components (the pre-built libraries are built in Visual Studio 6.0 and the STL is not compatible between .NET and 6.0). +
  • 30 March 2005: Version 0.9d beta - First release of VLD as a set of pre-built libraries. +
  • 17 March 2005: Version 0.9c beta - Fixed a compilation error if VLD_MAX_DATA_DUMP is defined. +
  • 15 March 2005: Version 0.9b beta - Improved ability to detect leaks in global C++ object constructors. +
  • 12 March 2005: Version 0.9a beta - Initial public release.
+ + + \ No newline at end of file diff --git a/console/README.txt b/console/README.txt index 7b75ae74..958ea8b3 100644 --- a/console/README.txt +++ b/console/README.txt @@ -1,36 +1,36 @@ -Visual Leak Detector Example Console Application (Version 1.0.1) - - Example Program Using Visual Leak Detector in a Console Application - - -About The Example Program: --------------------------- -This is an example Visual C++ 6.0 console application project that -implements the Visual Leak Detector. - -The project actually contains two separate programs. A C program and a -C++ program. The C program is in main.c while the C++ program is in -main.cpp. You can select which one you want to build by selecting the -corresponding project configuration as the active configuration. The purpose -behind including both C and C++ versions is to demonstrate Visual Leak -Detector's compatibility with C's malloc and free as well as C++'s new and -delete. - -To build the example project, simply open the project file and start a build. - -After the project is built, running the program will display a simple -"Hello World!" message. But a small amount of memory (containing the -"Hello World!" string) will be leaked. If you run the program under the -Visual C++ debugger, you should see a memory leak report in the debug -output window after the program exits. The report will include detailed -stack traces of the calls that allocated the leaked memory blocks. - -Double-clicking on a source file/line number in the stack trace will take you to -that file and line in the editor. This allows you to quickly see where in the -program the memory was allocated and how it got there. - - -Documentation: --------------- - -See the README.html file for the complete Visual Leak Detector documentation. +Visual Leak Detector Example Console Application (Version 1.0.1) + + Example Program Using Visual Leak Detector in a Console Application + + +About The Example Program: +-------------------------- +This is an example Visual C++ 6.0 console application project that +implements the Visual Leak Detector. + +The project actually contains two separate programs. A C program and a +C++ program. The C program is in main.c while the C++ program is in +main.cpp. You can select which one you want to build by selecting the +corresponding project configuration as the active configuration. The purpose +behind including both C and C++ versions is to demonstrate Visual Leak +Detector's compatibility with C's malloc and free as well as C++'s new and +delete. + +To build the example project, simply open the project file and start a build. + +After the project is built, running the program will display a simple +"Hello World!" message. But a small amount of memory (containing the +"Hello World!" string) will be leaked. If you run the program under the +Visual C++ debugger, you should see a memory leak report in the debug +output window after the program exits. The report will include detailed +stack traces of the calls that allocated the leaked memory blocks. + +Double-clicking on a source file/line number in the stack trace will take you to +that file and line in the editor. This allows you to quickly see where in the +program the memory was allocated and how it got there. + + +Documentation: +-------------- + +See the README.html file for the complete Visual Leak Detector documentation. diff --git a/console/main.c b/console/main.c index 69e54295..ad902764 100644 --- a/console/main.c +++ b/console/main.c @@ -1,24 +1,24 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// A simple C example program for testing the Visual Leak Detector. -// -//////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include - -// Include Visual Leak Detector -#include - -int main (int argc, char *argv []) -{ - char *s = (char*)malloc(14); - - strncpy(s, "Hello World!\n", 14); - printf(s); - - //free(s); - - return 0; -} +//////////////////////////////////////////////////////////////////////////////// +// +// A simple C example program for testing the Visual Leak Detector. +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include + +// Include Visual Leak Detector +#include + +int main (int argc, char *argv []) +{ + char *s = (char*)malloc(14); + + strncpy(s, "Hello World!\n", 14); + printf(s); + + //free(s); + + return 0; +} diff --git a/console/main.cpp b/console/main.cpp index ac08c1e2..479898dc 100644 --- a/console/main.cpp +++ b/console/main.cpp @@ -1,24 +1,24 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// A simple C++ example program for testing the Visual Leak Detector. -// -//////////////////////////////////////////////////////////////////////////////// - -#include -#include - -// Include Visual Leak Detector -#include - -using namespace std; - -int main (int argc, char *argv []) -{ - string *s = new string("Hello World!\n"); - - cout << *s; - - //delete s; - - return 0; -} +//////////////////////////////////////////////////////////////////////////////// +// +// A simple C++ example program for testing the Visual Leak Detector. +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include + +// Include Visual Leak Detector +#include + +using namespace std; + +int main (int argc, char *argv []) +{ + string *s = new string("Hello World!\n"); + + cout << *s; + + //delete s; + + return 0; +} diff --git a/console/vldconsole.sln b/console/vldconsole.sln index 8ec9344a..46f28187 100755 --- a/console/vldconsole.sln +++ b/console/vldconsole.sln @@ -1,20 +1,20 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldconsole", "vldconsole.vcproj", "{23F66B23-5893-429F-BA3E-5F61EB3ED2A2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - C Debug|Win32 = C Debug|Win32 - CPP Debug|Win32 = CPP Debug|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|Win32.ActiveCfg = C Debug|Win32 - {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|Win32.Build.0 = C Debug|Win32 - {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|Win32.ActiveCfg = CPP Debug|Win32 - {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|Win32.Build.0 = CPP Debug|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldconsole", "vldconsole.vcproj", "{23F66B23-5893-429F-BA3E-5F61EB3ED2A2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + C Debug|Win32 = C Debug|Win32 + CPP Debug|Win32 = CPP Debug|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|Win32.ActiveCfg = C Debug|Win32 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|Win32.Build.0 = C Debug|Win32 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|Win32.ActiveCfg = CPP Debug|Win32 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|Win32.Build.0 = CPP Debug|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/console/vldconsole.vcproj b/console/vldconsole.vcproj index 86b2ed57..8d8027e8 100755 --- a/console/vldconsole.vcproj +++ b/console/vldconsole.vcproj @@ -1,267 +1,267 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 22a61eb3..58c50c3b 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1,954 +1,970 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - CRT and MFC IAT Patch Functions Header -// Copyright (c) 2009 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifndef VLDBUILD -#error \ -"This header should only be included by Visual Leak Detector when building it from source. \ -Applications should never include this header." -#endif - -#include "vldint.h" -extern __declspec(dllexport) VisualLeakDetector vld; - -#define TEMPLATE_HEADER \ -template - -#define TEMPLATE_ARGS \ - crtddll, mfcddll, mfcuddll,\ - crtd_vector_new_name, crtd_vector_new_dbg_name,\ - crtd_scalar_new_name, crtd_scalar_new_dbg_name,\ - mfcd_vector_new_ordinal, mfcd_vector_new_dbg_4p_ordinal, mfcd_vector_new_dbg_3p_ordinal,\ - mfcd_scalar_new_ordinal, mfcd_scalar_new_dbg_4p_ordinal, mfcd_scalar_new_dbg_3p_ordinal,\ - mfcud_vector_new_ordinal, mfcud_vector_new_dbg_4p_ordinal, mfcud_vector_new_dbg_3p_ordinal,\ - mfcud_scalar_new_ordinal, mfcud_scalar_new_dbg_4p_ordinal, mfcud_scalar_new_dbg_3p_ordinal - -TEMPLATE_HEADER -class CrtMfcPatch -{ -public: - static void* __cdecl crtd__calloc_dbg (size_t num, size_t size, int type, char const *file, int line); - static void* __cdecl crtd__malloc_dbg (size_t size, int type, const char *file, int line); - static void* __cdecl crtd__realloc_dbg (void *mem, size_t size, int type, char const *file, int line); - static void* __cdecl crtd__scalar_new_dbg (size_t size, int type, char const *file, int line); - static void* __cdecl crtd__vector_new_dbg (size_t size, int type, char const *file, int line); - static void* __cdecl crtd_calloc (size_t num, size_t size); - static void* __cdecl crtd_malloc (size_t size); - static void* __cdecl crtd_realloc (void *mem, size_t size); - static void* __cdecl crtd_scalar_new (size_t size); - static void* __cdecl crtd_vector_new (size_t size); - - template - static void* __cdecl crtd_new_dbg (SIZE_T fp, size_t size, int type, char const *file, int line); - template - static void* __cdecl crtd_new (SIZE_T fp, size_t size); - - static void* __cdecl mfcd_vector_new (size_t size); - static void* __cdecl mfcd__vector_new_dbg_4p (size_t size, int type, char const *file, int line); - static void* __cdecl mfcd__vector_new_dbg_3p (size_t size, char const *file, int line); - static void* __cdecl mfcd_scalar_new (size_t size); - static void* __cdecl mfcd__scalar_new_dbg_4p (size_t size, int type, char const *file, int line); - static void* __cdecl mfcd__scalar_new_dbg_3p (size_t size, char const *file, int line); - static void* __cdecl mfcud_vector_new (size_t size); - static void* __cdecl mfcud__vector_new_dbg_4p (size_t size, int type, char const *file, int line); - static void* __cdecl mfcud__vector_new_dbg_3p (size_t size, char const *file, int line); - static void* __cdecl mfcud_scalar_new (size_t size); - static void* __cdecl mfcud__scalar_new_dbg_4p (size_t size, int type, char const *file, int line); - static void* __cdecl mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line); - - template - static void* __cdecl mfcd_new_dbg (SIZE_T fp, size_t size, int type, char const *file, int line); - template - static void* __cdecl mfcd_new_dbg (SIZE_T fp, size_t size, char const *file, int line); - template - static void* __cdecl mfcd_new (SIZE_T fp, size_t size); -}; - - -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Studio DLLs -// -//////////////////////////////////////////////////////////////////////////////// - -// crtd__calloc_dbg - Calls to _calloc_dbg from msvcrXXd.dll are patched -// through to this function. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by _calloc_dbg. -// -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__calloc_dbg (size_t num, - size_t size, - int type, - char const *file, - int line) -{ - static _calloc_dbg_t pcrtxxd__calloc_dbg = NULL; - - SIZE_T fp; - HMODULE msvcrxxd; - - FRAMEPOINTER(fp); - - if (pcrtxxd__calloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _calloc_dbg. - msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd__calloc_dbg = (_calloc_dbg_t)GetProcAddress(msvcrxxd, "_calloc_dbg"); - } - - return vld.__calloc_dbg(pcrtxxd__calloc_dbg, fp, num, size, type, file, line); -} - -// crtd__malloc_dbg - Calls to _malloc_dbg from msvcrXXd.dll are patched -// through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by _malloc_dbg. -// -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__malloc_dbg (size_t size, - int type, - char const *file, - int line) -{ - static _malloc_dbg_t pcrtxxd__malloc_dbg = NULL; - - SIZE_T fp; - HMODULE msvcrxxd; - - FRAMEPOINTER(fp); - - if (pcrtxxd__malloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _malloc_dbg. - msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd__malloc_dbg = (_malloc_dbg_t)GetProcAddress(msvcrxxd, "_malloc_dbg"); - } - - return vld.__malloc_dbg(pcrtxxd__malloc_dbg, fp, size, type, file, line); -} - -// crtd__realloc_dbg - Calls to _realloc_dbg from msvcrXXd.dll are patched -// through to this function. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by _realloc_dbg. -// -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__realloc_dbg (void *mem, - size_t size, - int type, - char const *file, - int line) -{ - static _realloc_dbg_t pcrtxxd__realloc_dbg = NULL; - - SIZE_T fp; - HMODULE msvcrxxd; - - FRAMEPOINTER(fp); - - if (pcrtxxd__realloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _realloc_dbg. - msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd__realloc_dbg = (_realloc_dbg_t)GetProcAddress(msvcrxxd, "_realloc_dbg"); - } - - return vld.__realloc_dbg(pcrtxxd__realloc_dbg, fp, mem, size, type, file, line); -} - -// crtd__scalar_new_dbg - Calls to the CRT's debug scalar new operator from -// msvcrXXd.dll are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the CRT debug scalar new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, - int type, - char const *file, - int line) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return crtd_new_dbg(fp, size, type, file, line); -} - -// crtd__vector_new_dbg - Calls to the CRT's debug vector new operator from -// msvcrXXd.dll are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the CRT debug vector new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, - int type, - char const *file, - int line) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return crtd_new_dbg(fp, size, type, file, line); -} - -// crtd_calloc - Calls to calloc from msvcrXXd.dll are patched through to -// this function. -// -// - dll (IN): The name of the dll -// -// - num (IN): The number of blocks, of size 'size', to be allocated. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the valued returned from calloc. -// -TEMPLATE_HEADER -void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) -{ - static calloc_t pcrtxxd_calloc = NULL; - - SIZE_T fp; - HMODULE msvcrxxd; - - FRAMEPOINTER(fp); - - if (pcrtxxd_calloc == NULL) { - // This is the first call to this function. Link to the real malloc. - msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd_calloc = (calloc_t)GetProcAddress(msvcrxxd, "calloc"); - } - - return vld._calloc(pcrtxxd_calloc, fp, num, size); -} - -// crtd_malloc - Calls to malloc from msvcrXXd.dll are patched through to -// this function. -// -// - dll (IN): The name of the dll -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the valued returned from malloc. -// -TEMPLATE_HEADER -void* CrtMfcPatch::crtd_malloc (size_t size) -{ - static malloc_t pcrtxxd_malloc = NULL; - - SIZE_T fp; - HMODULE msvcrxxd; - - FRAMEPOINTER(fp); - - if (pcrtxxd_malloc == NULL) { - // This is the first call to this function. Link to the real malloc. - msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd_malloc = (malloc_t)GetProcAddress(msvcrxxd, "malloc"); - } - - return vld._malloc(pcrtxxd_malloc, fp, size); -} - -// crtd_realloc - Calls to realloc from msvcrXXd.dll are patched through to -// this function. -// -// - dll (IN): The name of the dll -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from realloc. -// -TEMPLATE_HEADER -void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) -{ - static realloc_t pcrtxxd_realloc = NULL; - - SIZE_T fp; - HMODULE msvcrxxd; - - FRAMEPOINTER(fp); - - if (pcrtxxd_realloc == NULL) { - // This is the first call to this function. Link to the real realloc. - msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd_realloc = (realloc_t)GetProcAddress(msvcrxxd, "realloc"); - } - - return vld._realloc(pcrtxxd_realloc, fp, mem, size); -} - -// crtd_scalar_new - Calls to the CRT's scalar new operator from msvcrXXd.dll -// are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the CRT scalar new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::crtd_scalar_new (size_t size) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return crtd_new(fp, size); -} - -// crtd_vector_new - Calls to the CRT's vector new operator from msvcrXXd.dll -// are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the CRT vector new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::crtd_vector_new (size_t size) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return crtd_new(fp, size); -} - -// crtd_new_dbg - A template function for implementation of patch functions to -// the CRT's debug new operator from msvcrXXd.dll -// -// - procname (IN): The debug new operator's name -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the CRT debug new operator. -// -TEMPLATE_HEADER -template -void* CrtMfcPatch::crtd_new_dbg (SIZE_T fp, - size_t size, - int type, - char const *file, - int line) -{ - static new_dbg_crt_t pcrtxxd_new_dbg = NULL; - - HMODULE msvcrxxd; - - if (pcrtxxd_new_dbg == NULL) { - // This is the first call to this function. Link to the real CRT debug - // new operator. - msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd_new_dbg = (new_dbg_crt_t)GetProcAddress(msvcrxxd, procname); - } - - return vld.new_dbg_crt(pcrtxxd_new_dbg, fp, size, type, file, line); -} - -// crt_new - A template function for implementing patch functions to the -// CRT's new operator from msvcrXXd.dll -// -// - dll (IN): The name of the dll -// -// - procname (IN): The debug new operator's name -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the CRT new operator. -// -TEMPLATE_HEADER -template -void* CrtMfcPatch::crtd_new (SIZE_T fp, size_t size) -{ - static new_t pcrtxxd_scalar_new = NULL; - - HMODULE msvcrxxd; - - if (pcrtxxd_scalar_new == NULL) { - // This is the first call to this function. Link to the real CRT new - // operator. - msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd_scalar_new = (new_t)GetProcAddress(msvcrxxd, procname); - } - - return vld._new(pcrtxxd_scalar_new, fp, size); -} - -//////////////////////////////////////////////////////////////////////////////// -// -// MFC DLLs -// -//////////////////////////////////////////////////////////////////////////////// - -// mfcd__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from -// mfcXXd.dll are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug scalar new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size, - int type, - char const *file, - int line) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new_dbg - (fp, size, type, file, line); -} - -// mfcd__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from -// mfcXXd.dll are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug scalar new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size, - char const *file, - int line) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new_dbg - (fp, size, file, line); -} - -// mfcd__vector_new_dbg_4p - Calls to the MFC debug vector new operator from -// mfcXXd.dll are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug vector new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size, - int type, - char const *file, - int line) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new_dbg - (fp, size, type, file, line); -} - -// mfcd__vector_new_dbg_3p - Calls to the MFC debug vector new operator from -// mfcXXd.dll are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug vector new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, - char const *file, - int line) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new_dbg - (fp, size, file, line); -} - -// mfcd_scalar_new - Calls to the MFC scalar new operator from mfcXXd.dll are -// patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the MFC scalar new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd_scalar_new (size_t size) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new(fp, size); -} - -// mfcd_vector_new - Calls to the MFC vector new operator from mfcXXd.dll are -// patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the MFC vector new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd_vector_new (size_t size) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new(fp, size); -} - -// mfcud__scalar_new_dbg_4p - Calls to the MFC debug scalar new operator from -// mfcXXud.dll are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug scalar new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size, - int type, - char const *file, - int line) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new_dbg - (fp, size, type, file, line); -} - -// mfcud__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from -// mfcXXud.dll are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug scalar new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size, - char const *file, - int line) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new_dbg - (fp, size, file, line); -} - -// mfcud__vector_new_dbg_4p - Calls to the MFC debug vector new operator from -// mfcXXud.dll are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug vector new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size, - int type, - char const *file, - int line) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new_dbg - (fp, size, type, file, line); -} - -// mfcud__vector_new_dbg_3p - Calls to the MFC debug vector new operator from -// mfcXXud.dll are patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug vector new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size, - char const *file, - int line) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new_dbg - (fp, size, file, line); -} - -// mfcud_scalar_new - Calls to the MFC scalar new operator from mfcXXud.dll are -// patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the MFC scalar new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud_scalar_new (size_t size) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new(fp, size); -} - -// mfcud_vector_new - Calls to the MFC vector new operator from mfcXXud.dll are -// patched through to this function. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the MFC vector new operator. -// -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud_vector_new (size_t size) -{ - SIZE_T fp; - FRAMEPOINTER(fp); - - return mfcd_new(fp, size); -} - -// mfcd_new_dbg - A generic function for implementing patch functions to the MFC -// debug new operators: -// void* __cdecl operator new[](size_t size, int type, char const *file, int line) -// void* __cdecl operator new(size_t size, int type, char const *file, int line) -// -// - mfcdll (IN): The name of the MFC DLL -// -// - ordinal (IN): The debug new operator's ordinal value -// -// - type (IN): The "use type" of the block to be allocated. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug new operator. -// -TEMPLATE_HEADER -template -void* CrtMfcPatch::mfcd_new_dbg (SIZE_T fp, - size_t size, - int type, - char const *file, - int line) -{ - static new_dbg_crt_t pmfcxxd__new_dbg = NULL; - - HMODULE mfcxxd; - - if (pmfcxxd__new_dbg == NULL) { - // This is the first call to this function. Link to the real MFC debug - // new operator. - mfcxxd = GetModuleHandle(mfcdll); - pmfcxxd__new_dbg = (new_dbg_crt_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); - } - - return vld.new_dbg_mfc(pmfcxxd__new_dbg, fp, size, type, file, line); -} - -// mfcd_new_dbg - A generic function for implementing patch functions to the MFC -// debug new operators: -// void* __cdecl operator new[](size_t size, char const *file, int line) -// void* __cdecl operator new(size_t size, char const *file, int line) -// -// - mfcdll (IN): The name of the MFC DLL -// -// - ordinal (IN): The debug new operator's ordinal value -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug new operator. -// -TEMPLATE_HEADER -template -void* CrtMfcPatch::mfcd_new_dbg (SIZE_T fp, - size_t size, - char const *file, - int line) -{ - static new_dbg_mfc_t pmfcxxd__new_dbg = NULL; - - HMODULE mfcxxd; - - if (pmfcxxd__new_dbg == NULL) { - // This is the first call to this function. Link to the real MFC debug - // new operator. - mfcxxd = GetModuleHandle(mfcdll); - pmfcxxd__new_dbg = (new_dbg_mfc_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); - } - - return vld.new_dbg_mfc(pmfcxxd__new_dbg, fp, size, file, line); -} - -// mfcd_new - A generic function for implementing patch functions to the MFC new -// operators. -// -// - mfcdll (IN): The name of the MFC DLL -// -// - ordinal (IN): The new operator's ordinal value -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the MFC new operator. -// -TEMPLATE_HEADER -template -void* CrtMfcPatch::mfcd_new (SIZE_T fp, size_t size) -{ - static new_t pmfcxxd_new = NULL; - - HMODULE mfcxxd; - - if (pmfcxxd_new == NULL) { - // This is the first call to this function. Link to the real CRT new - // operator. - mfcxxd = GetModuleHandle(mfcdll); - pmfcxxd_new = (new_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); - } - - return vld._new(pmfcxxd_new, fp, size); -} - -#undef TEMPLATE_HEADER -#undef TEMPLATE_ARGS - -const extern char scalar_new_dbg_name[] = "??2@YAPAXIHPBDH@Z"; -const extern char vector_new_dbg_name[] = "??_U@YAPAXIHPBDH@Z"; -const extern char scalar_new_name[] = "??2@YAPAXI@Z"; -const extern char vector_new_name[] = "??_U@YAPAXI@Z"; -const extern wchar_t msvcrtd_dll[] = L"msvcrtd.dll"; -const extern wchar_t mfc42d_dll[] = L"mfc42d.dll"; -const extern wchar_t mfc42ud_dll[] = L"mfc42ud.dll"; -const extern wchar_t msvcr70d_dll[] = L"msvcr70d.dll"; -const extern wchar_t mfc70d_dll[] = L"mfc70d.dll"; -const extern wchar_t mfc70ud_dll[] = L"mfc70ud.dll"; -const extern wchar_t msvcr71d_dll[] = L"msvcr71d.dll"; -const extern wchar_t mfc71d_dll[] = L"mfc71d.dll"; -const extern wchar_t mfc71ud_dll[] = L"mfc71ud.dll"; -const extern wchar_t msvcr80d_dll[] = L"msvcr80d.dll"; -const extern wchar_t mfc80d_dll[] = L"mfc80d.dll"; -const extern wchar_t mfc80ud_dll[] = L"mfc80ud.dll"; -const extern wchar_t msvcr90d_dll[] = L"msvcr90d.dll"; -const extern wchar_t mfc90d_dll[] = L"mfc90d.dll"; -const extern wchar_t mfc90ud_dll[] = L"mfc90ud.dll"; - -// Visual Studio 6.0 -typedef CrtMfcPatch - VS60; -// Visual Studio .NET 2002 -typedef CrtMfcPatch - VS70; -// Visual Studio .NET 2003 -typedef CrtMfcPatch - VS71; -// Visual Studio 2005 -typedef CrtMfcPatch - VS80; -// Visual Studio 2008 -typedef CrtMfcPatch - VS90; +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - CRT and MFC IAT Patch Functions Header +// Copyright (c) 2009 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifndef VLDBUILD +#error \ +"This header should only be included by Visual Leak Detector when building it from source. \ +Applications should never include this header." +#endif + +#include "vldint.h" +extern __declspec(dllexport) VisualLeakDetector vld; + +#define TEMPLATE_HEADER \ +template + +#define TEMPLATE_ARGS \ + crtddll, mfcddll, mfcuddll,\ + crtd_vector_new_name, crtd_vector_new_dbg_name,\ + crtd_scalar_new_name, crtd_scalar_new_dbg_name,\ + mfcd_vector_new_ordinal, mfcd_vector_new_dbg_4p_ordinal, mfcd_vector_new_dbg_3p_ordinal,\ + mfcd_scalar_new_ordinal, mfcd_scalar_new_dbg_4p_ordinal, mfcd_scalar_new_dbg_3p_ordinal,\ + mfcud_vector_new_ordinal, mfcud_vector_new_dbg_4p_ordinal, mfcud_vector_new_dbg_3p_ordinal,\ + mfcud_scalar_new_ordinal, mfcud_scalar_new_dbg_4p_ordinal, mfcud_scalar_new_dbg_3p_ordinal + +TEMPLATE_HEADER +class CrtMfcPatch +{ +public: + static void* __cdecl crtd__calloc_dbg (size_t num, size_t size, int type, char const *file, int line); + static void* __cdecl crtd__malloc_dbg (size_t size, int type, const char *file, int line); + static void* __cdecl crtd__realloc_dbg (void *mem, size_t size, int type, char const *file, int line); + static void* __cdecl crtd__scalar_new_dbg (size_t size, int type, char const *file, int line); + static void* __cdecl crtd__vector_new_dbg (size_t size, int type, char const *file, int line); + static void* __cdecl crtd_calloc (size_t num, size_t size); + static void* __cdecl crtd_malloc (size_t size); + static void* __cdecl crtd_realloc (void *mem, size_t size); + static void* __cdecl crtd_scalar_new (size_t size); + static void* __cdecl crtd_vector_new (size_t size); + + template + static void* __cdecl crtd_new_dbg (UINT_PTR* fp, size_t size, int type, char const *file, int line); + template + static void* __cdecl crtd_new (UINT_PTR* fp, size_t size); + + static void* __cdecl mfcd_vector_new (size_t size); + static void* __cdecl mfcd__vector_new_dbg_4p (size_t size, int type, char const *file, int line); + static void* __cdecl mfcd__vector_new_dbg_3p (size_t size, char const *file, int line); + static void* __cdecl mfcd_scalar_new (size_t size); + static void* __cdecl mfcd__scalar_new_dbg_4p (size_t size, int type, char const *file, int line); + static void* __cdecl mfcd__scalar_new_dbg_3p (size_t size, char const *file, int line); + static void* __cdecl mfcud_vector_new (size_t size); + static void* __cdecl mfcud__vector_new_dbg_4p (size_t size, int type, char const *file, int line); + static void* __cdecl mfcud__vector_new_dbg_3p (size_t size, char const *file, int line); + static void* __cdecl mfcud_scalar_new (size_t size); + static void* __cdecl mfcud__scalar_new_dbg_4p (size_t size, int type, char const *file, int line); + static void* __cdecl mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line); + + template + static void* __cdecl mfcd_new_dbg (UINT_PTR* fp, size_t size, int type, char const *file, int line); + template + static void* __cdecl mfcd_new_dbg (UINT_PTR* fp, size_t size, char const *file, int line); + template + static void* __cdecl mfcd_new (UINT_PTR* fp, size_t size); +}; + + +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Studio DLLs +// +//////////////////////////////////////////////////////////////////////////////// + +// crtd__calloc_dbg - Calls to _calloc_dbg from msvcrXXd.dll are patched +// through to this function. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by _calloc_dbg. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__calloc_dbg (size_t num, + size_t size, + int type, + char const *file, + int line) +{ + static _calloc_dbg_t pcrtxxd__calloc_dbg = NULL; + + UINT_PTR* fp; + HMODULE msvcrxxd; + + ADDRESS_OF_RETURN_ADDRESS(fp); + + if (pcrtxxd__calloc_dbg == NULL) { + // This is the first call to this function. Link to the real + // _calloc_dbg. + msvcrxxd = GetModuleHandle(crtddll); + pcrtxxd__calloc_dbg = (_calloc_dbg_t)GetProcAddress(msvcrxxd, "_calloc_dbg"); + } + + return vld.__calloc_dbg(pcrtxxd__calloc_dbg, fp, num, size, type, file, line); +} + +// crtd__malloc_dbg - Calls to _malloc_dbg from msvcrXXd.dll are patched +// through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by _malloc_dbg. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__malloc_dbg (size_t size, + int type, + char const *file, + int line) +{ + static _malloc_dbg_t pcrtxxd__malloc_dbg = NULL; + + UINT_PTR* fp; + HMODULE msvcrxxd; + + ADDRESS_OF_RETURN_ADDRESS(fp); + + if (pcrtxxd__malloc_dbg == NULL) { + // This is the first call to this function. Link to the real + // _malloc_dbg. + msvcrxxd = GetModuleHandle(crtddll); + pcrtxxd__malloc_dbg = (_malloc_dbg_t)GetProcAddress(msvcrxxd, "_malloc_dbg"); + } + + return vld.__malloc_dbg(pcrtxxd__malloc_dbg, fp, size, type, file, line); +} + +// crtd__realloc_dbg - Calls to _realloc_dbg from msvcrXXd.dll are patched +// through to this function. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by _realloc_dbg. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__realloc_dbg (void *mem, + size_t size, + int type, + char const *file, + int line) +{ + static _realloc_dbg_t pcrtxxd__realloc_dbg = NULL; + + UINT_PTR* fp; + HMODULE msvcrxxd; + + ADDRESS_OF_RETURN_ADDRESS(fp); + + if (pcrtxxd__realloc_dbg == NULL) { + // This is the first call to this function. Link to the real + // _realloc_dbg. + msvcrxxd = GetModuleHandle(crtddll); + pcrtxxd__realloc_dbg = (_realloc_dbg_t)GetProcAddress(msvcrxxd, "_realloc_dbg"); + } + + return vld.__realloc_dbg(pcrtxxd__realloc_dbg, fp, mem, size, type, file, line); +} + +// crtd__scalar_new_dbg - Calls to the CRT's debug scalar new operator from +// msvcrXXd.dll are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the CRT debug scalar new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, + int type, + char const *file, + int line) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return crtd_new_dbg(fp, size, type, file, line); +} + +// crtd__vector_new_dbg - Calls to the CRT's debug vector new operator from +// msvcrXXd.dll are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the CRT debug vector new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, + int type, + char const *file, + int line) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return crtd_new_dbg(fp, size, type, file, line); +} + +// crtd_calloc - Calls to calloc from msvcrXXd.dll are patched through to +// this function. +// +// - dll (IN): The name of the dll +// +// - num (IN): The number of blocks, of size 'size', to be allocated. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the valued returned from calloc. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) +{ + static calloc_t pcrtxxd_calloc = NULL; + + UINT_PTR* fp; + HMODULE msvcrxxd; + + ADDRESS_OF_RETURN_ADDRESS(fp); + + if (pcrtxxd_calloc == NULL) { + // This is the first call to this function. Link to the real malloc. + msvcrxxd = GetModuleHandle(crtddll); + pcrtxxd_calloc = (calloc_t)GetProcAddress(msvcrxxd, "calloc"); + } + + return vld._calloc(pcrtxxd_calloc, fp, num, size); +} + +// crtd_malloc - Calls to malloc from msvcrXXd.dll are patched through to +// this function. +// +// - dll (IN): The name of the dll +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the valued returned from malloc. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd_malloc (size_t size) +{ + static malloc_t pcrtxxd_malloc = NULL; + + UINT_PTR* fp; + HMODULE msvcrxxd; + + ADDRESS_OF_RETURN_ADDRESS(fp); + + if (pcrtxxd_malloc == NULL) { + // This is the first call to this function. Link to the real malloc. + msvcrxxd = GetModuleHandle(crtddll); + pcrtxxd_malloc = (malloc_t)GetProcAddress(msvcrxxd, "malloc"); + } + + return vld._malloc(pcrtxxd_malloc, fp, size); +} + +// crtd_realloc - Calls to realloc from msvcrXXd.dll are patched through to +// this function. +// +// - dll (IN): The name of the dll +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from realloc. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) +{ + static realloc_t pcrtxxd_realloc = NULL; + + UINT_PTR* fp; + HMODULE msvcrxxd; + + ADDRESS_OF_RETURN_ADDRESS(fp); + + if (pcrtxxd_realloc == NULL) { + // This is the first call to this function. Link to the real realloc. + msvcrxxd = GetModuleHandle(crtddll); + pcrtxxd_realloc = (realloc_t)GetProcAddress(msvcrxxd, "realloc"); + } + + return vld._realloc(pcrtxxd_realloc, fp, mem, size); +} + +// crtd_scalar_new - Calls to the CRT's scalar new operator from msvcrXXd.dll +// are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned by the CRT scalar new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd_scalar_new (size_t size) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return crtd_new(fp, size); +} + +// crtd_vector_new - Calls to the CRT's vector new operator from msvcrXXd.dll +// are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned by the CRT vector new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd_vector_new (size_t size) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return crtd_new(fp, size); +} + +// crtd_new_dbg - A template function for implementation of patch functions to +// the CRT's debug new operator from msvcrXXd.dll +// +// - procname (IN): The debug new operator's name +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the CRT debug new operator. +// +TEMPLATE_HEADER +template +void* CrtMfcPatch::crtd_new_dbg (UINT_PTR* fp, + size_t size, + int type, + char const *file, + int line) +{ + static new_dbg_crt_t pcrtxxd_new_dbg = NULL; + + HMODULE msvcrxxd; + + if (pcrtxxd_new_dbg == NULL) { + // This is the first call to this function. Link to the real CRT debug + // new operator. + msvcrxxd = GetModuleHandle(crtddll); + pcrtxxd_new_dbg = (new_dbg_crt_t)GetProcAddress(msvcrxxd, procname); + } + + return vld.new_dbg_crt(pcrtxxd_new_dbg, fp, size, type, file, line); +} + +// crt_new - A template function for implementing patch functions to the +// CRT's new operator from msvcrXXd.dll +// +// - dll (IN): The name of the dll +// +// - procname (IN): The debug new operator's name +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned by the CRT new operator. +// +TEMPLATE_HEADER +template +void* CrtMfcPatch::crtd_new (UINT_PTR* fp, size_t size) +{ + static new_t pcrtxxd_scalar_new = NULL; + + HMODULE msvcrxxd; + + if (pcrtxxd_scalar_new == NULL) { + // This is the first call to this function. Link to the real CRT new + // operator. + msvcrxxd = GetModuleHandle(crtddll); + pcrtxxd_scalar_new = (new_t)GetProcAddress(msvcrxxd, procname); + } + + return vld._new(pcrtxxd_scalar_new, fp, size); +} + +//////////////////////////////////////////////////////////////////////////////// +// +// MFC DLLs +// +//////////////////////////////////////////////////////////////////////////////// + +// mfcd__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from +// mfcXXd.dll are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the MFC debug scalar new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size, + int type, + char const *file, + int line) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new_dbg + (fp, size, type, file, line); +} + +// mfcd__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from +// mfcXXd.dll are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the MFC debug scalar new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size, + char const *file, + int line) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new_dbg + (fp, size, file, line); +} + +// mfcd__vector_new_dbg_4p - Calls to the MFC debug vector new operator from +// mfcXXd.dll are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the MFC debug vector new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size, + int type, + char const *file, + int line) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new_dbg + (fp, size, type, file, line); +} + +// mfcd__vector_new_dbg_3p - Calls to the MFC debug vector new operator from +// mfcXXd.dll are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the MFC debug vector new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, + char const *file, + int line) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new_dbg + (fp, size, file, line); +} + +// mfcd_scalar_new - Calls to the MFC scalar new operator from mfcXXd.dll are +// patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned by the MFC scalar new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcd_scalar_new (size_t size) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new(fp, size); +} + +// mfcd_vector_new - Calls to the MFC vector new operator from mfcXXd.dll are +// patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned by the MFC vector new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcd_vector_new (size_t size) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new(fp, size); +} + +// mfcud__scalar_new_dbg_4p - Calls to the MFC debug scalar new operator from +// mfcXXud.dll are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the MFC debug scalar new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size, + int type, + char const *file, + int line) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new_dbg + (fp, size, type, file, line); +} + +// mfcud__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from +// mfcXXud.dll are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the MFC debug scalar new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size, + char const *file, + int line) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new_dbg + (fp, size, file, line); +} + +// mfcud__vector_new_dbg_4p - Calls to the MFC debug vector new operator from +// mfcXXud.dll are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the MFC debug vector new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size, + int type, + char const *file, + int line) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new_dbg + (fp, size, type, file, line); +} + +// mfcud__vector_new_dbg_3p - Calls to the MFC debug vector new operator from +// mfcXXud.dll are patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the MFC debug vector new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size, + char const *file, + int line) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new_dbg + (fp, size, file, line); +} + +// mfcud_scalar_new - Calls to the MFC scalar new operator from mfcXXud.dll are +// patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned by the MFC scalar new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcud_scalar_new (size_t size) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new(fp, size); +} + +// mfcud_vector_new - Calls to the MFC vector new operator from mfcXXud.dll are +// patched through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned by the MFC vector new operator. +// +TEMPLATE_HEADER +void* CrtMfcPatch::mfcud_vector_new (size_t size) +{ + UINT_PTR* fp; + ADDRESS_OF_RETURN_ADDRESS(fp); + + return mfcd_new(fp, size); +} + +// mfcd_new_dbg - A generic function for implementing patch functions to the MFC +// debug new operators: +// void* __cdecl operator new[](size_t size, int type, char const *file, int line) +// void* __cdecl operator new(size_t size, int type, char const *file, int line) +// +// - mfcdll (IN): The name of the MFC DLL +// +// - ordinal (IN): The debug new operator's ordinal value +// +// - type (IN): The "use type" of the block to be allocated. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the MFC debug new operator. +// +TEMPLATE_HEADER +template +void* CrtMfcPatch::mfcd_new_dbg (UINT_PTR* fp, + size_t size, + int type, + char const *file, + int line) +{ + static new_dbg_crt_t pmfcxxd__new_dbg = NULL; + + HMODULE mfcxxd; + + if (pmfcxxd__new_dbg == NULL) { + // This is the first call to this function. Link to the real MFC debug + // new operator. + mfcxxd = GetModuleHandle(mfcdll); + pmfcxxd__new_dbg = (new_dbg_crt_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); + } + + return vld.new_dbg_mfc(pmfcxxd__new_dbg, fp, size, type, file, line); +} + +// mfcd_new_dbg - A generic function for implementing patch functions to the MFC +// debug new operators: +// void* __cdecl operator new[](size_t size, char const *file, int line) +// void* __cdecl operator new(size_t size, char const *file, int line) +// +// - mfcdll (IN): The name of the MFC DLL +// +// - ordinal (IN): The debug new operator's ordinal value +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the MFC debug new operator. +// +TEMPLATE_HEADER +template +void* CrtMfcPatch::mfcd_new_dbg (UINT_PTR* fp, + size_t size, + char const *file, + int line) +{ + static new_dbg_mfc_t pmfcxxd__new_dbg = NULL; + + HMODULE mfcxxd; + + if (pmfcxxd__new_dbg == NULL) { + // This is the first call to this function. Link to the real MFC debug + // new operator. + mfcxxd = GetModuleHandle(mfcdll); + pmfcxxd__new_dbg = (new_dbg_mfc_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); + } + + return vld.new_dbg_mfc(pmfcxxd__new_dbg, fp, size, file, line); +} + +// mfcd_new - A generic function for implementing patch functions to the MFC new +// operators. +// +// - mfcdll (IN): The name of the MFC DLL +// +// - ordinal (IN): The new operator's ordinal value +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned by the MFC new operator. +// +TEMPLATE_HEADER +template +void* CrtMfcPatch::mfcd_new (UINT_PTR* fp, size_t size) +{ + static new_t pmfcxxd_new = NULL; + + HMODULE mfcxxd; + + if (pmfcxxd_new == NULL) { + // This is the first call to this function. Link to the real CRT new + // operator. + mfcxxd = GetModuleHandle(mfcdll); + pmfcxxd_new = (new_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); + } + + return vld._new(pmfcxxd_new, fp, size); +} + +#undef TEMPLATE_HEADER +#undef TEMPLATE_ARGS + +#ifndef WIN64 +//void * __cdecl operator new(unsigned int,int,char const *,int) +const extern char scalar_new_dbg_name[] = "??2@YAPAXIHPBDH@Z"; +//void * __cdecl operator new[](unsigned int,int,char const *,int) +const extern char vector_new_dbg_name[] = "??_U@YAPAXIHPBDH@Z"; +//void * __cdecl operator new(unsigned int) +const extern char scalar_new_name[] = "??2@YAPAXI@Z"; +//void * __cdecl operator new[](unsigned int) +const extern char vector_new_name[] = "??_U@YAPAXI@Z"; +#else +//void * __ptr64 __cdecl operator new(unsigned __int64,int,char const * __ptr64,int) +const extern char scalar_new_dbg_name[] = "??2@YAPEAX_KHPEBDH@Z"; +//void * __ptr64 __cdecl operator new[](unsigned __int64,int,char const * __ptr64,int) +const extern char vector_new_dbg_name[] = "??_U@YAPEAX_KHPEBDH@Z"; +//void * __ptr64 __cdecl operator new(unsigned __int64) +const extern char scalar_new_name[] = "??2@YAPEAX_K@Z"; +//void * __ptr64 __cdecl operator new[](unsigned __int64) +const extern char vector_new_name[] = "??_U@YAPEAX_K@Z"; +#endif + +const extern wchar_t msvcrtd_dll[] = L"msvcrtd.dll"; +const extern wchar_t mfc42d_dll[] = L"mfc42d.dll"; +const extern wchar_t mfc42ud_dll[] = L"mfc42ud.dll"; +const extern wchar_t msvcr70d_dll[] = L"msvcr70d.dll"; +const extern wchar_t mfc70d_dll[] = L"mfc70d.dll"; +const extern wchar_t mfc70ud_dll[] = L"mfc70ud.dll"; +const extern wchar_t msvcr71d_dll[] = L"msvcr71d.dll"; +const extern wchar_t mfc71d_dll[] = L"mfc71d.dll"; +const extern wchar_t mfc71ud_dll[] = L"mfc71ud.dll"; +const extern wchar_t msvcr80d_dll[] = L"msvcr80d.dll"; +const extern wchar_t mfc80d_dll[] = L"mfc80d.dll"; +const extern wchar_t mfc80ud_dll[] = L"mfc80ud.dll"; +const extern wchar_t msvcr90d_dll[] = L"msvcr90d.dll"; +const extern wchar_t mfc90d_dll[] = L"mfc90d.dll"; +const extern wchar_t mfc90ud_dll[] = L"mfc90ud.dll"; + +// Visual Studio 6.0 +typedef CrtMfcPatch + VS60; +// Visual Studio .NET 2002 +typedef CrtMfcPatch + VS70; +// Visual Studio .NET 2003 +typedef CrtMfcPatch + VS71; +// Visual Studio 2005 +typedef CrtMfcPatch + VS80; +// Visual Studio 2008 +typedef CrtMfcPatch + VS90; diff --git a/map.h b/map.h index 488eaec4..c1c8b137 100644 --- a/map.h +++ b/map.h @@ -1,357 +1,357 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Lightweight STL-like Map Template -// Copyright (c) 2006 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifndef VLDBUILD -#error \ -"This header should only be included by Visual Leak Detector when building it from source. \ -Applications should never include this header." -#endif - -#include "tree.h" // Provides access to the Tree template class. - -//////////////////////////////////////////////////////////////////////////////// -// -// The Pair Template Class -// -// This is a lightweight STL-like pair template, for use with the lightweight -// Map class template. -// -// Note that while this is a STL-like class, it is not a full STL-compliant -// implementation of the STL pair utility class. It provides just the bare -// minimum functionality required by the Visual Leak Detector Map template -// class below. -// -template -class Pair { -public: - // Constructor - Pair () - { - first = Tf(); - second = Ts(); - } - - // Constructor with initializers. - Pair (const Tf &f, const Ts &s) - { - first = f; - second = s; - } - - // Less-than operator - Compares this Pair with another Pair to determine - // if this Pair is less than the other Pair. The Pair with the smallest - // "first" value is the lesser Pair. - // - // - other (IN): The other pair to compare against. - // - // Return Value: - // - // Returns true if this Pair is less than the other Pair. Otherwise - // returns false. - // - BOOL operator < (const Pair &other) const - { - return (first < other.first); - } - - // Public data. - Tf first; // The first value of the pair. - Ts second; // The second value of the pair. -}; - -//////////////////////////////////////////////////////////////////////////////// -// -// The Map Template Class -// -// This is a lightweidht STL-like map template. It makes use of the Tree class -// template to enable fast insert, find, and erase operations. -// -// Note that while this is a STL-like class, it is not a full STL-compliant -// implementation of the STL map container. It contains just the bare minimum -// functionality required by Visual Leak Detector. Because of its "lightweight" -// nature, this map class has a noticeable performance advantage over some -// other standard STL map implementations. -// -template -class Map { -public: - class Iterator { - public: - // Constructor - Iterator () - { - // Plainly constructed iterators don't reference anything. - m_node = NULL; - m_tree = NULL; - } - - // operator != - Inequality operator for Map Iterators. Two Map - // Iterators are considered equal if and only if they both reference - // the same key/value pair in the same Map. - // - // - other (IN): The other Map Iterator to compare against. - // - // Return Value: - // - // Returns true if the specified Map Iterator is not equal to this - // Map Iterator; otherwise, returns false. - // - BOOL operator != (const Iterator &other) const - { - return ((m_tree != other.m_tree) || (m_node != other.m_node)); - } - - // operator * - Dereference operator for Map Iterators. - // - // Note: The reference returned by this function is "const", so the - // value referenced by the Iterator may not be modified through the - // Iterator. This is a departure from STL iterator behavior. - // - // Also, dereferencing an Iterator which does not reference a valid - // value in the Map is undefined and will almost certainly cause a - // crash. - // - // Return Value: - // - // Returns a const reference to the key/value pair in the Map - // referenced by the Iterator. - // - const Pair& operator * () const - { - return m_node->key; - } - - // operator ++ - Prefix increment operator for Map Iterators. Causes the - // Iterator to reference the in-oder successor of the key/value pair - // currently referenced by the Iterator. If the Iterator is currently - // referencing the largest key/value pair in the Map, then the - // resulting Iterator will reference the Map's end (the NULL pair). - // - // Note: Incrementing an Iterator which does not reference a valid - // key/value pair in the Map is undefined and will almost certainly - // cause a crash. - // - // Return Value: - // - // Returns the Iterator after it has been incremented. - // - Iterator& operator ++ (int) - { - m_node = m_tree->next(m_node); - return *this; - } - - // operator ++ - Postfix increment operator for Map Iterators. Causes - // the Iterator to reference the in-order successor of the key/value - // pair currently referenced by the Iterator. If the Iterator is - // currently referencing the largest key/value pair in the Map, then - // the resulting Iterator will reference the Map's end (the NULL - // pair). - // - // Note: Incrementing an Iterator which does not reference a valid - // key/value pair in the Map is undefined and will almost certainly - // cause a crash. - // - // Return Value: - // - // Returns the Iterator before it has been incremented. - // - Iterator operator ++ () - { - typename Tree >::node_t *cur = m_node; - - m_node = m_tree->next(m_node); - return Iterator(m_tree, cur); - } - - // operator - - Subtraction operator for Map Iterators. Causes the - // the Iterator to reference a key/value pair that is an in-order - // predecessor of the currently refereced key/value pair. - // - // - num (IN): Number indicating the number of preceding key/value - // pairs to decrement the iterator. - // - // Return Value: - // - // Returns an Iterator referencing the key/value pair that precedes - // the original Iterator by "num" pairs. - // - Iterator operator - (SIZE_T num) const - { - SIZE_T count; - typename Tree >::node_t *cur = m_node; - - cur = m_tree->prev(m_node); - for (count = 0; count < num; count++) { - cur = m_tree->prev(m_node); - if (cur == NULL) { - return Iterator(m_tree, NULL); - } - } - return Iterator(m_tree, cur); - } - - // operator == - Equality operator for Map Iterators. Map Iterators are - // considered equal if and only if they both refernce the same - // key/value pair in the same Map. - // - // - other (IN): The other Map Iterator to compare against. - // - // Return Value: - // - // Returns true if the specified Map Iterator is equal to this Map - // Iterator; otherwise returns false. - // - BOOL operator == (const Iterator &other) const - { - return ((m_tree == other.m_tree) && (m_node == other.m_node)); - } - - private: - // Private constructor. Only the Map class itself may use this - // constructor. It is used for constructing Iterators which reference - // specific nodes in the internal tree's structure. - Iterator (const Tree > *tree, typename Tree >::node_t *node) - { - m_node = node; - m_tree = tree; - } - - typename Tree >::node_t *m_node; // Pointer to the node referenced by the Map Iterator. - const Tree > *m_tree; // Pointer to the tree containing the referenced node. - - // The Map class is a friend of Map Iterators. - friend class Map; - }; - - // begin - Obtains an Iterator referencing the beginning of the Map (i.e. - // the lowest key/value pair currently stored in the Map). - // - // Return Value: - // - // Returns an Iterator referencing the first key/value pair in the Map. - // If no key/value pairs are currenly stored in the map, returns the - // "NULL" Iterator. - // - Iterator begin () const - { - return Iterator(&m_tree, m_tree.begin()); - } - - // end - Obtains an Iterator referencing the end of the Map. The end of - // the map does not reference an actual key/value pair. Instead it - // represents a "null" key/value pair which signifies the end (i.e. just - // beyond largest key/value pair currently stored in the Map). Also - // known as the "NULL" Iterator. - // - // Return Value: - // - // Returns the "NULL" Iterator, signifying the end of the Map. - // - Iterator end () const - { - return Iterator(&m_tree, NULL); - } - - // erase - Erases a key/value pair from the map. - // - // - it (IN): Iterator referencing the key/value pair to be erased from - // the map. - // - // Return Value: - // - // None. - // - VOID erase (Iterator& it) - { - m_tree.erase(it.m_node); - } - - // erase - Erases a key/value pair from the map. - // - // - key (IN): The key corresponding to the key/value pair to be erased - // from the map. - // - // Return Value: - // - // None. - // - VOID erase (const Tk &key) - { - m_tree.erase(Pair(key, Tv())); - } - - // find - Finds a key/value pair in the map. - // - // - key (IN): The key corresponding to the key/value pair to be found. - // - // Return Value: - // - // Returns an Iterator referencing the found key/value pair. If no - // key/value pair with the specified key could be found, then the "NULL" - // Iterator is returned. - // - Iterator find (const Tk &key) const - { - return Iterator(&m_tree, m_tree.find(Pair(key, Tv()))); - } - - // insert - Inserts a key/value pair into the map. - // - // - key (IN): The key of the key/value pair to be inserted. - // - // - data (IN): The value of the key/value pair to be inserted. - // - // Return Value: - // - // Returns an Iterator referencing the resulting key/value pair after - // if has been inserted into the map. - // - Iterator insert (const Tk &key, const Tv &data) - { - return Iterator(&m_tree, m_tree.insert(Pair(key, data))); - } - - // reserve - Sets the reserve size of the map. The reserve size is the - // number of key/value pairs for which space should be pre-allocated - // to avoid frequent heap hits when inserting new key/value pairs into - // the map. - // - // - count (IN): The number of key/value pairs for which to reserve space - // in advance. - // - // Return Value: - // - // Returns the reserve size previously in use by the map. - // - size_t reserve (size_t count) - { - return m_tree.reserve(count); - } - -private: - // Private data - Tree > m_tree; // The key/value pairs are actually stored in a tree. -}; +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Lightweight STL-like Map Template +// Copyright (c) 2006 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifndef VLDBUILD +#error \ +"This header should only be included by Visual Leak Detector when building it from source. \ +Applications should never include this header." +#endif + +#include "tree.h" // Provides access to the Tree template class. + +//////////////////////////////////////////////////////////////////////////////// +// +// The Pair Template Class +// +// This is a lightweight STL-like pair template, for use with the lightweight +// Map class template. +// +// Note that while this is a STL-like class, it is not a full STL-compliant +// implementation of the STL pair utility class. It provides just the bare +// minimum functionality required by the Visual Leak Detector Map template +// class below. +// +template +class Pair { +public: + // Constructor + Pair () + { + first = Tf(); + second = Ts(); + } + + // Constructor with initializers. + Pair (const Tf &f, const Ts &s) + { + first = f; + second = s; + } + + // Less-than operator - Compares this Pair with another Pair to determine + // if this Pair is less than the other Pair. The Pair with the smallest + // "first" value is the lesser Pair. + // + // - other (IN): The other pair to compare against. + // + // Return Value: + // + // Returns true if this Pair is less than the other Pair. Otherwise + // returns false. + // + BOOL operator < (const Pair &other) const + { + return (first < other.first); + } + + // Public data. + Tf first; // The first value of the pair. + Ts second; // The second value of the pair. +}; + +//////////////////////////////////////////////////////////////////////////////// +// +// The Map Template Class +// +// This is a lightweidht STL-like map template. It makes use of the Tree class +// template to enable fast insert, find, and erase operations. +// +// Note that while this is a STL-like class, it is not a full STL-compliant +// implementation of the STL map container. It contains just the bare minimum +// functionality required by Visual Leak Detector. Because of its "lightweight" +// nature, this map class has a noticeable performance advantage over some +// other standard STL map implementations. +// +template +class Map { +public: + class Iterator { + public: + // Constructor + Iterator () + { + // Plainly constructed iterators don't reference anything. + m_node = NULL; + m_tree = NULL; + } + + // operator != - Inequality operator for Map Iterators. Two Map + // Iterators are considered equal if and only if they both reference + // the same key/value pair in the same Map. + // + // - other (IN): The other Map Iterator to compare against. + // + // Return Value: + // + // Returns true if the specified Map Iterator is not equal to this + // Map Iterator; otherwise, returns false. + // + BOOL operator != (const Iterator &other) const + { + return ((m_tree != other.m_tree) || (m_node != other.m_node)); + } + + // operator * - Dereference operator for Map Iterators. + // + // Note: The reference returned by this function is "const", so the + // value referenced by the Iterator may not be modified through the + // Iterator. This is a departure from STL iterator behavior. + // + // Also, dereferencing an Iterator which does not reference a valid + // value in the Map is undefined and will almost certainly cause a + // crash. + // + // Return Value: + // + // Returns a const reference to the key/value pair in the Map + // referenced by the Iterator. + // + const Pair& operator * () const + { + return m_node->key; + } + + // operator ++ - Prefix increment operator for Map Iterators. Causes the + // Iterator to reference the in-oder successor of the key/value pair + // currently referenced by the Iterator. If the Iterator is currently + // referencing the largest key/value pair in the Map, then the + // resulting Iterator will reference the Map's end (the NULL pair). + // + // Note: Incrementing an Iterator which does not reference a valid + // key/value pair in the Map is undefined and will almost certainly + // cause a crash. + // + // Return Value: + // + // Returns the Iterator after it has been incremented. + // + Iterator& operator ++ (int) + { + m_node = m_tree->next(m_node); + return *this; + } + + // operator ++ - Postfix increment operator for Map Iterators. Causes + // the Iterator to reference the in-order successor of the key/value + // pair currently referenced by the Iterator. If the Iterator is + // currently referencing the largest key/value pair in the Map, then + // the resulting Iterator will reference the Map's end (the NULL + // pair). + // + // Note: Incrementing an Iterator which does not reference a valid + // key/value pair in the Map is undefined and will almost certainly + // cause a crash. + // + // Return Value: + // + // Returns the Iterator before it has been incremented. + // + Iterator operator ++ () + { + typename Tree >::node_t *cur = m_node; + + m_node = m_tree->next(m_node); + return Iterator(m_tree, cur); + } + + // operator - - Subtraction operator for Map Iterators. Causes the + // the Iterator to reference a key/value pair that is an in-order + // predecessor of the currently refereced key/value pair. + // + // - num (IN): Number indicating the number of preceding key/value + // pairs to decrement the iterator. + // + // Return Value: + // + // Returns an Iterator referencing the key/value pair that precedes + // the original Iterator by "num" pairs. + // + Iterator operator - (SIZE_T num) const + { + SIZE_T count; + typename Tree >::node_t *cur = m_node; + + cur = m_tree->prev(m_node); + for (count = 0; count < num; count++) { + cur = m_tree->prev(m_node); + if (cur == NULL) { + return Iterator(m_tree, NULL); + } + } + return Iterator(m_tree, cur); + } + + // operator == - Equality operator for Map Iterators. Map Iterators are + // considered equal if and only if they both refernce the same + // key/value pair in the same Map. + // + // - other (IN): The other Map Iterator to compare against. + // + // Return Value: + // + // Returns true if the specified Map Iterator is equal to this Map + // Iterator; otherwise returns false. + // + BOOL operator == (const Iterator &other) const + { + return ((m_tree == other.m_tree) && (m_node == other.m_node)); + } + + private: + // Private constructor. Only the Map class itself may use this + // constructor. It is used for constructing Iterators which reference + // specific nodes in the internal tree's structure. + Iterator (const Tree > *tree, typename Tree >::node_t *node) + { + m_node = node; + m_tree = tree; + } + + typename Tree >::node_t *m_node; // Pointer to the node referenced by the Map Iterator. + const Tree > *m_tree; // Pointer to the tree containing the referenced node. + + // The Map class is a friend of Map Iterators. + friend class Map; + }; + + // begin - Obtains an Iterator referencing the beginning of the Map (i.e. + // the lowest key/value pair currently stored in the Map). + // + // Return Value: + // + // Returns an Iterator referencing the first key/value pair in the Map. + // If no key/value pairs are currenly stored in the map, returns the + // "NULL" Iterator. + // + Iterator begin () const + { + return Iterator(&m_tree, m_tree.begin()); + } + + // end - Obtains an Iterator referencing the end of the Map. The end of + // the map does not reference an actual key/value pair. Instead it + // represents a "null" key/value pair which signifies the end (i.e. just + // beyond largest key/value pair currently stored in the Map). Also + // known as the "NULL" Iterator. + // + // Return Value: + // + // Returns the "NULL" Iterator, signifying the end of the Map. + // + Iterator end () const + { + return Iterator(&m_tree, NULL); + } + + // erase - Erases a key/value pair from the map. + // + // - it (IN): Iterator referencing the key/value pair to be erased from + // the map. + // + // Return Value: + // + // None. + // + VOID erase (Iterator& it) + { + m_tree.erase(it.m_node); + } + + // erase - Erases a key/value pair from the map. + // + // - key (IN): The key corresponding to the key/value pair to be erased + // from the map. + // + // Return Value: + // + // None. + // + VOID erase (const Tk &key) + { + m_tree.erase(Pair(key, Tv())); + } + + // find - Finds a key/value pair in the map. + // + // - key (IN): The key corresponding to the key/value pair to be found. + // + // Return Value: + // + // Returns an Iterator referencing the found key/value pair. If no + // key/value pair with the specified key could be found, then the "NULL" + // Iterator is returned. + // + Iterator find (const Tk &key) const + { + return Iterator(&m_tree, m_tree.find(Pair(key, Tv()))); + } + + // insert - Inserts a key/value pair into the map. + // + // - key (IN): The key of the key/value pair to be inserted. + // + // - data (IN): The value of the key/value pair to be inserted. + // + // Return Value: + // + // Returns an Iterator referencing the resulting key/value pair after + // if has been inserted into the map. + // + Iterator insert (const Tk &key, const Tv &data) + { + return Iterator(&m_tree, m_tree.insert(Pair(key, data))); + } + + // reserve - Sets the reserve size of the map. The reserve size is the + // number of key/value pairs for which space should be pre-allocated + // to avoid frequent heap hits when inserting new key/value pairs into + // the map. + // + // - count (IN): The number of key/value pairs for which to reserve space + // in advance. + // + // Return Value: + // + // Returns the reserve size previously in use by the map. + // + size_t reserve (size_t count) + { + return m_tree.reserve(count); + } + +private: + // Private data + Tree > m_tree; // The key/value pairs are actually stored in a tree. +}; diff --git a/mfc/README.txt b/mfc/README.txt index 2283ea35..06f14dc3 100644 --- a/mfc/README.txt +++ b/mfc/README.txt @@ -1,28 +1,28 @@ -Visual Leak Detector MFC Example (Version 1.0.1) - - Example Program Using Visual Leak Detector in an MFC Application - - -About The MFC Example Program: ------------------------------- -This is an example Visual C++ 6.0 MFC project that implements the Visual -Leak Detector. - -To build the example project, simply open the project file and start a build. - -After the project is built, running the program will pop up a simple -dialog box. If you leave the "Leak Some Memory" box checked, the program -will leak a small amount of memory as it exits. If you run the program -under the Visual C++ debugger, you should see a memory leak report in the -debug output window after the program exits. The report will include -detailed stack traces of the calls that allocated the leaked memory blocks. - -Double-clicking on a source file/line number in the stack trace will take you to -that file and line in the editor. This allows you to quickly see where in the -program the memory was allocated and how it got there. - - -Documentation: --------------- - -See the README.html file for the complete Visual Leak Detector documentation. +Visual Leak Detector MFC Example (Version 1.0.1) + + Example Program Using Visual Leak Detector in an MFC Application + + +About The MFC Example Program: +------------------------------ +This is an example Visual C++ 6.0 MFC project that implements the Visual +Leak Detector. + +To build the example project, simply open the project file and start a build. + +After the project is built, running the program will pop up a simple +dialog box. If you leave the "Leak Some Memory" box checked, the program +will leak a small amount of memory as it exits. If you run the program +under the Visual C++ debugger, you should see a memory leak report in the +debug output window after the program exits. The report will include +detailed stack traces of the calls that allocated the leaked memory blocks. + +Double-clicking on a source file/line number in the stack trace will take you to +that file and line in the editor. This allows you to quickly see where in the +program the memory was allocated and how it got there. + + +Documentation: +-------------- + +See the README.html file for the complete Visual Leak Detector documentation. diff --git a/mfc/StdAfx.cpp b/mfc/StdAfx.cpp index fca51d9c..52f38aae 100644 --- a/mfc/StdAfx.cpp +++ b/mfc/StdAfx.cpp @@ -1,8 +1,8 @@ -// source file that includes just the standard includes -// vldmfc.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - - - +// source file that includes just the standard includes +// vldmfc.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + + + diff --git a/mfc/StdAfx.h b/mfc/StdAfx.h index 01a2e1ae..33d88926 100644 --- a/mfc/StdAfx.h +++ b/mfc/StdAfx.h @@ -1,27 +1,27 @@ -// include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_) -#define AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers - -#include // MFC core and standard components -#include // MFC extensions -#include // MFC support for Internet Explorer 4 Common Controls -#ifndef _AFX_NO_AFXCMN_SUPPORT -#include // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT - - - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_) +// include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#if !defined(AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_) +#define AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers + +#include // MFC core and standard components +#include // MFC extensions +#include // MFC support for Internet Explorer 4 Common Controls +#ifndef _AFX_NO_AFXCMN_SUPPORT +#include // MFC support for Windows Common Controls +#endif // _AFX_NO_AFXCMN_SUPPORT + + + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_) diff --git a/mfc/res/vldmfc.rc2 b/mfc/res/vldmfc.rc2 index 803d2e47..99777388 100644 --- a/mfc/res/vldmfc.rc2 +++ b/mfc/res/vldmfc.rc2 @@ -1,13 +1,13 @@ -// -// VLDMFC.RC2 - resources Microsoft Visual C++ does not edit directly -// - -#ifdef APSTUDIO_INVOKED - #error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// Add manually edited resources here... - -///////////////////////////////////////////////////////////////////////////// +// +// VLDMFC.RC2 - resources Microsoft Visual C++ does not edit directly +// + +#ifdef APSTUDIO_INVOKED + #error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// Add manually edited resources here... + +///////////////////////////////////////////////////////////////////////////// diff --git a/mfc/resource.h b/mfc/resource.h index 23db3670..016c8c5d 100644 --- a/mfc/resource.h +++ b/mfc/resource.h @@ -1,21 +1,21 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by vldmfc.rc -// -#define IDM_ABOUTBOX 0x0010 -#define IDD_ABOUTBOX 100 -#define IDS_ABOUTBOX 101 -#define IDD_VLDMFC_DIALOG 102 -#define IDR_MAINFRAME 128 -#define IDC_CHECK_LEAK 1002 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 129 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1003 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by vldmfc.rc +// +#define IDM_ABOUTBOX 0x0010 +#define IDD_ABOUTBOX 100 +#define IDS_ABOUTBOX 101 +#define IDD_VLDMFC_DIALOG 102 +#define IDR_MAINFRAME 128 +#define IDC_CHECK_LEAK 1002 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 129 +#define _APS_NEXT_COMMAND_VALUE 32771 +#define _APS_NEXT_CONTROL_VALUE 1003 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/mfc/vldmfc.cpp b/mfc/vldmfc.cpp index 8d015beb..9ba6a79e 100644 --- a/mfc/vldmfc.cpp +++ b/mfc/vldmfc.cpp @@ -1,71 +1,71 @@ -#include "stdafx.h" -#include "vldmfc.h" -#include "vldmfcdlg.h" - -// Include Visual Leak Detector -#include - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CMFCExampleApp - -BEGIN_MESSAGE_MAP(CMFCExampleApp, CWinApp) - //{{AFX_MSG_MAP(CMFCExampleApp) - // NOTE - the ClassWizard will add and remove mapping macros here. - // DO NOT EDIT what you see in these blocks of generated code! - //}}AFX_MSG - ON_COMMAND(ID_HELP, CWinApp::OnHelp) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CMFCExampleApp construction - -CMFCExampleApp::CMFCExampleApp() -{ - // TODO: add construction code here, - // Place all significant initialization in InitInstance -} - -///////////////////////////////////////////////////////////////////////////// -// The one and only CMFCExampleApp object - -CMFCExampleApp theApp; - -///////////////////////////////////////////////////////////////////////////// -// CMFCExampleApp initialization - -BOOL CMFCExampleApp::InitInstance() -{ - // Standard initialization - // If you are not using these features and wish to reduce the size - // of your final executable, you should remove from the following - // the specific initialization routines you do not need. - - CMFCExampleDlg dlg; - m_pMainWnd = &dlg; - int nResponse = dlg.DoModal(); - if (nResponse == IDOK) - { - // TODO: Place code here to handle when the dialog is - // dismissed with OK - CString *s = new CString("Hello World!\n"); - - if (!dlg.m_bLeak) { - delete s; - } - } - else if (nResponse == IDCANCEL) - { - // TODO: Place code here to handle when the dialog is - // dismissed with Cancel - } - - // Since the dialog has been closed, return FALSE so that we exit the - // application, rather than start the application's message pump. - return FALSE; -} +#include "stdafx.h" +#include "vldmfc.h" +#include "vldmfcdlg.h" + +// Include Visual Leak Detector +#include + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp + +BEGIN_MESSAGE_MAP(CMFCExampleApp, CWinApp) + //{{AFX_MSG_MAP(CMFCExampleApp) + // NOTE - the ClassWizard will add and remove mapping macros here. + // DO NOT EDIT what you see in these blocks of generated code! + //}}AFX_MSG + ON_COMMAND(ID_HELP, CWinApp::OnHelp) +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp construction + +CMFCExampleApp::CMFCExampleApp() +{ + // TODO: add construction code here, + // Place all significant initialization in InitInstance +} + +///////////////////////////////////////////////////////////////////////////// +// The one and only CMFCExampleApp object + +CMFCExampleApp theApp; + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp initialization + +BOOL CMFCExampleApp::InitInstance() +{ + // Standard initialization + // If you are not using these features and wish to reduce the size + // of your final executable, you should remove from the following + // the specific initialization routines you do not need. + + CMFCExampleDlg dlg; + m_pMainWnd = &dlg; + int nResponse = dlg.DoModal(); + if (nResponse == IDOK) + { + // TODO: Place code here to handle when the dialog is + // dismissed with OK + CString *s = new CString("Hello World!\n"); + + if (!dlg.m_bLeak) { + delete s; + } + } + else if (nResponse == IDCANCEL) + { + // TODO: Place code here to handle when the dialog is + // dismissed with Cancel + } + + // Since the dialog has been closed, return FALSE so that we exit the + // application, rather than start the application's message pump. + return FALSE; +} diff --git a/mfc/vldmfc.h b/mfc/vldmfc.h index 133f84bb..9edfd2aa 100644 --- a/mfc/vldmfc.h +++ b/mfc/vldmfc.h @@ -1,46 +1,46 @@ -#if !defined(AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_) -#define AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#ifndef __AFXWIN_H__ - #error include 'stdafx.h' before including this file for PCH -#endif - -#include "resource.h" // main symbols - -///////////////////////////////////////////////////////////////////////////// -// CMFCExampleApp: -// See vldmfc.cpp for the implementation of this class -// - -class CMFCExampleApp : public CWinApp -{ -public: - CMFCExampleApp(); - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CMFCExampleApp) - public: - virtual BOOL InitInstance(); - //}}AFX_VIRTUAL - -// Implementation - - //{{AFX_MSG(CMFCExampleApp) - // NOTE - the ClassWizard will add and remove member functions here. - // DO NOT EDIT what you see in these blocks of generated code ! - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_) +#if !defined(AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_) +#define AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +#ifndef __AFXWIN_H__ + #error include 'stdafx.h' before including this file for PCH +#endif + +#include "resource.h" // main symbols + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp: +// See vldmfc.cpp for the implementation of this class +// + +class CMFCExampleApp : public CWinApp +{ +public: + CMFCExampleApp(); + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CMFCExampleApp) + public: + virtual BOOL InitInstance(); + //}}AFX_VIRTUAL + +// Implementation + + //{{AFX_MSG(CMFCExampleApp) + // NOTE - the ClassWizard will add and remove member functions here. + // DO NOT EDIT what you see in these blocks of generated code ! + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + + +///////////////////////////////////////////////////////////////////////////// + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_) diff --git a/mfc/vldmfc.rc b/mfc/vldmfc.rc index 1ba4fb2e..53223679 100644 --- a/mfc/vldmfc.rc +++ b/mfc/vldmfc.rc @@ -1,210 +1,210 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "#define _AFX_NO_SPLITTER_RESOURCES\r\n" - "#define _AFX_NO_OLE_RESOURCES\r\n" - "#define _AFX_NO_TRACKER_RESOURCES\r\n" - "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#endif //_WIN32\r\n" - "#include ""res\\vldmfc.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#endif\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDR_MAINFRAME ICON DISCARDABLE "res\\vldmfc.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 235, 55 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About Visual Leak Detector MFC Example" -FONT 8, "MS Sans Serif" -BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 - LTEXT "Visual Leak Detector MFC Example Version 1.0.1", - IDC_STATIC,40,14,156,8,SS_NOPREFIX - LTEXT "Copyright (C) 2005 Dan Moulding",IDC_STATIC,40,31,119,8 - DEFPUSHBUTTON "OK",IDOK,178,34,50,14,WS_GROUP -END - -IDD_VLDMFC_DIALOG DIALOGEX 0, 0, 181, 43 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_APPWINDOW -CAPTION "Visual Leak Detector MFC Example" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,112,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,112,23,50,14 - CONTROL "Leak Some Memory",IDC_CHECK_LEAK,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,19,16,79,10 -END - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,1,1 - PRODUCTVERSION 1,0,1,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "This software is copyright (c) 2005 Dan Moulding and is distributed under the terms of the GNU Lesser Public License\0" - VALUE "CompanyName", "\0" - VALUE "FileDescription", "Visual Leak Detector MFC Example\0" - VALUE "FileVersion", "1, 0, 1, 1\0" - VALUE "InternalName", "vldmfc\0" - VALUE "LegalCopyright", "Copyright (C) 2005\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "vldmfc.exe\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Visual Leak Detector MFC Example\0" - VALUE "ProductVersion", "1, 0, 1, 1\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 228 - TOPMARGIN, 7 - BOTTOMMARGIN, 48 - END - - IDD_VLDMFC_DIALOG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 174 - TOPMARGIN, 7 - BOTTOMMARGIN, 36 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_ABOUTBOX "&About Visual Leak Detector MFC Example..." -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#define _AFX_NO_SPLITTER_RESOURCES -#define _AFX_NO_OLE_RESOURCES -#define _AFX_NO_TRACKER_RESOURCES -#define _AFX_NO_PROPERTY_RESOURCES - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE 9, 1 -#pragma code_page(1252) -#endif //_WIN32 -#include "res\vldmfc.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#endif - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#define _AFX_NO_SPLITTER_RESOURCES\r\n" + "#define _AFX_NO_OLE_RESOURCES\r\n" + "#define _AFX_NO_TRACKER_RESOURCES\r\n" + "#define _AFX_NO_PROPERTY_RESOURCES\r\n" + "\r\n" + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" + "#ifdef _WIN32\r\n" + "LANGUAGE 9, 1\r\n" + "#pragma code_page(1252)\r\n" + "#endif //_WIN32\r\n" + "#include ""res\\vldmfc.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""afxres.rc"" // Standard components\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDR_MAINFRAME ICON DISCARDABLE "res\\vldmfc.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 235, 55 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About Visual Leak Detector MFC Example" +FONT 8, "MS Sans Serif" +BEGIN + ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 + LTEXT "Visual Leak Detector MFC Example Version 1.0.1", + IDC_STATIC,40,14,156,8,SS_NOPREFIX + LTEXT "Copyright (C) 2005 Dan Moulding",IDC_STATIC,40,31,119,8 + DEFPUSHBUTTON "OK",IDOK,178,34,50,14,WS_GROUP +END + +IDD_VLDMFC_DIALOG DIALOGEX 0, 0, 181, 43 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Visual Leak Detector MFC Example" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,112,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,112,23,50,14 + CONTROL "Leak Some Memory",IDC_CHECK_LEAK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,19,16,79,10 +END + + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,1,1 + PRODUCTVERSION 1,0,1,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "This software is copyright (c) 2005 Dan Moulding and is distributed under the terms of the GNU Lesser Public License\0" + VALUE "CompanyName", "\0" + VALUE "FileDescription", "Visual Leak Detector MFC Example\0" + VALUE "FileVersion", "1, 0, 1, 1\0" + VALUE "InternalName", "vldmfc\0" + VALUE "LegalCopyright", "Copyright (C) 2005\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "vldmfc.exe\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Visual Leak Detector MFC Example\0" + VALUE "ProductVersion", "1, 0, 1, 1\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 228 + TOPMARGIN, 7 + BOTTOMMARGIN, 48 + END + + IDD_VLDMFC_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 174 + TOPMARGIN, 7 + BOTTOMMARGIN, 36 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ABOUTBOX "&About Visual Leak Detector MFC Example..." +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#define _AFX_NO_SPLITTER_RESOURCES +#define _AFX_NO_OLE_RESOURCES +#define _AFX_NO_TRACKER_RESOURCES +#define _AFX_NO_PROPERTY_RESOURCES + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE 9, 1 +#pragma code_page(1252) +#endif //_WIN32 +#include "res\vldmfc.rc2" // non-Microsoft Visual C++ edited resources +#include "afxres.rc" // Standard components +#endif + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/mfc/vldmfc.sln b/mfc/vldmfc.sln index f3db54d3..c7c5d643 100755 --- a/mfc/vldmfc.sln +++ b/mfc/vldmfc.sln @@ -1,20 +1,20 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "vldmfc.vcproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "vldmfc.vcproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/mfc/vldmfc.vcproj b/mfc/vldmfc.vcproj index 84a40fc5..02aa5448 100755 --- a/mfc/vldmfc.vcproj +++ b/mfc/vldmfc.vcproj @@ -1,353 +1,353 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mfc/vldmfcdlg.cpp b/mfc/vldmfcdlg.cpp index 30677908..dfd3cfe3 100644 --- a/mfc/vldmfcdlg.cpp +++ b/mfc/vldmfcdlg.cpp @@ -1,169 +1,169 @@ -#include "stdafx.h" -#include "vldmfc.h" -#include "vldmfcdlg.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CAboutDlg dialog used for App About - -class CAboutDlg : public CDialog -{ -public: - CAboutDlg(); - - // Dialog Data - //{{AFX_DATA(CAboutDlg) - enum { IDD = IDD_ABOUTBOX }; - //}}AFX_DATA - - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CAboutDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - - // Implementation -protected: - //{{AFX_MSG(CAboutDlg) - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) -{ - //{{AFX_DATA_INIT(CAboutDlg) - //}}AFX_DATA_INIT -} - -void CAboutDlg::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CAboutDlg) - //}}AFX_DATA_MAP -} - -BEGIN_MESSAGE_MAP(CAboutDlg, CDialog) - //{{AFX_MSG_MAP(CAboutDlg) - // No message handlers - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CMFCExampleDlg dialog - -CMFCExampleDlg::CMFCExampleDlg(CWnd* pParent /*=NULL*/) - : CDialog(CMFCExampleDlg::IDD, pParent) -{ - //{{AFX_DATA_INIT(CMFCExampleDlg) - m_bLeak = FALSE; - //}}AFX_DATA_INIT - // Note that LoadIcon does not require a subsequent DestroyIcon in Win32 - m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); -} - -void CMFCExampleDlg::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CMFCExampleDlg) - DDX_Check(pDX, IDC_CHECK_LEAK, m_bLeak); - //}}AFX_DATA_MAP -} - -BEGIN_MESSAGE_MAP(CMFCExampleDlg, CDialog) - //{{AFX_MSG_MAP(CMFCExampleDlg) - ON_WM_SYSCOMMAND() - ON_WM_PAINT() - ON_WM_QUERYDRAGICON() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CMFCExampleDlg message handlers - -BOOL CMFCExampleDlg::OnInitDialog() -{ - CDialog::OnInitDialog(); - - // Add "About..." menu item to system menu. - - // IDM_ABOUTBOX must be in the system command range. - ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); - ASSERT(IDM_ABOUTBOX < 0xF000); - - CMenu* pSysMenu = GetSystemMenu(FALSE); - if (pSysMenu != NULL) - { - CString strAboutMenu; - strAboutMenu.LoadString(IDS_ABOUTBOX); - if (!strAboutMenu.IsEmpty()) - { - pSysMenu->AppendMenu(MF_SEPARATOR); - pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu); - } - } - - // Set the icon for this dialog. The framework does this automatically - // when the application's main window is not a dialog - SetIcon(m_hIcon, TRUE); // Set big icon - SetIcon(m_hIcon, FALSE); // Set small icon - - // TODO: Add extra initialization here - m_bLeak = TRUE; - UpdateData(FALSE); - - return TRUE; // return TRUE unless you set the focus to a control -} - -void CMFCExampleDlg::OnSysCommand(UINT nID, LPARAM lParam) -{ - if ((nID & 0xFFF0) == IDM_ABOUTBOX) - { - CAboutDlg dlgAbout; - dlgAbout.DoModal(); - } - else - { - CDialog::OnSysCommand(nID, lParam); - } -} - -// If you add a minimize button to your dialog, you will need the code below -// to draw the icon. For MFC applications using the document/view model, -// this is automatically done for you by the framework. - -void CMFCExampleDlg::OnPaint() -{ - if (IsIconic()) - { - CPaintDC dc(this); // device context for painting - - SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0); - - // Center icon in client rectangle - int cxIcon = GetSystemMetrics(SM_CXICON); - int cyIcon = GetSystemMetrics(SM_CYICON); - CRect rect; - GetClientRect(&rect); - int x = (rect.Width() - cxIcon + 1) / 2; - int y = (rect.Height() - cyIcon + 1) / 2; - - // Draw the icon - dc.DrawIcon(x, y, m_hIcon); - } - else - { - CDialog::OnPaint(); - } -} - -// The system calls this to obtain the cursor to display while the user drags -// the minimized window. -HCURSOR CMFCExampleDlg::OnQueryDragIcon() -{ - return (HCURSOR) m_hIcon; -} +#include "stdafx.h" +#include "vldmfc.h" +#include "vldmfcdlg.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +///////////////////////////////////////////////////////////////////////////// +// CAboutDlg dialog used for App About + +class CAboutDlg : public CDialog +{ +public: + CAboutDlg(); + + // Dialog Data + //{{AFX_DATA(CAboutDlg) + enum { IDD = IDD_ABOUTBOX }; + //}}AFX_DATA + + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CAboutDlg) + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + + // Implementation +protected: + //{{AFX_MSG(CAboutDlg) + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + +CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) +{ + //{{AFX_DATA_INIT(CAboutDlg) + //}}AFX_DATA_INIT +} + +void CAboutDlg::DoDataExchange(CDataExchange* pDX) +{ + CDialog::DoDataExchange(pDX); + //{{AFX_DATA_MAP(CAboutDlg) + //}}AFX_DATA_MAP +} + +BEGIN_MESSAGE_MAP(CAboutDlg, CDialog) + //{{AFX_MSG_MAP(CAboutDlg) + // No message handlers + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleDlg dialog + +CMFCExampleDlg::CMFCExampleDlg(CWnd* pParent /*=NULL*/) + : CDialog(CMFCExampleDlg::IDD, pParent) +{ + //{{AFX_DATA_INIT(CMFCExampleDlg) + m_bLeak = FALSE; + //}}AFX_DATA_INIT + // Note that LoadIcon does not require a subsequent DestroyIcon in Win32 + m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); +} + +void CMFCExampleDlg::DoDataExchange(CDataExchange* pDX) +{ + CDialog::DoDataExchange(pDX); + //{{AFX_DATA_MAP(CMFCExampleDlg) + DDX_Check(pDX, IDC_CHECK_LEAK, m_bLeak); + //}}AFX_DATA_MAP +} + +BEGIN_MESSAGE_MAP(CMFCExampleDlg, CDialog) + //{{AFX_MSG_MAP(CMFCExampleDlg) + ON_WM_SYSCOMMAND() + ON_WM_PAINT() + ON_WM_QUERYDRAGICON() + //}}AFX_MSG_MAP +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleDlg message handlers + +BOOL CMFCExampleDlg::OnInitDialog() +{ + CDialog::OnInitDialog(); + + // Add "About..." menu item to system menu. + + // IDM_ABOUTBOX must be in the system command range. + ASSERT((IDM_ABOUTBOX & 0xFFF0) == IDM_ABOUTBOX); + ASSERT(IDM_ABOUTBOX < 0xF000); + + CMenu* pSysMenu = GetSystemMenu(FALSE); + if (pSysMenu != NULL) + { + CString strAboutMenu; + strAboutMenu.LoadString(IDS_ABOUTBOX); + if (!strAboutMenu.IsEmpty()) + { + pSysMenu->AppendMenu(MF_SEPARATOR); + pSysMenu->AppendMenu(MF_STRING, IDM_ABOUTBOX, strAboutMenu); + } + } + + // Set the icon for this dialog. The framework does this automatically + // when the application's main window is not a dialog + SetIcon(m_hIcon, TRUE); // Set big icon + SetIcon(m_hIcon, FALSE); // Set small icon + + // TODO: Add extra initialization here + m_bLeak = TRUE; + UpdateData(FALSE); + + return TRUE; // return TRUE unless you set the focus to a control +} + +void CMFCExampleDlg::OnSysCommand(UINT nID, LPARAM lParam) +{ + if ((nID & 0xFFF0) == IDM_ABOUTBOX) + { + CAboutDlg dlgAbout; + dlgAbout.DoModal(); + } + else + { + CDialog::OnSysCommand(nID, lParam); + } +} + +// If you add a minimize button to your dialog, you will need the code below +// to draw the icon. For MFC applications using the document/view model, +// this is automatically done for you by the framework. + +void CMFCExampleDlg::OnPaint() +{ + if (IsIconic()) + { + CPaintDC dc(this); // device context for painting + + SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0); + + // Center icon in client rectangle + int cxIcon = GetSystemMetrics(SM_CXICON); + int cyIcon = GetSystemMetrics(SM_CYICON); + CRect rect; + GetClientRect(&rect); + int x = (rect.Width() - cxIcon + 1) / 2; + int y = (rect.Height() - cyIcon + 1) / 2; + + // Draw the icon + dc.DrawIcon(x, y, m_hIcon); + } + else + { + CDialog::OnPaint(); + } +} + +// The system calls this to obtain the cursor to display while the user drags +// the minimized window. +HCURSOR CMFCExampleDlg::OnQueryDragIcon() +{ + return (HCURSOR) m_hIcon; +} diff --git a/mfc/vldmfcdlg.h b/mfc/vldmfcdlg.h index f0ac0e36..93cd2025 100644 --- a/mfc/vldmfcdlg.h +++ b/mfc/vldmfcdlg.h @@ -1,46 +1,46 @@ -#if !defined(AFX_VLDMFCDLG_H__E5AE1FE6_8C7C_4A59_8DC1_2369B5C7B240__INCLUDED_) -#define AFX_VLDMFCDLG_H__E5AE1FE6_8C7C_4A59_8DC1_2369B5C7B240__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -///////////////////////////////////////////////////////////////////////////// -// CMFCExampleDlg dialog - -class CMFCExampleDlg : public CDialog -{ -// Construction -public: - CMFCExampleDlg(CWnd* pParent = NULL); // standard constructor - -// Dialog Data - //{{AFX_DATA(CMFCExampleDlg) - enum { IDD = IDD_VLDMFC_DIALOG }; - BOOL m_bLeak; - //}}AFX_DATA - - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CMFCExampleDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - HICON m_hIcon; - - // Generated message map functions - //{{AFX_MSG(CMFCExampleDlg) - virtual BOOL OnInitDialog(); - afx_msg void OnSysCommand(UINT nID, LPARAM lParam); - afx_msg void OnPaint(); - afx_msg HCURSOR OnQueryDragIcon(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_VLDMFCDLG_H__E5AE1FE6_8C7C_4A59_8DC1_2369B5C7B240__INCLUDED_) +#if !defined(AFX_VLDMFCDLG_H__E5AE1FE6_8C7C_4A59_8DC1_2369B5C7B240__INCLUDED_) +#define AFX_VLDMFCDLG_H__E5AE1FE6_8C7C_4A59_8DC1_2369B5C7B240__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleDlg dialog + +class CMFCExampleDlg : public CDialog +{ +// Construction +public: + CMFCExampleDlg(CWnd* pParent = NULL); // standard constructor + +// Dialog Data + //{{AFX_DATA(CMFCExampleDlg) + enum { IDD = IDD_VLDMFC_DIALOG }; + BOOL m_bLeak; + //}}AFX_DATA + + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CMFCExampleDlg) + protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + +// Implementation +protected: + HICON m_hIcon; + + // Generated message map functions + //{{AFX_MSG(CMFCExampleDlg) + virtual BOOL OnInitDialog(); + afx_msg void OnSysCommand(UINT nID, LPARAM lParam); + afx_msg void OnPaint(); + afx_msg HCURSOR OnQueryDragIcon(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_VLDMFCDLG_H__E5AE1FE6_8C7C_4A59_8DC1_2369B5C7B240__INCLUDED_) diff --git a/ntapi.cpp b/ntapi.cpp index da287ea3..b067594a 100644 --- a/ntapi.cpp +++ b/ntapi.cpp @@ -1,32 +1,33 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Global NT API Function Pointers -// Copyright (c) 2006 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#define VLDBUILD -#include "ntapi.h" - -// Global function pointers for explicit dynamic linking with NT APIs that can't -// be load-time linked (there is no import library available for these). -LdrLoadDll_t LdrLoadDll; -RtlAllocateHeap_t RtlAllocateHeap; -RtlFreeHeap_t RtlFreeHeap; -RtlReAllocateHeap_t RtlReAllocateHeap; +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Global NT API Function Pointers +// Copyright (c) 2006 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#include "stdafx.h" +#define VLDBUILD +#include "ntapi.h" + +// Global function pointers for explicit dynamic linking with NT APIs that can't +// be load-time linked (there is no import library available for these). +LdrLoadDll_t LdrLoadDll; +RtlAllocateHeap_t RtlAllocateHeap; +RtlFreeHeap_t RtlFreeHeap; +RtlReAllocateHeap_t RtlReAllocateHeap; diff --git a/ntapi.h b/ntapi.h index fef2b92a..6d7ad67e 100644 --- a/ntapi.h +++ b/ntapi.h @@ -1,57 +1,57 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - NT API Definitions -// Copyright (c) 2006-2009 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifndef VLDBUILD -#error \ -"This header should only be included by Visual Leak Detector when building it from source. \ -Applications should never include this header." -#endif - -#include - -// Return code type used by LdrLoadDll. -typedef LONG NTSTATUS; -#define STATUS_SUCCESS 0 - -// Unicode string structure used by NT APIs. -typedef struct unicodestring_s { - USHORT length; // Length of the string. - USHORT maxlength; // Length of the buffer. - PWSTR buffer; // The buffer containing the string. -} unicodestring_t; - -// Function pointer types for explicit dynamic linking with functions that can't -// be load-time linked (no import library is available for these). -typedef NTSTATUS (__stdcall *LdrLoadDll_t) (LPWSTR, PDWORD, unicodestring_t *, PHANDLE); -typedef LPVOID (__stdcall *RtlAllocateHeap_t) (HANDLE, DWORD, SIZE_T); -typedef BOOL (__stdcall *RtlFreeHeap_t) (HANDLE, DWORD, LPVOID); -typedef LPVOID (__stdcall *RtlReAllocateHeap_t) (HANDLE, DWORD, LPVOID, SIZE_T); - -// Provide forward declarations for the NT APIs for any source files that -// include this header. -extern LdrLoadDll_t LdrLoadDll; -extern RtlAllocateHeap_t RtlAllocateHeap; -extern RtlFreeHeap_t RtlFreeHeap; -extern RtlReAllocateHeap_t RtlReAllocateHeap; +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - NT API Definitions +// Copyright (c) 2006-2009 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifndef VLDBUILD +#error \ +"This header should only be included by Visual Leak Detector when building it from source. \ +Applications should never include this header." +#endif + +#include + +// Return code type used by LdrLoadDll. +typedef LONG NTSTATUS; +#define STATUS_SUCCESS 0 + +// Unicode string structure used by NT APIs. +typedef struct unicodestring_s { + USHORT length; // Length of the string. + USHORT maxlength; // Length of the buffer. + PWSTR buffer; // The buffer containing the string. +} unicodestring_t; + +// Function pointer types for explicit dynamic linking with functions that can't +// be load-time linked (no import library is available for these). +typedef NTSTATUS (__stdcall *LdrLoadDll_t) (LPWSTR, PDWORD, unicodestring_t *, PHANDLE); +typedef LPVOID (__stdcall *RtlAllocateHeap_t) (HANDLE, DWORD, SIZE_T); +typedef BOOL (__stdcall *RtlFreeHeap_t) (HANDLE, DWORD, LPVOID); +typedef LPVOID (__stdcall *RtlReAllocateHeap_t) (HANDLE, DWORD, LPVOID, SIZE_T); + +// Provide forward declarations for the NT APIs for any source files that +// include this header. +extern LdrLoadDll_t LdrLoadDll; +extern RtlAllocateHeap_t RtlAllocateHeap; +extern RtlFreeHeap_t RtlFreeHeap; +extern RtlReAllocateHeap_t RtlReAllocateHeap; diff --git a/resource.h b/resource.h index c6b72e6e..c210abbb 100755 --- a/resource.h +++ b/resource.h @@ -1,14 +1,14 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by vld.rc - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by vld.rc + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/set.h b/set.h index 23829b2b..fdeba5c6 100644 --- a/set.h +++ b/set.h @@ -1,337 +1,337 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Lightweight STL-like Set Template -// Copyright (c) 2006 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifndef VLDBUILD -#error \ -"This header should only be included by Visual Leak Detector when building it from source. \ -Applications should never include this header." -#endif - -#include "tree.h" // Provides access to the Tree template class. - -//////////////////////////////////////////////////////////////////////////////// -// -// The Set Template Class -// -// This is a lightweight STL-like set template. It makes use of the Tree class -// template to enable fast insert, find, and erase operations. -// -// Note that while this is a STL-like class, it is not a full STL-compliant -// implementation of the STL set container. It contains just the bare minimum -// functionality required by Visual Leak Detector. Because of its "lightweight" -// nature, this set class has a noticeable performance advantage over some -// other standard STL set implementations. -// -template -class Set { -public: - class Iterator { - public: - // Constructor - Iterator () - { - // Plainly constructed iterators don't reference anything. - m_node = NULL; - m_tree = NULL; - } - - // operator != - Inequality operator for Set Iterators. Two Set - // Iterators are considered equal if and only if they both reference - // the same key in the same Set. - // - // - other (IN): The other Set Iterator to compare against. - // - // Return Value: - // - // Returns true if the specified Set Iterator is not equal to this - // Set Iterator; otherwise, returns false. - // - BOOL operator != (const Iterator &other) const - { - return ((m_tree != other.m_tree) || (m_node != other.m_node)); - } - - // operator * - Dereference operator for Set Iterators. - // - // Note: The reference returned by this function is "const", so the - // value referenced by the Iterator may not be modified through the - // Iterator. This is a departure from STL iterator behavior. - // - // Also, dereferencing an Iterator which does not reference a valid - // value in the Set is undefined and will almost certainly cause a - // crash. - // - // Return Value: - // - // Returns a const reference to the key in the Map referenced by the - // Iterator. - // - const Tk& operator * () const - { - return m_node->key; - } - - // operator ++ - Prefix increment operator for Set Iterators. Causes the - // Iterator to reference the in-oder successor of the key currently - // referenced by the Iterator. If the Iterator is currently - // referencing the largest key in the Map, then the resulting Iterator - // will reference the Set's end (the NULL pair). - // - // Note: Incrementing an Iterator which does not reference a valid - // key in the Set is undefined and will almost certainly cause a - // crash. - // - // Return Value: - // - // Returns the Iterator after it has been incremented. - // - Iterator& operator ++ (int) - { - m_node = m_tree->next(m_node); - return *this; - } - - // operator ++ - Postfix increment operator for Map Iterators. Causes - // the Iterator to reference the in-order successor of the key/value - // pair currently referenced by the Iterator. If the Iterator is - // currently referencing the largest key/value pair in the Map, then - // the resulting Iterator will reference the Map's end (the NULL - // pair). - // - // Note: Incrementing an Iterator which does not reference a valid - // key/value pair in the Map is undefined and will almost certainly - // cause a crash. - // - // Return Value: - // - // Returns the Iterator before it has been incremented. - // - Iterator operator ++ () - { - typename Tree::node_t *cur = m_node; - - m_node = m_tree->next(m_node); - return Iterator(m_tree, cur); - } - - // operator - - Subtraction operator for Set Iterators. Causes the - // the Iterator to reference a key that is an in-order predecessor of - // the currently refereced key. - // - // - num (IN): Number indicating the number of preceding keys to - // decrement the iterator. - // - // Return Value: - // - // Returns an Iterator referencing the key that precedes the original - // Iterator by "num" keys. - // - Iterator operator - (SIZE_T num) const - { - SIZE_T count; - typename Tree::node_t *cur = m_node; - - cur = m_tree->prev(m_node); - for (count = 0; count < num; count++) { - cur = m_tree->prev(m_node); - if (cur == NULL) { - return Iterator(m_tree, NULL); - } - } - return Iterator(m_tree, cur); - } - - // operator == - Equality operator for Set Iterators. Set Iterators are - // considered equal if and only if they both refernce the same - // key in the same Set. - // - // - other (IN): The other Set Iterator to compare against. - // - // Return Value: - // - // Returns true if the specified Set Iterator is equal to this Set - // Iterator; otherwise returns false. - // - BOOL operator == (const Iterator &other) const - { - return ((m_tree == other.m_tree) && (m_node == other.m_node)); - } - - private: - // Private constructor. Only the Set class itself may use this - // constructor. It is used for constructing Iterators which reference - // specific nodes in the internal tree's structure. - Iterator (const Tree *tree, typename Tree::node_t *node) - { - m_node = node; - m_tree = tree; - } - - protected: - typename Tree::node_t *m_node; // Pointer to the node referenced by the Set Iterator. - const Tree *m_tree; // Pointer to the tree containing the referenced node. - - // The Set class is a friend of Set Iterators. - friend class Set; - }; - - // Muterator class - This class provides a mutable Iterator (the regular - // Iterators are const Iterators). By dereferencing a Muterator, you get - // a modifiable element. - // - // Caution: Modifing an element in a way that changes its sorting value - // will corrupt the Set container. Muterators should only be used when - // you are absolutely certain you will not be using it to make a - // modification that changes the sort order of the referenced element. - // - class Muterator : public Iterator - { - public: - // operator = - Assignment operator for Set Muterators. Can be used to - // copy a Muterator from an existing Iterator, such that the Muterator - // references the same element referenced by the Iterator. - Muterator& operator = (const Iterator& other) { - *(Iterator*)this = other; - return *this; - } - - // operator * - Dereference operator for Set Muterators. - // - // Note: Dereferencing a Muterator which does not reference a valid - // value in the Set is undefined and will almost certainly cause a - // crash. - // - // Return Value: - // - // Returns a reference to the key in the Map referenced by the - // Muterator. - // - Tk& operator * () - { - return m_node->key; - } - }; - - // begin - Obtains an Iterator referencing the beginning of the Set (i.e. - // the lowest key currently stored in the Set). - // - // Return Value: - // - // Returns an Iterator referencing the first key in the Set. If no keys - // are currenly stored in the Set, returns the "NULL" Iterator. - // - Iterator begin () const - { - return Iterator(&m_tree, m_tree.begin()); - } - - // end - Obtains an Iterator referencing the end of the Set. The end of - // the Set does not reference an actual key. Instead it represents a - // "null" key which signifies the end (i.e. just beyond largest key - // currently stored in the Set). Also known as the "NULL" Iterator. - // - // Return Value: - // - // Returns the "NULL" Iterator, signifying the end of the Set. - // - Iterator end () const - { - return Iterator(&m_tree, NULL); - } - - // erase - Erases a key from the Set. - // - // - it (IN): Iterator referencing the key to be erased from the Set. - // - // Return Value: - // - // None. - // - VOID erase (Iterator& it) - { - m_tree.erase(it.m_node); - } - - // erase - Erases a key from the Set. - // - // - key (IN): The key to be erased from the Set. - // - // Return Value: - // - // None. - // - VOID erase (const Tk &key) - { - m_tree.erase(key); - } - - // find - Finds a key in the Set. - // - // - key (IN): The key to be found. - // - // Return Value: - // - // Returns an Iterator referencing the found key. If the key could not - // be found, then the "NULL" Iterator is returned. - // - Iterator find (const Tk &key) const - { - return Iterator(&m_tree, m_tree.find(key)); - } - - // insert - Inserts a key into the Set. - // - // - key (IN): The key to be inserted. - // - // Return Value: - // - // Returns an Iterator referencing the key after it has been inserted - // into the Set. If an element with an identical key value already exists - // in the Set, then the NULL Iterator is returned. - // - Iterator insert (const Tk &key) - { - return Iterator(&m_tree, m_tree.insert(key)); - } - - // reserve - Sets the reserve size of the Set. The reserve size is the - // number of keys for which space should be pre-allocated to avoid - // frequent heap hits when inserting new keys into the Set. - // - // - count (IN): The number of keys for which to reserve space in advance. - // - // Return Value: - // - // Returns the reserve size previously in use by the Set. - // - size_t reserve (size_t count) - { - return m_tree.reserve(count); - } - -private: - // Private data - Tree m_tree; // The keys are actually stored in a tree. -}; +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Lightweight STL-like Set Template +// Copyright (c) 2006 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifndef VLDBUILD +#error \ +"This header should only be included by Visual Leak Detector when building it from source. \ +Applications should never include this header." +#endif + +#include "tree.h" // Provides access to the Tree template class. + +//////////////////////////////////////////////////////////////////////////////// +// +// The Set Template Class +// +// This is a lightweight STL-like set template. It makes use of the Tree class +// template to enable fast insert, find, and erase operations. +// +// Note that while this is a STL-like class, it is not a full STL-compliant +// implementation of the STL set container. It contains just the bare minimum +// functionality required by Visual Leak Detector. Because of its "lightweight" +// nature, this set class has a noticeable performance advantage over some +// other standard STL set implementations. +// +template +class Set { +public: + class Iterator { + public: + // Constructor + Iterator () + { + // Plainly constructed iterators don't reference anything. + m_node = NULL; + m_tree = NULL; + } + + // operator != - Inequality operator for Set Iterators. Two Set + // Iterators are considered equal if and only if they both reference + // the same key in the same Set. + // + // - other (IN): The other Set Iterator to compare against. + // + // Return Value: + // + // Returns true if the specified Set Iterator is not equal to this + // Set Iterator; otherwise, returns false. + // + BOOL operator != (const Iterator &other) const + { + return ((m_tree != other.m_tree) || (m_node != other.m_node)); + } + + // operator * - Dereference operator for Set Iterators. + // + // Note: The reference returned by this function is "const", so the + // value referenced by the Iterator may not be modified through the + // Iterator. This is a departure from STL iterator behavior. + // + // Also, dereferencing an Iterator which does not reference a valid + // value in the Set is undefined and will almost certainly cause a + // crash. + // + // Return Value: + // + // Returns a const reference to the key in the Map referenced by the + // Iterator. + // + const Tk& operator * () const + { + return m_node->key; + } + + // operator ++ - Prefix increment operator for Set Iterators. Causes the + // Iterator to reference the in-oder successor of the key currently + // referenced by the Iterator. If the Iterator is currently + // referencing the largest key in the Map, then the resulting Iterator + // will reference the Set's end (the NULL pair). + // + // Note: Incrementing an Iterator which does not reference a valid + // key in the Set is undefined and will almost certainly cause a + // crash. + // + // Return Value: + // + // Returns the Iterator after it has been incremented. + // + Iterator& operator ++ (int) + { + m_node = m_tree->next(m_node); + return *this; + } + + // operator ++ - Postfix increment operator for Map Iterators. Causes + // the Iterator to reference the in-order successor of the key/value + // pair currently referenced by the Iterator. If the Iterator is + // currently referencing the largest key/value pair in the Map, then + // the resulting Iterator will reference the Map's end (the NULL + // pair). + // + // Note: Incrementing an Iterator which does not reference a valid + // key/value pair in the Map is undefined and will almost certainly + // cause a crash. + // + // Return Value: + // + // Returns the Iterator before it has been incremented. + // + Iterator operator ++ () + { + typename Tree::node_t *cur = m_node; + + m_node = m_tree->next(m_node); + return Iterator(m_tree, cur); + } + + // operator - - Subtraction operator for Set Iterators. Causes the + // the Iterator to reference a key that is an in-order predecessor of + // the currently refereced key. + // + // - num (IN): Number indicating the number of preceding keys to + // decrement the iterator. + // + // Return Value: + // + // Returns an Iterator referencing the key that precedes the original + // Iterator by "num" keys. + // + Iterator operator - (SIZE_T num) const + { + SIZE_T count; + typename Tree::node_t *cur = m_node; + + cur = m_tree->prev(m_node); + for (count = 0; count < num; count++) { + cur = m_tree->prev(m_node); + if (cur == NULL) { + return Iterator(m_tree, NULL); + } + } + return Iterator(m_tree, cur); + } + + // operator == - Equality operator for Set Iterators. Set Iterators are + // considered equal if and only if they both refernce the same + // key in the same Set. + // + // - other (IN): The other Set Iterator to compare against. + // + // Return Value: + // + // Returns true if the specified Set Iterator is equal to this Set + // Iterator; otherwise returns false. + // + BOOL operator == (const Iterator &other) const + { + return ((m_tree == other.m_tree) && (m_node == other.m_node)); + } + + private: + // Private constructor. Only the Set class itself may use this + // constructor. It is used for constructing Iterators which reference + // specific nodes in the internal tree's structure. + Iterator (const Tree *tree, typename Tree::node_t *node) + { + m_node = node; + m_tree = tree; + } + + protected: + typename Tree::node_t *m_node; // Pointer to the node referenced by the Set Iterator. + const Tree *m_tree; // Pointer to the tree containing the referenced node. + + // The Set class is a friend of Set Iterators. + friend class Set; + }; + + // Muterator class - This class provides a mutable Iterator (the regular + // Iterators are const Iterators). By dereferencing a Muterator, you get + // a modifiable element. + // + // Caution: Modifing an element in a way that changes its sorting value + // will corrupt the Set container. Muterators should only be used when + // you are absolutely certain you will not be using it to make a + // modification that changes the sort order of the referenced element. + // + class Muterator : public Iterator + { + public: + // operator = - Assignment operator for Set Muterators. Can be used to + // copy a Muterator from an existing Iterator, such that the Muterator + // references the same element referenced by the Iterator. + Muterator& operator = (const Iterator& other) { + *(Iterator*)this = other; + return *this; + } + + // operator * - Dereference operator for Set Muterators. + // + // Note: Dereferencing a Muterator which does not reference a valid + // value in the Set is undefined and will almost certainly cause a + // crash. + // + // Return Value: + // + // Returns a reference to the key in the Map referenced by the + // Muterator. + // + Tk& operator * () + { + return m_node->key; + } + }; + + // begin - Obtains an Iterator referencing the beginning of the Set (i.e. + // the lowest key currently stored in the Set). + // + // Return Value: + // + // Returns an Iterator referencing the first key in the Set. If no keys + // are currenly stored in the Set, returns the "NULL" Iterator. + // + Iterator begin () const + { + return Iterator(&m_tree, m_tree.begin()); + } + + // end - Obtains an Iterator referencing the end of the Set. The end of + // the Set does not reference an actual key. Instead it represents a + // "null" key which signifies the end (i.e. just beyond largest key + // currently stored in the Set). Also known as the "NULL" Iterator. + // + // Return Value: + // + // Returns the "NULL" Iterator, signifying the end of the Set. + // + Iterator end () const + { + return Iterator(&m_tree, NULL); + } + + // erase - Erases a key from the Set. + // + // - it (IN): Iterator referencing the key to be erased from the Set. + // + // Return Value: + // + // None. + // + VOID erase (Iterator& it) + { + m_tree.erase(it.m_node); + } + + // erase - Erases a key from the Set. + // + // - key (IN): The key to be erased from the Set. + // + // Return Value: + // + // None. + // + VOID erase (const Tk &key) + { + m_tree.erase(key); + } + + // find - Finds a key in the Set. + // + // - key (IN): The key to be found. + // + // Return Value: + // + // Returns an Iterator referencing the found key. If the key could not + // be found, then the "NULL" Iterator is returned. + // + Iterator find (const Tk &key) const + { + return Iterator(&m_tree, m_tree.find(key)); + } + + // insert - Inserts a key into the Set. + // + // - key (IN): The key to be inserted. + // + // Return Value: + // + // Returns an Iterator referencing the key after it has been inserted + // into the Set. If an element with an identical key value already exists + // in the Set, then the NULL Iterator is returned. + // + Iterator insert (const Tk &key) + { + return Iterator(&m_tree, m_tree.insert(key)); + } + + // reserve - Sets the reserve size of the Set. The reserve size is the + // number of keys for which space should be pre-allocated to avoid + // frequent heap hits when inserting new keys into the Set. + // + // - count (IN): The number of keys for which to reserve space in advance. + // + // Return Value: + // + // Returns the reserve size previously in use by the Set. + // + size_t reserve (size_t count) + { + return m_tree.reserve(count); + } + +private: + // Private data + Tree m_tree; // The keys are actually stored in a tree. +}; diff --git a/setup/COPYING.txt b/setup/COPYING.txt index 82fa1daa..d511905c 100644 --- a/setup/COPYING.txt +++ b/setup/COPYING.txt @@ -1,339 +1,339 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/setup/license-free.txt b/setup/license-free.txt index 32cb5cd6..96c15404 100755 --- a/setup/license-free.txt +++ b/setup/license-free.txt @@ -1,24 +1,24 @@ -Anybody may use Visual Leak Detector (this software). No license is required -to use it and you are not asked (or required) to accept any terms or conditions -before using it. - -Provided that you have received a legal copy of this software, you are the -owner of the copy that you have been given. Accordingly, the publisher of this -software has no authority to prevent you from using the software. In the -United States, your legal right to use this copy of software is codified in -17 USC Sec. 117. This statute allows you to use any software you own, without -special permission from the publisher, even if you must make incidental copies -(e.g. in RAM or on a hard disk) in order to use it. - -The publisher of this software still retains the copyright in the software. -As such, you may not make additional copies of the software without permission -from the publisher. - -The publisher grants you the right to copy and distribute this software -on the condition that you agree to the terms contained in the license file -(COPYING.txt) that accompanies this software. To be clear: you are not being -asked to agree to the terms in the license file if you simply wish to use this -software. You must agree to the license only if you wish to copy, distribute, -or make derivative works of, this software. - +Anybody may use Visual Leak Detector (this software). No license is required +to use it and you are not asked (or required) to accept any terms or conditions +before using it. + +Provided that you have received a legal copy of this software, you are the +owner of the copy that you have been given. Accordingly, the publisher of this +software has no authority to prevent you from using the software. In the +United States, your legal right to use this copy of software is codified in +17 USC Sec. 117. This statute allows you to use any software you own, without +special permission from the publisher, even if you must make incidental copies +(e.g. in RAM or on a hard disk) in order to use it. + +The publisher of this software still retains the copyright in the software. +As such, you may not make additional copies of the software without permission +from the publisher. + +The publisher grants you the right to copy and distribute this software +on the condition that you agree to the terms contained in the license file +(COPYING.txt) that accompanies this software. To be clear: you are not being +asked to agree to the terms in the license file if you simply wish to use this +software. You must agree to the license only if you wish to copy, distribute, +or make derivative works of, this software. + To learn more, visit: http://soldnotlicensed.blogspot.com \ No newline at end of file diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 4a7820e2..1be63ae3 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -1,269 +1,269 @@ -################################################################################ -# -# Visual Leak Detector - NSIS Installation Script -# Copyright (c) 2006-2009 Dan Moulding -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -# -# See COPYING.txt for the full terms of the GNU General Public License. -# -################################################################################ - -!include "Library.nsh" # Provides the dynamic link library installation system -!include "LogicLib.nsh" # Provides useable conditional script syntax -!include "MUI.nsh" # Provides the modern user-interface - -# Version number -!define VLD_VERSION "1.9h" - -# Define build system paths -!define CRT_PATH "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT" -!define DTFW_PATH "C:\Program Files\Debugging Tools for Windows (x86)" -!define EDITENV_PATH "editenv" - -# Define build system files -!define CRT_DLL "msvcr90.dll" -!define CRT_MANIFEST "Microsoft.VC90.CRT.manifest" -!define DHL_DLL "dbghelp.dll" -!define EDITENV_DLL "editenv.dll" - -# Define installer paths -!define BIN_PATH "$INSTDIR\bin" -!define INCLUDE_PATH "$INSTDIR\include" -!define LIB_PATH "$INSTDIR\lib" -!define LNK_PATH "$SMPROGRAMS\$SM_PATH" -!define SRC_PATH "$INSTDIR\src" - -# Define editenv system environment variable scope -!define ES_SYSTEM 1 - -# Define registry keys -!define REG_KEY_PRODUCT "Software\Visual Leak Detector" -!define REG_KEY_UNINSTALL "Software\Microsoft\Windows\CurrentVersion\Uninstall\Visual Leak Detector" - -# Define page settings -!define MUI_FINISHPAGE_NOAUTOCLOSE -!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.html" -!define MUI_FINISHPAGE_SHOWREADME_TEXT "View Documentation" -!define MUI_LICENSEPAGE_BUTTON "Continue" -!define MUI_LICENSEPAGE_TEXT_BOTTOM "Click the 'Continue' button to continue installing. Remember, you aren't required to (and are not being asked to) agree to anything before using this software." -!define MUI_LICENSEPAGE_TEXT_TOP "Press Page Down to see the rest of the text." -!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Visual Leak Detector" -!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM -!define MUI_STARTMENUPAGE_REGISTRY_KEY "${REG_KEY_PRODUCT}" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "LnkPath" -!define MUI_UNFINISHPAGE_NOAUTOCLOSE - -# Define installer attributes -InstallDir "$PROGRAMFILES\Visual Leak Detector" -InstallDirRegKey HKLM "${REG_KEY_PRODUCT}" "InstallPath" -Name "Visual Leak Detector ${VLD_VERSION}" -OutFile "vld-${VLD_VERSION}-setup.exe" -SetCompressor /SOLID lzma -ShowInstDetails show -ShowUninstDetails show - -# Declare global variables -Var INSTALLED_VERSION -Var SM_PATH - -# Define the installer pages -!insertmacro MUI_PAGE_WELCOME -!define MUI_PAGE_HEADER_TEXT "No License Required for Use" -!define MUI_PAGE_HEADER_SUBTEXT "This software is provided 'AS IS' without warranty of any kind." -!insertmacro MUI_PAGE_LICENSE "license-free.txt" -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_STARTMENU "Shortcuts" $SM_PATH -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - -# Define the uninstaller pages -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -# Set the modern UI language -!insertmacro MUI_LANGUAGE "English" - -################################################################################ -# -# Installation -# -Function .onInit - ReadRegStr $INSTALLED_VERSION HKLM "${REG_KEY_PRODUCT}" "InstalledVersion" - ${UNLESS} $INSTALLED_VERSION == "" - ${IF} $INSTALLED_VERSION == ${VLD_VERSION} - MessageBox MB_ICONINFORMATION|MB_OKCANCEL "Setup has detected that Visual Leak Detector version $INSTALLED_VERSION is already installed on this computer.$\n$\nClick 'OK' if you want to continue and repair the existing installation. Click 'Cancel' if you want to abort installation." \ - IDOK continue IDCANCEL abort - ${ELSE} - MessageBox MB_ICONEXCLAMATION|MB_YESNO "Setup has detected that a different version of Visual Leak Detector is already installed on this computer.$\nIt is highly recommended that you first uninstall the version currently installed before proceeding.$\n$\nAre you sure you want to continue installing?" \ - IDYES continue IDNO abort - ${ENDIF} -abort: - Abort -continue: - ${ENDUNLESS} -FunctionEnd - -Section "Uninstaller" - SetOutPath "$INSTDIR" - WriteUninstaller "$INSTDIR\uninstall.exe" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "DisplayName" "Visual Leak Detector ${VLD_VERSION}" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "UninstallString" "$INSTDIR\uninstall.exe" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "InstallLocation" "$INSTDIR" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "Publisher" "Dan Moulding" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "URLInfoAbout" "http://www.danm.net" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "DisplayVersion" "${VLD_VERSION}" - WriteRegDWORD HKLM "${REG_KEY_UNINSTALL}" "NoModify" 1 - WriteRegDWORD HKLM "${REG_KEY_UNINSTALL}" "NoRepair" 1 -SectionEnd - -Section "Registry Keys" - WriteRegStr HKLM "${REG_KEY_PRODUCT}" "IniFile" "$INSTDIR\vld.ini" - WriteRegStr HKLM "${REG_KEY_PRODUCT}" "InstallPath" "$INSTDIR" - WriteRegStr HKLM "${REG_KEY_PRODUCT}" "InstalledVersion" "${VLD_VERSION}" -SectionEnd - -Section "Header File" - SetOutPath "${INCLUDE_PATH}" - File "..\vld.h" -SectionEnd - -Section "Import Library" - SetOutPath "${LIB_PATH}" - File "..\Release\vld.lib" -SectionEnd - -Section "Dynamic Link Libraries" - SetOutPath "${BIN_PATH}" - !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "..\Release\vld.dll" "${BIN_PATH}\vld.dll" $INSTDIR - MessageBox MB_YESNO "Visual Leak Detector needs the location of vld.dll to be added to your 'Path' environment variable.$\n$\nWould you like the installer to add it to the path now? If you select No, you'll need to add it to the path manually." \ - IDYES addtopath IDNO skipaddtopath -addtopath: - DetailPrint "Adding ${BIN_PATH} to the 'Path' system environment variable." - InitPluginsDir - SetOutPath "$PLUGINSDIR" - File "${EDITENV_PATH}\${EDITENV_DLL}" - System::Call "editenv::pathAdd(i ${ES_SYSTEM}, t '${BIN_PATH}') ? u" - Delete "$PLUGINSDIR\${EDITENV_DLL}" - SetOutPath "${BIN_PATH}" -skipaddtopath: - !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${DTFW_PATH}\${DHL_DLL}" "${BIN_PATH}\${DHL_DLL}" $INSTDIR - !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${CRT_PATH}\${CRT_DLL}" "${BIN_PATH}\${CRT_DLL}" $INSTDIR - File "..\Microsoft.DTfW.DHL.manifest" - File "${CRT_PATH}\${CRT_MANIFEST}" -SectionEnd - -Section "Configuration File" - SetOutPath "$INSTDIR" - File "..\vld.ini" -SectionEnd - -Section "Source Code" - SetOutPath "${SRC_PATH}" - File "..\*.cpp" - File "..\*.h" - File "..\vld.vcproj" - File "..\*.manifest" - File "..\*.rc" -SectionEnd - -Section "Documentation" - SetOutPath "$INSTDIR" - File "..\CHANGES.txt" - File "..\COPYING.txt" - File "..\README.html" -SectionEnd - -Section "Start Menu Shortcuts" - !insertmacro MUI_STARTMENU_WRITE_BEGIN "Shortcuts" - SetOutPath "$INSTDIR" - SetShellVarContext all - CreateDirectory "${LNK_PATH}" - CreateShortcut "${LNK_PATH}\Configure.lnk" "$INSTDIR\vld.ini" - CreateShortcut "${LNK_PATH}\Documentation.lnk" "$INSTDIR\README.html" - CreateShortcut "${LNK_PATH}\License.lnk" "$INSTDIR\COPYING.txt" - CreateShortcut "${LNK_PATH}\Uninstall.lnk" "$INSTDIR\uninstall.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - - -################################################################################ -# -# Uninstallation -# -Section "un.Header File" - Delete "${INCLUDE_PATH}\vld.h" - RMDir "${INCLUDE_PATH}" -SectionEnd - -Section "un.Import Library" - Delete "${LIB_PATH}\vld.lib" - RMDir "${LIB_PATH}" -SectionEnd - -Section "un.Dynamic Link Libraries" - !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\vld.dll" - DetailPrint "Removing ${BIN_PATH} from the 'Path' system environment variable." - InitPluginsDir - SetOutPath "$PLUGINSDIR" - File "${EDITENV_PATH}\${EDITENV_DLL}" - System::Call "editenv::pathRemove(i ${ES_SYSTEM}, t '${BIN_PATH}') ? u" - Delete "$PLUGINSDIR\${EDITENV_DLL}" - !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\${DHL_DLL}" - !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\${CRT_DLL}" - Delete "${BIN_PATH}\Microsoft.DTfW.DHL.manifest" - Delete "${BIN_PATH}\${CRT_MANIFEST}" - RMDir "${BIN_PATH}" -SectionEnd - -Section "un.Configuration File" - Delete "$INSTDIR\vld.ini" -SectionEnd - -Section "un.Source Code" - Delete "${SRC_PATH}\*.cpp" - Delete "${SRC_PATH}\*.h" - Delete "${SRC_PATH}\vld.vcproj" - Delete "${SRC_PATH}\*.manifest" - Delete "${SRC_PATH}\*.rc" - RMDir "${SRC_PATH}" -SectionEnd - -Section "un.Documentation" - Delete "$INSTDIR\CHANGES.txt" - Delete "$INSTDIR\COPYING.txt" - Delete "$INSTDIR\README.html" -SectionEnd - -Section "un.Start Menu Shortcuts" - !insertmacro MUI_STARTMENU_GETFOLDER "Shortcuts" $SM_PATH - SetShellVarContext all - Delete "${LNK_PATH}\Configure.lnk" - Delete "${LNK_PATH}\Documentation.lnk" - Delete "${LNK_PATH}\License.lnk" - Delete "${LNK_PATH}\Uninstall.lnk" - RMDir "${LNK_PATH}" -SectionEnd - -Section "un.Registry Keys" - DeleteRegKey HKLM "${REG_KEY_PRODUCT}" -SectionEnd - -Section "un.Uninstaller" - Delete "$INSTDIR\uninstall.exe" - RMDir "$INSTDIR" - DeleteRegKey HKLM "${REG_KEY_UNINSTALL}" -SectionEnd +################################################################################ +# +# Visual Leak Detector - NSIS Installation Script +# Copyright (c) 2006-2009 Dan Moulding +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +# +# See COPYING.txt for the full terms of the GNU General Public License. +# +################################################################################ + +!include "Library.nsh" # Provides the dynamic link library installation system +!include "LogicLib.nsh" # Provides useable conditional script syntax +!include "MUI.nsh" # Provides the modern user-interface + +# Version number +!define VLD_VERSION "1.9h" + +# Define build system paths +!define CRT_PATH "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT" +!define DTFW_PATH "C:\Program Files\Debugging Tools for Windows (x86)" +!define EDITENV_PATH "editenv" + +# Define build system files +!define CRT_DLL "msvcr90.dll" +!define CRT_MANIFEST "Microsoft.VC90.CRT.manifest" +!define DHL_DLL "dbghelp.dll" +!define EDITENV_DLL "editenv.dll" + +# Define installer paths +!define BIN_PATH "$INSTDIR\bin" +!define INCLUDE_PATH "$INSTDIR\include" +!define LIB_PATH "$INSTDIR\lib" +!define LNK_PATH "$SMPROGRAMS\$SM_PATH" +!define SRC_PATH "$INSTDIR\src" + +# Define editenv system environment variable scope +!define ES_SYSTEM 1 + +# Define registry keys +!define REG_KEY_PRODUCT "Software\Visual Leak Detector" +!define REG_KEY_UNINSTALL "Software\Microsoft\Windows\CurrentVersion\Uninstall\Visual Leak Detector" + +# Define page settings +!define MUI_FINISHPAGE_NOAUTOCLOSE +!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.html" +!define MUI_FINISHPAGE_SHOWREADME_TEXT "View Documentation" +!define MUI_LICENSEPAGE_BUTTON "Continue" +!define MUI_LICENSEPAGE_TEXT_BOTTOM "Click the 'Continue' button to continue installing. Remember, you aren't required to (and are not being asked to) agree to anything before using this software." +!define MUI_LICENSEPAGE_TEXT_TOP "Press Page Down to see the rest of the text." +!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Visual Leak Detector" +!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM +!define MUI_STARTMENUPAGE_REGISTRY_KEY "${REG_KEY_PRODUCT}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "LnkPath" +!define MUI_UNFINISHPAGE_NOAUTOCLOSE + +# Define installer attributes +InstallDir "$PROGRAMFILES\Visual Leak Detector" +InstallDirRegKey HKLM "${REG_KEY_PRODUCT}" "InstallPath" +Name "Visual Leak Detector ${VLD_VERSION}" +OutFile "vld-${VLD_VERSION}-setup.exe" +SetCompressor /SOLID lzma +ShowInstDetails show +ShowUninstDetails show + +# Declare global variables +Var INSTALLED_VERSION +Var SM_PATH + +# Define the installer pages +!insertmacro MUI_PAGE_WELCOME +!define MUI_PAGE_HEADER_TEXT "No License Required for Use" +!define MUI_PAGE_HEADER_SUBTEXT "This software is provided 'AS IS' without warranty of any kind." +!insertmacro MUI_PAGE_LICENSE "license-free.txt" +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_STARTMENU "Shortcuts" $SM_PATH +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +# Define the uninstaller pages +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +# Set the modern UI language +!insertmacro MUI_LANGUAGE "English" + +################################################################################ +# +# Installation +# +Function .onInit + ReadRegStr $INSTALLED_VERSION HKLM "${REG_KEY_PRODUCT}" "InstalledVersion" + ${UNLESS} $INSTALLED_VERSION == "" + ${IF} $INSTALLED_VERSION == ${VLD_VERSION} + MessageBox MB_ICONINFORMATION|MB_OKCANCEL "Setup has detected that Visual Leak Detector version $INSTALLED_VERSION is already installed on this computer.$\n$\nClick 'OK' if you want to continue and repair the existing installation. Click 'Cancel' if you want to abort installation." \ + IDOK continue IDCANCEL abort + ${ELSE} + MessageBox MB_ICONEXCLAMATION|MB_YESNO "Setup has detected that a different version of Visual Leak Detector is already installed on this computer.$\nIt is highly recommended that you first uninstall the version currently installed before proceeding.$\n$\nAre you sure you want to continue installing?" \ + IDYES continue IDNO abort + ${ENDIF} +abort: + Abort +continue: + ${ENDUNLESS} +FunctionEnd + +Section "Uninstaller" + SetOutPath "$INSTDIR" + WriteUninstaller "$INSTDIR\uninstall.exe" + WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "DisplayName" "Visual Leak Detector ${VLD_VERSION}" + WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "UninstallString" "$INSTDIR\uninstall.exe" + WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "InstallLocation" "$INSTDIR" + WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "Publisher" "Dan Moulding" + WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "URLInfoAbout" "http://www.danm.net" + WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "DisplayVersion" "${VLD_VERSION}" + WriteRegDWORD HKLM "${REG_KEY_UNINSTALL}" "NoModify" 1 + WriteRegDWORD HKLM "${REG_KEY_UNINSTALL}" "NoRepair" 1 +SectionEnd + +Section "Registry Keys" + WriteRegStr HKLM "${REG_KEY_PRODUCT}" "IniFile" "$INSTDIR\vld.ini" + WriteRegStr HKLM "${REG_KEY_PRODUCT}" "InstallPath" "$INSTDIR" + WriteRegStr HKLM "${REG_KEY_PRODUCT}" "InstalledVersion" "${VLD_VERSION}" +SectionEnd + +Section "Header File" + SetOutPath "${INCLUDE_PATH}" + File "..\vld.h" +SectionEnd + +Section "Import Library" + SetOutPath "${LIB_PATH}" + File "..\Release\vld.lib" +SectionEnd + +Section "Dynamic Link Libraries" + SetOutPath "${BIN_PATH}" + !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "..\Release\vld.dll" "${BIN_PATH}\vld.dll" $INSTDIR + MessageBox MB_YESNO "Visual Leak Detector needs the location of vld.dll to be added to your 'Path' environment variable.$\n$\nWould you like the installer to add it to the path now? If you select No, you'll need to add it to the path manually." \ + IDYES addtopath IDNO skipaddtopath +addtopath: + DetailPrint "Adding ${BIN_PATH} to the 'Path' system environment variable." + InitPluginsDir + SetOutPath "$PLUGINSDIR" + File "${EDITENV_PATH}\${EDITENV_DLL}" + System::Call "editenv::pathAdd(i ${ES_SYSTEM}, t '${BIN_PATH}') ? u" + Delete "$PLUGINSDIR\${EDITENV_DLL}" + SetOutPath "${BIN_PATH}" +skipaddtopath: + !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${DTFW_PATH}\${DHL_DLL}" "${BIN_PATH}\${DHL_DLL}" $INSTDIR + !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${CRT_PATH}\${CRT_DLL}" "${BIN_PATH}\${CRT_DLL}" $INSTDIR + File "..\Microsoft.DTfW.DHL.manifest" + File "${CRT_PATH}\${CRT_MANIFEST}" +SectionEnd + +Section "Configuration File" + SetOutPath "$INSTDIR" + File "..\vld.ini" +SectionEnd + +Section "Source Code" + SetOutPath "${SRC_PATH}" + File "..\*.cpp" + File "..\*.h" + File "..\vld.vcproj" + File "..\*.manifest" + File "..\*.rc" +SectionEnd + +Section "Documentation" + SetOutPath "$INSTDIR" + File "..\CHANGES.txt" + File "..\COPYING.txt" + File "..\README.html" +SectionEnd + +Section "Start Menu Shortcuts" + !insertmacro MUI_STARTMENU_WRITE_BEGIN "Shortcuts" + SetOutPath "$INSTDIR" + SetShellVarContext all + CreateDirectory "${LNK_PATH}" + CreateShortcut "${LNK_PATH}\Configure.lnk" "$INSTDIR\vld.ini" + CreateShortcut "${LNK_PATH}\Documentation.lnk" "$INSTDIR\README.html" + CreateShortcut "${LNK_PATH}\License.lnk" "$INSTDIR\COPYING.txt" + CreateShortcut "${LNK_PATH}\Uninstall.lnk" "$INSTDIR\uninstall.exe" + !insertmacro MUI_STARTMENU_WRITE_END +SectionEnd + + +################################################################################ +# +# Uninstallation +# +Section "un.Header File" + Delete "${INCLUDE_PATH}\vld.h" + RMDir "${INCLUDE_PATH}" +SectionEnd + +Section "un.Import Library" + Delete "${LIB_PATH}\vld.lib" + RMDir "${LIB_PATH}" +SectionEnd + +Section "un.Dynamic Link Libraries" + !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\vld.dll" + DetailPrint "Removing ${BIN_PATH} from the 'Path' system environment variable." + InitPluginsDir + SetOutPath "$PLUGINSDIR" + File "${EDITENV_PATH}\${EDITENV_DLL}" + System::Call "editenv::pathRemove(i ${ES_SYSTEM}, t '${BIN_PATH}') ? u" + Delete "$PLUGINSDIR\${EDITENV_DLL}" + !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\${DHL_DLL}" + !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\${CRT_DLL}" + Delete "${BIN_PATH}\Microsoft.DTfW.DHL.manifest" + Delete "${BIN_PATH}\${CRT_MANIFEST}" + RMDir "${BIN_PATH}" +SectionEnd + +Section "un.Configuration File" + Delete "$INSTDIR\vld.ini" +SectionEnd + +Section "un.Source Code" + Delete "${SRC_PATH}\*.cpp" + Delete "${SRC_PATH}\*.h" + Delete "${SRC_PATH}\vld.vcproj" + Delete "${SRC_PATH}\*.manifest" + Delete "${SRC_PATH}\*.rc" + RMDir "${SRC_PATH}" +SectionEnd + +Section "un.Documentation" + Delete "$INSTDIR\CHANGES.txt" + Delete "$INSTDIR\COPYING.txt" + Delete "$INSTDIR\README.html" +SectionEnd + +Section "un.Start Menu Shortcuts" + !insertmacro MUI_STARTMENU_GETFOLDER "Shortcuts" $SM_PATH + SetShellVarContext all + Delete "${LNK_PATH}\Configure.lnk" + Delete "${LNK_PATH}\Documentation.lnk" + Delete "${LNK_PATH}\License.lnk" + Delete "${LNK_PATH}\Uninstall.lnk" + RMDir "${LNK_PATH}" +SectionEnd + +Section "un.Registry Keys" + DeleteRegKey HKLM "${REG_KEY_PRODUCT}" +SectionEnd + +Section "un.Uninstaller" + Delete "$INSTDIR\uninstall.exe" + RMDir "$INSTDIR" + DeleteRegKey HKLM "${REG_KEY_UNINSTALL}" +SectionEnd diff --git a/stdafx.cpp b/stdafx.cpp new file mode 100644 index 00000000..cea1ca98 --- /dev/null +++ b/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// vld.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/stdafx.h b/stdafx.h new file mode 100644 index 00000000..1bc8a1b8 --- /dev/null +++ b/stdafx.h @@ -0,0 +1,14 @@ +#pragma once + +#include +#include +#include +#include +#if _WIN32_WINNT < 0x0600 // Windows XP or earlier, no GetProcessIdOfThread() +#include +#endif +#ifndef __out_xcount +#define __out_xcount(x) // Workaround for the specstrings.h bug in the Platform SDK. +#endif +#define DBGHELP_TRANSLATE_TCHAR +#include // Provides portable executable (PE) image access functions. diff --git a/testsuite/testsuite.cpp b/testsuite/testsuite.cpp index 0f0d2553..f35fee47 100644 --- a/testsuite/testsuite.cpp +++ b/testsuite/testsuite.cpp @@ -1,377 +1,378 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Test Suite -// Copyright (c) 2009 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -//////////////////////////////////////////////////////////////////////////////// -// -// Test suite for Visual Leak Detector -// -//////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include - -#include - -enum action_e { - a_calloc, - a_comalloc, - a_getprocmalloc, - a_heapalloc, - a_icomalloc, - a_ignored, - a_malloc, - a_new, - numactions -}; - -#define CRTDLLNAME "msvcr90d.dll" // Name of the debug C Runtime Library DLL on this system -#define MAXALLOC 1000 // Maximum number of allocations of each type to perform, per thread -#define MAXBLOCKS (MAXALLOC * numactions) // Total maximum number of allocations, per thread -#define MAXDEPTH 32 // Maximum depth of the allocation call stack -#define MAXSIZE 64 // Maximum block size to allocate -#define MINDEPTH 0 // Minimum depth of the allocation call stack -#define MINSIZE 16 // Minimum block size to allocate -#define NUMDUPLEAKS 0 // Number of times to duplicate each leak -#define NUMTHREADS 72 // Number of threads to run simultaneously -#define ONCEINAWHILE 10 // Free a random block approx. once every... - -typedef struct blockholder_s { - action_e action; - PVOID block; - BOOL leak; -} blockholder_t; - -typedef void* (__cdecl *free_t) (void* mem); -typedef void* (__cdecl *malloc_t) (size_t size); - -typedef struct threadcontext_s { - UINT index; - BOOL leaky; - DWORD seed; - BOOL terminated; - DWORD threadid; -} threadcontext_t; - -__declspec(thread) blockholder_t blocks [MAXBLOCKS]; -__declspec(thread) ULONG counts [numactions] = { 0 }; -__declspec(thread) IMalloc *imalloc = NULL; -__declspec(thread) free_t pfree = NULL; -__declspec(thread) malloc_t pmalloc = NULL; -__declspec(thread) HANDLE threadheap; -__declspec(thread) ULONG total_allocs = 0; - -ULONG random (ULONG max) -{ - FLOAT d; - FLOAT r; - ULONG v; - - r = ((FLOAT)rand()) / ((FLOAT)RAND_MAX); - r *= ((FLOAT)max); - d = r - ((ULONG)r); - if (d >= 0.5) { - v = ((ULONG)r) + 1; - } - else { - v = (ULONG)r; - } - - return v; -} - -VOID allocateblock (action_e action, SIZE_T size) -{ - HMODULE crt; - ULONG index; - LPCSTR name; - PVOID *pblock; - HRESULT status; - - // Find the first unused index. - for (index = 0; index < MAXBLOCKS; index++) { - if (blocks[index].block == NULL) { - break; - } - } - blocks[index].action = action; - - // Now do the randomized allocation. - pblock = &blocks[index].block; - switch (action) { - case a_calloc: - name = "calloc"; - *pblock = calloc(1, size); - break; - - case a_comalloc: - name = "CoTaskMemAlloc"; - *pblock = CoTaskMemAlloc(size); - break; - - case a_getprocmalloc: - name = "GetProcAddress"; - if (pmalloc == NULL) { - crt = LoadLibrary(CRTDLLNAME); - assert(crt != NULL); - pmalloc = (malloc_t)GetProcAddress(crt, "malloc"); - assert(pmalloc != NULL); - } - *pblock = pmalloc(size); - break; - - case a_heapalloc: - name = "HeapAlloc"; - if (threadheap == NULL) { - threadheap = HeapCreate(0x0, 0, 0); - } - *pblock = HeapAlloc(threadheap, 0x0, size); - break; - - case a_icomalloc: - name = "IMalloc"; - if (imalloc == NULL) { - status = CoGetMalloc(1, &imalloc); - assert(status == S_OK); - } - *pblock = imalloc->Alloc(size); - break; - - case a_ignored: - name = "Ignored"; - VLDDisable(); - *pblock = malloc(size); - VLDEnable(); - break; - - case a_malloc: - name = "malloc"; - *pblock = malloc(size); - break; - - case a_new: - name = "new"; - *pblock = new BYTE [size]; - break; - - default: - assert(FALSE); - } - counts[action]++; - total_allocs++; - - strncpy_s((char*)*pblock, size, name, _TRUNCATE); -} - -VOID freeblock (ULONG index) -{ - PVOID block; - HMODULE crt; - - block = blocks[index].block; - switch (blocks[index].action) { - case a_calloc: - free(block); - break; - - case a_comalloc: - CoTaskMemFree(block); - break; - - case a_getprocmalloc: - if (pfree == NULL) { - crt = GetModuleHandle(CRTDLLNAME); - assert(crt != NULL); - pfree = (free_t)GetProcAddress(crt, "free"); - assert(pfree != NULL); - } - pfree(block); - break; - - case a_heapalloc: - HeapFree(threadheap, 0x0, block); - break; - - case a_icomalloc: - imalloc->Free(block); - break; - - case a_ignored: - free(block); - break; - - case a_malloc: - free(block); - break; - - case a_new: - delete [] block; - break; - - default: - assert(FALSE); - } - blocks[index].block = NULL; - counts[blocks[index].action]--; - total_allocs--; -} - -VOID recursivelyallocate (UINT depth, action_e action, SIZE_T size) -{ - if (depth == 0) { - allocateblock(action, size); - } - else { - recursivelyallocate(depth - 1, action, size); - } -} - -DWORD __stdcall runtestsuite (LPVOID param) -{ - action_e action; - USHORT action_index; - BOOL allocate_more = TRUE; - threadcontext_t *context = (threadcontext_t*)param; - UINT depth; - ULONG index; - UINT leaks_selected; - SIZE_T size; - - srand(context->seed); - - for (index = 0; index < MAXBLOCKS; index++) { - blocks[index].block = NULL; - blocks[index].leak = FALSE; - } - - while (allocate_more == TRUE) { - // Select a random allocation action and a random size. - action = (action_e)random(numactions - 1); - size = random(MAXSIZE); - if (size < MINSIZE) { - size = MINSIZE; - } - if (counts[action] == MAXALLOC) { - // We've done enough of this type of allocation. Select another. - continue; - } - - // Allocate a block, using recursion to build up a stack of random - // depth. - depth = random(MAXDEPTH); - if (depth < MINDEPTH) { - depth = MINDEPTH; - } - recursivelyallocate(depth, action, size); - - // Every once in a while, free a random block. - if (random(ONCEINAWHILE) == ONCEINAWHILE) { - index = random(total_allocs); - if (blocks[index].block != NULL) { - freeblock(index); - } - } - - // See if we have allocated enough blocks using each type of action. - for (action_index = 0; action_index < numactions; action_index++) { - if (counts[action_index] < MAXALLOC) { - allocate_more = TRUE; - break; - } - allocate_more = FALSE; - } - } - - if (context->leaky == TRUE) { - // This is the leaky thread. Randomly select one block to be leaked from - // each type of allocation action. - for (action_index = 0; action_index < numactions; action_index++) { - leaks_selected = 0; - do { - index = random(MAXBLOCKS); - if ((blocks[index].block != NULL) && (blocks[index].action == (action_e)action_index)) { - blocks[index].leak = TRUE; - leaks_selected++; - } - } while (leaks_selected < (1 + NUMDUPLEAKS)); - } - } - - // Free all blocks except for those marked as leaks. - for (index = 0; index < MAXBLOCKS; index++) { - if ((blocks[index].block != NULL) && (blocks[index].leak == FALSE)) { - freeblock(index); - } - } - - // Do a sanity check. - if (context->leaky == TRUE) { - assert(total_allocs == (numactions * (1 + NUMDUPLEAKS))); - } - else { - assert(total_allocs == 0); - } - - context->terminated = TRUE; - return 0; -} - -int main (int argc, char *argv []) -{ - threadcontext_t contexts [NUMTHREADS]; - DWORD end; - UINT index; -#define MESSAGESIZE 512 - char message [512]; - DWORD start; - UINT leakythread; - - start = GetTickCount(); - srand(start); - - // Select a random thread to be the leaker. - leakythread = random(NUMTHREADS - 1); - - for (index = 0; index < NUMTHREADS; ++index) { - contexts[index].index = index; - if (index == leakythread) { - contexts[index].leaky = TRUE; - } - contexts[index].seed = random(RAND_MAX); - contexts[index].terminated = FALSE; - CreateThread(NULL, 0, runtestsuite, &contexts[index], 0, &contexts[index].threadid); - } - - // Wait for all threads to terminate. - for (index = 0; index < NUMTHREADS; ++index) { - while (contexts[index].terminated == FALSE) { - Sleep(10); - } - } - - end = GetTickCount(); - _snprintf_s(message, 512, _TRUNCATE, "Elapsed Time = %ums\n", end - start); - OutputDebugString(message); - - return 0; -} +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Test Suite +// Copyright (c) 2009 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +//////////////////////////////////////////////////////////////////////////////// +// +// Test suite for Visual Leak Detector +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include + +#include + +enum action_e { + a_calloc, + a_comalloc, + a_getprocmalloc, + a_heapalloc, + a_icomalloc, + a_ignored, + a_malloc, + a_new, + numactions +}; + +#define CRTDLLNAME _T("msvcr90d.dll") // Name of the debug C Runtime Library DLL on this system +#define MAXALLOC 1000 // Maximum number of allocations of each type to perform, per thread +#define MAXBLOCKS (MAXALLOC * numactions) // Total maximum number of allocations, per thread +#define MAXDEPTH 32 // Maximum depth of the allocation call stack +#define MAXSIZE 64 // Maximum block size to allocate +#define MINDEPTH 0 // Minimum depth of the allocation call stack +#define MINSIZE 16 // Minimum block size to allocate +#define NUMDUPLEAKS 0 // Number of times to duplicate each leak +#define NUMTHREADS 72 // Number of threads to run simultaneously +#define ONCEINAWHILE 10 // Free a random block approx. once every... + +typedef struct blockholder_s { + action_e action; + PVOID block; + BOOL leak; +} blockholder_t; + +typedef void* (__cdecl *free_t) (void* mem); +typedef void* (__cdecl *malloc_t) (size_t size); + +typedef struct threadcontext_s { + UINT index; + BOOL leaky; + DWORD seed; + BOOL terminated; + DWORD threadid; +} threadcontext_t; + +__declspec(thread) blockholder_t blocks [MAXBLOCKS]; +__declspec(thread) ULONG counts [numactions] = { 0 }; +__declspec(thread) IMalloc *imalloc = NULL; +__declspec(thread) free_t pfree = NULL; +__declspec(thread) malloc_t pmalloc = NULL; +__declspec(thread) HANDLE threadheap; +__declspec(thread) ULONG total_allocs = 0; + +ULONG random (ULONG max) +{ + FLOAT d; + FLOAT r; + ULONG v; + + r = ((FLOAT)rand()) / ((FLOAT)RAND_MAX); + r *= ((FLOAT)max); + d = r - ((ULONG)r); + if (d >= 0.5) { + v = ((ULONG)r) + 1; + } + else { + v = (ULONG)r; + } + + return v; +} + +VOID allocateblock (action_e action, SIZE_T size) +{ + HMODULE crt; + ULONG index; + LPCSTR name; + PVOID *pblock; + HRESULT status; + + // Find the first unused index. + for (index = 0; index < MAXBLOCKS; index++) { + if (blocks[index].block == NULL) { + break; + } + } + blocks[index].action = action; + + // Now do the randomized allocation. + pblock = &blocks[index].block; + switch (action) { + case a_calloc: + name = "calloc"; + *pblock = calloc(1, size); + break; + + case a_comalloc: + name = "CoTaskMemAlloc"; + *pblock = CoTaskMemAlloc(size); + break; + + case a_getprocmalloc: + name = "GetProcAddress"; + if (pmalloc == NULL) { + crt = LoadLibrary(CRTDLLNAME); + assert(crt != NULL); + pmalloc = (malloc_t)GetProcAddress(crt, "malloc"); + assert(pmalloc != NULL); + } + *pblock = pmalloc(size); + break; + + case a_heapalloc: + name = "HeapAlloc"; + if (threadheap == NULL) { + threadheap = HeapCreate(0x0, 0, 0); + } + *pblock = HeapAlloc(threadheap, 0x0, size); + break; + + case a_icomalloc: + name = "IMalloc"; + if (imalloc == NULL) { + status = CoGetMalloc(1, &imalloc); + assert(status == S_OK); + } + *pblock = imalloc->Alloc(size); + break; + + case a_ignored: + name = "Ignored"; + VLDDisable(); + *pblock = malloc(size); + VLDEnable(); + break; + + case a_malloc: + name = "malloc"; + *pblock = malloc(size); + break; + + case a_new: + name = "new"; + *pblock = new BYTE [size]; + break; + + default: + assert(FALSE); + } + counts[action]++; + total_allocs++; + + strncpy_s((char*)*pblock, size, name, _TRUNCATE); +} + +VOID freeblock (ULONG index) +{ + PVOID block; + HMODULE crt; + + block = blocks[index].block; + switch (blocks[index].action) { + case a_calloc: + free(block); + break; + + case a_comalloc: + CoTaskMemFree(block); + break; + + case a_getprocmalloc: + if (pfree == NULL) { + crt = GetModuleHandle(CRTDLLNAME); + assert(crt != NULL); + pfree = (free_t)GetProcAddress(crt, "free"); + assert(pfree != NULL); + } + pfree(block); + break; + + case a_heapalloc: + HeapFree(threadheap, 0x0, block); + break; + + case a_icomalloc: + imalloc->Free(block); + break; + + case a_ignored: + free(block); + break; + + case a_malloc: + free(block); + break; + + case a_new: + delete [] block; + break; + + default: + assert(FALSE); + } + blocks[index].block = NULL; + counts[blocks[index].action]--; + total_allocs--; +} + +VOID recursivelyallocate (UINT depth, action_e action, SIZE_T size) +{ + if (depth == 0) { + allocateblock(action, size); + } + else { + recursivelyallocate(depth - 1, action, size); + } +} + +DWORD __stdcall runtestsuite (LPVOID param) +{ + action_e action; + USHORT action_index; + BOOL allocate_more = TRUE; + threadcontext_t *context = (threadcontext_t*)param; + UINT depth; + ULONG index; + UINT leaks_selected; + SIZE_T size; + + srand(context->seed); + + for (index = 0; index < MAXBLOCKS; index++) { + blocks[index].block = NULL; + blocks[index].leak = FALSE; + } + + while (allocate_more == TRUE) { + // Select a random allocation action and a random size. + action = (action_e)random(numactions - 1); + size = random(MAXSIZE); + if (size < MINSIZE) { + size = MINSIZE; + } + if (counts[action] == MAXALLOC) { + // We've done enough of this type of allocation. Select another. + continue; + } + + // Allocate a block, using recursion to build up a stack of random + // depth. + depth = random(MAXDEPTH); + if (depth < MINDEPTH) { + depth = MINDEPTH; + } + recursivelyallocate(depth, action, size); + + // Every once in a while, free a random block. + if (random(ONCEINAWHILE) == ONCEINAWHILE) { + index = random(total_allocs); + if (blocks[index].block != NULL) { + freeblock(index); + } + } + + // See if we have allocated enough blocks using each type of action. + for (action_index = 0; action_index < numactions; action_index++) { + if (counts[action_index] < MAXALLOC) { + allocate_more = TRUE; + break; + } + allocate_more = FALSE; + } + } + + if (context->leaky == TRUE) { + // This is the leaky thread. Randomly select one block to be leaked from + // each type of allocation action. + for (action_index = 0; action_index < numactions; action_index++) { + leaks_selected = 0; + do { + index = random(MAXBLOCKS); + if ((blocks[index].block != NULL) && (blocks[index].action == (action_e)action_index)) { + blocks[index].leak = TRUE; + leaks_selected++; + } + } while (leaks_selected < (1 + NUMDUPLEAKS)); + } + } + + // Free all blocks except for those marked as leaks. + for (index = 0; index < MAXBLOCKS; index++) { + if ((blocks[index].block != NULL) && (blocks[index].leak == FALSE)) { + freeblock(index); + } + } + + // Do a sanity check. + if (context->leaky == TRUE) { + assert(total_allocs == (numactions * (1 + NUMDUPLEAKS))); + } + else { + assert(total_allocs == 0); + } + + context->terminated = TRUE; + return 0; +} + +int main (int argc, char *argv []) +{ + threadcontext_t contexts [NUMTHREADS]; + DWORD end; + UINT index; +#define MESSAGESIZE 512 + char message [512]; + DWORD start; + UINT leakythread; + + start = GetTickCount(); + srand(start); + + // Select a random thread to be the leaker. + leakythread = random(NUMTHREADS - 1); + + for (index = 0; index < NUMTHREADS; ++index) { + contexts[index].index = index; + if (index == leakythread) { + contexts[index].leaky = TRUE; + } + contexts[index].seed = random(RAND_MAX); + contexts[index].terminated = FALSE; + CreateThread(NULL, 0, runtestsuite, &contexts[index], 0, &contexts[index].threadid); + } + + // Wait for all threads to terminate. + for (index = 0; index < NUMTHREADS; ++index) { + while (contexts[index].terminated == FALSE) { + Sleep(10); + } + } + + end = GetTickCount(); + _snprintf_s(message, 512, _TRUNCATE, "Elapsed Time = %ums\n", end - start); + OutputDebugString(message); + + return 0; +} diff --git a/testsuite/testsuite.vcproj b/testsuite/testsuite.vcproj index b56e9957..260199ac 100644 --- a/testsuite/testsuite.vcproj +++ b/testsuite/testsuite.vcproj @@ -1,258 +1,483 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tree.h b/tree.h index 949990ea..41c64455 100644 --- a/tree.h +++ b/tree.h @@ -1,785 +1,785 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Red-black Tree Template -// Copyright (c) 2005-2006 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifndef VLDBUILD -#error \ -"This header should only be included by Visual Leak Detector when building it from source. \ -Applications should never include this header." -#endif - -#include "vldheap.h" // Provides internal new and delete operators. - -#define TREE_DEFAULT_RESERVE 32 // By default, trees reserve enough space, in advance, for this many nodes. - -//////////////////////////////////////////////////////////////////////////////// -// -// The Tree Template Class -// -// This data structure is the internal data structure behind the lightweight -// STL-like container classes. This is a red-black tree which provides for -// fast insert, find, and erase operations. -// -// The binary tree nodes are overlaid on top of larger chunks of allocated -// memory (called chunks) which are arranged in a simple linked list. This -// allows the tree to grow (add nodes) dynamically without incurring a heap -// hit each time a new node is added. -// -// The Tree class provides member functions which make it easily adaptable to -// an STL-like interface so that it can be used as the backend for STL-like -// container classes. -// -template -class Tree -{ -public: - // This is a red-black tree. - enum color_e { - red, - black - }; - - // The node is the basic data structure which the tree is built from. - typedef struct node_s { - color_e color; // The node's color. - T key; // The node's value, by which nodes are sorted. - union { - struct node_s *left; // For nodes in the tree, the node's left child. - struct node_s *next; // For nodes in the free list, the next node on the free list. - }; - struct node_s *parent; // The node's parent. - struct node_s *right; // The node's right child. - } node_t; - - // Reserve capacity for the tree is allocated in large chunks with room for - // many nodes. - typedef struct chunk_s { - struct chunk_s *next; // Pointer to the next node in the chunk list. - node_t *nodes; // Pointer to an array (of variable size) where nodes are stored. - } chunk_t; - - // Constructor - Tree () - { - m_freelist = NULL; - InitializeCriticalSection(&m_lock); - m_nil.color = black; - m_nil.key = T(); - m_nil.left = &m_nil; - m_nil.parent = &m_nil; - m_nil.right = &m_nil; - m_reserve = TREE_DEFAULT_RESERVE; - m_root = &m_nil; - m_store = NULL; - m_storetail = NULL; - } - - // Copy constructor - The sole purpose of this constructor's existence is - // to ensure that trees are not being inadvertently copied. - Tree (const Tree& source) - { - assert(FALSE); // Do not make copies of trees! - } - - // Destructor - ~Tree () - { - chunk_t *cur; - chunk_t *temp; - - // Free all the chunks in the chunk list. - EnterCriticalSection(&m_lock); - cur = m_store; - while (cur != NULL) { - temp = cur; - cur = cur->next; - delete [] temp->nodes; - delete temp; - } - LeaveCriticalSection(&m_lock); - DeleteCriticalSection(&m_lock); - } - - // operator = - Assignment operator. For efficiency, we want to avoid ever - // making copies of Trees (only pointer passing or reference passing - // should be performed). The sole purpose of this assignment operator is - // to ensure that no copying is being done inadvertently. - // - Tree& operator = (const Tree &other) - { - // Don't make copies of Trees! - assert(FALSE); - return *this; - } - - // begin - Obtains a pointer to the first node (the node with the smallest - // key value) in the tree. - // - // Return Value: - // - // Returns a pointer to the first node in the tree. - // - typename Tree::node_t* begin () const - { - node_t *cur; - - EnterCriticalSection(&m_lock); - if (m_root == &m_nil) { - LeaveCriticalSection(&m_lock); - return NULL; - } - - cur = m_root; - while (cur->left != &m_nil) { - cur = cur->left; - } - LeaveCriticalSection(&m_lock); - - return cur; - } - - // erase - Erases the specified node from the tree. Note that this does - // not cause the key associated with the erased node to be freed. The - // caller is responsible for freeing any dynamically allocated memory - // associated with the key. - // - // - node (IN): Pointer to the node to erase from the tree. - // - // Return Value: - // - // None. - // - VOID erase (typename Tree::node_t *node) - { - node_t *child; - node_t *cur; - node_t *erasure; - node_t *sibling; - - EnterCriticalSection(&m_lock); - - if ((node->left == &m_nil) || (node->right == &m_nil)) { - // The node to be erased has less than two children. It can be directly - // removed from the tree. - erasure = node; - } - else { - // The node to be erased has two children. It can only be removed - // indirectly. The actual node will stay where it is, but it's contents - // will be replaced by it's in-order successor's contents. The successor - // node will then be erased. Find the successor. - erasure = node->right; - while (erasure->left != &m_nil) { - erasure = erasure->left; - } - } - - // Select the child node which will replace the node to be erased. - if (erasure->left != &m_nil) { - child = erasure->left; - } - else { - child = erasure->right; - } - - // Replace the node to be erased with the selected child. - child->parent = erasure->parent; - if (child->parent == &m_nil) { - // The root of the tree is being erased. The child becomes root. - m_root = child; - } - else { - if (erasure == erasure->parent->left) { - erasure->parent->left = child; - } - else { - erasure->parent->right = child; - } - } - - if (erasure != node) { - // The node being erased from the tree is the successor of the actual - // node to be erased. Replace the contents of the node to be erased - // with the successor's contents. - node->key = erasure->key; - } - - if (erasure->color == black) { - // The node being erased from the tree is black. Restructuring of the - // tree may be needed so that black-height is maintained. - cur = child; - while ((cur != m_root) && (cur->color == black)) { - if (cur == cur->parent->left) { - // Current node is a left child. - sibling = cur->parent->right; - if (sibling->color == red) { - // Sibling is red. Rotate sibling up and color it black. - sibling->color = black; - cur->parent->color = red; - _rotateleft(cur->parent); - sibling = cur->parent->right; - } - if ((sibling->left->color == black) && (sibling->right->color == black)) { - // Both of sibling's children are black. Color sibling red. - sibling->color = red; - cur = cur->parent; - } - else { - // At least one of sibling's children is red. - if (sibling->right->color == black) { - sibling->left->color = black; - sibling->color = red; - _rotateright(sibling); - sibling = cur->parent->right; - } - sibling->color = cur->parent->color; - cur->parent->color = black; - sibling->right->color = black; - _rotateleft(cur->parent); - cur = m_root; - } - } - else { - // Current node is a right child. - sibling = cur->parent->left; - if (sibling->color == red) { - // Sibling is red. Rotate sibling up and color it black. - sibling->color = black; - cur->parent->color = red; - _rotateright(cur->parent); - sibling = cur->parent->left; - } - if ((sibling->left->color == black) && (sibling->right->color == black)) { - // Both of sibling's children are black. Color sibling red. - sibling->color = red; - cur = cur->parent; - } - else { - // At least one of sibling's children is red. - if (sibling->left->color == black) { - sibling->right->color = black; - sibling->color = red; - _rotateleft(sibling); - sibling = cur->parent->left; - } - sibling->color = cur->parent->color; - cur->parent->color = black; - sibling->left->color = black; - _rotateright(cur->parent); - cur = m_root; - } - } - } - cur->color = black; - } - - // Put the erased node onto the free list. - erasure->next = m_freelist; - m_freelist = erasure; - - LeaveCriticalSection(&m_lock); - } - - // erase - Erases the specified key from the tree. Note that this does - // not cause the key associated with the erased node to be freed. The - // caller is responsible for freeing any dynamically allocated memory - // associated with the key. - // - // - key (IN): The key to erase from the tree. This value is treated as - // the key for sorting within the tree. It must therefore be of a type - // which supports the "<" operator. - // - // Return Value: - // - // None. - // - VOID erase (const T &key) - { - node_t *node; - - // Find the node to erase. - EnterCriticalSection(&m_lock); - node = m_root; - while (node != &m_nil) { - if (node->key < key) { - // Go right. - node = node->right; - } - else if (key < node->key) { - // Go left. - node = node->left; - } - else { - // Found it. - erase(node); - LeaveCriticalSection(&m_lock); - return; - } - } - LeaveCriticalSection(&m_lock); - - // 'key' is not in the tree. - return; - } - - // find - Obtains a pointer to the node corresponding to the specified key. - // - // - key (IN): The value to search for in the tree. This value is treated - // as the key for sorting within the tree. It must therefore be of a - // type which supports the "<" operator. - // - // Return Value: - // - // Returns a pointer to the node corresponding to the specified key. If - // the key is not in the tree, then "find" returns NULL. - // - typename Tree::node_t* find (const T &key) const - { - node_t *cur; - - EnterCriticalSection(&m_lock); - cur = m_root; - while (cur != &m_nil) { - if (cur->key < key) { - // Go right. - cur = cur->right; - } - else if (key < cur->key) { - // Go left. - cur = cur->left; - } - else { - // Found it. - LeaveCriticalSection(&m_lock); - return cur; - } - } - LeaveCriticalSection(&m_lock); - - // 'key' is not in the tree. - return NULL; - } - - // insert - Inserts a new key into the tree. - // - // - key (IN): The key to insert into the tree. This value is treated as - // the key for sorting within the tree. It must therefore be of a type - // which supports the "<" operator. - // - // Return Value: - // - // Returns a pointer to the node corresponding to the newly inserted - // key. If an attempt is made to insert a key which is already in the - // tree, then NULL is returned and the new key is not inserted. - // - typename Tree::node_t* insert (const T &key) - { - node_t *cur; - node_t *node; - node_t *parent; - node_t *uncle; - - EnterCriticalSection(&m_lock); - - // Find the location where the new node should be inserted.. - cur = m_root; - parent = &m_nil; - while (cur != &m_nil) { - parent = cur; - if (cur->key < key) { - // Go right. - cur = cur->right; - } - else if (key < cur->key) { - // Go left. - cur = cur->left; - } - else { - // Keys in the tree must be unique. - LeaveCriticalSection(&m_lock); - return NULL; - } - } - - // Obtain a new node from the free list. - if (m_freelist == NULL) { - // Allocate additional storage. - reserve(m_reserve); - } - node = m_freelist; - m_freelist = m_freelist->next; - - // Initialize the new node and insert it. - node->color = red; - node->key = key; - node->left = &m_nil; - node->parent = parent; - node->right = &m_nil; - if (parent == &m_nil) { - // The tree is empty. The new node becomes root. - m_root = node; - } - else { - if (parent->key < key) { - // New node is a right child. - parent->right = node; - } - else { - // New node is a left child. - parent->left = node; - } - } - - // Rebalance and/or adjust the tree, if necessary. - cur = node; - while (cur->parent->color == red) { - // Double-red violation. Rebalancing/adjustment needed. - if (cur->parent == cur->parent->parent->left) { - // Parent is the left child. Uncle is the right child. - uncle = cur->parent->parent->right; - if (uncle->color == red) { - // Uncle is red. Recolor. - cur->parent->parent->color = red; - cur->parent->color = black; - uncle->color = black; - cur = cur->parent->parent; - } - else { - // Uncle is black. Restructure. - if (cur == cur->parent->right) { - cur = cur->parent; - _rotateleft(cur); - } - cur->parent->color = black; - cur->parent->parent->color = red; - _rotateright(cur->parent->parent); - } - } - else { - // Parent is the right child. Uncle is the left child. - uncle = cur->parent->parent->left; - if (uncle->color == red) { - // Uncle is red. Recolor. - cur->parent->parent->color = red; - cur->parent->color = black; - uncle->color = black; - cur = cur->parent->parent; - } - else { - // Uncle is black. Restructure. - if (cur == cur->parent->left) { - cur = cur->parent; - _rotateright(cur); - } - cur->parent->color = black; - cur->parent->parent->color = red; - _rotateleft(cur->parent->parent); - } - } - } - - // The root node is always colored black. - m_root->color = black; - - LeaveCriticalSection(&m_lock); - - return node; - } - - // next - Obtains a pointer to the in-order successor of the specified - // node. - // - // - node (IN): Pointer to the node whose in-order successor to retrieve. - // - // Return Value: - // - // Returns a pointer to the node's in-order successor. If the specified - // node corresponds to the largest value in the tree, then the specified - // node has no successor and "next" will return NULL. - // - typename Tree::node_t* next (typename Tree::node_t *node) const - { - node_t* cur; - - if (node == NULL) { - return NULL; - } - - EnterCriticalSection(&m_lock); - if (node->right != &m_nil) { - // 'node' has a right child. Successor is the far left node in - // the right subtree. - cur = node->right; - while (cur->left != &m_nil) { - cur = cur->left; - } - LeaveCriticalSection(&m_lock); - return cur; - } - else if (node->parent != &m_nil) { - // 'node' has no right child, but does have a parent. - if (node == node->parent->left) { - // 'node' is a left child; node's parent is successor. - LeaveCriticalSection(&m_lock); - return node->parent; - } - else { - // 'node' is a right child. - cur = node; - // Go up the tree until we find a parent to the right. - while (cur->parent != &m_nil) { - if (cur == cur->parent->right) { - cur = cur->parent; - continue; - } - else { - LeaveCriticalSection(&m_lock); - return cur->parent; - } - } - - // There is no parent greater than 'node'. 'node' is the - // maximum node. - LeaveCriticalSection(&m_lock); - return NULL; - } - } - else { - // 'node' is root and root is the maximum node. - LeaveCriticalSection(&m_lock); - return NULL; - } - } - - // prev - Obtains a pointer to the in-order predecessor of the specified - // node. - // - // - node (IN): Pointer to the node whose in-order predecessor to retrieve. - // - // Return Value: - // - // Returns a pointer to the node's in-order predecessor. If the specified - // node corresponds to the smallest value in the tree, then the specified - // node has no predecessor and "prev" will return NULL. - // - typename Tree::node_t* prev (typename Tree::node_t *node) const - { - node_t* cur; - - if (node == NULL) { - return NULL; - } - - EnterCriticalSection(&m_lock); - if (node->left != &m_nil) { - // 'node' has left child. Predecessor is the far right node in the - // left subtree. - cur = node->left; - while (cur->right != &m_nil) { - cur = cur->right; - } - LeaveCriticalSection(&m_lock); - return cur; - } - else if (node->parent != & m_nil) { - // 'node' has no left child, but does have a parent. - if (node == node->parent->right) { - // 'node' is a right child; node's parent is predecessor. - LeaveCriticalSection(&m_lock); - return node->parent; - } - else { - // 'node is a left child. - cur = node; - // Go up the tree until we find a parent to the left. - while (cur->parent != &m_nil) { - if (cur == cur->parent->left) { - cur = cur->parent; - continue; - } - else { - LeaveCriticalSection(&m_lock); - return cur->parent; - } - } - - // There is no parent less than 'node'. 'node' is the minimum - // node. - LeaveCriticalSection(&m_lock); - return NULL; - } - } - else { - // 'node' is root and root is the minimum node. - LeaveCriticalSection(&m_lock); - return NULL; - } - } - - // reserve - Reserves storage for a number of nodes in advance and/or sets - // the number of nodes for which the tree will automatically reserve - // storage when the tree needs to "grow" to accomodate new values being - // inserted into the tree. If this function is not called to set the - // reserve size to a specific value, then a pre-determined default value - // will be used. If this function is called when the tree currently has - // no reserve storage, then in addition to setting the tree's reserve - // value, it will also cause the tree to immediately reserve the - // specified amount of storage. - // - // - count (IN): The number of individual nodes' worth of storage to - // reserve. - // - // Return Value: - // - // Returns the previously defined reserve value. - // - UINT32 reserve (UINT32 count) - { - chunk_t *chunk; - UINT32 index; - UINT32 oldreserve = m_reserve; - - if (count != m_reserve) { - if (count < 1) { - // Minimum reserve size is 1. - m_reserve = 1; - } - else { - m_reserve = count; - } - } - - EnterCriticalSection(&m_lock); - if (m_freelist == NULL) { - // Allocate additional storage. - // Link a new chunk into the chunk list. - chunk = new Tree::chunk_t; - chunk->nodes = new Tree::node_s [m_reserve]; - chunk->next = NULL; - if (m_store == NULL) { - m_store = chunk; - } - else { - m_storetail->next = chunk; - } - m_storetail = chunk; - - // Link the individual nodes together to form a new free list. - for (index = 0; index < m_reserve - 1; index++) { - chunk->nodes[index].next = &chunk->nodes[index + 1]; - } - chunk->nodes[index].next = NULL; - m_freelist = chunk->nodes; - } - LeaveCriticalSection(&m_lock); - - return oldreserve; - } - -private: - // _rotateleft: Rotates a pair of nodes counter-clockwise so that the parent - // node becomes the left child and the right child becomes the parent. - // - // - parent (IN): Pointer to the parent to rotate about. - // - // Return Value: - // - // None. - // - VOID _rotateleft (typename Tree::node_t *parent) - { - node_t *child = parent->right; - - // Reassign the child's left subtree to the parent. - parent->right = child->left; - if (child->left != &m_nil) { - child->left->parent = parent; - } - - // Reassign the child/parent relationship. - child->parent = parent->parent; - if (parent->parent == &m_nil) { - // The child becomes the new root node. - m_root = child; - } - else { - // Point the grandparent at the child. - if (parent == parent->parent->left) { - parent->parent->left = child; - } - else { - parent->parent->right = child; - } - } - child->left = parent; - parent->parent = child; - } - - // _rotateright - Rotates a pair of nodes clockwise so that the parent node - // becomes the right child and the left child becomes the parent. - // - // - parent (IN): Pointer to the parent to rotate about. - // - // Return Value: - // - // None. - // - VOID _rotateright (typename Tree::node_t *parent) - { - node_t *child = parent->left; - - // Reassign the child's right subtree to the parent. - parent->left = child->right; - if (child->right != &m_nil) { - child->right->parent = parent; - } - - // Reassign the child/parent relationship. - child->parent = parent->parent; - if (parent->parent == &m_nil) { - // The child becomes the new root node. - m_root = child; - } - else { - // Point the grandparent at the child. - if (parent == parent->parent->left) { - parent->parent->left = child; - } - else { - parent->parent->right = child; - } - } - child->right = parent; - parent->parent = child; - } - - // Private data members. - node_t *m_freelist; // Pointer to the list of free nodes (reserve storage). - mutable CRITICAL_SECTION m_lock; // Protects the tree's integrity against concurrent accesses. - node_t m_nil; // The tree's nil node. All leaf nodes point to this. - UINT32 m_reserve; // The size (in nodes) of the chunks of reserve storage. - node_t *m_root; // Pointer to the tree's root node. - chunk_t *m_store; // Pointer to the start of the chunk list. - chunk_t *m_storetail; // Pointer to the end of the chunk list. -}; +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Red-black Tree Template +// Copyright (c) 2005-2006 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifndef VLDBUILD +#error \ +"This header should only be included by Visual Leak Detector when building it from source. \ +Applications should never include this header." +#endif + +#include "vldheap.h" // Provides internal new and delete operators. + +#define TREE_DEFAULT_RESERVE 32 // By default, trees reserve enough space, in advance, for this many nodes. + +//////////////////////////////////////////////////////////////////////////////// +// +// The Tree Template Class +// +// This data structure is the internal data structure behind the lightweight +// STL-like container classes. This is a red-black tree which provides for +// fast insert, find, and erase operations. +// +// The binary tree nodes are overlaid on top of larger chunks of allocated +// memory (called chunks) which are arranged in a simple linked list. This +// allows the tree to grow (add nodes) dynamically without incurring a heap +// hit each time a new node is added. +// +// The Tree class provides member functions which make it easily adaptable to +// an STL-like interface so that it can be used as the backend for STL-like +// container classes. +// +template +class Tree +{ +public: + // This is a red-black tree. + enum color_e { + red, + black + }; + + // The node is the basic data structure which the tree is built from. + typedef struct node_s { + color_e color; // The node's color. + T key; // The node's value, by which nodes are sorted. + union { + struct node_s *left; // For nodes in the tree, the node's left child. + struct node_s *next; // For nodes in the free list, the next node on the free list. + }; + struct node_s *parent; // The node's parent. + struct node_s *right; // The node's right child. + } node_t; + + // Reserve capacity for the tree is allocated in large chunks with room for + // many nodes. + typedef struct chunk_s { + struct chunk_s *next; // Pointer to the next node in the chunk list. + node_t *nodes; // Pointer to an array (of variable size) where nodes are stored. + } chunk_t; + + // Constructor + Tree () + { + m_freelist = NULL; + InitializeCriticalSection(&m_lock); + m_nil.color = black; + m_nil.key = T(); + m_nil.left = &m_nil; + m_nil.parent = &m_nil; + m_nil.right = &m_nil; + m_reserve = TREE_DEFAULT_RESERVE; + m_root = &m_nil; + m_store = NULL; + m_storetail = NULL; + } + + // Copy constructor - The sole purpose of this constructor's existence is + // to ensure that trees are not being inadvertently copied. + Tree (const Tree& source) + { + assert(FALSE); // Do not make copies of trees! + } + + // Destructor + ~Tree () + { + chunk_t *cur; + chunk_t *temp; + + // Free all the chunks in the chunk list. + EnterCriticalSection(&m_lock); + cur = m_store; + while (cur != NULL) { + temp = cur; + cur = cur->next; + delete [] temp->nodes; + delete temp; + } + LeaveCriticalSection(&m_lock); + DeleteCriticalSection(&m_lock); + } + + // operator = - Assignment operator. For efficiency, we want to avoid ever + // making copies of Trees (only pointer passing or reference passing + // should be performed). The sole purpose of this assignment operator is + // to ensure that no copying is being done inadvertently. + // + Tree& operator = (const Tree &other) + { + // Don't make copies of Trees! + assert(FALSE); + return *this; + } + + // begin - Obtains a pointer to the first node (the node with the smallest + // key value) in the tree. + // + // Return Value: + // + // Returns a pointer to the first node in the tree. + // + typename Tree::node_t* begin () const + { + node_t *cur; + + EnterCriticalSection(&m_lock); + if (m_root == &m_nil) { + LeaveCriticalSection(&m_lock); + return NULL; + } + + cur = m_root; + while (cur->left != &m_nil) { + cur = cur->left; + } + LeaveCriticalSection(&m_lock); + + return cur; + } + + // erase - Erases the specified node from the tree. Note that this does + // not cause the key associated with the erased node to be freed. The + // caller is responsible for freeing any dynamically allocated memory + // associated with the key. + // + // - node (IN): Pointer to the node to erase from the tree. + // + // Return Value: + // + // None. + // + VOID erase (typename Tree::node_t *node) + { + node_t *child; + node_t *cur; + node_t *erasure; + node_t *sibling; + + EnterCriticalSection(&m_lock); + + if ((node->left == &m_nil) || (node->right == &m_nil)) { + // The node to be erased has less than two children. It can be directly + // removed from the tree. + erasure = node; + } + else { + // The node to be erased has two children. It can only be removed + // indirectly. The actual node will stay where it is, but it's contents + // will be replaced by it's in-order successor's contents. The successor + // node will then be erased. Find the successor. + erasure = node->right; + while (erasure->left != &m_nil) { + erasure = erasure->left; + } + } + + // Select the child node which will replace the node to be erased. + if (erasure->left != &m_nil) { + child = erasure->left; + } + else { + child = erasure->right; + } + + // Replace the node to be erased with the selected child. + child->parent = erasure->parent; + if (child->parent == &m_nil) { + // The root of the tree is being erased. The child becomes root. + m_root = child; + } + else { + if (erasure == erasure->parent->left) { + erasure->parent->left = child; + } + else { + erasure->parent->right = child; + } + } + + if (erasure != node) { + // The node being erased from the tree is the successor of the actual + // node to be erased. Replace the contents of the node to be erased + // with the successor's contents. + node->key = erasure->key; + } + + if (erasure->color == black) { + // The node being erased from the tree is black. Restructuring of the + // tree may be needed so that black-height is maintained. + cur = child; + while ((cur != m_root) && (cur->color == black)) { + if (cur == cur->parent->left) { + // Current node is a left child. + sibling = cur->parent->right; + if (sibling->color == red) { + // Sibling is red. Rotate sibling up and color it black. + sibling->color = black; + cur->parent->color = red; + _rotateleft(cur->parent); + sibling = cur->parent->right; + } + if ((sibling->left->color == black) && (sibling->right->color == black)) { + // Both of sibling's children are black. Color sibling red. + sibling->color = red; + cur = cur->parent; + } + else { + // At least one of sibling's children is red. + if (sibling->right->color == black) { + sibling->left->color = black; + sibling->color = red; + _rotateright(sibling); + sibling = cur->parent->right; + } + sibling->color = cur->parent->color; + cur->parent->color = black; + sibling->right->color = black; + _rotateleft(cur->parent); + cur = m_root; + } + } + else { + // Current node is a right child. + sibling = cur->parent->left; + if (sibling->color == red) { + // Sibling is red. Rotate sibling up and color it black. + sibling->color = black; + cur->parent->color = red; + _rotateright(cur->parent); + sibling = cur->parent->left; + } + if ((sibling->left->color == black) && (sibling->right->color == black)) { + // Both of sibling's children are black. Color sibling red. + sibling->color = red; + cur = cur->parent; + } + else { + // At least one of sibling's children is red. + if (sibling->left->color == black) { + sibling->right->color = black; + sibling->color = red; + _rotateleft(sibling); + sibling = cur->parent->left; + } + sibling->color = cur->parent->color; + cur->parent->color = black; + sibling->left->color = black; + _rotateright(cur->parent); + cur = m_root; + } + } + } + cur->color = black; + } + + // Put the erased node onto the free list. + erasure->next = m_freelist; + m_freelist = erasure; + + LeaveCriticalSection(&m_lock); + } + + // erase - Erases the specified key from the tree. Note that this does + // not cause the key associated with the erased node to be freed. The + // caller is responsible for freeing any dynamically allocated memory + // associated with the key. + // + // - key (IN): The key to erase from the tree. This value is treated as + // the key for sorting within the tree. It must therefore be of a type + // which supports the "<" operator. + // + // Return Value: + // + // None. + // + VOID erase (const T &key) + { + node_t *node; + + // Find the node to erase. + EnterCriticalSection(&m_lock); + node = m_root; + while (node != &m_nil) { + if (node->key < key) { + // Go right. + node = node->right; + } + else if (key < node->key) { + // Go left. + node = node->left; + } + else { + // Found it. + erase(node); + LeaveCriticalSection(&m_lock); + return; + } + } + LeaveCriticalSection(&m_lock); + + // 'key' is not in the tree. + return; + } + + // find - Obtains a pointer to the node corresponding to the specified key. + // + // - key (IN): The value to search for in the tree. This value is treated + // as the key for sorting within the tree. It must therefore be of a + // type which supports the "<" operator. + // + // Return Value: + // + // Returns a pointer to the node corresponding to the specified key. If + // the key is not in the tree, then "find" returns NULL. + // + typename Tree::node_t* find (const T &key) const + { + node_t *cur; + + EnterCriticalSection(&m_lock); + cur = m_root; + while (cur != &m_nil) { + if (cur->key < key) { + // Go right. + cur = cur->right; + } + else if (key < cur->key) { + // Go left. + cur = cur->left; + } + else { + // Found it. + LeaveCriticalSection(&m_lock); + return cur; + } + } + LeaveCriticalSection(&m_lock); + + // 'key' is not in the tree. + return NULL; + } + + // insert - Inserts a new key into the tree. + // + // - key (IN): The key to insert into the tree. This value is treated as + // the key for sorting within the tree. It must therefore be of a type + // which supports the "<" operator. + // + // Return Value: + // + // Returns a pointer to the node corresponding to the newly inserted + // key. If an attempt is made to insert a key which is already in the + // tree, then NULL is returned and the new key is not inserted. + // + typename Tree::node_t* insert (const T &key) + { + node_t *cur; + node_t *node; + node_t *parent; + node_t *uncle; + + EnterCriticalSection(&m_lock); + + // Find the location where the new node should be inserted.. + cur = m_root; + parent = &m_nil; + while (cur != &m_nil) { + parent = cur; + if (cur->key < key) { + // Go right. + cur = cur->right; + } + else if (key < cur->key) { + // Go left. + cur = cur->left; + } + else { + // Keys in the tree must be unique. + LeaveCriticalSection(&m_lock); + return NULL; + } + } + + // Obtain a new node from the free list. + if (m_freelist == NULL) { + // Allocate additional storage. + reserve(m_reserve); + } + node = m_freelist; + m_freelist = m_freelist->next; + + // Initialize the new node and insert it. + node->color = red; + node->key = key; + node->left = &m_nil; + node->parent = parent; + node->right = &m_nil; + if (parent == &m_nil) { + // The tree is empty. The new node becomes root. + m_root = node; + } + else { + if (parent->key < key) { + // New node is a right child. + parent->right = node; + } + else { + // New node is a left child. + parent->left = node; + } + } + + // Rebalance and/or adjust the tree, if necessary. + cur = node; + while (cur->parent->color == red) { + // Double-red violation. Rebalancing/adjustment needed. + if (cur->parent == cur->parent->parent->left) { + // Parent is the left child. Uncle is the right child. + uncle = cur->parent->parent->right; + if (uncle->color == red) { + // Uncle is red. Recolor. + cur->parent->parent->color = red; + cur->parent->color = black; + uncle->color = black; + cur = cur->parent->parent; + } + else { + // Uncle is black. Restructure. + if (cur == cur->parent->right) { + cur = cur->parent; + _rotateleft(cur); + } + cur->parent->color = black; + cur->parent->parent->color = red; + _rotateright(cur->parent->parent); + } + } + else { + // Parent is the right child. Uncle is the left child. + uncle = cur->parent->parent->left; + if (uncle->color == red) { + // Uncle is red. Recolor. + cur->parent->parent->color = red; + cur->parent->color = black; + uncle->color = black; + cur = cur->parent->parent; + } + else { + // Uncle is black. Restructure. + if (cur == cur->parent->left) { + cur = cur->parent; + _rotateright(cur); + } + cur->parent->color = black; + cur->parent->parent->color = red; + _rotateleft(cur->parent->parent); + } + } + } + + // The root node is always colored black. + m_root->color = black; + + LeaveCriticalSection(&m_lock); + + return node; + } + + // next - Obtains a pointer to the in-order successor of the specified + // node. + // + // - node (IN): Pointer to the node whose in-order successor to retrieve. + // + // Return Value: + // + // Returns a pointer to the node's in-order successor. If the specified + // node corresponds to the largest value in the tree, then the specified + // node has no successor and "next" will return NULL. + // + typename Tree::node_t* next (typename Tree::node_t *node) const + { + node_t* cur; + + if (node == NULL) { + return NULL; + } + + EnterCriticalSection(&m_lock); + if (node->right != &m_nil) { + // 'node' has a right child. Successor is the far left node in + // the right subtree. + cur = node->right; + while (cur->left != &m_nil) { + cur = cur->left; + } + LeaveCriticalSection(&m_lock); + return cur; + } + else if (node->parent != &m_nil) { + // 'node' has no right child, but does have a parent. + if (node == node->parent->left) { + // 'node' is a left child; node's parent is successor. + LeaveCriticalSection(&m_lock); + return node->parent; + } + else { + // 'node' is a right child. + cur = node; + // Go up the tree until we find a parent to the right. + while (cur->parent != &m_nil) { + if (cur == cur->parent->right) { + cur = cur->parent; + continue; + } + else { + LeaveCriticalSection(&m_lock); + return cur->parent; + } + } + + // There is no parent greater than 'node'. 'node' is the + // maximum node. + LeaveCriticalSection(&m_lock); + return NULL; + } + } + else { + // 'node' is root and root is the maximum node. + LeaveCriticalSection(&m_lock); + return NULL; + } + } + + // prev - Obtains a pointer to the in-order predecessor of the specified + // node. + // + // - node (IN): Pointer to the node whose in-order predecessor to retrieve. + // + // Return Value: + // + // Returns a pointer to the node's in-order predecessor. If the specified + // node corresponds to the smallest value in the tree, then the specified + // node has no predecessor and "prev" will return NULL. + // + typename Tree::node_t* prev (typename Tree::node_t *node) const + { + node_t* cur; + + if (node == NULL) { + return NULL; + } + + EnterCriticalSection(&m_lock); + if (node->left != &m_nil) { + // 'node' has left child. Predecessor is the far right node in the + // left subtree. + cur = node->left; + while (cur->right != &m_nil) { + cur = cur->right; + } + LeaveCriticalSection(&m_lock); + return cur; + } + else if (node->parent != & m_nil) { + // 'node' has no left child, but does have a parent. + if (node == node->parent->right) { + // 'node' is a right child; node's parent is predecessor. + LeaveCriticalSection(&m_lock); + return node->parent; + } + else { + // 'node is a left child. + cur = node; + // Go up the tree until we find a parent to the left. + while (cur->parent != &m_nil) { + if (cur == cur->parent->left) { + cur = cur->parent; + continue; + } + else { + LeaveCriticalSection(&m_lock); + return cur->parent; + } + } + + // There is no parent less than 'node'. 'node' is the minimum + // node. + LeaveCriticalSection(&m_lock); + return NULL; + } + } + else { + // 'node' is root and root is the minimum node. + LeaveCriticalSection(&m_lock); + return NULL; + } + } + + // reserve - Reserves storage for a number of nodes in advance and/or sets + // the number of nodes for which the tree will automatically reserve + // storage when the tree needs to "grow" to accomodate new values being + // inserted into the tree. If this function is not called to set the + // reserve size to a specific value, then a pre-determined default value + // will be used. If this function is called when the tree currently has + // no reserve storage, then in addition to setting the tree's reserve + // value, it will also cause the tree to immediately reserve the + // specified amount of storage. + // + // - count (IN): The number of individual nodes' worth of storage to + // reserve. + // + // Return Value: + // + // Returns the previously defined reserve value. + // + size_t reserve (size_t count) + { + chunk_t *chunk; + size_t index; + size_t oldreserve = m_reserve; + + if (count != m_reserve) { + if (count < 1) { + // Minimum reserve size is 1. + m_reserve = 1; + } + else { + m_reserve = count; + } + } + + EnterCriticalSection(&m_lock); + if (m_freelist == NULL) { + // Allocate additional storage. + // Link a new chunk into the chunk list. + chunk = new Tree::chunk_t; + chunk->nodes = new Tree::node_s [m_reserve]; + chunk->next = NULL; + if (m_store == NULL) { + m_store = chunk; + } + else { + m_storetail->next = chunk; + } + m_storetail = chunk; + + // Link the individual nodes together to form a new free list. + for (index = 0; index < m_reserve - 1; index++) { + chunk->nodes[index].next = &chunk->nodes[index + 1]; + } + chunk->nodes[index].next = NULL; + m_freelist = chunk->nodes; + } + LeaveCriticalSection(&m_lock); + + return oldreserve; + } + +private: + // _rotateleft: Rotates a pair of nodes counter-clockwise so that the parent + // node becomes the left child and the right child becomes the parent. + // + // - parent (IN): Pointer to the parent to rotate about. + // + // Return Value: + // + // None. + // + VOID _rotateleft (typename Tree::node_t *parent) + { + node_t *child = parent->right; + + // Reassign the child's left subtree to the parent. + parent->right = child->left; + if (child->left != &m_nil) { + child->left->parent = parent; + } + + // Reassign the child/parent relationship. + child->parent = parent->parent; + if (parent->parent == &m_nil) { + // The child becomes the new root node. + m_root = child; + } + else { + // Point the grandparent at the child. + if (parent == parent->parent->left) { + parent->parent->left = child; + } + else { + parent->parent->right = child; + } + } + child->left = parent; + parent->parent = child; + } + + // _rotateright - Rotates a pair of nodes clockwise so that the parent node + // becomes the right child and the left child becomes the parent. + // + // - parent (IN): Pointer to the parent to rotate about. + // + // Return Value: + // + // None. + // + VOID _rotateright (typename Tree::node_t *parent) + { + node_t *child = parent->left; + + // Reassign the child's right subtree to the parent. + parent->left = child->right; + if (child->right != &m_nil) { + child->right->parent = parent; + } + + // Reassign the child/parent relationship. + child->parent = parent->parent; + if (parent->parent == &m_nil) { + // The child becomes the new root node. + m_root = child; + } + else { + // Point the grandparent at the child. + if (parent == parent->parent->left) { + parent->parent->left = child; + } + else { + parent->parent->right = child; + } + } + child->right = parent; + parent->parent = child; + } + + // Private data members. + node_t *m_freelist; // Pointer to the list of free nodes (reserve storage). + mutable CRITICAL_SECTION m_lock; // Protects the tree's integrity against concurrent accesses. + node_t m_nil; // The tree's nil node. All leaf nodes point to this. + size_t m_reserve; // The size (in nodes) of the chunks of reserve storage. + node_t *m_root; // Pointer to the tree's root node. + chunk_t *m_store; // Pointer to the start of the chunk list. + chunk_t *m_storetail; // Pointer to the end of the chunk list. +}; diff --git a/utility.cpp b/utility.cpp index 561d8bd5..34f3fb81 100644 --- a/utility.cpp +++ b/utility.cpp @@ -1,840 +1,830 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Various Utility Functions -// Copyright (c) 2005-2009 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include -#if _WIN32_WINNT < 0x0600 // Windows XP or earlier, no GetProcessIdOfThread() -#include -#endif -#ifndef __out_xcount -#define __out_xcount(x) // Workaround for the specstrings.h bug in the Platform SDK. -#endif -#define DBGHELP_TRANSLATE_TCHAR -#include // Provides portable executable (PE) image access functions. -#define VLDBUILD // Declares that we are building Visual Leak Detector. -#include "utility.h" // Provides various utility functions and macros. -#include "vldheap.h" // Provides internal new and delete operators. - -// Imported Global Variables -extern CRITICAL_SECTION imagelock; - -// Global variables. -static BOOL reportdelay = FALSE; // If TRUE, we sleep for a bit after calling OutputDebugString to give the debugger time to catch up. -static FILE *reportfile = NULL; // Pointer to the file, if any, to send the memory leak report to. -static BOOL reporttodebugger = TRUE; // If TRUE, a copy of the memory leak report will be sent to the debugger for display. -static encoding_e reportencoding = ascii; // Output encoding of the memory leak report. - -// dumpmemorya - Dumps a nicely formatted rendition of a region of memory. -// Includes both the hex value of each byte and its ASCII equivalent (if -// printable). -// -// - address (IN): Pointer to the beginning of the memory region to dump. -// -// - size (IN): The size, in bytes, of the region to dump. -// -// Return Value: -// -// None. -// -VOID dumpmemorya (LPCVOID address, SIZE_T size) -{ - WCHAR ascdump [18] = {0}; - SIZE_T ascindex; - BYTE byte; - SIZE_T byteindex; - SIZE_T bytesdone; - SIZE_T dumplen; - WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; - WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; - SIZE_T hexindex; - - // Each line of output is 16 bytes. - if ((size % 16) == 0) { - // No padding needed. - dumplen = size; - } - else { - // We'll need to pad the last line out to 16 bytes. - dumplen = size + (16 - (size % 16)); - } - - // For each byte of data, get both the ASCII equivalent (if it is a - // printable character) and the hex representation. - bytesdone = 0; - for (byteindex = 0; byteindex < dumplen; byteindex++) { - hexindex = 3 * ((byteindex % 16) + ((byteindex % 16) / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. - ascindex = (byteindex % 16) + (byteindex % 16) / 8; // 1 character per byte, plus a 1-character space after every 8 bytes. - if (byteindex < size) { - byte = ((PBYTE)address)[byteindex]; - _snwprintf_s(formatbuf, BYTEFORMATBUFFERLENGTH, _TRUNCATE, L"%.2X ", byte); - formatbuf[3] = '\0'; - wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, formatbuf, 4); - if (isgraph(byte)) { - ascdump[ascindex] = (WCHAR)byte; - } - else { - ascdump[ascindex] = L'.'; - } - } - else { - // Add padding to fill out the last line to 16 bytes. - wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, L" ", 4); - ascdump[ascindex] = L'.'; - } - bytesdone++; - if ((bytesdone % 16) == 0) { - // Print one line of data for every 16 bytes. Include the - // ASCII dump and the hex dump side-by-side. - report(L" %s %s\n", hexdump, ascdump); - } - else { - if ((bytesdone % 8) == 0) { - // Add a spacer in the ASCII dump after every 8 bytes. - ascdump[ascindex + 1] = L' '; - } - if ((bytesdone % 4) == 0) { - // Add a spacer in the hex dump after every 4 bytes. - wcsncpy_s(hexdump + hexindex + 3, HEXDUMPLINELENGTH - hexindex - 3, L" ", 4); - } - } - } -} - -// dumpmemoryw - Dumps a nicely formatted rendition of a region of memory. -// Includes both the hex value of each byte and its Unicode equivalent. -// -// - address (IN): Pointer to the beginning of the memory region to dump. -// -// - size (IN): The size, in bytes, of the region to dump. -// -// Return Value: -// -// None. -// -VOID dumpmemoryw (LPCVOID address, SIZE_T size) -{ - BYTE byte; - SIZE_T byteindex; - SIZE_T bytesdone; - SIZE_T dumplen; - WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; - WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; - SIZE_T hexindex; - WORD word; - WCHAR unidump [18] = {0}; - SIZE_T uniindex; - - // Each line of output is 16 bytes. - if ((size % 16) == 0) { - // No padding needed. - dumplen = size; - } - else { - // We'll need to pad the last line out to 16 bytes. - dumplen = size + (16 - (size % 16)); - } - - // For each word of data, get both the Unicode equivalent and the hex - // representation. - bytesdone = 0; - for (byteindex = 0; byteindex < dumplen; byteindex++) { - hexindex = 3 * ((byteindex % 16) + ((byteindex % 16) / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. - uniindex = ((byteindex / 2) % 8) + ((byteindex / 2) % 8) / 8; // 1 character every other byte, plus a 1-character space after every 8 bytes. - if (byteindex < size) { - byte = ((PBYTE)address)[byteindex]; - _snwprintf_s(formatbuf, BYTEFORMATBUFFERLENGTH, _TRUNCATE, L"%.2X ", byte); - formatbuf[BYTEFORMATBUFFERLENGTH - 1] = '\0'; - wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, formatbuf, 4); - if (((byteindex % 2) == 0) && ((byteindex + 1) < dumplen)) { - // On every even byte, print one character. - word = ((PWORD)address)[byteindex / 2]; - if ((word == 0x0000) || (word == 0x0020)) { - unidump[uniindex] = L'.'; - } - else { - unidump[uniindex] = word; - } - } - } - else { - // Add padding to fill out the last line to 16 bytes. - wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, L" ", 4); - unidump[uniindex] = L'.'; - } - bytesdone++; - if ((bytesdone % 16) == 0) { - // Print one line of data for every 16 bytes. Include the - // ASCII dump and the hex dump side-by-side. - report(L" %s %s\n", hexdump, unidump); - } - else { - if ((bytesdone % 8) == 0) { - // Add a spacer in the ASCII dump after every 8 bytes. - unidump[uniindex + 1] = L' '; - } - if ((bytesdone % 4) == 0) { - // Add a spacer in the hex dump after every 4 bytes. - wcsncpy_s(hexdump + hexindex + 3, HEXDUMPLINELENGTH - hexindex - 3, L" ", 4); - } - } - } -} - -// findimport - Determines if the specified module imports the named import -// from the named exporting module. -// -// - importmodule (IN): Handle (base address) of the module to be searched to -// see if it imports the specified import. -// -// - exportmodule (IN): Handle (base address) of the module that exports the -// import to be searched for. -// -// - exportmodulename (IN): ANSI string containing the name of the module that -// exports the import to be searched for. -// -// - importname (IN): ANSI string containing the name of the import to search -// for. May be an integer cast to a string if the import is exported by -// ordinal. -// -// Return Value: -// -// Returns TRUE if the module imports to the specified import. Otherwise -// returns FALSE. -// -BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname) -{ - IMAGE_THUNK_DATA *iate; - IMAGE_IMPORT_DESCRIPTOR *idte; - FARPROC import; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return FALSE; - } - while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return FALSE; - } - - // Get the *real* address of the import. If we find this address in the IAT, - // then we've found that the module does import the named import. - import = GetProcAddress(exportmodule, importname); - assert(import != NULL); // Perhaps the named export module does not actually export the named import? - - // Locate the import's IAT entry. - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)import) { - // Found the IAT entry. The module imports the named import. - return TRUE; - } - iate++; - } - - // The module does not import the named import. - return FALSE; -} - -// findpatch - Determines if the specified module has been patched to use the -// specified replacement. -// -// - importmodule (IN): Handle (base address) of the module to be searched to -// see if it imports the specified replacement export. -// -// - exportmodulename (IN): ANSI string containing the name of the module that -// normally exports that import that would have been patched to use the -// replacement export. -// -// - replacement (IN): Address of the replacement, or destination, function or -// variable to search for. -// -// Return Value: -// -// Returns TRUE if the module has been patched to use the specified -// replacement export. -// -BOOL findpatch (HMODULE importmodule, LPCSTR exportmodulename, LPCVOID replacement) -{ - IMAGE_THUNK_DATA *iate; - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return FALSE; - } - while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return FALSE; - } - - // Locate the replacement's IAT entry. - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)replacement) { - // Found the IAT entry for the replacement. This patch has been - // installed. - return TRUE; - } - iate++; - } - - // The module does not import the replacement. The patch has not been - // installed. - return FALSE; -} - -// insertreportdelay - Sets the report function to sleep for a bit after each -// call to OutputDebugString, in order to allow the debugger to catch up. -// -// Return Value: -// -// None. -// -VOID insertreportdelay () -{ - reportdelay = TRUE; -} - -// moduleispatched - Checks to see if any of the imports listed in the specified -// patch table have been patched into the specified importmodule. -// -// - importmodule (IN): Handle (base address) of the module to be queried to -// determine if it has been patched. -// -// - patchtable (IN): An array of patchentry_t structures specifying all of the -// import patches to search for. -// -// - tablesize (IN): Size, in entries, of the specified patch table. -// -// Return Value: -// -// Returns TRUE if at least one of the patches listed in the patch table is -// installed in the importmodule. Otherwise returns FALSE. -// -BOOL moduleispatched (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize) -{ - patchentry_t *entry; - BOOL found = FALSE; - UINT index; - - // Loop through the import patch table, individually checking each patch - // entry to see if it is installed in the import module. If any patch entry - // is installed in the import module, then the module has been patched. - for (index = 0; index < tablesize; index++) { - entry = &patchtable[index]; - found = findpatch(importmodule, entry->exportmodulename, entry->replacement); - if (found == TRUE) { - // Found one of the listed patches installed in the import module. - return TRUE; - } - } - - // No patches listed in the patch table were found in the import module. - return FALSE; -} - -// patchimport - Patches all future calls to an imported function, or references -// to an imported variable, through to a replacement function or variable. -// Patching is done by replacing the import's address in the specified target -// module's Import Address Table (IAT) with the address of the replacement -// function or variable. -// -// - importmodule (IN): Handle (base address) of the target module for which -// calls or references to the import should be patched. -// -// - exportmodule (IN): Handle (base address) of the module that exports the -// the function or variable to be patched. -// -// - exportmodulename (IN): ANSI string containing the name of the module that -// exports the function or variable to be patched. -// -// - importname (IN): ANSI string containing the name of the imported function -// or variable to be patched. May be an integer cast to a string if the -// import is exported by ordinal. -// -// - replacement (IN): Address of the function or variable to which future -// calls or references should be patched through to. This function or -// variable can be thought of as effectively replacing the original import -// from the point of view of the module specified by "importmodule". -// -// Return Value: -// -// Returns TRUE if the patch was installed into the import module. If the -// import module does not import the specified export, so nothing changed, -// then FALSE will be returned. -// -BOOL patchimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, - LPCVOID replacement) -{ - IMAGE_THUNK_DATA *iate; - IMAGE_IMPORT_DESCRIPTOR *idte; - FARPROC import; - DWORD protect; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return FALSE; - } - while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return FALSE; - } - - // Get the *real* address of the import. If we find this address in the IAT, - // then we've found the entry that needs to be patched. - import = GetProcAddress(exportmodule, importname); - assert(import != NULL); // Perhaps the named export module does not actually export the named import? - - // Locate the import's IAT entry. - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)import) { - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the address of the replacement. Note that the IAT - // entry may be write-protected, so we must first ensure that it is - // writable. - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)replacement; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - - // The patch has been installed in the import module. - return TRUE; - } - iate++; - } - - // The import's IAT entry was not found. The importing module does not - // import the specified import. - return FALSE; -} - -// patchmodule - Patches all imports listed in the supplied patch table, and -// which are imported by the specified module, through to their respective -// replacement functions. -// -// Note: If the specified module does not import any of the functions listed -// in the patch table, then nothing is changed for the specified module. -// -// - importmodule (IN): Handle (base address) of the target module which is to -// have its imports patched. -// -// - patchtable (IN): An array of patchentry_t structures specifying all of the -// imports to patch for the specified module. -// -// - tablesize (IN): Size, in entries, of the specified patch table. -// -// Return Value: -// -// Returns TRUE if at least one of the patches listed in the patch table was -// installed in the importmodule. Otherwise returns FALSE. -// -BOOL patchmodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize) -{ - patchentry_t *entry; - UINT index; - BOOL patched = FALSE; - - // Loop through the import patch table, individually patching each import - // listed in the table. - for (index = 0; index < tablesize; index++) { - entry = &patchtable[index]; - if (patchimport(importmodule, (HMODULE)entry->modulebase, entry->exportmodulename, entry->importname, - entry->replacement) == TRUE) { - patched = TRUE; - } - } - - return patched; -} - -// report - Sends a printf-style formatted message to the debugger for display -// and/or to a file. -// -// Note: A message longer than MAXREPORTLENGTH characters will be truncated -// to MAXREPORTLENGTH. -// -// - format (IN): Specifies a printf-compliant format string containing the -// message to be sent to the debugger. -// -// - ... (IN): Arguments to be formatted using the specified format string. -// -// Return Value: -// -// None. -// -VOID report (LPCWSTR format, ...) -{ - va_list args; - size_t count; - CHAR messagea [MAXREPORTLENGTH + 1]; - WCHAR messagew [MAXREPORTLENGTH + 1]; - - va_start(args, format); - _vsnwprintf_s(messagew, MAXREPORTLENGTH + 1, _TRUNCATE, format, args); - va_end(args); - messagew[MAXREPORTLENGTH] = L'\0'; - - if (reportencoding == unicode) { - if (reportfile != NULL) { - // Send the report to the previously specified file. - fwrite(messagew, sizeof(WCHAR), wcslen(messagew), reportfile); - } - if (reporttodebugger) { - OutputDebugStringW(messagew); - } - } - else { - if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) == -1) { - // Failed to convert the Unicode message to ASCII. - assert(FALSE); - return; - } - messagea[MAXREPORTLENGTH] = '\0'; - if (reportfile != NULL) { - // Send the report to the previously specified file. - fwrite(messagea, sizeof(CHAR), strlen(messagea), reportfile); - } - if (reporttodebugger) { - OutputDebugStringA(messagea); - } - } - - if (reporttodebugger && (reportdelay == TRUE)) { - Sleep(10); // Workaround the Visual Studio 6 bug where debug strings are sometimes lost if they're sent too fast. - } -} - -// restoreimport - Restores the IAT entry for an import previously patched via -// a call to "patchimport" to the original address of the import. -// -// - importmodule (IN): Handle (base address) of the target module for which -// calls or references to the import should be restored. -// -// - exportmodule (IN): Handle (base address) of the module that exports the -// function or variable to be patched. -// -// - exportmodulename (IN): ANSI string containing the name of the module that -// exports the function or variable to be patched. -// -// - importname (IN): ANSI string containing the name of the imported function -// or variable to be restored. May be an integer cast to a string if the -// import is exported by ordinal. -// -// - replacement (IN): Address of the function or variable which the import was -// previously patched through to via a call to "patchimport". -// -// Return Value: -// -// None. -// -VOID restoreimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, - LPCVOID replacement) -{ - IMAGE_THUNK_DATA *iate; - IMAGE_IMPORT_DESCRIPTOR *idte; - FARPROC import; - DWORD protect; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return; - } - while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return; - } - - // Get the *real* address of the import. - import = GetProcAddress(exportmodule, importname); - assert(import != NULL); // Perhaps the named export module does not actually export the named import? - - // Locate the import's original IAT entry (it currently has the replacement - // address in it). - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)replacement) { - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the import's real address. Note that the IAT entry may - // be write-protected, so we must first ensure that it is writable. - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)import; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - break; - } - iate++; - } -} - -// restoremodule - Restores all imports listed in the supplied patch table, and -// which are imported by the specified module, to their original functions. -// -// Note: If the specified module does not import any of the functions listed -// in the patch table, then nothing is changed for the specified module. -// -// - importmodule (IN): Handle (base address) of the target module which is to -// have its imports restored. -// -// - patchtable (IN): Array of patchentry_t structures specifying all of the -// imports to restore for the specified module. -// -// - tablesize (IN): Size, in entries, of the specified patch table. -// -// Return Value: -// -// None. -// -VOID restoremodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize) -{ - patchentry_t *entry; - UINT index; - - // Loop through the import patch table, individually restoring each import - // listed in the table. - for (index = 0; index < tablesize; index++) { - entry = &patchtable[index]; - restoreimport(importmodule, (HMODULE)entry->modulebase, entry->exportmodulename, entry->importname, - entry->replacement); - } -} - -// setreportencoding - Sets the output encoding of report messages to either -// ASCII (the default) or Unicode. -// -// - encoding (IN): Specifies either "ascii" or "unicode". -// -// Return Value: -// -// None. -// -VOID setreportencoding (encoding_e encoding) -{ - switch (encoding) { - case ascii: - case unicode: - reportencoding = encoding; - break; - - default: - assert(FALSE); - } -} - -// setreportfile - Sets a destination file to which all report messages should -// be sent. If this function is not called to set a destination file, then -// report messages will be sent to the debugger instead of to a file. -// -// - file (IN): Pointer to an open file, to which future report messages should -// be sent. -// -// - copydebugger (IN): If true, in addition to sending report messages to -// the specified file, a copy of each message will also be sent to the -// debugger. -// -// Return Value: -// -// None. -// -VOID setreportfile (FILE *file, BOOL copydebugger) -{ - reportfile = file; - reporttodebugger = copydebugger; -} - -// strapp - Appends the specified source string to the specified destination -// string. Allocates additional space so that the destination string "grows" -// as new strings are appended to it. This function is fairly infrequently -// used so efficiency is not a major concern. -// -// - dest (IN/OUT): Address of the destination string. Receives the resulting -// combined string after the append operation. -// -// - source (IN): Source string to be appended to the destination string. -// -// Return Value: -// -// None. -// -VOID strapp (LPWSTR *dest, LPCWSTR source) -{ - SIZE_T length; - LPWSTR temp; - - temp = *dest; - length = wcslen(*dest) + wcslen(source); - *dest = new WCHAR [length + 1]; - wcsncpy_s(*dest, length + 1, temp, _TRUNCATE); - wcsncat_s(*dest, length + 1, source, _TRUNCATE); - delete [] temp; -} - -// strtobool - Converts string values (e.g. "yes", "no", "on", "off") to boolean -// values. -// -// - s (IN): String value to convert. -// -// Return Value: -// -// Returns TRUE if the string is recognized as a "true" string. Otherwise -// returns FALSE. -// -BOOL strtobool (LPCWSTR s) { - WCHAR *end; - - if ((_wcsicmp(s, L"true") == 0) || - (_wcsicmp(s, L"yes") == 0) || - (_wcsicmp(s, L"on") == 0) || - (wcstol(s, &end, 10) == 1)) { - return TRUE; - } - else { - return FALSE; - } -} - -// _GetProcessIdOfThread - Returns the ID of the process owns the thread. -// -// - thread (IN): The handle to the thread. -// -// Return Value: -// -// Returns the ID of the process that owns the thread. Otherwise returns 0. -// -DWORD _GetProcessIdOfThread (HANDLE thread) -{ - typedef struct _CLIENT_ID { - HANDLE UniqueProcess; - HANDLE UniqueThread; - } CLIENT_ID, *PCLIENT_ID; - - typedef LONG NTSTATUS; - typedef LONG KPRIORITY; - - typedef struct _THREAD_BASIC_INFORMATION { - NTSTATUS ExitStatus; - PVOID TebBaseAddress; - CLIENT_ID ClientId; - KAFFINITY AffinityMask; - KPRIORITY Priority; - KPRIORITY BasePriority; - } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION; - - const static THREADINFOCLASS ThreadBasicInformation = (THREADINFOCLASS)0; - - typedef NTSTATUS (WINAPI *PNtQueryInformationThread) (HANDLE thread, - THREADINFOCLASS infoclass, PVOID buffer, ULONG buffersize, - PULONG used); - - static PNtQueryInformationThread NtQueryInformationThread = NULL; - - THREAD_BASIC_INFORMATION tbi; - NTSTATUS status; - HMODULE ntdll; - if (NtQueryInformationThread == NULL) { - ntdll = GetModuleHandle(L"ntdll.dll"); - NtQueryInformationThread = (PNtQueryInformationThread)GetProcAddress(ntdll, "NtQueryInformationThread"); - if (NtQueryInformationThread == NULL) { - return 0; - } - } - - status = NtQueryInformationThread(thread, ThreadBasicInformation, &tbi, sizeof(tbi), NULL); - if(status < 0) { - // Shall we go through all the trouble of setting last error? - return 0; - } - - return (DWORD)tbi.ClientId.UniqueProcess; -} +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Various Utility Functions +// Copyright (c) 2005-2009 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#include "stdafx.h" +#define VLDBUILD // Declares that we are building Visual Leak Detector. +#include "utility.h" // Provides various utility functions and macros. +#include "vldheap.h" // Provides internal new and delete operators. + +// Imported Global Variables +extern CRITICAL_SECTION imagelock; + +// Global variables. +static BOOL reportdelay = FALSE; // If TRUE, we sleep for a bit after calling OutputDebugString to give the debugger time to catch up. +static FILE *reportfile = NULL; // Pointer to the file, if any, to send the memory leak report to. +static BOOL reporttodebugger = TRUE; // If TRUE, a copy of the memory leak report will be sent to the debugger for display. +static encoding_e reportencoding = ascii; // Output encoding of the memory leak report. + +// dumpmemorya - Dumps a nicely formatted rendition of a region of memory. +// Includes both the hex value of each byte and its ASCII equivalent (if +// printable). +// +// - address (IN): Pointer to the beginning of the memory region to dump. +// +// - size (IN): The size, in bytes, of the region to dump. +// +// Return Value: +// +// None. +// +VOID dumpmemorya (LPCVOID address, SIZE_T size) +{ + WCHAR ascdump [18] = {0}; + SIZE_T ascindex; + BYTE byte; + SIZE_T byteindex; + SIZE_T bytesdone; + SIZE_T dumplen; + WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; + WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; + SIZE_T hexindex; + + // Each line of output is 16 bytes. + if ((size % 16) == 0) { + // No padding needed. + dumplen = size; + } + else { + // We'll need to pad the last line out to 16 bytes. + dumplen = size + (16 - (size % 16)); + } + + // For each byte of data, get both the ASCII equivalent (if it is a + // printable character) and the hex representation. + bytesdone = 0; + for (byteindex = 0; byteindex < dumplen; byteindex++) { + hexindex = 3 * ((byteindex % 16) + ((byteindex % 16) / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. + ascindex = (byteindex % 16) + (byteindex % 16) / 8; // 1 character per byte, plus a 1-character space after every 8 bytes. + if (byteindex < size) { + byte = ((PBYTE)address)[byteindex]; + _snwprintf_s(formatbuf, BYTEFORMATBUFFERLENGTH, _TRUNCATE, L"%.2X ", byte); + formatbuf[3] = '\0'; + wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, formatbuf, 4); + if (isgraph(byte)) { + ascdump[ascindex] = (WCHAR)byte; + } + else { + ascdump[ascindex] = L'.'; + } + } + else { + // Add padding to fill out the last line to 16 bytes. + wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, L" ", 4); + ascdump[ascindex] = L'.'; + } + bytesdone++; + if ((bytesdone % 16) == 0) { + // Print one line of data for every 16 bytes. Include the + // ASCII dump and the hex dump side-by-side. + report(L" %s %s\n", hexdump, ascdump); + } + else { + if ((bytesdone % 8) == 0) { + // Add a spacer in the ASCII dump after every 8 bytes. + ascdump[ascindex + 1] = L' '; + } + if ((bytesdone % 4) == 0) { + // Add a spacer in the hex dump after every 4 bytes. + wcsncpy_s(hexdump + hexindex + 3, HEXDUMPLINELENGTH - hexindex - 3, L" ", 4); + } + } + } +} + +// dumpmemoryw - Dumps a nicely formatted rendition of a region of memory. +// Includes both the hex value of each byte and its Unicode equivalent. +// +// - address (IN): Pointer to the beginning of the memory region to dump. +// +// - size (IN): The size, in bytes, of the region to dump. +// +// Return Value: +// +// None. +// +VOID dumpmemoryw (LPCVOID address, SIZE_T size) +{ + BYTE byte; + SIZE_T byteindex; + SIZE_T bytesdone; + SIZE_T dumplen; + WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; + WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; + SIZE_T hexindex; + WORD word; + WCHAR unidump [18] = {0}; + SIZE_T uniindex; + + // Each line of output is 16 bytes. + if ((size % 16) == 0) { + // No padding needed. + dumplen = size; + } + else { + // We'll need to pad the last line out to 16 bytes. + dumplen = size + (16 - (size % 16)); + } + + // For each word of data, get both the Unicode equivalent and the hex + // representation. + bytesdone = 0; + for (byteindex = 0; byteindex < dumplen; byteindex++) { + hexindex = 3 * ((byteindex % 16) + ((byteindex % 16) / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. + uniindex = ((byteindex / 2) % 8) + ((byteindex / 2) % 8) / 8; // 1 character every other byte, plus a 1-character space after every 8 bytes. + if (byteindex < size) { + byte = ((PBYTE)address)[byteindex]; + _snwprintf_s(formatbuf, BYTEFORMATBUFFERLENGTH, _TRUNCATE, L"%.2X ", byte); + formatbuf[BYTEFORMATBUFFERLENGTH - 1] = '\0'; + wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, formatbuf, 4); + if (((byteindex % 2) == 0) && ((byteindex + 1) < dumplen)) { + // On every even byte, print one character. + word = ((PWORD)address)[byteindex / 2]; + if ((word == 0x0000) || (word == 0x0020)) { + unidump[uniindex] = L'.'; + } + else { + unidump[uniindex] = word; + } + } + } + else { + // Add padding to fill out the last line to 16 bytes. + wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, L" ", 4); + unidump[uniindex] = L'.'; + } + bytesdone++; + if ((bytesdone % 16) == 0) { + // Print one line of data for every 16 bytes. Include the + // ASCII dump and the hex dump side-by-side. + report(L" %s %s\n", hexdump, unidump); + } + else { + if ((bytesdone % 8) == 0) { + // Add a spacer in the ASCII dump after every 8 bytes. + unidump[uniindex + 1] = L' '; + } + if ((bytesdone % 4) == 0) { + // Add a spacer in the hex dump after every 4 bytes. + wcsncpy_s(hexdump + hexindex + 3, HEXDUMPLINELENGTH - hexindex - 3, L" ", 4); + } + } + } +} + +// findimport - Determines if the specified module imports the named import +// from the named exporting module. +// +// - importmodule (IN): Handle (base address) of the module to be searched to +// see if it imports the specified import. +// +// - exportmodule (IN): Handle (base address) of the module that exports the +// import to be searched for. +// +// - exportmodulename (IN): ANSI string containing the name of the module that +// exports the import to be searched for. +// +// - importname (IN): ANSI string containing the name of the import to search +// for. May be an integer cast to a string if the import is exported by +// ordinal. +// +// Return Value: +// +// Returns TRUE if the module imports to the specified import. Otherwise +// returns FALSE. +// +BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname) +{ + IMAGE_THUNK_DATA *iate; + IMAGE_IMPORT_DESCRIPTOR *idte; + FARPROC import; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return FALSE; + } + while (idte->OriginalFirstThunk != 0x0) { + if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->OriginalFirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return FALSE; + } + + // Get the *real* address of the import. If we find this address in the IAT, + // then we've found that the module does import the named import. + import = GetProcAddress(exportmodule, importname); + assert(import != NULL); // Perhaps the named export module does not actually export the named import? + + // Locate the import's IAT entry. + iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) { + if (iate->u1.Function == (DWORD_PTR)import) { + // Found the IAT entry. The module imports the named import. + return TRUE; + } + iate++; + } + + // The module does not import the named import. + return FALSE; +} + +// findpatch - Determines if the specified module has been patched to use the +// specified replacement. +// +// - importmodule (IN): Handle (base address) of the module to be searched to +// see if it imports the specified replacement export. +// +// - exportmodulename (IN): ANSI string containing the name of the module that +// normally exports that import that would have been patched to use the +// replacement export. +// +// - replacement (IN): Address of the replacement, or destination, function or +// variable to search for. +// +// Return Value: +// +// Returns TRUE if the module has been patched to use the specified +// replacement export. +// +BOOL findpatch (HMODULE importmodule, LPCSTR exportmodulename, LPCVOID replacement) +{ + IMAGE_THUNK_DATA *iate; + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return FALSE; + } + while (idte->OriginalFirstThunk != 0x0) { + if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->OriginalFirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return FALSE; + } + + // Locate the replacement's IAT entry. + iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) { + if (iate->u1.Function == (DWORD_PTR)replacement) { + // Found the IAT entry for the replacement. This patch has been + // installed. + return TRUE; + } + iate++; + } + + // The module does not import the replacement. The patch has not been + // installed. + return FALSE; +} + +// insertreportdelay - Sets the report function to sleep for a bit after each +// call to OutputDebugString, in order to allow the debugger to catch up. +// +// Return Value: +// +// None. +// +VOID insertreportdelay () +{ + reportdelay = TRUE; +} + +// moduleispatched - Checks to see if any of the imports listed in the specified +// patch table have been patched into the specified importmodule. +// +// - importmodule (IN): Handle (base address) of the module to be queried to +// determine if it has been patched. +// +// - patchtable (IN): An array of patchentry_t structures specifying all of the +// import patches to search for. +// +// - tablesize (IN): Size, in entries, of the specified patch table. +// +// Return Value: +// +// Returns TRUE if at least one of the patches listed in the patch table is +// installed in the importmodule. Otherwise returns FALSE. +// +BOOL moduleispatched (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize) +{ + patchentry_t *entry; + BOOL found = FALSE; + UINT index; + + // Loop through the import patch table, individually checking each patch + // entry to see if it is installed in the import module. If any patch entry + // is installed in the import module, then the module has been patched. + for (index = 0; index < tablesize; index++) { + entry = &patchtable[index]; + found = findpatch(importmodule, entry->exportmodulename, entry->replacement); + if (found == TRUE) { + // Found one of the listed patches installed in the import module. + return TRUE; + } + } + + // No patches listed in the patch table were found in the import module. + return FALSE; +} + +// patchimport - Patches all future calls to an imported function, or references +// to an imported variable, through to a replacement function or variable. +// Patching is done by replacing the import's address in the specified target +// module's Import Address Table (IAT) with the address of the replacement +// function or variable. +// +// - importmodule (IN): Handle (base address) of the target module for which +// calls or references to the import should be patched. +// +// - exportmodule (IN): Handle (base address) of the module that exports the +// the function or variable to be patched. +// +// - exportmodulename (IN): ANSI string containing the name of the module that +// exports the function or variable to be patched. +// +// - importname (IN): ANSI string containing the name of the imported function +// or variable to be patched. May be an integer cast to a string if the +// import is exported by ordinal. +// +// - replacement (IN): Address of the function or variable to which future +// calls or references should be patched through to. This function or +// variable can be thought of as effectively replacing the original import +// from the point of view of the module specified by "importmodule". +// +// Return Value: +// +// Returns TRUE if the patch was installed into the import module. If the +// import module does not import the specified export, so nothing changed, +// then FALSE will be returned. +// +BOOL patchimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, + LPCVOID replacement) +{ + IMAGE_THUNK_DATA *iate; + IMAGE_IMPORT_DESCRIPTOR *idte; + FARPROC import; + DWORD protect; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return FALSE; + } + while (idte->OriginalFirstThunk != 0x0) { + if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->OriginalFirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return FALSE; + } + + // Get the *real* address of the import. If we find this address in the IAT, + // then we've found the entry that needs to be patched. + import = GetProcAddress(exportmodule, importname); + assert(import != NULL); // Perhaps the named export module does not actually export the named import? + + // Locate the import's IAT entry. + iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) { + if (iate->u1.Function == (DWORD_PTR)import) { + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the address of the replacement. Note that the IAT + // entry may be write-protected, so we must first ensure that it is + // writable. + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)replacement; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + + // The patch has been installed in the import module. + return TRUE; + } + iate++; + } + + // The import's IAT entry was not found. The importing module does not + // import the specified import. + return FALSE; +} + +// patchmodule - Patches all imports listed in the supplied patch table, and +// which are imported by the specified module, through to their respective +// replacement functions. +// +// Note: If the specified module does not import any of the functions listed +// in the patch table, then nothing is changed for the specified module. +// +// - importmodule (IN): Handle (base address) of the target module which is to +// have its imports patched. +// +// - patchtable (IN): An array of patchentry_t structures specifying all of the +// imports to patch for the specified module. +// +// - tablesize (IN): Size, in entries, of the specified patch table. +// +// Return Value: +// +// Returns TRUE if at least one of the patches listed in the patch table was +// installed in the importmodule. Otherwise returns FALSE. +// +BOOL patchmodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize) +{ + patchentry_t *entry; + UINT index; + BOOL patched = FALSE; + + // Loop through the import patch table, individually patching each import + // listed in the table. + for (index = 0; index < tablesize; index++) { + entry = &patchtable[index]; + if (patchimport(importmodule, (HMODULE)entry->modulebase, entry->exportmodulename, entry->importname, + entry->replacement) == TRUE) { + patched = TRUE; + } + } + + return patched; +} + +// report - Sends a printf-style formatted message to the debugger for display +// and/or to a file. +// +// Note: A message longer than MAXREPORTLENGTH characters will be truncated +// to MAXREPORTLENGTH. +// +// - format (IN): Specifies a printf-compliant format string containing the +// message to be sent to the debugger. +// +// - ... (IN): Arguments to be formatted using the specified format string. +// +// Return Value: +// +// None. +// +VOID report (LPCWSTR format, ...) +{ + va_list args; + size_t count; + CHAR messagea [MAXREPORTLENGTH + 1]; + WCHAR messagew [MAXREPORTLENGTH + 1]; + + va_start(args, format); + _vsnwprintf_s(messagew, MAXREPORTLENGTH + 1, _TRUNCATE, format, args); + va_end(args); + messagew[MAXREPORTLENGTH] = L'\0'; + + if (reportencoding == unicode) { + if (reportfile != NULL) { + // Send the report to the previously specified file. + fwrite(messagew, sizeof(WCHAR), wcslen(messagew), reportfile); + } + if (reporttodebugger) { + OutputDebugStringW(messagew); + } + } + else { + if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) == -1) { + // Failed to convert the Unicode message to ASCII. + assert(FALSE); + return; + } + messagea[MAXREPORTLENGTH] = '\0'; + if (reportfile != NULL) { + // Send the report to the previously specified file. + fwrite(messagea, sizeof(CHAR), strlen(messagea), reportfile); + } + if (reporttodebugger) { + OutputDebugStringA(messagea); + } + } + + if (reporttodebugger && (reportdelay == TRUE)) { + Sleep(10); // Workaround the Visual Studio 6 bug where debug strings are sometimes lost if they're sent too fast. + } +} + +// restoreimport - Restores the IAT entry for an import previously patched via +// a call to "patchimport" to the original address of the import. +// +// - importmodule (IN): Handle (base address) of the target module for which +// calls or references to the import should be restored. +// +// - exportmodule (IN): Handle (base address) of the module that exports the +// function or variable to be patched. +// +// - exportmodulename (IN): ANSI string containing the name of the module that +// exports the function or variable to be patched. +// +// - importname (IN): ANSI string containing the name of the imported function +// or variable to be restored. May be an integer cast to a string if the +// import is exported by ordinal. +// +// - replacement (IN): Address of the function or variable which the import was +// previously patched through to via a call to "patchimport". +// +// Return Value: +// +// None. +// +VOID restoreimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, + LPCVOID replacement) +{ + IMAGE_THUNK_DATA *iate; + IMAGE_IMPORT_DESCRIPTOR *idte; + FARPROC import; + DWORD protect; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return; + } + while (idte->OriginalFirstThunk != 0x0) { + if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->OriginalFirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return; + } + + // Get the *real* address of the import. + import = GetProcAddress(exportmodule, importname); + assert(import != NULL); // Perhaps the named export module does not actually export the named import? + + // Locate the import's original IAT entry (it currently has the replacement + // address in it). + iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) { + if (iate->u1.Function == (DWORD_PTR)replacement) { + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the import's real address. Note that the IAT entry may + // be write-protected, so we must first ensure that it is writable. + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)import; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + break; + } + iate++; + } +} + +// restoremodule - Restores all imports listed in the supplied patch table, and +// which are imported by the specified module, to their original functions. +// +// Note: If the specified module does not import any of the functions listed +// in the patch table, then nothing is changed for the specified module. +// +// - importmodule (IN): Handle (base address) of the target module which is to +// have its imports restored. +// +// - patchtable (IN): Array of patchentry_t structures specifying all of the +// imports to restore for the specified module. +// +// - tablesize (IN): Size, in entries, of the specified patch table. +// +// Return Value: +// +// None. +// +VOID restoremodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize) +{ + patchentry_t *entry; + UINT index; + + // Loop through the import patch table, individually restoring each import + // listed in the table. + for (index = 0; index < tablesize; index++) { + entry = &patchtable[index]; + restoreimport(importmodule, (HMODULE)entry->modulebase, entry->exportmodulename, entry->importname, + entry->replacement); + } +} + +// setreportencoding - Sets the output encoding of report messages to either +// ASCII (the default) or Unicode. +// +// - encoding (IN): Specifies either "ascii" or "unicode". +// +// Return Value: +// +// None. +// +VOID setreportencoding (encoding_e encoding) +{ + switch (encoding) { + case ascii: + case unicode: + reportencoding = encoding; + break; + + default: + assert(FALSE); + } +} + +// setreportfile - Sets a destination file to which all report messages should +// be sent. If this function is not called to set a destination file, then +// report messages will be sent to the debugger instead of to a file. +// +// - file (IN): Pointer to an open file, to which future report messages should +// be sent. +// +// - copydebugger (IN): If true, in addition to sending report messages to +// the specified file, a copy of each message will also be sent to the +// debugger. +// +// Return Value: +// +// None. +// +VOID setreportfile (FILE *file, BOOL copydebugger) +{ + reportfile = file; + reporttodebugger = copydebugger; +} + +// strapp - Appends the specified source string to the specified destination +// string. Allocates additional space so that the destination string "grows" +// as new strings are appended to it. This function is fairly infrequently +// used so efficiency is not a major concern. +// +// - dest (IN/OUT): Address of the destination string. Receives the resulting +// combined string after the append operation. +// +// - source (IN): Source string to be appended to the destination string. +// +// Return Value: +// +// None. +// +VOID strapp (LPWSTR *dest, LPCWSTR source) +{ + SIZE_T length; + LPWSTR temp; + + temp = *dest; + length = wcslen(*dest) + wcslen(source); + *dest = new WCHAR [length + 1]; + wcsncpy_s(*dest, length + 1, temp, _TRUNCATE); + wcsncat_s(*dest, length + 1, source, _TRUNCATE); + delete [] temp; +} + +// strtobool - Converts string values (e.g. "yes", "no", "on", "off") to boolean +// values. +// +// - s (IN): String value to convert. +// +// Return Value: +// +// Returns TRUE if the string is recognized as a "true" string. Otherwise +// returns FALSE. +// +BOOL strtobool (LPCWSTR s) { + WCHAR *end; + + if ((_wcsicmp(s, L"true") == 0) || + (_wcsicmp(s, L"yes") == 0) || + (_wcsicmp(s, L"on") == 0) || + (wcstol(s, &end, 10) == 1)) { + return TRUE; + } + else { + return FALSE; + } +} + +// _GetProcessIdOfThread - Returns the ID of the process owns the thread. +// +// - thread (IN): The handle to the thread. +// +// Return Value: +// +// Returns the ID of the process that owns the thread. Otherwise returns 0. +// +DWORD _GetProcessIdOfThread (HANDLE thread) +{ + typedef struct _CLIENT_ID { + HANDLE UniqueProcess; + HANDLE UniqueThread; + } CLIENT_ID, *PCLIENT_ID; + + typedef LONG NTSTATUS; + typedef LONG KPRIORITY; + + typedef struct _THREAD_BASIC_INFORMATION { + NTSTATUS ExitStatus; + PVOID TebBaseAddress; + CLIENT_ID ClientId; + KAFFINITY AffinityMask; + KPRIORITY Priority; + KPRIORITY BasePriority; + } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION; + + const static THREADINFOCLASS ThreadBasicInformation = (THREADINFOCLASS)0; + + typedef NTSTATUS (WINAPI *PNtQueryInformationThread) (HANDLE thread, + THREADINFOCLASS infoclass, PVOID buffer, ULONG buffersize, + PULONG used); + + static PNtQueryInformationThread NtQueryInformationThread = NULL; + + THREAD_BASIC_INFORMATION tbi; + NTSTATUS status; + HMODULE ntdll; + if (NtQueryInformationThread == NULL) { + ntdll = GetModuleHandle(L"ntdll.dll"); + NtQueryInformationThread = (PNtQueryInformationThread)GetProcAddress(ntdll, "NtQueryInformationThread"); + if (NtQueryInformationThread == NULL) { + return 0; + } + } + + status = NtQueryInformationThread(thread, ThreadBasicInformation, &tbi, sizeof(tbi), NULL); + if(status < 0) { + // Shall we go through all the trouble of setting last error? + return 0; + } + + return (DWORD)tbi.ClientId.UniqueProcess; +} diff --git a/utility.h b/utility.h index dd106004..e9aef319 100644 --- a/utility.h +++ b/utility.h @@ -1,112 +1,115 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Various Utility Definitions -// Copyright (c) 2005-2006 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifndef VLDBUILD -#error \ -"This header should only be included by Visual Leak Detector when building it from source. \ -Applications should never include this header." -#endif - -#include -#include - -#ifdef _WIN64 -#define ADDRESSFORMAT L"0x%.16X" // Format string for 64-bit addresses -#else -#define ADDRESSFORMAT L"0x%.8X" // Format string for 32-bit addresses -#endif // _WIN64 -#define BOM 0xFEFF // Unicode byte-order mark. -#define MAXREPORTLENGTH 511 // Maximum length, in characters, of "report" messages. - -// Architecture-specific definitions for x86 and x64 -#if defined(_M_IX86) -#define SIZEOFPTR 4 -#define X86X64ARCHITECTURE IMAGE_FILE_MACHINE_I386 -#define AXREG Eax -#define BPREG Ebp -#define IPREG Eip -#define SPREG Esp -#elif defined(_M_X64) -#define SIZEOFPTR 8 -#define X86X64ARCHITECTURE IMAGE_FILE_MACHINE_AMD64 -#define AXREG Rax -#define BPREG Rbp -#define IPREG Rip -#define SPREG Rsp -#endif // _M_IX86 - -#if defined(_M_IX86) || defined (_M_X64) -#define FRAMEPOINTER(fp) __asm {mov fp, BPREG} // Copies the current frame pointer to the supplied variable. -#else -// If you want to retarget Visual Leak Detector to another processor -// architecture then you'll need to provide an architecture-specific macro to -// obtain the frame pointer (or other address) which can be used to obtain the -// return address and stack pointer of the calling frame. -#error "Visual Leak Detector is not supported on this architecture." -#endif // _M_IX86 || _M_X64 - -// Miscellaneous definitions -#define R2VA(modulebase, rva) (((PBYTE)modulebase) + rva) // Relative Virtual Address to Virtual Address conversion. -#define BYTEFORMATBUFFERLENGTH 4 -#define HEXDUMPLINELENGTH 58 - -// Reports can be encoded as either ASCII or Unicode (UTF-16). -enum encoding_e { - ascii, - unicode -}; - -// This structure allows us to build a table of APIs which should be patched -// through to replacement functions provided by VLD. -typedef struct patchentry_s -{ - LPCSTR exportmodulename; // The name of the module exporting the patched API. - LPCSTR importname; // The name (or ordinal) of the imported API being patched. - SIZE_T modulebase; // The base address of the exporting module (filled in at runtime when the modules are loaded). - LPCVOID replacement; // Pointer to the function to which the imported API should be patched through to. -} patchentry_t; - -// Utility functions. See function definitions for details. -VOID dumpmemorya (LPCVOID address, SIZE_T length); -VOID dumpmemoryw (LPCVOID address, SIZE_T length); -BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname); -BOOL findpatch (HMODULE importmodule, LPCSTR exportmodulename, LPCVOID replacement); -VOID insertreportdelay (); -BOOL moduleispatched (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize); -BOOL patchimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, - LPCVOID replacement); -BOOL patchmodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize); -VOID report (LPCWSTR format, ...); -VOID restoreimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, - LPCVOID replacement); -VOID restoremodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize); -VOID setreportencoding (encoding_e encoding); -VOID setreportfile (FILE *file, BOOL copydebugger); -VOID strapp (LPWSTR *dest, LPCWSTR source); -BOOL strtobool (LPCWSTR s); -#if _WIN32_WINNT < 0x0600 // Windows XP or earlier, no GetProcessIdOfThread() -DWORD _GetProcessIdOfThread (HANDLE thread); -#define GetProcessIdOfThread _GetProcessIdOfThread +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Various Utility Definitions +// Copyright (c) 2005-2006 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifndef VLDBUILD +#error \ +"This header should only be included by Visual Leak Detector when building it from source. \ +Applications should never include this header." +#endif + +#include +#include +#include + +#pragma intrinsic(_AddressOfReturnAddress) + +#ifdef _WIN64 +#define ADDRESSFORMAT L"0x%.16X" // Format string for 64-bit addresses +#else +#define ADDRESSFORMAT L"0x%.8X" // Format string for 32-bit addresses +#endif // _WIN64 +#define BOM 0xFEFF // Unicode byte-order mark. +#define MAXREPORTLENGTH 511 // Maximum length, in characters, of "report" messages. + +// Architecture-specific definitions for x86 and x64 +#if defined(_M_IX86) +#define SIZEOFPTR 4 +#define X86X64ARCHITECTURE IMAGE_FILE_MACHINE_I386 +#define AXREG Eax +#define BPREG Ebp +#define IPREG Eip +#define SPREG Esp +#elif defined(_M_X64) +#define SIZEOFPTR 8 +#define X86X64ARCHITECTURE IMAGE_FILE_MACHINE_AMD64 +#define AXREG Rax +#define BPREG Rbp +#define IPREG Rip +#define SPREG Rsp +#endif // _M_IX86 + +#if defined(_M_IX86) || defined (_M_X64) +#define ADDRESS_OF_RETURN_ADDRESS(fp) fp = (UINT_PTR*)_AddressOfReturnAddress() // Copies the current frame pointer to the supplied variable. +#else +// If you want to retarget Visual Leak Detector to another processor +// architecture then you'll need to provide an architecture-specific macro to +// obtain the frame pointer (or other address) which can be used to obtain the +// return address and stack pointer of the calling frame. +#error "Visual Leak Detector is not supported on this architecture." +#endif // _M_IX86 || _M_X64 + +// Miscellaneous definitions +#define R2VA(modulebase, rva) (((PBYTE)modulebase) + rva) // Relative Virtual Address to Virtual Address conversion. +#define BYTEFORMATBUFFERLENGTH 4 +#define HEXDUMPLINELENGTH 58 + +// Reports can be encoded as either ASCII or Unicode (UTF-16). +enum encoding_e { + ascii, + unicode +}; + +// This structure allows us to build a table of APIs which should be patched +// through to replacement functions provided by VLD. +typedef struct patchentry_s +{ + LPCSTR exportmodulename; // The name of the module exporting the patched API. + LPCSTR importname; // The name (or ordinal) of the imported API being patched. + UINT_PTR modulebase; // The base address of the exporting module (filled in at runtime when the modules are loaded). + LPCVOID replacement; // Pointer to the function to which the imported API should be patched through to. +} patchentry_t; + +// Utility functions. See function definitions for details. +VOID dumpmemorya (LPCVOID address, SIZE_T length); +VOID dumpmemoryw (LPCVOID address, SIZE_T length); +BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname); +BOOL findpatch (HMODULE importmodule, LPCSTR exportmodulename, LPCVOID replacement); +VOID insertreportdelay (); +BOOL moduleispatched (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize); +BOOL patchimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, + LPCVOID replacement); +BOOL patchmodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize); +VOID report (LPCWSTR format, ...); +VOID restoreimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, + LPCVOID replacement); +VOID restoremodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize); +VOID setreportencoding (encoding_e encoding); +VOID setreportfile (FILE *file, BOOL copydebugger); +VOID strapp (LPWSTR *dest, LPCWSTR source); +BOOL strtobool (LPCWSTR s); +#if _WIN32_WINNT < 0x0600 // Windows XP or earlier, no GetProcessIdOfThread() +DWORD _GetProcessIdOfThread (HANDLE thread); +#define GetProcessIdOfThread _GetProcessIdOfThread #endif \ No newline at end of file diff --git a/vld.cpp b/vld.cpp index d797d2e2..687c8f35 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1,2726 +1,2720 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2009 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma comment(lib, "dbghelp.lib") - -#include -#include -#include -#include -#include -#ifndef __out_xcount -#define __out_xcount(x) // Workaround for the specstrings.h bug in the Platform SDK. -#endif -#define DBGHELP_TRANSLATE_TCHAR -#include // Provides symbol handling services. -#define VLDBUILD // Declares that we are building Visual Leak Detector. -#include "callstack.h" // Provides a class for handling call stacks. -#include "crtmfcpatch.h" // Provides CRT and MFC patch functions. -#include "map.h" // Provides a lightweight STL-like map template. -#include "ntapi.h" // Provides access to NT APIs. -#include "set.h" // Provides a lightweight STL-like set template. -#include "utility.h" // Provides various utility functions. -#include "vldheap.h" // Provides internal new and delete operators. -#include "vldint.h" // Provides access to the Visual Leak Detector internals. - -#define BLOCKMAPRESERVE 64 // This should strike a balance between memory use and a desire to minimize heap hits. -#define HEAPMAPRESERVE 2 // Usually there won't be more than a few heaps in the process, so this should be small. -#define MAXSYMBOLNAMELENGTH 256 // Maximum symbol name length that we will allow. Longer names will be truncated. -#define MODULESETRESERVE 16 // There are likely to be several modules loaded in the process. - -// Imported global variables. -extern vldblockheader_t *vldblocklist; -extern HANDLE vldheap; -extern CRITICAL_SECTION vldheaplock; - -// Global variables. -HANDLE currentprocess; // Pseudo-handle for the current process. -HANDLE currentthread; // Pseudo-handle for the current thread. -CRITICAL_SECTION imagelock; // Serializes calls to the Debug Help Library PE image access APIs. -HANDLE processheap; // Handle to the process's heap (COM allocations come from here). -CRITICAL_SECTION stackwalklock; // Serializes calls to StackWalk64 from the Debug Help Library. -CRITICAL_SECTION symbollock; // Serializes calls to the Debug Help Library symbols handling APIs. - -// The one and only VisualLeakDetector object instance. -__declspec(dllexport) VisualLeakDetector vld; - -// Global function pointers for explicit dynamic linking with functions listed -// in the import patch table. Using explicit dynamic linking minimizes VLD's -// footprint by loading only modules that are actually used. These pointers will -// be linked to the real functions the first time they are used. - -// The import patch table: lists the heap-related API imports that VLD patches -// through to replacement functions provided by VLD. Having this table simply -// makes it more convenient to add additional IAT patches. -patchentry_t VisualLeakDetector::m_patchtable [] = { - // Win32 heap APIs. - "kernel32.dll", "GetProcAddress", 0x0, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. - "kernel32.dll", "HeapAlloc", 0x0, _RtlAllocateHeap, - "kernel32.dll", "HeapCreate", 0x0, _HeapCreate, - "kernel32.dll", "HeapDestroy", 0x0, _HeapDestroy, - "kernel32.dll", "HeapFree", 0x0, _RtlFreeHeap, - "kernel32.dll", "HeapReAlloc", 0x0, _RtlReAllocateHeap, - - // MFC new operators (exported by ordinal). - // XXX why are the vector new operators missing for mfc42d.dll? - "mfc42d.dll", (LPCSTR)711, 0x0, VS60::mfcd_scalar_new, - "mfc42d.dll", (LPCSTR)712, 0x0, VS60::mfcd__scalar_new_dbg_4p, - "mfc42d.dll", (LPCSTR)714, 0x0, VS60::mfcd__scalar_new_dbg_3p, - "mfc42ud.dll", (LPCSTR)711, 0x0, VS60::mfcud_scalar_new, - "mfc42ud.dll", (LPCSTR)712, 0x0, VS60::mfcud__scalar_new_dbg_4p, - "mfc42ud.dll", (LPCSTR)714, 0x0, VS60::mfcud__scalar_new_dbg_3p, - "mfc70d.dll", (LPCSTR)257, 0x0, VS70::mfcd_vector_new, - "mfc70d.dll", (LPCSTR)258, 0x0, VS70::mfcd__vector_new_dbg_4p, - "mfc70d.dll", (LPCSTR)259, 0x0, VS70::mfcd__vector_new_dbg_3p, - "mfc70d.dll", (LPCSTR)832, 0x0, VS70::mfcd_scalar_new, - "mfc70d.dll", (LPCSTR)833, 0x0, VS70::mfcd__scalar_new_dbg_4p, - "mfc70d.dll", (LPCSTR)834, 0x0, VS70::mfcd__scalar_new_dbg_3p, - "mfc70ud.dll", (LPCSTR)258, 0x0, VS70::mfcud_vector_new, - "mfc70ud.dll", (LPCSTR)259, 0x0, VS70::mfcud__vector_new_dbg_4p, - "mfc70ud.dll", (LPCSTR)260, 0x0, VS70::mfcud__vector_new_dbg_3p, - "mfc70ud.dll", (LPCSTR)833, 0x0, VS70::mfcud_scalar_new, - "mfc70ud.dll", (LPCSTR)834, 0x0, VS70::mfcud__scalar_new_dbg_4p, - "mfc70ud.dll", (LPCSTR)835, 0x0, VS70::mfcud__scalar_new_dbg_3p, - "mfc71d.dll", (LPCSTR)267, 0x0, VS71::mfcd_vector_new, - "mfc71d.dll", (LPCSTR)268, 0x0, VS71::mfcd__vector_new_dbg_4p, - "mfc71d.dll", (LPCSTR)269, 0x0, VS71::mfcd__vector_new_dbg_3p, - "mfc71d.dll", (LPCSTR)893, 0x0, VS71::mfcd_scalar_new, - "mfc71d.dll", (LPCSTR)894, 0x0, VS71::mfcd__scalar_new_dbg_4p, - "mfc71d.dll", (LPCSTR)895, 0x0, VS71::mfcd__scalar_new_dbg_3p, - "mfc71ud.dll", (LPCSTR)267, 0x0, VS71::mfcud_vector_new, - "mfc71ud.dll", (LPCSTR)268, 0x0, VS71::mfcud__vector_new_dbg_4p, - "mfc71ud.dll", (LPCSTR)269, 0x0, VS71::mfcud__vector_new_dbg_3p, - "mfc71ud.dll", (LPCSTR)893, 0x0, VS71::mfcud_scalar_new, - "mfc71ud.dll", (LPCSTR)894, 0x0, VS71::mfcud__scalar_new_dbg_4p, - "mfc71ud.dll", (LPCSTR)895, 0x0, VS71::mfcud__scalar_new_dbg_3p, - "mfc80d.dll", (LPCSTR)267, 0x0, VS80::mfcd_vector_new, - "mfc80d.dll", (LPCSTR)268, 0x0, VS80::mfcd__vector_new_dbg_4p, - "mfc80d.dll", (LPCSTR)269, 0x0, VS80::mfcd__vector_new_dbg_3p, - "mfc80d.dll", (LPCSTR)893, 0x0, VS80::mfcd_scalar_new, - "mfc80d.dll", (LPCSTR)894, 0x0, VS80::mfcd__scalar_new_dbg_4p, - "mfc80d.dll", (LPCSTR)895, 0x0, VS80::mfcd__scalar_new_dbg_3p, - "mfc80ud.dll", (LPCSTR)267, 0x0, VS80::mfcud_vector_new, - "mfc80ud.dll", (LPCSTR)268, 0x0, VS80::mfcud__vector_new_dbg_4p, - "mfc80ud.dll", (LPCSTR)269, 0x0, VS80::mfcud__vector_new_dbg_3p, - "mfc80ud.dll", (LPCSTR)893, 0x0, VS80::mfcud_scalar_new, - "mfc80ud.dll", (LPCSTR)894, 0x0, VS80::mfcud__scalar_new_dbg_4p, - "mfc80ud.dll", (LPCSTR)895, 0x0, VS80::mfcud__scalar_new_dbg_3p, - "mfc90d.dll", (LPCSTR)267, 0x0, VS90::mfcd_vector_new, - "mfc90d.dll", (LPCSTR)268, 0x0, VS90::mfcd__vector_new_dbg_4p, - "mfc90d.dll", (LPCSTR)269, 0x0, VS90::mfcd__vector_new_dbg_3p, - "mfc90d.dll", (LPCSTR)931, 0x0, VS90::mfcd_scalar_new, - "mfc90d.dll", (LPCSTR)932, 0x0, VS90::mfcd__scalar_new_dbg_4p, - "mfc90d.dll", (LPCSTR)933, 0x0, VS90::mfcd__scalar_new_dbg_3p, - "mfc90ud.dll", (LPCSTR)267, 0x0, VS90::mfcud_vector_new, - "mfc90ud.dll", (LPCSTR)268, 0x0, VS90::mfcud__vector_new_dbg_4p, - "mfc90ud.dll", (LPCSTR)269, 0x0, VS90::mfcud__vector_new_dbg_3p, - "mfc90ud.dll", (LPCSTR)935, 0x0, VS90::mfcud_scalar_new, - "mfc90ud.dll", (LPCSTR)936, 0x0, VS90::mfcud__scalar_new_dbg_4p, - "mfc90ud.dll", (LPCSTR)937, 0x0, VS90::mfcud__scalar_new_dbg_3p, - - // CRT new operators and heap APIs. - "msvcrtd.dll", "_calloc_dbg", 0x0, VS60::crtd__calloc_dbg, - "msvcrtd.dll", "_malloc_dbg", 0x0, VS60::crtd__malloc_dbg, - "msvcrtd.dll", "_realloc_dbg", 0x0, VS60::crtd__realloc_dbg, - "msvcrtd.dll", "??2@YAPAXIHPBDH@Z", 0x0, VS60::crtd__scalar_new_dbg, -// "msvcrtd.dll", "??_U@YAPAXIHPBDH@Z", 0x0, VS60::crtd__vector_new_dbg, - "msvcrtd.dll", "calloc", 0x0, VS60::crtd_calloc, - "msvcrtd.dll", "malloc", 0x0, VS60::crtd_malloc, - "msvcrtd.dll", "realloc", 0x0, VS60::crtd_realloc, - "msvcrtd.dll", "??2@YAPAXI@Z", 0x0, VS60::crtd_scalar_new, -// "msvcrtd.dll", "??_U@YAPAXI@Z", 0x0, VS60::crtd_vector_new, - "msvcr70d.dll", "_calloc_dbg", 0x0, VS70::crtd__calloc_dbg, - "msvcr70d.dll", "_malloc_dbg", 0x0, VS70::crtd__malloc_dbg, - "msvcr70d.dll", "_realloc_dbg", 0x0, VS70::crtd__realloc_dbg, - "msvcr70d.dll", "??2@YAPAXIHPBDH@Z", 0x0, VS70::crtd__scalar_new_dbg, - "msvcr70d.dll", "??_U@YAPAXIHPBDH@Z", 0x0, VS70::crtd__vector_new_dbg, - "msvcr70d.dll", "calloc", 0x0, VS70::crtd_calloc, - "msvcr70d.dll", "malloc", 0x0, VS70::crtd_malloc, - "msvcr70d.dll", "realloc", 0x0, VS70::crtd_realloc, - "msvcr70d.dll", "??2@YAPAXI@Z", 0x0, VS70::crtd_scalar_new, - "msvcr70d.dll", "??_U@YAPAXI@Z", 0x0, VS70::crtd_vector_new, - "msvcr71d.dll", "_calloc_dbg", 0x0, VS71::crtd__calloc_dbg, - "msvcr71d.dll", "_malloc_dbg", 0x0, VS71::crtd__malloc_dbg, - "msvcr71d.dll", "_realloc_dbg", 0x0, VS71::crtd__realloc_dbg, - "msvcr71d.dll", "??2@YAPAXIHPBDH@Z", 0x0, VS71::crtd__scalar_new_dbg, - "msvcr71d.dll", "??_U@YAPAXIHPBDH@Z", 0x0, VS71::crtd__vector_new_dbg, - "msvcr71d.dll", "calloc", 0x0, VS71::crtd_calloc, - "msvcr71d.dll", "malloc", 0x0, VS71::crtd_malloc, - "msvcr71d.dll", "realloc", 0x0, VS71::crtd_realloc, - "msvcr71d.dll", "??2@YAPAXI@Z", 0x0, VS71::crtd_scalar_new, - "msvcr71d.dll", "??_U@YAPAXI@Z", 0x0, VS71::crtd_vector_new, - "msvcr80d.dll", "_calloc_dbg", 0x0, VS80::crtd__calloc_dbg, - "msvcr80d.dll", "_malloc_dbg", 0x0, VS80::crtd__malloc_dbg, - "msvcr80d.dll", "_realloc_dbg", 0x0, VS80::crtd__realloc_dbg, - "msvcr80d.dll", "??2@YAPAXIHPBDH@Z", 0x0, VS80::crtd__scalar_new_dbg, - "msvcr80d.dll", "??_U@YAPAXIHPBDH@Z", 0x0, VS80::crtd__vector_new_dbg, - "msvcr80d.dll", "calloc", 0x0, VS80::crtd_calloc, - "msvcr80d.dll", "malloc", 0x0, VS80::crtd_malloc, - "msvcr80d.dll", "realloc", 0x0, VS80::crtd_realloc, - "msvcr80d.dll", "??2@YAPAXI@Z", 0x0, VS80::crtd_scalar_new, - "msvcr80d.dll", "??_U@YAPAXI@Z", 0x0, VS80::crtd_vector_new, - "msvcr90d.dll", "_calloc_dbg", 0x0, VS90::crtd__calloc_dbg, - "msvcr90d.dll", "_malloc_dbg", 0x0, VS90::crtd__malloc_dbg, - "msvcr90d.dll", "_realloc_dbg", 0x0, VS90::crtd__realloc_dbg, - "msvcr90d.dll", "??2@YAPAXIHPBDH@Z", 0x0, VS90::crtd__scalar_new_dbg, - "msvcr90d.dll", "??_U@YAPAXIHPBDH@Z", 0x0, VS90::crtd__vector_new_dbg, - "msvcr90d.dll", "calloc", 0x0, VS90::crtd_calloc, - "msvcr90d.dll", "malloc", 0x0, VS90::crtd_malloc, - "msvcr90d.dll", "realloc", 0x0, VS90::crtd_realloc, - "msvcr90d.dll", "??2@YAPAXI@Z", 0x0, VS90::crtd_scalar_new, - "msvcr90d.dll", "??_U@YAPAXI@Z", 0x0, VS90::crtd_vector_new, - - // NT APIs. - "ntdll.dll", "RtlAllocateHeap", 0x0, _RtlAllocateHeap, - "ntdll.dll", "RtlFreeHeap", 0x0, _RtlFreeHeap, - "ntdll.dll", "RtlReAllocateHeap", 0x0, _RtlReAllocateHeap, - - // COM heap APIs. - "ole32.dll", "CoGetMalloc", 0x0, _CoGetMalloc, - "ole32.dll", "CoTaskMemAlloc", 0x0, _CoTaskMemAlloc, - "ole32.dll", "CoTaskMemRealloc", 0x0, _CoTaskMemRealloc -}; - -// Constructor - Initializes private data, loads configuration options, and -// attaches Visual Leak Detector to all other modules loaded into the current -// process. -// -VisualLeakDetector::VisualLeakDetector () -{ - WCHAR bom = BOM; // Unicode byte-order mark. - HMODULE kernel32; - ModuleSet *newmodules; - HMODULE ntdll; - LPWSTR symbolpath; - - // Initialize configuration options and related private data. - _wcsnset_s(m_forcedmodulelist, MAXMODULELISTLENGTH, '\0', _TRUNCATE); - m_maxdatadump = 0xffffffff; - m_maxtraceframes = 0xffffffff; - m_options = 0x0; - m_reportfile = NULL; - wcsncpy_s(m_reportfilepath, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); - m_status = 0x0; - - // Load configuration options. - configure(); - if (m_options & VLD_OPT_VLDOFF) { - report(L"Visual Leak Detector is turned off.\n"); - return; - } - - kernel32 = GetModuleHandle(L"kernel32.dll"); - ntdll = GetModuleHandle(L"ntdll.dll"); - - // Initialize global variables. - currentprocess = GetCurrentProcess(); - currentthread = GetCurrentThread(); - InitializeCriticalSection(&imagelock); - LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); - processheap = GetProcessHeap(); - RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); - RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); - RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); - InitializeCriticalSection(&stackwalklock); - InitializeCriticalSection(&symbollock); - vldheap = HeapCreate(0x0, 0, 0); - InitializeCriticalSection(&vldheaplock); - - // Initialize remaining private data. - m_heapmap = new HeapMap; - m_heapmap->reserve(HEAPMAPRESERVE); - m_imalloc = NULL; - m_leaksfound = 0; - m_loadedmodules = NULL; - InitializeCriticalSection(&m_loaderlock); - InitializeCriticalSection(&m_maplock); - InitializeCriticalSection(&m_moduleslock); - m_selftestfile = __FILE__; - m_selftestline = 0; - m_tlsindex = TlsAlloc(); - InitializeCriticalSection(&m_tlslock); - m_tlsset = new TlsSet; - - if (m_options & VLD_OPT_SELF_TEST) { - // Self-test mode has been enabled. Intentionally leak a small amount of - // memory so that memory leak self-checking can be verified. - if (m_options & VLD_OPT_UNICODE_REPORT) { - wcsncpy_s(new WCHAR [wcslen(SELFTESTTEXTW) + 1], wcslen(SELFTESTTEXTW) + 1, SELFTESTTEXTW, _TRUNCATE); - m_selftestline = __LINE__ - 1; - } - else { - strncpy_s(new CHAR [strlen(SELFTESTTEXTA) + 1], strlen(SELFTESTTEXTA) + 1, SELFTESTTEXTA, _TRUNCATE); - m_selftestline = __LINE__ - 1; - } - } - if (m_options & VLD_OPT_START_DISABLED) { - // Memory leak detection will initially be disabled. - m_status |= VLD_STATUS_NEVER_ENABLED; - } - if (m_options & VLD_OPT_REPORT_TO_FILE) { - // Reporting to file enabled. - if (m_options & VLD_OPT_UNICODE_REPORT) { - // Unicode data encoding has been enabled. Write the byte-order - // mark before anything else gets written to the file. Open the - // file for binary writing. - if (_wfopen_s(&m_reportfile, m_reportfilepath, L"wb") == EINVAL) { - // Couldn't open the file. - m_reportfile = NULL; - } - else { - fwrite(&bom, sizeof(WCHAR), 1, m_reportfile); - setreportencoding(unicode); - } - } - else { - // Open the file in text mode for ASCII output. - if (_wfopen_s(&m_reportfile, m_reportfilepath, L"w") == EINVAL) { - // Couldn't open the file. - m_reportfile = NULL; - } - else { - setreportencoding(ascii); - } - } - if (m_reportfile == NULL) { - report(L"WARNING: Visual Leak Detector: Couldn't open report file for writing: %s\n" - L" The report will be sent to the debugger instead.\n", m_reportfilepath); - } - else { - // Set the "report" function to write to the file. - setreportfile(m_reportfile, m_options & VLD_OPT_REPORT_TO_DEBUGGER); - } - } - if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { - // Insert a slight delay between messages sent to the debugger for - // output. (For working around a bug in VC6 where data sent to the - // debugger gets lost if it's sent too fast). - insertreportdelay(); - } - - // This is highly unlikely to happen, but just in case, check to be sure - // we got a valid TLS index. - if (m_tlsindex == TLS_OUT_OF_INDEXES) { - report(L"ERROR: Visual Leak Detector could not be installed because thread local" - L" storage could not be allocated."); - return; - } - - // Initialize the symbol handler. We use it for obtaining source file/line - // number information and function names for the memory leak report. - symbolpath = buildsymbolsearchpath(); - SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_UNDNAME); - if (!SymInitializeW(currentprocess, symbolpath, FALSE)) { - report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" - L" File and function names will probably not be available in call stacks.\n", GetLastError()); - } - delete [] symbolpath; - - // Patch into kernel32.dll's calls to LdrLoadDll so that VLD can - // dynamically attach to new modules loaded during runtime. - patchimport(kernel32, ntdll, "ntdll.dll", "LdrLoadDll", _LdrLoadDll); - - // Attach Visual Leak Detector to every module loaded in the process. - newmodules = new ModuleSet; - newmodules->reserve(MODULESETRESERVE); - EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); - attachtoloadedmodules(newmodules); - m_loadedmodules = newmodules; - m_status |= VLD_STATUS_INSTALLED; - - report(L"Visual Leak Detector Version " VLDVERSION L" installed.\n"); - if (m_status & VLD_STATUS_FORCE_REPORT_TO_FILE) { - // The report is being forced to a file. Let the human know why. - report(L"NOTE: Visual Leak Detector: Unicode-encoded reporting has been enabled, but the\n" - L" debugger is the only selected report destination. The debugger cannot display\n" - L" Unicode characters, so the report will also be sent to a file. If no file has\n" - L" been specified, the default file name is \"" VLD_DEFAULT_REPORT_FILE_NAME L"\".\n"); - - } - reportconfig(); -} - -// Destructor - Detaches Visual Leak Detector from all modules loaded in the -// process, frees internally allocated resources, and generates the memory -// leak report. -// -VisualLeakDetector::~VisualLeakDetector () -{ - BlockMap::Iterator blockit; - BlockMap *blockmap; - size_t count; - vldblockheader_t *header; - HANDLE heap; - HeapMap::Iterator heapit; - SIZE_T internalleaks = 0; - const char *leakfile = NULL; - WCHAR leakfilew [MAX_PATH]; - int leakline = 0; - ModuleSet::Iterator moduleit; - HANDLE thread; - BOOL threadsactive= FALSE; - TlsSet::Iterator tlsit; - DWORD dwCurProcessID; - - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - if (m_status & VLD_STATUS_INSTALLED) { - // Detach Visual Leak Detector from all previously attached modules. - EnumerateLoadedModulesW64(currentprocess, detachfrommodule, NULL); - - dwCurProcessID = GetCurrentProcessId(); - - // See if any threads that have ever entered VLD's code are still active. - EnterCriticalSection(&m_tlslock); - for (tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { - if ((*tlsit)->threadid == GetCurrentThreadId()) { - // Don't wait for the current thread to exit. - continue; - } - - thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit)->threadid); - if (thread == NULL) { - // Couldn't query this thread. We'll assume that it exited. - continue; // XXX should we check GetLastError()? - } - if (GetProcessIdOfThread(thread) != dwCurProcessID) { - //The thread ID has been recycled. - CloseHandle(thread); - continue; - } - while (WaitForSingleObject(thread, 10000) == WAIT_TIMEOUT) { // 10 seconds - // There is still at least one other thread running. The CRT - // will stomp it dead when it cleans up, which is not a - // graceful way for a thread to go down. Warn about this, - // and wait until the thread has exited so that we know it - // can't still be off running somewhere in VLD's code. - // - // Since we've been waiting a while, let the human know we are - // still here and alive. - threadsactive = TRUE; - report(L"Visual Leak Detector: Waiting for threads to terminate...\n"); - } - CloseHandle(thread); - } - LeaveCriticalSection(&m_tlslock); - - if (m_status & VLD_STATUS_NEVER_ENABLED) { - // Visual Leak Detector started with leak detection disabled and - // it was never enabled at runtime. A lot of good that does. - report(L"WARNING: Visual Leak Detector: Memory leak detection was never enabled.\n"); - } - else { - // Generate a memory leak report for each heap in the process. - for (heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - heap = (*heapit).first; - reportleaks(heap); - } - - // Show a summary. - if (m_leaksfound == 0) { - report(L"No memory leaks detected.\n"); - } - else { - report(L"Visual Leak Detector detected %lu memory leak", m_leaksfound); - report((m_leaksfound > 1) ? L"s.\n" : L".\n"); - } - } - - // Free resources used by the symbol handler. - if (!SymCleanup(currentprocess)) { - report(L"WARNING: Visual Leak Detector: The symbol handler failed to deallocate resources (error=%lu).\n", - GetLastError()); - } - - // Free internally allocated resources used by the heapmap and blockmap. - for (heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - blockmap = &(*heapit).second->blockmap; - for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callstack; - delete (*blockit).second; - } - delete blockmap; - } - delete m_heapmap; - - // Free internally allocated resources used by the loaded module set. - for (moduleit = m_loadedmodules->begin(); moduleit != m_loadedmodules->end(); ++moduleit) { - delete (*moduleit).name; - delete (*moduleit).path; - } - delete m_loadedmodules; - - // Free internally allocated resources used for thread local storage. - for (tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { - delete *tlsit; - } - delete m_tlsset; - - // Do a memory leak self-check. - header = vldblocklist; - while (header) { - // Doh! VLD still has an internally allocated block! - // This won't ever actually happen, right guys?... guys? - internalleaks++; - leakfile = header->file; - leakline = header->line; - mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); - report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); - report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, - VLDBLOCKDATA(header), header->size); - report(L" Call Stack:\n"); - report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); - if (m_maxdatadump != 0) { - report(L" Data:\n"); - if (m_options & VLD_OPT_UNICODE_REPORT) { - dumpmemoryw(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); - } - else { - dumpmemorya(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); - } - } - report(L"\n"); - header = header->next; - } - if (m_options & VLD_OPT_SELF_TEST) { - if ((internalleaks == 1) && (strcmp(leakfile, m_selftestfile) == 0) && (leakline == m_selftestline)) { - report(L"Visual Leak Detector passed the memory leak self-test.\n"); - } - else { - report(L"ERROR: Visual Leak Detector: Failed the memory leak self-test.\n"); - } - } - - if (threadsactive == TRUE) { - report(L"WARNING: Visual Leak Detector: Some threads appear to have not terminated normally.\n" - L" This could cause inaccurate leak detection results, including false positives.\n"); - } - report(L"Visual Leak Detector is now exiting.\n"); - } - else { - // VLD failed to load properly. - delete m_heapmap; - delete m_tlsset; - } - HeapDestroy(vldheap); - - DeleteCriticalSection(&imagelock); - DeleteCriticalSection(&m_loaderlock); - DeleteCriticalSection(&m_maplock); - DeleteCriticalSection(&m_moduleslock); - DeleteCriticalSection(&stackwalklock); - DeleteCriticalSection(&symbollock); - DeleteCriticalSection(&vldheaplock); - - if (m_tlsindex != TLS_OUT_OF_INDEXES) { - TlsFree(m_tlsindex); - } - - if (m_reportfile != NULL) { - fclose(m_reportfile); - } -} - - -//////////////////////////////////////////////////////////////////////////////// -// -// Private Leak Detection Functions -// -//////////////////////////////////////////////////////////////////////////////// - -// attachtoloadedmodules - Attaches VLD to all modules contained in the provided -// ModuleSet. Not all modules are in the ModuleSet will actually be included -// in leak detection. Only modules that import the global VisualLeakDetector -// class object, or those that are otherwise explicitly included in leak -// detection, will be checked for memory leaks. -// -// When VLD attaches to a module, it means that any of the imports listed in -// the import patch table which are imported by the module, will be redirected -// to VLD's designated replacements. -// -// - newmodules (IN): Pointer to a ModuleSet containing information about any -// loaded modules that need to be attached. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) -{ - size_t count; - DWORD64 modulebase; - UINT32 moduleflags; - IMAGEHLP_MODULE64 moduleimageinfo; - LPCSTR modulename; -#define MAXMODULENAME (_MAX_FNAME + _MAX_EXT) - WCHAR modulenamew [MAXMODULENAME]; - LPCSTR modulepath; - DWORD modulesize; - ModuleSet::Iterator newit; - ModuleSet::Iterator oldit; - ModuleSet *oldmodules; - BOOL refresh; - UINT tablesize = sizeof(m_patchtable) / sizeof(patchentry_t); - ModuleSet::Muterator updateit; - - // Iterate through the supplied set, until all modules have been attached. - for (newit = newmodules->begin(); newit != newmodules->end(); ++newit) { - modulebase = (DWORD64)(*newit).addrlow; - moduleflags = 0x0; - modulename = (*newit).name; - modulepath = (*newit).path; - modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; - - refresh = FALSE; - EnterCriticalSection(&m_moduleslock); - oldmodules = m_loadedmodules; - if (oldmodules != NULL) { - // This is not the first time we have been called to attach to the - // currently loaded modules. - oldit = oldmodules->find(*newit); - if (oldit != oldmodules->end()) { - // We've seen this "new" module loaded in the process before. - moduleflags = (*oldit).flags; - LeaveCriticalSection(&m_moduleslock); - if (moduleispatched((HMODULE)modulebase, m_patchtable, tablesize)) { - // This module is already attached. Just update the module's - // flags, nothing more. - updateit = newit; - (*updateit).flags = moduleflags; - continue; - } - else { - // This module may have been attached before and has been - // detached. We'll need to try reattaching to it in case it - // was unloaded and then subsequently reloaded. - refresh = TRUE; - } - } - else { - LeaveCriticalSection(&m_moduleslock); - } - } - else { - LeaveCriticalSection(&m_moduleslock); - } - - EnterCriticalSection(&symbollock); - if ((refresh == TRUE) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { - // Discard the previously loaded symbols, so we can refresh them. - if (SymUnloadModule64(currentprocess, modulebase) == FALSE) { - report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" - L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); - } - } - - // Try to load the module's symbols. This ensures that we have loaded - // the symbols for every module that has ever been loaded into the - // process, guaranteeing the symbols' availability when generating the - // leak report. - moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); - if ((SymGetModuleInfoW64(currentprocess, (DWORD64)modulebase, &moduleimageinfo) == TRUE) || - ((SymLoadModule64(currentprocess, NULL, modulepath, NULL, modulebase, modulesize) == modulebase) && - (SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo) == TRUE))) { - moduleflags |= VLD_MODULE_SYMBOLSLOADED; - } - LeaveCriticalSection(&symbollock); - - if (_stricmp("vld.dll", modulename) == 0) { - // What happens when a module goes through it's own portal? Bad things. - // Like infinite recursion. And ugly bald men wearing dresses. VLD - // should not, therefore, attach to itself. - continue; - } - - mbstowcs_s(&count, modulenamew, MAXMODULENAME, modulename, _TRUNCATE); - if ((findimport((HMODULE)modulebase, m_vldbase, "vld.dll", "?vld@@3VVisualLeakDetector@@A") == FALSE) && - (wcsstr(vld.m_forcedmodulelist, modulenamew) == NULL)) { - // This module does not import VLD. This means that none of the module's - // sources #included vld.h. Exclude this module from leak detection. - moduleflags |= VLD_MODULE_EXCLUDED; - } - else if (!(moduleflags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { - // This module is going to be included in leak detection, but complete - // symbols for this module couldn't be loaded. This means that any stack - // traces through this module may lack information, like line numbers - // and function names. - report(L"WARNING: Visual Leak Detector: A module, %s, included in memory leak detection\n" - L" does not have any debugging symbols available, or they could not be located.\n" - L" Function names and/or line numbers for this module may not be available.\n", modulename); - } - - // Update the module's flags in the "new modules" set. - updateit = newit; - (*updateit).flags = moduleflags; - - // Attach to the module. - patchmodule((HMODULE)modulebase, m_patchtable, tablesize); - } -} - -// buildsymbolsearchpath - Builds the symbol search path for the symbol handler. -// This helps the symbol handler find the symbols for the application being -// debugged. -// -// Return Value: -// -// Returns a string containing the search path. The caller is responsible for -// freeing the string. -// -LPWSTR VisualLeakDetector::buildsymbolsearchpath () -{ - WCHAR directory [_MAX_DIR]; - WCHAR drive [_MAX_DRIVE]; - LPWSTR env; - DWORD envlen; - SIZE_T index; - SIZE_T length; - HMODULE module; - LPWSTR path = new WCHAR [MAX_PATH]; - SIZE_T pos = 0; - WCHAR system [MAX_PATH]; - WCHAR windows [MAX_PATH]; - - // Oddly, the symbol handler ignores the link to the PDB embedded in the - // executable image. So, we'll manually add the location of the executable - // to the search path since that is often where the PDB will be located. - path[0] = L'\0'; - module = GetModuleHandle(NULL); - GetModuleFileName(module, path, MAX_PATH); - _wsplitpath_s(path, drive, _MAX_DRIVE, directory, _MAX_DIR, NULL, 0, NULL, 0); - wcsncpy_s(path, MAX_PATH, drive, _TRUNCATE); - strapp(&path, directory); - - // When the symbol handler is given a custom symbol search path, it will no - // longer search the default directories (working directory, system root, - // etc). But we'd like it to still search those directories, so we'll add - // them to our custom search path. - // - // Append the working directory. - strapp(&path, L";.\\"); - - // Append the Windows directory. - if (GetWindowsDirectory(windows, MAX_PATH) != 0) { - strapp(&path, L";"); - strapp(&path, windows); - } - - // Append the system directory. - if (GetSystemDirectory(system, MAX_PATH) != 0) { - strapp(&path, L";"); - strapp(&path, system); - } - - // Append %_NT_SYMBOL_PATH%. - envlen = GetEnvironmentVariable(L"_NT_SYMBOL_PATH", NULL, 0); - if (envlen != 0) { - env = new WCHAR [envlen]; - if (GetEnvironmentVariable(L"_NT_SYMBOL_PATH", env, envlen) != 0) { - strapp(&path, L";"); - strapp(&path, env); - } - delete [] env; - } - - // Append %_NT_ALT_SYMBOL_PATH%. - envlen = GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", NULL, 0); - if (envlen != 0) { - env = new WCHAR [envlen]; - if (GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", env, envlen) != 0) { - strapp(&path, L";"); - strapp(&path, env); - } - delete [] env; - } - - // Remove any quotes from the path. The symbol handler doesn't like them. - pos = 0; - length = wcslen(path); - while (pos < length) { - if (path[pos] == L'\"') { - for (index = pos; index < length; index++) { - path[index] = path[index + 1]; - } - } - pos++; - } - - return path; -} - -// configure - Configures VLD using values read from the vld.ini file. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::configure () -{ -#define BSIZE 64 - WCHAR buffer [BSIZE]; - WCHAR filename [MAX_PATH]; - WCHAR inipath [MAX_PATH]; - BOOL keyopen = FALSE; - DWORD length; - HKEY productkey; - LONG regstatus; - struct _stat s; - DWORD valuetype; - - if (_wstat(L".\\vld.ini", &s) == 0) { - // Found a copy of vld.ini in the working directory. Use it. - wcsncpy_s(inipath, MAX_PATH, L".\\vld.ini", _TRUNCATE); - } - else { - // Get the location of the vld.ini file from the registry. - regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); - if (regstatus == ERROR_SUCCESS) { - keyopen = TRUE; - regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); - } - if (keyopen) { - RegCloseKey(productkey); - } - if ((regstatus != ERROR_SUCCESS) || (_wstat(inipath, &s) != 0)) { - // The location of vld.ini could not be read from the registry. As a - // last resort, look in the Windows directory. - wcsncpy_s(inipath, MAX_PATH, L"vld.ini", _TRUNCATE); - } - } - - // Read the boolean options. - GetPrivateProfileString(L"Options", L"VLD", L"on", buffer, BSIZE, inipath); - if (strtobool(buffer) == FALSE) { - m_options |= VLD_OPT_VLDOFF; - return; - } - - GetPrivateProfileString(L"Options", L"AggregateDuplicates", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_AGGREGATE_DUPLICATES; - } - - GetPrivateProfileString(L"Options", L"SelfTest", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_SELF_TEST; - } - - GetPrivateProfileString(L"Options", L"SlowDebuggerDump", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_SLOW_DEBUGGER_DUMP; - } - - GetPrivateProfileString(L"Options", L"StartDisabled", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_START_DISABLED; - } - - GetPrivateProfileString(L"Options", L"TraceInternalFrames", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_TRACE_INTERNAL_FRAMES; - } - - // Read the integer configuration options. - m_maxdatadump = GetPrivateProfileInt(L"Options", L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); - m_maxtraceframes = GetPrivateProfileInt(L"Options", L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); - if (m_maxtraceframes < 1) { - m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; - } - - // Read the force-include module list. - GetPrivateProfileString(L"Options", L"ForceIncludeModules", L"", m_forcedmodulelist, MAXMODULELISTLENGTH, inipath); - _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); - - // Read the report destination (debugger, file, or both). - GetPrivateProfileString(L"Options", L"ReportFile", L"", filename, MAX_PATH, inipath); - if (wcslen(filename) == 0) { - wcsncpy_s(filename, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); - } - _wfullpath(m_reportfilepath, filename, MAX_PATH); - GetPrivateProfileString(L"Options", L"ReportTo", L"", buffer, BSIZE, inipath); - if (_wcsicmp(buffer, L"both") == 0) { - m_options |= (VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE); - } - else if (_wcsicmp(buffer, L"file") == 0) { - m_options |= VLD_OPT_REPORT_TO_FILE; - } - else { - m_options |= VLD_OPT_REPORT_TO_DEBUGGER; - } - - // Read the report file encoding (ascii or unicode). - GetPrivateProfileString(L"Options", L"ReportEncoding", L"", buffer, BSIZE, inipath); - if (_wcsicmp(buffer, L"unicode") == 0) { - m_options |= VLD_OPT_UNICODE_REPORT; - } - if ((m_options & VLD_OPT_UNICODE_REPORT) && !(m_options & VLD_OPT_REPORT_TO_FILE)) { - // If Unicode report encoding is enabled, then the report needs to be - // sent to a file because the debugger will not display Unicode - // characters, it will display question marks in their place instead. - m_options |= VLD_OPT_REPORT_TO_FILE; - m_status |= VLD_STATUS_FORCE_REPORT_TO_FILE; - } - - // Read the stack walking method. - GetPrivateProfileString(L"Options", L"StackWalkMethod", L"", buffer, BSIZE, inipath); - if (_wcsicmp(buffer, L"safe") == 0) { - m_options |= VLD_OPT_SAFE_STACK_WALK; - } -} - -// enabled - Determines if memory leak detection is enabled for the current -// thread. -// -// Return Value: -// -// Returns true if Visual Leak Detector is enabled for the current thread. -// Otherwise, returns false. -// -BOOL VisualLeakDetector::enabled () -{ - tls_t *tls = vld.gettls(); - - if (!(m_status & VLD_STATUS_INSTALLED)) { - // Memory leak detection is not yet enabled because VLD is still - // initializing. - return FALSE; - } - - if (!(tls->flags & VLD_TLS_DISABLED) && !(tls->flags & VLD_TLS_ENABLED)) { - // The enabled/disabled state for the current thread has not been - // initialized yet. Use the default state. - if (m_options & VLD_OPT_START_DISABLED) { - tls->flags |= VLD_TLS_DISABLED; - } - else { - tls->flags |= VLD_TLS_ENABLED; - } - } - - return ((tls->flags & VLD_TLS_ENABLED) != 0); -} - -// eraseduplicates - Erases, from the block maps, blocks that appear to be -// duplicate leaks of an already identified leak. -// -// - element (IN): BlockMap Iterator referencing the block of which to search -// for duplicates. -// -// Return Value: -// -// Returns the number of duplicate blocks erased from the block map. -// -SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) -{ - BlockMap::Iterator blockit; - BlockMap *blockmap; - blockinfo_t *elementinfo; - SIZE_T erased = 0; - HeapMap::Iterator heapit; - blockinfo_t *info; - BlockMap::Iterator previt; - - elementinfo = (*element).second; - - // Iteratate through all block maps, looking for blocks with the same size - // and callstack as the specified element. - for (heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - blockmap = &(*heapit).second->blockmap; - for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - if (blockit == element) { - // Don't delete the element of which we are searching for - // duplicates. - continue; - } - info = (*blockit).second; - if ((info->size == elementinfo->size) && (*(info->callstack) == *(elementinfo->callstack))) { - // Found a duplicate. Erase it. - delete info->callstack; - delete info; - previt = blockit - 1; - blockmap->erase(blockit); - blockit = previt; - erased++; - } - } - } - - return erased; -} - -// gettls - Obtains the thread local storage structure for the calling thread. -// -// Return Value: -// -// Returns a pointer to the thread local storage structure. (This function -// always succeeds). -// -tls_t* VisualLeakDetector::gettls () -{ - tls_t *tls; - - // Get the pointer to this thread's thread local storage structure. - tls = (tls_t*)TlsGetValue(m_tlsindex); - assert(GetLastError() == ERROR_SUCCESS); - - if (tls == NULL) { - // This thread's thread local storage structure has not been allocated. - tls = new tls_t; - TlsSetValue(m_tlsindex, tls); - tls->addrfp = 0x0; - tls->flags = 0x0; - tls->threadid = GetCurrentThreadId(); - - // Add this thread's TLS to the TlsSet. - EnterCriticalSection(&m_tlslock); - m_tlsset->insert(tls); - LeaveCriticalSection(&m_tlslock); - } - - return tls; -} - -// mapblock - Tracks memory allocations. Information about allocated blocks is -// collected and then the block is mapped to this information. -// -// - heap (IN): Handle to the heap from which the block has been allocated. -// -// - mem (IN): Pointer to the memory block being allocated. -// -// - size (IN): Size, in bytes, of the memory block being allocated. -// -// - framepointer (IN): Framepointer at the time this allocation first entered -// VLD's code. This is used from determining the starting point for the -// stack trace. -// -// - crtalloc (IN): Should be set to TRUE if this allocation is a CRT memory -// block. Otherwise should be FALSE. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, SIZE_T framepointer, BOOL crtalloc) -{ - blockinfo_t *blockinfo; - BlockMap::Iterator blockit; - BlockMap *blockmap; - HeapMap::Iterator heapit; - static SIZE_T serialnumber = 0; - - // Record the block's information. - blockinfo = new blockinfo_t; - if (m_options & VLD_OPT_SAFE_STACK_WALK) { - blockinfo->callstack = new SafeCallStack; - } - else { - blockinfo->callstack = new FastCallStack; - } - if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { - // Passing NULL for the frame pointer argument will force the stack - // trace to begin at the current frame. - blockinfo->callstack->getstacktrace(m_maxtraceframes, NULL); - } - else { - // Start the stack trace at the call that first entered VLD's code. - blockinfo->callstack->getstacktrace(m_maxtraceframes, (SIZE_T*)framepointer); - } - blockinfo->serialnumber = serialnumber++; - blockinfo->size = size; - - // Insert the block's information into the block map. - EnterCriticalSection(&m_maplock); - heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // We haven't mapped this heap to a block map yet. Do it now. - mapheap(heap); - heapit = m_heapmap->find(heap); - assert(heapit != m_heapmap->end()); - } - if (crtalloc == TRUE) { - // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags |= VLD_HEAP_CRT; - } - blockmap = &(*heapit).second->blockmap; - blockit = blockmap->insert(mem, blockinfo); - if (blockit == blockmap->end()) { - // A block with this address has already been allocated. The - // previously allocated block must have been freed (probably by some - // mechanism unknown to VLD), or the heap wouldn't have allocated it - // again. Replace the previously allocated info with the new info. - blockit = blockmap->find(mem); - delete (*blockit).second->callstack; - delete (*blockit).second; - blockmap->erase(blockit); - blockmap->insert(mem, blockinfo); - } - LeaveCriticalSection(&m_maplock); -} - -// mapheap - Tracks heap creation. Creates a block map for tracking individual -// allocations from the newly created heap and then maps the heap to this -// block map. -// -// - heap (IN): Handle to the newly created heap. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::mapheap (HANDLE heap) -{ - heapinfo_t *heapinfo; - HeapMap::Iterator heapit; - - // Create a new block map for this heap and insert it into the heap map. - heapinfo = new heapinfo_t; - heapinfo->blockmap.reserve(BLOCKMAPRESERVE); - heapinfo->flags = 0x0; - EnterCriticalSection(&m_maplock); - heapit = m_heapmap->insert(heap, heapinfo); - if (heapit == m_heapmap->end()) { - // Somehow this heap has been created twice without being destroyed, - // or at least it was destroyed without VLD's knowledge. Unmap the heap - // from the existing heapinfo, and remap it to the new one. - report(L"WARNING: Visual Leak Detector detected a duplicate heap (" ADDRESSFORMAT L").\n", heap); - heapit = m_heapmap->find(heap); - unmapheap((*heapit).first); - m_heapmap->insert(heap, heapinfo); - } - LeaveCriticalSection(&m_maplock); -} - -// remapblock - Tracks reallocations. Unmaps a block from its previously -// collected information and remaps it to updated information. -// -// Note: If the block itself remains at the same address, then the block's -// information can simply be updated rather than having to actually erase and -// reinsert the block. -// -// - heap (IN): Handle to the heap from which the memory is being reallocated. -// -// - mem (IN): Pointer to the memory block being reallocated. -// -// - newmem (IN): Pointer to the memory block being returned to the caller -// that requested the reallocation. This pointer may or may not be the same -// as the original memory block (as pointed to by "mem"). -// -// - size (IN): Size, in bytes, of the new memory block. -// -// - framepointer (IN): The frame pointer at which this reallocation entered -// VLD's code. Used for determining the starting point of the stack trace. -// -// - crtalloc (IN): Should be set to TRUE if this reallocation is for a CRT -// memory block. Otherwise should be set to FALSE. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, SIZE_T framepointer, - BOOL crtalloc) -{ - BlockMap::Iterator blockit; - BlockMap *blockmap; - HeapMap::Iterator heapit; - blockinfo_t *info; - - if (newmem != mem) { - // The block was not reallocated in-place. Instead the old block was - // freed and a new block allocated to satisfy the new size. - unmapblock(heap, mem); - mapblock(heap, newmem, size, framepointer, crtalloc); - return; - } - - // The block was reallocated in-place. Find the existing blockinfo_t - // entry in the block map and update it with the new callstack and size. - EnterCriticalSection(&m_maplock); - heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // We haven't mapped this heap to a block map yet. Obviously the - // block has also not been mapped to a blockinfo_t entry yet either, - // so treat this reallocation as a brand-new allocation (this will - // also map the heap to a new block map). - mapblock(heap, newmem, size, framepointer, crtalloc); - LeaveCriticalSection(&m_maplock); - return; - } - - // Find the block's blockinfo_t structure so that we can update it. - blockmap = &(*heapit).second->blockmap; - blockit = blockmap->find(mem); - if (blockit == blockmap->end()) { - // The block hasn't been mapped to a blockinfo_t entry yet. - // Treat this reallocation as a new allocation. - mapblock(heap, newmem, size, framepointer, crtalloc); - LeaveCriticalSection(&m_maplock); - return; - } - - // Found the blockinfo_t entry for this block. Update it with - // a new callstack and new size. - info = (*blockit).second; - info->callstack->clear(); - if (crtalloc) { - // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags |= VLD_HEAP_CRT; - } - LeaveCriticalSection(&m_maplock); - - // Update the block's callstack and size. - if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { - // Passing NULL for the frame pointer argument will force - // the stack trace to begin at the current frame. - info->callstack->getstacktrace(m_maxtraceframes, NULL); - } - else { - // Start the stack trace at the call that first entered - // VLD's code. - info->callstack->getstacktrace(m_maxtraceframes, (SIZE_T*)framepointer); - } - info->size = size; -} - -// reportconfig - Generates a brief report summarizing Visual Leak Detector's -// configuration, as loaded from the vld.ini file. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::reportconfig () -{ - if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { - report(L" Aggregating duplicate leaks.\n"); - } - if (wcslen(m_forcedmodulelist) != 0) { - report(L" Forcing inclusion of these modules in leak detection: %s\n", m_forcedmodulelist); - } - if (m_maxdatadump != VLD_DEFAULT_MAX_DATA_DUMP) { - if (m_maxdatadump == 0) { - report(L" Suppressing data dumps.\n"); - } - else { - report(L" Limiting data dumps to %lu bytes.\n", m_maxdatadump); - } - } - if (m_maxtraceframes != VLD_DEFAULT_MAX_TRACE_FRAMES) { - report(L" Limiting stack traces to %u frames.\n", m_maxtraceframes); - } - if (m_options & VLD_OPT_UNICODE_REPORT) { - report(L" Generating a Unicode (UTF-16) encoded report.\n"); - } - if (m_options & VLD_OPT_REPORT_TO_FILE) { - if (m_options & VLD_OPT_REPORT_TO_DEBUGGER) { - report(L" Outputting the report to the debugger and to %s\n", m_reportfilepath); - } - else { - report(L" Outputting the report to %s\n", m_reportfilepath); - } - } - if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { - report(L" Outputting the report to the debugger at a slower rate.\n"); - } - if (m_options & VLD_OPT_SAFE_STACK_WALK) { - report(L" Using the \"safe\" (but slow) stack walking method.\n"); - } - if (m_options & VLD_OPT_SELF_TEST) { - report(L" Perfoming a memory leak self-test.\n"); - } - if (m_options & VLD_OPT_START_DISABLED) { - report(L" Starting with memory leak detection disabled.\n"); - } - if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { - report(L" Including heap and VLD internal frames in stack traces.\n"); - } -} - -// reportleaks - Generates a memory leak report for the specified heap. -// -// - heap (IN): Handle to the heap for which to generate a memory leak -// report. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::reportleaks (HANDLE heap) -{ - LPCVOID address; - LPCVOID block; - BlockMap::Iterator blockit; - BlockMap *blockmap; - crtdbgblockheader_t *crtheader; - SIZE_T duplicates; - heapinfo_t *heapinfo; - HeapMap::Iterator heapit; - blockinfo_t *info; - SIZE_T size; - - // Find the heap's information (blockmap, etc). - EnterCriticalSection(&m_maplock); - heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // Nothing is allocated from this heap. No leaks. - LeaveCriticalSection(&m_maplock); - return; - } - - heapinfo = (*heapit).second; - blockmap = &heapinfo->blockmap; - for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - // Found a block which is still in the BlockMap. We've identified a - // potential memory leak. - block = (*blockit).first; - info = (*blockit).second; - address = block; - size = info->size; - if (heapinfo->flags & VLD_HEAP_CRT) { - // This block is allocated to a CRT heap, so the block has a CRT - // memory block header prepended to it. - crtheader = (crtdbgblockheader_t*)block; - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { - // This block is marked as being used internally by the CRT. - // The CRT will free the block after VLD is destroyed. - continue; - } - // The CRT header is more or less transparent to the user, so - // the information about the contained block will probably be - // more useful to the user. Accordingly, that's the information - // we'll include in the report. - address = CRTDBGBLOCKDATA(block); - size = crtheader->size; - } - // It looks like a real memory leak. - if (m_leaksfound == 0) { - report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); - } - m_leaksfound++; - report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialnumber, address, size); - if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { - // Aggregate all other leaks which are duplicates of this one - // under this same heading, to cut down on clutter. - duplicates = eraseduplicates(blockit); - if (duplicates) { - report(L"A total of %lu leaks match this size and call stack. Showing only the first one.\n", - duplicates + 1); - m_leaksfound += duplicates; - } - } - // Dump the call stack. - report(L" Call Stack:\n"); - info->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); - // Dump the data in the user data section of the memory block. - if (m_maxdatadump != 0) { - report(L" Data:\n"); - if (m_options & VLD_OPT_UNICODE_REPORT) { - dumpmemoryw(address, (m_maxdatadump < size) ? m_maxdatadump : size); - } - else { - dumpmemorya(address, (m_maxdatadump < size) ? m_maxdatadump : size); - } - } - report(L"\n"); - } - - LeaveCriticalSection(&m_maplock); -} - -// unmapblock - Tracks memory blocks that are freed. Unmaps the specified block -// from the block's information, relinquishing internally allocated resources. -// -// - heap (IN): Handle to the heap to which this block is being freed. -// -// - mem (IN): Pointer to the memory block being freed. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) -{ - BlockMap::Iterator blockit; - BlockMap *blockmap; - HeapMap::Iterator heapit; - blockinfo_t *info; - - // Find this heap's block map. - EnterCriticalSection(&m_maplock); - heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // We don't have a block map for this heap. We must not have monitored - // this allocation (probably happened before VLD was initialized). - LeaveCriticalSection(&m_maplock); - return; - } - - // Find this block in the block map. - blockmap = &(*heapit).second->blockmap; - blockit = blockmap->find(mem); - if (blockit == blockmap->end()) { - // This block is not in the block map. We must not have monitored this - // allocation (probably happened before VLD was initialized). - LeaveCriticalSection(&m_maplock); - return; - } - - // Free the blockinfo_t structure and erase it from the block map. - info = (*blockit).second; - delete info->callstack; - delete info; - blockmap->erase(blockit); - LeaveCriticalSection(&m_maplock); -} - -// unmapheap - Tracks heap destruction. Unmaps the specified heap from its block -// map. The block map is cleared and deleted, relinquishing internally -// allocated resources. -// -// - heap (IN): Handle to the heap which is being destroyed. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::unmapheap (HANDLE heap) -{ - BlockMap::Iterator blockit; - BlockMap *blockmap; - heapinfo_t *heapinfo; - HeapMap::Iterator heapit; - - // Find this heap's block map. - EnterCriticalSection(&m_maplock); - heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // This heap hasn't been mapped. We must not have monitored this heap's - // creation (probably happened before VLD was initialized). - LeaveCriticalSection(&m_maplock); - return; - } - - // Free all of the blockinfo_t structures stored in the block map. - heapinfo = (*heapit).second; - blockmap = &heapinfo->blockmap; - for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callstack; - delete (*blockit).second; - } - delete heapinfo; - - // Remove this heap's block map from the heap map. - m_heapmap->erase(heapit); - LeaveCriticalSection(&m_maplock); -} - - -//////////////////////////////////////////////////////////////////////////////// -// -// Static Leak Detection Functions (Callbacks) -// -//////////////////////////////////////////////////////////////////////////////// - -// addloadedmodule - Callback function for EnumerateLoadedModules64. This -// function records information about every module loaded in the process, -// each time adding the module's information to the provided ModuleSet (the -// "context" parameter). -// -// When EnumerateLoadedModules64 has finished calling this function for each -// loaded module, then the resulting ModuleSet can be used at any time to get -// information about any modules loaded into the process. -// -// - modulepath (IN): The fully qualified path from where the module was -// loaded. -// -// - modulebase (IN): The base address at which the module has been loaded. -// -// - modulesize (IN): The size, in bytes, of the loaded module. -// -// - context (IN): Pointer to the ModuleSet to which information about each -// module is to be added. -// -// Return Value: -// -// Always returns TRUE, which tells EnumerateLoadedModules64 to continue -// enumerating. -// -BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context) -{ - size_t count; - patchentry_t *entry; - CHAR extension [_MAX_EXT]; - CHAR filename [_MAX_FNAME]; - UINT index; - moduleinfo_t moduleinfo; - LPSTR modulenamea; - LPSTR modulepatha; - ModuleSet* newmodules = (ModuleSet*)context; - SIZE_T size; - UINT tablesize = sizeof(m_patchtable) / sizeof(patchentry_t); - - // Convert the module path to ASCII. - size = wcslen(modulepath) + 1; - modulepatha = new CHAR [size]; - wcstombs_s(&count, modulepatha, size, modulepath, _TRUNCATE); - - // Extract just the filename and extension from the module path. - _splitpath_s(modulepatha, NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); - size = strlen(filename) + strlen(extension) + 1; - modulenamea = new CHAR [size]; - strncpy_s(modulenamea, size, filename, _TRUNCATE); - strncat_s(modulenamea, size, extension, _TRUNCATE); - _strlwr_s(modulenamea, size); - - if (_stricmp(modulenamea, "vld.dll") == 0) { - // Record Visual Leak Detector's own base address. - vld.m_vldbase = (HMODULE)modulebase; - } - else { - // See if this is a module listed in the patch table. If it is, update - // the corresponding patch table entries' module base address. - for (index = 0; index < tablesize; index++) { - entry = &m_patchtable[index]; - if (_stricmp(entry->exportmodulename, modulenamea) == 0) { - entry->modulebase = (SIZE_T)modulebase; - } - } - } - - // Record the module's information and store it in the set. - moduleinfo.addrlow = (SIZE_T)modulebase; - moduleinfo.addrhigh = (SIZE_T)(modulebase + modulesize) - 1; - moduleinfo.flags = 0x0; - moduleinfo.name = modulenamea; - moduleinfo.path = modulepatha; - newmodules->insert(moduleinfo); - - return TRUE; -} - -// detachfrommodule - Callback function for EnumerateLoadedModules64 that -// detaches Visual Leak Detector from the specified module. If the specified -// module has not previously been attached to, then calling this function will -// not actually result in any changes. -// -// - modulepath (IN): String containing the name, which may include a path, of -// the module to detach from (ignored). -// -// - modulebase (IN): Base address of the module. -// -// - modulesize (IN): Total size of the module (ignored). -// -// - context (IN): User-supplied context (ignored). -// -// Return Value: -// -// Always returns TRUE. -// -BOOL VisualLeakDetector::detachfrommodule (PCWSTR /*modulepath*/, DWORD64 modulebase, ULONG /*modulesize*/, - PVOID /*context*/) -{ - UINT tablesize = sizeof(m_patchtable) / sizeof(patchentry_t); - - restoremodule((HMODULE)modulebase, m_patchtable, tablesize); - - return TRUE; -} - - -//////////////////////////////////////////////////////////////////////////////// -// -// Standard CRT and MFC IAT Replacement Functions -// -// The addresses of these functions are not actually directly patched into the -// import address tables, but these functions do get indirectly called by the -// patch functions that are placed in the import address tables. -// -//////////////////////////////////////////////////////////////////////////////// - -// _calloc - This function is just a wrapper around the real calloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - pcalloc (IN): Pointer to the particular calloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - num (IN): The number of blocks, of size 'size', to be allocated. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned from the specified calloc. -// -void* VisualLeakDetector::_calloc (calloc_t pcalloc, - SIZE_T fp, - size_t num, - size_t size) -{ - void *block; - tls_t *tls = vld.gettls(); - - // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pcalloc(num, size); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// _malloc - This function is just a wrapper around the real malloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - pmalloc (IN): Pointer to the particular malloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned from the specified malloc. -// -void *VisualLeakDetector::_malloc (malloc_t pmalloc, SIZE_T fp, size_t size) -{ - void *block; - tls_t *tls = vld.gettls(); - - // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pmalloc(size); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// _new - This function is just a wrapper around the real CRT and MFC new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - pnew (IN): Pointer to the particular new implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the specified CRT new operator. -// -void* VisualLeakDetector::_new (new_t pnew, SIZE_T fp, size_t size) -{ - void *block; - tls_t *tls = vld.gettls(); - - // The new operator is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pnew(size); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// _realloc - This function is just a wrapper around the real realloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - prealloc (IN): Pointer to the particular realloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified realloc. -// -void* VisualLeakDetector::_realloc (realloc_t prealloc, - SIZE_T fp, - void *mem, - size_t size) -{ - void *block; - tls_t *tls = vld.gettls(); - - // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = prealloc(mem, size); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Debug CRT and MFC IAT Replacement Functions -// -// The addresses of these functions are not actually directly patched into the -// import address tables, but these functions do get indirectly called by the -// patch functions that are placed in the import address tables. -// -//////////////////////////////////////////////////////////////////////////////// - -// __calloc_dbg - This function is just a wrapper around the real _calloc_dbg -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - p_calloc_dbg: Pointer to the particular _calloc_dbg implementation to -// call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _calloc_dbg. -// -void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, - SIZE_T fp, - size_t num, - size_t size, - int type, - char const *file, - int line) -{ - void *block; - tls_t *tls = vld.gettls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = p_calloc_dbg(num, size, type, file, line); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// __malloc_dbg - This function is just a wrapper around the real _malloc_dbg -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to -// call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _malloc_dbg. -// -void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, - SIZE_T fp, - size_t size, - int type, - char const *file, - int line) -{ - void *block; - tls_t *tls = vld.gettls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = p_malloc_dbg(size, type, file, line); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// new_dbg_crt - This function is just a wrapper around the real CRT debug new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - pnew_dbg_crt (IN): Pointer to the particular CRT new operator -// implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified CRT debug new operator. -// -void* VisualLeakDetector::new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, - SIZE_T fp, - size_t size, - int type, - char const *file, - int line) -{ - void *block; - tls_t *tls = vld.gettls(); - - // The debug new operator is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pnew_dbg_crt(size, type, file, line); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// new_dbg_mfc - This function is just a wrapper around the real MFC debug new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - pnew_dbg (IN): Pointer to the particular CRT new operator -// implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified CRT debug new operator. -// -void* VisualLeakDetector::new_dbg_mfc (new_dbg_crt_t pnew_dbg, - SIZE_T fp, - size_t size, - int type, - char const *file, - int line) -{ - void *block; - tls_t *tls = vld.gettls(); - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pnew_dbg(size, type, file, line); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// new_dbg_mfc - This function is just a wrapper around the real MFC debug new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - pnew_dbg_mfc (IN): Pointer to the particular MFC new operator -// implementation to call. -// -// - fp (IN): Frame pointer of the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified MFC debug new operator. -// -void* VisualLeakDetector::new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, - SIZE_T fp, - size_t size, - char const *file, - int line) -{ - void *block; - tls_t *tls = vld.gettls(); - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pnew_dbg_mfc(size, file, line); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// __realloc_debug - This function is just a wrapper around the real -// _realloc_dbg that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, - SIZE_T fp, - void *mem, - size_t size, - int type, - char const *file, - int line) -{ - void *block; - tls_t *tls = vld.gettls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = p_realloc_dbg(mem, size, type, file, line); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Win32 IAT Replacement Functions -// -//////////////////////////////////////////////////////////////////////////////// - -// _GetProcAddress - Calls to GetProcAddress are patched through to this -// function. If the requested function is a function that has been patched -// through to one of VLD's handlers, then the address of VLD's handler -// function is returned instead of the real address. Otherwise, this -// function is just a wrapper around the real GetProcAddress. -// -// - module (IN): Handle (base address) of the module from which to retrieve -// the address of an exported function. -// -// - procname (IN): ANSI string containing the name of the exported function -// whose address is to be retrieved. -// -// Return Value: -// -// Returns a pointer to the requested function, or VLD's replacement for -// the function, if there is a replacement function. -// -FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) -{ - patchentry_t *entry; - UINT index; - UINT tablesize = sizeof(vld.m_patchtable) / sizeof(patchentry_t); - - // See if there is an entry in the patch table that matches the requested - // function. - for (index = 0; index < tablesize; index++) { - entry = &vld.m_patchtable[index]; - if ((entry->modulebase == 0x0) || ((HMODULE)entry->modulebase != module)) { - // This patch table entry is for a different module. - continue; - } - - // This patch table entry is for the specified module. If the requested - // import's name matches the entry's import name (or ordinal), then - // return the address of the replacement instead of the address of the - // actual import. - if ((SIZE_T)entry->importname < (SIZE_T)vld.m_vldbase) { - // This entry's import name is not a valid pointer to data in - // vld.dll. It must be an ordinal value. - if ((UINT)entry->importname == (UINT)procname) { - return (FARPROC)entry->replacement; - } - } - else { - if (strcmp(entry->importname, procname) == 0) { - return (FARPROC)entry->replacement; - } - } - } - - // The requested function is not a patched function. Just return the real - // address of the requested function. - return GetProcAddress(module, procname); -} - -// _HeapCreate - Calls to HeapCreate are patched through to this function. This -// function is just a wrapper around the real HeapCreate that calls VLD's heap -// creation tracking function after the heap has been created. -// -// - options (IN): Heap options. -// -// - initsize (IN): Initial size of the heap. -// -// - maxsize (IN): Maximum size of the heap. -// -// Return Value: -// -// Returns the value returned by HeapCreate. -// -HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) -{ - DWORD64 displacement; - SIZE_T fp; - SYMBOL_INFO *functioninfo; - HANDLE heap; - HeapMap::Iterator heapit; - SIZE_T ra; - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; - BOOL symfound; - - // Get the return address within the calling function. - FRAMEPOINTER(fp); - ra = *((SIZE_T*)fp + 1); - - // Create the heap. - heap = HeapCreate(options, initsize, maxsize); - - // Map the created heap handle to a new block map. - vld.mapheap(heap); - - // Try to get the name of the function containing the return address. - functioninfo = (SYMBOL_INFO*)&symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; - EnterCriticalSection(&symbollock); - symfound = SymFromAddrW(currentprocess, ra, &displacement, functioninfo); - LeaveCriticalSection(&symbollock); - if (symfound == TRUE) { - if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { - // HeapCreate was called by _heap_init. This is a static CRT heap. - EnterCriticalSection(&vld.m_maplock); - heapit = vld.m_heapmap->find(heap); - assert(heapit != vld.m_heapmap->end()); - (*heapit).second->flags |= VLD_HEAP_CRT; - LeaveCriticalSection(&vld.m_maplock); - } - } - - return heap; -} - -// _HeapDestroy - Calls to HeapDestroy are patched through to this function. -// This function is just a wrapper around the real HeapDestroy that calls -// VLD's heap destruction tracking function after the heap has been destroyed. -// -// - heap (IN): Handle to the heap to be destroyed. -// -// Return Value: -// -// Returns the valued returned by HeapDestroy. -// -BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) -{ - // After this heap is destroyed, the heap's address space will be unmapped - // from the process's address space. So, we'd better generate a leak report - // for this heap now, while we can still read from the memory blocks - // allocated to it. - vld.reportleaks(heap); - - vld.unmapheap(heap); - - return HeapDestroy(heap); -} - -// _LdrLoadDll - Calls to LdrLoadDll are patched through to this function. This -// function invokes the real LdrLoadDll and then re-attaches VLD to all -// modules loaded in the process after loading of the new DLL is complete. -// All modules must be re-enumerated because the explicit load of the -// specified module may result in the implicit load of one or more additional -// modules which are dependencies of the specified module. -// -// - searchpath (IN): The path to use for searching for the specified module to -// be loaded. -// -// - flags (IN): Pointer to action flags. -// -// - modulename (IN): Pointer to a unicodestring_t structure specifying the -// name of the module to be loaded. -// -// - modulehandle (OUT): Address of a HANDLE to receive the newly loaded -// module's handle. -// -// Return Value: -// -// Returns the value returned by LdrLoadDll. -// -NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, PDWORD flags, unicodestring_t *modulename, - PHANDLE modulehandle) -{ - ModuleSet::Iterator moduleit; - ModuleSet *newmodules; - ModuleSet *oldmodules; - NTSTATUS status; - - EnterCriticalSection(&vld.m_loaderlock); - - // Load the DLL. - status = LdrLoadDll(searchpath, flags, modulename, modulehandle); - - if (STATUS_SUCCESS == status) { - // Create a new set of all loaded modules, including any newly loaded - // modules. - newmodules = new ModuleSet; - newmodules->reserve(MODULESETRESERVE); - EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); - - // Attach to all modules included in the set. - vld.attachtoloadedmodules(newmodules); - - // Start using the new set of loaded modules. - EnterCriticalSection(&vld.m_moduleslock); - oldmodules = vld.m_loadedmodules; - vld.m_loadedmodules = newmodules; - LeaveCriticalSection(&vld.m_moduleslock); - - // Free resources used by the old module list. - for (moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { - delete (*moduleit).name; - delete (*moduleit).path; - } - delete oldmodules; - } - - LeaveCriticalSection(&vld.m_loaderlock); - - return status; -} - -// _RtlAllocateHeap - Calls to RtlAllocateHeap are patched through to this -// function. This function invokes the real RtlAllocateHeap and then calls -// VLD's allocation tracking function. Pretty much all memory allocations -// will eventually result in a call to RtlAllocateHeap, so this is where we -// finally map the allocated block. -// -// - heap (IN): Handle to the heap from which to allocate memory. -// -// - flags (IN): Heap allocation control flags. -// -// - size (IN): Size, in bytes, of the block to allocate. -// -// Return Value: -// -// Returns the return value from RtlAllocateHeap. -// -LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) -{ - BOOL crtalloc; - BOOL excluded = FALSE; - SIZE_T fp; - LPVOID block; - moduleinfo_t moduleinfo; - ModuleSet::Iterator moduleit; - SIZE_T returnaddress; - tls_t *tls = vld.gettls(); - - // Allocate the block. - block = RtlAllocateHeap(heap, flags, size); - if ((block != NULL) && vld.enabled()) { - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - FRAMEPOINTER(fp); - } - else { - fp = tls->addrfp; - } - crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - - // Reset thread local flags and variables, in case any libraries called - // into while mapping the block allocate some memory. - tls->addrfp = 0x0; - tls->flags &=~VLD_TLS_CRTALLOC; - - // Find the information for the module that initiated this allocation. - returnaddress = *((SIZE_T*)fp + 1); - moduleinfo.addrhigh = returnaddress; - moduleinfo.addrlow = returnaddress; - EnterCriticalSection(&vld.m_moduleslock); - moduleit = vld.m_loadedmodules->find(moduleinfo); - if (moduleit != vld.m_loadedmodules->end()) { - excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; - } - LeaveCriticalSection(&vld.m_moduleslock); - if (!excluded) { - // The module that initiated this allocation is included in leak - // detection. Map this block to the specified heap. - vld.mapblock(heap, block, size, fp, crtalloc); - } - } - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. -// This function calls VLD's free tracking function and then invokes the real -// RtlFreeHeap. Pretty much all memory frees will eventually result in a call -// to RtlFreeHeap, so this is where we finally unmap the freed block. -// -// - heap (IN): Handle to the heap to which the block being freed belongs. -// -// - flags (IN): Heap control flags. -// -// - mem (IN): Pointer to the memory block being freed. -// -// Return Value: -// -// Returns the value returned by RtlFreeHeap. -// -BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) -{ - BOOL status; - - // Unmap the block from the specified heap. - vld.unmapblock(heap, mem); - - status = RtlFreeHeap(heap, flags, mem); - - return status; -} - -// _RtlReAllocateHeap - Calls to RtlReAllocateHeap are patched through to this -// function. This function invokes the real RtlReAllocateHeap and then calls -// VLD's reallocation tracking function. All arguments passed to this function -// are passed on to the real RtlReAllocateHeap without modification. Pretty -// much all memory re-allocations will eventually result in a call to -// RtlReAllocateHeap, so this is where we finally remap the reallocated block. -// -// - heap (IN): Handle to the heap to reallocate memory from. -// -// - flags (IN): Heap control flags. -// -// - mem (IN): Pointer to the currently allocated block which is to be -// reallocated. -// -// - size (IN): Size, in bytes, of the block to reallocate. -// -// Return Value: -// -// Returns the value returned by RtlReAllocateHeap. -// -LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) -{ - BOOL crtalloc; - BOOL excluded = FALSE; - SIZE_T fp; - moduleinfo_t moduleinfo; - ModuleSet::Iterator moduleit; - LPVOID newmem; - SIZE_T returnaddress; - tls_t *tls = vld.gettls(); - - // Reallocate the block. - newmem = RtlReAllocateHeap(heap, flags, mem, size); - - if (newmem != NULL) { - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - FRAMEPOINTER(fp); - } - else { - fp = tls->addrfp; - } - crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - - // Reset thread local flags and variables, in case any libraries called - // into while remapping the block allocate some memory. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - // Find the information for the module that initiated this reallocation. - returnaddress = *((SIZE_T*)fp + 1); - moduleinfo.addrhigh = returnaddress; - moduleinfo.addrlow = returnaddress; - EnterCriticalSection(&vld.m_moduleslock); - moduleit = vld.m_loadedmodules->find(moduleinfo); - if (moduleit != vld.m_loadedmodules->end()) { - excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; - } - LeaveCriticalSection(&vld.m_moduleslock); - if (!excluded) { - // The module that initiated this allocation is included in leak - // detection. Remap the block. - vld.remapblock(heap, mem, newmem, size, fp, crtalloc); - } - } - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return newmem; -} - -//////////////////////////////////////////////////////////////////////////////// -// -// COM IAT Replacement Functions -// -//////////////////////////////////////////////////////////////////////////////// - -// _CoGetMalloc - Calls to CoGetMalloc are patched through to this function. -// This function returns a pointer to Visual Leak Detector's implementation -// of the IMalloc interface, instead of returning a pointer to the system -// implementation. This allows VLD's implementation of the IMalloc interface -// (which is basically a thin wrapper around the system implementation) to be -// invoked in place of the system implementation. -// -// - context (IN): Reserved; value must be 1. -// -// - imalloc (IN): Address of a pointer to receive the address of VLD's -// implementation of the IMalloc interface. -// -// Return Value: -// -// Always returns S_OK. -// -HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) -{ - static CoGetMalloc_t pCoGetMalloc = NULL; - - HMODULE ole32; - - *imalloc = (LPMALLOC)&vld; - - if (pCoGetMalloc == NULL) { - // This is the first call to this function. Link to the real - // CoGetMalloc and get a pointer to the system implementation of the - // IMalloc interface. - ole32 = GetModuleHandle(L"ole32.dll"); - pCoGetMalloc = (CoGetMalloc_t)GetProcAddress(ole32, "CoGetMalloc"); - pCoGetMalloc(context, &vld.m_imalloc); - } - - return S_OK; -} - -// _CoTaskMemAlloc - Calls to CoTaskMemAlloc are patched through to this -// function. This function is just a wrapper around the real CoTaskMemAlloc -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - size (IN): Size of the memory block to allocate. -// -// Return Value: -// -// Returns the value returned from CoTaskMemAlloc. -// -LPVOID VisualLeakDetector::_CoTaskMemAlloc (ULONG size) -{ - static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; - - LPVOID block; - SIZE_T fp; - HMODULE ole32; - tls_t *tls = vld.gettls(); - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - FRAMEPOINTER(fp); - tls->addrfp = fp; - } - - if (pCoTaskMemAlloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemAlloc. - ole32 = GetModuleHandle(L"ole32.dll"); - pCoTaskMemAlloc = (CoTaskMemAlloc_t)GetProcAddress(ole32, "CoTaskMemAlloc"); - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pCoTaskMemAlloc(size); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// _CoTaskMemRealloc - Calls to CoTaskMemRealloc are patched through to this -// function. This function is just a wrapper around the real CoTaskMemRealloc -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size, in bytes, of the block to reallocate. -// -// Return Value: -// -// Returns the value returned from CoTaskMemRealloc. -// -LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, ULONG size) -{ - static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; - - LPVOID block; - SIZE_T fp; - HMODULE ole32; - tls_t *tls = vld.gettls(); - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - FRAMEPOINTER(fp); - tls->addrfp = fp; - } - - if (pCoTaskMemRealloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemRealloc. - ole32 = GetModuleHandle(L"ole32.dll"); - pCoTaskMemRealloc = (CoTaskMemRealloc_t)GetProcAddress(ole32, "CoTaskMemRealloc"); - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = pCoTaskMemRealloc(mem, size); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Public COM IMalloc Implementation Functions -// -//////////////////////////////////////////////////////////////////////////////// - -// AddRef - Calls to IMalloc::AddRef end up here. This function is just a -// wrapper around the real IMalloc::AddRef implementation. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::AddRef. -// -ULONG VisualLeakDetector::AddRef () -{ - assert(m_imalloc != NULL); - return m_imalloc->AddRef(); -} - -// Alloc - Calls to IMalloc::Alloc end up here. This function is just a wrapper -// around the real IMalloc::Alloc implementation that sets appropriate flags -// to be consulted when the memory is actually allocated by RtlAllocateHeap. -// -// - size (IN): The size of the memory block to allocate. -// -// Return Value: -// -// Returns the value returned by the system's IMalloc::Alloc implementation. -// -LPVOID VisualLeakDetector::Alloc (ULONG size) -{ - LPVOID block; - SIZE_T fp; - tls_t *tls = vld.gettls(); - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - FRAMEPOINTER(fp); - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - assert(m_imalloc != NULL); - block = m_imalloc->Alloc(size); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// DidAlloc - Calls to IMalloc::DidAlloc will end up here. This function is just -// a wrapper around the system implementation of IMalloc::DidAlloc. -// -// - mem (IN): Pointer to a memory block to inquire about. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::DidAlloc. -// -INT VisualLeakDetector::DidAlloc (LPVOID mem) -{ - assert(m_imalloc != NULL); - return m_imalloc->DidAlloc(mem); -} - -// Free - Calls to IMalloc::Free will end up here. This function is just a -// wrapper around the real IMalloc::Free implementation. -// -// - mem (IN): Pointer to the memory block to be freed. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::Free (LPVOID mem) -{ - assert(m_imalloc != NULL); - m_imalloc->Free(mem); -} - -// GetSize - Calls to IMalloc::GetSize will end up here. This function is just a -// wrapper around the real IMalloc::GetSize implementation. -// -// - mem (IN): Pointer to the memory block to inquire about. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::GetSize. -// -ULONG VisualLeakDetector::GetSize (LPVOID mem) -{ - assert(m_imalloc != NULL); - return m_imalloc->GetSize(mem); -} - -// HeapMinimize - Calls to IMalloc::HeapMinimize will end up here. This function -// is just a wrapper around the real IMalloc::HeapMinimize implementation. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::HeapMinimize () -{ - assert(m_imalloc != NULL); - m_imalloc->HeapMinimize(); -} - -// QueryInterface - Calls to IMalloc::QueryInterface will end up here. This -// function is just a wrapper around the real IMalloc::QueryInterface -// implementation. -// -// - iid (IN): COM interface ID to query about. -// -// - object (IN): Address of a pointer to receive the requested interface -// pointer. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::QueryInterface. -// -HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) -{ - assert(m_imalloc != NULL); - return m_imalloc->QueryInterface(iid, object); -} - -// Realloc - Calls to IMalloc::Realloc will end up here. This function is just a -// wrapper around the real IMalloc::Realloc implementation that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size, in bytes, of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::Realloc. -// -LPVOID VisualLeakDetector::Realloc (LPVOID mem, ULONG size) -{ - LPVOID block; - SIZE_T fp; - tls_t *tls = vld.gettls(); - - if (tls->addrfp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - FRAMEPOINTER(fp); - tls->addrfp = fp; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - assert(m_imalloc != NULL); - block = m_imalloc->Realloc(mem, size); - - // Reset thread local flags and variables for the next allocation. - tls->addrfp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - return block; -} - -// Release - Calls to IMalloc::Release will end up here. This function is just -// a wrapper around the real IMalloc::Release implementation. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::Release. -// -ULONG VisualLeakDetector::Release () -{ - assert(m_imalloc != NULL); - return m_imalloc->Release(); -} +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - VisualLeakDetector Class Implementation +// Copyright (c) 2005-2009 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#include "stdafx.h" + +#pragma comment(lib, "dbghelp.lib") + +#include +#define VLDBUILD // Declares that we are building Visual Leak Detector. +#include "callstack.h" // Provides a class for handling call stacks. +#include "crtmfcpatch.h" // Provides CRT and MFC patch functions. +#include "map.h" // Provides a lightweight STL-like map template. +#include "ntapi.h" // Provides access to NT APIs. +#include "set.h" // Provides a lightweight STL-like set template. +#include "utility.h" // Provides various utility functions. +#include "vldheap.h" // Provides internal new and delete operators. +#include "vldint.h" // Provides access to the Visual Leak Detector internals. + +#define BLOCKMAPRESERVE 64 // This should strike a balance between memory use and a desire to minimize heap hits. +#define HEAPMAPRESERVE 2 // Usually there won't be more than a few heaps in the process, so this should be small. +#define MAXSYMBOLNAMELENGTH 256 // Maximum symbol name length that we will allow. Longer names will be truncated. +#define MODULESETRESERVE 16 // There are likely to be several modules loaded in the process. + +// Imported global variables. +extern vldblockheader_t *vldblocklist; +extern HANDLE vldheap; +extern CRITICAL_SECTION vldheaplock; + +// Global variables. +HANDLE currentprocess; // Pseudo-handle for the current process. +HANDLE currentthread; // Pseudo-handle for the current thread. +CRITICAL_SECTION imagelock; // Serializes calls to the Debug Help Library PE image access APIs. +HANDLE processheap; // Handle to the process's heap (COM allocations come from here). +CRITICAL_SECTION stackwalklock; // Serializes calls to StackWalk64 from the Debug Help Library. +CRITICAL_SECTION symbollock; // Serializes calls to the Debug Help Library symbols handling APIs. + +// The one and only VisualLeakDetector object instance. +__declspec(dllexport) VisualLeakDetector vld; + +// Global function pointers for explicit dynamic linking with functions listed +// in the import patch table. Using explicit dynamic linking minimizes VLD's +// footprint by loading only modules that are actually used. These pointers will +// be linked to the real functions the first time they are used. + +// The import patch table: lists the heap-related API imports that VLD patches +// through to replacement functions provided by VLD. Having this table simply +// makes it more convenient to add additional IAT patches. +patchentry_t VisualLeakDetector::m_patchtable [] = { + // Win32 heap APIs. + "kernel32.dll", "GetProcAddress", 0x0, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. + "kernel32.dll", "HeapAlloc", 0x0, _RtlAllocateHeap, + "kernel32.dll", "HeapCreate", 0x0, _HeapCreate, + "kernel32.dll", "HeapDestroy", 0x0, _HeapDestroy, + "kernel32.dll", "HeapFree", 0x0, _RtlFreeHeap, + "kernel32.dll", "HeapReAlloc", 0x0, _RtlReAllocateHeap, + + // MFC new operators (exported by ordinal). + // XXX why are the vector new operators missing for mfc42d.dll? + "mfc42d.dll", (LPCSTR)711, 0x0, VS60::mfcd_scalar_new, + "mfc42d.dll", (LPCSTR)712, 0x0, VS60::mfcd__scalar_new_dbg_4p, + "mfc42d.dll", (LPCSTR)714, 0x0, VS60::mfcd__scalar_new_dbg_3p, + "mfc42ud.dll", (LPCSTR)711, 0x0, VS60::mfcud_scalar_new, + "mfc42ud.dll", (LPCSTR)712, 0x0, VS60::mfcud__scalar_new_dbg_4p, + "mfc42ud.dll", (LPCSTR)714, 0x0, VS60::mfcud__scalar_new_dbg_3p, + "mfc70d.dll", (LPCSTR)257, 0x0, VS70::mfcd_vector_new, + "mfc70d.dll", (LPCSTR)258, 0x0, VS70::mfcd__vector_new_dbg_4p, + "mfc70d.dll", (LPCSTR)259, 0x0, VS70::mfcd__vector_new_dbg_3p, + "mfc70d.dll", (LPCSTR)832, 0x0, VS70::mfcd_scalar_new, + "mfc70d.dll", (LPCSTR)833, 0x0, VS70::mfcd__scalar_new_dbg_4p, + "mfc70d.dll", (LPCSTR)834, 0x0, VS70::mfcd__scalar_new_dbg_3p, + "mfc70ud.dll", (LPCSTR)258, 0x0, VS70::mfcud_vector_new, + "mfc70ud.dll", (LPCSTR)259, 0x0, VS70::mfcud__vector_new_dbg_4p, + "mfc70ud.dll", (LPCSTR)260, 0x0, VS70::mfcud__vector_new_dbg_3p, + "mfc70ud.dll", (LPCSTR)833, 0x0, VS70::mfcud_scalar_new, + "mfc70ud.dll", (LPCSTR)834, 0x0, VS70::mfcud__scalar_new_dbg_4p, + "mfc70ud.dll", (LPCSTR)835, 0x0, VS70::mfcud__scalar_new_dbg_3p, + "mfc71d.dll", (LPCSTR)267, 0x0, VS71::mfcd_vector_new, + "mfc71d.dll", (LPCSTR)268, 0x0, VS71::mfcd__vector_new_dbg_4p, + "mfc71d.dll", (LPCSTR)269, 0x0, VS71::mfcd__vector_new_dbg_3p, + "mfc71d.dll", (LPCSTR)893, 0x0, VS71::mfcd_scalar_new, + "mfc71d.dll", (LPCSTR)894, 0x0, VS71::mfcd__scalar_new_dbg_4p, + "mfc71d.dll", (LPCSTR)895, 0x0, VS71::mfcd__scalar_new_dbg_3p, + "mfc71ud.dll", (LPCSTR)267, 0x0, VS71::mfcud_vector_new, + "mfc71ud.dll", (LPCSTR)268, 0x0, VS71::mfcud__vector_new_dbg_4p, + "mfc71ud.dll", (LPCSTR)269, 0x0, VS71::mfcud__vector_new_dbg_3p, + "mfc71ud.dll", (LPCSTR)893, 0x0, VS71::mfcud_scalar_new, + "mfc71ud.dll", (LPCSTR)894, 0x0, VS71::mfcud__scalar_new_dbg_4p, + "mfc71ud.dll", (LPCSTR)895, 0x0, VS71::mfcud__scalar_new_dbg_3p, + "mfc80d.dll", (LPCSTR)267, 0x0, VS80::mfcd_vector_new, + "mfc80d.dll", (LPCSTR)268, 0x0, VS80::mfcd__vector_new_dbg_4p, + "mfc80d.dll", (LPCSTR)269, 0x0, VS80::mfcd__vector_new_dbg_3p, + "mfc80d.dll", (LPCSTR)893, 0x0, VS80::mfcd_scalar_new, + "mfc80d.dll", (LPCSTR)894, 0x0, VS80::mfcd__scalar_new_dbg_4p, + "mfc80d.dll", (LPCSTR)895, 0x0, VS80::mfcd__scalar_new_dbg_3p, + "mfc80ud.dll", (LPCSTR)267, 0x0, VS80::mfcud_vector_new, + "mfc80ud.dll", (LPCSTR)268, 0x0, VS80::mfcud__vector_new_dbg_4p, + "mfc80ud.dll", (LPCSTR)269, 0x0, VS80::mfcud__vector_new_dbg_3p, + "mfc80ud.dll", (LPCSTR)893, 0x0, VS80::mfcud_scalar_new, + "mfc80ud.dll", (LPCSTR)894, 0x0, VS80::mfcud__scalar_new_dbg_4p, + "mfc80ud.dll", (LPCSTR)895, 0x0, VS80::mfcud__scalar_new_dbg_3p, + "mfc90d.dll", (LPCSTR)267, 0x0, VS90::mfcd_vector_new, + "mfc90d.dll", (LPCSTR)268, 0x0, VS90::mfcd__vector_new_dbg_4p, + "mfc90d.dll", (LPCSTR)269, 0x0, VS90::mfcd__vector_new_dbg_3p, + "mfc90d.dll", (LPCSTR)931, 0x0, VS90::mfcd_scalar_new, + "mfc90d.dll", (LPCSTR)932, 0x0, VS90::mfcd__scalar_new_dbg_4p, + "mfc90d.dll", (LPCSTR)933, 0x0, VS90::mfcd__scalar_new_dbg_3p, + "mfc90ud.dll", (LPCSTR)267, 0x0, VS90::mfcud_vector_new, + "mfc90ud.dll", (LPCSTR)268, 0x0, VS90::mfcud__vector_new_dbg_4p, + "mfc90ud.dll", (LPCSTR)269, 0x0, VS90::mfcud__vector_new_dbg_3p, + "mfc90ud.dll", (LPCSTR)935, 0x0, VS90::mfcud_scalar_new, + "mfc90ud.dll", (LPCSTR)936, 0x0, VS90::mfcud__scalar_new_dbg_4p, + "mfc90ud.dll", (LPCSTR)937, 0x0, VS90::mfcud__scalar_new_dbg_3p, + + // CRT new operators and heap APIs. + "msvcrtd.dll", "_calloc_dbg", 0x0, VS60::crtd__calloc_dbg, + "msvcrtd.dll", "_malloc_dbg", 0x0, VS60::crtd__malloc_dbg, + "msvcrtd.dll", "_realloc_dbg", 0x0, VS60::crtd__realloc_dbg, + "msvcrtd.dll", scalar_new_dbg_name, 0x0, VS60::crtd__scalar_new_dbg, +// "msvcrtd.dll", vector_new_dbg_name, 0x0, VS60::crtd__vector_new_dbg, + "msvcrtd.dll", "calloc", 0x0, VS60::crtd_calloc, + "msvcrtd.dll", "malloc", 0x0, VS60::crtd_malloc, + "msvcrtd.dll", "realloc", 0x0, VS60::crtd_realloc, + "msvcrtd.dll", scalar_new_name, 0x0, VS60::crtd_scalar_new, +// "msvcrtd.dll", vector_new_name, 0x0, VS60::crtd_vector_new, + "msvcr70d.dll", "_calloc_dbg", 0x0, VS70::crtd__calloc_dbg, + "msvcr70d.dll", "_malloc_dbg", 0x0, VS70::crtd__malloc_dbg, + "msvcr70d.dll", "_realloc_dbg", 0x0, VS70::crtd__realloc_dbg, + "msvcr70d.dll", scalar_new_dbg_name, 0x0, VS70::crtd__scalar_new_dbg, + "msvcr70d.dll", vector_new_dbg_name, 0x0, VS70::crtd__vector_new_dbg, + "msvcr70d.dll", "calloc", 0x0, VS70::crtd_calloc, + "msvcr70d.dll", "malloc", 0x0, VS70::crtd_malloc, + "msvcr70d.dll", "realloc", 0x0, VS70::crtd_realloc, + "msvcr70d.dll", scalar_new_name, 0x0, VS70::crtd_scalar_new, + "msvcr70d.dll", vector_new_name, 0x0, VS70::crtd_vector_new, + "msvcr71d.dll", "_calloc_dbg", 0x0, VS71::crtd__calloc_dbg, + "msvcr71d.dll", "_malloc_dbg", 0x0, VS71::crtd__malloc_dbg, + "msvcr71d.dll", "_realloc_dbg", 0x0, VS71::crtd__realloc_dbg, + "msvcr71d.dll", scalar_new_dbg_name, 0x0, VS71::crtd__scalar_new_dbg, + "msvcr71d.dll", vector_new_dbg_name, 0x0, VS71::crtd__vector_new_dbg, + "msvcr71d.dll", "calloc", 0x0, VS71::crtd_calloc, + "msvcr71d.dll", "malloc", 0x0, VS71::crtd_malloc, + "msvcr71d.dll", "realloc", 0x0, VS71::crtd_realloc, + "msvcr71d.dll", scalar_new_name, 0x0, VS71::crtd_scalar_new, + "msvcr71d.dll", vector_new_name, 0x0, VS71::crtd_vector_new, + "msvcr80d.dll", "_calloc_dbg", 0x0, VS80::crtd__calloc_dbg, + "msvcr80d.dll", "_malloc_dbg", 0x0, VS80::crtd__malloc_dbg, + "msvcr80d.dll", "_realloc_dbg", 0x0, VS80::crtd__realloc_dbg, + "msvcr80d.dll", scalar_new_dbg_name, 0x0, VS80::crtd__scalar_new_dbg, + "msvcr80d.dll", vector_new_dbg_name, 0x0, VS80::crtd__vector_new_dbg, + "msvcr80d.dll", "calloc", 0x0, VS80::crtd_calloc, + "msvcr80d.dll", "malloc", 0x0, VS80::crtd_malloc, + "msvcr80d.dll", "realloc", 0x0, VS80::crtd_realloc, + "msvcr80d.dll", scalar_new_name, 0x0, VS80::crtd_scalar_new, + "msvcr80d.dll", vector_new_name, 0x0, VS80::crtd_vector_new, + "msvcr90d.dll", "_calloc_dbg", 0x0, VS90::crtd__calloc_dbg, + "msvcr90d.dll", "_malloc_dbg", 0x0, VS90::crtd__malloc_dbg, + "msvcr90d.dll", "_realloc_dbg", 0x0, VS90::crtd__realloc_dbg, + "msvcr90d.dll", scalar_new_dbg_name, 0x0, VS90::crtd__scalar_new_dbg, + "msvcr90d.dll", vector_new_dbg_name, 0x0, VS90::crtd__vector_new_dbg, + "msvcr90d.dll", "calloc", 0x0, VS90::crtd_calloc, + "msvcr90d.dll", "malloc", 0x0, VS90::crtd_malloc, + "msvcr90d.dll", "realloc", 0x0, VS90::crtd_realloc, + "msvcr90d.dll", scalar_new_name, 0x0, VS90::crtd_scalar_new, + "msvcr90d.dll", vector_new_name, 0x0, VS90::crtd_vector_new, + + // NT APIs. + "ntdll.dll", "RtlAllocateHeap", 0x0, _RtlAllocateHeap, + "ntdll.dll", "RtlFreeHeap", 0x0, _RtlFreeHeap, + "ntdll.dll", "RtlReAllocateHeap", 0x0, _RtlReAllocateHeap, + + // COM heap APIs. + "ole32.dll", "CoGetMalloc", 0x0, _CoGetMalloc, + "ole32.dll", "CoTaskMemAlloc", 0x0, _CoTaskMemAlloc, + "ole32.dll", "CoTaskMemRealloc", 0x0, _CoTaskMemRealloc +}; + +// Constructor - Initializes private data, loads configuration options, and +// attaches Visual Leak Detector to all other modules loaded into the current +// process. +// +VisualLeakDetector::VisualLeakDetector () +{ + WCHAR bom = BOM; // Unicode byte-order mark. + HMODULE kernel32; + ModuleSet *newmodules; + HMODULE ntdll; + LPWSTR symbolpath; + + // Initialize configuration options and related private data. + _wcsnset_s(m_forcedmodulelist, MAXMODULELISTLENGTH, '\0', _TRUNCATE); + m_maxdatadump = 0xffffffff; + m_maxtraceframes = 0xffffffff; + m_options = 0x0; + m_reportfile = NULL; + wcsncpy_s(m_reportfilepath, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); + m_status = 0x0; + + // Load configuration options. + configure(); + if (m_options & VLD_OPT_VLDOFF) { + report(L"Visual Leak Detector is turned off.\n"); + return; + } + + kernel32 = GetModuleHandle(L"kernel32.dll"); + ntdll = GetModuleHandle(L"ntdll.dll"); + + // Initialize global variables. + currentprocess = GetCurrentProcess(); + currentthread = GetCurrentThread(); + InitializeCriticalSection(&imagelock); + LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); + processheap = GetProcessHeap(); + RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); + RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); + RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); + InitializeCriticalSection(&stackwalklock); + InitializeCriticalSection(&symbollock); + vldheap = HeapCreate(0x0, 0, 0); + InitializeCriticalSection(&vldheaplock); + + // Initialize remaining private data. + m_heapmap = new HeapMap; + m_heapmap->reserve(HEAPMAPRESERVE); + m_imalloc = NULL; + m_leaksfound = 0; + m_loadedmodules = NULL; + InitializeCriticalSection(&m_loaderlock); + InitializeCriticalSection(&m_maplock); + InitializeCriticalSection(&m_moduleslock); + m_selftestfile = __FILE__; + m_selftestline = 0; + m_tlsindex = TlsAlloc(); + InitializeCriticalSection(&m_tlslock); + m_tlsset = new TlsSet; + + if (m_options & VLD_OPT_SELF_TEST) { + // Self-test mode has been enabled. Intentionally leak a small amount of + // memory so that memory leak self-checking can be verified. + if (m_options & VLD_OPT_UNICODE_REPORT) { + wcsncpy_s(new WCHAR [wcslen(SELFTESTTEXTW) + 1], wcslen(SELFTESTTEXTW) + 1, SELFTESTTEXTW, _TRUNCATE); + m_selftestline = __LINE__ - 1; + } + else { + strncpy_s(new CHAR [strlen(SELFTESTTEXTA) + 1], strlen(SELFTESTTEXTA) + 1, SELFTESTTEXTA, _TRUNCATE); + m_selftestline = __LINE__ - 1; + } + } + if (m_options & VLD_OPT_START_DISABLED) { + // Memory leak detection will initially be disabled. + m_status |= VLD_STATUS_NEVER_ENABLED; + } + if (m_options & VLD_OPT_REPORT_TO_FILE) { + // Reporting to file enabled. + if (m_options & VLD_OPT_UNICODE_REPORT) { + // Unicode data encoding has been enabled. Write the byte-order + // mark before anything else gets written to the file. Open the + // file for binary writing. + if (_wfopen_s(&m_reportfile, m_reportfilepath, L"wb") == EINVAL) { + // Couldn't open the file. + m_reportfile = NULL; + } + else { + fwrite(&bom, sizeof(WCHAR), 1, m_reportfile); + setreportencoding(unicode); + } + } + else { + // Open the file in text mode for ASCII output. + if (_wfopen_s(&m_reportfile, m_reportfilepath, L"w") == EINVAL) { + // Couldn't open the file. + m_reportfile = NULL; + } + else { + setreportencoding(ascii); + } + } + if (m_reportfile == NULL) { + report(L"WARNING: Visual Leak Detector: Couldn't open report file for writing: %s\n" + L" The report will be sent to the debugger instead.\n", m_reportfilepath); + } + else { + // Set the "report" function to write to the file. + setreportfile(m_reportfile, m_options & VLD_OPT_REPORT_TO_DEBUGGER); + } + } + if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { + // Insert a slight delay between messages sent to the debugger for + // output. (For working around a bug in VC6 where data sent to the + // debugger gets lost if it's sent too fast). + insertreportdelay(); + } + + // This is highly unlikely to happen, but just in case, check to be sure + // we got a valid TLS index. + if (m_tlsindex == TLS_OUT_OF_INDEXES) { + report(L"ERROR: Visual Leak Detector could not be installed because thread local" + L" storage could not be allocated."); + return; + } + + // Initialize the symbol handler. We use it for obtaining source file/line + // number information and function names for the memory leak report. + symbolpath = buildsymbolsearchpath(); + SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_UNDNAME); + if (!SymInitializeW(currentprocess, symbolpath, FALSE)) { + report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" + L" File and function names will probably not be available in call stacks.\n", GetLastError()); + } + delete [] symbolpath; + + // Patch into kernel32.dll's calls to LdrLoadDll so that VLD can + // dynamically attach to new modules loaded during runtime. + patchimport(kernel32, ntdll, "ntdll.dll", "LdrLoadDll", _LdrLoadDll); + + // Attach Visual Leak Detector to every module loaded in the process. + newmodules = new ModuleSet; + newmodules->reserve(MODULESETRESERVE); + EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); + attachtoloadedmodules(newmodules); + m_loadedmodules = newmodules; + m_status |= VLD_STATUS_INSTALLED; + + report(L"Visual Leak Detector Version " VLDVERSION L" installed.\n"); + if (m_status & VLD_STATUS_FORCE_REPORT_TO_FILE) { + // The report is being forced to a file. Let the human know why. + report(L"NOTE: Visual Leak Detector: Unicode-encoded reporting has been enabled, but the\n" + L" debugger is the only selected report destination. The debugger cannot display\n" + L" Unicode characters, so the report will also be sent to a file. If no file has\n" + L" been specified, the default file name is \"" VLD_DEFAULT_REPORT_FILE_NAME L"\".\n"); + + } + reportconfig(); +} + +// Destructor - Detaches Visual Leak Detector from all modules loaded in the +// process, frees internally allocated resources, and generates the memory +// leak report. +// +VisualLeakDetector::~VisualLeakDetector () +{ + BlockMap::Iterator blockit; + BlockMap *blockmap; + size_t count; + vldblockheader_t *header; + HANDLE heap; + HeapMap::Iterator heapit; + SIZE_T internalleaks = 0; + const char *leakfile = NULL; + WCHAR leakfilew [MAX_PATH]; + int leakline = 0; + ModuleSet::Iterator moduleit; + HANDLE thread; + BOOL threadsactive= FALSE; + TlsSet::Iterator tlsit; + DWORD dwCurProcessID; + + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + if (m_status & VLD_STATUS_INSTALLED) { + // Detach Visual Leak Detector from all previously attached modules. + EnumerateLoadedModulesW64(currentprocess, detachfrommodule, NULL); + + dwCurProcessID = GetCurrentProcessId(); + + // See if any threads that have ever entered VLD's code are still active. + EnterCriticalSection(&m_tlslock); + for (tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { + if ((*tlsit)->threadid == GetCurrentThreadId()) { + // Don't wait for the current thread to exit. + continue; + } + + thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit)->threadid); + if (thread == NULL) { + // Couldn't query this thread. We'll assume that it exited. + continue; // XXX should we check GetLastError()? + } + if (GetProcessIdOfThread(thread) != dwCurProcessID) { + //The thread ID has been recycled. + CloseHandle(thread); + continue; + } + while (WaitForSingleObject(thread, 10000) == WAIT_TIMEOUT) { // 10 seconds + // There is still at least one other thread running. The CRT + // will stomp it dead when it cleans up, which is not a + // graceful way for a thread to go down. Warn about this, + // and wait until the thread has exited so that we know it + // can't still be off running somewhere in VLD's code. + // + // Since we've been waiting a while, let the human know we are + // still here and alive. + threadsactive = TRUE; + report(L"Visual Leak Detector: Waiting for threads to terminate...\n"); + } + CloseHandle(thread); + } + LeaveCriticalSection(&m_tlslock); + + if (m_status & VLD_STATUS_NEVER_ENABLED) { + // Visual Leak Detector started with leak detection disabled and + // it was never enabled at runtime. A lot of good that does. + report(L"WARNING: Visual Leak Detector: Memory leak detection was never enabled.\n"); + } + else { + // Generate a memory leak report for each heap in the process. + for (heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + heap = (*heapit).first; + reportleaks(heap); + } + + // Show a summary. + if (m_leaksfound == 0) { + report(L"No memory leaks detected.\n"); + } + else { + report(L"Visual Leak Detector detected %lu memory leak", m_leaksfound); + report((m_leaksfound > 1) ? L"s.\n" : L".\n"); + } + } + + // Free resources used by the symbol handler. + if (!SymCleanup(currentprocess)) { + report(L"WARNING: Visual Leak Detector: The symbol handler failed to deallocate resources (error=%lu).\n", + GetLastError()); + } + + // Free internally allocated resources used by the heapmap and blockmap. + for (heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + blockmap = &(*heapit).second->blockmap; + for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + delete (*blockit).second->callstack; + delete (*blockit).second; + } + delete blockmap; + } + delete m_heapmap; + + // Free internally allocated resources used by the loaded module set. + for (moduleit = m_loadedmodules->begin(); moduleit != m_loadedmodules->end(); ++moduleit) { + delete (*moduleit).name; + delete (*moduleit).path; + } + delete m_loadedmodules; + + // Free internally allocated resources used for thread local storage. + for (tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { + delete *tlsit; + } + delete m_tlsset; + + // Do a memory leak self-check. + header = vldblocklist; + while (header) { + // Doh! VLD still has an internally allocated block! + // This won't ever actually happen, right guys?... guys? + internalleaks++; + leakfile = header->file; + leakline = header->line; + mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); + report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); + report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, + VLDBLOCKDATA(header), header->size); + report(L" Call Stack:\n"); + report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); + if (m_maxdatadump != 0) { + report(L" Data:\n"); + if (m_options & VLD_OPT_UNICODE_REPORT) { + dumpmemoryw(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); + } + else { + dumpmemorya(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); + } + } + report(L"\n"); + header = header->next; + } + if (m_options & VLD_OPT_SELF_TEST) { + if ((internalleaks == 1) && (strcmp(leakfile, m_selftestfile) == 0) && (leakline == m_selftestline)) { + report(L"Visual Leak Detector passed the memory leak self-test.\n"); + } + else { + report(L"ERROR: Visual Leak Detector: Failed the memory leak self-test.\n"); + } + } + + if (threadsactive == TRUE) { + report(L"WARNING: Visual Leak Detector: Some threads appear to have not terminated normally.\n" + L" This could cause inaccurate leak detection results, including false positives.\n"); + } + report(L"Visual Leak Detector is now exiting.\n"); + } + else { + // VLD failed to load properly. + delete m_heapmap; + delete m_tlsset; + } + HeapDestroy(vldheap); + + DeleteCriticalSection(&imagelock); + DeleteCriticalSection(&m_loaderlock); + DeleteCriticalSection(&m_maplock); + DeleteCriticalSection(&m_moduleslock); + DeleteCriticalSection(&stackwalklock); + DeleteCriticalSection(&symbollock); + DeleteCriticalSection(&vldheaplock); + + if (m_tlsindex != TLS_OUT_OF_INDEXES) { + TlsFree(m_tlsindex); + } + + if (m_reportfile != NULL) { + fclose(m_reportfile); + } +} + + +//////////////////////////////////////////////////////////////////////////////// +// +// Private Leak Detection Functions +// +//////////////////////////////////////////////////////////////////////////////// + +// attachtoloadedmodules - Attaches VLD to all modules contained in the provided +// ModuleSet. Not all modules are in the ModuleSet will actually be included +// in leak detection. Only modules that import the global VisualLeakDetector +// class object, or those that are otherwise explicitly included in leak +// detection, will be checked for memory leaks. +// +// When VLD attaches to a module, it means that any of the imports listed in +// the import patch table which are imported by the module, will be redirected +// to VLD's designated replacements. +// +// - newmodules (IN): Pointer to a ModuleSet containing information about any +// loaded modules that need to be attached. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) +{ + size_t count; + DWORD64 modulebase; + UINT32 moduleflags; + IMAGEHLP_MODULE64 moduleimageinfo; + LPCSTR modulename; +#define MAXMODULENAME (_MAX_FNAME + _MAX_EXT) + WCHAR modulenamew [MAXMODULENAME]; + LPCSTR modulepath; + DWORD modulesize; + ModuleSet::Iterator newit; + ModuleSet::Iterator oldit; + ModuleSet *oldmodules; + BOOL refresh; + UINT tablesize = sizeof(m_patchtable) / sizeof(patchentry_t); + ModuleSet::Muterator updateit; + + // Iterate through the supplied set, until all modules have been attached. + for (newit = newmodules->begin(); newit != newmodules->end(); ++newit) { + modulebase = (DWORD64)(*newit).addrlow; + moduleflags = 0x0; + modulename = (*newit).name; + modulepath = (*newit).path; + modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; + + refresh = FALSE; + EnterCriticalSection(&m_moduleslock); + oldmodules = m_loadedmodules; + if (oldmodules != NULL) { + // This is not the first time we have been called to attach to the + // currently loaded modules. + oldit = oldmodules->find(*newit); + if (oldit != oldmodules->end()) { + // We've seen this "new" module loaded in the process before. + moduleflags = (*oldit).flags; + LeaveCriticalSection(&m_moduleslock); + if (moduleispatched((HMODULE)modulebase, m_patchtable, tablesize)) { + // This module is already attached. Just update the module's + // flags, nothing more. + updateit = newit; + (*updateit).flags = moduleflags; + continue; + } + else { + // This module may have been attached before and has been + // detached. We'll need to try reattaching to it in case it + // was unloaded and then subsequently reloaded. + refresh = TRUE; + } + } + else { + LeaveCriticalSection(&m_moduleslock); + } + } + else { + LeaveCriticalSection(&m_moduleslock); + } + + EnterCriticalSection(&symbollock); + if ((refresh == TRUE) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { + // Discard the previously loaded symbols, so we can refresh them. + if (SymUnloadModule64(currentprocess, modulebase) == FALSE) { + report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" + L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); + } + } + + // Try to load the module's symbols. This ensures that we have loaded + // the symbols for every module that has ever been loaded into the + // process, guaranteeing the symbols' availability when generating the + // leak report. + moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); + if ((SymGetModuleInfoW64(currentprocess, (DWORD64)modulebase, &moduleimageinfo) == TRUE) || + ((SymLoadModule64(currentprocess, NULL, modulepath, NULL, modulebase, modulesize) == modulebase) && + (SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo) == TRUE))) { + moduleflags |= VLD_MODULE_SYMBOLSLOADED; + } + LeaveCriticalSection(&symbollock); + + if (_stricmp("vld.dll", modulename) == 0) { + // What happens when a module goes through it's own portal? Bad things. + // Like infinite recursion. And ugly bald men wearing dresses. VLD + // should not, therefore, attach to itself. + continue; + } + + mbstowcs_s(&count, modulenamew, MAXMODULENAME, modulename, _TRUNCATE); + if ((findimport((HMODULE)modulebase, m_vldbase, "vld.dll", "?vld@@3VVisualLeakDetector@@A") == FALSE) && + (wcsstr(vld.m_forcedmodulelist, modulenamew) == NULL)) { + // This module does not import VLD. This means that none of the module's + // sources #included vld.h. Exclude this module from leak detection. + moduleflags |= VLD_MODULE_EXCLUDED; + } + else if (!(moduleflags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { + // This module is going to be included in leak detection, but complete + // symbols for this module couldn't be loaded. This means that any stack + // traces through this module may lack information, like line numbers + // and function names. + report(L"WARNING: Visual Leak Detector: A module, %s, included in memory leak detection\n" + L" does not have any debugging symbols available, or they could not be located.\n" + L" Function names and/or line numbers for this module may not be available.\n", modulename); + } + + // Update the module's flags in the "new modules" set. + updateit = newit; + (*updateit).flags = moduleflags; + + // Attach to the module. + patchmodule((HMODULE)modulebase, m_patchtable, tablesize); + } +} + +// buildsymbolsearchpath - Builds the symbol search path for the symbol handler. +// This helps the symbol handler find the symbols for the application being +// debugged. +// +// Return Value: +// +// Returns a string containing the search path. The caller is responsible for +// freeing the string. +// +LPWSTR VisualLeakDetector::buildsymbolsearchpath () +{ + WCHAR directory [_MAX_DIR]; + WCHAR drive [_MAX_DRIVE]; + LPWSTR env; + DWORD envlen; + SIZE_T index; + SIZE_T length; + HMODULE module; + LPWSTR path = new WCHAR [MAX_PATH]; + SIZE_T pos = 0; + WCHAR system [MAX_PATH]; + WCHAR windows [MAX_PATH]; + + // Oddly, the symbol handler ignores the link to the PDB embedded in the + // executable image. So, we'll manually add the location of the executable + // to the search path since that is often where the PDB will be located. + path[0] = L'\0'; + module = GetModuleHandle(NULL); + GetModuleFileName(module, path, MAX_PATH); + _wsplitpath_s(path, drive, _MAX_DRIVE, directory, _MAX_DIR, NULL, 0, NULL, 0); + wcsncpy_s(path, MAX_PATH, drive, _TRUNCATE); + strapp(&path, directory); + + // When the symbol handler is given a custom symbol search path, it will no + // longer search the default directories (working directory, system root, + // etc). But we'd like it to still search those directories, so we'll add + // them to our custom search path. + // + // Append the working directory. + strapp(&path, L";.\\"); + + // Append the Windows directory. + if (GetWindowsDirectory(windows, MAX_PATH) != 0) { + strapp(&path, L";"); + strapp(&path, windows); + } + + // Append the system directory. + if (GetSystemDirectory(system, MAX_PATH) != 0) { + strapp(&path, L";"); + strapp(&path, system); + } + + // Append %_NT_SYMBOL_PATH%. + envlen = GetEnvironmentVariable(L"_NT_SYMBOL_PATH", NULL, 0); + if (envlen != 0) { + env = new WCHAR [envlen]; + if (GetEnvironmentVariable(L"_NT_SYMBOL_PATH", env, envlen) != 0) { + strapp(&path, L";"); + strapp(&path, env); + } + delete [] env; + } + + // Append %_NT_ALT_SYMBOL_PATH%. + envlen = GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", NULL, 0); + if (envlen != 0) { + env = new WCHAR [envlen]; + if (GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", env, envlen) != 0) { + strapp(&path, L";"); + strapp(&path, env); + } + delete [] env; + } + + // Remove any quotes from the path. The symbol handler doesn't like them. + pos = 0; + length = wcslen(path); + while (pos < length) { + if (path[pos] == L'\"') { + for (index = pos; index < length; index++) { + path[index] = path[index + 1]; + } + } + pos++; + } + + return path; +} + +// configure - Configures VLD using values read from the vld.ini file. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::configure () +{ +#define BSIZE 64 + WCHAR buffer [BSIZE]; + WCHAR filename [MAX_PATH]; + WCHAR inipath [MAX_PATH]; + BOOL keyopen = FALSE; + DWORD length; + HKEY productkey; + LONG regstatus; + struct _stat s; + DWORD valuetype; + + if (_wstat(L".\\vld.ini", &s) == 0) { + // Found a copy of vld.ini in the working directory. Use it. + wcsncpy_s(inipath, MAX_PATH, L".\\vld.ini", _TRUNCATE); + } + else { + // Get the location of the vld.ini file from the registry. + regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + if (regstatus == ERROR_SUCCESS) { + keyopen = TRUE; + regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); + } + if (keyopen) { + RegCloseKey(productkey); + } + if ((regstatus != ERROR_SUCCESS) || (_wstat(inipath, &s) != 0)) { + // The location of vld.ini could not be read from the registry. As a + // last resort, look in the Windows directory. + wcsncpy_s(inipath, MAX_PATH, L"vld.ini", _TRUNCATE); + } + } + + // Read the boolean options. + GetPrivateProfileString(L"Options", L"VLD", L"on", buffer, BSIZE, inipath); + if (strtobool(buffer) == FALSE) { + m_options |= VLD_OPT_VLDOFF; + return; + } + + GetPrivateProfileString(L"Options", L"AggregateDuplicates", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_AGGREGATE_DUPLICATES; + } + + GetPrivateProfileString(L"Options", L"SelfTest", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_SELF_TEST; + } + + GetPrivateProfileString(L"Options", L"SlowDebuggerDump", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_SLOW_DEBUGGER_DUMP; + } + + GetPrivateProfileString(L"Options", L"StartDisabled", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_START_DISABLED; + } + + GetPrivateProfileString(L"Options", L"TraceInternalFrames", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_TRACE_INTERNAL_FRAMES; + } + + // Read the integer configuration options. + m_maxdatadump = GetPrivateProfileInt(L"Options", L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); + m_maxtraceframes = GetPrivateProfileInt(L"Options", L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); + if (m_maxtraceframes < 1) { + m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; + } + + // Read the force-include module list. + GetPrivateProfileString(L"Options", L"ForceIncludeModules", L"", m_forcedmodulelist, MAXMODULELISTLENGTH, inipath); + _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); + + // Read the report destination (debugger, file, or both). + GetPrivateProfileString(L"Options", L"ReportFile", L"", filename, MAX_PATH, inipath); + if (wcslen(filename) == 0) { + wcsncpy_s(filename, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); + } + _wfullpath(m_reportfilepath, filename, MAX_PATH); + GetPrivateProfileString(L"Options", L"ReportTo", L"", buffer, BSIZE, inipath); + if (_wcsicmp(buffer, L"both") == 0) { + m_options |= (VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE); + } + else if (_wcsicmp(buffer, L"file") == 0) { + m_options |= VLD_OPT_REPORT_TO_FILE; + } + else { + m_options |= VLD_OPT_REPORT_TO_DEBUGGER; + } + + // Read the report file encoding (ascii or unicode). + GetPrivateProfileString(L"Options", L"ReportEncoding", L"", buffer, BSIZE, inipath); + if (_wcsicmp(buffer, L"unicode") == 0) { + m_options |= VLD_OPT_UNICODE_REPORT; + } + if ((m_options & VLD_OPT_UNICODE_REPORT) && !(m_options & VLD_OPT_REPORT_TO_FILE)) { + // If Unicode report encoding is enabled, then the report needs to be + // sent to a file because the debugger will not display Unicode + // characters, it will display question marks in their place instead. + m_options |= VLD_OPT_REPORT_TO_FILE; + m_status |= VLD_STATUS_FORCE_REPORT_TO_FILE; + } + + // Read the stack walking method. + GetPrivateProfileString(L"Options", L"StackWalkMethod", L"", buffer, BSIZE, inipath); + if (_wcsicmp(buffer, L"safe") == 0) { + m_options |= VLD_OPT_SAFE_STACK_WALK; + } +} + +// enabled - Determines if memory leak detection is enabled for the current +// thread. +// +// Return Value: +// +// Returns true if Visual Leak Detector is enabled for the current thread. +// Otherwise, returns false. +// +BOOL VisualLeakDetector::enabled () +{ + tls_t *tls = vld.gettls(); + + if (!(m_status & VLD_STATUS_INSTALLED)) { + // Memory leak detection is not yet enabled because VLD is still + // initializing. + return FALSE; + } + + if (!(tls->flags & VLD_TLS_DISABLED) && !(tls->flags & VLD_TLS_ENABLED)) { + // The enabled/disabled state for the current thread has not been + // initialized yet. Use the default state. + if (m_options & VLD_OPT_START_DISABLED) { + tls->flags |= VLD_TLS_DISABLED; + } + else { + tls->flags |= VLD_TLS_ENABLED; + } + } + + return ((tls->flags & VLD_TLS_ENABLED) != 0); +} + +// eraseduplicates - Erases, from the block maps, blocks that appear to be +// duplicate leaks of an already identified leak. +// +// - element (IN): BlockMap Iterator referencing the block of which to search +// for duplicates. +// +// Return Value: +// +// Returns the number of duplicate blocks erased from the block map. +// +SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) +{ + BlockMap::Iterator blockit; + BlockMap *blockmap; + blockinfo_t *elementinfo; + SIZE_T erased = 0; + HeapMap::Iterator heapit; + blockinfo_t *info; + BlockMap::Iterator previt; + + elementinfo = (*element).second; + + // Iteratate through all block maps, looking for blocks with the same size + // and callstack as the specified element. + for (heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + blockmap = &(*heapit).second->blockmap; + for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + if (blockit == element) { + // Don't delete the element of which we are searching for + // duplicates. + continue; + } + info = (*blockit).second; + if ((info->size == elementinfo->size) && (*(info->callstack) == *(elementinfo->callstack))) { + // Found a duplicate. Erase it. + delete info->callstack; + delete info; + previt = blockit - 1; + blockmap->erase(blockit); + blockit = previt; + erased++; + } + } + } + + return erased; +} + +// gettls - Obtains the thread local storage structure for the calling thread. +// +// Return Value: +// +// Returns a pointer to the thread local storage structure. (This function +// always succeeds). +// +tls_t* VisualLeakDetector::gettls () +{ + tls_t *tls; + + // Get the pointer to this thread's thread local storage structure. + tls = (tls_t*)TlsGetValue(m_tlsindex); + assert(GetLastError() == ERROR_SUCCESS); + + if (tls == NULL) { + // This thread's thread local storage structure has not been allocated. + tls = new tls_t; + TlsSetValue(m_tlsindex, tls); + tls->addrofra = 0x0; + tls->flags = 0x0; + tls->threadid = GetCurrentThreadId(); + + // Add this thread's TLS to the TlsSet. + EnterCriticalSection(&m_tlslock); + m_tlsset->insert(tls); + LeaveCriticalSection(&m_tlslock); + } + + return tls; +} + +// mapblock - Tracks memory allocations. Information about allocated blocks is +// collected and then the block is mapped to this information. +// +// - heap (IN): Handle to the heap from which the block has been allocated. +// +// - mem (IN): Pointer to the memory block being allocated. +// +// - size (IN): Size, in bytes, of the memory block being allocated. +// +// - addrOfRetAddr (IN): Address of return address at the time this allocation +// first entered VLD's code. This is used from determining the starting +// point for the stack trace. +// +// - crtalloc (IN): Should be set to TRUE if this allocation is a CRT memory +// block. Otherwise should be FALSE. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, UINT_PTR* addrOfRetAddr, BOOL crtalloc) +{ + blockinfo_t *blockinfo; + BlockMap::Iterator blockit; + BlockMap *blockmap; + HeapMap::Iterator heapit; + static SIZE_T serialnumber = 0; + + // Record the block's information. + blockinfo = new blockinfo_t; + if (m_options & VLD_OPT_SAFE_STACK_WALK) { + blockinfo->callstack = new SafeCallStack; + } + else { + blockinfo->callstack = new FastCallStack; + } + if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { + // Passing NULL for the frame pointer argument will force the stack + // trace to begin at the current frame. + blockinfo->callstack->getstacktrace(m_maxtraceframes, NULL); + } + else { + // Start the stack trace at the call that first entered VLD's code. + blockinfo->callstack->getstacktrace(m_maxtraceframes, (addrOfRetAddr - 1)); + } + blockinfo->serialnumber = serialnumber++; + blockinfo->size = size; + + // Insert the block's information into the block map. + EnterCriticalSection(&m_maplock); + heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // We haven't mapped this heap to a block map yet. Do it now. + mapheap(heap); + heapit = m_heapmap->find(heap); + assert(heapit != m_heapmap->end()); + } + if (crtalloc == TRUE) { + // The heap that this block was allocated from is a CRT heap. + (*heapit).second->flags |= VLD_HEAP_CRT; + } + blockmap = &(*heapit).second->blockmap; + blockit = blockmap->insert(mem, blockinfo); + if (blockit == blockmap->end()) { + // A block with this address has already been allocated. The + // previously allocated block must have been freed (probably by some + // mechanism unknown to VLD), or the heap wouldn't have allocated it + // again. Replace the previously allocated info with the new info. + blockit = blockmap->find(mem); + delete (*blockit).second->callstack; + delete (*blockit).second; + blockmap->erase(blockit); + blockmap->insert(mem, blockinfo); + } + LeaveCriticalSection(&m_maplock); +} + +// mapheap - Tracks heap creation. Creates a block map for tracking individual +// allocations from the newly created heap and then maps the heap to this +// block map. +// +// - heap (IN): Handle to the newly created heap. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::mapheap (HANDLE heap) +{ + heapinfo_t *heapinfo; + HeapMap::Iterator heapit; + + // Create a new block map for this heap and insert it into the heap map. + heapinfo = new heapinfo_t; + heapinfo->blockmap.reserve(BLOCKMAPRESERVE); + heapinfo->flags = 0x0; + EnterCriticalSection(&m_maplock); + heapit = m_heapmap->insert(heap, heapinfo); + if (heapit == m_heapmap->end()) { + // Somehow this heap has been created twice without being destroyed, + // or at least it was destroyed without VLD's knowledge. Unmap the heap + // from the existing heapinfo, and remap it to the new one. + report(L"WARNING: Visual Leak Detector detected a duplicate heap (" ADDRESSFORMAT L").\n", heap); + heapit = m_heapmap->find(heap); + unmapheap((*heapit).first); + m_heapmap->insert(heap, heapinfo); + } + LeaveCriticalSection(&m_maplock); +} + +// remapblock - Tracks reallocations. Unmaps a block from its previously +// collected information and remaps it to updated information. +// +// Note: If the block itself remains at the same address, then the block's +// information can simply be updated rather than having to actually erase and +// reinsert the block. +// +// - heap (IN): Handle to the heap from which the memory is being reallocated. +// +// - mem (IN): Pointer to the memory block being reallocated. +// +// - newmem (IN): Pointer to the memory block being returned to the caller +// that requested the reallocation. This pointer may or may not be the same +// as the original memory block (as pointed to by "mem"). +// +// - size (IN): Size, in bytes, of the new memory block. +// +// - framepointer (IN): The frame pointer at which this reallocation entered +// VLD's code. Used for determining the starting point of the stack trace. +// +// - crtalloc (IN): Should be set to TRUE if this reallocation is for a CRT +// memory block. Otherwise should be set to FALSE. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, UINT_PTR* framepointer, + BOOL crtalloc) +{ + BlockMap::Iterator blockit; + BlockMap *blockmap; + HeapMap::Iterator heapit; + blockinfo_t *info; + + if (newmem != mem) { + // The block was not reallocated in-place. Instead the old block was + // freed and a new block allocated to satisfy the new size. + unmapblock(heap, mem); + mapblock(heap, newmem, size, framepointer, crtalloc); + return; + } + + // The block was reallocated in-place. Find the existing blockinfo_t + // entry in the block map and update it with the new callstack and size. + EnterCriticalSection(&m_maplock); + heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // We haven't mapped this heap to a block map yet. Obviously the + // block has also not been mapped to a blockinfo_t entry yet either, + // so treat this reallocation as a brand-new allocation (this will + // also map the heap to a new block map). + mapblock(heap, newmem, size, framepointer, crtalloc); + LeaveCriticalSection(&m_maplock); + return; + } + + // Find the block's blockinfo_t structure so that we can update it. + blockmap = &(*heapit).second->blockmap; + blockit = blockmap->find(mem); + if (blockit == blockmap->end()) { + // The block hasn't been mapped to a blockinfo_t entry yet. + // Treat this reallocation as a new allocation. + mapblock(heap, newmem, size, framepointer, crtalloc); + LeaveCriticalSection(&m_maplock); + return; + } + + // Found the blockinfo_t entry for this block. Update it with + // a new callstack and new size. + info = (*blockit).second; + info->callstack->clear(); + if (crtalloc) { + // The heap that this block was allocated from is a CRT heap. + (*heapit).second->flags |= VLD_HEAP_CRT; + } + LeaveCriticalSection(&m_maplock); + + // Update the block's callstack and size. + if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { + // Passing NULL for the frame pointer argument will force + // the stack trace to begin at the current frame. + info->callstack->getstacktrace(m_maxtraceframes, NULL); + } + else { + // Start the stack trace at the call that first entered + // VLD's code. + info->callstack->getstacktrace(m_maxtraceframes, (framepointer - 1)); + } + info->size = size; +} + +// reportconfig - Generates a brief report summarizing Visual Leak Detector's +// configuration, as loaded from the vld.ini file. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::reportconfig () +{ + if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { + report(L" Aggregating duplicate leaks.\n"); + } + if (wcslen(m_forcedmodulelist) != 0) { + report(L" Forcing inclusion of these modules in leak detection: %s\n", m_forcedmodulelist); + } + if (m_maxdatadump != VLD_DEFAULT_MAX_DATA_DUMP) { + if (m_maxdatadump == 0) { + report(L" Suppressing data dumps.\n"); + } + else { + report(L" Limiting data dumps to %lu bytes.\n", m_maxdatadump); + } + } + if (m_maxtraceframes != VLD_DEFAULT_MAX_TRACE_FRAMES) { + report(L" Limiting stack traces to %u frames.\n", m_maxtraceframes); + } + if (m_options & VLD_OPT_UNICODE_REPORT) { + report(L" Generating a Unicode (UTF-16) encoded report.\n"); + } + if (m_options & VLD_OPT_REPORT_TO_FILE) { + if (m_options & VLD_OPT_REPORT_TO_DEBUGGER) { + report(L" Outputting the report to the debugger and to %s\n", m_reportfilepath); + } + else { + report(L" Outputting the report to %s\n", m_reportfilepath); + } + } + if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { + report(L" Outputting the report to the debugger at a slower rate.\n"); + } + if (m_options & VLD_OPT_SAFE_STACK_WALK) { + report(L" Using the \"safe\" (but slow) stack walking method.\n"); + } + if (m_options & VLD_OPT_SELF_TEST) { + report(L" Perfoming a memory leak self-test.\n"); + } + if (m_options & VLD_OPT_START_DISABLED) { + report(L" Starting with memory leak detection disabled.\n"); + } + if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { + report(L" Including heap and VLD internal frames in stack traces.\n"); + } +} + +// reportleaks - Generates a memory leak report for the specified heap. +// +// - heap (IN): Handle to the heap for which to generate a memory leak +// report. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::reportleaks (HANDLE heap) +{ + LPCVOID address; + LPCVOID block; + BlockMap::Iterator blockit; + BlockMap *blockmap; + crtdbgblockheader_t *crtheader; + SIZE_T duplicates; + heapinfo_t *heapinfo; + HeapMap::Iterator heapit; + blockinfo_t *info; + SIZE_T size; + + // Find the heap's information (blockmap, etc). + EnterCriticalSection(&m_maplock); + heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // Nothing is allocated from this heap. No leaks. + LeaveCriticalSection(&m_maplock); + return; + } + + heapinfo = (*heapit).second; + blockmap = &heapinfo->blockmap; + for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + // Found a block which is still in the BlockMap. We've identified a + // potential memory leak. + block = (*blockit).first; + info = (*blockit).second; + address = block; + size = info->size; + if (heapinfo->flags & VLD_HEAP_CRT) { + // This block is allocated to a CRT heap, so the block has a CRT + // memory block header prepended to it. + crtheader = (crtdbgblockheader_t*)block; + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { + // This block is marked as being used internally by the CRT. + // The CRT will free the block after VLD is destroyed. + continue; + } + // The CRT header is more or less transparent to the user, so + // the information about the contained block will probably be + // more useful to the user. Accordingly, that's the information + // we'll include in the report. + address = CRTDBGBLOCKDATA(block); + size = crtheader->size; + } + // It looks like a real memory leak. + if (m_leaksfound == 0) { + report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); + } + m_leaksfound++; + report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialnumber, address, size); + if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { + // Aggregate all other leaks which are duplicates of this one + // under this same heading, to cut down on clutter. + duplicates = eraseduplicates(blockit); + if (duplicates) { + report(L"A total of %lu leaks match this size and call stack. Showing only the first one.\n", + duplicates + 1); + m_leaksfound += duplicates; + } + } + // Dump the call stack. + report(L" Call Stack:\n"); + info->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + // Dump the data in the user data section of the memory block. + if (m_maxdatadump != 0) { + report(L" Data:\n"); + if (m_options & VLD_OPT_UNICODE_REPORT) { + dumpmemoryw(address, (m_maxdatadump < size) ? m_maxdatadump : size); + } + else { + dumpmemorya(address, (m_maxdatadump < size) ? m_maxdatadump : size); + } + } + report(L"\n"); + } + + LeaveCriticalSection(&m_maplock); +} + +// unmapblock - Tracks memory blocks that are freed. Unmaps the specified block +// from the block's information, relinquishing internally allocated resources. +// +// - heap (IN): Handle to the heap to which this block is being freed. +// +// - mem (IN): Pointer to the memory block being freed. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) +{ + BlockMap::Iterator blockit; + BlockMap *blockmap; + HeapMap::Iterator heapit; + blockinfo_t *info; + + // Find this heap's block map. + EnterCriticalSection(&m_maplock); + heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // We don't have a block map for this heap. We must not have monitored + // this allocation (probably happened before VLD was initialized). + LeaveCriticalSection(&m_maplock); + return; + } + + // Find this block in the block map. + blockmap = &(*heapit).second->blockmap; + blockit = blockmap->find(mem); + if (blockit == blockmap->end()) { + // This block is not in the block map. We must not have monitored this + // allocation (probably happened before VLD was initialized). + LeaveCriticalSection(&m_maplock); + return; + } + + // Free the blockinfo_t structure and erase it from the block map. + info = (*blockit).second; + delete info->callstack; + delete info; + blockmap->erase(blockit); + LeaveCriticalSection(&m_maplock); +} + +// unmapheap - Tracks heap destruction. Unmaps the specified heap from its block +// map. The block map is cleared and deleted, relinquishing internally +// allocated resources. +// +// - heap (IN): Handle to the heap which is being destroyed. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::unmapheap (HANDLE heap) +{ + BlockMap::Iterator blockit; + BlockMap *blockmap; + heapinfo_t *heapinfo; + HeapMap::Iterator heapit; + + // Find this heap's block map. + EnterCriticalSection(&m_maplock); + heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // This heap hasn't been mapped. We must not have monitored this heap's + // creation (probably happened before VLD was initialized). + LeaveCriticalSection(&m_maplock); + return; + } + + // Free all of the blockinfo_t structures stored in the block map. + heapinfo = (*heapit).second; + blockmap = &heapinfo->blockmap; + for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + delete (*blockit).second->callstack; + delete (*blockit).second; + } + delete heapinfo; + + // Remove this heap's block map from the heap map. + m_heapmap->erase(heapit); + LeaveCriticalSection(&m_maplock); +} + + +//////////////////////////////////////////////////////////////////////////////// +// +// Static Leak Detection Functions (Callbacks) +// +//////////////////////////////////////////////////////////////////////////////// + +// addloadedmodule - Callback function for EnumerateLoadedModules64. This +// function records information about every module loaded in the process, +// each time adding the module's information to the provided ModuleSet (the +// "context" parameter). +// +// When EnumerateLoadedModules64 has finished calling this function for each +// loaded module, then the resulting ModuleSet can be used at any time to get +// information about any modules loaded into the process. +// +// - modulepath (IN): The fully qualified path from where the module was +// loaded. +// +// - modulebase (IN): The base address at which the module has been loaded. +// +// - modulesize (IN): The size, in bytes, of the loaded module. +// +// - context (IN): Pointer to the ModuleSet to which information about each +// module is to be added. +// +// Return Value: +// +// Always returns TRUE, which tells EnumerateLoadedModules64 to continue +// enumerating. +// +BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context) +{ + size_t count; + patchentry_t *entry; + CHAR extension [_MAX_EXT]; + CHAR filename [_MAX_FNAME]; + UINT index; + moduleinfo_t moduleinfo; + LPSTR modulenamea; + LPSTR modulepatha; + ModuleSet* newmodules = (ModuleSet*)context; + SIZE_T size; + UINT tablesize = sizeof(m_patchtable) / sizeof(patchentry_t); + + // Convert the module path to ASCII. + size = wcslen(modulepath) + 1; + modulepatha = new CHAR [size]; + wcstombs_s(&count, modulepatha, size, modulepath, _TRUNCATE); + + // Extract just the filename and extension from the module path. + _splitpath_s(modulepatha, NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); + size = strlen(filename) + strlen(extension) + 1; + modulenamea = new CHAR [size]; + strncpy_s(modulenamea, size, filename, _TRUNCATE); + strncat_s(modulenamea, size, extension, _TRUNCATE); + _strlwr_s(modulenamea, size); + + if (_stricmp(modulenamea, "vld.dll") == 0) { + // Record Visual Leak Detector's own base address. + vld.m_vldbase = (HMODULE)modulebase; + } + else { + // See if this is a module listed in the patch table. If it is, update + // the corresponding patch table entries' module base address. + for (index = 0; index < tablesize; index++) { + entry = &m_patchtable[index]; + if (_stricmp(entry->exportmodulename, modulenamea) == 0) { + entry->modulebase = (UINT_PTR)modulebase; + } + } + } + + // Record the module's information and store it in the set. + moduleinfo.addrlow = (UINT_PTR)modulebase; + moduleinfo.addrhigh = (UINT_PTR)(modulebase + modulesize) - 1; + moduleinfo.flags = 0x0; + moduleinfo.name = modulenamea; + moduleinfo.path = modulepatha; + newmodules->insert(moduleinfo); + + return TRUE; +} + +// detachfrommodule - Callback function for EnumerateLoadedModules64 that +// detaches Visual Leak Detector from the specified module. If the specified +// module has not previously been attached to, then calling this function will +// not actually result in any changes. +// +// - modulepath (IN): String containing the name, which may include a path, of +// the module to detach from (ignored). +// +// - modulebase (IN): Base address of the module. +// +// - modulesize (IN): Total size of the module (ignored). +// +// - context (IN): User-supplied context (ignored). +// +// Return Value: +// +// Always returns TRUE. +// +BOOL VisualLeakDetector::detachfrommodule (PCWSTR /*modulepath*/, DWORD64 modulebase, ULONG /*modulesize*/, + PVOID /*context*/) +{ + UINT tablesize = sizeof(m_patchtable) / sizeof(patchentry_t); + + restoremodule((HMODULE)modulebase, m_patchtable, tablesize); + + return TRUE; +} + + +//////////////////////////////////////////////////////////////////////////////// +// +// Standard CRT and MFC IAT Replacement Functions +// +// The addresses of these functions are not actually directly patched into the +// import address tables, but these functions do get indirectly called by the +// patch functions that are placed in the import address tables. +// +//////////////////////////////////////////////////////////////////////////////// + +// _calloc - This function is just a wrapper around the real calloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - pcalloc (IN): Pointer to the particular calloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - num (IN): The number of blocks, of size 'size', to be allocated. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned from the specified calloc. +// +void* VisualLeakDetector::_calloc (calloc_t pcalloc, + UINT_PTR* fp, + size_t num, + size_t size) +{ + void *block; + tls_t *tls = vld.gettls(); + + // malloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pcalloc(num, size); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// _malloc - This function is just a wrapper around the real malloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - pmalloc (IN): Pointer to the particular malloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned from the specified malloc. +// +void *VisualLeakDetector::_malloc (malloc_t pmalloc, UINT_PTR* fp, size_t size) +{ + void *block; + tls_t *tls = vld.gettls(); + + // malloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pmalloc(size); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// _new - This function is just a wrapper around the real CRT and MFC new +// operators that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - pnew (IN): Pointer to the particular new implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned by the specified CRT new operator. +// +void* VisualLeakDetector::_new (new_t pnew, UINT_PTR* fp, size_t size) +{ + void *block; + tls_t *tls = vld.gettls(); + + // The new operator is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pnew(size); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// _realloc - This function is just a wrapper around the real realloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - prealloc (IN): Pointer to the particular realloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified realloc. +// +void* VisualLeakDetector::_realloc (realloc_t prealloc, + UINT_PTR* fp, + void *mem, + size_t size) +{ + void *block; + tls_t *tls = vld.gettls(); + + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + block = prealloc(mem, size); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +//////////////////////////////////////////////////////////////////////////////// +// +// Debug CRT and MFC IAT Replacement Functions +// +// The addresses of these functions are not actually directly patched into the +// import address tables, but these functions do get indirectly called by the +// patch functions that are placed in the import address tables. +// +//////////////////////////////////////////////////////////////////////////////// + +// __calloc_dbg - This function is just a wrapper around the real _calloc_dbg +// that sets appropriate flags to be consulted when the memory is actually +// allocated by RtlAllocateHeap. +// +// - p_calloc_dbg: Pointer to the particular _calloc_dbg implementation to +// call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _calloc_dbg. +// +void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, + UINT_PTR* fp, + size_t num, + size_t size, + int type, + char const *file, + int line) +{ + void *block; + tls_t *tls = vld.gettls(); + + // _malloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = p_calloc_dbg(num, size, type, file, line); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// __malloc_dbg - This function is just a wrapper around the real _malloc_dbg +// that sets appropriate flags to be consulted when the memory is actually +// allocated by RtlAllocateHeap. +// +// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to +// call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _malloc_dbg. +// +void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, + UINT_PTR* fp, + size_t size, + int type, + char const *file, + int line) +{ + void *block; + tls_t *tls = vld.gettls(); + + // _malloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = p_malloc_dbg(size, type, file, line); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// new_dbg_crt - This function is just a wrapper around the real CRT debug new +// operators that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - pnew_dbg_crt (IN): Pointer to the particular CRT new operator +// implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified CRT debug new operator. +// +void* VisualLeakDetector::new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, + UINT_PTR* fp, + size_t size, + int type, + char const *file, + int line) +{ + void *block; + tls_t *tls = vld.gettls(); + + // The debug new operator is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pnew_dbg_crt(size, type, file, line); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// new_dbg_mfc - This function is just a wrapper around the real MFC debug new +// operators that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - pnew_dbg (IN): Pointer to the particular CRT new operator +// implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified CRT debug new operator. +// +void* VisualLeakDetector::new_dbg_mfc (new_dbg_crt_t pnew_dbg, + UINT_PTR* fp, + size_t size, + int type, + char const *file, + int line) +{ + void *block; + tls_t *tls = vld.gettls(); + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pnew_dbg(size, type, file, line); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// new_dbg_mfc - This function is just a wrapper around the real MFC debug new +// operators that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - pnew_dbg_mfc (IN): Pointer to the particular MFC new operator +// implementation to call. +// +// - fp (IN): Frame pointer of the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified MFC debug new operator. +// +void* VisualLeakDetector::new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, + UINT_PTR* fp, + size_t size, + char const *file, + int line) +{ + void *block; + tls_t *tls = vld.gettls(); + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pnew_dbg_mfc(size, file, line); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// __realloc_debug - This function is just a wrapper around the real +// _realloc_dbg that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, + UINT_PTR* fp, + void *mem, + size_t size, + int type, + char const *file, + int line) +{ + void *block; + tls_t *tls = vld.gettls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + block = p_realloc_dbg(mem, size, type, file, line); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +//////////////////////////////////////////////////////////////////////////////// +// +// Win32 IAT Replacement Functions +// +//////////////////////////////////////////////////////////////////////////////// + +// _GetProcAddress - Calls to GetProcAddress are patched through to this +// function. If the requested function is a function that has been patched +// through to one of VLD's handlers, then the address of VLD's handler +// function is returned instead of the real address. Otherwise, this +// function is just a wrapper around the real GetProcAddress. +// +// - module (IN): Handle (base address) of the module from which to retrieve +// the address of an exported function. +// +// - procname (IN): ANSI string containing the name of the exported function +// whose address is to be retrieved. +// +// Return Value: +// +// Returns a pointer to the requested function, or VLD's replacement for +// the function, if there is a replacement function. +// +FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) +{ + patchentry_t *entry; + UINT index; + UINT tablesize = sizeof(vld.m_patchtable) / sizeof(patchentry_t); + + // See if there is an entry in the patch table that matches the requested + // function. + for (index = 0; index < tablesize; index++) { + entry = &vld.m_patchtable[index]; + if ((entry->modulebase == 0x0) || ((HMODULE)entry->modulebase != module)) { + // This patch table entry is for a different module. + continue; + } + + // This patch table entry is for the specified module. If the requested + // import's name matches the entry's import name (or ordinal), then + // return the address of the replacement instead of the address of the + // actual import. + if ((SIZE_T)entry->importname < (SIZE_T)vld.m_vldbase) { + // This entry's import name is not a valid pointer to data in + // vld.dll. It must be an ordinal value. + if ((UINT)entry->importname == (UINT)procname) { + return (FARPROC)entry->replacement; + } + } + else { + if (strcmp(entry->importname, procname) == 0) { + return (FARPROC)entry->replacement; + } + } + } + + // The requested function is not a patched function. Just return the real + // address of the requested function. + return GetProcAddress(module, procname); +} + +// _HeapCreate - Calls to HeapCreate are patched through to this function. This +// function is just a wrapper around the real HeapCreate that calls VLD's heap +// creation tracking function after the heap has been created. +// +// - options (IN): Heap options. +// +// - initsize (IN): Initial size of the heap. +// +// - maxsize (IN): Maximum size of the heap. +// +// Return Value: +// +// Returns the value returned by HeapCreate. +// +HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) +{ + DWORD64 displacement; + SYMBOL_INFO *functioninfo; + HANDLE heap; + HeapMap::Iterator heapit; + UINT_PTR* fp; + UINT_PTR ra; + BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; + BOOL symfound; + + // Get the return address within the calling function. + ADDRESS_OF_RETURN_ADDRESS(fp); + ra = *fp; + + // Create the heap. + heap = HeapCreate(options, initsize, maxsize); + + // Map the created heap handle to a new block map. + vld.mapheap(heap); + + // Try to get the name of the function containing the return address. + functioninfo = (SYMBOL_INFO*)&symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + EnterCriticalSection(&symbollock); + symfound = SymFromAddrW(currentprocess, ra, &displacement, functioninfo); + LeaveCriticalSection(&symbollock); + if (symfound == TRUE) { + if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { + // HeapCreate was called by _heap_init. This is a static CRT heap. + EnterCriticalSection(&vld.m_maplock); + heapit = vld.m_heapmap->find(heap); + assert(heapit != vld.m_heapmap->end()); + (*heapit).second->flags |= VLD_HEAP_CRT; + LeaveCriticalSection(&vld.m_maplock); + } + } + + return heap; +} + +// _HeapDestroy - Calls to HeapDestroy are patched through to this function. +// This function is just a wrapper around the real HeapDestroy that calls +// VLD's heap destruction tracking function after the heap has been destroyed. +// +// - heap (IN): Handle to the heap to be destroyed. +// +// Return Value: +// +// Returns the valued returned by HeapDestroy. +// +BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) +{ + // After this heap is destroyed, the heap's address space will be unmapped + // from the process's address space. So, we'd better generate a leak report + // for this heap now, while we can still read from the memory blocks + // allocated to it. + vld.reportleaks(heap); + + vld.unmapheap(heap); + + return HeapDestroy(heap); +} + +// _LdrLoadDll - Calls to LdrLoadDll are patched through to this function. This +// function invokes the real LdrLoadDll and then re-attaches VLD to all +// modules loaded in the process after loading of the new DLL is complete. +// All modules must be re-enumerated because the explicit load of the +// specified module may result in the implicit load of one or more additional +// modules which are dependencies of the specified module. +// +// - searchpath (IN): The path to use for searching for the specified module to +// be loaded. +// +// - flags (IN): Pointer to action flags. +// +// - modulename (IN): Pointer to a unicodestring_t structure specifying the +// name of the module to be loaded. +// +// - modulehandle (OUT): Address of a HANDLE to receive the newly loaded +// module's handle. +// +// Return Value: +// +// Returns the value returned by LdrLoadDll. +// +NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, PDWORD flags, unicodestring_t *modulename, + PHANDLE modulehandle) +{ + ModuleSet::Iterator moduleit; + ModuleSet *newmodules; + ModuleSet *oldmodules; + NTSTATUS status; + + EnterCriticalSection(&vld.m_loaderlock); + + // Load the DLL. + status = LdrLoadDll(searchpath, flags, modulename, modulehandle); + + if (STATUS_SUCCESS == status) { + // Create a new set of all loaded modules, including any newly loaded + // modules. + newmodules = new ModuleSet; + newmodules->reserve(MODULESETRESERVE); + EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); + + // Attach to all modules included in the set. + vld.attachtoloadedmodules(newmodules); + + // Start using the new set of loaded modules. + EnterCriticalSection(&vld.m_moduleslock); + oldmodules = vld.m_loadedmodules; + vld.m_loadedmodules = newmodules; + LeaveCriticalSection(&vld.m_moduleslock); + + // Free resources used by the old module list. + for (moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { + delete (*moduleit).name; + delete (*moduleit).path; + } + delete oldmodules; + } + + LeaveCriticalSection(&vld.m_loaderlock); + + return status; +} + +// _RtlAllocateHeap - Calls to RtlAllocateHeap are patched through to this +// function. This function invokes the real RtlAllocateHeap and then calls +// VLD's allocation tracking function. Pretty much all memory allocations +// will eventually result in a call to RtlAllocateHeap, so this is where we +// finally map the allocated block. +// +// - heap (IN): Handle to the heap from which to allocate memory. +// +// - flags (IN): Heap allocation control flags. +// +// - size (IN): Size, in bytes, of the block to allocate. +// +// Return Value: +// +// Returns the return value from RtlAllocateHeap. +// +LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) +{ + BOOL crtalloc; + BOOL excluded = FALSE; + UINT_PTR* fp; + LPVOID block; + moduleinfo_t moduleinfo; + ModuleSet::Iterator moduleit; + UINT_PTR returnaddress; + tls_t *tls = vld.gettls(); + + // Allocate the block. + block = RtlAllocateHeap(heap, flags, size); + + if ((block != NULL) && vld.enabled()) { + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + ADDRESS_OF_RETURN_ADDRESS(fp); + } + else { + fp = tls->addrofra; + } + crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + + // Reset thread local flags and variables, in case any libraries called + // into while mapping the block allocate some memory. + tls->addrofra = 0x0; + tls->flags &=~VLD_TLS_CRTALLOC; + + // Find the information for the module that initiated this allocation. + returnaddress = *fp; + moduleinfo.addrhigh = returnaddress; + moduleinfo.addrlow = returnaddress; + EnterCriticalSection(&vld.m_moduleslock); + moduleit = vld.m_loadedmodules->find(moduleinfo); + if (moduleit != vld.m_loadedmodules->end()) { + excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; + } + LeaveCriticalSection(&vld.m_moduleslock); + if (!excluded) { + // The module that initiated this allocation is included in leak + // detection. Map this block to the specified heap. + vld.mapblock(heap, block, size, fp, crtalloc); + } + } + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. +// This function calls VLD's free tracking function and then invokes the real +// RtlFreeHeap. Pretty much all memory frees will eventually result in a call +// to RtlFreeHeap, so this is where we finally unmap the freed block. +// +// - heap (IN): Handle to the heap to which the block being freed belongs. +// +// - flags (IN): Heap control flags. +// +// - mem (IN): Pointer to the memory block being freed. +// +// Return Value: +// +// Returns the value returned by RtlFreeHeap. +// +BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) +{ + BOOL status; + + // Unmap the block from the specified heap. + vld.unmapblock(heap, mem); + + status = RtlFreeHeap(heap, flags, mem); + + return status; +} + +// _RtlReAllocateHeap - Calls to RtlReAllocateHeap are patched through to this +// function. This function invokes the real RtlReAllocateHeap and then calls +// VLD's reallocation tracking function. All arguments passed to this function +// are passed on to the real RtlReAllocateHeap without modification. Pretty +// much all memory re-allocations will eventually result in a call to +// RtlReAllocateHeap, so this is where we finally remap the reallocated block. +// +// - heap (IN): Handle to the heap to reallocate memory from. +// +// - flags (IN): Heap control flags. +// +// - mem (IN): Pointer to the currently allocated block which is to be +// reallocated. +// +// - size (IN): Size, in bytes, of the block to reallocate. +// +// Return Value: +// +// Returns the value returned by RtlReAllocateHeap. +// +LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) +{ + BOOL crtalloc; + BOOL excluded = FALSE; + UINT_PTR* fp; + moduleinfo_t moduleinfo; + ModuleSet::Iterator moduleit; + LPVOID newmem; + UINT_PTR returnaddress; + tls_t *tls = vld.gettls(); + + // Reallocate the block. + newmem = RtlReAllocateHeap(heap, flags, mem, size); + + if (newmem != NULL) { + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + ADDRESS_OF_RETURN_ADDRESS(fp); + } + else { + fp = tls->addrofra; + } + crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + + // Reset thread local flags and variables, in case any libraries called + // into while remapping the block allocate some memory. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + // Find the information for the module that initiated this reallocation. + returnaddress = *fp; + moduleinfo.addrhigh = returnaddress; + moduleinfo.addrlow = returnaddress; + EnterCriticalSection(&vld.m_moduleslock); + moduleit = vld.m_loadedmodules->find(moduleinfo); + if (moduleit != vld.m_loadedmodules->end()) { + excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; + } + LeaveCriticalSection(&vld.m_moduleslock); + if (!excluded) { + // The module that initiated this allocation is included in leak + // detection. Remap the block. + vld.remapblock(heap, mem, newmem, size, fp, crtalloc); + } + } + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return newmem; +} + +//////////////////////////////////////////////////////////////////////////////// +// +// COM IAT Replacement Functions +// +//////////////////////////////////////////////////////////////////////////////// + +// _CoGetMalloc - Calls to CoGetMalloc are patched through to this function. +// This function returns a pointer to Visual Leak Detector's implementation +// of the IMalloc interface, instead of returning a pointer to the system +// implementation. This allows VLD's implementation of the IMalloc interface +// (which is basically a thin wrapper around the system implementation) to be +// invoked in place of the system implementation. +// +// - context (IN): Reserved; value must be 1. +// +// - imalloc (IN): Address of a pointer to receive the address of VLD's +// implementation of the IMalloc interface. +// +// Return Value: +// +// Always returns S_OK. +// +HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) +{ + static CoGetMalloc_t pCoGetMalloc = NULL; + + HMODULE ole32; + + *imalloc = (LPMALLOC)&vld; + + if (pCoGetMalloc == NULL) { + // This is the first call to this function. Link to the real + // CoGetMalloc and get a pointer to the system implementation of the + // IMalloc interface. + ole32 = GetModuleHandle(L"ole32.dll"); + pCoGetMalloc = (CoGetMalloc_t)GetProcAddress(ole32, "CoGetMalloc"); + pCoGetMalloc(context, &vld.m_imalloc); + } + + return S_OK; +} + +// _CoTaskMemAlloc - Calls to CoTaskMemAlloc are patched through to this +// function. This function is just a wrapper around the real CoTaskMemAlloc +// that sets appropriate flags to be consulted when the memory is actually +// allocated by RtlAllocateHeap. +// +// - size (IN): Size of the memory block to allocate. +// +// Return Value: +// +// Returns the value returned from CoTaskMemAlloc. +// +LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) +{ + static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; + + LPVOID block; + UINT_PTR* fp; + HMODULE ole32; + tls_t *tls = vld.gettls(); + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + ADDRESS_OF_RETURN_ADDRESS(fp); + tls->addrofra = fp; + } + + if (pCoTaskMemAlloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemAlloc. + ole32 = GetModuleHandle(L"ole32.dll"); + pCoTaskMemAlloc = (CoTaskMemAlloc_t)GetProcAddress(ole32, "CoTaskMemAlloc"); + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pCoTaskMemAlloc(size); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// _CoTaskMemRealloc - Calls to CoTaskMemRealloc are patched through to this +// function. This function is just a wrapper around the real CoTaskMemRealloc +// that sets appropriate flags to be consulted when the memory is actually +// allocated by RtlAllocateHeap. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size, in bytes, of the block to reallocate. +// +// Return Value: +// +// Returns the value returned from CoTaskMemRealloc. +// +LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) +{ + static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; + + LPVOID block; + UINT_PTR* fp; + HMODULE ole32; + tls_t *tls = vld.gettls(); + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + ADDRESS_OF_RETURN_ADDRESS(fp); + tls->addrofra = fp; + } + + if (pCoTaskMemRealloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemRealloc. + ole32 = GetModuleHandle(L"ole32.dll"); + pCoTaskMemRealloc = (CoTaskMemRealloc_t)GetProcAddress(ole32, "CoTaskMemRealloc"); + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + block = pCoTaskMemRealloc(mem, size); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +//////////////////////////////////////////////////////////////////////////////// +// +// Public COM IMalloc Implementation Functions +// +//////////////////////////////////////////////////////////////////////////////// + +// AddRef - Calls to IMalloc::AddRef end up here. This function is just a +// wrapper around the real IMalloc::AddRef implementation. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::AddRef. +// +ULONG VisualLeakDetector::AddRef () +{ + assert(m_imalloc != NULL); + return m_imalloc->AddRef(); +} + +// Alloc - Calls to IMalloc::Alloc end up here. This function is just a wrapper +// around the real IMalloc::Alloc implementation that sets appropriate flags +// to be consulted when the memory is actually allocated by RtlAllocateHeap. +// +// - size (IN): The size of the memory block to allocate. +// +// Return Value: +// +// Returns the value returned by the system's IMalloc::Alloc implementation. +// +LPVOID VisualLeakDetector::Alloc (SIZE_T size) +{ + LPVOID block; + UINT_PTR* fp; + tls_t *tls = vld.gettls(); + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + ADDRESS_OF_RETURN_ADDRESS(fp); + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + assert(m_imalloc != NULL); + block = m_imalloc->Alloc(size); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// DidAlloc - Calls to IMalloc::DidAlloc will end up here. This function is just +// a wrapper around the system implementation of IMalloc::DidAlloc. +// +// - mem (IN): Pointer to a memory block to inquire about. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::DidAlloc. +// +INT VisualLeakDetector::DidAlloc (LPVOID mem) +{ + assert(m_imalloc != NULL); + return m_imalloc->DidAlloc(mem); +} + +// Free - Calls to IMalloc::Free will end up here. This function is just a +// wrapper around the real IMalloc::Free implementation. +// +// - mem (IN): Pointer to the memory block to be freed. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::Free (LPVOID mem) +{ + assert(m_imalloc != NULL); + m_imalloc->Free(mem); +} + +// GetSize - Calls to IMalloc::GetSize will end up here. This function is just a +// wrapper around the real IMalloc::GetSize implementation. +// +// - mem (IN): Pointer to the memory block to inquire about. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::GetSize. +// +SIZE_T VisualLeakDetector::GetSize (LPVOID mem) +{ + assert(m_imalloc != NULL); + return m_imalloc->GetSize(mem); +} + +// HeapMinimize - Calls to IMalloc::HeapMinimize will end up here. This function +// is just a wrapper around the real IMalloc::HeapMinimize implementation. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::HeapMinimize () +{ + assert(m_imalloc != NULL); + m_imalloc->HeapMinimize(); +} + +// QueryInterface - Calls to IMalloc::QueryInterface will end up here. This +// function is just a wrapper around the real IMalloc::QueryInterface +// implementation. +// +// - iid (IN): COM interface ID to query about. +// +// - object (IN): Address of a pointer to receive the requested interface +// pointer. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::QueryInterface. +// +HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) +{ + assert(m_imalloc != NULL); + return m_imalloc->QueryInterface(iid, object); +} + +// Realloc - Calls to IMalloc::Realloc will end up here. This function is just a +// wrapper around the real IMalloc::Realloc implementation that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size, in bytes, of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::Realloc. +// +LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) +{ + LPVOID block; + UINT_PTR* fp; + tls_t *tls = vld.gettls(); + + if (tls->addrofra == 0x0) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + ADDRESS_OF_RETURN_ADDRESS(fp); + tls->addrofra = fp; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + assert(m_imalloc != NULL); + block = m_imalloc->Realloc(mem, size); + + // Reset thread local flags and variables for the next allocation. + tls->addrofra = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + return block; +} + +// Release - Calls to IMalloc::Release will end up here. This function is just +// a wrapper around the real IMalloc::Release implementation. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::Release. +// +ULONG VisualLeakDetector::Release () +{ + assert(m_imalloc != NULL); + return m_imalloc->Release(); +} diff --git a/vld.dll.dependency.manifest b/vld.dll.dependency.manifest deleted file mode 100644 index 0d609fe2..00000000 --- a/vld.dll.dependency.manifest +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/vld.h b/vld.h index 234c87f3..27d7b142 100644 --- a/vld.h +++ b/vld.h @@ -1,97 +1,97 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Import Library Header -// Copyright (c) 2006 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifdef _DEBUG - -#pragma comment(lib, "vld.lib") - -// Force a symbolic reference to the global VisualLeakDetector class object from -// the DLL. This enusres that the DLL is loaded and linked with the program, -// even if no code otherwise imports any of the DLL's exports. -#pragma comment(linker, "/include:__imp_?vld@@3VVisualLeakDetector@@A") - -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector APIs -// - -#ifdef __cplusplus -extern "C" { -#endif // __cplusplus - -// VLDDisable - Disables Visual Leak Detector's memory leak detection at -// runtime. If memory leak detection is already disabled, then calling this -// function has no effect. -// -// Note: In multithreaded programs, this function operates on a per-thread -// basis. In other words, if you call this function from one thread, then -// memory leak detection is only disabled for that thread. If memory leak -// detection is enabled for other threads, then it will remain enabled for -// those other threads. It was designed to work this way to insulate you, -// the programmer, from having to ensure thread synchronization when calling -// VLDEnable() and VLDDisable(). Without this, calling these two functions -// unsychronized could result in unpredictable and unintended behavior. -// But this also means that if you want to disable memory leak detection -// process-wide, then you need to call this function from every thread in -// the process. -// -// Return Value: -// -// None. -// -__declspec(dllimport) void VLDDisable (); - -// VLDEnable - Enables Visual Leak Detector's memory leak detection at runtime. -// If memory leak detection is already enabled, which it is by default, then -// calling this function has no effect. -// -// Note: In multithreaded programs, this function operates on a per-thread -// basis. In other words, if you call this function from one thread, then -// memory leak detection is only enabled for that thread. If memory leak -// detection is disabled for other threads, then it will remain disabled for -// those other threads. It was designed to work this way to insulate you, -// the programmer, from having to ensure thread synchronization when calling -// VLDEnable() and VLDDisable(). Without this, calling these two functions -// unsychronized could result in unpredictable and unintended behavior. -// But this also means that if you want to enable memory leak detection -// process-wide, then you need to call this function from every thread in -// the process. -// -// Return Value: -// -// None. -// -__declspec(dllimport) void VLDEnable (); - -#ifdef __cplusplus -} -#endif // __cplusplus - -#else // !_DEBUG - -#define VLDEnable() -#define VLDDisable() - -#endif // _DEBUG +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Import Library Header +// Copyright (c) 2006 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifdef _DEBUG + +#pragma comment(lib, "vld.lib") + +// Force a symbolic reference to the global VisualLeakDetector class object from +// the DLL. This enusres that the DLL is loaded and linked with the program, +// even if no code otherwise imports any of the DLL's exports. +#pragma comment(linker, "/include:__imp_?vld@@3VVisualLeakDetector@@A") + +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector APIs +// + +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + +// VLDDisable - Disables Visual Leak Detector's memory leak detection at +// runtime. If memory leak detection is already disabled, then calling this +// function has no effect. +// +// Note: In multithreaded programs, this function operates on a per-thread +// basis. In other words, if you call this function from one thread, then +// memory leak detection is only disabled for that thread. If memory leak +// detection is enabled for other threads, then it will remain enabled for +// those other threads. It was designed to work this way to insulate you, +// the programmer, from having to ensure thread synchronization when calling +// VLDEnable() and VLDDisable(). Without this, calling these two functions +// unsychronized could result in unpredictable and unintended behavior. +// But this also means that if you want to disable memory leak detection +// process-wide, then you need to call this function from every thread in +// the process. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDDisable (); + +// VLDEnable - Enables Visual Leak Detector's memory leak detection at runtime. +// If memory leak detection is already enabled, which it is by default, then +// calling this function has no effect. +// +// Note: In multithreaded programs, this function operates on a per-thread +// basis. In other words, if you call this function from one thread, then +// memory leak detection is only enabled for that thread. If memory leak +// detection is disabled for other threads, then it will remain disabled for +// those other threads. It was designed to work this way to insulate you, +// the programmer, from having to ensure thread synchronization when calling +// VLDEnable() and VLDDisable(). Without this, calling these two functions +// unsychronized could result in unpredictable and unintended behavior. +// But this also means that if you want to enable memory leak detection +// process-wide, then you need to call this function from every thread in +// the process. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDEnable (); + +#ifdef __cplusplus +} +#endif // __cplusplus + +#else // !_DEBUG + +#define VLDEnable() +#define VLDDisable() + +#endif // _DEBUG diff --git a/vld.ini b/vld.ini index 44cd4413..7d298f62 100644 --- a/vld.ini +++ b/vld.ini @@ -1,155 +1,155 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; -;; Visual Leak Detector - Initialization/Configuration File -;; Copyright (c) 2006 Dan Moulding -;; -;; This library is free software; you can redistribute it and/or -;; modify it under the terms of the GNU Lesser General Public -;; License as published by the Free Software Foundation; either -;; version 2.1 of the License, or (at your option) any later version. -;; -;; This library is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; Lesser General Public License for more details. -;; -;; You should have received a copy of the GNU Lesser General Public -;; License along with this library; if not, write to the Free Software -;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -;; -;; See COPYING.txt for the full terms of the GNU Lesser General Public License. -;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -; Any options left blank or not present will revert to their default values. -[Options] - -; The main on/off switch. If off, Visual Leak Detector will be completely -; disabled. It will do nothing but print a message to the debugger indicating -; that it has been turned off. -; -; Valid Values: on, off -; Default: on -; -VLD = on - -; If yes, duplicate leaks (those that are identical) are not shown individually. -; Only the first such leak is shown, along with a number indicating the total -; number of duplicate leaks. -; -; Valid Values: yes, no -; Default: no -; -AggregateDuplicates = no - -; Lists any additional modules to be included in memory leak detection. This can -; be useful for checking for memory leaks in debug builds of 3rd party modules -; which can not be easily rebuilt with '#include "vld.h"'. This option should be -; used only if absolutely necessary and only if you really know what you are -; doing. -; -; CAUTION: Avoid listing any modules that link with the release CRT libraries. -; Only modules that link with the debug CRT libraries should be listed here. -; Doing otherwise might result in false memory leak reports or even crashes. -; -; Valid Values: Any list containing module names (i.e. names of EXEs or DLLs). -; Default: None. -; -ForceIncludeModules = - -; Maximum number of data bytes to display for each leaked block. If zero, then -; the data dump is completely suppressed and only call stacks are shown. -; Limiting this to a low number can be useful if any of the leaked blocks are -; very large and cause unnecessary clutter in the memory leak report. -; -; Value Values: 0 - 4294967295 -; Default: 256 -; -MaxDataDump = - -; Maximum number of call stack frames to trace back during leak detection. -; Limiting this to a low number can reduce the CPU utilization overhead imposed -; by memory leak detection, especially when using the slower "safe" stack -; walking method (see StackWalkMethod below). -; -; Valid Values: 1 - 4294967295 -; Default: 64 -; -MaxTraceFrames = - -; Sets the type of encoding to use for the generated memory leak report. This -; option is really only useful in conjuction with sending the report to a file. -; Sending a Unicode encoded report to the debugger is not useful because the -; debugger cannot display Unicode characters. Using Unicode encoding might be -; useful if the data contained in leaked blocks is likely to consist of Unicode -; text. -; -; Valid Values: ascii, unicode -; Default: ascii -; -ReportEncoding = ascii - -; Sets the report file destination, if reporting to file is enabled. A relative -; path may be specified and is considered relative to the process' working -; directory. -; -; Valid Values: Any valid path and filename. -; Default: .\memory_leak_report.txt -; -ReportFile = - -; Sets the report destination to either a file, the debugger, or both. If -; reporting to file is enabled, the report is sent to the file specified by the -; ReportFile option. -; -; Valid Values: debugger, file, both -; Default: debugger -; -ReportTo = debugger - -; Turns on or off a self-test mode which is used to verify that VLD is able to -; detect memory leaks in itself. Intended to be used for debugging VLD itself, -; not for debugging other programs. -; -; Valid Values: on, off -; Default: off -; -SelfTest = off - -; Selects the method to be used for walking the stack to obtain stack traces for -; allocated memory blocks. The "fast" method may not always be able to -; successfully trace completely through all call stacks. In such cases, the -; "safe" method may prove to more reliably obtain the full stack trace. The -; disadvantage is that the "safe" method is significantly slower than the "fast" -; method and will probably result in very noticeable performance degradation of -; the program being debugged. -; -; Valid Values: fast, safe -; Default: fast -; -StackWalkMethod = fast - -; Determines whether memory leak detection should be initially enabled for all -; threads, or whether it should be initially disabled for all threads. If set -; to "yes", then any threads requiring memory leak detection to be enabled will -; need to call VLDEnable at some point to enable leak detection for those -; threads. -; -; Valid Values: yes, no -; Default: no -; -StartDisabled = no - -; Determines whether or not all frames, including frames internal to the heap, -; are traced. There will always be a number of frames internal to Visual Leak -; Detector and C/C++ or Win32 heap APIs that aren't generally useful for -; determining the cause of a leak. Normally these frames are skipped during the -; stack trace, which somewhat reduces the time spent tracing and amount of data -; collected and stored in memory. Including all frames in the stack trace, all -; the way down into VLD's own code can, however, be useful for debugging VLD -; itself. -; -; Valid Values: yes, no -; Default: no -; -TraceInternalFrames = no +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; Visual Leak Detector - Initialization/Configuration File +;; Copyright (c) 2006 Dan Moulding +;; +;; This library is free software; you can redistribute it and/or +;; modify it under the terms of the GNU Lesser General Public +;; License as published by the Free Software Foundation; either +;; version 2.1 of the License, or (at your option) any later version. +;; +;; This library is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; Lesser General Public License for more details. +;; +;; You should have received a copy of the GNU Lesser General Public +;; License along with this library; if not, write to the Free Software +;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +;; +;; See COPYING.txt for the full terms of the GNU Lesser General Public License. +;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; Any options left blank or not present will revert to their default values. +[Options] + +; The main on/off switch. If off, Visual Leak Detector will be completely +; disabled. It will do nothing but print a message to the debugger indicating +; that it has been turned off. +; +; Valid Values: on, off +; Default: on +; +VLD = on + +; If yes, duplicate leaks (those that are identical) are not shown individually. +; Only the first such leak is shown, along with a number indicating the total +; number of duplicate leaks. +; +; Valid Values: yes, no +; Default: no +; +AggregateDuplicates = no + +; Lists any additional modules to be included in memory leak detection. This can +; be useful for checking for memory leaks in debug builds of 3rd party modules +; which can not be easily rebuilt with '#include "vld.h"'. This option should be +; used only if absolutely necessary and only if you really know what you are +; doing. +; +; CAUTION: Avoid listing any modules that link with the release CRT libraries. +; Only modules that link with the debug CRT libraries should be listed here. +; Doing otherwise might result in false memory leak reports or even crashes. +; +; Valid Values: Any list containing module names (i.e. names of EXEs or DLLs). +; Default: None. +; +ForceIncludeModules = + +; Maximum number of data bytes to display for each leaked block. If zero, then +; the data dump is completely suppressed and only call stacks are shown. +; Limiting this to a low number can be useful if any of the leaked blocks are +; very large and cause unnecessary clutter in the memory leak report. +; +; Value Values: 0 - 4294967295 +; Default: 256 +; +MaxDataDump = + +; Maximum number of call stack frames to trace back during leak detection. +; Limiting this to a low number can reduce the CPU utilization overhead imposed +; by memory leak detection, especially when using the slower "safe" stack +; walking method (see StackWalkMethod below). +; +; Valid Values: 1 - 4294967295 +; Default: 64 +; +MaxTraceFrames = + +; Sets the type of encoding to use for the generated memory leak report. This +; option is really only useful in conjuction with sending the report to a file. +; Sending a Unicode encoded report to the debugger is not useful because the +; debugger cannot display Unicode characters. Using Unicode encoding might be +; useful if the data contained in leaked blocks is likely to consist of Unicode +; text. +; +; Valid Values: ascii, unicode +; Default: ascii +; +ReportEncoding = ascii + +; Sets the report file destination, if reporting to file is enabled. A relative +; path may be specified and is considered relative to the process' working +; directory. +; +; Valid Values: Any valid path and filename. +; Default: .\memory_leak_report.txt +; +ReportFile = + +; Sets the report destination to either a file, the debugger, or both. If +; reporting to file is enabled, the report is sent to the file specified by the +; ReportFile option. +; +; Valid Values: debugger, file, both +; Default: debugger +; +ReportTo = debugger + +; Turns on or off a self-test mode which is used to verify that VLD is able to +; detect memory leaks in itself. Intended to be used for debugging VLD itself, +; not for debugging other programs. +; +; Valid Values: on, off +; Default: off +; +SelfTest = off + +; Selects the method to be used for walking the stack to obtain stack traces for +; allocated memory blocks. The "fast" method may not always be able to +; successfully trace completely through all call stacks. In such cases, the +; "safe" method may prove to more reliably obtain the full stack trace. The +; disadvantage is that the "safe" method is significantly slower than the "fast" +; method and will probably result in very noticeable performance degradation of +; the program being debugged. +; +; Valid Values: fast, safe +; Default: fast +; +StackWalkMethod = fast + +; Determines whether memory leak detection should be initially enabled for all +; threads, or whether it should be initially disabled for all threads. If set +; to "yes", then any threads requiring memory leak detection to be enabled will +; need to call VLDEnable at some point to enable leak detection for those +; threads. +; +; Valid Values: yes, no +; Default: no +; +StartDisabled = no + +; Determines whether or not all frames, including frames internal to the heap, +; are traced. There will always be a number of frames internal to Visual Leak +; Detector and C/C++ or Win32 heap APIs that aren't generally useful for +; determining the cause of a leak. Normally these frames are skipped during the +; stack trace, which somewhat reduces the time spent tracing and amount of data +; collected and stored in memory. Including all frames in the stack trace, all +; the way down into VLD's own code can, however, be useful for debugging VLD +; itself. +; +; Valid Values: yes, no +; Default: no +; +TraceInternalFrames = no diff --git a/vld.rc b/vld.rc index 187fbff6..608ec0eb 100755 --- a/vld.rc +++ b/vld.rc @@ -1,101 +1,101 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,8,0 - PRODUCTVERSION 1,9,8,0 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x3L -#else - FILEFLAGS 0x2L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "Visual Leak Detector DLL" - VALUE "FileVersion", "1, 9, 8, 0" - VALUE "InternalName", "vld" - VALUE "LegalCopyright", "Copyright (C) 2009" - VALUE "OriginalFilename", "vld.dll" - VALUE "ProductName", "Visual Leak Detector" - VALUE "ProductVersion", "1, 9, 8, 0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,0,0,0 + PRODUCTVERSION 2,0,0,0 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x3L +#else + FILEFLAGS 0x2L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "Visual Leak Detector DLL" + VALUE "FileVersion", "2, 0, 0, 0" + VALUE "InternalName", "vld" + VALUE "LegalCopyright", "Copyright (C) 2010" + VALUE "OriginalFilename", "vld.dll" + VALUE "ProductName", "Visual Leak Detector" + VALUE "ProductVersion", "2, 0, 0, 0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/vld.sln b/vld.sln index 23f0e475..ad49e481 100644 --- a/vld.sln +++ b/vld.sln @@ -1,29 +1,39 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "vld.vcproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "testsuite\testsuite.vcproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Debug(Release)|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "vld.vcproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "testsuite\testsuite.vcproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Debug(Release)|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vld.vcproj b/vld.vcproj index 0d1b30cb..8a8d30cf 100644 --- a/vld.vcproj +++ b/vld.vcproj @@ -1,262 +1,460 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vldapi.cpp b/vldapi.cpp index 88d0a531..9cd537fe 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -1,68 +1,70 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Exported APIs -// Copyright (c) 2005-2006 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#define VLDBUILD // Declares that we are building Visual Leak Detector. -#include "vldint.h" // Provides access to the Visual Leak Detector internals. -#include "vldheap.h" // Provides internal new and delete operators. - -// Imported global variables. -extern VisualLeakDetector vld; - -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector APIs - see vldapi.h for each function's details. -// - -extern "C" __declspec(dllexport) void VLDDisable () -{ - tls_t *tls; - - if (vld.m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - // Disable memory leak detection for the current thread. There are two flags - // because if neither flag is set, it means that we are in the default or - // "starting" state, which could be either enabled or disabled depending on - // the configuration. - tls = vld.gettls(); - tls->flags &= ~VLD_TLS_ENABLED; - tls->flags |= VLD_TLS_DISABLED; -} - -extern "C" __declspec(dllexport) void VLDEnable () -{ - tls_t *tls; - - if (vld.m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - // Enable memory leak detection for the current thread. - tls = vld.gettls(); - tls->flags &= ~VLD_TLS_DISABLED; - tls->flags |= VLD_TLS_ENABLED; - vld.m_status &= ~VLD_STATUS_NEVER_ENABLED; -} +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Exported APIs +// Copyright (c) 2005-2006 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#include "stdafx.h" + +#define VLDBUILD // Declares that we are building Visual Leak Detector. +#include "vldint.h" // Provides access to the Visual Leak Detector internals. +#include "vldheap.h" // Provides internal new and delete operators. + +// Imported global variables. +extern VisualLeakDetector vld; + +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector APIs - see vldapi.h for each function's details. +// + +extern "C" __declspec(dllexport) void VLDDisable () +{ + tls_t *tls; + + if (vld.m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Disable memory leak detection for the current thread. There are two flags + // because if neither flag is set, it means that we are in the default or + // "starting" state, which could be either enabled or disabled depending on + // the configuration. + tls = vld.gettls(); + tls->flags &= ~VLD_TLS_ENABLED; + tls->flags |= VLD_TLS_DISABLED; +} + +extern "C" __declspec(dllexport) void VLDEnable () +{ + tls_t *tls; + + if (vld.m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Enable memory leak detection for the current thread. + tls = vld.gettls(); + tls->flags &= ~VLD_TLS_DISABLED; + tls->flags |= VLD_TLS_ENABLED; + vld.m_status &= ~VLD_STATUS_NEVER_ENABLED; +} diff --git a/vldheap.cpp b/vldheap.cpp index 50f807b7..0a35860f 100644 --- a/vldheap.cpp +++ b/vldheap.cpp @@ -1,212 +1,213 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Internal C++ Heap Management -// Copyright (c) 2006 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#include -#define VLDBUILD // Declares that we are building Visual Leak Detector. -#include "ntapi.h" // Provides access to NT APIs. -#include "vldheap.h" // Provides access to VLD's internal heap data structures. -#undef new // Do not map "new" to VLD's new operator in this file - -// Global variables. -vldblockheader_t *vldblocklist = NULL; // List of internally allocated blocks on VLD's private heap. -HANDLE vldheap; // VLD's private heap. -CRITICAL_SECTION vldheaplock; // Serializes access to VLD's private heap. - -// Local helper functions. -static inline void vlddelete (void *block); -static inline void* vldnew (size_t size, const char *file, int line); - -// scalar delete operator - Delete operator used to free internally used memory -// back to VLD's private heap. -// -// - block (IN): Pointer to the scalar memory block to free. -// -// Return Value: -// -// None. -// -void operator delete (void *block) -{ - vlddelete(block); -} - -// vector delete operator - Delete operator used to free internally used memory -// back to VLD's private heap. -// -// - block (IN): Pointer to the vector memory block to free. -// -// Return Value: -// -// None. -// -void operator delete [] (void *block) -{ - vlddelete(block); -} - -// scalar delete operator - Delete operator used to free memory partially -// allocated by new in the event that the corresponding new operator throws -// an exception. -// -// Note: This version of the delete operator should never be called directly. -// The compiler automatically generates calls to this function as needed. -// -void operator delete (void *block, const char *, int) -{ - vlddelete(block); -} - -// vector delete operator - Delete operator used to free memory partially -// allocated by new in the event that the corresponding new operator throws -// an exception. -// -// Note: This version of the delete operator should never be called directly. -// The compiler automatically generates calls to this function as needed. -// -void operator delete [] (void *block, const char *, int) -{ - vlddelete(block); -} - -// scalar new operator - New operator used to allocate a scalar memory block -// from VLD's private heap. -// -// - size (IN): Size of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being -// called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// If the allocation succeeds, a pointer to the allocated memory block is -// returned. If the allocation fails, NULL is returned. -// -void* operator new (size_t size, const char *file, int line) -{ - return vldnew(size, file, line); -} - -// vector new operator - New operator used to allocate a vector memory block -// from VLD's private heap. -// -// - size (IN): Size of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being -// called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// If the allocation succeeds, a pointer to the allocated memory block is -// returned. If the allocation fails, NULL is returned. -// -void* operator new [] (size_t size, const char *file, int line) -{ - return vldnew(size, file, line); -} - -// vlddelete - Local helper function that actually frees memory back to VLD's -// private heap. -// -// - block (IN): Pointer to a memory block being freed. -// -// Return Value: -// -// None. -// -void vlddelete (void *block) -{ - BOOL freed; - vldblockheader_t *header = VLDBLOCKHEADER((LPVOID)block); - - // Unlink the block from the block list. - EnterCriticalSection(&vldheaplock); - if (header->prev) { - header->prev->next = header->next; - } - else { - vldblocklist = header->next; - } - - if (header->next) { - header->next->prev = header->prev; - } - LeaveCriticalSection(&vldheaplock); - - // Free the block. - freed = RtlFreeHeap(vldheap, 0x0, header); - assert(freed != FALSE); -} - -// vldnew - Local helper function that actually allocates memory from VLD's -// private heap. Prepends a header, which is used for bookeeping information -// that allows VLD to detect and report internal memory leaks, to the returned -// block, but the header is transparent to the caller because the returned -// pointer points to the useable section of memory requested by the caller, it -// does not point to the block header. -// -// - size (IN): Size of the memory block to be allocated. -// -// - file (IN): Name of the file that called the new operator. -// -// - line (IN): Line, in the above file, at which the new operator was called. -// -// Return Value: -// -// If the memory allocation succeeds, a pointer to the allocated memory -// block is returned. If the allocation fails, NULL is returned. -// -void* vldnew (size_t size, const char *file, int line) -{ - vldblockheader_t *header = (vldblockheader_t*)RtlAllocateHeap(vldheap, 0x0, size + sizeof(vldblockheader_t)); - static SIZE_T serialnumber = 0; - - if (header == NULL) { - // Out of memory. - return NULL; - } - - // Fill in the block's header information. - header->file = file; - header->line = line; - header->serialnumber = serialnumber++; - header->size = size; - - // Link the block into the block list. - EnterCriticalSection(&vldheaplock); - header->next = vldblocklist; - if (header->next != NULL) { - header->next->prev = header; - } - header->prev = NULL; - vldblocklist = header; - LeaveCriticalSection(&vldheaplock); - - // Return a pointer to the beginning of the data section of the block. - return (void*)VLDBLOCKDATA(header); -} +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Internal C++ Heap Management +// Copyright (c) 2006 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#include "stdafx.h" + +#define VLDBUILD // Declares that we are building Visual Leak Detector. +#include "ntapi.h" // Provides access to NT APIs. +#include "vldheap.h" // Provides access to VLD's internal heap data structures. +#undef new // Do not map "new" to VLD's new operator in this file + +// Global variables. +vldblockheader_t *vldblocklist = NULL; // List of internally allocated blocks on VLD's private heap. +HANDLE vldheap; // VLD's private heap. +CRITICAL_SECTION vldheaplock; // Serializes access to VLD's private heap. + +// Local helper functions. +static inline void vlddelete (void *block); +static inline void* vldnew (size_t size, const char *file, int line); + +// scalar delete operator - Delete operator used to free internally used memory +// back to VLD's private heap. +// +// - block (IN): Pointer to the scalar memory block to free. +// +// Return Value: +// +// None. +// +void operator delete (void *block) +{ + vlddelete(block); +} + +// vector delete operator - Delete operator used to free internally used memory +// back to VLD's private heap. +// +// - block (IN): Pointer to the vector memory block to free. +// +// Return Value: +// +// None. +// +void operator delete [] (void *block) +{ + vlddelete(block); +} + +// scalar delete operator - Delete operator used to free memory partially +// allocated by new in the event that the corresponding new operator throws +// an exception. +// +// Note: This version of the delete operator should never be called directly. +// The compiler automatically generates calls to this function as needed. +// +void operator delete (void *block, const char *, int) +{ + vlddelete(block); +} + +// vector delete operator - Delete operator used to free memory partially +// allocated by new in the event that the corresponding new operator throws +// an exception. +// +// Note: This version of the delete operator should never be called directly. +// The compiler automatically generates calls to this function as needed. +// +void operator delete [] (void *block, const char *, int) +{ + vlddelete(block); +} + +// scalar new operator - New operator used to allocate a scalar memory block +// from VLD's private heap. +// +// - size (IN): Size of the memory block to be allocated. +// +// - file (IN): The name of the file from which this function is being +// called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// If the allocation succeeds, a pointer to the allocated memory block is +// returned. If the allocation fails, NULL is returned. +// +void* operator new (size_t size, const char *file, int line) +{ + return vldnew(size, file, line); +} + +// vector new operator - New operator used to allocate a vector memory block +// from VLD's private heap. +// +// - size (IN): Size of the memory block to be allocated. +// +// - file (IN): The name of the file from which this function is being +// called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// If the allocation succeeds, a pointer to the allocated memory block is +// returned. If the allocation fails, NULL is returned. +// +void* operator new [] (size_t size, const char *file, int line) +{ + return vldnew(size, file, line); +} + +// vlddelete - Local helper function that actually frees memory back to VLD's +// private heap. +// +// - block (IN): Pointer to a memory block being freed. +// +// Return Value: +// +// None. +// +void vlddelete (void *block) +{ + BOOL freed; + vldblockheader_t *header = VLDBLOCKHEADER((LPVOID)block); + + // Unlink the block from the block list. + EnterCriticalSection(&vldheaplock); + if (header->prev) { + header->prev->next = header->next; + } + else { + vldblocklist = header->next; + } + + if (header->next) { + header->next->prev = header->prev; + } + LeaveCriticalSection(&vldheaplock); + + // Free the block. + freed = RtlFreeHeap(vldheap, 0x0, header); + assert(freed != FALSE); +} + +// vldnew - Local helper function that actually allocates memory from VLD's +// private heap. Prepends a header, which is used for bookeeping information +// that allows VLD to detect and report internal memory leaks, to the returned +// block, but the header is transparent to the caller because the returned +// pointer points to the useable section of memory requested by the caller, it +// does not point to the block header. +// +// - size (IN): Size of the memory block to be allocated. +// +// - file (IN): Name of the file that called the new operator. +// +// - line (IN): Line, in the above file, at which the new operator was called. +// +// Return Value: +// +// If the memory allocation succeeds, a pointer to the allocated memory +// block is returned. If the allocation fails, NULL is returned. +// +void* vldnew (size_t size, const char *file, int line) +{ + vldblockheader_t *header = (vldblockheader_t*)RtlAllocateHeap(vldheap, 0x0, size + sizeof(vldblockheader_t)); + static SIZE_T serialnumber = 0; + + if (header == NULL) { + // Out of memory. + return NULL; + } + + // Fill in the block's header information. + header->file = file; + header->line = line; + header->serialnumber = serialnumber++; + header->size = size; + + // Link the block into the block list. + EnterCriticalSection(&vldheaplock); + header->next = vldblocklist; + if (header->next != NULL) { + header->next->prev = header; + } + header->prev = NULL; + vldblocklist = header; + LeaveCriticalSection(&vldheaplock); + + // Return a pointer to the beginning of the data section of the block. + return (void*)VLDBLOCKDATA(header); +} diff --git a/vldheap.h b/vldheap.h index 8d83fdf0..72bd91c0 100644 --- a/vldheap.h +++ b/vldheap.h @@ -1,94 +1,94 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Internal C++ Heap Management Definitions -// Copyright (c) 2006 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifndef VLDBUILD -#error \ -"This header should only be included by Visual Leak Detector when building it from source. \ -Applications should never include this header." -#endif - -#include - -#define GAPSIZE 4 - -// Memory block header structure used internally by the debug CRT. All blocks -// allocated by the CRT are allocated from the CRT heap and, in debug mode, they -// have this header prepended to them (there's also a trailer appended at the -// end, but we're not interested in that). -typedef struct crtdbgblockheader_s -{ - struct crtblockheader_s *next; // Pointer to the next block in the list of blocks allocated from the CRT heap. - struct crtblockheader_s *prev; // Pointer to the previous block in the list of blocks allocated from the CRT heap. - char *file; // Source file where this block was allocated. - int line; // Line of code, within the above file, where this block was allocated. -#ifdef _WIN64 - int use; // This block's "use type": see below. - size_t size; // Size of the data portion of the block. -#else - size_t size; // Size of the data portion of the block. - int use; // This block's "use type": -#endif // _WIN64 -#define CRT_USE_FREE 0 // This block has been freed. -#define CRT_USE_NORMAL 1 // This is a normal (user) block. -#define CRT_USE_INTERNAL 2 // This block is used internally by the CRT. -#define CRT_USE_IGNORE 3 // This block is a specially tagged block that is ignored during some debug error checking. -#define CRT_USE_CLIENT 4 // This block is a specially tagged block with special use defined by the user application. - long request; // This block's "request" number. Basically a serial number. - unsigned char gap [GAPSIZE]; // No-man's land buffer zone, for buffer overrun/underrun checking. -} crtdbgblockheader_t; - -// Macro to strip off any sub-type information stored in a block's "use type". -#define CRT_USE_TYPE(use) (use & 0xFFFF) - -// Memory block header structure used internally by VLD. All internally -// allocated blocks are allocated from VLD's private heap and have this header -// prepended to them. -typedef struct vldblockheader_s -{ - struct vldblockheader_s *next; // Pointer to the next block in the list of internally allocated blocks. - struct vldblockheader_s *prev; // Pointer to the preceding block in the list of internally allocated blocks. - const char *file; // Name of the file where this block was allocated. - int line; // Line number within the above file where this block was allocated. - size_t size; // The size of this memory block, not including this header. - SIZE_T serialnumber; // Each block is assigned a unique serial number, starting from zero. -} vldblockheader_t; - -// Data-to-Header and Header-to-Data conversion -#define CRTDBGBLOCKHEADER(d) (crtdbgblockheader_t*)(((PBYTE)d) - sizeof(crtdbgblockheader_t)) -#define CRTDBGBLOCKDATA(h) (LPVOID)(((PBYTE)h) + sizeof(crtdbgblockheader_t)) -#define VLDBLOCKHEADER(d) (vldblockheader_t*)(((PBYTE)d) - sizeof(vldblockheader_t)) -#define VLDBLOCKDATA(h) (LPVOID)(((PBYTE)h) + sizeof(vldblockheader_t)) - -// new and delete operators for allocating from VLD's private heap. -void operator delete (void *block); -void operator delete [] (void *block); -void operator delete (void *block, const char *file, int line); -void operator delete [] (void *block, const char *file, int line); -void* operator new (size_t size, const char *file, int line); -void* operator new [] (size_t size, const char *file, int line); - -// All calls to the new operator from within VLD are mapped to the version of -// new that allocates from VLD's private heap. -#define new new(__FILE__, __LINE__) +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Internal C++ Heap Management Definitions +// Copyright (c) 2006 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifndef VLDBUILD +#error \ +"This header should only be included by Visual Leak Detector when building it from source. \ +Applications should never include this header." +#endif + +#include + +#define GAPSIZE 4 + +// Memory block header structure used internally by the debug CRT. All blocks +// allocated by the CRT are allocated from the CRT heap and, in debug mode, they +// have this header prepended to them (there's also a trailer appended at the +// end, but we're not interested in that). +typedef struct crtdbgblockheader_s +{ + struct crtblockheader_s *next; // Pointer to the next block in the list of blocks allocated from the CRT heap. + struct crtblockheader_s *prev; // Pointer to the previous block in the list of blocks allocated from the CRT heap. + char *file; // Source file where this block was allocated. + int line; // Line of code, within the above file, where this block was allocated. +#ifdef _WIN64 + int use; // This block's "use type": see below. + size_t size; // Size of the data portion of the block. +#else + size_t size; // Size of the data portion of the block. + int use; // This block's "use type": +#endif // _WIN64 +#define CRT_USE_FREE 0 // This block has been freed. +#define CRT_USE_NORMAL 1 // This is a normal (user) block. +#define CRT_USE_INTERNAL 2 // This block is used internally by the CRT. +#define CRT_USE_IGNORE 3 // This block is a specially tagged block that is ignored during some debug error checking. +#define CRT_USE_CLIENT 4 // This block is a specially tagged block with special use defined by the user application. + long request; // This block's "request" number. Basically a serial number. + unsigned char gap [GAPSIZE]; // No-man's land buffer zone, for buffer overrun/underrun checking. +} crtdbgblockheader_t; + +// Macro to strip off any sub-type information stored in a block's "use type". +#define CRT_USE_TYPE(use) (use & 0xFFFF) + +// Memory block header structure used internally by VLD. All internally +// allocated blocks are allocated from VLD's private heap and have this header +// prepended to them. +typedef struct vldblockheader_s +{ + struct vldblockheader_s *next; // Pointer to the next block in the list of internally allocated blocks. + struct vldblockheader_s *prev; // Pointer to the preceding block in the list of internally allocated blocks. + const char *file; // Name of the file where this block was allocated. + int line; // Line number within the above file where this block was allocated. + size_t size; // The size of this memory block, not including this header. + SIZE_T serialnumber; // Each block is assigned a unique serial number, starting from zero. +} vldblockheader_t; + +// Data-to-Header and Header-to-Data conversion +#define CRTDBGBLOCKHEADER(d) (crtdbgblockheader_t*)(((PBYTE)d) - sizeof(crtdbgblockheader_t)) +#define CRTDBGBLOCKDATA(h) (LPVOID)(((PBYTE)h) + sizeof(crtdbgblockheader_t)) +#define VLDBLOCKHEADER(d) (vldblockheader_t*)(((PBYTE)d) - sizeof(vldblockheader_t)) +#define VLDBLOCKDATA(h) (LPVOID)(((PBYTE)h) + sizeof(vldblockheader_t)) + +// new and delete operators for allocating from VLD's private heap. +void operator delete (void *block); +void operator delete [] (void *block); +void operator delete (void *block, const char *file, int line); +void operator delete [] (void *block, const char *file, int line); +void* operator new (size_t size, const char *file, int line); +void* operator new [] (size_t size, const char *file, int line); + +// All calls to the new operator from within VLD are mapped to the version of +// new that allocates from VLD's private heap. +#define new new(__FILE__, __LINE__) diff --git a/vldint.h b/vldint.h index 1646341c..d0884319 100644 --- a/vldint.h +++ b/vldint.h @@ -1,292 +1,291 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - VisualLeakDetector Class Definition -// Copyright (c) 2005-2009 Dan Moulding -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifndef VLDBUILD -#error \ -"This header should only be included by Visual Leak Detector when building it from source. \ -Applications should never include this header." -#endif - -#include -#include -#include "callstack.h" // Provides a custom class for handling call stacks. -#include "map.h" // Provides a custom STL-like map template. -#include "ntapi.h" // Provides access to NT APIs. -#include "set.h" // Provides a custom STL-like set template. -#include "utility.h" // Provides miscellaneous utility functions. - -#define MAXMODULELISTLENGTH 512 // Maximum module list length, in characters. -#define SELFTESTTEXTA "Memory Leak Self-Test" -#define SELFTESTTEXTW L"Memory Leak Self-Test" -#define VLDREGKEYPRODUCT L"Software\\Visual Leak Detector" -#define VLDVERSION L"1.9h" - -// The Visual Leak Detector APIs. -extern "C" __declspec(dllexport) void VLDDisable (); -extern "C" __declspec(dllexport) void VLDEnable (); - -// Function pointer types for explicit dynamic linking with functions listed in -// the import patch table. -typedef void* (__cdecl *_calloc_dbg_t) (size_t, size_t, int, const char*, int); -typedef void* (__cdecl *_malloc_dbg_t) (size_t, int, const char *, int); -typedef void* (__cdecl *_realloc_dbg_t) (void *, size_t, int, const char *, int); -typedef void* (__cdecl *calloc_t) (size_t, size_t); -typedef HRESULT (__stdcall *CoGetMalloc_t) (DWORD, LPMALLOC *); -typedef LPVOID (__stdcall *CoTaskMemAlloc_t) (ULONG); -typedef LPVOID (__stdcall *CoTaskMemRealloc_t) (LPVOID, ULONG); -typedef void* (__cdecl *malloc_t) (size_t); -typedef void* (__cdecl *new_t) (size_t); -typedef void* (__cdecl *new_dbg_crt_t) (size_t, int, const char *, int); -typedef void* (__cdecl *new_dbg_mfc_t) (size_t, const char *, int); -typedef void* (__cdecl *realloc_t) (void *, size_t); - -// Data is collected for every block allocated from any heap in the process. -// The data is stored in this structure and these structures are stored in -// a BlockMap which maps each of these structures to its corresponding memory -// block. -typedef struct blockinfo_s { - CallStack *callstack; - SIZE_T serialnumber; - SIZE_T size; -} blockinfo_t; - -// BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. -typedef Map BlockMap; - -// Information about each heap in the process is kept in this map. Primarily -// this is used for mapping heaps to all of the blocks allocated from those -// heaps. -typedef struct heapinfo_s { - BlockMap blockmap; // Map of all blocks allocated from this heap. - UINT32 flags; // Heap status flags: -#define VLD_HEAP_CRT 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). -} heapinfo_t; - -// HeapMaps map heaps (via their handles) to BlockMaps. -typedef Map HeapMap; - -// This structure stores information, primarily the virtual address range, about -// a given module and can be used with the Set template because it supports the -// '<' operator (sorts by virtual address range). -typedef struct moduleinfo_s { - BOOL operator < (const struct moduleinfo_s &other) const - { - if (addrhigh < other.addrlow) { - return TRUE; - } - else { - return FALSE; - } - } - - SIZE_T addrhigh; // Highest address within the module's virtual address space (i.e. base + size). - SIZE_T addrlow; // Lowest address within the module's virtual address space (i.e. base address). - UINT32 flags; // Module flags: -#define VLD_MODULE_EXCLUDED 0x1 // If set, this module is excluded from leak detection. -#define VLD_MODULE_SYMBOLSLOADED 0x2 // If set, this module's debug symbols have been loaded. - LPCSTR name; // The module's name (e.g. "kernel32.dll"). - LPCSTR path; // The fully qualified path from where the module was loaded. -} moduleinfo_t; - -// ModuleSets store information about modules loaded in the process. -typedef Set ModuleSet; - -// Thread local storage structure. Every thread in the process gets its own copy -// of this structure. Thread specific information, such as the current leak -// detection status (enabled or disabled) and the address that initiated the -// current allocation is stored here. -typedef struct tls_s { - SIZE_T addrfp; // Frame pointer at the first call that entered VLD's code for the current allocation. - UINT32 flags; // Thread-local status flags: -#define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. -#define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. -#define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. - DWORD threadid; // Thread ID of the thread that owns this TLS structure. -} tls_t; - -// The TlsSet allows VLD to keep track of all thread local storage structures -// allocated in the process. -typedef Set TlsSet; - -//////////////////////////////////////////////////////////////////////////////// -// -// The VisualLeakDetector Class -// -// One global instance of this class is instantiated. Upon construction it -// patches the import address table (IAT) of every other module loaded in the -// process (see the "patchimport" utility function) to allow key Windows heap -// APIs to be patched through to, or redirected to, functions provided by VLD. -// Patching the IATs in this manner allows VLD to be made aware of all -// relevant heap activity, making it possible for VLD to detect and trace -// memory leaks. -// -// The one global instance of this class is constructed within the context of -// the process' main thread during process initialization and is destroyed in -// the same context during process termination. -// -// When the VisualLeakDetector object is destroyed, it consults its internal -// datastructures, looking for any memory that has not been freed. A memory -// leak report is then generated, indicating any memory leaks that may have -// been identified. -// -// This class is derived from IMalloc so that it can provide an implementation -// of the IMalloc COM interface in order to support detection of COM-based -// memory leaks. However, this implementation of IMalloc is actually just a -// thin wrapper around the system's implementation of IMalloc. -// -class VisualLeakDetector : public IMalloc -{ -public: - VisualLeakDetector(); - ~VisualLeakDetector(); - -//////////////////////////////////////////////////////////////////////////////// -// Public CRT and MFC Common Handlers -// -// Many heap functions are indirectly rerouted to these handlers. One common -// function exists for each heap function with a given signature. These -// handlers are not direct IAT replacements, but are called by the individual -// IAT replacement functions. -//////////////////////////////////////////////////////////////////////////////// - // Standard CRT and MFC common handlers - void* _calloc (calloc_t pcalloc, SIZE_T fp, size_t num, size_t size); - void* _malloc (malloc_t pmalloc, SIZE_T fp, size_t size); - void* _new (new_t pnew, SIZE_T fp, size_t size); - void* _realloc (realloc_t prealloc, SIZE_T fp, void *mem, size_t size); - - // Debug CRT and MFC common handlers - void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, SIZE_T fp, size_t num, size_t size, int type, char const *file, int line); - void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, SIZE_T fp, size_t size, int type, char const *file, int line); - void* new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, SIZE_T fp, size_t size, int type, char const *file, int line); - void* new_dbg_mfc (new_dbg_crt_t pnew_dbg, SIZE_T fp, size_t size, int type, char const *file, int line); - void* new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, SIZE_T fp, size_t size, char const *file, int line); - void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, SIZE_T fp, void *mem, size_t size, int type, char const *file, int line); - -//////////////////////////////////////////////////////////////////////////////// -// Public IMalloc methods - for support of COM-based memory leak detection. -//////////////////////////////////////////////////////////////////////////////// - ULONG __stdcall AddRef (); - LPVOID __stdcall Alloc (ULONG size); - INT __stdcall DidAlloc (LPVOID mem); - VOID __stdcall Free (LPVOID mem); - ULONG __stdcall GetSize (LPVOID mem); - VOID __stdcall HeapMinimize (); - HRESULT __stdcall QueryInterface (REFIID iid, LPVOID *object); - LPVOID __stdcall Realloc (LPVOID mem, ULONG size); - ULONG __stdcall Release (); - -private: -//////////////////////////////////////////////////////////////////////////////// -// Private leak detection functions - see each function definition for details. -//////////////////////////////////////////////////////////////////////////////// - VOID attachtoloadedmodules (ModuleSet *newmodules); - LPWSTR buildsymbolsearchpath (); - VOID configure (); - BOOL enabled (); - SIZE_T eraseduplicates (const BlockMap::Iterator &element); - tls_t* gettls (); - VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, SIZE_T framepointer, BOOL crtalloc); - VOID mapheap (HANDLE heap); - VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, SIZE_T framepointer, BOOL crtalloc); - VOID reportconfig (); - VOID reportleaks (HANDLE heap); - VOID unmapblock (HANDLE heap, LPCVOID mem); - VOID unmapheap (HANDLE heap); - - // Static functions (callbacks) - static BOOL __stdcall addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - static BOOL __stdcall detachfrommodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - -//////////////////////////////////////////////////////////////////////////////// -// IAT replacement functions - see each function definition for details. -// -// Because there are so many virtually identical CRT and MFC replacement -// functions, they are excluded from the class to reduce the amount of noise -// within this class's code. See crtmfcpatch.cpp for those functions. -//////////////////////////////////////////////////////////////////////////////// - // Win32 IAT replacement functions - static FARPROC __stdcall _GetProcAddress (HMODULE module, LPCSTR procname); - static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); - static BOOL __stdcall _HeapDestroy (HANDLE heap); - static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, PDWORD flags, unicodestring_t *modulename, - PHANDLE modulehandle); - static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); - static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); - static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); - - // COM IAT replacement functions - static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); - static LPVOID __stdcall _CoTaskMemAlloc (ULONG size); - static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, ULONG size); - -//////////////////////////////////////////////////////////////////////////////// -// Private data -//////////////////////////////////////////////////////////////////////////////// - WCHAR m_forcedmodulelist [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. - HeapMap *m_heapmap; // Map of all active heaps in the process. - IMalloc *m_imalloc; // Pointer to the system implementation of IMalloc. - SIZE_T m_leaksfound; // Total number of leaks found. - ModuleSet *m_loadedmodules; // Contains information about all modules loaded in the process. - CRITICAL_SECTION m_loaderlock; // Serializes the attachment of newly loaded modules. - CRITICAL_SECTION m_maplock; // Serializes access to the heap and block maps. - SIZE_T m_maxdatadump; // Maximum number of user-data bytes to dump for each leaked block. - UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. - CRITICAL_SECTION m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. - UINT32 m_options; // Configuration options: -#define VLD_OPT_AGGREGATE_DUPLICATES 0x1 // If set, aggregate duplicate leaks in the leak report. -#define VLD_OPT_MODULE_LIST_INCLUDE 0x2 // If set, modules in the module list are included, all others are excluded. -#define VLD_OPT_REPORT_TO_DEBUGGER 0x4 // If set, the memory leak report is sent to the debugger. -#define VLD_OPT_REPORT_TO_FILE 0x8 // If set, the memory leak report is sent to a file. -#define VLD_OPT_SAFE_STACK_WALK 0x10 // If set, the stack is walked using the "safe" method (StackWalk64). -#define VLD_OPT_SELF_TEST 0x20 // If set, peform a self-test to verify memory leak self-checking. -#define VLD_OPT_SLOW_DEBUGGER_DUMP 0x40 // If set, inserts a slight delay between sending output to the debugger. -#define VLD_OPT_START_DISABLED 0x80 // If set, memory leak detection will initially disabled. -#define VLD_OPT_TRACE_INTERNAL_FRAMES 0x100 // If set, include useless frames (e.g. internal to VLD) in call stacks. -#define VLD_OPT_UNICODE_REPORT 0x200 // If set, the leak report will be encoded UTF-16 instead of ASCII. -#define VLD_OPT_VLDOFF 0x400 // If set, VLD will be completely deactivated. It will not attach to any modules. - static patchentry_t m_patchtable []; // Table of imports patched for attaching VLD to other modules. - FILE *m_reportfile; // File where the memory leak report may be sent to. - WCHAR m_reportfilepath [MAX_PATH]; // Full path and name of file to send memory leak report to. - const char *m_selftestfile; // Filename where the memory leak self-test block is leaked. - int m_selftestline; // Line number where the memory leak self-test block is leaked. - UINT32 m_status; // Status flags: -#define VLD_STATUS_DBGHELPLINKED 0x1 // If set, the explicit dynamic link to the Debug Help Library succeeded. -#define VLD_STATUS_INSTALLED 0x2 // If set, VLD was successfully installed. -#define VLD_STATUS_NEVER_ENABLED 0x4 // If set, VLD started disabled, and has not yet been manually enabled. -#define VLD_STATUS_FORCE_REPORT_TO_FILE 0x8 // If set, the leak report is being forced to a file. - DWORD m_tlsindex; // Thread-local storage index. - CRITICAL_SECTION m_tlslock; // Protects accesses to the Set of TLS structures. - TlsSet *m_tlsset; // Set of all all thread-local storage structres for the process. - HMODULE m_vldbase; // Visual Leak Detector's own module handle (base address). - - // The Visual Leak Detector APIs are our friends. - friend __declspec(dllexport) void VLDDisable (); - friend __declspec(dllexport) void VLDEnable (); -}; - -// Configuration option default values -#define VLD_DEFAULT_MAX_DATA_DUMP 256 -#define VLD_DEFAULT_MAX_TRACE_FRAMES 64 -#define VLD_DEFAULT_REPORT_FILE_NAME L".\\memory_leak_report.txt" +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - VisualLeakDetector Class Definition +// Copyright (c) 2005-2009 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifndef VLDBUILD +#error \ +"This header should only be included by Visual Leak Detector when building it from source. \ +Applications should never include this header." +#endif + +#include +#include +#include "callstack.h" // Provides a custom class for handling call stacks. +#include "map.h" // Provides a custom STL-like map template. +#include "ntapi.h" // Provides access to NT APIs. +#include "set.h" // Provides a custom STL-like set template. +#include "utility.h" // Provides miscellaneous utility functions. + +#define MAXMODULELISTLENGTH 512 // Maximum module list length, in characters. +#define SELFTESTTEXTA "Memory Leak Self-Test" +#define SELFTESTTEXTW L"Memory Leak Self-Test" +#define VLDREGKEYPRODUCT L"Software\\Visual Leak Detector" +#define VLDVERSION L"2.0" + +// The Visual Leak Detector APIs. +extern "C" __declspec(dllexport) void VLDDisable (); +extern "C" __declspec(dllexport) void VLDEnable (); + +// Function pointer types for explicit dynamic linking with functions listed in +// the import patch table. +typedef void* (__cdecl *_calloc_dbg_t) (size_t, size_t, int, const char*, int); +typedef void* (__cdecl *_malloc_dbg_t) (size_t, int, const char *, int); +typedef void* (__cdecl *_realloc_dbg_t) (void *, size_t, int, const char *, int); +typedef void* (__cdecl *calloc_t) (size_t, size_t); +typedef HRESULT (__stdcall *CoGetMalloc_t) (DWORD, LPMALLOC *); +typedef LPVOID (__stdcall *CoTaskMemAlloc_t) (SIZE_T); +typedef LPVOID (__stdcall *CoTaskMemRealloc_t) (LPVOID, SIZE_T); +typedef void* (__cdecl *malloc_t) (size_t); +typedef void* (__cdecl *new_t) (size_t); +typedef void* (__cdecl *new_dbg_crt_t) (size_t, int, const char *, int); +typedef void* (__cdecl *new_dbg_mfc_t) (size_t, const char *, int); +typedef void* (__cdecl *realloc_t) (void *, size_t); + +// Data is collected for every block allocated from any heap in the process. +// The data is stored in this structure and these structures are stored in +// a BlockMap which maps each of these structures to its corresponding memory +// block. +typedef struct blockinfo_s { + CallStack *callstack; + SIZE_T serialnumber; + SIZE_T size; +} blockinfo_t; + +// BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. +typedef Map BlockMap; + +// Information about each heap in the process is kept in this map. Primarily +// this is used for mapping heaps to all of the blocks allocated from those +// heaps. +typedef struct heapinfo_s { + BlockMap blockmap; // Map of all blocks allocated from this heap. + UINT32 flags; // Heap status flags: +#define VLD_HEAP_CRT 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). +} heapinfo_t; + +// HeapMaps map heaps (via their handles) to BlockMaps. +typedef Map HeapMap; + +// This structure stores information, primarily the virtual address range, about +// a given module and can be used with the Set template because it supports the +// '<' operator (sorts by virtual address range). +typedef struct moduleinfo_s { + BOOL operator < (const struct moduleinfo_s &other) const + { + if (addrhigh < other.addrlow) { + return TRUE; + } + else { + return FALSE; + } + } + + SIZE_T addrlow; // Lowest address within the module's virtual address space (i.e. base address). + SIZE_T addrhigh; // Highest address within the module's virtual address space (i.e. base + size). + UINT32 flags; // Module flags: +#define VLD_MODULE_EXCLUDED 0x1 // If set, this module is excluded from leak detection. +#define VLD_MODULE_SYMBOLSLOADED 0x2 // If set, this module's debug symbols have been loaded. + LPCSTR name; // The module's name (e.g. "kernel32.dll"). + LPCSTR path; // The fully qualified path from where the module was loaded. +} moduleinfo_t; + +// ModuleSets store information about modules loaded in the process. +typedef Set ModuleSet; + +// Thread local storage structure. Every thread in the process gets its own copy +// of this structure. Thread specific information, such as the current leak +// detection status (enabled or disabled) and the address that initiated the +// current allocation is stored here. +typedef struct tls_s { + UINT_PTR* addrofra; // Address of return address at the first call that entered VLD's code for the current allocation. + UINT32 flags; // Thread-local status flags: +#define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. +#define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. +#define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. + DWORD threadid; // Thread ID of the thread that owns this TLS structure. +} tls_t; + +// The TlsSet allows VLD to keep track of all thread local storage structures +// allocated in the process. +typedef Set TlsSet; + +//////////////////////////////////////////////////////////////////////////////// +// +// The VisualLeakDetector Class +// +// One global instance of this class is instantiated. Upon construction it +// patches the import address table (IAT) of every other module loaded in the +// process (see the "patchimport" utility function) to allow key Windows heap +// APIs to be patched through to, or redirected to, functions provided by VLD. +// Patching the IATs in this manner allows VLD to be made aware of all +// relevant heap activity, making it possible for VLD to detect and trace +// memory leaks. +// +// The one global instance of this class is constructed within the context of +// the process' main thread during process initialization and is destroyed in +// the same context during process termination. +// +// When the VisualLeakDetector object is destroyed, it consults its internal +// datastructures, looking for any memory that has not been freed. A memory +// leak report is then generated, indicating any memory leaks that may have +// been identified. +// +// This class is derived from IMalloc so that it can provide an implementation +// of the IMalloc COM interface in order to support detection of COM-based +// memory leaks. However, this implementation of IMalloc is actually just a +// thin wrapper around the system's implementation of IMalloc. +// +class VisualLeakDetector : public IMalloc +{ +public: + VisualLeakDetector(); + ~VisualLeakDetector(); + +//////////////////////////////////////////////////////////////////////////////// +// Public CRT and MFC Common Handlers +// +// Many heap functions are indirectly rerouted to these handlers. One common +// function exists for each heap function with a given signature. These +// handlers are not direct IAT replacements, but are called by the individual +// IAT replacement functions. +//////////////////////////////////////////////////////////////////////////////// + // Standard CRT and MFC common handlers + void* _calloc (calloc_t pcalloc, UINT_PTR* fp, size_t num, size_t size); + void* _malloc (malloc_t pmalloc, UINT_PTR* fp, size_t size); + void* _new (new_t pnew, UINT_PTR* fp, size_t size); + void* _realloc (realloc_t prealloc, UINT_PTR* fp, void *mem, size_t size); + + // Debug CRT and MFC common handlers + void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, UINT_PTR* fp, size_t num, size_t size, int type, char const *file, int line); + void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, UINT_PTR* fp, size_t size, int type, char const *file, int line); + void* new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, UINT_PTR* fp, size_t size, int type, char const *file, int line); + void* new_dbg_mfc (new_dbg_crt_t pnew_dbg, UINT_PTR* fp, size_t size, int type, char const *file, int line); + void* new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, UINT_PTR* fp, size_t size, char const *file, int line); + void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, UINT_PTR* fp, void *mem, size_t size, int type, char const *file, int line); + +//////////////////////////////////////////////////////////////////////////////// +// Public IMalloc methods - for support of COM-based memory leak detection. +//////////////////////////////////////////////////////////////////////////////// + ULONG __stdcall AddRef (); + LPVOID __stdcall Alloc (SIZE_T size); + INT __stdcall DidAlloc (LPVOID mem); + VOID __stdcall Free (LPVOID mem); + SIZE_T __stdcall GetSize (LPVOID mem); + VOID __stdcall HeapMinimize (); + HRESULT __stdcall QueryInterface (REFIID iid, LPVOID *object); + LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); + ULONG __stdcall Release (); + +private: +//////////////////////////////////////////////////////////////////////////////// +// Private leak detection functions - see each function definition for details. +//////////////////////////////////////////////////////////////////////////////// + VOID attachtoloadedmodules (ModuleSet *newmodules); + LPWSTR buildsymbolsearchpath (); + VOID configure (); + BOOL enabled (); + SIZE_T eraseduplicates (const BlockMap::Iterator &element); + tls_t* gettls (); + VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, UINT_PTR* framepointer, BOOL crtalloc); + VOID mapheap (HANDLE heap); + VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, UINT_PTR* framepointer, BOOL crtalloc); + VOID reportconfig (); + VOID reportleaks (HANDLE heap); + VOID unmapblock (HANDLE heap, LPCVOID mem); + VOID unmapheap (HANDLE heap); + + // Static functions (callbacks) + static BOOL __stdcall addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + static BOOL __stdcall detachfrommodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + +//////////////////////////////////////////////////////////////////////////////// +// IAT replacement functions - see each function definition for details. +// +// Because there are so many virtually identical CRT and MFC replacement +// functions, they are excluded from the class to reduce the amount of noise +// within this class's code. See crtmfcpatch.cpp for those functions. +//////////////////////////////////////////////////////////////////////////////// + // Win32 IAT replacement functions + static FARPROC __stdcall _GetProcAddress (HMODULE module, LPCSTR procname); + static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); + static BOOL __stdcall _HeapDestroy (HANDLE heap); + static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, PDWORD flags, unicodestring_t *modulename, + PHANDLE modulehandle); + static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); + static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); + static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); + + // COM IAT replacement functions + static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); + static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); + static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); +//////////////////////////////////////////////////////////////////////////////// +// Private data +//////////////////////////////////////////////////////////////////////////////// + WCHAR m_forcedmodulelist [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. + HeapMap *m_heapmap; // Map of all active heaps in the process. + IMalloc *m_imalloc; // Pointer to the system implementation of IMalloc. + SIZE_T m_leaksfound; // Total number of leaks found. + ModuleSet *m_loadedmodules; // Contains information about all modules loaded in the process. + CRITICAL_SECTION m_loaderlock; // Serializes the attachment of newly loaded modules. + CRITICAL_SECTION m_maplock; // Serializes access to the heap and block maps. + SIZE_T m_maxdatadump; // Maximum number of user-data bytes to dump for each leaked block. + UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. + CRITICAL_SECTION m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. + UINT32 m_options; // Configuration options: +#define VLD_OPT_AGGREGATE_DUPLICATES 0x1 // If set, aggregate duplicate leaks in the leak report. +#define VLD_OPT_MODULE_LIST_INCLUDE 0x2 // If set, modules in the module list are included, all others are excluded. +#define VLD_OPT_REPORT_TO_DEBUGGER 0x4 // If set, the memory leak report is sent to the debugger. +#define VLD_OPT_REPORT_TO_FILE 0x8 // If set, the memory leak report is sent to a file. +#define VLD_OPT_SAFE_STACK_WALK 0x10 // If set, the stack is walked using the "safe" method (StackWalk64). +#define VLD_OPT_SELF_TEST 0x20 // If set, peform a self-test to verify memory leak self-checking. +#define VLD_OPT_SLOW_DEBUGGER_DUMP 0x40 // If set, inserts a slight delay between sending output to the debugger. +#define VLD_OPT_START_DISABLED 0x80 // If set, memory leak detection will initially disabled. +#define VLD_OPT_TRACE_INTERNAL_FRAMES 0x100 // If set, include useless frames (e.g. internal to VLD) in call stacks. +#define VLD_OPT_UNICODE_REPORT 0x200 // If set, the leak report will be encoded UTF-16 instead of ASCII. +#define VLD_OPT_VLDOFF 0x400 // If set, VLD will be completely deactivated. It will not attach to any modules. + static patchentry_t m_patchtable []; // Table of imports patched for attaching VLD to other modules. + FILE *m_reportfile; // File where the memory leak report may be sent to. + WCHAR m_reportfilepath [MAX_PATH]; // Full path and name of file to send memory leak report to. + const char *m_selftestfile; // Filename where the memory leak self-test block is leaked. + int m_selftestline; // Line number where the memory leak self-test block is leaked. + UINT32 m_status; // Status flags: +#define VLD_STATUS_DBGHELPLINKED 0x1 // If set, the explicit dynamic link to the Debug Help Library succeeded. +#define VLD_STATUS_INSTALLED 0x2 // If set, VLD was successfully installed. +#define VLD_STATUS_NEVER_ENABLED 0x4 // If set, VLD started disabled, and has not yet been manually enabled. +#define VLD_STATUS_FORCE_REPORT_TO_FILE 0x8 // If set, the leak report is being forced to a file. + DWORD m_tlsindex; // Thread-local storage index. + CRITICAL_SECTION m_tlslock; // Protects accesses to the Set of TLS structures. + TlsSet *m_tlsset; // Set of all all thread-local storage structres for the process. + HMODULE m_vldbase; // Visual Leak Detector's own module handle (base address). + + // The Visual Leak Detector APIs are our friends. + friend __declspec(dllexport) void VLDDisable (); + friend __declspec(dllexport) void VLDEnable (); +}; + +// Configuration option default values +#define VLD_DEFAULT_MAX_DATA_DUMP 256 +#define VLD_DEFAULT_MAX_TRACE_FRAMES 64 +#define VLD_DEFAULT_REPORT_FILE_NAME L".\\memory_leak_report.txt" From 24ce89e387ec9f389cec141b9a4a0d27564476c2 Mon Sep 17 00:00:00 2001 From: KindDragon Date: Wed, 17 Mar 2010 06:25:20 +0300 Subject: [PATCH 002/321] Added support Visual Studio 2010 --- crtmfcpatch.h | 10 ++++++++++ testsuite/testsuite.cpp | 10 +++++++++- vld.cpp | 30 ++++++++++++++++++++++++++---- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 58c50c3b..8d17e8d6 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -932,6 +932,9 @@ const extern wchar_t mfc80ud_dll[] = L"mfc80ud.dll"; const extern wchar_t msvcr90d_dll[] = L"msvcr90d.dll"; const extern wchar_t mfc90d_dll[] = L"mfc90d.dll"; const extern wchar_t mfc90ud_dll[] = L"mfc90ud.dll"; +const extern wchar_t msvcr100d_dll[] = L"msvcr100d.dll"; +const extern wchar_t mfc100d_dll[] = L"mfc100d.dll"; +const extern wchar_t mfc100ud_dll[] = L"mfc100ud.dll"; // Visual Studio 6.0 typedef CrtMfcPatch VS90; +// Visual Studio 2010 +typedef CrtMfcPatch + VS100; diff --git a/testsuite/testsuite.cpp b/testsuite/testsuite.cpp index f35fee47..d93a6036 100644 --- a/testsuite/testsuite.cpp +++ b/testsuite/testsuite.cpp @@ -46,7 +46,15 @@ enum action_e { numactions }; -#define CRTDLLNAME _T("msvcr90d.dll") // Name of the debug C Runtime Library DLL on this system +// Name of the debug C Runtime Library DLL on this system +#if _MSC_VER == 1400 +#define CRTDLLNAME _T("msvcr80d.dll") +#elif _MSC_VER == 1500 +#define CRTDLLNAME _T("msvcr90d.dll") +#elif _MSC_VER == 1600 +#define CRTDLLNAME _T("msvcr100d.dll") +#endif + #define MAXALLOC 1000 // Maximum number of allocations of each type to perform, per thread #define MAXBLOCKS (MAXALLOC * numactions) // Total maximum number of allocations, per thread #define MAXDEPTH 32 // Maximum depth of the allocation call stack diff --git a/vld.cpp b/vld.cpp index 687c8f35..788ffe21 100644 --- a/vld.cpp +++ b/vld.cpp @@ -130,6 +130,18 @@ patchentry_t VisualLeakDetector::m_patchtable [] = { "mfc90ud.dll", (LPCSTR)935, 0x0, VS90::mfcud_scalar_new, "mfc90ud.dll", (LPCSTR)936, 0x0, VS90::mfcud__scalar_new_dbg_4p, "mfc90ud.dll", (LPCSTR)937, 0x0, VS90::mfcud__scalar_new_dbg_3p, + "mfc100d.dll", (LPCSTR)267, 0x0, VS100::mfcd_vector_new, + "mfc100d.dll", (LPCSTR)268, 0x0, VS100::mfcd__vector_new_dbg_4p, + "mfc100d.dll", (LPCSTR)269, 0x0, VS100::mfcd__vector_new_dbg_3p, + "mfc100d.dll", (LPCSTR)1427, 0x0, VS100::mfcd_scalar_new, + "mfc100d.dll", (LPCSTR)1428, 0x0, VS100::mfcd__scalar_new_dbg_4p, + "mfc100d.dll", (LPCSTR)1429, 0x0, VS100::mfcd__scalar_new_dbg_3p, + "mfc100ud.dll", (LPCSTR)267, 0x0, VS100::mfcud_vector_new, + "mfc100ud.dll", (LPCSTR)268, 0x0, VS100::mfcud__vector_new_dbg_4p, + "mfc100ud.dll", (LPCSTR)269, 0x0, VS100::mfcud__vector_new_dbg_3p, + "mfc100ud.dll", (LPCSTR)1434, 0x0, VS100::mfcud_scalar_new, + "mfc100ud.dll", (LPCSTR)1435, 0x0, VS100::mfcud__scalar_new_dbg_4p, + "mfc100ud.dll", (LPCSTR)1436, 0x0, VS100::mfcud__scalar_new_dbg_3p, // CRT new operators and heap APIs. "msvcrtd.dll", "_calloc_dbg", 0x0, VS60::crtd__calloc_dbg, @@ -182,6 +194,16 @@ patchentry_t VisualLeakDetector::m_patchtable [] = { "msvcr90d.dll", "realloc", 0x0, VS90::crtd_realloc, "msvcr90d.dll", scalar_new_name, 0x0, VS90::crtd_scalar_new, "msvcr90d.dll", vector_new_name, 0x0, VS90::crtd_vector_new, + "msvcr100d.dll", "_calloc_dbg", 0x0, VS100::crtd__calloc_dbg, + "msvcr100d.dll", "_malloc_dbg", 0x0, VS100::crtd__malloc_dbg, + "msvcr100d.dll", "_realloc_dbg", 0x0, VS100::crtd__realloc_dbg, + "msvcr100d.dll", scalar_new_dbg_name, 0x0, VS100::crtd__scalar_new_dbg, + "msvcr100d.dll", vector_new_dbg_name, 0x0, VS100::crtd__vector_new_dbg, + "msvcr100d.dll", "calloc", 0x0, VS100::crtd_calloc, + "msvcr100d.dll", "malloc", 0x0, VS100::crtd_malloc, + "msvcr100d.dll", "realloc", 0x0, VS100::crtd_realloc, + "msvcr100d.dll", scalar_new_name, 0x0, VS100::crtd_scalar_new, + "msvcr100d.dll", vector_new_name, 0x0, VS100::crtd_vector_new, // NT APIs. "ntdll.dll", "RtlAllocateHeap", 0x0, _RtlAllocateHeap, @@ -576,7 +598,7 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) ModuleSet::Iterator oldit; ModuleSet *oldmodules; BOOL refresh; - UINT tablesize = sizeof(m_patchtable) / sizeof(patchentry_t); + UINT tablesize = _countof(m_patchtable); ModuleSet::Muterator updateit; // Iterate through the supplied set, until all modules have been attached. @@ -1473,7 +1495,7 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, LPSTR modulepatha; ModuleSet* newmodules = (ModuleSet*)context; SIZE_T size; - UINT tablesize = sizeof(m_patchtable) / sizeof(patchentry_t); + UINT tablesize = _countof(m_patchtable); // Convert the module path to ASCII. size = wcslen(modulepath) + 1; @@ -1535,7 +1557,7 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, BOOL VisualLeakDetector::detachfrommodule (PCWSTR /*modulepath*/, DWORD64 modulebase, ULONG /*modulesize*/, PVOID /*context*/) { - UINT tablesize = sizeof(m_patchtable) / sizeof(patchentry_t); + UINT tablesize = _countof(m_patchtable); restoremodule((HMODULE)modulebase, m_patchtable, tablesize); @@ -2053,7 +2075,7 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) { patchentry_t *entry; UINT index; - UINT tablesize = sizeof(vld.m_patchtable) / sizeof(patchentry_t); + UINT tablesize = _countof(vld.m_patchtable); // See if there is an entry in the patch table that matches the requested // function. From a566701fcc735a2fad1f515b14ac3479459dc2b5 Mon Sep 17 00:00:00 2001 From: KindDragon Date: Fri, 19 Mar 2010 02:50:01 +0300 Subject: [PATCH 003/321] Improved x64 callstack tracing --- Microsoft.DTfW.DHL.manifest | 7 - callstack.cpp | 60 +++---- callstack.h | 9 +- console/vldconsole.sln | 6 + console/vldconsole.vcproj | 268 ++++++++++++++++++++++++++++--- crtmfcpatch.h | 162 +++++++++---------- mfc/res/vldmfc.ico | Bin 1078 -> 67777 bytes mfc/vldmfc.sln | 6 + mfc/vldmfc.vcproj | 309 +++++++++++++++++++++++++++++++++--- testsuite/testsuite.cpp | 6 +- utility.h | 24 ++- vld.cpp | 266 +++++++++++++++---------------- vld.vcproj | 12 +- vldint.h | 31 ++-- 14 files changed, 845 insertions(+), 321 deletions(-) delete mode 100644 Microsoft.DTfW.DHL.manifest diff --git a/Microsoft.DTfW.DHL.manifest b/Microsoft.DTfW.DHL.manifest deleted file mode 100644 index f78f4e36..00000000 --- a/Microsoft.DTfW.DHL.manifest +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/callstack.cpp b/callstack.cpp index 34b18566..542669e0 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -268,7 +268,7 @@ VOID CallStack::dump (BOOL showinternalframes) const // // None. // -VOID CallStack::push_back (const SIZE_T programcounter) +VOID CallStack::push_back (const UINT_PTR programcounter) { CallStack::chunk_t *chunk; @@ -313,17 +313,17 @@ VOID CallStack::push_back (const SIZE_T programcounter) // // None. // -VOID FastCallStack::getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer) +VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) { UINT32 count = 0; - if (framepointer == NULL) { + if (context.fp == NULL) { // Begin the stack trace with the current frame. Obtain the current // frame pointer. - ADDRESS_OF_RETURN_ADDRESS(framepointer); - framepointer--; + CAPTURE_CONTEXT(context); } + UINT_PTR* framepointer = context.fp; while (count < maxdepth) { if (*framepointer < (UINT)framepointer) { if (*framepointer == NULL) { @@ -376,31 +376,36 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer) // // None. // -VOID SafeCallStack::getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer) +VOID SafeCallStack::getstacktrace (UINT32 maxdepth, context_t& context) { DWORD architecture; - CONTEXT context; + CONTEXT currentcontext; UINT32 count = 0; STACKFRAME64 frame; - SIZE_T programcounter; - SIZE_T stackpointer; - if (framepointer == NULL) { + if (context.fp == NULL) { // Begin the stack trace with the current frame. Obtain the current // frame pointer. - ADDRESS_OF_RETURN_ADDRESS(framepointer); - framepointer--; + CAPTURE_CONTEXT(context); } + UINT_PTR* framepointer = context.fp; + + architecture = X86X64ARCHITECTURE; + memset(¤tcontext, 0, sizeof(currentcontext)); + // Get the required values for initialization of the STACKFRAME64 structure // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame. -#if defined(_M_IX86) || defined(_M_X64) - architecture = X86X64ARCHITECTURE; - programcounter = *(framepointer + 1); - stackpointer = *framepointer; // An approximation. - context.BPREG = *framepointer; - context.IPREG = programcounter; - context.SPREG = stackpointer; +#if defined(_M_IX86) + UINT_PTR programcounter = *(framepointer + 1); + UINT_PTR stackpointer = (*framepointer) - maxdepth * 10 * sizeof(void*); // An approximation. + currentcontext.SPREG = stackpointer; + currentcontext.BPREG = (DWORD64)framepointer; + currentcontext.IPREG = programcounter; +#elif defined(_M_X64) + currentcontext.SPREG = context.Rsp; + currentcontext.BPREG = (DWORD64)framepointer; + currentcontext.IPREG = context.Rip; #else // If you want to retarget Visual Leak Detector to another processor // architecture then you'll need to provide architecture-specific code to @@ -410,18 +415,19 @@ VOID SafeCallStack::getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer) // Initialize the STACKFRAME64 structure. memset(&frame, 0x0, sizeof(frame)); - frame.AddrFrame.Offset = *framepointer; - frame.AddrFrame.Mode = AddrModeFlat; - frame.AddrPC.Offset = programcounter; - frame.AddrPC.Mode = AddrModeFlat; - frame.AddrStack.Offset = stackpointer; - frame.AddrStack.Mode = AddrModeFlat; + frame.AddrPC.Offset = currentcontext.IPREG; + frame.AddrPC.Mode = AddrModeFlat; + frame.AddrStack.Offset = currentcontext.SPREG; + frame.AddrStack.Mode = AddrModeFlat; + frame.AddrFrame.Offset = currentcontext.BPREG; + frame.AddrFrame.Mode = AddrModeFlat; + frame.Virtual = TRUE; // Walk the stack. EnterCriticalSection(&stackwalklock); while (count < maxdepth) { count++; - if (!StackWalk64(architecture, currentprocess, currentthread, &frame, &context, NULL, + if (!StackWalk64(architecture, currentprocess, currentthread, &frame, ¤tcontext, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { // Couldn't trace back through any more frames. break; @@ -432,7 +438,7 @@ VOID SafeCallStack::getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer) } // Push this frame's program counter onto the CallStack. - push_back((SIZE_T)frame.AddrPC.Offset); + push_back((UINT_PTR)frame.AddrPC.Offset); } LeaveCriticalSection(&stackwalklock); } diff --git a/callstack.h b/callstack.h index d35191e1..79e7117b 100644 --- a/callstack.h +++ b/callstack.h @@ -30,6 +30,7 @@ Applications should never include this header." #endif #include +#include "utility.h" #define CALLSTACKCHUNKSIZE 32 // Number of frame slots in each CallStack chunk. @@ -62,11 +63,11 @@ class CallStack // Public APIs - see each function definition for details. VOID clear (); VOID dump (BOOL showinternalframes) const; - virtual VOID getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer) = 0; + virtual VOID getstacktrace (UINT32 maxdepth, context_t& context) = 0; CallStack& operator = (const CallStack &other); BOOL operator == (const CallStack &other) const; SIZE_T operator [] (UINT32 index) const; - VOID push_back (const SIZE_T programcounter); + VOID push_back (const UINT_PTR programcounter); protected: // Protected data. @@ -99,7 +100,7 @@ class CallStack class FastCallStack : public CallStack { public: - VOID getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer); + VOID getstacktrace (UINT32 maxdepth, context_t& context); }; //////////////////////////////////////////////////////////////////////////////// @@ -112,5 +113,5 @@ class FastCallStack : public CallStack class SafeCallStack : public CallStack { public: - VOID getstacktrace (UINT32 maxdepth, UINT_PTR *framepointer); + VOID getstacktrace (UINT32 maxdepth, context_t& context); }; diff --git a/console/vldconsole.sln b/console/vldconsole.sln index 46f28187..d0146f23 100755 --- a/console/vldconsole.sln +++ b/console/vldconsole.sln @@ -6,13 +6,19 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution C Debug|Win32 = C Debug|Win32 + C Debug|x64 = C Debug|x64 CPP Debug|Win32 = CPP Debug|Win32 + CPP Debug|x64 = CPP Debug|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|Win32.ActiveCfg = C Debug|Win32 {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|Win32.Build.0 = C Debug|Win32 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|x64.ActiveCfg = C Debug|x64 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|x64.Build.0 = C Debug|x64 {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|Win32.ActiveCfg = CPP Debug|Win32 {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|Win32.Build.0 = CPP Debug|Win32 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|x64.ActiveCfg = CPP Debug|x64 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|x64.Build.0 = CPP Debug|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/console/vldconsole.vcproj b/console/vldconsole.vcproj index 8d8027e8..8c40826b 100755 --- a/console/vldconsole.vcproj +++ b/console/vldconsole.vcproj @@ -1,23 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -217,6 +405,16 @@ PreprocessorDefinitions="" /> + + + @@ -226,6 +424,15 @@ PreprocessorDefinitions="" /> + + + + + + + + + - static void* __cdecl crtd_new_dbg (UINT_PTR* fp, size_t size, int type, char const *file, int line); + static void* __cdecl crtd_new_dbg (context_t& context, size_t size, int type, char const *file, int line); template - static void* __cdecl crtd_new (UINT_PTR* fp, size_t size); + static void* __cdecl crtd_new (context_t& context, size_t size); static void* __cdecl mfcd_vector_new (size_t size); static void* __cdecl mfcd__vector_new_dbg_4p (size_t size, int type, char const *file, int line); @@ -84,11 +84,11 @@ class CrtMfcPatch static void* __cdecl mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line); template - static void* __cdecl mfcd_new_dbg (UINT_PTR* fp, size_t size, int type, char const *file, int line); + static void* __cdecl mfcd_new_dbg (context_t& context, size_t size, int type, char const *file, int line); template - static void* __cdecl mfcd_new_dbg (UINT_PTR* fp, size_t size, char const *file, int line); + static void* __cdecl mfcd_new_dbg (context_t& context, size_t size, char const *file, int line); template - static void* __cdecl mfcd_new (UINT_PTR* fp, size_t size); + static void* __cdecl mfcd_new (context_t& context, size_t size); }; @@ -125,10 +125,10 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, { static _calloc_dbg_t pcrtxxd__calloc_dbg = NULL; - UINT_PTR* fp; + context_t context; HMODULE msvcrxxd; - ADDRESS_OF_RETURN_ADDRESS(fp); + CAPTURE_CONTEXT(context); if (pcrtxxd__calloc_dbg == NULL) { // This is the first call to this function. Link to the real @@ -137,7 +137,7 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, pcrtxxd__calloc_dbg = (_calloc_dbg_t)GetProcAddress(msvcrxxd, "_calloc_dbg"); } - return vld.__calloc_dbg(pcrtxxd__calloc_dbg, fp, num, size, type, file, line); + return vld.__calloc_dbg(pcrtxxd__calloc_dbg, context, num, size, type, file, line); } // crtd__malloc_dbg - Calls to _malloc_dbg from msvcrXXd.dll are patched @@ -164,10 +164,10 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, { static _malloc_dbg_t pcrtxxd__malloc_dbg = NULL; - UINT_PTR* fp; + context_t context; HMODULE msvcrxxd; - ADDRESS_OF_RETURN_ADDRESS(fp); + CAPTURE_CONTEXT(context); if (pcrtxxd__malloc_dbg == NULL) { // This is the first call to this function. Link to the real @@ -176,7 +176,7 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, pcrtxxd__malloc_dbg = (_malloc_dbg_t)GetProcAddress(msvcrxxd, "_malloc_dbg"); } - return vld.__malloc_dbg(pcrtxxd__malloc_dbg, fp, size, type, file, line); + return vld.__malloc_dbg(pcrtxxd__malloc_dbg, context, size, type, file, line); } // crtd__realloc_dbg - Calls to _realloc_dbg from msvcrXXd.dll are patched @@ -206,10 +206,10 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, { static _realloc_dbg_t pcrtxxd__realloc_dbg = NULL; - UINT_PTR* fp; + context_t context; HMODULE msvcrxxd; - ADDRESS_OF_RETURN_ADDRESS(fp); + CAPTURE_CONTEXT(context); if (pcrtxxd__realloc_dbg == NULL) { // This is the first call to this function. Link to the real @@ -218,7 +218,7 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, pcrtxxd__realloc_dbg = (_realloc_dbg_t)GetProcAddress(msvcrxxd, "_realloc_dbg"); } - return vld.__realloc_dbg(pcrtxxd__realloc_dbg, fp, mem, size, type, file, line); + return vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, type, file, line); } // crtd__scalar_new_dbg - Calls to the CRT's debug scalar new operator from @@ -243,10 +243,10 @@ void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, char const *file, int line) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); - return crtd_new_dbg(fp, size, type, file, line); + return crtd_new_dbg(context, size, type, file, line); } // crtd__vector_new_dbg - Calls to the CRT's debug vector new operator from @@ -271,10 +271,10 @@ void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, char const *file, int line) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); - return crtd_new_dbg(fp, size, type, file, line); + return crtd_new_dbg(context, size, type, file, line); } // crtd_calloc - Calls to calloc from msvcrXXd.dll are patched through to @@ -295,10 +295,10 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) { static calloc_t pcrtxxd_calloc = NULL; - UINT_PTR* fp; + context_t context; HMODULE msvcrxxd; - ADDRESS_OF_RETURN_ADDRESS(fp); + CAPTURE_CONTEXT(context); if (pcrtxxd_calloc == NULL) { // This is the first call to this function. Link to the real malloc. @@ -306,7 +306,7 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) pcrtxxd_calloc = (calloc_t)GetProcAddress(msvcrxxd, "calloc"); } - return vld._calloc(pcrtxxd_calloc, fp, num, size); + return vld._calloc(pcrtxxd_calloc, context, num, size); } // crtd_malloc - Calls to malloc from msvcrXXd.dll are patched through to @@ -325,10 +325,10 @@ void* CrtMfcPatch::crtd_malloc (size_t size) { static malloc_t pcrtxxd_malloc = NULL; - UINT_PTR* fp; + context_t context; HMODULE msvcrxxd; - ADDRESS_OF_RETURN_ADDRESS(fp); + CAPTURE_CONTEXT(context); if (pcrtxxd_malloc == NULL) { // This is the first call to this function. Link to the real malloc. @@ -336,7 +336,7 @@ void* CrtMfcPatch::crtd_malloc (size_t size) pcrtxxd_malloc = (malloc_t)GetProcAddress(msvcrxxd, "malloc"); } - return vld._malloc(pcrtxxd_malloc, fp, size); + return vld._malloc(pcrtxxd_malloc, context, size); } // crtd_realloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -357,10 +357,10 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) { static realloc_t pcrtxxd_realloc = NULL; - UINT_PTR* fp; + context_t context; HMODULE msvcrxxd; - ADDRESS_OF_RETURN_ADDRESS(fp); + CAPTURE_CONTEXT(context); if (pcrtxxd_realloc == NULL) { // This is the first call to this function. Link to the real realloc. @@ -368,7 +368,7 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) pcrtxxd_realloc = (realloc_t)GetProcAddress(msvcrxxd, "realloc"); } - return vld._realloc(pcrtxxd_realloc, fp, mem, size); + return vld._realloc(pcrtxxd_realloc, context, mem, size); } // crtd_scalar_new - Calls to the CRT's scalar new operator from msvcrXXd.dll @@ -383,10 +383,10 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) TEMPLATE_HEADER void* CrtMfcPatch::crtd_scalar_new (size_t size) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); - return crtd_new(fp, size); + return crtd_new(context, size); } // crtd_vector_new - Calls to the CRT's vector new operator from msvcrXXd.dll @@ -401,10 +401,10 @@ void* CrtMfcPatch::crtd_scalar_new (size_t size) TEMPLATE_HEADER void* CrtMfcPatch::crtd_vector_new (size_t size) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); - return crtd_new(fp, size); + return crtd_new(context, size); } // crtd_new_dbg - A template function for implementation of patch functions to @@ -429,7 +429,7 @@ void* CrtMfcPatch::crtd_vector_new (size_t size) // TEMPLATE_HEADER template -void* CrtMfcPatch::crtd_new_dbg (UINT_PTR* fp, +void* CrtMfcPatch::crtd_new_dbg (context_t& context, size_t size, int type, char const *file, @@ -446,7 +446,7 @@ void* CrtMfcPatch::crtd_new_dbg (UINT_PTR* fp, pcrtxxd_new_dbg = (new_dbg_crt_t)GetProcAddress(msvcrxxd, procname); } - return vld.new_dbg_crt(pcrtxxd_new_dbg, fp, size, type, file, line); + return vld.new_dbg_crt(pcrtxxd_new_dbg, context, size, type, file, line); } // crt_new - A template function for implementing patch functions to the @@ -464,7 +464,7 @@ void* CrtMfcPatch::crtd_new_dbg (UINT_PTR* fp, // TEMPLATE_HEADER template -void* CrtMfcPatch::crtd_new (UINT_PTR* fp, size_t size) +void* CrtMfcPatch::crtd_new (context_t& context, size_t size) { static new_t pcrtxxd_scalar_new = NULL; @@ -477,7 +477,7 @@ void* CrtMfcPatch::crtd_new (UINT_PTR* fp, size_t size) pcrtxxd_scalar_new = (new_t)GetProcAddress(msvcrxxd, procname); } - return vld._new(pcrtxxd_scalar_new, fp, size); + return vld._new(pcrtxxd_scalar_new, context, size); } //////////////////////////////////////////////////////////////////////////////// @@ -508,11 +508,11 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size, char const *file, int line) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); return mfcd_new_dbg - (fp, size, type, file, line); + (context, size, type, file, line); } // mfcd__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from @@ -534,11 +534,11 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size, char const *file, int line) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); return mfcd_new_dbg - (fp, size, file, line); + (context, size, file, line); } // mfcd__vector_new_dbg_4p - Calls to the MFC debug vector new operator from @@ -563,11 +563,11 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size, char const *file, int line) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); return mfcd_new_dbg - (fp, size, type, file, line); + (context, size, type, file, line); } // mfcd__vector_new_dbg_3p - Calls to the MFC debug vector new operator from @@ -589,11 +589,11 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, char const *file, int line) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); return mfcd_new_dbg - (fp, size, file, line); + (context, size, file, line); } // mfcd_scalar_new - Calls to the MFC scalar new operator from mfcXXd.dll are @@ -608,10 +608,10 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, TEMPLATE_HEADER void* CrtMfcPatch::mfcd_scalar_new (size_t size) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); - return mfcd_new(fp, size); + return mfcd_new(context, size); } // mfcd_vector_new - Calls to the MFC vector new operator from mfcXXd.dll are @@ -626,10 +626,10 @@ void* CrtMfcPatch::mfcd_scalar_new (size_t size) TEMPLATE_HEADER void* CrtMfcPatch::mfcd_vector_new (size_t size) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); - return mfcd_new(fp, size); + return mfcd_new(context, size); } // mfcud__scalar_new_dbg_4p - Calls to the MFC debug scalar new operator from @@ -654,11 +654,11 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size, char const *file, int line) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); return mfcd_new_dbg - (fp, size, type, file, line); + (context, size, type, file, line); } // mfcud__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from @@ -680,11 +680,11 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); return mfcd_new_dbg - (fp, size, file, line); + (context, size, file, line); } // mfcud__vector_new_dbg_4p - Calls to the MFC debug vector new operator from @@ -709,11 +709,11 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size, char const *file, int line) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); return mfcd_new_dbg - (fp, size, type, file, line); + (context, size, type, file, line); } // mfcud__vector_new_dbg_3p - Calls to the MFC debug vector new operator from @@ -735,11 +735,11 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size, char const *file, int line) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); return mfcd_new_dbg - (fp, size, file, line); + (context, size, file, line); } // mfcud_scalar_new - Calls to the MFC scalar new operator from mfcXXud.dll are @@ -754,10 +754,10 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size, TEMPLATE_HEADER void* CrtMfcPatch::mfcud_scalar_new (size_t size) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); - return mfcd_new(fp, size); + return mfcd_new(context, size); } // mfcud_vector_new - Calls to the MFC vector new operator from mfcXXud.dll are @@ -772,10 +772,10 @@ void* CrtMfcPatch::mfcud_scalar_new (size_t size) TEMPLATE_HEADER void* CrtMfcPatch::mfcud_vector_new (size_t size) { - UINT_PTR* fp; - ADDRESS_OF_RETURN_ADDRESS(fp); + context_t context; + CAPTURE_CONTEXT(context); - return mfcd_new(fp, size); + return mfcd_new(context, size); } // mfcd_new_dbg - A generic function for implementing patch functions to the MFC @@ -802,7 +802,7 @@ void* CrtMfcPatch::mfcud_vector_new (size_t size) // TEMPLATE_HEADER template -void* CrtMfcPatch::mfcd_new_dbg (UINT_PTR* fp, +void* CrtMfcPatch::mfcd_new_dbg (context_t& context, size_t size, int type, char const *file, @@ -819,7 +819,7 @@ void* CrtMfcPatch::mfcd_new_dbg (UINT_PTR* fp, pmfcxxd__new_dbg = (new_dbg_crt_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); } - return vld.new_dbg_mfc(pmfcxxd__new_dbg, fp, size, type, file, line); + return vld.new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } // mfcd_new_dbg - A generic function for implementing patch functions to the MFC @@ -844,7 +844,7 @@ void* CrtMfcPatch::mfcd_new_dbg (UINT_PTR* fp, // TEMPLATE_HEADER template -void* CrtMfcPatch::mfcd_new_dbg (UINT_PTR* fp, +void* CrtMfcPatch::mfcd_new_dbg (context_t& context, size_t size, char const *file, int line) @@ -860,7 +860,7 @@ void* CrtMfcPatch::mfcd_new_dbg (UINT_PTR* fp, pmfcxxd__new_dbg = (new_dbg_mfc_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); } - return vld.new_dbg_mfc(pmfcxxd__new_dbg, fp, size, file, line); + return vld.new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } // mfcd_new - A generic function for implementing patch functions to the MFC new @@ -878,7 +878,7 @@ void* CrtMfcPatch::mfcd_new_dbg (UINT_PTR* fp, // TEMPLATE_HEADER template -void* CrtMfcPatch::mfcd_new (UINT_PTR* fp, size_t size) +void* CrtMfcPatch::mfcd_new (context_t& context, size_t size) { static new_t pmfcxxd_new = NULL; @@ -891,7 +891,7 @@ void* CrtMfcPatch::mfcd_new (UINT_PTR* fp, size_t size) pmfcxxd_new = (new_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); } - return vld._new(pmfcxxd_new, fp, size); + return vld._new(pmfcxxd_new, context, size); } #undef TEMPLATE_HEADER diff --git a/mfc/res/vldmfc.ico b/mfc/res/vldmfc.ico index 7eef0bcbe6580a6f464d688906172c2d9de44262..d56fbcdfdf6eac0f4727c34770c26689271d96af 100644 GIT binary patch literal 67777 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 NK9A-8OQnhX{{?OVn?wKr literal 1078 zcmc&zF>b>!3}jLb9s)T}@Kod(893@u8ajANzT`op9^o+)S?=nU(FD@%0s)Sg^oyC8{H z9myetc;MEP)59v(LMa~xK8Yu^jIR*H22uCFiq5%C{s7(PJi>o15i^bmX4(vPxWAio z9ryY#AU_jfnd047-@`)XzL?%iS$gQyFP{44kS9X)fN{{QoL~hO-&=q&20Zr*cxFAt PkaNE{wR~2C$NfnjhSXWT diff --git a/mfc/vldmfc.sln b/mfc/vldmfc.sln index c7c5d643..1ddbd0da 100755 --- a/mfc/vldmfc.sln +++ b/mfc/vldmfc.sln @@ -6,13 +6,19 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/mfc/vldmfc.vcproj b/mfc/vldmfc.vcproj index 02aa5448..405a18ad 100755 --- a/mfc/vldmfc.vcproj +++ b/mfc/vldmfc.vcproj @@ -1,9 +1,10 @@ @@ -11,14 +12,17 @@ + @@ -77,11 +81,12 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -229,6 +428,16 @@ UsePrecompiledHeader="1" /> + + + @@ -239,6 +448,16 @@ UsePrecompiledHeader="1" /> + + + + + + @@ -261,6 +489,15 @@ PreprocessorDefinitions="" /> + + + + + + @@ -281,6 +526,14 @@ PreprocessorDefinitions="" /> + + + + + + @@ -303,6 +565,15 @@ PreprocessorDefinitions="" /> + + + #include -#pragma intrinsic(_AddressOfReturnAddress) - #ifdef _WIN64 #define ADDRESSFORMAT L"0x%.16X" // Format string for 64-bit addresses #else @@ -60,8 +58,26 @@ Applications should never include this header." #define SPREG Rsp #endif // _M_IX86 -#if defined(_M_IX86) || defined (_M_X64) -#define ADDRESS_OF_RETURN_ADDRESS(fp) fp = (UINT_PTR*)_AddressOfReturnAddress() // Copies the current frame pointer to the supplied variable. +typedef struct context_s +{ + UINT_PTR* fp; +#if defined(_M_X64) + DWORD64 Rsp; + DWORD64 Rip; +#endif // _M_IX86 +} context_t; + +#if defined(_M_IX86) +// Copies the current frame pointer to the supplied variable. +#define CAPTURE_CONTEXT(context) context.fp = ((UINT_PTR*)_AddressOfReturnAddress()) - 1 +#define GET_RETURN_ADDRESS(context) *(context.fp + 1) +#elif defined(_M_X64) +// Capture current context +#define CAPTURE_CONTEXT(context) CONTEXT _ctx; \ + RtlCaptureContext(&_ctx); \ + context.Rsp = _ctx.Rsp; context.Rip = _ctx.Rip; \ + context.fp = ((UINT_PTR*)_AddressOfReturnAddress()) - 1 +#define GET_RETURN_ADDRESS(context) *(context.fp + 1) #else // If you want to retarget Visual Leak Detector to another processor // architecture then you'll need to provide an architecture-specific macro to diff --git a/vld.cpp b/vld.cpp index 788ffe21..4d87cb77 100644 --- a/vld.cpp +++ b/vld.cpp @@ -26,6 +26,7 @@ #pragma comment(lib, "dbghelp.lib") #include + #define VLDBUILD // Declares that we are building Visual Leak Detector. #include "callstack.h" // Provides a class for handling call stacks. #include "crtmfcpatch.h" // Provides CRT and MFC patch functions. @@ -1005,7 +1006,7 @@ tls_t* VisualLeakDetector::gettls () // This thread's thread local storage structure has not been allocated. tls = new tls_t; TlsSetValue(m_tlsindex, tls); - tls->addrofra = 0x0; + ZeroMemory(&tls->context, sizeof(tls->context)); tls->flags = 0x0; tls->threadid = GetCurrentThreadId(); @@ -1038,7 +1039,7 @@ tls_t* VisualLeakDetector::gettls () // // None. // -VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, UINT_PTR* addrOfRetAddr, BOOL crtalloc) +VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, context_t& context, BOOL crtalloc) { blockinfo_t *blockinfo; BlockMap::Iterator blockit; @@ -1047,21 +1048,27 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, UINT_P static SIZE_T serialnumber = 0; // Record the block's information. - blockinfo = new blockinfo_t; + blockinfo = new blockinfo_t; +#if defined(_M_IX86) if (m_options & VLD_OPT_SAFE_STACK_WALK) { blockinfo->callstack = new SafeCallStack; } else { blockinfo->callstack = new FastCallStack; } +#else + blockinfo->callstack = new SafeCallStack; +#endif if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { // Passing NULL for the frame pointer argument will force the stack // trace to begin at the current frame. - blockinfo->callstack->getstacktrace(m_maxtraceframes, NULL); + context_t t; + t.fp = 0; + blockinfo->callstack->getstacktrace(m_maxtraceframes, t); } else { // Start the stack trace at the call that first entered VLD's code. - blockinfo->callstack->getstacktrace(m_maxtraceframes, (addrOfRetAddr - 1)); + blockinfo->callstack->getstacktrace(m_maxtraceframes, context); } blockinfo->serialnumber = serialnumber++; blockinfo->size = size; @@ -1155,7 +1162,7 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) // // None. // -VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, UINT_PTR* framepointer, +VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, context_t& context, BOOL crtalloc) { BlockMap::Iterator blockit; @@ -1167,7 +1174,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. unmapblock(heap, mem); - mapblock(heap, newmem, size, framepointer, crtalloc); + mapblock(heap, newmem, size, context, crtalloc); return; } @@ -1180,7 +1187,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // block has also not been mapped to a blockinfo_t entry yet either, // so treat this reallocation as a brand-new allocation (this will // also map the heap to a new block map). - mapblock(heap, newmem, size, framepointer, crtalloc); + mapblock(heap, newmem, size, context, crtalloc); LeaveCriticalSection(&m_maplock); return; } @@ -1191,7 +1198,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (blockit == blockmap->end()) { // The block hasn't been mapped to a blockinfo_t entry yet. // Treat this reallocation as a new allocation. - mapblock(heap, newmem, size, framepointer, crtalloc); + mapblock(heap, newmem, size, context, crtalloc); LeaveCriticalSection(&m_maplock); return; } @@ -1209,13 +1216,15 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // Update the block's callstack and size. if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { // Passing NULL for the frame pointer argument will force - // the stack trace to begin at the current frame. - info->callstack->getstacktrace(m_maxtraceframes, NULL); + // the stack trace to begin at the current frame. + context_t t; + t.fp = 0; + info->callstack->getstacktrace(m_maxtraceframes, t); } else { // Start the stack trace at the call that first entered // VLD's code. - info->callstack->getstacktrace(m_maxtraceframes, (framepointer - 1)); + info->callstack->getstacktrace(m_maxtraceframes, context); } info->size = size; } @@ -1592,7 +1601,7 @@ BOOL VisualLeakDetector::detachfrommodule (PCWSTR /*modulepath*/, DWORD64 module // Returns the value returned from the specified calloc. // void* VisualLeakDetector::_calloc (calloc_t pcalloc, - UINT_PTR* fp, + context_t& context, size_t num, size_t size) { @@ -1602,17 +1611,17 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // malloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - tls->addrofra = fp; + tls->context = context; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pcalloc(num, size); - // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -1632,7 +1641,7 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // // Returns the value returned from the specified malloc. // -void *VisualLeakDetector::_malloc (malloc_t pmalloc, UINT_PTR* fp, size_t size) +void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t size) { void *block; tls_t *tls = vld.gettls(); @@ -1640,17 +1649,17 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, UINT_PTR* fp, size_t size) // malloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - tls->addrofra = fp; + tls->context = context; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pmalloc(size); - // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -1670,7 +1679,7 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, UINT_PTR* fp, size_t size) // // Returns the value returned by the specified CRT new operator. // -void* VisualLeakDetector::_new (new_t pnew, UINT_PTR* fp, size_t size) +void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) { void *block; tls_t *tls = vld.gettls(); @@ -1678,17 +1687,17 @@ void* VisualLeakDetector::_new (new_t pnew, UINT_PTR* fp, size_t size) // The new operator is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - tls->addrofra = fp; + tls->context = context; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew(size); - // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -1711,7 +1720,7 @@ void* VisualLeakDetector::_new (new_t pnew, UINT_PTR* fp, size_t size) // Returns the value returned from the specified realloc. // void* VisualLeakDetector::_realloc (realloc_t prealloc, - UINT_PTR* fp, + context_t& context, void *mem, size_t size) { @@ -1721,17 +1730,17 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // realloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - tls->addrofra = fp; + tls->context = context; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. block = prealloc(mem, size); - // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -1770,7 +1779,7 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // Returns the value returned by the specified _calloc_dbg. // void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, - UINT_PTR* fp, + context_t& context, size_t num, size_t size, int type, @@ -1783,17 +1792,17 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // _malloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - tls->addrofra = fp; + tls->context = context; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = p_calloc_dbg(num, size, type, file, line); - // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -1822,7 +1831,7 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // Returns the value returned by the specified _malloc_dbg. // void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, - UINT_PTR* fp, + context_t& context, size_t size, int type, char const *file, @@ -1834,17 +1843,17 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // _malloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - tls->addrofra = fp; + tls->context = context; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = p_malloc_dbg(size, type, file, line); - // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -1873,7 +1882,7 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, - UINT_PTR* fp, + context_t& context, size_t size, int type, char const *file, @@ -1885,17 +1894,17 @@ void* VisualLeakDetector::new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // The debug new operator is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - tls->addrofra = fp; + tls->context = context; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg_crt(size, type, file, line); - // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -1924,7 +1933,7 @@ void* VisualLeakDetector::new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::new_dbg_mfc (new_dbg_crt_t pnew_dbg, - UINT_PTR* fp, + context_t& context, size_t size, int type, char const *file, @@ -1933,17 +1942,17 @@ void* VisualLeakDetector::new_dbg_mfc (new_dbg_crt_t pnew_dbg, void *block; tls_t *tls = vld.gettls(); - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - tls->addrofra = fp; + tls->context = context; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg(size, type, file, line); - // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -1970,7 +1979,7 @@ void* VisualLeakDetector::new_dbg_mfc (new_dbg_crt_t pnew_dbg, // Returns the value returned by the specified MFC debug new operator. // void* VisualLeakDetector::new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, - UINT_PTR* fp, + context_t& context, size_t size, char const *file, int line) @@ -1978,17 +1987,17 @@ void* VisualLeakDetector::new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, void *block; tls_t *tls = vld.gettls(); - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - tls->addrofra = fp; + tls->context = context; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg_mfc(size, file, line); - // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -2019,7 +2028,7 @@ void* VisualLeakDetector::new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, - UINT_PTR* fp, + context_t& context, void *mem, size_t size, int type, @@ -2032,17 +2041,17 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // _realloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - tls->addrofra = fp; + tls->context = context; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. block = p_realloc_dbg(mem, size, type, file, line); - // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -2129,14 +2138,12 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m SYMBOL_INFO *functioninfo; HANDLE heap; HeapMap::Iterator heapit; - UINT_PTR* fp; UINT_PTR ra; BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; BOOL symfound; // Get the return address within the calling function. - ADDRESS_OF_RETURN_ADDRESS(fp); - ra = *fp; + ra = (UINT_PTR)_ReturnAddress(); // Create the heap. heap = HeapCreate(options, initsize, maxsize); @@ -2271,52 +2278,38 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, PDWORD flags, unico LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) { BOOL crtalloc; - BOOL excluded = FALSE; - UINT_PTR* fp; + context_t context; LPVOID block; - moduleinfo_t moduleinfo; - ModuleSet::Iterator moduleit; - UINT_PTR returnaddress; tls_t *tls = vld.gettls(); // Allocate the block. block = RtlAllocateHeap(heap, flags, size); if ((block != NULL) && vld.enabled()) { - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - ADDRESS_OF_RETURN_ADDRESS(fp); + CAPTURE_CONTEXT(context); } else { - fp = tls->addrofra; + context = tls->context; } crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; // Reset thread local flags and variables, in case any libraries called - // into while mapping the block allocate some memory. - tls->addrofra = 0x0; + // into while mapping the block allocate some memory. + tls->context.fp = 0x0; tls->flags &=~VLD_TLS_CRTALLOC; - // Find the information for the module that initiated this allocation. - returnaddress = *fp; - moduleinfo.addrhigh = returnaddress; - moduleinfo.addrlow = returnaddress; - EnterCriticalSection(&vld.m_moduleslock); - moduleit = vld.m_loadedmodules->find(moduleinfo); - if (moduleit != vld.m_loadedmodules->end()) { - excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; - } - LeaveCriticalSection(&vld.m_moduleslock); - if (!excluded) { + if (!IsModuleExcluded(GET_RETURN_ADDRESS(context))) { // The module that initiated this allocation is included in leak // detection. Map this block to the specified heap. - vld.mapblock(heap, block, size, fp, crtalloc); + vld.mapblock(heap, block, size, context, crtalloc); } } - // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -2349,6 +2342,23 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) return status; } +// Find the information for the module that initiated this reallocation. +BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) +{ + BOOL excluded = FALSE; + moduleinfo_t moduleinfo; + ModuleSet::Iterator moduleit; + moduleinfo.addrhigh = address; + moduleinfo.addrlow = address; + EnterCriticalSection(&vld.m_moduleslock); + moduleit = vld.m_loadedmodules->find(moduleinfo); + if (moduleit != vld.m_loadedmodules->end()) { + excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; + } + LeaveCriticalSection(&vld.m_moduleslock); + return excluded; +} + // _RtlReAllocateHeap - Calls to RtlReAllocateHeap are patched through to this // function. This function invokes the real RtlReAllocateHeap and then calls // VLD's reallocation tracking function. All arguments passed to this function @@ -2372,52 +2382,38 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { BOOL crtalloc; - BOOL excluded = FALSE; - UINT_PTR* fp; - moduleinfo_t moduleinfo; - ModuleSet::Iterator moduleit; + context_t context; LPVOID newmem; - UINT_PTR returnaddress; tls_t *tls = vld.gettls(); // Reallocate the block. newmem = RtlReAllocateHeap(heap, flags, mem, size); - if (newmem != NULL) { - if (tls->addrofra == 0x0) { + if (newmem != NULL) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - ADDRESS_OF_RETURN_ADDRESS(fp); + CAPTURE_CONTEXT(context); } else { - fp = tls->addrofra; + context = tls->context; } crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; // Reset thread local flags and variables, in case any libraries called // into while remapping the block allocate some memory. - tls->addrofra = 0x0; + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; - // Find the information for the module that initiated this reallocation. - returnaddress = *fp; - moduleinfo.addrhigh = returnaddress; - moduleinfo.addrlow = returnaddress; - EnterCriticalSection(&vld.m_moduleslock); - moduleit = vld.m_loadedmodules->find(moduleinfo); - if (moduleit != vld.m_loadedmodules->end()) { - excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; - } - LeaveCriticalSection(&vld.m_moduleslock); - if (!excluded) { + if (!IsModuleExcluded(GET_RETURN_ADDRESS(context))) { // The module that initiated this allocation is included in leak // detection. Remap the block. - vld.remapblock(heap, mem, newmem, size, fp, crtalloc); + vld.remapblock(heap, mem, newmem, size, context, crtalloc); } } // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return newmem; @@ -2480,16 +2476,16 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) { static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; - LPVOID block; - UINT_PTR* fp; + LPVOID block; + context_t context; HMODULE ole32; tls_t *tls = vld.gettls(); - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - ADDRESS_OF_RETURN_ADDRESS(fp); - tls->addrofra = fp; + CAPTURE_CONTEXT(context); + tls->context = context; } if (pCoTaskMemAlloc == NULL) { @@ -2503,7 +2499,7 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) block = pCoTaskMemAlloc(size); // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -2526,16 +2522,16 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) { static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; - LPVOID block; - UINT_PTR* fp; + LPVOID block; + context_t context; HMODULE ole32; tls_t *tls = vld.gettls(); - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - ADDRESS_OF_RETURN_ADDRESS(fp); - tls->addrofra = fp; + CAPTURE_CONTEXT(context); + tls->context = context; } if (pCoTaskMemRealloc == NULL) { @@ -2549,7 +2545,7 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) block = pCoTaskMemRealloc(mem, size); // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -2587,15 +2583,15 @@ ULONG VisualLeakDetector::AddRef () // LPVOID VisualLeakDetector::Alloc (SIZE_T size) { - LPVOID block; - UINT_PTR* fp; + LPVOID block; + context_t context; tls_t *tls = vld.gettls(); - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - ADDRESS_OF_RETURN_ADDRESS(fp); - tls->addrofra = fp; + CAPTURE_CONTEXT(context); + tls->context = context; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -2603,7 +2599,7 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) block = m_imalloc->Alloc(size); // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; @@ -2706,14 +2702,14 @@ HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) { LPVOID block; - UINT_PTR* fp; + context_t context; tls_t *tls = vld.gettls(); - if (tls->addrofra == 0x0) { + if (tls->context.fp == 0x0) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - ADDRESS_OF_RETURN_ADDRESS(fp); - tls->addrofra = fp; + CAPTURE_CONTEXT(context); + tls->context = context; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -2721,7 +2717,7 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) block = m_imalloc->Realloc(mem, size); // Reset thread local flags and variables for the next allocation. - tls->addrofra = 0x0; + tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; return block; diff --git a/vld.vcproj b/vld.vcproj index 8a8d30cf..99fb7720 100644 --- a/vld.vcproj +++ b/vld.vcproj @@ -46,8 +46,7 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0502" BasicRuntimeChecks="3" - RuntimeLibrary="3" - EnableFunctionLevelLinking="true" + RuntimeLibrary="1" UsePrecompiledHeader="2" WarningLevel="4" DebugInformationFormat="4" @@ -119,8 +118,7 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN64;_WIN32_WINNT=0x0502" BasicRuntimeChecks="3" - RuntimeLibrary="3" - EnableFunctionLevelLinking="true" + RuntimeLibrary="1" UsePrecompiledHeader="2" WarningLevel="4" DebugInformationFormat="3" @@ -195,8 +193,9 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0502" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" FloatingPointModel="2" UsePrecompiledHeader="2" DebugInformationFormat="3" @@ -273,8 +272,9 @@ AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN64;_WIN32_WINNT=0x0502" StringPooling="true" - RuntimeLibrary="2" + RuntimeLibrary="0" BufferSecurityCheck="false" + EnableFunctionLevelLinking="true" FloatingPointModel="2" UsePrecompiledHeader="2" DebugInformationFormat="3" diff --git a/vldint.h b/vldint.h index d0884319..0ff1b4ca 100644 --- a/vldint.h +++ b/vldint.h @@ -118,7 +118,7 @@ typedef Set ModuleSet; // detection status (enabled or disabled) and the address that initiated the // current allocation is stored here. typedef struct tls_s { - UINT_PTR* addrofra; // Address of return address at the first call that entered VLD's code for the current allocation. + context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. UINT32 flags; // Thread-local status flags: #define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. #define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. @@ -171,18 +171,18 @@ class VisualLeakDetector : public IMalloc // IAT replacement functions. //////////////////////////////////////////////////////////////////////////////// // Standard CRT and MFC common handlers - void* _calloc (calloc_t pcalloc, UINT_PTR* fp, size_t num, size_t size); - void* _malloc (malloc_t pmalloc, UINT_PTR* fp, size_t size); - void* _new (new_t pnew, UINT_PTR* fp, size_t size); - void* _realloc (realloc_t prealloc, UINT_PTR* fp, void *mem, size_t size); + void* _calloc (calloc_t pcalloc, context_t& context, size_t num, size_t size); + void* _malloc (malloc_t pmalloc, context_t& context, size_t size); + void* _new (new_t pnew, context_t& context, size_t size); + void* _realloc (realloc_t prealloc, context_t& context, void *mem, size_t size); // Debug CRT and MFC common handlers - void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, UINT_PTR* fp, size_t num, size_t size, int type, char const *file, int line); - void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, UINT_PTR* fp, size_t size, int type, char const *file, int line); - void* new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, UINT_PTR* fp, size_t size, int type, char const *file, int line); - void* new_dbg_mfc (new_dbg_crt_t pnew_dbg, UINT_PTR* fp, size_t size, int type, char const *file, int line); - void* new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, UINT_PTR* fp, size_t size, char const *file, int line); - void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, UINT_PTR* fp, void *mem, size_t size, int type, char const *file, int line); + void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, size_t num, size_t size, int type, char const *file, int line); + void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, size_t size, int type, char const *file, int line); + void* new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, size_t size, int type, char const *file, int line); + void* new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); + void* new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); + void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, void *mem, size_t size, int type, char const *file, int line); //////////////////////////////////////////////////////////////////////////////// // Public IMalloc methods - for support of COM-based memory leak detection. @@ -207,9 +207,9 @@ class VisualLeakDetector : public IMalloc BOOL enabled (); SIZE_T eraseduplicates (const BlockMap::Iterator &element); tls_t* gettls (); - VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, UINT_PTR* framepointer, BOOL crtalloc); + VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, context_t& context, BOOL crtalloc); VOID mapheap (HANDLE heap); - VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, UINT_PTR* framepointer, BOOL crtalloc); + VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, context_t& context, BOOL crtalloc); VOID reportconfig (); VOID reportleaks (HANDLE heap); VOID unmapblock (HANDLE heap, LPCVOID mem); @@ -219,6 +219,9 @@ class VisualLeakDetector : public IMalloc static BOOL __stdcall addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); static BOOL __stdcall detachfrommodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + // Utils + static BOOL IsModuleExcluded (UINT_PTR returnaddress); + //////////////////////////////////////////////////////////////////////////////// // IAT replacement functions - see each function definition for details. // @@ -236,7 +239,7 @@ class VisualLeakDetector : public IMalloc static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); - // COM IAT replacement functions + // COM IAT replacement functions static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); From ede030944acd16298cfd825405d939e60d4fa60b Mon Sep 17 00:00:00 2001 From: KindDragon Date: Fri, 19 Mar 2010 23:32:47 +0300 Subject: [PATCH 004/321] 64-bit MFC functions ordinals fixed Rewrited m_patchtable Added support x64 MFC 7 (VS2005) --- callstack.cpp | 2 +- crtmfcpatch.h | 29 +++- ntapi.h | 2 +- utility.cpp | 367 +++++++++++++++++++++------------------- utility.h | 21 ++- vld.cpp | 450 ++++++++++++++++++++++++++++++++------------------ vldint.h | 7 +- 7 files changed, 526 insertions(+), 352 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 542669e0..137490bb 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Implementations -// Copyright (c) 2005-2009 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/crtmfcpatch.h b/crtmfcpatch.h index e76b2e7c..56bd0b35 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CRT and MFC IAT Patch Functions Header -// Copyright (c) 2009 Dan Moulding +// Copyright (c) 2009-2010 Dan Moulding // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -88,7 +88,7 @@ class CrtMfcPatch template static void* __cdecl mfcd_new_dbg (context_t& context, size_t size, char const *file, int line); template - static void* __cdecl mfcd_new (context_t& context, size_t size); + static void* __cdecl mfcd_new (context_t& context, size_t size); }; @@ -960,21 +960,36 @@ typedef CrtMfcPatch + 267, 268, 269, 893, 894, 895> +#else + 267, 268, 269, 907, 908, 909, + 267, 268, 269, 907, 908, 909> +#endif VS80; // Visual Studio 2008 typedef CrtMfcPatch + 267, 268, 269, 935, 936, 937> +#else + 267, 268, 269, 909, 910, 911, + 267, 268, 269, 913, 914, 915> +#endif VS90; // Visual Studio 2010 typedef CrtMfcPatch +#else + 267, 268, 269, 1405, 1406, 1407, + 267, 268, 269, 1412, 1413, 1414> +#endif VS100; diff --git a/ntapi.h b/ntapi.h index 6d7ad67e..474c999c 100644 --- a/ntapi.h +++ b/ntapi.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - NT API Definitions -// Copyright (c) 2006-2009 Dan Moulding +// Copyright (c) 2006-2010 Dan Moulding // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/utility.cpp b/utility.cpp index 34f3fb81..78efbeac 100644 --- a/utility.cpp +++ b/utility.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Various Utility Functions -// Copyright (c) 2005-2009 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -282,52 +282,61 @@ BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodule // Returns TRUE if the module has been patched to use the specified // replacement export. // -BOOL findpatch (HMODULE importmodule, LPCSTR exportmodulename, LPCVOID replacement) +BOOL findpatch (HMODULE importmodule, moduleentry_t *module) { - IMAGE_THUNK_DATA *iate; - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return FALSE; - } - while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return FALSE; - } - - // Locate the replacement's IAT entry. - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)replacement) { - // Found the IAT entry for the replacement. This patch has been - // installed. - return TRUE; - } - iate++; - } - - // The module does not import the replacement. The patch has not been - // installed. - return FALSE; + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return FALSE; + } + while (idte->OriginalFirstThunk != 0x0) { + if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), module->exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->OriginalFirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return FALSE; + } + + int i = 0; + patchentry_t *entry = module->patchtable; + while(entry->importname) + { + LPCVOID replacement = entry->replacement; + + IMAGE_THUNK_DATA *iate; + + // Locate the replacement's IAT entry. + iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) { + if (iate->u1.Function == (DWORD_PTR)replacement) { + // Found the IAT entry for the replacement. This patch has been + // installed. + return TRUE; + } + iate++; + } + entry++; i++; + } + + // The module does not import the replacement. The patch has not been + // installed. + return FALSE; } // insertreportdelay - Sets the report function to sleep for a bit after each @@ -358,9 +367,9 @@ VOID insertreportdelay () // Returns TRUE if at least one of the patches listed in the patch table is // installed in the importmodule. Otherwise returns FALSE. // -BOOL moduleispatched (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize) +BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize) { - patchentry_t *entry; + moduleentry_t *entry; BOOL found = FALSE; UINT index; @@ -368,8 +377,8 @@ BOOL moduleispatched (HMODULE importmodule, patchentry_t patchtable [], UINT tab // entry to see if it is installed in the import module. If any patch entry // is installed in the import module, then the module has been patched. for (index = 0; index < tablesize; index++) { - entry = &patchtable[index]; - found = findpatch(importmodule, entry->exportmodulename, entry->replacement); + entry = &patchtable[index]; + found = findpatch(importmodule, entry); if (found == TRUE) { // Found one of the listed patches installed in the import module. return TRUE; @@ -410,67 +419,79 @@ BOOL moduleispatched (HMODULE importmodule, patchentry_t patchtable [], UINT tab // import module does not import the specified export, so nothing changed, // then FALSE will be returned. // -BOOL patchimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, - LPCVOID replacement) +BOOL patchimport (HMODULE importmodule, moduleentry_t *module) { - IMAGE_THUNK_DATA *iate; - IMAGE_IMPORT_DESCRIPTOR *idte; - FARPROC import; - DWORD protect; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return FALSE; - } - while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return FALSE; - } - - // Get the *real* address of the import. If we find this address in the IAT, - // then we've found the entry that needs to be patched. - import = GetProcAddress(exportmodule, importname); - assert(import != NULL); // Perhaps the named export module does not actually export the named import? - - // Locate the import's IAT entry. - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)import) { - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the address of the replacement. Note that the IAT - // entry may be write-protected, so we must first ensure that it is - // writable. - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)replacement; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - - // The patch has been installed in the import module. - return TRUE; - } - iate++; - } + DWORD result = 0; + HMODULE exportmodule = (HMODULE)module->modulebase; + LPCSTR exportmodulename = module->exportmodulename; + + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return FALSE; + } + while (idte->FirstThunk != 0x0) { + if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->FirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return FALSE; + } + + patchentry_t *entry = module->patchtable; + int i = 0; + while(entry->importname) + { + LPCSTR importname = entry->importname; + LPCVOID replacement = entry->replacement; + IMAGE_THUNK_DATA *iate; + DWORD protect; + FARPROC import; + + // Get the *real* address of the import. If we find this address in the IAT, + // then we've found the entry that needs to be patched. + import = GetProcAddress(exportmodule, importname); + assert(import != NULL); // Perhaps the named export module does not actually export the named import? + + // Locate the import's IAT entry. + iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) { + if (iate->u1.Function == (DWORD_PTR)import) { + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the address of the replacement. Note that the IAT + // entry may be write-protected, so we must first ensure that it is + // writable. + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)replacement; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + + // The patch has been installed in the import module. + result++; + } + iate++; + } + entry++; i++; + } // The import's IAT entry was not found. The importing module does not // import the specified import. - return FALSE; + return result > 0; } // patchmodule - Patches all imports listed in the supplied patch table, and @@ -493,9 +514,9 @@ BOOL patchimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodul // Returns TRUE if at least one of the patches listed in the patch table was // installed in the importmodule. Otherwise returns FALSE. // -BOOL patchmodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize) +BOOL patchmodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize) { - patchentry_t *entry; + moduleentry_t *entry; UINT index; BOOL patched = FALSE; @@ -503,8 +524,7 @@ BOOL patchmodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesi // listed in the table. for (index = 0; index < tablesize; index++) { entry = &patchtable[index]; - if (patchimport(importmodule, (HMODULE)entry->modulebase, entry->exportmodulename, entry->importname, - entry->replacement) == TRUE) { + if (patchimport(importmodule, entry) == TRUE) { patched = TRUE; } } @@ -592,60 +612,72 @@ VOID report (LPCWSTR format, ...) // // None. // -VOID restoreimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, - LPCVOID replacement) +VOID restoreimport (HMODULE importmodule, moduleentry_t* module) { - IMAGE_THUNK_DATA *iate; - IMAGE_IMPORT_DESCRIPTOR *idte; - FARPROC import; - DWORD protect; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return; - } - while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return; - } - - // Get the *real* address of the import. - import = GetProcAddress(exportmodule, importname); - assert(import != NULL); // Perhaps the named export module does not actually export the named import? - - // Locate the import's original IAT entry (it currently has the replacement - // address in it). - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)replacement) { - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the import's real address. Note that the IAT entry may - // be write-protected, so we must first ensure that it is writable. - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)import; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - break; - } - iate++; - } + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + HMODULE exportmodule = (HMODULE)module->modulebase; + LPCSTR exportmodulename = module->exportmodulename; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return; + } + while (idte->OriginalFirstThunk != 0x0) { + if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->OriginalFirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return; + } + + int i = 0; + patchentry_t *entry = module->patchtable; + while(entry->importname) + { + IMAGE_THUNK_DATA *iate; + FARPROC import; + DWORD protect; + + LPCSTR importname = entry->importname; + LPCVOID replacement = entry->replacement; + + // Get the *real* address of the import. + import = GetProcAddress(exportmodule, importname); + assert(import != NULL); // Perhaps the named export module does not actually export the named import? + + // Locate the import's original IAT entry (it currently has the replacement + // address in it). + iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) { + if (iate->u1.Function == (DWORD_PTR)replacement) { + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the import's real address. Note that the IAT entry may + // be write-protected, so we must first ensure that it is writable. + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)import; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + break; + } + iate++; + } + entry++; i++; + } } // restoremodule - Restores all imports listed in the supplied patch table, and @@ -666,17 +698,16 @@ VOID restoreimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmod // // None. // -VOID restoremodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize) +VOID restoremodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize) { - patchentry_t *entry; + moduleentry_t *entry; UINT index; // Loop through the import patch table, individually restoring each import // listed in the table. for (index = 0; index < tablesize; index++) { entry = &patchtable[index]; - restoreimport(importmodule, (HMODULE)entry->modulebase, entry->exportmodulename, entry->importname, - entry->replacement); + restoreimport(importmodule, entry); } } diff --git a/utility.h b/utility.h index d515c477..f94e9fcf 100644 --- a/utility.h +++ b/utility.h @@ -101,26 +101,29 @@ enum encoding_e { // through to replacement functions provided by VLD. typedef struct patchentry_s { - LPCSTR exportmodulename; // The name of the module exporting the patched API. LPCSTR importname; // The name (or ordinal) of the imported API being patched. - UINT_PTR modulebase; // The base address of the exporting module (filled in at runtime when the modules are loaded). LPCVOID replacement; // Pointer to the function to which the imported API should be patched through to. } patchentry_t; +typedef struct moduleentry_s +{ + LPCSTR exportmodulename; // The name of the module exporting the patched API. + UINT_PTR modulebase; // The base address of the exporting module (filled in at runtime when the modules are loaded). + patchentry_t* patchtable; +} moduleentry_t; + // Utility functions. See function definitions for details. VOID dumpmemorya (LPCVOID address, SIZE_T length); VOID dumpmemoryw (LPCVOID address, SIZE_T length); BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname); BOOL findpatch (HMODULE importmodule, LPCSTR exportmodulename, LPCVOID replacement); VOID insertreportdelay (); -BOOL moduleispatched (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize); -BOOL patchimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, - LPCVOID replacement); -BOOL patchmodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize); +BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); +BOOL patchimport (HMODULE importmodule, moduleentry_t *module); +BOOL patchmodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); VOID report (LPCWSTR format, ...); -VOID restoreimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname, - LPCVOID replacement); -VOID restoremodule (HMODULE importmodule, patchentry_t patchtable [], UINT tablesize); +VOID restoreimport (HMODULE importmodule, moduleentry_t* module); +VOID restoremodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); VOID setreportencoding (encoding_e encoding); VOID setreportfile (FILE *file, BOOL copydebugger); VOID strapp (LPWSTR *dest, LPCWSTR source); diff --git a/vld.cpp b/vld.cpp index 4d87cb77..59600e69 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2009 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -66,155 +66,267 @@ __declspec(dllexport) VisualLeakDetector vld; // The import patch table: lists the heap-related API imports that VLD patches // through to replacement functions provided by VLD. Having this table simply // makes it more convenient to add additional IAT patches. -patchentry_t VisualLeakDetector::m_patchtable [] = { +patchentry_t VisualLeakDetector::m_kernel32Patch [] = { + "GetProcAddress", _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. + "HeapAlloc", _RtlAllocateHeap, + "HeapCreate", _HeapCreate, + "HeapDestroy", _HeapDestroy, + "HeapFree", _RtlFreeHeap, + "HeapReAlloc", _RtlReAllocateHeap, + NULL, NULL +}; + +#if !defined(_M_X64) +#define ORDINAL(x86, x64) (LPCSTR)x86 +#else +#define ORDINAL(x86, x64) (LPCSTR)x64 +#endif + +static patchentry_t mfc42dPatch [] = { + // XXX why are the vector new operators missing for mfc42d.dll? + (LPCSTR)711, VS60::mfcd_scalar_new, + (LPCSTR)712, VS60::mfcd__scalar_new_dbg_4p, + (LPCSTR)714, VS60::mfcd__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t mfc42udPatch [] = { + // XXX why are the vector new operators missing for mfc42ud.dll? + (LPCSTR)711, VS60::mfcud_scalar_new, + (LPCSTR)712, VS60::mfcud__scalar_new_dbg_4p, + (LPCSTR)714, VS60::mfcud__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t mfc70dPatch [] = { + (LPCSTR)257, VS70::mfcd_vector_new, + (LPCSTR)258, VS70::mfcd__vector_new_dbg_4p, + (LPCSTR)259, VS70::mfcd__vector_new_dbg_3p, + (LPCSTR)832, VS70::mfcd_scalar_new, + (LPCSTR)833, VS70::mfcd__scalar_new_dbg_4p, + (LPCSTR)834, VS70::mfcd__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t mfc70udPatch [] = { + (LPCSTR)258, VS70::mfcud_vector_new, + (LPCSTR)259, VS70::mfcud__vector_new_dbg_4p, + (LPCSTR)260, VS70::mfcud__vector_new_dbg_3p, + (LPCSTR)833, VS70::mfcud_scalar_new, + (LPCSTR)834, VS70::mfcud__scalar_new_dbg_4p, + (LPCSTR)835, VS70::mfcud__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t mfc71dPatch [] = { + (LPCSTR)267, VS71::mfcd_vector_new, + (LPCSTR)268, VS71::mfcd__vector_new_dbg_4p, + (LPCSTR)269, VS71::mfcd__vector_new_dbg_3p, + (LPCSTR)893, VS71::mfcd_scalar_new, + (LPCSTR)894, VS71::mfcd__scalar_new_dbg_4p, + (LPCSTR)895, VS71::mfcd__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t mfc71udPatch [] = { + (LPCSTR)267, VS71::mfcud_vector_new, + (LPCSTR)268, VS71::mfcud__vector_new_dbg_4p, + (LPCSTR)269, VS71::mfcud__vector_new_dbg_3p, + (LPCSTR)893, VS71::mfcud_scalar_new, + (LPCSTR)894, VS71::mfcud__scalar_new_dbg_4p, + (LPCSTR)895, VS71::mfcud__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t mfc80dPatch [] = { + (LPCSTR)267, VS80::mfcd_vector_new, + (LPCSTR)268, VS80::mfcd__vector_new_dbg_4p, + (LPCSTR)269, VS80::mfcd__vector_new_dbg_3p, + ORDINAL(893,907), VS80::mfcd_scalar_new, + ORDINAL(894,908), VS80::mfcd__scalar_new_dbg_4p, + ORDINAL(895,909), VS80::mfcd__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t mfc80udPatch [] = { + (LPCSTR)267, VS80::mfcud_vector_new, + (LPCSTR)268, VS80::mfcud__vector_new_dbg_4p, + (LPCSTR)269, VS80::mfcud__vector_new_dbg_3p, + ORDINAL(893,907), VS80::mfcud_scalar_new, + ORDINAL(894,908), VS80::mfcud__scalar_new_dbg_4p, + ORDINAL(895,909), VS80::mfcud__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t mfc90dPatch [] = { + (LPCSTR)267, VS90::mfcd_vector_new, + (LPCSTR)268, VS90::mfcd__vector_new_dbg_4p, + (LPCSTR)269, VS90::mfcd__vector_new_dbg_3p, + ORDINAL(931, 909), VS90::mfcd_scalar_new, + ORDINAL(932, 910), VS90::mfcd__scalar_new_dbg_4p, + ORDINAL(932, 911), VS90::mfcd__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t mfc90udPatch [] = { + (LPCSTR)267, VS90::mfcud_vector_new, + (LPCSTR)268, VS90::mfcud__vector_new_dbg_4p, + (LPCSTR)269, VS90::mfcud__vector_new_dbg_3p, + ORDINAL(935, 913), VS90::mfcud_scalar_new, + ORDINAL(936, 914), VS90::mfcud__scalar_new_dbg_4p, + ORDINAL(937, 915), VS90::mfcud__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t mfc100dPatch [] = { + (LPCSTR)267, VS100::mfcd_vector_new, + (LPCSTR)268, VS100::mfcd__vector_new_dbg_4p, + (LPCSTR)269, VS100::mfcd__vector_new_dbg_3p, + ORDINAL(1427, 1405), VS100::mfcd_scalar_new, + ORDINAL(1428, 1406), VS100::mfcd__scalar_new_dbg_4p, + ORDINAL(1429, 1407), VS100::mfcd__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t mfc100udPatch [] = { + (LPCSTR)267, VS100::mfcud_vector_new, + (LPCSTR)268, VS100::mfcud__vector_new_dbg_4p, + (LPCSTR)269, VS100::mfcud__vector_new_dbg_3p, + ORDINAL(1434, 1412), VS100::mfcud_scalar_new, + ORDINAL(1435, 1413), VS100::mfcud__scalar_new_dbg_4p, + ORDINAL(1436, 1414), VS100::mfcud__scalar_new_dbg_3p, + NULL, NULL +}; + +static patchentry_t msvcrtdPatch [] = { + "_calloc_dbg", VS60::crtd__calloc_dbg, + "_malloc_dbg", VS60::crtd__malloc_dbg, + "_realloc_dbg", VS60::crtd__realloc_dbg, + scalar_new_dbg_name, VS60::crtd__scalar_new_dbg, + //vector_new_dbg_name, VS60::crtd__vector_new_dbg, + "calloc", VS60::crtd_calloc, + "malloc", VS60::crtd_malloc, + "realloc", VS60::crtd_realloc, + scalar_new_name, VS60::crtd_scalar_new, + //vector_new_name, VS60::crtd_vector_new, + NULL, NULL +}; + +static patchentry_t msvcr70dPatch [] = { + "_calloc_dbg", VS70::crtd__calloc_dbg, + "_malloc_dbg", VS70::crtd__malloc_dbg, + "_realloc_dbg", VS70::crtd__realloc_dbg, + scalar_new_dbg_name, VS70::crtd__scalar_new_dbg, + vector_new_dbg_name, VS70::crtd__vector_new_dbg, + "calloc", VS70::crtd_calloc, + "malloc", VS70::crtd_malloc, + "realloc", VS70::crtd_realloc, + scalar_new_name, VS70::crtd_scalar_new, + vector_new_name, VS70::crtd_vector_new, + NULL, NULL +}; + +static patchentry_t msvcr71dPatch [] = { + "_calloc_dbg", VS71::crtd__calloc_dbg, + "_malloc_dbg", VS71::crtd__malloc_dbg, + "_realloc_dbg", VS71::crtd__realloc_dbg, + scalar_new_dbg_name, VS71::crtd__scalar_new_dbg, + vector_new_dbg_name, VS71::crtd__vector_new_dbg, + "calloc", VS71::crtd_calloc, + "malloc", VS71::crtd_malloc, + "realloc", VS71::crtd_realloc, + scalar_new_name, VS71::crtd_scalar_new, + vector_new_name, VS71::crtd_vector_new, + NULL, NULL +}; + +static patchentry_t msvcr80dPatch [] = { + "_calloc_dbg", VS80::crtd__calloc_dbg, + "_malloc_dbg", VS80::crtd__malloc_dbg, + "_realloc_dbg", VS80::crtd__realloc_dbg, + scalar_new_dbg_name, VS80::crtd__scalar_new_dbg, + vector_new_dbg_name, VS80::crtd__vector_new_dbg, + "calloc", VS80::crtd_calloc, + "malloc", VS80::crtd_malloc, + "realloc", VS80::crtd_realloc, + scalar_new_name, VS80::crtd_scalar_new, + vector_new_name, VS80::crtd_vector_new, + NULL, NULL +}; + +static patchentry_t msvcr90dPatch [] = { + "_calloc_dbg", VS90::crtd__calloc_dbg, + "_malloc_dbg", VS90::crtd__malloc_dbg, + "_realloc_dbg", VS90::crtd__realloc_dbg, + scalar_new_dbg_name, VS90::crtd__scalar_new_dbg, + vector_new_dbg_name, VS90::crtd__vector_new_dbg, + "calloc", VS90::crtd_calloc, + "malloc", VS90::crtd_malloc, + "realloc", VS90::crtd_realloc, + scalar_new_name, VS90::crtd_scalar_new, + vector_new_name, VS90::crtd_vector_new, + NULL, NULL +}; + +static patchentry_t msvcr100dPatch [] = { + "_calloc_dbg", VS100::crtd__calloc_dbg, + "_malloc_dbg", VS100::crtd__malloc_dbg, + "_realloc_dbg", VS100::crtd__realloc_dbg, + scalar_new_dbg_name, VS100::crtd__scalar_new_dbg, + vector_new_dbg_name, VS100::crtd__vector_new_dbg, + "calloc", VS100::crtd_calloc, + "malloc", VS100::crtd_malloc, + "realloc", VS100::crtd_realloc, + scalar_new_name, VS100::crtd_scalar_new, + vector_new_name, VS100::crtd_vector_new, + NULL, NULL +}; + +patchentry_t VisualLeakDetector::m_ntdllPatch [] = { + "RtlAllocateHeap", VisualLeakDetector::_RtlAllocateHeap, + "RtlFreeHeap", VisualLeakDetector::_RtlFreeHeap, + "RtlReAllocateHeap", VisualLeakDetector::_RtlReAllocateHeap, + NULL, NULL +}; + +patchentry_t VisualLeakDetector::m_ole32Patch [] = { + "CoGetMalloc", VisualLeakDetector::_CoGetMalloc, + "CoTaskMemAlloc", VisualLeakDetector::_CoTaskMemAlloc, + "CoTaskMemRealloc", VisualLeakDetector::_CoTaskMemRealloc, + NULL, NULL +}; + +moduleentry_t VisualLeakDetector::m_patchtable [] = { // Win32 heap APIs. - "kernel32.dll", "GetProcAddress", 0x0, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. - "kernel32.dll", "HeapAlloc", 0x0, _RtlAllocateHeap, - "kernel32.dll", "HeapCreate", 0x0, _HeapCreate, - "kernel32.dll", "HeapDestroy", 0x0, _HeapDestroy, - "kernel32.dll", "HeapFree", 0x0, _RtlFreeHeap, - "kernel32.dll", "HeapReAlloc", 0x0, _RtlReAllocateHeap, - - // MFC new operators (exported by ordinal). - // XXX why are the vector new operators missing for mfc42d.dll? - "mfc42d.dll", (LPCSTR)711, 0x0, VS60::mfcd_scalar_new, - "mfc42d.dll", (LPCSTR)712, 0x0, VS60::mfcd__scalar_new_dbg_4p, - "mfc42d.dll", (LPCSTR)714, 0x0, VS60::mfcd__scalar_new_dbg_3p, - "mfc42ud.dll", (LPCSTR)711, 0x0, VS60::mfcud_scalar_new, - "mfc42ud.dll", (LPCSTR)712, 0x0, VS60::mfcud__scalar_new_dbg_4p, - "mfc42ud.dll", (LPCSTR)714, 0x0, VS60::mfcud__scalar_new_dbg_3p, - "mfc70d.dll", (LPCSTR)257, 0x0, VS70::mfcd_vector_new, - "mfc70d.dll", (LPCSTR)258, 0x0, VS70::mfcd__vector_new_dbg_4p, - "mfc70d.dll", (LPCSTR)259, 0x0, VS70::mfcd__vector_new_dbg_3p, - "mfc70d.dll", (LPCSTR)832, 0x0, VS70::mfcd_scalar_new, - "mfc70d.dll", (LPCSTR)833, 0x0, VS70::mfcd__scalar_new_dbg_4p, - "mfc70d.dll", (LPCSTR)834, 0x0, VS70::mfcd__scalar_new_dbg_3p, - "mfc70ud.dll", (LPCSTR)258, 0x0, VS70::mfcud_vector_new, - "mfc70ud.dll", (LPCSTR)259, 0x0, VS70::mfcud__vector_new_dbg_4p, - "mfc70ud.dll", (LPCSTR)260, 0x0, VS70::mfcud__vector_new_dbg_3p, - "mfc70ud.dll", (LPCSTR)833, 0x0, VS70::mfcud_scalar_new, - "mfc70ud.dll", (LPCSTR)834, 0x0, VS70::mfcud__scalar_new_dbg_4p, - "mfc70ud.dll", (LPCSTR)835, 0x0, VS70::mfcud__scalar_new_dbg_3p, - "mfc71d.dll", (LPCSTR)267, 0x0, VS71::mfcd_vector_new, - "mfc71d.dll", (LPCSTR)268, 0x0, VS71::mfcd__vector_new_dbg_4p, - "mfc71d.dll", (LPCSTR)269, 0x0, VS71::mfcd__vector_new_dbg_3p, - "mfc71d.dll", (LPCSTR)893, 0x0, VS71::mfcd_scalar_new, - "mfc71d.dll", (LPCSTR)894, 0x0, VS71::mfcd__scalar_new_dbg_4p, - "mfc71d.dll", (LPCSTR)895, 0x0, VS71::mfcd__scalar_new_dbg_3p, - "mfc71ud.dll", (LPCSTR)267, 0x0, VS71::mfcud_vector_new, - "mfc71ud.dll", (LPCSTR)268, 0x0, VS71::mfcud__vector_new_dbg_4p, - "mfc71ud.dll", (LPCSTR)269, 0x0, VS71::mfcud__vector_new_dbg_3p, - "mfc71ud.dll", (LPCSTR)893, 0x0, VS71::mfcud_scalar_new, - "mfc71ud.dll", (LPCSTR)894, 0x0, VS71::mfcud__scalar_new_dbg_4p, - "mfc71ud.dll", (LPCSTR)895, 0x0, VS71::mfcud__scalar_new_dbg_3p, - "mfc80d.dll", (LPCSTR)267, 0x0, VS80::mfcd_vector_new, - "mfc80d.dll", (LPCSTR)268, 0x0, VS80::mfcd__vector_new_dbg_4p, - "mfc80d.dll", (LPCSTR)269, 0x0, VS80::mfcd__vector_new_dbg_3p, - "mfc80d.dll", (LPCSTR)893, 0x0, VS80::mfcd_scalar_new, - "mfc80d.dll", (LPCSTR)894, 0x0, VS80::mfcd__scalar_new_dbg_4p, - "mfc80d.dll", (LPCSTR)895, 0x0, VS80::mfcd__scalar_new_dbg_3p, - "mfc80ud.dll", (LPCSTR)267, 0x0, VS80::mfcud_vector_new, - "mfc80ud.dll", (LPCSTR)268, 0x0, VS80::mfcud__vector_new_dbg_4p, - "mfc80ud.dll", (LPCSTR)269, 0x0, VS80::mfcud__vector_new_dbg_3p, - "mfc80ud.dll", (LPCSTR)893, 0x0, VS80::mfcud_scalar_new, - "mfc80ud.dll", (LPCSTR)894, 0x0, VS80::mfcud__scalar_new_dbg_4p, - "mfc80ud.dll", (LPCSTR)895, 0x0, VS80::mfcud__scalar_new_dbg_3p, - "mfc90d.dll", (LPCSTR)267, 0x0, VS90::mfcd_vector_new, - "mfc90d.dll", (LPCSTR)268, 0x0, VS90::mfcd__vector_new_dbg_4p, - "mfc90d.dll", (LPCSTR)269, 0x0, VS90::mfcd__vector_new_dbg_3p, - "mfc90d.dll", (LPCSTR)931, 0x0, VS90::mfcd_scalar_new, - "mfc90d.dll", (LPCSTR)932, 0x0, VS90::mfcd__scalar_new_dbg_4p, - "mfc90d.dll", (LPCSTR)933, 0x0, VS90::mfcd__scalar_new_dbg_3p, - "mfc90ud.dll", (LPCSTR)267, 0x0, VS90::mfcud_vector_new, - "mfc90ud.dll", (LPCSTR)268, 0x0, VS90::mfcud__vector_new_dbg_4p, - "mfc90ud.dll", (LPCSTR)269, 0x0, VS90::mfcud__vector_new_dbg_3p, - "mfc90ud.dll", (LPCSTR)935, 0x0, VS90::mfcud_scalar_new, - "mfc90ud.dll", (LPCSTR)936, 0x0, VS90::mfcud__scalar_new_dbg_4p, - "mfc90ud.dll", (LPCSTR)937, 0x0, VS90::mfcud__scalar_new_dbg_3p, - "mfc100d.dll", (LPCSTR)267, 0x0, VS100::mfcd_vector_new, - "mfc100d.dll", (LPCSTR)268, 0x0, VS100::mfcd__vector_new_dbg_4p, - "mfc100d.dll", (LPCSTR)269, 0x0, VS100::mfcd__vector_new_dbg_3p, - "mfc100d.dll", (LPCSTR)1427, 0x0, VS100::mfcd_scalar_new, - "mfc100d.dll", (LPCSTR)1428, 0x0, VS100::mfcd__scalar_new_dbg_4p, - "mfc100d.dll", (LPCSTR)1429, 0x0, VS100::mfcd__scalar_new_dbg_3p, - "mfc100ud.dll", (LPCSTR)267, 0x0, VS100::mfcud_vector_new, - "mfc100ud.dll", (LPCSTR)268, 0x0, VS100::mfcud__vector_new_dbg_4p, - "mfc100ud.dll", (LPCSTR)269, 0x0, VS100::mfcud__vector_new_dbg_3p, - "mfc100ud.dll", (LPCSTR)1434, 0x0, VS100::mfcud_scalar_new, - "mfc100ud.dll", (LPCSTR)1435, 0x0, VS100::mfcud__scalar_new_dbg_4p, - "mfc100ud.dll", (LPCSTR)1436, 0x0, VS100::mfcud__scalar_new_dbg_3p, + "kernel32.dll", 0x0, m_kernel32Patch, + + // MFC new operators (exported by ordinal). + "mfc42d.dll", 0x0, mfc42dPatch, + "mfc42ud.dll", 0x0, mfc42udPatch, + "mfc70d.dll", 0x0, mfc70dPatch, + "mfc70ud.dll", 0x0, mfc70udPatch, + "mfc71d.dll", 0x0, mfc71dPatch, + "mfc71ud.dll", 0x0, mfc71udPatch, + "mfc80d.dll", 0x0, mfc80dPatch, + "mfc80ud.dll", 0x0, mfc80udPatch, + "mfc90d.dll", 0x0, mfc90dPatch, + "mfc90ud.dll", 0x0, mfc90udPatch, + "mfc100d.dll", 0x0, mfc100dPatch, + "mfc100ud.dll", 0x0, mfc100dPatch, // CRT new operators and heap APIs. - "msvcrtd.dll", "_calloc_dbg", 0x0, VS60::crtd__calloc_dbg, - "msvcrtd.dll", "_malloc_dbg", 0x0, VS60::crtd__malloc_dbg, - "msvcrtd.dll", "_realloc_dbg", 0x0, VS60::crtd__realloc_dbg, - "msvcrtd.dll", scalar_new_dbg_name, 0x0, VS60::crtd__scalar_new_dbg, -// "msvcrtd.dll", vector_new_dbg_name, 0x0, VS60::crtd__vector_new_dbg, - "msvcrtd.dll", "calloc", 0x0, VS60::crtd_calloc, - "msvcrtd.dll", "malloc", 0x0, VS60::crtd_malloc, - "msvcrtd.dll", "realloc", 0x0, VS60::crtd_realloc, - "msvcrtd.dll", scalar_new_name, 0x0, VS60::crtd_scalar_new, -// "msvcrtd.dll", vector_new_name, 0x0, VS60::crtd_vector_new, - "msvcr70d.dll", "_calloc_dbg", 0x0, VS70::crtd__calloc_dbg, - "msvcr70d.dll", "_malloc_dbg", 0x0, VS70::crtd__malloc_dbg, - "msvcr70d.dll", "_realloc_dbg", 0x0, VS70::crtd__realloc_dbg, - "msvcr70d.dll", scalar_new_dbg_name, 0x0, VS70::crtd__scalar_new_dbg, - "msvcr70d.dll", vector_new_dbg_name, 0x0, VS70::crtd__vector_new_dbg, - "msvcr70d.dll", "calloc", 0x0, VS70::crtd_calloc, - "msvcr70d.dll", "malloc", 0x0, VS70::crtd_malloc, - "msvcr70d.dll", "realloc", 0x0, VS70::crtd_realloc, - "msvcr70d.dll", scalar_new_name, 0x0, VS70::crtd_scalar_new, - "msvcr70d.dll", vector_new_name, 0x0, VS70::crtd_vector_new, - "msvcr71d.dll", "_calloc_dbg", 0x0, VS71::crtd__calloc_dbg, - "msvcr71d.dll", "_malloc_dbg", 0x0, VS71::crtd__malloc_dbg, - "msvcr71d.dll", "_realloc_dbg", 0x0, VS71::crtd__realloc_dbg, - "msvcr71d.dll", scalar_new_dbg_name, 0x0, VS71::crtd__scalar_new_dbg, - "msvcr71d.dll", vector_new_dbg_name, 0x0, VS71::crtd__vector_new_dbg, - "msvcr71d.dll", "calloc", 0x0, VS71::crtd_calloc, - "msvcr71d.dll", "malloc", 0x0, VS71::crtd_malloc, - "msvcr71d.dll", "realloc", 0x0, VS71::crtd_realloc, - "msvcr71d.dll", scalar_new_name, 0x0, VS71::crtd_scalar_new, - "msvcr71d.dll", vector_new_name, 0x0, VS71::crtd_vector_new, - "msvcr80d.dll", "_calloc_dbg", 0x0, VS80::crtd__calloc_dbg, - "msvcr80d.dll", "_malloc_dbg", 0x0, VS80::crtd__malloc_dbg, - "msvcr80d.dll", "_realloc_dbg", 0x0, VS80::crtd__realloc_dbg, - "msvcr80d.dll", scalar_new_dbg_name, 0x0, VS80::crtd__scalar_new_dbg, - "msvcr80d.dll", vector_new_dbg_name, 0x0, VS80::crtd__vector_new_dbg, - "msvcr80d.dll", "calloc", 0x0, VS80::crtd_calloc, - "msvcr80d.dll", "malloc", 0x0, VS80::crtd_malloc, - "msvcr80d.dll", "realloc", 0x0, VS80::crtd_realloc, - "msvcr80d.dll", scalar_new_name, 0x0, VS80::crtd_scalar_new, - "msvcr80d.dll", vector_new_name, 0x0, VS80::crtd_vector_new, - "msvcr90d.dll", "_calloc_dbg", 0x0, VS90::crtd__calloc_dbg, - "msvcr90d.dll", "_malloc_dbg", 0x0, VS90::crtd__malloc_dbg, - "msvcr90d.dll", "_realloc_dbg", 0x0, VS90::crtd__realloc_dbg, - "msvcr90d.dll", scalar_new_dbg_name, 0x0, VS90::crtd__scalar_new_dbg, - "msvcr90d.dll", vector_new_dbg_name, 0x0, VS90::crtd__vector_new_dbg, - "msvcr90d.dll", "calloc", 0x0, VS90::crtd_calloc, - "msvcr90d.dll", "malloc", 0x0, VS90::crtd_malloc, - "msvcr90d.dll", "realloc", 0x0, VS90::crtd_realloc, - "msvcr90d.dll", scalar_new_name, 0x0, VS90::crtd_scalar_new, - "msvcr90d.dll", vector_new_name, 0x0, VS90::crtd_vector_new, - "msvcr100d.dll", "_calloc_dbg", 0x0, VS100::crtd__calloc_dbg, - "msvcr100d.dll", "_malloc_dbg", 0x0, VS100::crtd__malloc_dbg, - "msvcr100d.dll", "_realloc_dbg", 0x0, VS100::crtd__realloc_dbg, - "msvcr100d.dll", scalar_new_dbg_name, 0x0, VS100::crtd__scalar_new_dbg, - "msvcr100d.dll", vector_new_dbg_name, 0x0, VS100::crtd__vector_new_dbg, - "msvcr100d.dll", "calloc", 0x0, VS100::crtd_calloc, - "msvcr100d.dll", "malloc", 0x0, VS100::crtd_malloc, - "msvcr100d.dll", "realloc", 0x0, VS100::crtd_realloc, - "msvcr100d.dll", scalar_new_name, 0x0, VS100::crtd_scalar_new, - "msvcr100d.dll", vector_new_name, 0x0, VS100::crtd_vector_new, + "msvcrtd.dll", 0x0, msvcrtdPatch, + "msvcr70d.dll", 0x0, msvcr70dPatch, + "msvcr71d.dll", 0x0, msvcr71dPatch, + "msvcr80d.dll", 0x0, msvcr80dPatch, + "msvcr90d.dll", 0x0, msvcr90dPatch, + "msvcr100d.dll", 0x0, msvcr100dPatch, // NT APIs. - "ntdll.dll", "RtlAllocateHeap", 0x0, _RtlAllocateHeap, - "ntdll.dll", "RtlFreeHeap", 0x0, _RtlFreeHeap, - "ntdll.dll", "RtlReAllocateHeap", 0x0, _RtlReAllocateHeap, + "ntdll.dll", 0x0, m_ntdllPatch, // COM heap APIs. - "ole32.dll", "CoGetMalloc", 0x0, _CoGetMalloc, - "ole32.dll", "CoTaskMemAlloc", 0x0, _CoTaskMemAlloc, - "ole32.dll", "CoTaskMemRealloc", 0x0, _CoTaskMemRealloc + "ole32.dll", 0x0, m_ole32Patch }; // Constructor - Initializes private data, loads configuration options, and @@ -352,9 +464,14 @@ VisualLeakDetector::VisualLeakDetector () } delete [] symbolpath; - // Patch into kernel32.dll's calls to LdrLoadDll so that VLD can - // dynamically attach to new modules loaded during runtime. - patchimport(kernel32, ntdll, "ntdll.dll", "LdrLoadDll", _LdrLoadDll); + patchentry_t ntdllPatch [] = { + "LdrLoadDll", _LdrLoadDll, + NULL, NULL + }; + moduleentry_t ldrLoadDllPatch [] = { + "ntdll.dll", (UINT_PTR)ntdll, ntdllPatch, + }; + patchimport(kernel32, ldrLoadDllPatch); // Attach Visual Leak Detector to every module loaded in the process. newmodules = new ModuleSet; @@ -1495,7 +1612,7 @@ VOID VisualLeakDetector::unmapheap (HANDLE heap) BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context) { size_t count; - patchentry_t *entry; + moduleentry_t *entry; CHAR extension [_MAX_EXT]; CHAR filename [_MAX_FNAME]; UINT index; @@ -2082,7 +2199,7 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) { - patchentry_t *entry; + moduleentry_t *entry; UINT index; UINT tablesize = _countof(vld.m_patchtable); @@ -2095,22 +2212,27 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) continue; } - // This patch table entry is for the specified module. If the requested - // import's name matches the entry's import name (or ordinal), then - // return the address of the replacement instead of the address of the - // actual import. - if ((SIZE_T)entry->importname < (SIZE_T)vld.m_vldbase) { - // This entry's import name is not a valid pointer to data in - // vld.dll. It must be an ordinal value. - if ((UINT)entry->importname == (UINT)procname) { - return (FARPROC)entry->replacement; - } - } - else { - if (strcmp(entry->importname, procname) == 0) { - return (FARPROC)entry->replacement; - } - } + patchentry_t *patchentry = entry->patchtable; + while(patchentry->importname) + { + // This patch table entry is for the specified module. If the requested + // import's name matches the entry's import name (or ordinal), then + // return the address of the replacement instead of the address of the + // actual import. + if ((SIZE_T)patchentry->importname < (SIZE_T)vld.m_vldbase) { + // This entry's import name is not a valid pointer to data in + // vld.dll. It must be an ordinal value. + if ((UINT)patchentry->importname == (UINT)procname) { + return (FARPROC)patchentry->replacement; + } + } + else { + if (strcmp(patchentry->importname, procname) == 0) { + return (FARPROC)patchentry->replacement; + } + } + patchentry++; + } } // The requested function is not a patched function. Just return the real diff --git a/vldint.h b/vldint.h index 0ff1b4ca..3cc989b1 100644 --- a/vldint.h +++ b/vldint.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Definition -// Copyright (c) 2005-2009 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -268,7 +268,10 @@ class VisualLeakDetector : public IMalloc #define VLD_OPT_TRACE_INTERNAL_FRAMES 0x100 // If set, include useless frames (e.g. internal to VLD) in call stacks. #define VLD_OPT_UNICODE_REPORT 0x200 // If set, the leak report will be encoded UTF-16 instead of ASCII. #define VLD_OPT_VLDOFF 0x400 // If set, VLD will be completely deactivated. It will not attach to any modules. - static patchentry_t m_patchtable []; // Table of imports patched for attaching VLD to other modules. + static patchentry_t m_kernel32Patch []; + static patchentry_t m_ntdllPatch []; + static patchentry_t m_ole32Patch []; + static moduleentry_t m_patchtable []; // Table of imports patched for attaching VLD to other modules. FILE *m_reportfile; // File where the memory leak report may be sent to. WCHAR m_reportfilepath [MAX_PATH]; // Full path and name of file to send memory leak report to. const char *m_selftestfile; // Filename where the memory leak self-test block is leaked. From e93ba85c5528c46412adff436cc7e313734d1e4d Mon Sep 17 00:00:00 2001 From: KindDragon Date: Fri, 19 Mar 2010 23:52:27 +0300 Subject: [PATCH 005/321] Minor fixes Added mfc_detect project --- mfc_detect/StdAfx.cpp | 8 + mfc_detect/StdAfx.h | 27 + mfc_detect/res/vldmfc.ico | Bin 0 -> 67777 bytes mfc_detect/res/vldmfc.rc2 | 13 + mfc_detect/resource.h | 18 + mfc_detect/vldmfc.cpp | 247 ++++++++ mfc_detect/vldmfc.h | 46 ++ mfc_detect/vldmfc.rc | 144 +++++ mfc_detect/vldmfc_detect_vs08.sln | 26 + mfc_detect/vldmfc_detect_vs08.vcproj | 811 +++++++++++++++++++++++++++ vld.cpp | 2 +- 11 files changed, 1341 insertions(+), 1 deletion(-) create mode 100644 mfc_detect/StdAfx.cpp create mode 100644 mfc_detect/StdAfx.h create mode 100644 mfc_detect/res/vldmfc.ico create mode 100644 mfc_detect/res/vldmfc.rc2 create mode 100644 mfc_detect/resource.h create mode 100644 mfc_detect/vldmfc.cpp create mode 100644 mfc_detect/vldmfc.h create mode 100644 mfc_detect/vldmfc.rc create mode 100644 mfc_detect/vldmfc_detect_vs08.sln create mode 100644 mfc_detect/vldmfc_detect_vs08.vcproj diff --git a/mfc_detect/StdAfx.cpp b/mfc_detect/StdAfx.cpp new file mode 100644 index 00000000..52f38aae --- /dev/null +++ b/mfc_detect/StdAfx.cpp @@ -0,0 +1,8 @@ +// source file that includes just the standard includes +// vldmfc.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + + + diff --git a/mfc_detect/StdAfx.h b/mfc_detect/StdAfx.h new file mode 100644 index 00000000..33d88926 --- /dev/null +++ b/mfc_detect/StdAfx.h @@ -0,0 +1,27 @@ +// include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#if !defined(AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_) +#define AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers + +#include // MFC core and standard components +#include // MFC extensions +#include // MFC support for Internet Explorer 4 Common Controls +#ifndef _AFX_NO_AFXCMN_SUPPORT +#include // MFC support for Windows Common Controls +#endif // _AFX_NO_AFXCMN_SUPPORT + + + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_) diff --git a/mfc_detect/res/vldmfc.ico b/mfc_detect/res/vldmfc.ico new file mode 100644 index 0000000000000000000000000000000000000000..d56fbcdfdf6eac0f4727c34770c26689271d96af GIT binary patch literal 67777 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 NK9A-8OQnhX{{?OVn?wKr literal 0 HcmV?d00001 diff --git a/mfc_detect/res/vldmfc.rc2 b/mfc_detect/res/vldmfc.rc2 new file mode 100644 index 00000000..99777388 --- /dev/null +++ b/mfc_detect/res/vldmfc.rc2 @@ -0,0 +1,13 @@ +// +// VLDMFC.RC2 - resources Microsoft Visual C++ does not edit directly +// + +#ifdef APSTUDIO_INVOKED + #error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// Add manually edited resources here... + +///////////////////////////////////////////////////////////////////////////// diff --git a/mfc_detect/resource.h b/mfc_detect/resource.h new file mode 100644 index 00000000..acd9140f --- /dev/null +++ b/mfc_detect/resource.h @@ -0,0 +1,18 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by vldmfc.rc +// +#define IDM_ABOUTBOX 0x0010 +#define IDS_ABOUTBOX 101 +#define IDR_MAINFRAME 128 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 129 +#define _APS_NEXT_COMMAND_VALUE 32771 +#define _APS_NEXT_CONTROL_VALUE 1003 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/mfc_detect/vldmfc.cpp b/mfc_detect/vldmfc.cpp new file mode 100644 index 00000000..b147c194 --- /dev/null +++ b/mfc_detect/vldmfc.cpp @@ -0,0 +1,247 @@ +#include "stdafx.h" +#include "vldmfc.h" + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp + +BEGIN_MESSAGE_MAP(CMFCExampleApp, CWinApp) +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp construction + +CMFCExampleApp::CMFCExampleApp() +{ + // TODO: add construction code here, + // Place all significant initialization in InitInstance +} + +///////////////////////////////////////////////////////////////////////////// +// The one and only CMFCExampleApp object + +CMFCExampleApp theApp; + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp initialization +/// Efficiently searches a module's name pointer table (NPT) for the named +/// procedure. +/// +/// @param[in] npt Address of the NPT to search. +/// +/// @param[in] size Number of entries in the NPT. +/// +/// @param[in] base Base address of the module containing the NPT. This is +/// used to resolve addresses in the NPT (which are relative +/// to the module's base address). +/// +/// @param[in] proc String containing the name of the procedure to search +/// for. +/// +/// @return Returns the index into the NPT of the entry matching the named +/// procedure. If no such matching entry exists, the function returns +/// -1. +/// +DWORD FindNptProc (PDWORD npt, DWORD size, PBYTE base, void* proc) +{ + for (DWORD i = 0; i < size; i++) + { + void* p = (void*)(npt[i] + base); + if (p == proc) + return i; + } + + return -1; +} + +/// Gets a pointer to a module's export directory table (EDT). +/// +/// @param[in] module Handle to the module (as returned by GetModuleHandle). +/// +/// @return Returns a pointer to the module's EDT. If there is an error (e.g. +/// if the module handle is invalid or the module has no EDT) the +/// function will return NULL. +/// +PIMAGE_EXPORT_DIRECTORY GetExportDirectoryTable (HMODULE module) +{ + PBYTE base; // base address of module + PIMAGE_FILE_HEADER cfh; // COFF file header + PIMAGE_EXPORT_DIRECTORY edt; // export directory table (EDT) + DWORD rva; // relative virtual address of EDT + PIMAGE_DOS_HEADER mds; // MS-DOS stub + PIMAGE_OPTIONAL_HEADER oh; // so-called "optional" header + PDWORD sig; // PE signature + + // Start at the base of the module. The MS-DOS stub begins there. + base = (PBYTE)module; + mds = (PIMAGE_DOS_HEADER)module; + + // Get the PE signature and verify it. + sig = (DWORD *)(base + mds->e_lfanew); + if (IMAGE_NT_SIGNATURE != *sig) { + // Bad signature -- invalid image or module handle + return NULL; + } + + // Get the COFF file header. + cfh = (PIMAGE_FILE_HEADER)(sig + 1); + + // Get the "optional" header (it's not actually optional for executables). + oh = (PIMAGE_OPTIONAL_HEADER)(cfh + 1); + + // Finally, get the export directory table. + if (IMAGE_DIRECTORY_ENTRY_EXPORT >= oh->NumberOfRvaAndSizes) { + // This image doesn't have an export directory table. + return NULL; + } + rva = oh->DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress; + edt = (PIMAGE_EXPORT_DIRECTORY)(base + rva); + + return edt; +} + +/// Gets the o of an exported procedure. +/// +/// @param[in] module Handle (as returned by GetModuleHandle) of the module +/// that exports the procedure. +/// +/// @param[in] proc String containing the name of the procedure. +/// +/// @return Returns the procedure's o. If an o for the procedure +/// could not be located (e.g. if the named procedure is not exported +/// by the specified module) then the function will return -1. +/// +DWORD GetProcOrdinal (HMODULE module, void* proc) +{ + PBYTE base; // module base address + PIMAGE_EXPORT_DIRECTORY edt; // export directory table (EDT) + DWORD i; // index into NPT and/or EOT + PDWORD npt; // name pointer table (NPT) + + base = (PBYTE)module; + + // Get the export directory table, from which we can find the name pointer + // table and export o table. + edt = GetExportDirectoryTable(module); + + // Get the name pointer table and search it for the named procedure. + _ASSERT(edt->NumberOfFunctions); + npt = (DWORD *)(base + edt->AddressOfFunctions); + i = FindNptProc(npt, edt->NumberOfFunctions, base, proc); + if (-1 == i) { + // The procedure was not found in the module's name pointer table. + return -1; + } + + // Actual o is o from EOT plus "o base" from EDT. + return i + edt->Base; +} + +LPVOID FindRealCode(LPVOID pCode) +{ + LPVOID result = pCode; + if (pCode != NULL) + { + if (*(WORD *) pCode == 0x25ff) + { + DWORD addr = *((DWORD *) ((ULONG_PTR) pCode + 2)); +#ifdef _WIN64 + // RIP relative addressing + PBYTE pNextInst = (PBYTE) ((ULONG_PTR) pCode + 6); + pCode = *(LPVOID*) (pNextInst + addr); +#else + pCode = *(LPVOID*) (addr); +#endif + return FindRealCode(pCode); + } + else if (*(BYTE *) pCode == 0xE9) + { + // Relative next instruction + PBYTE pNextInst = (PBYTE) ((ULONG_PTR) pCode + 5); + LONG offset = *((LONG *) ((ULONG_PTR) pCode + 1)); + pCode = (LPVOID*)(pNextInst + offset); + return FindRealCode(pCode); + } + } + return result; +} + +void SetClipboardText(LPCTSTR pszText) +{ + const size_t len = (_tcslen(pszText) + 1) * sizeof(pszText[0]); + HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, len); + memcpy(GlobalLock(hMem), pszText, len); + GlobalUnlock(hMem); + if(OpenClipboard(NULL)) + { + EmptyClipboard(); +#ifndef _UNICODE + HANDLE handle = SetClipboardData(CF_TEXT, hMem); +#else + HANDLE handle = SetClipboardData(CF_UNICODETEXT, hMem); +#endif + CloseClipboard(); + } +} + +typedef void* (__cdecl *new_t) (size_t); +typedef void* (__cdecl *new_dbg_crt_t) (size_t, int, const char *, int); +typedef void* (__cdecl *new_dbg_mfc_t) (size_t, const char *, int); + +BOOL CMFCExampleApp::InitInstance() +{ + new_t new_f = &(::operator new); + new_dbg_crt_t new_dbg_crt_f = &(::operator new); + new_dbg_mfc_t new_dbg_mfc_f = &(::operator new); + new_t new_array_f = &(::operator new[]); + new_dbg_crt_t new_dbg_crt_array_f = &(::operator new[]); + new_dbg_mfc_t new_dbg_mfc_array_f = &(::operator new[]); + + void* p1 = FindRealCode(new_array_f); + void* p2 = FindRealCode(new_dbg_crt_array_f); + void* p3 = FindRealCode(new_dbg_mfc_array_f); + void* p4 = FindRealCode(new_f); + void* p5 = FindRealCode(new_dbg_crt_f); + void* p6 = FindRealCode(new_dbg_mfc_f); + +#ifndef _UNICODE +#if _MFC_VER == 0x0700 // VS 2003 +#define MFCDLLNAME _T("mfc70d.dll") +#elif _MFC_VER == 0x0800 // VS 2005 +#define MFCDLLNAME _T("mfc80d.dll") +#elif _MFC_VER == 0x0900 // VS 2008 +#define MFCDLLNAME _T("mfc90d.dll") +#elif _MFC_VER == 0x0A00 // VS 2010 +#define MFCDLLNAME _T("mfc100d.dll") +#endif +#else +#if _MFC_VER == 0x0700 // VS 2003 +#define MFCDLLNAME _T("mfc70ud.dll") +#elif _MFC_VER == 0x0800 // VS 2005 +#define MFCDLLNAME _T("mfc80ud.dll") +#elif _MFC_VER == 0x0900 // VS 2008 +#define MFCDLLNAME _T("mfc90ud.dll") +#elif _MFC_VER == 0x0A00 // VS 2010 +#define MFCDLLNAME _T("mfc100ud.dll") +#endif +#endif + + HMODULE module = GetModuleHandle(MFCDLLNAME); + if (NULL == module) + return FALSE; + + int o1 = GetProcOrdinal(module, p1); + int o2 = GetProcOrdinal(module, p2); + int o3 = GetProcOrdinal(module, p3); + int o4 = GetProcOrdinal(module, p4); + int o5 = GetProcOrdinal(module, p5); + int o6 = GetProcOrdinal(module, p6); + + TCHAR msg[256]; + _stprintf(msg, _T("%d, %d, %d, %d, %d, %d"), + o1, o2, o3, o4, o5, o6); + SetClipboardText(msg); + MessageBox(NULL, msg, _T("MFC ordinals"), + MB_ICONINFORMATION | MB_OK); + + return FALSE; +} diff --git a/mfc_detect/vldmfc.h b/mfc_detect/vldmfc.h new file mode 100644 index 00000000..9edfd2aa --- /dev/null +++ b/mfc_detect/vldmfc.h @@ -0,0 +1,46 @@ +#if !defined(AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_) +#define AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +#ifndef __AFXWIN_H__ + #error include 'stdafx.h' before including this file for PCH +#endif + +#include "resource.h" // main symbols + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp: +// See vldmfc.cpp for the implementation of this class +// + +class CMFCExampleApp : public CWinApp +{ +public: + CMFCExampleApp(); + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CMFCExampleApp) + public: + virtual BOOL InitInstance(); + //}}AFX_VIRTUAL + +// Implementation + + //{{AFX_MSG(CMFCExampleApp) + // NOTE - the ClassWizard will add and remove member functions here. + // DO NOT EDIT what you see in these blocks of generated code ! + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + + +///////////////////////////////////////////////////////////////////////////// + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_) diff --git a/mfc_detect/vldmfc.rc b/mfc_detect/vldmfc.rc new file mode 100644 index 00000000..a5cc45ce --- /dev/null +++ b/mfc_detect/vldmfc.rc @@ -0,0 +1,144 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "#define _AFX_NO_SPLITTER_RESOURCES\r\n" + "#define _AFX_NO_OLE_RESOURCES\r\n" + "#define _AFX_NO_TRACKER_RESOURCES\r\n" + "#define _AFX_NO_PROPERTY_RESOURCES\r\n" + "\r\n" + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" + "#ifdef _WIN32\r\n" + "LANGUAGE 9, 1\r\n" + "#pragma code_page(1252)\r\n" + "#endif //_WIN32\r\n" + "#include ""res\\vldmfc.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""afxres.rc"" // Standard components\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDR_MAINFRAME ICON "res\\vldmfc.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,1,1 + PRODUCTVERSION 1,0,1,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "This software is copyright (c) 2005 Dan Moulding and is distributed under the terms of the GNU Lesser Public License" + VALUE "FileDescription", "Visual Leak Detector MFC Example" + VALUE "FileVersion", "1, 0, 1, 1" + VALUE "InternalName", "vldmfc" + VALUE "LegalCopyright", "Copyright (C) 2005" + VALUE "OriginalFilename", "vldmfc.exe" + VALUE "ProductName", "Visual Leak Detector MFC Example" + VALUE "ProductVersion", "1, 0, 1, 1" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_ABOUTBOX "&About Visual Leak Detector MFC Example..." +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#define _AFX_NO_SPLITTER_RESOURCES +#define _AFX_NO_OLE_RESOURCES +#define _AFX_NO_TRACKER_RESOURCES +#define _AFX_NO_PROPERTY_RESOURCES + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE 9, 1 +#pragma code_page(1252) +#endif //_WIN32 +#include "res\vldmfc.rc2" // non-Microsoft Visual C++ edited resources +#include "afxres.rc" // Standard components +#endif + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/mfc_detect/vldmfc_detect_vs08.sln b/mfc_detect/vldmfc_detect_vs08.sln new file mode 100644 index 00000000..bc784b86 --- /dev/null +++ b/mfc_detect/vldmfc_detect_vs08.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect", "vldmfc_detect_vs08.vcproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug (Unicode)|Win32 = Debug (Unicode)|Win32 + Debug (Unicode)|x64 = Debug (Unicode)|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/mfc_detect/vldmfc_detect_vs08.vcproj b/mfc_detect/vldmfc_detect_vs08.vcproj new file mode 100644 index 00000000..ae9147e5 --- /dev/null +++ b/mfc_detect/vldmfc_detect_vs08.vcproj @@ -0,0 +1,811 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vld.cpp b/vld.cpp index 59600e69..6cf94784 100644 --- a/vld.cpp +++ b/vld.cpp @@ -164,7 +164,7 @@ static patchentry_t mfc90dPatch [] = { (LPCSTR)269, VS90::mfcd__vector_new_dbg_3p, ORDINAL(931, 909), VS90::mfcd_scalar_new, ORDINAL(932, 910), VS90::mfcd__scalar_new_dbg_4p, - ORDINAL(932, 911), VS90::mfcd__scalar_new_dbg_3p, + ORDINAL(933, 911), VS90::mfcd__scalar_new_dbg_3p, NULL, NULL }; From b933a3619035c44a8624810dff683830b0073296 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 9 Apr 2010 22:37:17 +0000 Subject: [PATCH 006/321] First commit git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C44425 --- callstack.cpp | 50 ++- crtmfcpatch.h | 6 +- ntapi.h | 2 +- testsuite/testsuite.cpp | 4 +- testsuite/testsuite.vcxproj | 265 ++++++++++++++ testsuite/testsuite.vcxproj.filters | 22 ++ testsuite/testsuite.vcxproj.vspscc | 10 + vld.cpp | 541 +++++++++++++++++++--------- vld.h | 9 + vld.vcxproj | 238 ++++++++++++ vld.vcxproj.filters | 83 +++++ vld.vcxproj.vspscc | 10 + vld_vs10.sln | 115 ++++++ vld_vs10.vssscc | 10 + vldapi.cpp | 21 +- vldint.h | 24 +- 16 files changed, 1205 insertions(+), 205 deletions(-) create mode 100644 testsuite/testsuite.vcxproj create mode 100644 testsuite/testsuite.vcxproj.filters create mode 100644 testsuite/testsuite.vcxproj.vspscc create mode 100644 vld.vcxproj create mode 100644 vld.vcxproj.filters create mode 100644 vld.vcxproj.vspscc create mode 100644 vld_vs10.sln create mode 100644 vld_vs10.vssscc diff --git a/callstack.cpp b/callstack.cpp index 137490bb..c0594c3d 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -315,15 +315,10 @@ VOID CallStack::push_back (const UINT_PTR programcounter) // VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) { - UINT32 count = 0; - - if (context.fp == NULL) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - CAPTURE_CONTEXT(context); - } - + UINT32 count = 0; UINT_PTR* framepointer = context.fp; + +#if defined(_M_IX86) while (count < maxdepth) { if (*framepointer < (UINT)framepointer) { if (*framepointer == NULL) { @@ -354,7 +349,38 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) count++; push_back(*(framepointer + 1)); framepointer = (UINT_PTR*)*framepointer; - } + } +#elif defined(_M_X64) + UINT32 maxframes = min(62, maxdepth + 10); + static USHORT (WINAPI *s_pfnCaptureStackBackTrace)(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash) = 0; + if (s_pfnCaptureStackBackTrace == 0) + { + const HMODULE hNtDll = GetModuleHandle(L"ntdll.dll"); + reinterpret_cast(s_pfnCaptureStackBackTrace) + = ::GetProcAddress(hNtDll, "RtlCaptureStackBackTrace"); + if (s_pfnCaptureStackBackTrace == 0) + return; + } + UINT_PTR* myFrames = new UINT_PTR[maxframes]; + ZeroMemory(myFrames, sizeof(UINT_PTR) * maxframes); + s_pfnCaptureStackBackTrace(0, maxframes, (PVOID*)myFrames, NULL); + UINT32 startIndex = 0; + while (count < maxframes) { + if (myFrames[count] == 0) + break; + if (myFrames[count] == *(framepointer + 1)) + startIndex = count; + count++; + } + count = startIndex; + while (count < maxframes) { + if (myFrames[count] == 0) + break; + push_back(myFrames[count]); + count++; + } + delete [] myFrames; +#endif } // getstacktrace - Traces the stack as far back as possible, or until 'maxdepth' @@ -383,12 +409,6 @@ VOID SafeCallStack::getstacktrace (UINT32 maxdepth, context_t& context) UINT32 count = 0; STACKFRAME64 frame; - if (context.fp == NULL) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - CAPTURE_CONTEXT(context); - } - UINT_PTR* framepointer = context.fp; architecture = X86X64ARCHITECTURE; diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 56bd0b35..31643faa 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -446,7 +446,7 @@ void* CrtMfcPatch::crtd_new_dbg (context_t& context, pcrtxxd_new_dbg = (new_dbg_crt_t)GetProcAddress(msvcrxxd, procname); } - return vld.new_dbg_crt(pcrtxxd_new_dbg, context, size, type, file, line); + return vld.__new_dbg_crt(pcrtxxd_new_dbg, context, size, type, file, line); } // crt_new - A template function for implementing patch functions to the @@ -819,7 +819,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, pmfcxxd__new_dbg = (new_dbg_crt_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); } - return vld.new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); + return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } // mfcd_new_dbg - A generic function for implementing patch functions to the MFC @@ -860,7 +860,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, pmfcxxd__new_dbg = (new_dbg_mfc_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); } - return vld.new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); + return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } // mfcd_new - A generic function for implementing patch functions to the MFC new diff --git a/ntapi.h b/ntapi.h index 474c999c..793f9b21 100644 --- a/ntapi.h +++ b/ntapi.h @@ -44,7 +44,7 @@ typedef struct unicodestring_s { // Function pointer types for explicit dynamic linking with functions that can't // be load-time linked (no import library is available for these). -typedef NTSTATUS (__stdcall *LdrLoadDll_t) (LPWSTR, PDWORD, unicodestring_t *, PHANDLE); +typedef NTSTATUS (__stdcall *LdrLoadDll_t) (LPWSTR, ULONG, unicodestring_t *, PHANDLE); typedef LPVOID (__stdcall *RtlAllocateHeap_t) (HANDLE, DWORD, SIZE_T); typedef BOOL (__stdcall *RtlFreeHeap_t) (HANDLE, DWORD, LPVOID); typedef LPVOID (__stdcall *RtlReAllocateHeap_t) (HANDLE, DWORD, LPVOID, SIZE_T); diff --git a/testsuite/testsuite.cpp b/testsuite/testsuite.cpp index 42cf7144..acbeb9b0 100644 --- a/testsuite/testsuite.cpp +++ b/testsuite/testsuite.cpp @@ -170,7 +170,7 @@ VOID allocateblock (action_e action, SIZE_T size) name = "Ignored"; VLDDisable(); *pblock = malloc(size); - VLDEnable(); + VLDRestore(); break; case a_malloc: @@ -355,6 +355,8 @@ int main (int argc, char *argv []) DWORD start; UINT leakythread; + //VLDDisable(); + start = GetTickCount(); srand(start); diff --git a/testsuite/testsuite.vcxproj b/testsuite/testsuite.vcxproj new file mode 100644 index 00000000..ddcd0011 --- /dev/null +++ b/testsuite/testsuite.vcxproj @@ -0,0 +1,265 @@ + + + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} + testsuite + SAK + SAK + SAK + SAK + + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\Release\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\Release\ + $(Platform)\$(Configuration)\ + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset + + + + + + Disabled + $(SolutionDir);%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + EditAndContinue + false + + + ..\$(Configuration);%(AdditionalLibraryDirectories) + true + false + + + + + + + Full + $(SolutionDir);%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + false + MultiThreadedDLL + + + true + true + + + ..\$(Configuration);%(AdditionalLibraryDirectories) + false + true + true + false + + + + + + + Disabled + $(SolutionDir);%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + EditAndContinue + true + + + ..\Release;%(AdditionalLibraryDirectories) + true + false + + + + + + + X64 + + + Disabled + $(SolutionDir);%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + ProgramDatabase + false + + + ..\$(Configuration);%(AdditionalLibraryDirectories) + true + false + + + MachineX64 + + + + + X64 + + + Full + $(SolutionDir);%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + false + MultiThreadedDLL + + + true + true + + + ..\$(Configuration);%(AdditionalLibraryDirectories) + false + true + true + false + + + MachineX64 + + + + + X64 + + + Disabled + $(SolutionDir);%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + ProgramDatabase + true + + + ..\Release;%(AdditionalLibraryDirectories) + true + false + + + MachineX64 + true + + + + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/testsuite/testsuite.vcxproj.filters b/testsuite/testsuite.vcxproj.filters new file mode 100644 index 00000000..31a8fddb --- /dev/null +++ b/testsuite/testsuite.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + \ No newline at end of file diff --git a/testsuite/testsuite.vcxproj.vspscc b/testsuite/testsuite.vcxproj.vspscc new file mode 100644 index 00000000..b6d32892 --- /dev/null +++ b/testsuite/testsuite.vcxproj.vspscc @@ -0,0 +1,10 @@ +"" +{ +"FILE_VERSION" = "9237" +"ENLISTMENT_CHOICE" = "NEVER" +"PROJECT_FILE_RELATIVE_PATH" = "" +"NUMBER_OF_EXCLUDED_FILES" = "0" +"ORIGINAL_PROJECT_FILE_PATH" = "" +"NUMBER_OF_NESTED_PROJECTS" = "0" +"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" +} diff --git a/vld.cpp b/vld.cpp index 6cf94784..caae725b 100644 --- a/vld.cpp +++ b/vld.cpp @@ -457,7 +457,7 @@ VisualLeakDetector::VisualLeakDetector () // Initialize the symbol handler. We use it for obtaining source file/line // number information and function names for the memory leak report. symbolpath = buildsymbolsearchpath(); - SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_UNDNAME); + SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); if (!SymInitializeW(currentprocess, symbolpath, FALSE)) { report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" L" File and function names will probably not be available in call stacks.\n", GetLastError()); @@ -927,16 +927,30 @@ VOID VisualLeakDetector::configure () // Found a copy of vld.ini in the working directory. Use it. wcsncpy_s(inipath, MAX_PATH, L".\\vld.ini", _TRUNCATE); } - else { - // Get the location of the vld.ini file from the registry. - regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); - if (regstatus == ERROR_SUCCESS) { - keyopen = TRUE; - regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); - } - if (keyopen) { - RegCloseKey(productkey); - } + else { + // Get the location of the vld.ini file from the registry. + regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + if (regstatus == ERROR_SUCCESS) { + keyopen = TRUE; + regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); + } + if (keyopen) { + RegCloseKey(productkey); + } + + if (!keyopen) + { + // Get the location of the vld.ini file from the registry. + regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + if (regstatus == ERROR_SUCCESS) { + keyopen = TRUE; + regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); + } + if (keyopen) { + RegCloseKey(productkey); + } + } + if ((regstatus != ERROR_SUCCESS) || (_wstat(inipath, &s) != 0)) { // The location of vld.ini could not be read from the registry. As a // last resort, look in the Windows directory. @@ -1124,8 +1138,10 @@ tls_t* VisualLeakDetector::gettls () tls = new tls_t; TlsSetValue(m_tlsindex, tls); ZeroMemory(&tls->context, sizeof(tls->context)); - tls->flags = 0x0; + tls->flags = 0x0; + tls->oldflags = 0x0; tls->threadid = GetCurrentThreadId(); + tls->ppcallstack = NULL; // Add this thread's TLS to the TlsSet. EnterCriticalSection(&m_tlslock); @@ -1156,7 +1172,7 @@ tls_t* VisualLeakDetector::gettls () // // None. // -VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, context_t& context, BOOL crtalloc) +VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack) { blockinfo_t *blockinfo; BlockMap::Iterator blockit; @@ -1166,27 +1182,8 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, contex // Record the block's information. blockinfo = new blockinfo_t; -#if defined(_M_IX86) - if (m_options & VLD_OPT_SAFE_STACK_WALK) { - blockinfo->callstack = new SafeCallStack; - } - else { - blockinfo->callstack = new FastCallStack; - } -#else - blockinfo->callstack = new SafeCallStack; -#endif - if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { - // Passing NULL for the frame pointer argument will force the stack - // trace to begin at the current frame. - context_t t; - t.fp = 0; - blockinfo->callstack->getstacktrace(m_maxtraceframes, t); - } - else { - // Start the stack trace at the call that first entered VLD's code. - blockinfo->callstack->getstacktrace(m_maxtraceframes, context); - } + blockinfo->callstack = NULL; + ppcallstack = &blockinfo->callstack; blockinfo->serialnumber = serialnumber++; blockinfo->size = size; @@ -1215,6 +1212,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, contex delete (*blockit).second; blockmap->erase(blockit); blockmap->insert(mem, blockinfo); + ppcallstack = NULL; } LeaveCriticalSection(&m_maplock); } @@ -1279,8 +1277,8 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) // // None. // -VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, context_t& context, - BOOL crtalloc) +VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, + BOOL crtalloc, CallStack **&ppcallstack) { BlockMap::Iterator blockit; BlockMap *blockmap; @@ -1291,7 +1289,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. unmapblock(heap, mem); - mapblock(heap, newmem, size, context, crtalloc); + mapblock(heap, newmem, size, crtalloc, ppcallstack); return; } @@ -1304,7 +1302,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // block has also not been mapped to a blockinfo_t entry yet either, // so treat this reallocation as a brand-new allocation (this will // also map the heap to a new block map). - mapblock(heap, newmem, size, context, crtalloc); + mapblock(heap, newmem, size, crtalloc, ppcallstack); LeaveCriticalSection(&m_maplock); return; } @@ -1315,7 +1313,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (blockit == blockmap->end()) { // The block hasn't been mapped to a blockinfo_t entry yet. // Treat this reallocation as a new allocation. - mapblock(heap, newmem, size, context, crtalloc); + mapblock(heap, newmem, size, crtalloc, ppcallstack); LeaveCriticalSection(&m_maplock); return; } @@ -1330,19 +1328,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S } LeaveCriticalSection(&m_maplock); - // Update the block's callstack and size. - if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { - // Passing NULL for the frame pointer argument will force - // the stack trace to begin at the current frame. - context_t t; - t.fp = 0; - info->callstack->getstacktrace(m_maxtraceframes, t); - } - else { - // Start the stack trace at the call that first entered - // VLD's code. - info->callstack->getstacktrace(m_maxtraceframes, context); - } + // Update the block's size. info->size = size; } @@ -1728,7 +1714,8 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // malloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1737,9 +1724,18 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pcalloc(num, size); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -1766,7 +1762,8 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t // malloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1775,9 +1772,18 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pmalloc(size); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -1804,7 +1810,8 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) // The new operator is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1813,9 +1820,18 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew(size); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -1847,7 +1863,8 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // realloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1856,9 +1873,18 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // Do the allocation. The block will be mapped by _RtlReAllocateHeap. block = prealloc(mem, size); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -1909,7 +1935,8 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // _malloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1918,9 +1945,18 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = p_calloc_dbg(num, size, type, file, line); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -1960,7 +1996,8 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // _malloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1969,9 +2006,18 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = p_malloc_dbg(size, type, file, line); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -1998,7 +2044,7 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // // Returns the value returned by the specified CRT debug new operator. // -void* VisualLeakDetector::new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, +void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, size_t size, int type, @@ -2011,7 +2057,8 @@ void* VisualLeakDetector::new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // The debug new operator is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -2020,9 +2067,18 @@ void* VisualLeakDetector::new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg_crt(size, type, file, line); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2049,7 +2105,7 @@ void* VisualLeakDetector::new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // // Returns the value returned by the specified CRT debug new operator. // -void* VisualLeakDetector::new_dbg_mfc (new_dbg_crt_t pnew_dbg, +void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, @@ -2059,7 +2115,8 @@ void* VisualLeakDetector::new_dbg_mfc (new_dbg_crt_t pnew_dbg, void *block; tls_t *tls = vld.gettls(); - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -2068,9 +2125,18 @@ void* VisualLeakDetector::new_dbg_mfc (new_dbg_crt_t pnew_dbg, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg(size, type, file, line); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2095,7 +2161,7 @@ void* VisualLeakDetector::new_dbg_mfc (new_dbg_crt_t pnew_dbg, // // Returns the value returned by the specified MFC debug new operator. // -void* VisualLeakDetector::new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, +void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, @@ -2104,7 +2170,8 @@ void* VisualLeakDetector::new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, void *block; tls_t *tls = vld.gettls(); - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -2113,9 +2180,18 @@ void* VisualLeakDetector::new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg_mfc(size, file, line); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2158,7 +2234,8 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // _realloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -2167,9 +2244,18 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // Do the allocation. The block will be mapped by _RtlReAllocateHeap. block = p_realloc_dbg(mem, size, type, file, line); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2339,7 +2425,7 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) // // Returns the value returned by LdrLoadDll. // -NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, PDWORD flags, unicodestring_t *modulename, +NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, PHANDLE modulehandle) { ModuleSet::Iterator moduleit; @@ -2381,6 +2467,26 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, PDWORD flags, unico return status; } +void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &context_ ) +{ + CallStack *callstack; + if (vld.m_options & VLD_OPT_SAFE_STACK_WALK) { + callstack = new SafeCallStack; + } + else { + callstack = new FastCallStack; + } + + // Reset thread local flags and variables, in case any libraries called + // into while mapping the block allocate some memory. + context_t context = context_; + *ppcallstack = callstack; + context_.fp = 0x0; + ppcallstack = NULL; + + callstack->getstacktrace(vld.m_maxtraceframes, context); +} + // _RtlAllocateHeap - Calls to RtlAllocateHeap are patched through to this // function. This function invokes the real RtlAllocateHeap and then calls // VLD's allocation tracking function. Pretty much all memory allocations @@ -2399,40 +2505,56 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, PDWORD flags, unico // LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) { - BOOL crtalloc; - context_t context; - LPVOID block; - tls_t *tls = vld.gettls(); + LPVOID block; // Allocate the block. block = RtlAllocateHeap(heap, flags, size); - if ((block != NULL) && vld.enabled()) { - if (tls->context.fp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else { - context = tls->context; - } - crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + if ((block == NULL) || !vld.enabled()) + return block; - // Reset thread local flags and variables, in case any libraries called - // into while mapping the block allocate some memory. - tls->context.fp = 0x0; - tls->flags &=~VLD_TLS_CRTALLOC; + tls_t *tls = vld.gettls(); + BOOL firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; - if (!IsModuleExcluded(GET_RETURN_ADDRESS(context))) { - // The module that initiated this allocation is included in leak - // detection. Map this block to the specified heap. - vld.mapblock(heap, block, size, context, crtalloc); - } - } + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; + + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + tls->context = context; - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + BOOL crtalloc; + crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + + // The module that initiated this allocation is included in leak + // detection. Map this block to the specified heap. + vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); + + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2503,42 +2625,71 @@ BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) // LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { - BOOL crtalloc; - context_t context; - LPVOID newmem; - tls_t *tls = vld.gettls(); - - // Reallocate the block. - newmem = RtlReAllocateHeap(heap, flags, mem, size); - - if (newmem != NULL) { - if (tls->context.fp == 0x0) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else { - context = tls->context; - } - crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + LPVOID newmem; - // Reset thread local flags and variables, in case any libraries called - // into while remapping the block allocate some memory. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + // Reallocate the block. + newmem = RtlReAllocateHeap(heap, flags, mem, size); + if (newmem == NULL) + return newmem; - if (!IsModuleExcluded(GET_RETURN_ADDRESS(context))) { - // The module that initiated this allocation is included in leak - // detection. Remap the block. - vld.remapblock(heap, mem, newmem, size, context, crtalloc); - } - } + tls_t *tls = vld.gettls(); + BOOL firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return newmem; + + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + BOOL crtalloc; + crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + // Reset thread local flags and variables, in case any libraries called + // into while remapping the block allocate some memory. + tls->context.fp = 0x0; + if (crtalloc) + tls->flags |= VLD_TLS_CRTALLOC; + else + tls->flags &=~VLD_TLS_CRTALLOC; - return newmem; + // The module that initiated this allocation is included in leak + // detection. Remap the block. + vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack); + +#ifdef _DEBUG + if(tls->context.fp != 0) + __debugbreak(); +#endif + tls->context = context; + tls->flags |= crtalloc; + + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->ppcallstack = NULL; + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } + + return newmem; } //////////////////////////////////////////////////////////////////////////////// @@ -2603,7 +2754,8 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) HMODULE ole32; tls_t *tls = vld.gettls(); - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); @@ -2618,11 +2770,20 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) } // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pCoTaskMemAlloc(size); + block = pCoTaskMemAlloc(size); + + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2649,7 +2810,8 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) HMODULE ole32; tls_t *tls = vld.gettls(); - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); @@ -2664,11 +2826,20 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = pCoTaskMemRealloc(mem, size); + block = pCoTaskMemRealloc(mem, size); + + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2709,7 +2880,8 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) context_t context; tls_t *tls = vld.gettls(); - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); @@ -2718,11 +2890,20 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) // Do the allocation. The block will be mapped by _RtlAllocateHeap. assert(m_imalloc != NULL); - block = m_imalloc->Alloc(size); + block = m_imalloc->Alloc(size); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2827,7 +3008,8 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) context_t context; tls_t *tls = vld.gettls(); - if (tls->context.fp == 0x0) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); @@ -2836,11 +3018,20 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) // Do the allocation. The block will be mapped by _RtlReAllocateHeap. assert(m_imalloc != NULL); - block = m_imalloc->Realloc(mem, size); + block = m_imalloc->Realloc(mem, size); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } diff --git a/vld.h b/vld.h index 27d7b142..c0915fc7 100644 --- a/vld.h +++ b/vld.h @@ -85,6 +85,14 @@ __declspec(dllimport) void VLDDisable (); // __declspec(dllimport) void VLDEnable (); +// VLDRestore - Restore Visual Leak Detector's previous state. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDRestore (); + #ifdef __cplusplus } #endif // __cplusplus @@ -93,5 +101,6 @@ __declspec(dllimport) void VLDEnable (); #define VLDEnable() #define VLDDisable() +#define VLDRestore() #endif // _DEBUG diff --git a/vld.vcxproj b/vld.vcxproj new file mode 100644 index 00000000..25c4cc40 --- /dev/null +++ b/vld.vcxproj @@ -0,0 +1,238 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + vld + SAK + SAK + SAK + SAK + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset + + + + + + Disabled + DIA SDK\include;%(AdditionalIncludeDirectories) + WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + Use + Level4 + EditAndContinue + false + + + true + 0x03200000 + false + DIA SDK\lib;%(AdditionalLibraryDirectories) + psapi.lib;diaguids.lib;%(AdditionalDependencies) + + + + + + + + + X64 + + + Disabled + DIA SDK\include;%(AdditionalIncludeDirectories) + WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + Use + Level4 + ProgramDatabase + false + + + true + 0x03200000 + false + MachineX64 + DIA SDK\lib\amd64;%(AdditionalLibraryDirectories) + psapi.lib;diaguids.lib;%(AdditionalDependencies) + + + + + + + + + Full + Speed + true + DIA SDK\include;%(AdditionalIncludeDirectories) + WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + Use + ProgramDatabase + true + + + true + true + true + 0x03200000 + false + DIA SDK\lib;%(AdditionalLibraryDirectories) + diaguids.lib;%(AdditionalDependencies) + + + + + + + + + X64 + + + Full + Speed + true + DIA SDK\include;%(AdditionalIncludeDirectories) + WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + Use + ProgramDatabase + true + + + true + true + true + 0x03200000 + false + MachineX64 + true + DIA SDK\lib\amd64;%(AdditionalLibraryDirectories) + diaguids.lib;%(AdditionalDependencies) + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vld.vcxproj.filters b/vld.vcxproj.filters new file mode 100644 index 00000000..6e35fdca --- /dev/null +++ b/vld.vcxproj.filters @@ -0,0 +1,83 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/vld.vcxproj.vspscc b/vld.vcxproj.vspscc new file mode 100644 index 00000000..b6d32892 --- /dev/null +++ b/vld.vcxproj.vspscc @@ -0,0 +1,10 @@ +"" +{ +"FILE_VERSION" = "9237" +"ENLISTMENT_CHOICE" = "NEVER" +"PROJECT_FILE_RELATIVE_PATH" = "" +"NUMBER_OF_EXCLUDED_FILES" = "0" +"ORIGINAL_PROJECT_FILE_PATH" = "" +"NUMBER_OF_NESTED_PROJECTS" = "0" +"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" +} diff --git a/vld_vs10.sln b/vld_vs10.sln new file mode 100644 index 00000000..31bd9c11 --- /dev/null +++ b/vld_vs10.sln @@ -0,0 +1,115 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "testsuite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VLDPackage", "VLDPackage\VLDPackage.csproj", "{27BBE284-E522-4349-BFC8-EFE670EB2F04}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VLDPackage_IntegrationTests", "VLDPackage\VLDPackage_IntegrationTests\VLDPackage_IntegrationTests.csproj", "{D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{736C7A2E-0416-4D52-BB9E-83DF39143560}" + ProjectSection(SolutionItems) = preProject + IntegrationTests.testsettings = IntegrationTests.testsettings + UnitTests.testsettings = UnitTests.testsettings + vld_vs10.vsmdi = vld_vs10.vsmdi + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VLDPackage_UnitTests", "VLDPackage\VLDPackage_UnitTests\VLDPackage_UnitTests.csproj", "{277FD7F3-7FE5-44B7-8B05-5361872512DE}" +EndProject +Global + GlobalSection(TeamFoundationVersionControl) = preSolution + SccNumberOfProjects = 3 + SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccTeamFoundationServer = https://tfs07.codeplex.com/ + SccLocalPath0 = . + SccProjectUniqueName1 = testsuite\\testsuite.vcxproj + SccProjectName1 = testsuite + SccLocalPath1 = testsuite + SccProjectUniqueName2 = vld.vcxproj + SccLocalPath2 = . + EndGlobalSection + GlobalSection(TestCaseManagementSettings) = postSolution + CategoryFile = vld_vs10.vsmdi + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Any CPU.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Any CPU.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Mixed Platforms.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Any CPU.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Any CPU.ActiveCfg = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Mixed Platforms.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Debug(Release)|x64 + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Debug|Win32.ActiveCfg = Debug|Any CPU + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Debug|x64.ActiveCfg = Debug|Any CPU + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Release|Any CPU.ActiveCfg = Release|Any CPU + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Release|Any CPU.Build.0 = Release|Any CPU + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Release|Win32.ActiveCfg = Release|Any CPU + {27BBE284-E522-4349-BFC8-EFE670EB2F04}.Release|x64.ActiveCfg = Release|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Debug|Win32.ActiveCfg = Debug|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Debug|x64.ActiveCfg = Debug|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Release|Any CPU.Build.0 = Release|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Release|Win32.ActiveCfg = Release|Any CPU + {D1B99BAB-27A3-4F5E-9F9D-18C0740FF8F9}.Release|x64.ActiveCfg = Release|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Debug|Win32.ActiveCfg = Debug|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Debug|x64.ActiveCfg = Debug|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Release|Any CPU.Build.0 = Release|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Release|Win32.ActiveCfg = Release|Any CPU + {277FD7F3-7FE5-44B7-8B05-5361872512DE}.Release|x64.ActiveCfg = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vld_vs10.vssscc b/vld_vs10.vssscc new file mode 100644 index 00000000..6cb031bc --- /dev/null +++ b/vld_vs10.vssscc @@ -0,0 +1,10 @@ +"" +{ +"FILE_VERSION" = "9237" +"ENLISTMENT_CHOICE" = "NEVER" +"PROJECT_FILE_RELATIVE_PATH" = "" +"NUMBER_OF_EXCLUDED_FILES" = "0" +"ORIGINAL_PROJECT_FILE_PATH" = "" +"NUMBER_OF_NESTED_PROJECTS" = "0" +"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROJECT" +} diff --git a/vldapi.cpp b/vldapi.cpp index 9cd537fe..c0a6876e 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -48,7 +48,8 @@ extern "C" __declspec(dllexport) void VLDDisable () // because if neither flag is set, it means that we are in the default or // "starting" state, which could be either enabled or disabled depending on // the configuration. - tls = vld.gettls(); + tls = vld.gettls(); + tls->oldflags = tls->flags; tls->flags &= ~VLD_TLS_ENABLED; tls->flags |= VLD_TLS_DISABLED; } @@ -63,8 +64,24 @@ extern "C" __declspec(dllexport) void VLDEnable () } // Enable memory leak detection for the current thread. - tls = vld.gettls(); + tls = vld.gettls(); + tls->oldflags = tls->flags; tls->flags &= ~VLD_TLS_DISABLED; tls->flags |= VLD_TLS_ENABLED; vld.m_status &= ~VLD_STATUS_NEVER_ENABLED; } + +extern "C" __declspec(dllexport) void VLDRestore () +{ + tls_t *tls; + + if (vld.m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Restore state memory leak detection for the current thread. + tls = vld.gettls(); + tls->flags &= ~(VLD_TLS_DISABLED | VLD_TLS_ENABLED); + tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); +} diff --git a/vldint.h b/vldint.h index 3cc989b1..25708cc3 100644 --- a/vldint.h +++ b/vldint.h @@ -46,6 +46,7 @@ Applications should never include this header." // The Visual Leak Detector APIs. extern "C" __declspec(dllexport) void VLDDisable (); extern "C" __declspec(dllexport) void VLDEnable (); +extern "C" __declspec(dllexport) void VLDRestore (); // Function pointer types for explicit dynamic linking with functions listed in // the import patch table. @@ -123,13 +124,17 @@ typedef struct tls_s { #define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. #define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. #define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. + UINT32 oldflags; // Thread-local status old flags DWORD threadid; // Thread ID of the thread that owns this TLS structure. + CallStack **ppcallstack; // Memory block callstack pointer. } tls_t; // The TlsSet allows VLD to keep track of all thread local storage structures // allocated in the process. typedef Set TlsSet; +class CallStack; + //////////////////////////////////////////////////////////////////////////////// // // The VisualLeakDetector Class @@ -147,7 +152,7 @@ typedef Set TlsSet; // the same context during process termination. // // When the VisualLeakDetector object is destroyed, it consults its internal -// datastructures, looking for any memory that has not been freed. A memory +// data structures, looking for any memory that has not been freed. A memory // leak report is then generated, indicating any memory leaks that may have // been identified. // @@ -179,9 +184,9 @@ class VisualLeakDetector : public IMalloc // Debug CRT and MFC common handlers void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, size_t num, size_t size, int type, char const *file, int line); void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, size_t size, int type, char const *file, int line); - void* new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, size_t size, int type, char const *file, int line); - void* new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); - void* new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); + void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, size_t size, int type, char const *file, int line); + void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); + void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, void *mem, size_t size, int type, char const *file, int line); //////////////////////////////////////////////////////////////////////////////// @@ -207,9 +212,9 @@ class VisualLeakDetector : public IMalloc BOOL enabled (); SIZE_T eraseduplicates (const BlockMap::Iterator &element); tls_t* gettls (); - VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, context_t& context, BOOL crtalloc); + VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); VOID mapheap (HANDLE heap); - VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, context_t& context, BOOL crtalloc); + VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); VOID reportconfig (); VOID reportleaks (HANDLE heap); VOID unmapblock (HANDLE heap, LPCVOID mem); @@ -221,6 +226,7 @@ class VisualLeakDetector : public IMalloc // Utils static BOOL IsModuleExcluded (UINT_PTR returnaddress); + static void getcallstack( CallStack **&ppcallstack, context_t &context ); //////////////////////////////////////////////////////////////////////////////// // IAT replacement functions - see each function definition for details. @@ -233,10 +239,11 @@ class VisualLeakDetector : public IMalloc static FARPROC __stdcall _GetProcAddress (HMODULE module, LPCSTR procname); static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); static BOOL __stdcall _HeapDestroy (HANDLE heap); - static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, PDWORD flags, unicodestring_t *modulename, + static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, PHANDLE modulehandle); static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); - static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); + + static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); // COM IAT replacement functions @@ -289,6 +296,7 @@ class VisualLeakDetector : public IMalloc // The Visual Leak Detector APIs are our friends. friend __declspec(dllexport) void VLDDisable (); friend __declspec(dllexport) void VLDEnable (); + friend __declspec(dllexport) void VLDRestore (); }; // Configuration option default values From 121168e12627cca1a4b3820a97c952ba1b0a1740 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 24 Apr 2010 23:03:13 +0000 Subject: [PATCH 007/321] Added missing files git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C46485 --- CHANGES.txt | 9 + README.html | 2 +- mfc/vldmfc.vcxproj | 337 ++++++++++ mfc/vldmfc.vcxproj.filters | 57 ++ mfc/vldmfc_vs10.sln | 26 + mfc_detect/vldmfc_detect.sln | 26 + mfc_detect/vldmfc_detect.vcproj | 811 +++++++++++++++++++++++ mfc_detect/vldmfc_detect.vcxproj | 469 +++++++++++++ mfc_detect/vldmfc_detect.vcxproj.filters | 49 ++ mfc_detect/vldmfc_detect_vs10.sln | 26 + setup/vld-setup.nsi | 52 +- testsuite/testsuite.cpp | 10 +- testsuite/testsuite.vcproj | 87 +-- vld_vs10.sln | 73 +- 14 files changed, 1904 insertions(+), 130 deletions(-) create mode 100644 mfc/vldmfc.vcxproj create mode 100644 mfc/vldmfc.vcxproj.filters create mode 100644 mfc/vldmfc_vs10.sln create mode 100644 mfc_detect/vldmfc_detect.sln create mode 100644 mfc_detect/vldmfc_detect.vcproj create mode 100644 mfc_detect/vldmfc_detect.vcxproj create mode 100644 mfc_detect/vldmfc_detect.vcxproj.filters create mode 100644 mfc_detect/vldmfc_detect_vs10.sln diff --git a/CHANGES.txt b/CHANGES.txt index 3ddcdfd2..459b3195 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,15 @@ Visual Leak Detector (VLD) Version 1.9h (beta) Change Log / Release Notes +2.0 beta (25 April 2009) +---------------------------- + Enhancements: + + Added support to work with 64-bit applications + + Added support to work with Visual Studio 2010 + + Known Bugs/Restrictions: + + Same bugs/restrictions as version 1.9f. + 1.9h beta (24 February 2009) ---------------------------- Enhancements: diff --git a/README.html b/README.html index 87b94694..2f5234f9 100644 --- a/README.html +++ b/README.html @@ -771,7 +771,7 @@

Additional Developers Wanted

- + diff --git a/mfc/vldmfc.vcxproj b/mfc/vldmfc.vcxproj new file mode 100644 index 00000000..fdf1e3c3 --- /dev/null +++ b/mfc/vldmfc.vcxproj @@ -0,0 +1,337 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {A231973E-072A-428E-982E-5363ADD1CDE2} + MFCProj + + + + Application + Dynamic + MultiByte + + + Application + Dynamic + Unicode + + + Application + Dynamic + MultiByte + + + Application + Dynamic + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + ..\$(PlatformName)\$(Configuration)\ + ..\$(PlatformName)\$(Configuration)\ + $(PlatformName)\$(Configuration)\ + $(PlatformName)\$(Configuration)\ + false + false + ..\$(PlatformName)\$(Configuration)\ + ..\$(PlatformName)\$(Configuration)\ + $(PlatformName)\$(Configuration)\ + $(PlatformName)\$(Configuration)\ + true + true + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\Release/vldmfc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + ..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + .\Release/vldmfc.pdb + Windows + false + + + MachineX86 + + + true + .\Release/vldmfc.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + .\Release/vldmfc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + ..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + .\Release/vldmfc.pdb + Windows + false + + + + + true + .\Release/vldmfc.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\Debug/vldmfc.pch + .\Debug/ + .\Debug/ + .\Debug/ + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + ..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + true + .\Debug/vldmfc.pdb + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/vldmfc.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\Debug/vldmfc.pch + .\Debug/ + .\Debug/ + .\Debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + ..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + true + .\Debug/vldmfc.pdb + Windows + false + + + + + true + .\Debug/vldmfc.bsc + + + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + Create + Create + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + Create + Create + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mfc/vldmfc.vcxproj.filters b/mfc/vldmfc.vcxproj.filters new file mode 100644 index 00000000..a1555d96 --- /dev/null +++ b/mfc/vldmfc.vcxproj.filters @@ -0,0 +1,57 @@ + + + + + {34f1f2ae-d745-4d33-82c0-d281bca28a63} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {716aeea6-27e4-47d9-9d4e-4a9d35551f9c} + h;hpp;hxx;hm;inl + + + {468ee78d-f409-4040-95ff-fd2928868302} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + + + \ No newline at end of file diff --git a/mfc/vldmfc_vs10.sln b/mfc/vldmfc_vs10.sln new file mode 100644 index 00000000..c5000baf --- /dev/null +++ b/mfc/vldmfc_vs10.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/mfc_detect/vldmfc_detect.sln b/mfc_detect/vldmfc_detect.sln new file mode 100644 index 00000000..482d5ced --- /dev/null +++ b/mfc_detect/vldmfc_detect.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect", "vldmfc_detect.vcproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug (Unicode)|Win32 = Debug (Unicode)|Win32 + Debug (Unicode)|x64 = Debug (Unicode)|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/mfc_detect/vldmfc_detect.vcproj b/mfc_detect/vldmfc_detect.vcproj new file mode 100644 index 00000000..7e79ee35 --- /dev/null +++ b/mfc_detect/vldmfc_detect.vcproj @@ -0,0 +1,811 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mfc_detect/vldmfc_detect.vcxproj b/mfc_detect/vldmfc_detect.vcxproj new file mode 100644 index 00000000..e04b267b --- /dev/null +++ b/mfc_detect/vldmfc_detect.vcxproj @@ -0,0 +1,469 @@ + + + + + Debug (Unicode) + Win32 + + + Debug (Unicode) + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {A231973E-072A-428E-982E-5363ADD1CDE2} + MFCProj + + + + Application + Dynamic + Unicode + + + Application + Dynamic + NotSet + + + Application + Dynamic + NotSet + + + Application + Dynamic + Unicode + + + Application + Dynamic + NotSet + + + Application + Dynamic + NotSet + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(Configuration)\ + $(Configuration)\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Debug;%(AdditionalLibraryDirectories) + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX86 + + + true + .\Release/vldmfc.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Debug;%(AdditionalLibraryDirectories) + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX64 + + + true + .\Release/vldmfc.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Debug;%(AdditionalLibraryDirectories) + true + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Debug;%(AdditionalLibraryDirectories) + true + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX64 + + + true + .\Debug/vldmfc.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Debug;%(AdditionalLibraryDirectories) + true + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Debug;%(AdditionalLibraryDirectories) + true + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX64 + + + true + .\Debug/vldmfc.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mfc_detect/vldmfc_detect.vcxproj.filters b/mfc_detect/vldmfc_detect.vcxproj.filters new file mode 100644 index 00000000..a065821f --- /dev/null +++ b/mfc_detect/vldmfc_detect.vcxproj.filters @@ -0,0 +1,49 @@ + + + + + {ee1a072e-69ee-4e6d-b044-911ae029bbeb} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {ab9a8a11-b14d-470f-a7c5-88b379d3e731} + h;hpp;hxx;hm;inl + + + {65ba1fde-89d1-4036-9a69-3cfddfdc7de5} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/mfc_detect/vldmfc_detect_vs10.sln b/mfc_detect/vldmfc_detect_vs10.sln new file mode 100644 index 00000000..14131b34 --- /dev/null +++ b/mfc_detect/vldmfc_detect_vs10.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect", "vldmfc_detect.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug (Unicode)|Win32 = Debug (Unicode)|Win32 + Debug (Unicode)|x64 = Debug (Unicode)|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 1be63ae3..3526194f 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -26,16 +26,16 @@ !include "MUI.nsh" # Provides the modern user-interface # Version number -!define VLD_VERSION "1.9h" +!define VLD_VERSION "2.0" # Define build system paths -!define CRT_PATH "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT" +#!define CRT_PATH "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT" !define DTFW_PATH "C:\Program Files\Debugging Tools for Windows (x86)" !define EDITENV_PATH "editenv" # Define build system files -!define CRT_DLL "msvcr90.dll" -!define CRT_MANIFEST "Microsoft.VC90.CRT.manifest" +#!define CRT_DLL "msvcr90.dll" +#!define CRT_MANIFEST "Microsoft.VC90.CRT.manifest" !define DHL_DLL "dbghelp.dll" !define EDITENV_DLL "editenv.dll" @@ -143,12 +143,15 @@ SectionEnd Section "Import Library" SetOutPath "${LIB_PATH}" - File "..\Release\vld.lib" + File "..\Win32\Release\vld.lib" + File "..\x64\Release\vld.lib" SectionEnd Section "Dynamic Link Libraries" - SetOutPath "${BIN_PATH}" - !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "..\Release\vld.dll" "${BIN_PATH}\vld.dll" $INSTDIR + SetOutPath "${BIN_PATH}\Win32" + !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "..\Win32\Release\vld.dll" "${BIN_PATH}\Win32\vld.dll" $INSTDIR + SetOutPath "${BIN_PATH}\Win64" + !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "..\x64\Release\vld.dll" "${BIN_PATH}\Win64\vld.dll" $INSTDIR MessageBox MB_YESNO "Visual Leak Detector needs the location of vld.dll to be added to your 'Path' environment variable.$\n$\nWould you like the installer to add it to the path now? If you select No, you'll need to add it to the path manually." \ IDYES addtopath IDNO skipaddtopath addtopath: @@ -156,14 +159,18 @@ addtopath: InitPluginsDir SetOutPath "$PLUGINSDIR" File "${EDITENV_PATH}\${EDITENV_DLL}" - System::Call "editenv::pathAdd(i ${ES_SYSTEM}, t '${BIN_PATH}') ? u" + System::Call "editenv::pathAdd(i ${ES_SYSTEM}, t '${BIN_PATH}\Win32') ? u" + System::Call "editenv::pathAdd(i ${ES_SYSTEM}, t '${BIN_PATH}\Win64') ? u" Delete "$PLUGINSDIR\${EDITENV_DLL}" SetOutPath "${BIN_PATH}" skipaddtopath: - !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${DTFW_PATH}\${DHL_DLL}" "${BIN_PATH}\${DHL_DLL}" $INSTDIR - !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${CRT_PATH}\${CRT_DLL}" "${BIN_PATH}\${CRT_DLL}" $INSTDIR - File "..\Microsoft.DTfW.DHL.manifest" - File "${CRT_PATH}\${CRT_MANIFEST}" + SetOutPath "${BIN_PATH}\Win32" + !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "..\Win32\Release\${DHL_DLL}" "${BIN_PATH}\Win32\${DHL_DLL}" $INSTDIR + SetOutPath "${BIN_PATH}\Win64" + !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "..\x64\Release\${DHL_DLL}" "${BIN_PATH}\Win64\${DHL_DLL}" $INSTDIR +# !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${CRT_PATH}\${CRT_DLL}" "${BIN_PATH}\${CRT_DLL}" $INSTDIR +# File "..\Microsoft.DTfW.DHL.manifest" +# File "${CRT_PATH}\${CRT_MANIFEST}" SectionEnd Section "Configuration File" @@ -176,7 +183,8 @@ Section "Source Code" File "..\*.cpp" File "..\*.h" File "..\vld.vcproj" - File "..\*.manifest" + File "..\vld.sln" +# File "..\*.manifest" File "..\*.rc" SectionEnd @@ -210,22 +218,26 @@ Section "un.Header File" SectionEnd Section "un.Import Library" - Delete "${LIB_PATH}\vld.lib" + Delete "${LIB_PATH}\Win32\vld.lib" + Delete "${LIB_PATH}\Win64\vld.lib" RMDir "${LIB_PATH}" SectionEnd Section "un.Dynamic Link Libraries" - !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\vld.dll" + !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win32\vld.dll" + !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win64\vld.dll" DetailPrint "Removing ${BIN_PATH} from the 'Path' system environment variable." InitPluginsDir SetOutPath "$PLUGINSDIR" File "${EDITENV_PATH}\${EDITENV_DLL}" - System::Call "editenv::pathRemove(i ${ES_SYSTEM}, t '${BIN_PATH}') ? u" + System::Call "editenv::pathRemove(i ${ES_SYSTEM}, t '${BIN_PATH}\Win32') ? u" + System::Call "editenv::pathRemove(i ${ES_SYSTEM}, t '${BIN_PATH}\Win64') ? u" Delete "$PLUGINSDIR\${EDITENV_DLL}" - !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\${DHL_DLL}" - !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\${CRT_DLL}" - Delete "${BIN_PATH}\Microsoft.DTfW.DHL.manifest" - Delete "${BIN_PATH}\${CRT_MANIFEST}" + !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win32\${DHL_DLL}" + !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win64\${DHL_DLL}" +# !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\${CRT_DLL}" +# Delete "${BIN_PATH}\Microsoft.DTfW.DHL.manifest" +# Delete "${BIN_PATH}\${CRT_MANIFEST}" RMDir "${BIN_PATH}" SectionEnd diff --git a/testsuite/testsuite.cpp b/testsuite/testsuite.cpp index acbeb9b0..0cc64d08 100644 --- a/testsuite/testsuite.cpp +++ b/testsuite/testsuite.cpp @@ -83,6 +83,7 @@ typedef struct threadcontext_s { } threadcontext_t; __declspec(thread) blockholder_t blocks [MAXBLOCKS]; +__declspec(thread) ULONG freeBlock = (ULONG)0; __declspec(thread) ULONG counts [numactions] = { 0 }; __declspec(thread) IMalloc *imalloc = NULL; __declspec(thread) free_t pfree = NULL; @@ -113,13 +114,16 @@ VOID allocateblock (action_e action, SIZE_T size) { HMODULE crt; ULONG index; + ULONG index2; LPCSTR name; PVOID *pblock; HRESULT status; // Find the first unused index. - for (index = 0; index < MAXBLOCKS; index++) { - if (blocks[index].block == NULL) { + index = freeBlock; + for (index2 = freeBlock + 1; index2 < MAXBLOCKS; index2++) { + if (blocks[index2].block == NULL) { + freeBlock = index2; break; } } @@ -241,6 +245,8 @@ VOID freeblock (ULONG index) assert(FALSE); } blocks[index].block = NULL; + if (index < freeBlock) + freeBlock = index; counts[blocks[index].action]--; total_allocs--; } diff --git a/testsuite/testsuite.vcproj b/testsuite/testsuite.vcproj index 260199ac..e46c7373 100644 --- a/testsuite/testsuite.vcproj +++ b/testsuite/testsuite.vcproj @@ -90,7 +90,7 @@ /> @@ -233,7 +234,7 @@ /> Date: Sat, 24 Apr 2010 23:29:04 +0000 Subject: [PATCH 008/321] Added console projects Setup file fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C46487 --- console/vldconsole.vcxproj | 285 +++++++++++++++++++++++++++++ console/vldconsole.vcxproj.filters | 25 +++ console/vldconsole_vs10.sln | 26 +++ setup/vld-setup.nsi | 10 +- 4 files changed, 343 insertions(+), 3 deletions(-) create mode 100644 console/vldconsole.vcxproj create mode 100644 console/vldconsole.vcxproj.filters create mode 100644 console/vldconsole_vs10.sln diff --git a/console/vldconsole.vcxproj b/console/vldconsole.vcxproj new file mode 100644 index 00000000..0e0e4134 --- /dev/null +++ b/console/vldconsole.vcxproj @@ -0,0 +1,285 @@ + + + + + C Debug + Win32 + + + C Debug + x64 + + + CPP Debug + Win32 + + + CPP Debug + x64 + + + + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2} + + + + Application + false + NotSet + + + Application + false + NotSet + + + Application + false + NotSet + + + Application + false + NotSet + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + ..\$(PlatformName)\Debug\ + ..\$(PlatformName)\Debug\ + $(PlatformName)\$(Configuration)\ + $(PlatformName)\$(Configuration)\ + true + true + ..\$(PlatformName)\Debug\ + ..\$(PlatformName)\Debug\ + $(PlatformName)\$(Configuration)\ + $(PlatformName)\$(Configuration)\ + true + true + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + + + + .\CPP Debug/vldconsole.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + .\CPP Debug/vldconsole.pch + .\CPP Debug/ + .\CPP Debug/ + .\CPP Debug/ + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldconsole.exe + true + ..\Win32\Debug;%(AdditionalLibraryDirectories) + true + .\CPP Debug/vldconsole.pdb + Console + false + + + MachineX86 + + + true + .\CPP Debug/vldconsole.bsc + + + + + .\CPP Debug/vldconsole.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + .\CPP Debug/vldconsole.pch + .\CPP Debug/ + .\CPP Debug/ + .\CPP Debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldconsole.exe + true + ..\x64\Debug;%(AdditionalLibraryDirectories) + true + .\CPP Debug/vldconsole.pdb + Console + false + + + + + true + .\CPP Debug/vldconsole.bsc + + + + + .\C Debug/vldconsole.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + .\C Debug/vldconsole.pch + .\C Debug/ + .\C Debug/ + .\C Debug/ + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldconsole.exe + true + ..\Win32\Debug;%(AdditionalLibraryDirectories) + true + .\C Debug/vldconsole.pdb + Console + false + + + MachineX86 + + + true + .\C Debug/vldconsole.bsc + + + + + .\C Debug/vldconsole.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + .\C Debug/vldconsole.pch + .\C Debug/ + .\C Debug/ + .\C Debug/ + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldconsole.exe + true + ..\x64\Debug;%(AdditionalLibraryDirectories) + true + .\C Debug/vldconsole.pdb + Console + false + + + + + true + .\C Debug/vldconsole.bsc + + + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + true + true + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + true + true + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + \ No newline at end of file diff --git a/console/vldconsole.vcxproj.filters b/console/vldconsole.vcxproj.filters new file mode 100644 index 00000000..a0d4a226 --- /dev/null +++ b/console/vldconsole.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {cfef00a9-107f-44fb-b4e4-95d6324cce2c} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {6dc46008-9659-4679-95d2-cc106ba6ca2f} + h;hpp;hxx;hm;inl + + + {6568e0a7-4b52-49eb-a41c-1e38930cab1f} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/console/vldconsole_vs10.sln b/console/vldconsole_vs10.sln new file mode 100644 index 00000000..a28acb42 --- /dev/null +++ b/console/vldconsole_vs10.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldconsole", "vldconsole.vcxproj", "{23F66B23-5893-429F-BA3E-5F61EB3ED2A2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + C Debug|Win32 = C Debug|Win32 + C Debug|x64 = C Debug|x64 + CPP Debug|Win32 = CPP Debug|Win32 + CPP Debug|x64 = CPP Debug|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|Win32.ActiveCfg = C Debug|Win32 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|Win32.Build.0 = C Debug|Win32 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|x64.ActiveCfg = C Debug|x64 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.C Debug|x64.Build.0 = C Debug|x64 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|Win32.ActiveCfg = CPP Debug|Win32 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|Win32.Build.0 = CPP Debug|Win32 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|x64.ActiveCfg = CPP Debug|x64 + {23F66B23-5893-429F-BA3E-5F61EB3ED2A2}.CPP Debug|x64.Build.0 = CPP Debug|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 3526194f..08cf6114 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -55,7 +55,7 @@ # Define page settings !define MUI_FINISHPAGE_NOAUTOCLOSE -!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.html" +!define MUI_FINISHPAGE_SHOWREADME "http://vld.codeplex.com/documentation" !define MUI_FINISHPAGE_SHOWREADME_TEXT "View Documentation" !define MUI_LICENSEPAGE_BUTTON "Continue" !define MUI_LICENSEPAGE_TEXT_BOTTOM "Click the 'Continue' button to continue installing. Remember, you aren't required to (and are not being asked to) agree to anything before using this software." @@ -142,8 +142,9 @@ Section "Header File" SectionEnd Section "Import Library" - SetOutPath "${LIB_PATH}" + SetOutPath "${LIB_PATH}\Win32" File "..\Win32\Release\vld.lib" + SetOutPath "${LIB_PATH}\Win64" File "..\x64\Release\vld.lib" SectionEnd @@ -183,7 +184,6 @@ Section "Source Code" File "..\*.cpp" File "..\*.h" File "..\vld.vcproj" - File "..\vld.sln" # File "..\*.manifest" File "..\*.rc" SectionEnd @@ -219,7 +219,9 @@ SectionEnd Section "un.Import Library" Delete "${LIB_PATH}\Win32\vld.lib" + RMDir "${LIB_PATH}\Win32" Delete "${LIB_PATH}\Win64\vld.lib" + RMDir "${LIB_PATH}\Win64" RMDir "${LIB_PATH}" SectionEnd @@ -234,7 +236,9 @@ Section "un.Dynamic Link Libraries" System::Call "editenv::pathRemove(i ${ES_SYSTEM}, t '${BIN_PATH}\Win64') ? u" Delete "$PLUGINSDIR\${EDITENV_DLL}" !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win32\${DHL_DLL}" + RMDir "${BIN_PATH}\Win32" !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win64\${DHL_DLL}" + RMDir "${BIN_PATH}\Win64" # !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\${CRT_DLL}" # Delete "${BIN_PATH}\Microsoft.DTfW.DHL.manifest" # Delete "${BIN_PATH}\${CRT_MANIFEST}" From 5dbbb55bd29162b8eb984ab6f23d25589e50c241 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Thu, 13 May 2010 00:07:22 +0000 Subject: [PATCH 009/321] Renamed vld dll files. Problem with MSVC 2010 Unicode library fixed. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C47925 --- CHANGES.txt | 13 ++++++++++++- setup/dbghelp/x64/dbghelp.dll | Bin 0 -> 1369936 bytes setup/dbghelp/x86/dbghelp.dll | Bin 0 -> 1080656 bytes setup/vld-setup.nsi | 16 ++++++++-------- vld.cpp | 8 ++++---- vld.rc | 6 +++++- vld.vcproj | 8 ++++++++ vldint.h | 5 +++++ 8 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 setup/dbghelp/x64/dbghelp.dll create mode 100644 setup/dbghelp/x86/dbghelp.dll diff --git a/CHANGES.txt b/CHANGES.txt index 459b3195..494a7fd1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,7 +2,18 @@ Visual Leak Detector (VLD) Version 1.9h (beta) Change Log / Release Notes -2.0 beta (25 April 2009) +2.0a (13 May 2010) +---------------------------- + Enhancements: + + Renamed vld dll files. + + Bugs Fixed: + + Problem with MSVC 2010 Unicode library fixed. + + Known Bugs/Restrictions: + + Same bugs/restrictions as version 1.9f. + +2.0 (25 April 2010) ---------------------------- Enhancements: + Added support to work with 64-bit applications diff --git a/setup/dbghelp/x64/dbghelp.dll b/setup/dbghelp/x64/dbghelp.dll new file mode 100644 index 0000000000000000000000000000000000000000..499fa290aeae25c32b7ac1d968968bb256f692db GIT binary patch literal 1369936 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 z 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%0A^I5f5jD79JIxTG)J-D$~)13 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དྷw;Qsqvm4Z8Gvfw6-vn4sm#w0g*zjcGB5}rqh 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

`>B-;NP-dpoy6dkHWB%ZY#dPPh7m|N9`~Rq)g> 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%0AqJ~BhbD+q1Gt6KHzmIz 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

J@Y*J)^1AIK3VJXrFSulF|Q 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%0AM$S8Oo)otNX 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 r)|UF~9j-ko^I+1 Date: Tue, 24 Aug 2010 18:50:04 +0000 Subject: [PATCH 010/321] Patch by llessieux git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C56379 --- CHANGES.txt | 24 +++--- crtmfcpatch.h | 22 ++--- utility.cpp | 29 +++++-- utility.h | 2 +- vld.cpp | 205 +++++++++++++++++++++++++++++++++++--------- vld.h | 56 ++++++++++++ vld.vcproj | 6 +- vld.vcxproj | 9 +- vld.vcxproj.filters | 3 + vld_def.h | 38 ++++++++ vldapi.cpp | 26 ++++++ vldint.h | 30 ++++--- 12 files changed, 366 insertions(+), 84 deletions(-) create mode 100644 vld_def.h diff --git a/CHANGES.txt b/CHANGES.txt index 494a7fd1..74629fd6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,17 @@ -Visual Leak Detector (VLD) Version 1.9h (beta) +Visual Leak Detector (VLD) Version 2.0b + Change Log / Release Notes +2.0b (24 August 2010) +---------------------------- + Enhancements: + + Added new commands: VLDReportLeaks, VLDRefreshModules, VLDEnableModule, + VLDDisableModule, VLDSetReportOptions (see vld.h). + + Bugs Fixed: + + Problems with MSVC 2008 SP1 fixed. Thanks to Laurent Lessieux for contributing this patch. + 2.0a (13 May 2010) ---------------------------- Enhancements: @@ -10,18 +20,12 @@ Visual Leak Detector (VLD) Version 1.9h (beta) Bugs Fixed: + Problem with MSVC 2010 Unicode library fixed. - Known Bugs/Restrictions: - + Same bugs/restrictions as version 1.9f. - 2.0 (25 April 2010) ---------------------------- Enhancements: + Added support to work with 64-bit applications + Added support to work with Visual Studio 2010 - Known Bugs/Restrictions: - + Same bugs/restrictions as version 1.9f. - 1.9h beta (24 February 2009) ---------------------------- Enhancements: @@ -78,7 +82,7 @@ Visual Leak Detector (VLD) Version 1.9h (beta) Bugs Fixed: + Numerous deadlock situations. The multithread synchronization scheme has been completely re-written which should make deadlocks in VLD much less - likey to happen. + likely to happen. + An access violation will occur in VLD if GetProcAddress is called to obtain an export's address by ordinal, for certain libraries. @@ -127,7 +131,7 @@ Visual Leak Detector (VLD) Version 1.9h (beta) 1.9c beta (6 November 2006) --------------------------- - New Features/Enhancments: + New Features/Enhancements: + New NSIS installer makes setting up and using VLD much easier. + No need to manually copy dbghelp.dll to the right location, VLD will always @@ -182,7 +186,7 @@ Visual Leak Detector (VLD) Version 1.9h (beta) 1.9a beta (9 March 2006) ------------------------ - New Features/Enhancments: + New Features/Enhancements: + All new leak detection engine detects most, if not all, in-process memory leaks, not just leaks from "new" or "malloc", including COM-based leaks. diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 31643faa..f8c91d1f 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -134,7 +134,7 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, // This is the first call to this function. Link to the real // _calloc_dbg. msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd__calloc_dbg = (_calloc_dbg_t)GetProcAddress(msvcrxxd, "_calloc_dbg"); + pcrtxxd__calloc_dbg = (_calloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_calloc_dbg"); } return vld.__calloc_dbg(pcrtxxd__calloc_dbg, context, num, size, type, file, line); @@ -173,7 +173,7 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, // This is the first call to this function. Link to the real // _malloc_dbg. msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd__malloc_dbg = (_malloc_dbg_t)GetProcAddress(msvcrxxd, "_malloc_dbg"); + pcrtxxd__malloc_dbg = (_malloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_malloc_dbg"); } return vld.__malloc_dbg(pcrtxxd__malloc_dbg, context, size, type, file, line); @@ -215,7 +215,7 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, // This is the first call to this function. Link to the real // _realloc_dbg. msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd__realloc_dbg = (_realloc_dbg_t)GetProcAddress(msvcrxxd, "_realloc_dbg"); + pcrtxxd__realloc_dbg = (_realloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_realloc_dbg"); } return vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, type, file, line); @@ -303,7 +303,7 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) if (pcrtxxd_calloc == NULL) { // This is the first call to this function. Link to the real malloc. msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd_calloc = (calloc_t)GetProcAddress(msvcrxxd, "calloc"); + pcrtxxd_calloc = (calloc_t)vld._RGetProcAddress(msvcrxxd, "calloc"); } return vld._calloc(pcrtxxd_calloc, context, num, size); @@ -333,7 +333,7 @@ void* CrtMfcPatch::crtd_malloc (size_t size) if (pcrtxxd_malloc == NULL) { // This is the first call to this function. Link to the real malloc. msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd_malloc = (malloc_t)GetProcAddress(msvcrxxd, "malloc"); + pcrtxxd_malloc = (malloc_t)vld._RGetProcAddress(msvcrxxd, "malloc"); } return vld._malloc(pcrtxxd_malloc, context, size); @@ -365,7 +365,7 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) if (pcrtxxd_realloc == NULL) { // This is the first call to this function. Link to the real realloc. msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd_realloc = (realloc_t)GetProcAddress(msvcrxxd, "realloc"); + pcrtxxd_realloc = (realloc_t)vld._RGetProcAddress(msvcrxxd, "realloc"); } return vld._realloc(pcrtxxd_realloc, context, mem, size); @@ -443,7 +443,7 @@ void* CrtMfcPatch::crtd_new_dbg (context_t& context, // This is the first call to this function. Link to the real CRT debug // new operator. msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd_new_dbg = (new_dbg_crt_t)GetProcAddress(msvcrxxd, procname); + pcrtxxd_new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(msvcrxxd, procname); } return vld.__new_dbg_crt(pcrtxxd_new_dbg, context, size, type, file, line); @@ -474,7 +474,7 @@ void* CrtMfcPatch::crtd_new (context_t& context, size_t size) // This is the first call to this function. Link to the real CRT new // operator. msvcrxxd = GetModuleHandle(crtddll); - pcrtxxd_scalar_new = (new_t)GetProcAddress(msvcrxxd, procname); + pcrtxxd_scalar_new = (new_t)vld._RGetProcAddress(msvcrxxd, procname); } return vld._new(pcrtxxd_scalar_new, context, size); @@ -816,7 +816,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, // This is the first call to this function. Link to the real MFC debug // new operator. mfcxxd = GetModuleHandle(mfcdll); - pmfcxxd__new_dbg = (new_dbg_crt_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); + pmfcxxd__new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); @@ -857,7 +857,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, // This is the first call to this function. Link to the real MFC debug // new operator. mfcxxd = GetModuleHandle(mfcdll); - pmfcxxd__new_dbg = (new_dbg_mfc_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); + pmfcxxd__new_dbg = (new_dbg_mfc_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); @@ -888,7 +888,7 @@ void* CrtMfcPatch::mfcd_new (context_t& context, size_t size) // This is the first call to this function. Link to the real CRT new // operator. mfcxxd = GetModuleHandle(mfcdll); - pmfcxxd_new = (new_t)GetProcAddress(mfcxxd, (LPCSTR)ordinal); + pmfcxxd_new = (new_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } return vld._new(pmfcxxd_new, context, size); diff --git a/utility.cpp b/utility.cpp index 78efbeac..d68c8a54 100644 --- a/utility.cpp +++ b/utility.cpp @@ -25,6 +25,7 @@ #define VLDBUILD // Declares that we are building Visual Leak Detector. #include "utility.h" // Provides various utility functions and macros. #include "vldheap.h" // Provides internal new and delete operators. +#include "vldint.h" // Imported Global Variables extern CRITICAL_SECTION imagelock; @@ -33,6 +34,7 @@ extern CRITICAL_SECTION imagelock; static BOOL reportdelay = FALSE; // If TRUE, we sleep for a bit after calling OutputDebugString to give the debugger time to catch up. static FILE *reportfile = NULL; // Pointer to the file, if any, to send the memory leak report to. static BOOL reporttodebugger = TRUE; // If TRUE, a copy of the memory leak report will be sent to the debugger for display. +static BOOL reporttostdout = TRUE; // If TRUE, a copy of the memory leak report will be sent to standart output. static encoding_e reportencoding = ascii; // Output encoding of the memory leak report. // dumpmemorya - Dumps a nicely formatted rendition of a region of memory. @@ -462,11 +464,16 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) LPCVOID replacement = entry->replacement; IMAGE_THUNK_DATA *iate; DWORD protect; - FARPROC import; + FARPROC import = NULL; + FARPROC import2 = NULL; // Get the *real* address of the import. If we find this address in the IAT, // then we've found the entry that needs to be patched. + import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); import = GetProcAddress(exportmodule, importname); + if ( import2 ) + import = import2; + assert(import != NULL); // Perhaps the named export module does not actually export the named import? // Locate the import's IAT entry. @@ -477,10 +484,12 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) // entry with the address of the replacement. Note that the IAT // entry may be write-protected, so we must first ensure that it is // writable. - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)replacement; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - + if ( import != replacement ) + { + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)replacement; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + } // The patch has been installed in the import module. result++; } @@ -564,6 +573,9 @@ VOID report (LPCWSTR format, ...) // Send the report to the previously specified file. fwrite(messagew, sizeof(WCHAR), wcslen(messagew), reportfile); } + if ( reporttostdout ) + fwprintf(stdout,messagew); + if (reporttodebugger) { OutputDebugStringW(messagew); } @@ -579,6 +591,10 @@ VOID report (LPCWSTR format, ...) // Send the report to the previously specified file. fwrite(messagea, sizeof(CHAR), strlen(messagea), reportfile); } + + if ( reporttostdout ) + printf(messagea); + if (reporttodebugger) { OutputDebugStringA(messagea); } @@ -748,10 +764,11 @@ VOID setreportencoding (encoding_e encoding) // // None. // -VOID setreportfile (FILE *file, BOOL copydebugger) +VOID setreportfile (FILE *file, BOOL copydebugger, BOOL tostdout) { reportfile = file; reporttodebugger = copydebugger; + reporttostdout = tostdout; } // strapp - Appends the specified source string to the specified destination diff --git a/utility.h b/utility.h index f94e9fcf..1e3c9e50 100644 --- a/utility.h +++ b/utility.h @@ -125,7 +125,7 @@ VOID report (LPCWSTR format, ...); VOID restoreimport (HMODULE importmodule, moduleentry_t* module); VOID restoremodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); VOID setreportencoding (encoding_e encoding); -VOID setreportfile (FILE *file, BOOL copydebugger); +VOID setreportfile (FILE *file, BOOL copydebugger, BOOL copytostdout); VOID strapp (LPWSTR *dest, LPCWSTR source); BOOL strtobool (LPCWSTR s); #if _WIN32_WINNT < 0x0600 // Windows XP or earlier, no GetProcessIdOfThread() diff --git a/vld.cpp b/vld.cpp index 00c537d2..44db678d 100644 --- a/vld.cpp +++ b/vld.cpp @@ -82,6 +82,8 @@ patchentry_t VisualLeakDetector::m_kernel32Patch [] = { #define ORDINAL(x86, x64) (LPCSTR)x64 #endif +VisualLeakDetector::_GetProcAddressType *VisualLeakDetector::m_original_GetProcAddress = NULL; + static patchentry_t mfc42dPatch [] = { // XXX why are the vector new operators missing for mfc42d.dll? (LPCSTR)711, VS60::mfcd_scalar_new, @@ -335,7 +337,6 @@ moduleentry_t VisualLeakDetector::m_patchtable [] = { // VisualLeakDetector::VisualLeakDetector () { - WCHAR bom = BOM; // Unicode byte-order mark. HMODULE kernel32; ModuleSet *newmodules; HMODULE ntdll; @@ -360,6 +361,7 @@ VisualLeakDetector::VisualLeakDetector () kernel32 = GetModuleHandle(L"kernel32.dll"); ntdll = GetModuleHandle(L"ntdll.dll"); + m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); // Initialize global variables. currentprocess = GetCurrentProcess(); currentthread = GetCurrentThread(); @@ -406,38 +408,7 @@ VisualLeakDetector::VisualLeakDetector () m_status |= VLD_STATUS_NEVER_ENABLED; } if (m_options & VLD_OPT_REPORT_TO_FILE) { - // Reporting to file enabled. - if (m_options & VLD_OPT_UNICODE_REPORT) { - // Unicode data encoding has been enabled. Write the byte-order - // mark before anything else gets written to the file. Open the - // file for binary writing. - if (_wfopen_s(&m_reportfile, m_reportfilepath, L"wb") == EINVAL) { - // Couldn't open the file. - m_reportfile = NULL; - } - else { - fwrite(&bom, sizeof(WCHAR), 1, m_reportfile); - setreportencoding(unicode); - } - } - else { - // Open the file in text mode for ASCII output. - if (_wfopen_s(&m_reportfile, m_reportfilepath, L"w") == EINVAL) { - // Couldn't open the file. - m_reportfile = NULL; - } - else { - setreportencoding(ascii); - } - } - if (m_reportfile == NULL) { - report(L"WARNING: Visual Leak Detector: Couldn't open report file for writing: %s\n" - L" The report will be sent to the debugger instead.\n", m_reportfilepath); - } - else { - // Set the "report" function to write to the file. - setreportfile(m_reportfile, m_options & VLD_OPT_REPORT_TO_DEBUGGER); - } + SetupReporting(); } if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { // Insert a slight delay between messages sent to the debugger for @@ -1014,6 +985,9 @@ VOID VisualLeakDetector::configure () else if (_wcsicmp(buffer, L"file") == 0) { m_options |= VLD_OPT_REPORT_TO_FILE; } + else if (_wcsicmp(buffer, L"stdout") == 0) { + m_options |= VLD_OPT_REPORT_TO_STDOUT; + } else { m_options |= VLD_OPT_REPORT_TO_DEBUGGER; } @@ -2313,9 +2287,18 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) } } else { - if (strcmp(patchentry->importname, procname) == 0) { - return (FARPROC)patchentry->replacement; - } + __try + { + if (strcmp(patchentry->importname, procname) == 0) { + return (FARPROC)patchentry->replacement; + } + } + __except(EXCEPTION_EXECUTE_HANDLER) + { + if ((UINT)patchentry->importname == (UINT)procname) { + return (FARPROC)patchentry->replacement; + } + } } patchentry++; } @@ -2323,7 +2306,12 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) // The requested function is not a patched function. Just return the real // address of the requested function. - return GetProcAddress(module, procname); + return vld._RGetProcAddress(module, procname); +} + +FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) +{ + return m_original_GetProcAddress(module, procname); } // _HeapCreate - Calls to HeapCreate are patched through to this function. This @@ -2467,6 +2455,40 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod return status; } +NTSTATUS VisualLeakDetector::RefreshModules() +{ + ModuleSet::Iterator moduleit; + ModuleSet *newmodules; + ModuleSet *oldmodules; + + EnterCriticalSection(&vld.m_loaderlock); + + // Create a new set of all loaded modules, including any newly loaded + // modules. + newmodules = new ModuleSet; + newmodules->reserve(MODULESETRESERVE); + EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); + + // Attach to all modules included in the set. + vld.attachtoloadedmodules(newmodules); + + // Start using the new set of loaded modules. + EnterCriticalSection(&vld.m_moduleslock); + oldmodules = vld.m_loadedmodules; + vld.m_loadedmodules = newmodules; + LeaveCriticalSection(&vld.m_moduleslock); + + // Free resources used by the old module list. + for (moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { + delete (*moduleit).name; + delete (*moduleit).path; + } + delete oldmodules; + + LeaveCriticalSection(&vld.m_loaderlock); + + return STATUS_SUCCESS; +} void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &context_ ) { CallStack *callstack; @@ -2727,7 +2749,7 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) // CoGetMalloc and get a pointer to the system implementation of the // IMalloc interface. ole32 = GetModuleHandle(L"ole32.dll"); - pCoGetMalloc = (CoGetMalloc_t)GetProcAddress(ole32, "CoGetMalloc"); + pCoGetMalloc = (CoGetMalloc_t)vld._RGetProcAddress(ole32, "CoGetMalloc"); pCoGetMalloc(context, &vld.m_imalloc); } @@ -2766,7 +2788,7 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) // This is the first call to this function. Link to the real // CoTaskMemAlloc. ole32 = GetModuleHandle(L"ole32.dll"); - pCoTaskMemAlloc = (CoTaskMemAlloc_t)GetProcAddress(ole32, "CoTaskMemAlloc"); + pCoTaskMemAlloc = (CoTaskMemAlloc_t)vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -2822,7 +2844,7 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) // This is the first call to this function. Link to the real // CoTaskMemRealloc. ole32 = GetModuleHandle(L"ole32.dll"); - pCoTaskMemRealloc = (CoTaskMemRealloc_t)GetProcAddress(ole32, "CoTaskMemRealloc"); + pCoTaskMemRealloc = (CoTaskMemRealloc_t)vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -3049,3 +3071,106 @@ ULONG VisualLeakDetector::Release () assert(m_imalloc != NULL); return m_imalloc->Release(); } + + +VOID __stdcall VisualLeakDetector::Reportleaks( ) +{ + HeapMap::Iterator heapit; + HANDLE heap; + + // Generate a memory leak report for each heap in the process. + for (heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + heap = (*heapit).first; + reportleaks(heap); + } +} + +void __stdcall VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) +{ + ModuleSet::Iterator moduleit; + + EnterCriticalSection(&vld.m_moduleslock); + moduleit = vld.m_loadedmodules->begin(); + while( moduleit != vld.m_loadedmodules->end() ) + { + if ( (*moduleit).addrlow == (UINT_PTR)module) + { + moduleinfo_t *mod = (moduleinfo_t *)&(*moduleit); + if ( on ) + mod->flags &= ~VLD_MODULE_EXCLUDED; + else + mod->flags |= VLD_MODULE_EXCLUDED; + + break; + } + moduleit++; + } + LeaveCriticalSection(&vld.m_moduleslock); + +} + +void __stdcall VisualLeakDetector::EnableModule(HMODULE module) +{ + ChangeModuleState(module,true); +} + +void __stdcall VisualLeakDetector::DisableModule(HMODULE module) +{ + ChangeModuleState(module,false); +} + +void __stdcall VisualLeakDetector::SetReportOptions(UINT32 option_mask,WCHAR *filename) +{ + m_options |= option_mask & VLD_OPT_REPORT_TO_DEBUGGER; + if ( (option_mask & VLD_OPT_REPORT_TO_FILE) && ( filename != NULL )) + { + wcsncpy_s(m_reportfilepath, MAX_PATH, filename, _TRUNCATE); + m_options |= option_mask & VLD_OPT_REPORT_TO_FILE; + } + m_options |= option_mask & VLD_OPT_REPORT_TO_STDOUT; + m_options |= option_mask & VLD_OPT_UNICODE_REPORT; + + SetupReporting(); +} + +void VisualLeakDetector::SetupReporting() +{ + WCHAR bom = BOM; // Unicode byte-order mark. + + //Close the previous report file if needed. + if ( m_reportfile ) + fclose(m_reportfile); + + // Reporting to file enabled. + if (m_options & VLD_OPT_UNICODE_REPORT) { + // Unicode data encoding has been enabled. Write the byte-order + // mark before anything else gets written to the file. Open the + // file for binary writing. + if (_wfopen_s(&m_reportfile, m_reportfilepath, L"wb") == EINVAL) { + // Couldn't open the file. + m_reportfile = NULL; + } + else { + fwrite(&bom, sizeof(WCHAR), 1, m_reportfile); + setreportencoding(unicode); + } + } + else { + // Open the file in text mode for ASCII output. + if (_wfopen_s(&m_reportfile, m_reportfilepath, L"w") == EINVAL) { + // Couldn't open the file. + m_reportfile = NULL; + } + else { + setreportencoding(ascii); + } + } + if (m_reportfile == NULL) { + report(L"WARNING: Visual Leak Detector: Couldn't open report file for writing: %s\n" + L" The report will be sent to the debugger instead.\n", m_reportfilepath); + } + else { + // Set the "report" function to write to the file. + setreportfile(m_reportfile, m_options & VLD_OPT_REPORT_TO_DEBUGGER, m_options & VLD_OPT_REPORT_TO_STDOUT); + } +} diff --git a/vld.h b/vld.h index c0915fc7..033d8101 100644 --- a/vld.h +++ b/vld.h @@ -23,6 +23,8 @@ #pragma once +#include "vld_def.h" + #ifdef _DEBUG #pragma comment(lib, "vld.lib") @@ -93,6 +95,56 @@ __declspec(dllimport) void VLDEnable (); // __declspec(dllimport) void VLDRestore (); +// VLDReportLeaks - Report leaks up to the execution point. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDReportLeaks (); + + +// VLDRefreshModules - Look for recently loaded DLLs and patch them if necessary. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDRefreshModules(); + + +// VLDEnableModule - Enable Memory leak checking on the specified module. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDEnableModule(HMODULE); + + +// VLDDisableModule - Disable Memory leak checking on the specified module. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDDisableModule(HMODULE); + +// VLDSetOptions - Update the report options via function call rather than INI file. +// +// Only the following flags are checked +// VLD_OPT_REPORT_TO_DEBUGGER +// VLD_OPT_REPORT_TO_FILE +// VLD_OPT_REPORT_TO_STDOUT +// VLD_OPT_UNICODE_REPORT +// +// filename is optional. +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, WCHAR *filename = NULL); + #ifdef __cplusplus } #endif // __cplusplus @@ -102,5 +154,9 @@ __declspec(dllimport) void VLDRestore (); #define VLDEnable() #define VLDDisable() #define VLDRestore() +#define VLDReportLeaks() +#define VLDRefreshModules() +#define VLDEnableModule() +#define VLDDisableModule() #endif // _DEBUG diff --git a/vld.vcproj b/vld.vcproj index 4e1d70a4..9440bddd 100644 --- a/vld.vcproj +++ b/vld.vcproj @@ -1,7 +1,7 @@ + + diff --git a/vld.vcxproj b/vld.vcxproj index 25c4cc40..ed97ef05 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -102,7 +102,7 @@ 0x03200000 false DIA SDK\lib;%(AdditionalLibraryDirectories) - psapi.lib;diaguids.lib;%(AdditionalDependencies) + psapi.lib;%(AdditionalDependencies) @@ -131,7 +131,7 @@ false MachineX64 DIA SDK\lib\amd64;%(AdditionalLibraryDirectories) - psapi.lib;diaguids.lib;%(AdditionalDependencies) + psapi.lib;%(AdditionalDependencies) @@ -160,7 +160,7 @@ 0x03200000 false DIA SDK\lib;%(AdditionalLibraryDirectories) - diaguids.lib;%(AdditionalDependencies) + %(AdditionalDependencies) @@ -194,7 +194,7 @@ MachineX64 true DIA SDK\lib\amd64;%(AdditionalLibraryDirectories) - diaguids.lib;%(AdditionalDependencies) + %(AdditionalDependencies) @@ -228,6 +228,7 @@ + diff --git a/vld.vcxproj.filters b/vld.vcxproj.filters index 6e35fdca..fb3682fe 100644 --- a/vld.vcxproj.filters +++ b/vld.vcxproj.filters @@ -74,6 +74,9 @@ Header Files + + Header Files + diff --git a/vld_def.h b/vld_def.h new file mode 100644 index 00000000..2326a9c2 --- /dev/null +++ b/vld_def.h @@ -0,0 +1,38 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Import Library Header +// Copyright (c) 2006 Dan Moulding +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#define VLD_OPT_AGGREGATE_DUPLICATES 0x001 // If set, aggregate duplicate leaks in the leak report. +#define VLD_OPT_MODULE_LIST_INCLUDE 0x002 // If set, modules in the module list are included, all others are excluded. +#define VLD_OPT_REPORT_TO_DEBUGGER 0x004 // If set, the memory leak report is sent to the debugger. +#define VLD_OPT_REPORT_TO_FILE 0x008 // If set, the memory leak report is sent to a file. +#define VLD_OPT_SAFE_STACK_WALK 0x010 // If set, the stack is walked using the "safe" method (StackWalk64). +#define VLD_OPT_SELF_TEST 0x020 // If set, perform a self-test to verify memory leak self-checking. +#define VLD_OPT_SLOW_DEBUGGER_DUMP 0x040 // If set, inserts a slight delay between sending output to the debugger. +#define VLD_OPT_START_DISABLED 0x080 // If set, memory leak detection will initially disabled. +#define VLD_OPT_TRACE_INTERNAL_FRAMES 0x100 // If set, include useless frames (e.g. internal to VLD) in call stacks. +#define VLD_OPT_UNICODE_REPORT 0x200 // If set, the leak report will be encoded UTF-16 instead of ASCII. +#define VLD_OPT_VLDOFF 0x400 // If set, VLD will be completely deactivated. It will not attach to any modules. +#define VLD_OPT_REPORT_TO_STDOUT 0x800 // If set, the memory leak report is sent to stdout. + diff --git a/vldapi.cpp b/vldapi.cpp index c0a6876e..bd6cf7c1 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -85,3 +85,29 @@ extern "C" __declspec(dllexport) void VLDRestore () tls->flags &= ~(VLD_TLS_DISABLED | VLD_TLS_ENABLED); tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); } + +extern "C" __declspec(dllexport) void VLDReportLeaks () +{ + vld.Reportleaks(); +} + +extern "C" __declspec(dllexport) void VLDRefreshModules() +{ + vld.RefreshModules(); +} + +extern "C" __declspec(dllexport) void VLDEnableModule(HMODULE module) +{ + vld.EnableModule(module); +} + +extern "C" __declspec(dllexport) void VLDDisableModule(HMODULE module) +{ + vld.DisableModule(module); +} + + +extern "C" __declspec(dllexport) void VLDSetReportOptions(UINT32 option_mask,WCHAR *filename) +{ + vld.SetReportOptions(option_mask,filename); +} diff --git a/vldint.h b/vldint.h index e70ec05e..1d7b3a0c 100644 --- a/vldint.h +++ b/vldint.h @@ -31,6 +31,7 @@ Applications should never include this header." #include #include +#include "vld_def.h" #include "callstack.h" // Provides a custom class for handling call stacks. #include "map.h" // Provides a custom STL-like map template. #include "ntapi.h" // Provides access to NT APIs. @@ -172,6 +173,8 @@ class VisualLeakDetector : public IMalloc VisualLeakDetector(); ~VisualLeakDetector(); + NTSTATUS RefreshModules(); + //////////////////////////////////////////////////////////////////////////////// // Public CRT and MFC Common Handlers // @@ -207,6 +210,13 @@ class VisualLeakDetector : public IMalloc LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); ULONG __stdcall Release (); + VOID __stdcall Reportleaks(); + VOID __stdcall EnableModule(HMODULE module); + VOID __stdcall DisableModule(HMODULE module); + void __stdcall SetReportOptions(UINT32 option_mask,WCHAR *filename); + + + static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); private: //////////////////////////////////////////////////////////////////////////////// // Private leak detection functions - see each function definition for details. @@ -232,6 +242,7 @@ class VisualLeakDetector : public IMalloc // Utils static BOOL IsModuleExcluded (UINT_PTR returnaddress); static void getcallstack( CallStack **&ppcallstack, context_t &context ); + void SetupReporting(); //////////////////////////////////////////////////////////////////////////////// // IAT replacement functions - see each function definition for details. @@ -255,6 +266,7 @@ class VisualLeakDetector : public IMalloc static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); + //////////////////////////////////////////////////////////////////////////////// // Private data //////////////////////////////////////////////////////////////////////////////// @@ -269,17 +281,7 @@ class VisualLeakDetector : public IMalloc UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. CRITICAL_SECTION m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. UINT32 m_options; // Configuration options: -#define VLD_OPT_AGGREGATE_DUPLICATES 0x1 // If set, aggregate duplicate leaks in the leak report. -#define VLD_OPT_MODULE_LIST_INCLUDE 0x2 // If set, modules in the module list are included, all others are excluded. -#define VLD_OPT_REPORT_TO_DEBUGGER 0x4 // If set, the memory leak report is sent to the debugger. -#define VLD_OPT_REPORT_TO_FILE 0x8 // If set, the memory leak report is sent to a file. -#define VLD_OPT_SAFE_STACK_WALK 0x10 // If set, the stack is walked using the "safe" method (StackWalk64). -#define VLD_OPT_SELF_TEST 0x20 // If set, peform a self-test to verify memory leak self-checking. -#define VLD_OPT_SLOW_DEBUGGER_DUMP 0x40 // If set, inserts a slight delay between sending output to the debugger. -#define VLD_OPT_START_DISABLED 0x80 // If set, memory leak detection will initially disabled. -#define VLD_OPT_TRACE_INTERNAL_FRAMES 0x100 // If set, include useless frames (e.g. internal to VLD) in call stacks. -#define VLD_OPT_UNICODE_REPORT 0x200 // If set, the leak report will be encoded UTF-16 instead of ASCII. -#define VLD_OPT_VLDOFF 0x400 // If set, VLD will be completely deactivated. It will not attach to any modules. + static patchentry_t m_kernel32Patch []; static patchentry_t m_ntdllPatch []; static patchentry_t m_ole32Patch []; @@ -298,6 +300,12 @@ class VisualLeakDetector : public IMalloc TlsSet *m_tlsset; // Set of all all thread-local storage structres for the process. HMODULE m_vldbase; // Visual Leak Detector's own module handle (base address). + typedef FARPROC __stdcall _GetProcAddressType(HMODULE module, LPCSTR procname); + + VOID __stdcall ChangeModuleState(HMODULE module,bool on); + + static _GetProcAddressType * m_original_GetProcAddress; + // The Visual Leak Detector APIs are our friends. friend __declspec(dllexport) void VLDDisable (); friend __declspec(dllexport) void VLDEnable (); From ed744e4c1f2239da3900804e23c0e9f6d46eb787 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 24 Aug 2010 18:57:11 +0000 Subject: [PATCH 011/321] Setup file fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C56380 --- setup/vld-setup.nsi | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index c3af8541..8f903777 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -1,7 +1,7 @@ ################################################################################ # # Visual Leak Detector - NSIS Installation Script -# Copyright (c) 2006-2009 Dan Moulding +# Copyright (c) 2006-2010 Dan Moulding, Arkadiy Shapkin # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -26,7 +26,7 @@ !include "MUI.nsh" # Provides the modern user-interface # Version number -!define VLD_VERSION "2.0a" +!define VLD_VERSION "2.0b" # Define build system paths #!define CRT_PATH "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT" @@ -139,6 +139,7 @@ SectionEnd Section "Header File" SetOutPath "${INCLUDE_PATH}" File "..\vld.h" + File "..\vld_def.h" SectionEnd Section "Import Library" @@ -184,6 +185,8 @@ Section "Source Code" File "..\*.cpp" File "..\*.h" File "..\vld.vcproj" + File "..\vld.vcxproj" + File "..\vld.vcxproj.filters" # File "..\*.manifest" File "..\*.rc" SectionEnd @@ -214,6 +217,7 @@ SectionEnd # Section "un.Header File" Delete "${INCLUDE_PATH}\vld.h" + Delete "${INCLUDE_PATH}\vld_def.h" RMDir "${INCLUDE_PATH}" SectionEnd @@ -253,6 +257,8 @@ Section "un.Source Code" Delete "${SRC_PATH}\*.cpp" Delete "${SRC_PATH}\*.h" Delete "${SRC_PATH}\vld.vcproj" + Delete "${SRC_PATH}\vld.vcxproj" + Delete "${SRC_PATH}\vld.vcxproj.filters" Delete "${SRC_PATH}\*.manifest" Delete "${SRC_PATH}\*.rc" RMDir "${SRC_PATH}" From 35c047095c13c5ee967a8a8c8b3289c9198db24a Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 24 Aug 2010 19:36:59 +0000 Subject: [PATCH 012/321] VS2010 project fixed Minor changes git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C56383 --- callstack.cpp | 64 +- callstack.h | 2 +- crtmfcpatch.h | 44 +- testsuite/testsuite.cpp | 2 +- testsuite/testsuite.vcxproj | 17 +- utility.cpp | 384 ++++++------ utility.h | 6 +- vld.cpp | 1180 +++++++++++++++++------------------ vld.h | 9 +- vld.vcxproj | 20 +- vldapi.cpp | 20 +- vldint.h | 28 +- 12 files changed, 890 insertions(+), 886 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index c0594c3d..201e7849 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -315,8 +315,8 @@ VOID CallStack::push_back (const UINT_PTR programcounter) // VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) { - UINT32 count = 0; - UINT_PTR* framepointer = context.fp; + UINT32 count = 0; + UINT_PTR* framepointer = context.fp; #if defined(_M_IX86) while (count < maxdepth) { @@ -349,37 +349,37 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) count++; push_back(*(framepointer + 1)); framepointer = (UINT_PTR*)*framepointer; - } + } #elif defined(_M_X64) - UINT32 maxframes = min(62, maxdepth + 10); - static USHORT (WINAPI *s_pfnCaptureStackBackTrace)(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash) = 0; - if (s_pfnCaptureStackBackTrace == 0) - { - const HMODULE hNtDll = GetModuleHandle(L"ntdll.dll"); - reinterpret_cast(s_pfnCaptureStackBackTrace) - = ::GetProcAddress(hNtDll, "RtlCaptureStackBackTrace"); - if (s_pfnCaptureStackBackTrace == 0) - return; - } - UINT_PTR* myFrames = new UINT_PTR[maxframes]; - ZeroMemory(myFrames, sizeof(UINT_PTR) * maxframes); - s_pfnCaptureStackBackTrace(0, maxframes, (PVOID*)myFrames, NULL); - UINT32 startIndex = 0; - while (count < maxframes) { - if (myFrames[count] == 0) - break; - if (myFrames[count] == *(framepointer + 1)) - startIndex = count; - count++; - } - count = startIndex; - while (count < maxframes) { - if (myFrames[count] == 0) - break; - push_back(myFrames[count]); - count++; - } - delete [] myFrames; + UINT32 maxframes = min(62, maxdepth + 10); + static USHORT (WINAPI *s_pfnCaptureStackBackTrace)(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash) = 0; + if (s_pfnCaptureStackBackTrace == 0) + { + const HMODULE hNtDll = GetModuleHandle(L"ntdll.dll"); + reinterpret_cast(s_pfnCaptureStackBackTrace) + = ::GetProcAddress(hNtDll, "RtlCaptureStackBackTrace"); + if (s_pfnCaptureStackBackTrace == 0) + return; + } + UINT_PTR* myFrames = new UINT_PTR[maxframes]; + ZeroMemory(myFrames, sizeof(UINT_PTR) * maxframes); + s_pfnCaptureStackBackTrace(0, maxframes, (PVOID*)myFrames, NULL); + UINT32 startIndex = 0; + while (count < maxframes) { + if (myFrames[count] == 0) + break; + if (myFrames[count] == *(framepointer + 1)) + startIndex = count; + count++; + } + count = startIndex; + while (count < maxframes) { + if (myFrames[count] == 0) + break; + push_back(myFrames[count]); + count++; + } + delete [] myFrames; #endif } diff --git a/callstack.h b/callstack.h index 79e7117b..c7b1c1a2 100644 --- a/callstack.h +++ b/callstack.h @@ -113,5 +113,5 @@ class FastCallStack : public CallStack class SafeCallStack : public CallStack { public: - VOID getstacktrace (UINT32 maxdepth, context_t& context); + VOID getstacktrace (UINT32 maxdepth, context_t& context); }; diff --git a/crtmfcpatch.h b/crtmfcpatch.h index f8c91d1f..17b06a2c 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -88,7 +88,7 @@ class CrtMfcPatch template static void* __cdecl mfcd_new_dbg (context_t& context, size_t size, char const *file, int line); template - static void* __cdecl mfcd_new (context_t& context, size_t size); + static void* __cdecl mfcd_new (context_t& context, size_t size); }; @@ -164,7 +164,7 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, { static _malloc_dbg_t pcrtxxd__malloc_dbg = NULL; - context_t context; + context_t context; HMODULE msvcrxxd; CAPTURE_CONTEXT(context); @@ -206,7 +206,7 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, { static _realloc_dbg_t pcrtxxd__realloc_dbg = NULL; - context_t context; + context_t context; HMODULE msvcrxxd; CAPTURE_CONTEXT(context); @@ -243,7 +243,7 @@ void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, char const *file, int line) { - context_t context; + context_t context; CAPTURE_CONTEXT(context); return crtd_new_dbg(context, size, type, file, line); @@ -295,7 +295,7 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) { static calloc_t pcrtxxd_calloc = NULL; - context_t context; + context_t context; HMODULE msvcrxxd; CAPTURE_CONTEXT(context); @@ -325,7 +325,7 @@ void* CrtMfcPatch::crtd_malloc (size_t size) { static malloc_t pcrtxxd_malloc = NULL; - context_t context; + context_t context; HMODULE msvcrxxd; CAPTURE_CONTEXT(context); @@ -357,7 +357,7 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) { static realloc_t pcrtxxd_realloc = NULL; - context_t context; + context_t context; HMODULE msvcrxxd; CAPTURE_CONTEXT(context); @@ -383,7 +383,7 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) TEMPLATE_HEADER void* CrtMfcPatch::crtd_scalar_new (size_t size) { - context_t context; + context_t context; CAPTURE_CONTEXT(context); return crtd_new(context, size); @@ -508,7 +508,7 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size, char const *file, int line) { - context_t context; + context_t context; CAPTURE_CONTEXT(context); return mfcd_new_dbg @@ -534,7 +534,7 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size, char const *file, int line) { - context_t context; + context_t context; CAPTURE_CONTEXT(context); return mfcd_new_dbg @@ -608,7 +608,7 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, TEMPLATE_HEADER void* CrtMfcPatch::mfcd_scalar_new (size_t size) { - context_t context; + context_t context; CAPTURE_CONTEXT(context); return mfcd_new(context, size); @@ -960,36 +960,36 @@ typedef CrtMfcPatch + 267, 268, 269, 893, 894, 895> #else - 267, 268, 269, 907, 908, 909, - 267, 268, 269, 907, 908, 909> + 267, 268, 269, 907, 908, 909, + 267, 268, 269, 907, 908, 909> #endif VS80; // Visual Studio 2008 typedef CrtMfcPatch + 267, 268, 269, 935, 936, 937> #else - 267, 268, 269, 909, 910, 911, - 267, 268, 269, 913, 914, 915> + 267, 268, 269, 909, 910, 911, + 267, 268, 269, 913, 914, 915> #endif VS90; // Visual Studio 2010 typedef CrtMfcPatch #else - 267, 268, 269, 1405, 1406, 1407, - 267, 268, 269, 1412, 1413, 1414> + 267, 268, 269, 1405, 1406, 1407, + 267, 268, 269, 1412, 1413, 1414> #endif VS100; diff --git a/testsuite/testsuite.cpp b/testsuite/testsuite.cpp index 0cc64d08..7d46f294 100644 --- a/testsuite/testsuite.cpp +++ b/testsuite/testsuite.cpp @@ -361,7 +361,7 @@ int main (int argc, char *argv []) DWORD start; UINT leakythread; - //VLDDisable(); + //VLDDisable(); start = GetTickCount(); srand(start); diff --git a/testsuite/testsuite.vcxproj b/testsuite/testsuite.vcxproj index ddcd0011..a2372868 100644 --- a/testsuite/testsuite.vcxproj +++ b/testsuite/testsuite.vcxproj @@ -127,7 +127,7 @@ false - ..\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true false @@ -147,7 +147,7 @@ true - ..\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false true true @@ -169,7 +169,7 @@ true - ..\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)\$(Platform)\Release;%(AdditionalLibraryDirectories) true false @@ -192,7 +192,7 @@ false - ..\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true false @@ -216,7 +216,7 @@ true - ..\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) false true true @@ -242,7 +242,7 @@ true - ..\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)\$(Platform)\Release;%(AdditionalLibraryDirectories) true false @@ -254,11 +254,6 @@ - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - diff --git a/utility.cpp b/utility.cpp index d68c8a54..19be3c90 100644 --- a/utility.cpp +++ b/utility.cpp @@ -286,59 +286,59 @@ BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodule // BOOL findpatch (HMODULE importmodule, moduleentry_t *module) { - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return FALSE; - } - while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), module->exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return FALSE; - } - - int i = 0; - patchentry_t *entry = module->patchtable; - while(entry->importname) - { - LPCVOID replacement = entry->replacement; - - IMAGE_THUNK_DATA *iate; - - // Locate the replacement's IAT entry. - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)replacement) { - // Found the IAT entry for the replacement. This patch has been - // installed. - return TRUE; - } - iate++; - } - entry++; i++; - } - - // The module does not import the replacement. The patch has not been - // installed. - return FALSE; + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return FALSE; + } + while (idte->OriginalFirstThunk != 0x0) { + if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), module->exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->OriginalFirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return FALSE; + } + + int i = 0; + patchentry_t *entry = module->patchtable; + while(entry->importname) + { + LPCVOID replacement = entry->replacement; + + IMAGE_THUNK_DATA *iate; + + // Locate the replacement's IAT entry. + iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) { + if (iate->u1.Function == (DWORD_PTR)replacement) { + // Found the IAT entry for the replacement. This patch has been + // installed. + return TRUE; + } + iate++; + } + entry++; i++; + } + + // The module does not import the replacement. The patch has not been + // installed. + return FALSE; } // insertreportdelay - Sets the report function to sleep for a bit after each @@ -379,7 +379,7 @@ BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT ta // entry to see if it is installed in the import module. If any patch entry // is installed in the import module, then the module has been patched. for (index = 0; index < tablesize; index++) { - entry = &patchtable[index]; + entry = &patchtable[index]; found = findpatch(importmodule, entry); if (found == TRUE) { // Found one of the listed patches installed in the import module. @@ -423,80 +423,80 @@ BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT ta // BOOL patchimport (HMODULE importmodule, moduleentry_t *module) { - DWORD result = 0; - HMODULE exportmodule = (HMODULE)module->modulebase; - LPCSTR exportmodulename = module->exportmodulename; - - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return FALSE; - } - while (idte->FirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->FirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return FALSE; - } - - patchentry_t *entry = module->patchtable; - int i = 0; - while(entry->importname) - { - LPCSTR importname = entry->importname; - LPCVOID replacement = entry->replacement; - IMAGE_THUNK_DATA *iate; - DWORD protect; - FARPROC import = NULL; - FARPROC import2 = NULL; - - // Get the *real* address of the import. If we find this address in the IAT, - // then we've found the entry that needs to be patched. - import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); - import = GetProcAddress(exportmodule, importname); - if ( import2 ) - import = import2; - - assert(import != NULL); // Perhaps the named export module does not actually export the named import? - - // Locate the import's IAT entry. - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)import) { - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the address of the replacement. Note that the IAT - // entry may be write-protected, so we must first ensure that it is - // writable. - if ( import != replacement ) - { - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)replacement; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - } - // The patch has been installed in the import module. - result++; - } - iate++; - } - entry++; i++; - } + DWORD result = 0; + HMODULE exportmodule = (HMODULE)module->modulebase; + LPCSTR exportmodulename = module->exportmodulename; + + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return FALSE; + } + while (idte->FirstThunk != 0x0) { + if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->FirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return FALSE; + } + + patchentry_t *entry = module->patchtable; + int i = 0; + while(entry->importname) + { + LPCSTR importname = entry->importname; + LPCVOID replacement = entry->replacement; + IMAGE_THUNK_DATA *iate; + DWORD protect; + FARPROC import = NULL; + FARPROC import2 = NULL; + + // Get the *real* address of the import. If we find this address in the IAT, + // then we've found the entry that needs to be patched. + import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); + import = GetProcAddress(exportmodule, importname); + if ( import2 ) + import = import2; + + assert(import != NULL); // Perhaps the named export module does not actually export the named import? + + // Locate the import's IAT entry. + iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) { + if (iate->u1.Function == (DWORD_PTR)import) { + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the address of the replacement. Note that the IAT + // entry may be write-protected, so we must first ensure that it is + // writable. + if ( import != replacement ) + { + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)replacement; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + } + // The patch has been installed in the import module. + result++; + } + iate++; + } + entry++; i++; + } // The import's IAT entry was not found. The importing module does not // import the specified import. @@ -630,70 +630,70 @@ VOID report (LPCWSTR format, ...) // VOID restoreimport (HMODULE importmodule, moduleentry_t* module) { - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - HMODULE exportmodule = (HMODULE)module->modulebase; - LPCSTR exportmodulename = module->exportmodulename; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return; - } - while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return; - } - - int i = 0; - patchentry_t *entry = module->patchtable; - while(entry->importname) - { - IMAGE_THUNK_DATA *iate; - FARPROC import; - DWORD protect; - - LPCSTR importname = entry->importname; - LPCVOID replacement = entry->replacement; - - // Get the *real* address of the import. - import = GetProcAddress(exportmodule, importname); - assert(import != NULL); // Perhaps the named export module does not actually export the named import? - - // Locate the import's original IAT entry (it currently has the replacement - // address in it). - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)replacement) { - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the import's real address. Note that the IAT entry may - // be write-protected, so we must first ensure that it is writable. - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)import; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - break; - } - iate++; - } - entry++; i++; - } + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + HMODULE exportmodule = (HMODULE)module->modulebase; + LPCSTR exportmodulename = module->exportmodulename; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return; + } + while (idte->OriginalFirstThunk != 0x0) { + if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->OriginalFirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return; + } + + int i = 0; + patchentry_t *entry = module->patchtable; + while(entry->importname) + { + IMAGE_THUNK_DATA *iate; + FARPROC import; + DWORD protect; + + LPCSTR importname = entry->importname; + LPCVOID replacement = entry->replacement; + + // Get the *real* address of the import. + import = GetProcAddress(exportmodule, importname); + assert(import != NULL); // Perhaps the named export module does not actually export the named import? + + // Locate the import's original IAT entry (it currently has the replacement + // address in it). + iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) { + if (iate->u1.Function == (DWORD_PTR)replacement) { + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the import's real address. Note that the IAT entry may + // be write-protected, so we must first ensure that it is writable. + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)import; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + break; + } + iate++; + } + entry++; i++; + } } // restoremodule - Restores all imports listed in the supplied patch table, and diff --git a/utility.h b/utility.h index 1e3c9e50..235f93ac 100644 --- a/utility.h +++ b/utility.h @@ -107,9 +107,9 @@ typedef struct patchentry_s typedef struct moduleentry_s { - LPCSTR exportmodulename; // The name of the module exporting the patched API. - UINT_PTR modulebase; // The base address of the exporting module (filled in at runtime when the modules are loaded). - patchentry_t* patchtable; + LPCSTR exportmodulename; // The name of the module exporting the patched API. + UINT_PTR modulebase; // The base address of the exporting module (filled in at runtime when the modules are loaded). + patchentry_t* patchtable; } moduleentry_t; // Utility functions. See function definitions for details. diff --git a/vld.cpp b/vld.cpp index 44db678d..f356812a 100644 --- a/vld.cpp +++ b/vld.cpp @@ -67,13 +67,13 @@ __declspec(dllexport) VisualLeakDetector vld; // through to replacement functions provided by VLD. Having this table simply // makes it more convenient to add additional IAT patches. patchentry_t VisualLeakDetector::m_kernel32Patch [] = { - "GetProcAddress", _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. - "HeapAlloc", _RtlAllocateHeap, - "HeapCreate", _HeapCreate, - "HeapDestroy", _HeapDestroy, - "HeapFree", _RtlFreeHeap, - "HeapReAlloc", _RtlReAllocateHeap, - NULL, NULL + "GetProcAddress", _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. + "HeapAlloc", _RtlAllocateHeap, + "HeapCreate", _HeapCreate, + "HeapDestroy", _HeapDestroy, + "HeapFree", _RtlFreeHeap, + "HeapReAlloc", _RtlReAllocateHeap, + NULL, NULL }; #if !defined(_M_X64) @@ -85,226 +85,226 @@ patchentry_t VisualLeakDetector::m_kernel32Patch [] = { VisualLeakDetector::_GetProcAddressType *VisualLeakDetector::m_original_GetProcAddress = NULL; static patchentry_t mfc42dPatch [] = { - // XXX why are the vector new operators missing for mfc42d.dll? - (LPCSTR)711, VS60::mfcd_scalar_new, - (LPCSTR)712, VS60::mfcd__scalar_new_dbg_4p, - (LPCSTR)714, VS60::mfcd__scalar_new_dbg_3p, - NULL, NULL + // XXX why are the vector new operators missing for mfc42d.dll? + (LPCSTR)711, VS60::mfcd_scalar_new, + (LPCSTR)712, VS60::mfcd__scalar_new_dbg_4p, + (LPCSTR)714, VS60::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc42udPatch [] = { - // XXX why are the vector new operators missing for mfc42ud.dll? - (LPCSTR)711, VS60::mfcud_scalar_new, - (LPCSTR)712, VS60::mfcud__scalar_new_dbg_4p, - (LPCSTR)714, VS60::mfcud__scalar_new_dbg_3p, - NULL, NULL + // XXX why are the vector new operators missing for mfc42ud.dll? + (LPCSTR)711, VS60::mfcud_scalar_new, + (LPCSTR)712, VS60::mfcud__scalar_new_dbg_4p, + (LPCSTR)714, VS60::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc70dPatch [] = { - (LPCSTR)257, VS70::mfcd_vector_new, - (LPCSTR)258, VS70::mfcd__vector_new_dbg_4p, - (LPCSTR)259, VS70::mfcd__vector_new_dbg_3p, - (LPCSTR)832, VS70::mfcd_scalar_new, - (LPCSTR)833, VS70::mfcd__scalar_new_dbg_4p, - (LPCSTR)834, VS70::mfcd__scalar_new_dbg_3p, - NULL, NULL + (LPCSTR)257, VS70::mfcd_vector_new, + (LPCSTR)258, VS70::mfcd__vector_new_dbg_4p, + (LPCSTR)259, VS70::mfcd__vector_new_dbg_3p, + (LPCSTR)832, VS70::mfcd_scalar_new, + (LPCSTR)833, VS70::mfcd__scalar_new_dbg_4p, + (LPCSTR)834, VS70::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc70udPatch [] = { - (LPCSTR)258, VS70::mfcud_vector_new, - (LPCSTR)259, VS70::mfcud__vector_new_dbg_4p, - (LPCSTR)260, VS70::mfcud__vector_new_dbg_3p, - (LPCSTR)833, VS70::mfcud_scalar_new, - (LPCSTR)834, VS70::mfcud__scalar_new_dbg_4p, - (LPCSTR)835, VS70::mfcud__scalar_new_dbg_3p, - NULL, NULL + (LPCSTR)258, VS70::mfcud_vector_new, + (LPCSTR)259, VS70::mfcud__vector_new_dbg_4p, + (LPCSTR)260, VS70::mfcud__vector_new_dbg_3p, + (LPCSTR)833, VS70::mfcud_scalar_new, + (LPCSTR)834, VS70::mfcud__scalar_new_dbg_4p, + (LPCSTR)835, VS70::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc71dPatch [] = { - (LPCSTR)267, VS71::mfcd_vector_new, - (LPCSTR)268, VS71::mfcd__vector_new_dbg_4p, - (LPCSTR)269, VS71::mfcd__vector_new_dbg_3p, - (LPCSTR)893, VS71::mfcd_scalar_new, - (LPCSTR)894, VS71::mfcd__scalar_new_dbg_4p, - (LPCSTR)895, VS71::mfcd__scalar_new_dbg_3p, - NULL, NULL + (LPCSTR)267, VS71::mfcd_vector_new, + (LPCSTR)268, VS71::mfcd__vector_new_dbg_4p, + (LPCSTR)269, VS71::mfcd__vector_new_dbg_3p, + (LPCSTR)893, VS71::mfcd_scalar_new, + (LPCSTR)894, VS71::mfcd__scalar_new_dbg_4p, + (LPCSTR)895, VS71::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc71udPatch [] = { - (LPCSTR)267, VS71::mfcud_vector_new, - (LPCSTR)268, VS71::mfcud__vector_new_dbg_4p, - (LPCSTR)269, VS71::mfcud__vector_new_dbg_3p, - (LPCSTR)893, VS71::mfcud_scalar_new, - (LPCSTR)894, VS71::mfcud__scalar_new_dbg_4p, - (LPCSTR)895, VS71::mfcud__scalar_new_dbg_3p, - NULL, NULL + (LPCSTR)267, VS71::mfcud_vector_new, + (LPCSTR)268, VS71::mfcud__vector_new_dbg_4p, + (LPCSTR)269, VS71::mfcud__vector_new_dbg_3p, + (LPCSTR)893, VS71::mfcud_scalar_new, + (LPCSTR)894, VS71::mfcud__scalar_new_dbg_4p, + (LPCSTR)895, VS71::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc80dPatch [] = { - (LPCSTR)267, VS80::mfcd_vector_new, - (LPCSTR)268, VS80::mfcd__vector_new_dbg_4p, - (LPCSTR)269, VS80::mfcd__vector_new_dbg_3p, - ORDINAL(893,907), VS80::mfcd_scalar_new, - ORDINAL(894,908), VS80::mfcd__scalar_new_dbg_4p, - ORDINAL(895,909), VS80::mfcd__scalar_new_dbg_3p, - NULL, NULL + (LPCSTR)267, VS80::mfcd_vector_new, + (LPCSTR)268, VS80::mfcd__vector_new_dbg_4p, + (LPCSTR)269, VS80::mfcd__vector_new_dbg_3p, + ORDINAL(893,907), VS80::mfcd_scalar_new, + ORDINAL(894,908), VS80::mfcd__scalar_new_dbg_4p, + ORDINAL(895,909), VS80::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc80udPatch [] = { - (LPCSTR)267, VS80::mfcud_vector_new, - (LPCSTR)268, VS80::mfcud__vector_new_dbg_4p, - (LPCSTR)269, VS80::mfcud__vector_new_dbg_3p, - ORDINAL(893,907), VS80::mfcud_scalar_new, - ORDINAL(894,908), VS80::mfcud__scalar_new_dbg_4p, - ORDINAL(895,909), VS80::mfcud__scalar_new_dbg_3p, - NULL, NULL + (LPCSTR)267, VS80::mfcud_vector_new, + (LPCSTR)268, VS80::mfcud__vector_new_dbg_4p, + (LPCSTR)269, VS80::mfcud__vector_new_dbg_3p, + ORDINAL(893,907), VS80::mfcud_scalar_new, + ORDINAL(894,908), VS80::mfcud__scalar_new_dbg_4p, + ORDINAL(895,909), VS80::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc90dPatch [] = { - (LPCSTR)267, VS90::mfcd_vector_new, - (LPCSTR)268, VS90::mfcd__vector_new_dbg_4p, - (LPCSTR)269, VS90::mfcd__vector_new_dbg_3p, - ORDINAL(931, 909), VS90::mfcd_scalar_new, - ORDINAL(932, 910), VS90::mfcd__scalar_new_dbg_4p, - ORDINAL(933, 911), VS90::mfcd__scalar_new_dbg_3p, - NULL, NULL + (LPCSTR)267, VS90::mfcd_vector_new, + (LPCSTR)268, VS90::mfcd__vector_new_dbg_4p, + (LPCSTR)269, VS90::mfcd__vector_new_dbg_3p, + ORDINAL(931, 909), VS90::mfcd_scalar_new, + ORDINAL(932, 910), VS90::mfcd__scalar_new_dbg_4p, + ORDINAL(933, 911), VS90::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc90udPatch [] = { - (LPCSTR)267, VS90::mfcud_vector_new, - (LPCSTR)268, VS90::mfcud__vector_new_dbg_4p, - (LPCSTR)269, VS90::mfcud__vector_new_dbg_3p, - ORDINAL(935, 913), VS90::mfcud_scalar_new, - ORDINAL(936, 914), VS90::mfcud__scalar_new_dbg_4p, - ORDINAL(937, 915), VS90::mfcud__scalar_new_dbg_3p, - NULL, NULL + (LPCSTR)267, VS90::mfcud_vector_new, + (LPCSTR)268, VS90::mfcud__vector_new_dbg_4p, + (LPCSTR)269, VS90::mfcud__vector_new_dbg_3p, + ORDINAL(935, 913), VS90::mfcud_scalar_new, + ORDINAL(936, 914), VS90::mfcud__scalar_new_dbg_4p, + ORDINAL(937, 915), VS90::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc100dPatch [] = { - (LPCSTR)267, VS100::mfcd_vector_new, - (LPCSTR)268, VS100::mfcd__vector_new_dbg_4p, - (LPCSTR)269, VS100::mfcd__vector_new_dbg_3p, - ORDINAL(1427, 1405), VS100::mfcd_scalar_new, - ORDINAL(1428, 1406), VS100::mfcd__scalar_new_dbg_4p, - ORDINAL(1429, 1407), VS100::mfcd__scalar_new_dbg_3p, - NULL, NULL + (LPCSTR)267, VS100::mfcd_vector_new, + (LPCSTR)268, VS100::mfcd__vector_new_dbg_4p, + (LPCSTR)269, VS100::mfcd__vector_new_dbg_3p, + ORDINAL(1427, 1405), VS100::mfcd_scalar_new, + ORDINAL(1428, 1406), VS100::mfcd__scalar_new_dbg_4p, + ORDINAL(1429, 1407), VS100::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc100udPatch [] = { - (LPCSTR)267, VS100::mfcud_vector_new, - (LPCSTR)268, VS100::mfcud__vector_new_dbg_4p, - (LPCSTR)269, VS100::mfcud__vector_new_dbg_3p, - ORDINAL(1434, 1412), VS100::mfcud_scalar_new, - ORDINAL(1435, 1413), VS100::mfcud__scalar_new_dbg_4p, - ORDINAL(1436, 1414), VS100::mfcud__scalar_new_dbg_3p, - NULL, NULL + (LPCSTR)267, VS100::mfcud_vector_new, + (LPCSTR)268, VS100::mfcud__vector_new_dbg_4p, + (LPCSTR)269, VS100::mfcud__vector_new_dbg_3p, + ORDINAL(1434, 1412), VS100::mfcud_scalar_new, + ORDINAL(1435, 1413), VS100::mfcud__scalar_new_dbg_4p, + ORDINAL(1436, 1414), VS100::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t msvcrtdPatch [] = { - "_calloc_dbg", VS60::crtd__calloc_dbg, - "_malloc_dbg", VS60::crtd__malloc_dbg, - "_realloc_dbg", VS60::crtd__realloc_dbg, - scalar_new_dbg_name, VS60::crtd__scalar_new_dbg, - //vector_new_dbg_name, VS60::crtd__vector_new_dbg, - "calloc", VS60::crtd_calloc, - "malloc", VS60::crtd_malloc, - "realloc", VS60::crtd_realloc, - scalar_new_name, VS60::crtd_scalar_new, - //vector_new_name, VS60::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS60::crtd__calloc_dbg, + "_malloc_dbg", VS60::crtd__malloc_dbg, + "_realloc_dbg", VS60::crtd__realloc_dbg, + scalar_new_dbg_name, VS60::crtd__scalar_new_dbg, + //vector_new_dbg_name, VS60::crtd__vector_new_dbg, + "calloc", VS60::crtd_calloc, + "malloc", VS60::crtd_malloc, + "realloc", VS60::crtd_realloc, + scalar_new_name, VS60::crtd_scalar_new, + //vector_new_name, VS60::crtd_vector_new, + NULL, NULL }; static patchentry_t msvcr70dPatch [] = { - "_calloc_dbg", VS70::crtd__calloc_dbg, - "_malloc_dbg", VS70::crtd__malloc_dbg, - "_realloc_dbg", VS70::crtd__realloc_dbg, - scalar_new_dbg_name, VS70::crtd__scalar_new_dbg, - vector_new_dbg_name, VS70::crtd__vector_new_dbg, - "calloc", VS70::crtd_calloc, - "malloc", VS70::crtd_malloc, - "realloc", VS70::crtd_realloc, - scalar_new_name, VS70::crtd_scalar_new, - vector_new_name, VS70::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS70::crtd__calloc_dbg, + "_malloc_dbg", VS70::crtd__malloc_dbg, + "_realloc_dbg", VS70::crtd__realloc_dbg, + scalar_new_dbg_name, VS70::crtd__scalar_new_dbg, + vector_new_dbg_name, VS70::crtd__vector_new_dbg, + "calloc", VS70::crtd_calloc, + "malloc", VS70::crtd_malloc, + "realloc", VS70::crtd_realloc, + scalar_new_name, VS70::crtd_scalar_new, + vector_new_name, VS70::crtd_vector_new, + NULL, NULL }; static patchentry_t msvcr71dPatch [] = { - "_calloc_dbg", VS71::crtd__calloc_dbg, - "_malloc_dbg", VS71::crtd__malloc_dbg, - "_realloc_dbg", VS71::crtd__realloc_dbg, - scalar_new_dbg_name, VS71::crtd__scalar_new_dbg, - vector_new_dbg_name, VS71::crtd__vector_new_dbg, - "calloc", VS71::crtd_calloc, - "malloc", VS71::crtd_malloc, - "realloc", VS71::crtd_realloc, - scalar_new_name, VS71::crtd_scalar_new, - vector_new_name, VS71::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS71::crtd__calloc_dbg, + "_malloc_dbg", VS71::crtd__malloc_dbg, + "_realloc_dbg", VS71::crtd__realloc_dbg, + scalar_new_dbg_name, VS71::crtd__scalar_new_dbg, + vector_new_dbg_name, VS71::crtd__vector_new_dbg, + "calloc", VS71::crtd_calloc, + "malloc", VS71::crtd_malloc, + "realloc", VS71::crtd_realloc, + scalar_new_name, VS71::crtd_scalar_new, + vector_new_name, VS71::crtd_vector_new, + NULL, NULL }; static patchentry_t msvcr80dPatch [] = { - "_calloc_dbg", VS80::crtd__calloc_dbg, - "_malloc_dbg", VS80::crtd__malloc_dbg, - "_realloc_dbg", VS80::crtd__realloc_dbg, - scalar_new_dbg_name, VS80::crtd__scalar_new_dbg, - vector_new_dbg_name, VS80::crtd__vector_new_dbg, - "calloc", VS80::crtd_calloc, - "malloc", VS80::crtd_malloc, - "realloc", VS80::crtd_realloc, - scalar_new_name, VS80::crtd_scalar_new, - vector_new_name, VS80::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS80::crtd__calloc_dbg, + "_malloc_dbg", VS80::crtd__malloc_dbg, + "_realloc_dbg", VS80::crtd__realloc_dbg, + scalar_new_dbg_name, VS80::crtd__scalar_new_dbg, + vector_new_dbg_name, VS80::crtd__vector_new_dbg, + "calloc", VS80::crtd_calloc, + "malloc", VS80::crtd_malloc, + "realloc", VS80::crtd_realloc, + scalar_new_name, VS80::crtd_scalar_new, + vector_new_name, VS80::crtd_vector_new, + NULL, NULL }; static patchentry_t msvcr90dPatch [] = { - "_calloc_dbg", VS90::crtd__calloc_dbg, - "_malloc_dbg", VS90::crtd__malloc_dbg, - "_realloc_dbg", VS90::crtd__realloc_dbg, - scalar_new_dbg_name, VS90::crtd__scalar_new_dbg, - vector_new_dbg_name, VS90::crtd__vector_new_dbg, - "calloc", VS90::crtd_calloc, - "malloc", VS90::crtd_malloc, - "realloc", VS90::crtd_realloc, - scalar_new_name, VS90::crtd_scalar_new, - vector_new_name, VS90::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS90::crtd__calloc_dbg, + "_malloc_dbg", VS90::crtd__malloc_dbg, + "_realloc_dbg", VS90::crtd__realloc_dbg, + scalar_new_dbg_name, VS90::crtd__scalar_new_dbg, + vector_new_dbg_name, VS90::crtd__vector_new_dbg, + "calloc", VS90::crtd_calloc, + "malloc", VS90::crtd_malloc, + "realloc", VS90::crtd_realloc, + scalar_new_name, VS90::crtd_scalar_new, + vector_new_name, VS90::crtd_vector_new, + NULL, NULL }; static patchentry_t msvcr100dPatch [] = { - "_calloc_dbg", VS100::crtd__calloc_dbg, - "_malloc_dbg", VS100::crtd__malloc_dbg, - "_realloc_dbg", VS100::crtd__realloc_dbg, - scalar_new_dbg_name, VS100::crtd__scalar_new_dbg, - vector_new_dbg_name, VS100::crtd__vector_new_dbg, - "calloc", VS100::crtd_calloc, - "malloc", VS100::crtd_malloc, - "realloc", VS100::crtd_realloc, - scalar_new_name, VS100::crtd_scalar_new, - vector_new_name, VS100::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS100::crtd__calloc_dbg, + "_malloc_dbg", VS100::crtd__malloc_dbg, + "_realloc_dbg", VS100::crtd__realloc_dbg, + scalar_new_dbg_name, VS100::crtd__scalar_new_dbg, + vector_new_dbg_name, VS100::crtd__vector_new_dbg, + "calloc", VS100::crtd_calloc, + "malloc", VS100::crtd_malloc, + "realloc", VS100::crtd_realloc, + scalar_new_name, VS100::crtd_scalar_new, + vector_new_name, VS100::crtd_vector_new, + NULL, NULL }; patchentry_t VisualLeakDetector::m_ntdllPatch [] = { - "RtlAllocateHeap", VisualLeakDetector::_RtlAllocateHeap, - "RtlFreeHeap", VisualLeakDetector::_RtlFreeHeap, - "RtlReAllocateHeap", VisualLeakDetector::_RtlReAllocateHeap, - NULL, NULL + "RtlAllocateHeap", VisualLeakDetector::_RtlAllocateHeap, + "RtlFreeHeap", VisualLeakDetector::_RtlFreeHeap, + "RtlReAllocateHeap", VisualLeakDetector::_RtlReAllocateHeap, + NULL, NULL }; patchentry_t VisualLeakDetector::m_ole32Patch [] = { - "CoGetMalloc", VisualLeakDetector::_CoGetMalloc, - "CoTaskMemAlloc", VisualLeakDetector::_CoTaskMemAlloc, - "CoTaskMemRealloc", VisualLeakDetector::_CoTaskMemRealloc, - NULL, NULL + "CoGetMalloc", VisualLeakDetector::_CoGetMalloc, + "CoTaskMemAlloc", VisualLeakDetector::_CoTaskMemAlloc, + "CoTaskMemRealloc", VisualLeakDetector::_CoTaskMemRealloc, + NULL, NULL }; moduleentry_t VisualLeakDetector::m_patchtable [] = { // Win32 heap APIs. "kernel32.dll", 0x0, m_kernel32Patch, - // MFC new operators (exported by ordinal). - "mfc42d.dll", 0x0, mfc42dPatch, - "mfc42ud.dll", 0x0, mfc42udPatch, + // MFC new operators (exported by ordinal). + "mfc42d.dll", 0x0, mfc42dPatch, + "mfc42ud.dll", 0x0, mfc42udPatch, "mfc70d.dll", 0x0, mfc70dPatch, "mfc70ud.dll", 0x0, mfc70udPatch, "mfc71d.dll", 0x0, mfc71dPatch, @@ -408,7 +408,7 @@ VisualLeakDetector::VisualLeakDetector () m_status |= VLD_STATUS_NEVER_ENABLED; } if (m_options & VLD_OPT_REPORT_TO_FILE) { - SetupReporting(); + SetupReporting(); } if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { // Insert a slight delay between messages sent to the debugger for @@ -435,13 +435,13 @@ VisualLeakDetector::VisualLeakDetector () } delete [] symbolpath; - patchentry_t ntdllPatch [] = { - "LdrLoadDll", _LdrLoadDll, - NULL, NULL - }; - moduleentry_t ldrLoadDllPatch [] = { - "ntdll.dll", (UINT_PTR)ntdll, ntdllPatch, - }; + patchentry_t ntdllPatch [] = { + "LdrLoadDll", _LdrLoadDll, + NULL, NULL + }; + moduleentry_t ldrLoadDllPatch [] = { + "ntdll.dll", (UINT_PTR)ntdll, ntdllPatch, + }; patchimport(kernel32, ldrLoadDllPatch); // Attach Visual Leak Detector to every module loaded in the process. @@ -898,29 +898,29 @@ VOID VisualLeakDetector::configure () // Found a copy of vld.ini in the working directory. Use it. wcsncpy_s(inipath, MAX_PATH, L".\\vld.ini", _TRUNCATE); } - else { - // Get the location of the vld.ini file from the registry. - regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); - if (regstatus == ERROR_SUCCESS) { - keyopen = TRUE; - regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); - } - if (keyopen) { - RegCloseKey(productkey); - } - - if (!keyopen) - { - // Get the location of the vld.ini file from the registry. - regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); - if (regstatus == ERROR_SUCCESS) { - keyopen = TRUE; - regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); - } - if (keyopen) { - RegCloseKey(productkey); - } - } + else { + // Get the location of the vld.ini file from the registry. + regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + if (regstatus == ERROR_SUCCESS) { + keyopen = TRUE; + regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); + } + if (keyopen) { + RegCloseKey(productkey); + } + + if (!keyopen) + { + // Get the location of the vld.ini file from the registry. + regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + if (regstatus == ERROR_SUCCESS) { + keyopen = TRUE; + regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); + } + if (keyopen) { + RegCloseKey(productkey); + } + } if ((regstatus != ERROR_SUCCESS) || (_wstat(inipath, &s) != 0)) { // The location of vld.ini could not be read from the registry. As a @@ -1112,10 +1112,10 @@ tls_t* VisualLeakDetector::gettls () tls = new tls_t; TlsSetValue(m_tlsindex, tls); ZeroMemory(&tls->context, sizeof(tls->context)); - tls->flags = 0x0; - tls->oldflags = 0x0; + tls->flags = 0x0; + tls->oldflags = 0x0; tls->threadid = GetCurrentThreadId(); - tls->ppcallstack = NULL; + tls->ppcallstack = NULL; // Add this thread's TLS to the TlsSet. EnterCriticalSection(&m_tlslock); @@ -1155,9 +1155,9 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c static SIZE_T serialnumber = 0; // Record the block's information. - blockinfo = new blockinfo_t; - blockinfo->callstack = NULL; - ppcallstack = &blockinfo->callstack; + blockinfo = new blockinfo_t; + blockinfo->callstack = NULL; + ppcallstack = &blockinfo->callstack; blockinfo->serialnumber = serialnumber++; blockinfo->size = size; @@ -1186,7 +1186,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c delete (*blockit).second; blockmap->erase(blockit); blockmap->insert(mem, blockinfo); - ppcallstack = NULL; + ppcallstack = NULL; } LeaveCriticalSection(&m_maplock); } @@ -1688,8 +1688,8 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // malloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1698,18 +1698,18 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pcalloc(num, size); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -1736,8 +1736,8 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t // malloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1746,18 +1746,18 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pmalloc(size); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -1784,8 +1784,8 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) // The new operator is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1794,18 +1794,18 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew(size); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -1837,8 +1837,8 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // realloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1847,18 +1847,18 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // Do the allocation. The block will be mapped by _RtlReAllocateHeap. block = prealloc(mem, size); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -1909,8 +1909,8 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // _malloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1919,18 +1919,18 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = p_calloc_dbg(num, size, type, file, line); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -1970,8 +1970,8 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // _malloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -1980,18 +1980,18 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = p_malloc_dbg(size, type, file, line); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2031,8 +2031,8 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // The debug new operator is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -2041,18 +2041,18 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg_crt(size, type, file, line); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2089,8 +2089,8 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, void *block; tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -2099,18 +2099,18 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg(size, type, file, line); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2144,8 +2144,8 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, void *block; tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -2154,18 +2154,18 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg_mfc(size, file, line); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2208,8 +2208,8 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // _realloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; @@ -2218,18 +2218,18 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // Do the allocation. The block will be mapped by _RtlReAllocateHeap. block = p_realloc_dbg(mem, size, type, file, line); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2259,7 +2259,7 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) { - moduleentry_t *entry; + moduleentry_t *entry; UINT index; UINT tablesize = _countof(vld.m_patchtable); @@ -2272,21 +2272,21 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) continue; } - patchentry_t *patchentry = entry->patchtable; - while(patchentry->importname) - { - // This patch table entry is for the specified module. If the requested - // import's name matches the entry's import name (or ordinal), then - // return the address of the replacement instead of the address of the - // actual import. - if ((SIZE_T)patchentry->importname < (SIZE_T)vld.m_vldbase) { - // This entry's import name is not a valid pointer to data in - // vld.dll. It must be an ordinal value. - if ((UINT)patchentry->importname == (UINT)procname) { - return (FARPROC)patchentry->replacement; - } - } - else { + patchentry_t *patchentry = entry->patchtable; + while(patchentry->importname) + { + // This patch table entry is for the specified module. If the requested + // import's name matches the entry's import name (or ordinal), then + // return the address of the replacement instead of the address of the + // actual import. + if ((SIZE_T)patchentry->importname < (SIZE_T)vld.m_vldbase) { + // This entry's import name is not a valid pointer to data in + // vld.dll. It must be an ordinal value. + if ((UINT)patchentry->importname == (UINT)procname) { + return (FARPROC)patchentry->replacement; + } + } + else { __try { if (strcmp(patchentry->importname, procname) == 0) { @@ -2299,9 +2299,9 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) return (FARPROC)patchentry->replacement; } } - } - patchentry++; - } + } + patchentry++; + } } // The requested function is not a patched function. Just return the real @@ -2333,7 +2333,7 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m DWORD64 displacement; SYMBOL_INFO *functioninfo; HANDLE heap; - HeapMap::Iterator heapit; + HeapMap::Iterator heapit; UINT_PTR ra; BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; BOOL symfound; @@ -2491,22 +2491,22 @@ NTSTATUS VisualLeakDetector::RefreshModules() } void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &context_ ) { - CallStack *callstack; - if (vld.m_options & VLD_OPT_SAFE_STACK_WALK) { - callstack = new SafeCallStack; - } - else { - callstack = new FastCallStack; - } - - // Reset thread local flags and variables, in case any libraries called - // into while mapping the block allocate some memory. - context_t context = context_; - *ppcallstack = callstack; - context_.fp = 0x0; - ppcallstack = NULL; - - callstack->getstacktrace(vld.m_maxtraceframes, context); + CallStack *callstack; + if (vld.m_options & VLD_OPT_SAFE_STACK_WALK) { + callstack = new SafeCallStack; + } + else { + callstack = new FastCallStack; + } + + // Reset thread local flags and variables, in case any libraries called + // into while mapping the block allocate some memory. + context_t context = context_; + *ppcallstack = callstack; + context_.fp = 0x0; + ppcallstack = NULL; + + callstack->getstacktrace(vld.m_maxtraceframes, context); } // _RtlAllocateHeap - Calls to RtlAllocateHeap are patched through to this @@ -2527,56 +2527,56 @@ void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &cont // LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) { - LPVOID block; + LPVOID block; // Allocate the block. block = RtlAllocateHeap(heap, flags, size); - if ((block == NULL) || !vld.enabled()) - return block; - - tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) - return block; - - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - tls->context = context; - - BOOL crtalloc; - crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - - // The module that initiated this allocation is included in leak - // detection. Map this block to the specified heap. - vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); - - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + if ((block == NULL) || !vld.enabled()) + return block; + + tls_t *tls = vld.gettls(); + BOOL firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; + + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + tls->context = context; + + BOOL crtalloc; + crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + + // The module that initiated this allocation is included in leak + // detection. Map this block to the specified heap. + vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); + + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2611,18 +2611,18 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) // Find the information for the module that initiated this reallocation. BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) { - BOOL excluded = FALSE; - moduleinfo_t moduleinfo; - ModuleSet::Iterator moduleit; - moduleinfo.addrhigh = address; - moduleinfo.addrlow = address; - EnterCriticalSection(&vld.m_moduleslock); - moduleit = vld.m_loadedmodules->find(moduleinfo); - if (moduleit != vld.m_loadedmodules->end()) { - excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; - } - LeaveCriticalSection(&vld.m_moduleslock); - return excluded; + BOOL excluded = FALSE; + moduleinfo_t moduleinfo; + ModuleSet::Iterator moduleit; + moduleinfo.addrhigh = address; + moduleinfo.addrlow = address; + EnterCriticalSection(&vld.m_moduleslock); + moduleit = vld.m_loadedmodules->find(moduleinfo); + if (moduleit != vld.m_loadedmodules->end()) { + excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; + } + LeaveCriticalSection(&vld.m_moduleslock); + return excluded; } // _RtlReAllocateHeap - Calls to RtlReAllocateHeap are patched through to this @@ -2647,71 +2647,71 @@ BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) // LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { - LPVOID newmem; - - // Reallocate the block. - newmem = RtlReAllocateHeap(heap, flags, mem, size); - if (newmem == NULL) - return newmem; - - tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) - return newmem; - - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - BOOL crtalloc; - crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - - // Reset thread local flags and variables, in case any libraries called - // into while remapping the block allocate some memory. - tls->context.fp = 0x0; - if (crtalloc) - tls->flags |= VLD_TLS_CRTALLOC; - else - tls->flags &=~VLD_TLS_CRTALLOC; - - // The module that initiated this allocation is included in leak - // detection. Remap the block. - vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack); + LPVOID newmem; + + // Reallocate the block. + newmem = RtlReAllocateHeap(heap, flags, mem, size); + if (newmem == NULL) + return newmem; + + tls_t *tls = vld.gettls(); + BOOL firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return newmem; + + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + BOOL crtalloc; + crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + + // Reset thread local flags and variables, in case any libraries called + // into while remapping the block allocate some memory. + tls->context.fp = 0x0; + if (crtalloc) + tls->flags |= VLD_TLS_CRTALLOC; + else + tls->flags &=~VLD_TLS_CRTALLOC; + + // The module that initiated this allocation is included in leak + // detection. Remap the block. + vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack); #ifdef _DEBUG - if(tls->context.fp != 0) - __debugbreak(); + if(tls->context.fp != 0) + __debugbreak(); #endif - tls->context = context; - tls->flags |= crtalloc; - - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->ppcallstack = NULL; - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } - - return newmem; + tls->context = context; + tls->flags |= crtalloc; + + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->ppcallstack = NULL; + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } + + return newmem; } //////////////////////////////////////////////////////////////////////////////// @@ -2771,13 +2771,13 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) { static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; - LPVOID block; - context_t context; + LPVOID block; + context_t context; HMODULE ole32; tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); @@ -2792,20 +2792,20 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) } // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pCoTaskMemAlloc(size); - - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + block = pCoTaskMemAlloc(size); + + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2827,13 +2827,13 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) { static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; - LPVOID block; - context_t context; + LPVOID block; + context_t context; HMODULE ole32; tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); @@ -2848,20 +2848,20 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = pCoTaskMemRealloc(mem, size); - - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + block = pCoTaskMemRealloc(mem, size); + + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -2898,12 +2898,12 @@ ULONG VisualLeakDetector::AddRef () // LPVOID VisualLeakDetector::Alloc (SIZE_T size) { - LPVOID block; - context_t context; + LPVOID block; + context_t context; tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); @@ -2912,20 +2912,20 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) // Do the allocation. The block will be mapped by _RtlAllocateHeap. assert(m_imalloc != NULL); - block = m_imalloc->Alloc(size); - - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + block = m_imalloc->Alloc(size); + + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -3030,8 +3030,8 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) context_t context; tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); @@ -3040,20 +3040,20 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) // Do the allocation. The block will be mapped by _RtlReAllocateHeap. assert(m_imalloc != NULL); - block = m_imalloc->Realloc(mem, size); - - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + block = m_imalloc->Realloc(mem, size); + + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } return block; } @@ -3087,59 +3087,59 @@ VOID __stdcall VisualLeakDetector::Reportleaks( ) void __stdcall VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) { - ModuleSet::Iterator moduleit; - - EnterCriticalSection(&vld.m_moduleslock); - moduleit = vld.m_loadedmodules->begin(); - while( moduleit != vld.m_loadedmodules->end() ) - { - if ( (*moduleit).addrlow == (UINT_PTR)module) - { - moduleinfo_t *mod = (moduleinfo_t *)&(*moduleit); - if ( on ) - mod->flags &= ~VLD_MODULE_EXCLUDED; - else - mod->flags |= VLD_MODULE_EXCLUDED; - - break; - } - moduleit++; - } - LeaveCriticalSection(&vld.m_moduleslock); + ModuleSet::Iterator moduleit; + + EnterCriticalSection(&vld.m_moduleslock); + moduleit = vld.m_loadedmodules->begin(); + while( moduleit != vld.m_loadedmodules->end() ) + { + if ( (*moduleit).addrlow == (UINT_PTR)module) + { + moduleinfo_t *mod = (moduleinfo_t *)&(*moduleit); + if ( on ) + mod->flags &= ~VLD_MODULE_EXCLUDED; + else + mod->flags |= VLD_MODULE_EXCLUDED; + + break; + } + moduleit++; + } + LeaveCriticalSection(&vld.m_moduleslock); } void __stdcall VisualLeakDetector::EnableModule(HMODULE module) { - ChangeModuleState(module,true); + ChangeModuleState(module,true); } void __stdcall VisualLeakDetector::DisableModule(HMODULE module) { - ChangeModuleState(module,false); + ChangeModuleState(module,false); } void __stdcall VisualLeakDetector::SetReportOptions(UINT32 option_mask,WCHAR *filename) { - m_options |= option_mask & VLD_OPT_REPORT_TO_DEBUGGER; - if ( (option_mask & VLD_OPT_REPORT_TO_FILE) && ( filename != NULL )) - { - wcsncpy_s(m_reportfilepath, MAX_PATH, filename, _TRUNCATE); - m_options |= option_mask & VLD_OPT_REPORT_TO_FILE; - } - m_options |= option_mask & VLD_OPT_REPORT_TO_STDOUT; - m_options |= option_mask & VLD_OPT_UNICODE_REPORT; - - SetupReporting(); + m_options |= option_mask & VLD_OPT_REPORT_TO_DEBUGGER; + if ( (option_mask & VLD_OPT_REPORT_TO_FILE) && ( filename != NULL )) + { + wcsncpy_s(m_reportfilepath, MAX_PATH, filename, _TRUNCATE); + m_options |= option_mask & VLD_OPT_REPORT_TO_FILE; + } + m_options |= option_mask & VLD_OPT_REPORT_TO_STDOUT; + m_options |= option_mask & VLD_OPT_UNICODE_REPORT; + + SetupReporting(); } void VisualLeakDetector::SetupReporting() { WCHAR bom = BOM; // Unicode byte-order mark. - //Close the previous report file if needed. - if ( m_reportfile ) - fclose(m_reportfile); + //Close the previous report file if needed. + if ( m_reportfile ) + fclose(m_reportfile); // Reporting to file enabled. if (m_options & VLD_OPT_UNICODE_REPORT) { diff --git a/vld.h b/vld.h index 033d8101..bdd9f9c5 100644 --- a/vld.h +++ b/vld.h @@ -27,10 +27,15 @@ #ifdef _DEBUG -#pragma comment(lib, "vld.lib") +#ifndef WIN64 +#pragma comment(lib, "vld_x86.lib") +#else +#pragma comment(lib, "vld_x64.lib") +#endif + // Force a symbolic reference to the global VisualLeakDetector class object from -// the DLL. This enusres that the DLL is loaded and linked with the program, +// the DLL. This ensures that the DLL is loaded and linked with the program, // even if no code otherwise imports any of the DLL's exports. #pragma comment(linker, "/include:__imp_?vld@@3VVisualLeakDetector@@A") diff --git a/vld.vcxproj b/vld.vcxproj index ed97ef05..3cc1c6f8 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -83,11 +83,15 @@ MinimumRecommendedRules.ruleset + $(ProjectName)_x86 + $(ProjectName)_x86 + $(ProjectName)_x64 + $(ProjectName)_x64 Disabled - DIA SDK\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -101,7 +105,7 @@ true 0x03200000 false - DIA SDK\lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) psapi.lib;%(AdditionalDependencies) @@ -115,7 +119,7 @@ Disabled - DIA SDK\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -130,7 +134,7 @@ 0x03200000 false MachineX64 - DIA SDK\lib\amd64;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) psapi.lib;%(AdditionalDependencies) @@ -143,7 +147,7 @@ Full Speed true - DIA SDK\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) true MultiThreaded @@ -159,7 +163,7 @@ true 0x03200000 false - DIA SDK\lib;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) %(AdditionalDependencies) @@ -175,7 +179,7 @@ Full Speed true - DIA SDK\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) true MultiThreaded @@ -193,7 +197,7 @@ false MachineX64 true - DIA SDK\lib\amd64;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) %(AdditionalDependencies) diff --git a/vldapi.cpp b/vldapi.cpp index bd6cf7c1..d93f1a8a 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -48,8 +48,8 @@ extern "C" __declspec(dllexport) void VLDDisable () // because if neither flag is set, it means that we are in the default or // "starting" state, which could be either enabled or disabled depending on // the configuration. - tls = vld.gettls(); - tls->oldflags = tls->flags; + tls = vld.gettls(); + tls->oldflags = tls->flags; tls->flags &= ~VLD_TLS_ENABLED; tls->flags |= VLD_TLS_DISABLED; } @@ -64,8 +64,8 @@ extern "C" __declspec(dllexport) void VLDEnable () } // Enable memory leak detection for the current thread. - tls = vld.gettls(); - tls->oldflags = tls->flags; + tls = vld.gettls(); + tls->oldflags = tls->flags; tls->flags &= ~VLD_TLS_DISABLED; tls->flags |= VLD_TLS_ENABLED; vld.m_status &= ~VLD_STATUS_NEVER_ENABLED; @@ -82,8 +82,8 @@ extern "C" __declspec(dllexport) void VLDRestore () // Restore state memory leak detection for the current thread. tls = vld.gettls(); - tls->flags &= ~(VLD_TLS_DISABLED | VLD_TLS_ENABLED); - tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); + tls->flags &= ~(VLD_TLS_DISABLED | VLD_TLS_ENABLED); + tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); } extern "C" __declspec(dllexport) void VLDReportLeaks () @@ -93,21 +93,21 @@ extern "C" __declspec(dllexport) void VLDReportLeaks () extern "C" __declspec(dllexport) void VLDRefreshModules() { - vld.RefreshModules(); + vld.RefreshModules(); } extern "C" __declspec(dllexport) void VLDEnableModule(HMODULE module) { - vld.EnableModule(module); + vld.EnableModule(module); } extern "C" __declspec(dllexport) void VLDDisableModule(HMODULE module) { - vld.DisableModule(module); + vld.DisableModule(module); } extern "C" __declspec(dllexport) void VLDSetReportOptions(UINT32 option_mask,WCHAR *filename) { - vld.SetReportOptions(option_mask,filename); + vld.SetReportOptions(option_mask,filename); } diff --git a/vldint.h b/vldint.h index 1d7b3a0c..a82957d0 100644 --- a/vldint.h +++ b/vldint.h @@ -42,7 +42,7 @@ Applications should never include this header." #define SELFTESTTEXTA "Memory Leak Self-Test" #define SELFTESTTEXTW L"Memory Leak Self-Test" #define VLDREGKEYPRODUCT L"Software\\Visual Leak Detector" -#define VLDVERSION L"2.0" +#define VLDVERSION L"2.0b" #ifndef WIN64 #define VLDDLL "vld_x86.dll" #else @@ -125,7 +125,7 @@ typedef Set ModuleSet; // detection status (enabled or disabled) and the address that initiated the // current allocation is stored here. typedef struct tls_s { - context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. + context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. UINT32 flags; // Thread-local status flags: #define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. #define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. @@ -173,7 +173,7 @@ class VisualLeakDetector : public IMalloc VisualLeakDetector(); ~VisualLeakDetector(); - NTSTATUS RefreshModules(); + NTSTATUS RefreshModules(); //////////////////////////////////////////////////////////////////////////////// // Public CRT and MFC Common Handlers @@ -211,9 +211,9 @@ class VisualLeakDetector : public IMalloc ULONG __stdcall Release (); VOID __stdcall Reportleaks(); - VOID __stdcall EnableModule(HMODULE module); - VOID __stdcall DisableModule(HMODULE module); - void __stdcall SetReportOptions(UINT32 option_mask,WCHAR *filename); + VOID __stdcall EnableModule(HMODULE module); + VOID __stdcall DisableModule(HMODULE module); + void __stdcall SetReportOptions(UINT32 option_mask,WCHAR *filename); static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); @@ -233,16 +233,16 @@ class VisualLeakDetector : public IMalloc VOID reportconfig (); VOID reportleaks (HANDLE heap); VOID unmapblock (HANDLE heap, LPCVOID mem); - VOID unmapheap (HANDLE heap); + VOID unmapheap (HANDLE heap); // Static functions (callbacks) static BOOL __stdcall addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); static BOOL __stdcall detachfrommodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - // Utils - static BOOL IsModuleExcluded (UINT_PTR returnaddress); - static void getcallstack( CallStack **&ppcallstack, context_t &context ); - void SetupReporting(); + // Utils + static BOOL IsModuleExcluded (UINT_PTR returnaddress); + static void getcallstack( CallStack **&ppcallstack, context_t &context ); + void SetupReporting(); //////////////////////////////////////////////////////////////////////////////// // IAT replacement functions - see each function definition for details. @@ -259,10 +259,10 @@ class VisualLeakDetector : public IMalloc PHANDLE modulehandle); static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); - static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); + static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); - // COM IAT replacement functions + // COM IAT replacement functions static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); @@ -302,7 +302,7 @@ class VisualLeakDetector : public IMalloc typedef FARPROC __stdcall _GetProcAddressType(HMODULE module, LPCSTR procname); - VOID __stdcall ChangeModuleState(HMODULE module,bool on); + VOID __stdcall ChangeModuleState(HMODULE module,bool on); static _GetProcAddressType * m_original_GetProcAddress; From db298b6742c033429e305e67949735c3a0287734 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 30 Aug 2010 21:39:36 +0000 Subject: [PATCH 013/321] vld.h fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C56674 --- testsuite/testsuite.vcxproj | 10 ++++++++++ vld.h | 13 +++++-------- vld.vcxproj | 18 ++++++++++++++++++ vld_vs10.sln | 3 +++ 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/testsuite/testsuite.vcxproj b/testsuite/testsuite.vcxproj index a2372868..32f28493 100644 --- a/testsuite/testsuite.vcxproj +++ b/testsuite/testsuite.vcxproj @@ -254,6 +254,16 @@ + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + true + false + true + false + + diff --git a/vld.h b/vld.h index bdd9f9c5..587cf3eb 100644 --- a/vld.h +++ b/vld.h @@ -27,12 +27,7 @@ #ifdef _DEBUG -#ifndef WIN64 -#pragma comment(lib, "vld_x86.lib") -#else -#pragma comment(lib, "vld_x64.lib") -#endif - +#pragma comment(lib, "vld.lib") // Force a symbolic reference to the global VisualLeakDetector class object from // the DLL. This ensures that the DLL is loaded and linked with the program, @@ -161,7 +156,9 @@ __declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, WCHAR *filena #define VLDRestore() #define VLDReportLeaks() #define VLDRefreshModules() -#define VLDEnableModule() -#define VLDDisableModule() + +inline void VLDEnableModule(HMODULE) {} +inline void VLDDisableModule(HMODULE) {} +inline void VLDSetReportOptions(UINT32 option_mask, WCHAR *filename = NULL) {} #endif // _DEBUG diff --git a/vld.vcxproj b/vld.vcxproj index 3cc1c6f8..deaee34c 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -112,6 +112,9 @@ + + copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + @@ -141,6 +144,12 @@ + + copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + @@ -170,6 +179,9 @@ + + copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + @@ -204,6 +216,12 @@ + + copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + diff --git a/vld_vs10.sln b/vld_vs10.sln index 6ecc1fc8..cc9375e7 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 11.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "testsuite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution From 3e0efbdb5f9f2b4f38c4e96ad5492e7c56313261 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 18 Sep 2010 16:27:02 +0000 Subject: [PATCH 014/321] vld.h header fixed Copyright string updated in headers git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C57367 --- callstack.cpp | 2 +- callstack.h | 2 +- crtmfcpatch.h | 2 +- map.h | 2 +- ntapi.cpp | 2 +- ntapi.h | 2 +- set.h | 2 +- testsuite/testsuite.cpp | 2 +- tree.h | 2 +- utility.cpp | 2 +- utility.h | 2 +- vld.cpp | 2 +- vld.h | 17 +++++++++-------- vld.rc | 2 +- vld_def.h | 2 +- vldapi.cpp | 2 +- vldheap.cpp | 2 +- vldheap.h | 2 +- vldint.h | 2 +- 19 files changed, 27 insertions(+), 26 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 201e7849..02ee966e 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Implementations -// Copyright (c) 2005-2010 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/callstack.h b/callstack.h index c7b1c1a2..feee0ce4 100644 --- a/callstack.h +++ b/callstack.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Definitions -// Copyright (c) 2005-2006 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 17b06a2c..2b2aee42 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CRT and MFC IAT Patch Functions Header -// Copyright (c) 2009-2010 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/map.h b/map.h index c1c8b137..cac98629 100644 --- a/map.h +++ b/map.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Lightweight STL-like Map Template -// Copyright (c) 2006 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/ntapi.cpp b/ntapi.cpp index b067594a..c880bd83 100644 --- a/ntapi.cpp +++ b/ntapi.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Global NT API Function Pointers -// Copyright (c) 2006 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/ntapi.h b/ntapi.h index 793f9b21..878f8a8e 100644 --- a/ntapi.h +++ b/ntapi.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - NT API Definitions -// Copyright (c) 2006-2010 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/set.h b/set.h index fdeba5c6..d0db52b0 100644 --- a/set.h +++ b/set.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Lightweight STL-like Set Template -// Copyright (c) 2006 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/testsuite/testsuite.cpp b/testsuite/testsuite.cpp index 7d46f294..21510c8e 100644 --- a/testsuite/testsuite.cpp +++ b/testsuite/testsuite.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Test Suite -// Copyright (c) 2009 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/tree.h b/tree.h index 41c64455..69817053 100644 --- a/tree.h +++ b/tree.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Red-black Tree Template -// Copyright (c) 2005-2006 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/utility.cpp b/utility.cpp index 19be3c90..787bd849 100644 --- a/utility.cpp +++ b/utility.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Various Utility Functions -// Copyright (c) 2005-2010 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/utility.h b/utility.h index 235f93ac..4d36ded5 100644 --- a/utility.h +++ b/utility.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Various Utility Definitions -// Copyright (c) 2005-2006 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.cpp b/vld.cpp index f356812a..81085c41 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2010 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.h b/vld.h index 587cf3eb..e657cee7 100644 --- a/vld.h +++ b/vld.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Import Library Header -// Copyright (c) 2006 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -23,6 +23,7 @@ #pragma once +#include #include "vld_def.h" #ifdef _DEBUG @@ -76,7 +77,7 @@ __declspec(dllimport) void VLDDisable (); // those other threads. It was designed to work this way to insulate you, // the programmer, from having to ensure thread synchronization when calling // VLDEnable() and VLDDisable(). Without this, calling these two functions -// unsychronized could result in unpredictable and unintended behavior. +// unsynchronized could result in unpredictable and unintended behavior. // But this also means that if you want to enable memory leak detection // process-wide, then you need to call this function from every thread in // the process. @@ -119,6 +120,7 @@ __declspec(dllimport) void VLDRefreshModules(); // // None. // + __declspec(dllimport) void VLDEnableModule(HMODULE); @@ -138,12 +140,12 @@ __declspec(dllimport) void VLDDisableModule(HMODULE); // VLD_OPT_REPORT_TO_STDOUT // VLD_OPT_UNICODE_REPORT // -// filename is optional. +// filename is optional and can be NULL. // Return Value: // // None. // -__declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, WCHAR *filename = NULL); +__declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, WCHAR *filename); #ifdef __cplusplus } @@ -156,9 +158,8 @@ __declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, WCHAR *filena #define VLDRestore() #define VLDReportLeaks() #define VLDRefreshModules() - -inline void VLDEnableModule(HMODULE) {} -inline void VLDDisableModule(HMODULE) {} -inline void VLDSetReportOptions(UINT32 option_mask, WCHAR *filename = NULL) {} +#define VLDEnableModule(a) +#define VLDDisableModule(b) +#define VLDSetReportOptions(a, b) #endif // _DEBUG diff --git a/vld.rc b/vld.rc index 1522ba59..476a0380 100755 --- a/vld.rc +++ b/vld.rc @@ -72,7 +72,7 @@ BEGIN VALUE "FileDescription", "Visual Leak Detector DLL" VALUE "FileVersion", "2, 0, 0, 0" VALUE "InternalName", "vld" - VALUE "LegalCopyright", "Copyright (C) 2010" + VALUE "LegalCopyright", "Copyright (C) 2005-2010" #ifndef WIN64 VALUE "OriginalFilename", "vld_x86.dll" #else diff --git a/vld_def.h b/vld_def.h index 2326a9c2..dbf8ec13 100644 --- a/vld_def.h +++ b/vld_def.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Import Library Header -// Copyright (c) 2006 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldapi.cpp b/vldapi.cpp index d93f1a8a..443349e1 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Exported APIs -// Copyright (c) 2005-2006 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldheap.cpp b/vldheap.cpp index 0a35860f..981aebb5 100644 --- a/vldheap.cpp +++ b/vldheap.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Internal C++ Heap Management -// Copyright (c) 2006 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldheap.h b/vldheap.h index 72bd91c0..ef3d5c32 100644 --- a/vldheap.h +++ b/vldheap.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Internal C++ Heap Management Definitions -// Copyright (c) 2006 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldint.h b/vldint.h index a82957d0..7fce2a1c 100644 --- a/vldint.h +++ b/vldint.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Definition -// Copyright (c) 2005-2010 Dan Moulding +// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public From 3796e85a83d0293139871ab19dad597a3dd24e4f Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 4 Mar 2011 20:45:09 +0000 Subject: [PATCH 015/321] New functions added: VLDGlobalDisable, VLDGlobalEnable, VLDGetOptions, VLDGetReportFilename, VLDSetOptions, VLDSetIncludeModules, VLDGetIncludeModules Hash for each leak added git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64150 --- callstack.cpp | 29 +++++- callstack.h | 6 +- setup/vld-setup.nsi | 2 +- testsuite/testsuite.cpp | 7 +- utility.cpp | 62 +++++++++++++ utility.h | 3 +- vld.cpp | 191 +++++++++++++++++++++++++++++++++++++--- vld.h | 89 ++++++++++++++++++- vldapi.cpp | 92 +++++++++---------- vldint.h | 14 ++- 10 files changed, 424 insertions(+), 71 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 02ee966e..320ff0e0 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -144,7 +144,7 @@ BOOL CallStack::operator == (const CallStack &other) const // specified index is out of range for the CallStack, the return value is // undefined. // -SIZE_T CallStack::operator [] (UINT32 index) const +UINT_PTR CallStack::operator [] (UINT32 index) const { UINT32 count; const CallStack::chunk_t *chunk = &m_store; @@ -196,7 +196,7 @@ VOID CallStack::dump (BOOL showinternalframes) const UINT32 frame; SYMBOL_INFO *functioninfo; LPWSTR functionname; - SIZE_T programcounter; + UINT_PTR programcounter; IMAGEHLP_LINE64 sourceinfo = { 0 }; BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; @@ -246,7 +246,10 @@ VOID CallStack::dump (BOOL showinternalframes) const // Display the current stack frame's information. if (foundline) { - report(L" %s (%d): %s\n", sourceinfo.FileName, sourceinfo.LineNumber, functionname); + if (displacement64 == 0) + report(L" %s (%d): %s\n", sourceinfo.FileName, sourceinfo.LineNumber, functionname); + else + report(L" %s (%d): %s + 0x%X bytes\n", sourceinfo.FileName, sourceinfo.LineNumber, functionname, displacement); } else { report(L" " ADDRESSFORMAT L" (File and line number not available): ", (*this)[frame]); @@ -255,6 +258,26 @@ VOID CallStack::dump (BOOL showinternalframes) const } } +// getHashValue - Generate callstack hash value. +// +// Return Value: +// +// None. +// +DWORD CallStack::getHashValue () const +{ + UINT32 frame; + UINT_PTR programcounter; + DWORD hashcode = 0xD202EF8D; + + // Iterate through each frame in the call stack. + for (frame = 0; frame < m_size; frame++) { + programcounter = (*this)[frame]; + hashcode = CalculateCRC32(programcounter, hashcode); + } + return hashcode; +} + // push_back - Pushes a frame's program counter onto the CallStack. Pushes are // always appended to the back of the chunk list (aka the "top" chunk). // diff --git a/callstack.h b/callstack.h index feee0ce4..ad1fc659 100644 --- a/callstack.h +++ b/callstack.h @@ -63,12 +63,12 @@ class CallStack // Public APIs - see each function definition for details. VOID clear (); VOID dump (BOOL showinternalframes) const; + DWORD getHashValue () const; virtual VOID getstacktrace (UINT32 maxdepth, context_t& context) = 0; CallStack& operator = (const CallStack &other); BOOL operator == (const CallStack &other) const; - SIZE_T operator [] (UINT32 index) const; + UINT_PTR operator [] (UINT32 index) const; VOID push_back (const UINT_PTR programcounter); - protected: // Protected data. UINT32 m_status; // Status flags: @@ -78,7 +78,7 @@ class CallStack // The chunk list is made of a linked list of Chunks. typedef struct chunk_s { struct chunk_s *next; // Pointer to the next chunk in the chunk list. - SIZE_T frames [CALLSTACKCHUNKSIZE]; // Pushed frames (program counter addresses) are stored in this array. + UINT_PTR frames [CALLSTACKCHUNKSIZE]; // Pushed frames (program counter addresses) are stored in this array. } chunk_t; // Private data. diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 8f903777..00dea674 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -26,7 +26,7 @@ !include "MUI.nsh" # Provides the modern user-interface # Version number -!define VLD_VERSION "2.0b" +!define VLD_VERSION "2.1-test" # Define build system paths #!define CRT_PATH "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT" diff --git a/testsuite/testsuite.cpp b/testsuite/testsuite.cpp index 21510c8e..b579270b 100644 --- a/testsuite/testsuite.cpp +++ b/testsuite/testsuite.cpp @@ -61,7 +61,7 @@ enum action_e { #define MAXSIZE 64 // Maximum block size to allocate #define MINDEPTH 0 // Minimum depth of the allocation call stack #define MINSIZE 16 // Minimum block size to allocate -#define NUMDUPLEAKS 0 // Number of times to duplicate each leak +#define NUMDUPLEAKS 3 // Number of times to duplicate each leak #define NUMTHREADS 72 // Number of threads to run simultaneously #define ONCEINAWHILE 10 // Free a random block approx. once every... @@ -371,9 +371,10 @@ int main (int argc, char *argv []) for (index = 0; index < NUMTHREADS; ++index) { contexts[index].index = index; - if (index == leakythread) { + if (index == leakythread) contexts[index].leaky = TRUE; - } + else + contexts[index].leaky = FALSE; contexts[index].seed = random(RAND_MAX); contexts[index].terminated = FALSE; CreateThread(NULL, 0, runtestsuite, &contexts[index], 0, &contexts[index].threadid); diff --git a/utility.cpp b/utility.cpp index 787bd849..083cc47c 100644 --- a/utility.cpp +++ b/utility.cpp @@ -876,3 +876,65 @@ DWORD _GetProcessIdOfThread (HANDLE thread) return (DWORD)tbi.ClientId.UniqueProcess; } + +static const DWORD crctab[256] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, + 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, + 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, + 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, + 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, + 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, + 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, + 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, + 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, + 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, + 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, + 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, + 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, + 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, + 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, + 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, + 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, + 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, + 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, + 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, + 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, + 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, + 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, + 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, + 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, + 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, + 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, + 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, + 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, + 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, + 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, +}; + +DWORD CalculateCRC32(UINT_PTR p, UINT startValue) +{ + register DWORD hash = startValue; + hash = (hash >> 8) ^ crctab[(hash & 0xff) ^ ((p >> 0) & 0xff)]; + hash = (hash >> 8) ^ crctab[(hash & 0xff) ^ ((p >> 8) & 0xff)]; + hash = (hash >> 8) ^ crctab[(hash & 0xff) ^ ((p >> 16) & 0xff)]; + hash = (hash >> 8) ^ crctab[(hash & 0xff) ^ ((p >> 24) & 0xff)]; +#ifdef WIN64 + hash = (hash >> 8) ^ crctab[(hash & 0xff) ^ ((p >> 32) & 0xff)]; + hash = (hash >> 8) ^ crctab[(hash & 0xff) ^ ((p >> 40) & 0xff)]; + hash = (hash >> 8) ^ crctab[(hash & 0xff) ^ ((p >> 48) & 0xff)]; + hash = (hash >> 8) ^ crctab[(hash & 0xff) ^ ((p >> 56) & 0xff)]; +#endif + return hash; +} diff --git a/utility.h b/utility.h index 4d36ded5..1734b0c9 100644 --- a/utility.h +++ b/utility.h @@ -131,4 +131,5 @@ BOOL strtobool (LPCWSTR s); #if _WIN32_WINNT < 0x0600 // Windows XP or earlier, no GetProcessIdOfThread() DWORD _GetProcessIdOfThread (HANDLE thread); #define GetProcessIdOfThread _GetProcessIdOfThread -#endif \ No newline at end of file +#endif +DWORD CalculateCRC32(UINT_PTR p, UINT startValue = 0xD202EF8D); diff --git a/vld.cpp b/vld.cpp index 81085c41..e966518f 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1350,7 +1350,7 @@ VOID VisualLeakDetector::reportconfig () report(L" Using the \"safe\" (but slow) stack walking method.\n"); } if (m_options & VLD_OPT_SELF_TEST) { - report(L" Perfoming a memory leak self-test.\n"); + report(L" Performing a memory leak self-test.\n"); } if (m_options & VLD_OPT_START_DISABLED) { report(L" Starting with memory leak detection disabled.\n"); @@ -1425,12 +1425,11 @@ VOID VisualLeakDetector::reportleaks (HANDLE heap) if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { // Aggregate all other leaks which are duplicates of this one // under this same heading, to cut down on clutter. - duplicates = eraseduplicates(blockit); - if (duplicates) { - report(L"A total of %lu leaks match this size and call stack. Showing only the first one.\n", - duplicates + 1); + duplicates = eraseduplicates(blockit) + 1; + if (duplicates > 1) m_leaksfound += duplicates; - } + report(L"Leak Hash: 0x%08IX Count: %lu\n", + CalculateCRC32(info->size, info->callstack->getHashValue()), duplicates); } // Dump the call stack. report(L" Call Stack:\n"); @@ -1445,7 +1444,7 @@ VOID VisualLeakDetector::reportleaks (HANDLE heap) dumpmemorya(address, (m_maxdatadump < size) ? m_maxdatadump : size); } } - report(L"\n"); + report(L"\n\n"); } LeaveCriticalSection(&m_maplock); @@ -2740,6 +2739,8 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) { static CoGetMalloc_t pCoGetMalloc = NULL; + HRESULT hr = S_OK; + HMODULE ole32; *imalloc = (LPMALLOC)&vld; @@ -2750,10 +2751,22 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) // IMalloc interface. ole32 = GetModuleHandle(L"ole32.dll"); pCoGetMalloc = (CoGetMalloc_t)vld._RGetProcAddress(ole32, "CoGetMalloc"); - pCoGetMalloc(context, &vld.m_imalloc); + hr = pCoGetMalloc(context, &vld.m_imalloc); + } + else + { + // wait for different thread initialization + int c = 0; + while(vld.m_imalloc == NULL && c < 10) + { + Sleep(1); + c++; + } + if (vld.m_imalloc == NULL) + hr = E_INVALIDARG; } - return S_OK; + return hr; } // _CoTaskMemAlloc - Calls to CoTaskMemAlloc are patched through to this @@ -3119,8 +3132,154 @@ void __stdcall VisualLeakDetector::DisableModule(HMODULE module) ChangeModuleState(module,false); } -void __stdcall VisualLeakDetector::SetReportOptions(UINT32 option_mask,WCHAR *filename) +void __stdcall VisualLeakDetector::DisableLeakDetection () +{ + tls_t *tls; + + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Disable memory leak detection for the current thread. There are two flags + // because if neither flag is set, it means that we are in the default or + // "starting" state, which could be either enabled or disabled depending on + // the configuration. + tls = gettls(); + tls->oldflags = tls->flags; + tls->flags &= ~VLD_TLS_ENABLED; + tls->flags |= VLD_TLS_DISABLED; +} + +void __stdcall VisualLeakDetector::EnableLeakDetection () +{ + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + tls_t *tls; + + // Enable memory leak detection for the current thread. + tls = gettls(); + tls->oldflags = tls->flags; + tls->flags &= ~VLD_TLS_DISABLED; + tls->flags |= VLD_TLS_ENABLED; + m_status &= ~VLD_STATUS_NEVER_ENABLED; +} + +void __stdcall VisualLeakDetector::RestoreLeakDetectionState () +{ + tls_t *tls; + + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Restore state memory leak detection for the current thread. + tls = gettls(); + tls->flags &= ~(VLD_TLS_DISABLED | VLD_TLS_ENABLED); + tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); +} + +void __stdcall VisualLeakDetector::GlobalDisableLeakDetection () +{ + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Disable memory leak detection for all threads. + EnterCriticalSection(&m_tlslock); + TlsSet::Iterator tlsit; + for (tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { + (*tlsit)->oldflags = (*tlsit)->flags; + (*tlsit)->flags &= ~VLD_TLS_ENABLED; + (*tlsit)->flags |= VLD_TLS_DISABLED; + } + LeaveCriticalSection(&m_tlslock); +} + +void __stdcall VisualLeakDetector::GlobalEnableLeakDetection () +{ + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Enable memory leak detection for all threads. + EnterCriticalSection(&m_tlslock); + TlsSet::Iterator tlsit; + for (tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { + (*tlsit)->oldflags = (*tlsit)->flags; + (*tlsit)->flags &= ~VLD_TLS_DISABLED; + (*tlsit)->flags |= VLD_TLS_ENABLED; + } + LeaveCriticalSection(&m_tlslock); + m_status &= ~VLD_STATUS_NEVER_ENABLED; +} + +UINT32 __stdcall VisualLeakDetector::GetOptions() +{ + return m_options; +} + +void __stdcall VisualLeakDetector::SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames) { + m_options &= ~(VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | VLD_OPT_TRACE_INTERNAL_FRAMES); // clear used bits + + m_options |= option_mask & VLD_OPT_AGGREGATE_DUPLICATES; + m_options |= option_mask & VLD_OPT_SAFE_STACK_WALK; + m_options |= option_mask & VLD_OPT_SLOW_DEBUGGER_DUMP; + m_options |= option_mask & VLD_OPT_TRACE_INTERNAL_FRAMES; + + m_maxdatadump = maxDataDump; + m_maxtraceframes = maxTraceFrames; + if (m_maxtraceframes < 1) { + m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; + } + + m_options |= option_mask & VLD_OPT_START_DISABLED; + if (m_options & VLD_OPT_START_DISABLED) + GlobalDisableLeakDetection(); +} + +void __stdcall VisualLeakDetector::SetIncludeModules(CONST WCHAR *modules) +{ + if (modules && modules[0] != '\0') + { + m_options &= !VLD_OPT_MODULE_LIST_INCLUDE; + wcsncpy_s(m_forcedmodulelist, MAXMODULELISTLENGTH, modules, _TRUNCATE); + _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); + } + else + m_options |= VLD_OPT_MODULE_LIST_INCLUDE; +} + +bool __stdcall VisualLeakDetector::GetIncludeModules(WCHAR *modules, UINT size) +{ + if (m_options & VLD_OPT_MODULE_LIST_INCLUDE) + { + wcsncpy_s(modules, size, m_forcedmodulelist, _TRUNCATE); + return true; + } + else + { + modules[0] = '\0'; + return false; + } +} + +void __stdcall VisualLeakDetector::GetReportFilename(WCHAR *filename) +{ + wcsncpy_s(filename, MAX_PATH, m_reportfilepath, _TRUNCATE); +} + +void __stdcall VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filename) +{ + m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits + m_options |= option_mask & VLD_OPT_REPORT_TO_DEBUGGER; if ( (option_mask & VLD_OPT_REPORT_TO_FILE) && ( filename != NULL )) { @@ -3130,7 +3289,17 @@ void __stdcall VisualLeakDetector::SetReportOptions(UINT32 option_mask,WCHAR *fi m_options |= option_mask & VLD_OPT_REPORT_TO_STDOUT; m_options |= option_mask & VLD_OPT_UNICODE_REPORT; - SetupReporting(); + if ((m_options & VLD_OPT_UNICODE_REPORT) && !(m_options & VLD_OPT_REPORT_TO_FILE)) { + // If Unicode report encoding is enabled, then the report needs to be + // sent to a file because the debugger will not display Unicode + // characters, it will display question marks in their place instead. + m_options |= VLD_OPT_REPORT_TO_FILE; + m_status |= VLD_STATUS_FORCE_REPORT_TO_FILE; + } + + if (m_options & VLD_OPT_REPORT_TO_FILE) { + SetupReporting(); + } } void VisualLeakDetector::SetupReporting() diff --git a/vld.h b/vld.h index e657cee7..18d0c2ec 100644 --- a/vld.h +++ b/vld.h @@ -55,7 +55,7 @@ extern "C" { // those other threads. It was designed to work this way to insulate you, // the programmer, from having to ensure thread synchronization when calling // VLDEnable() and VLDDisable(). Without this, calling these two functions -// unsychronized could result in unpredictable and unintended behavior. +// unsynchronized could result in unpredictable and unintended behavior. // But this also means that if you want to disable memory leak detection // process-wide, then you need to call this function from every thread in // the process. @@ -96,6 +96,26 @@ __declspec(dllimport) void VLDEnable (); // __declspec(dllimport) void VLDRestore (); +// VLDGlobalDisable - Disables Visual Leak Detector's memory leak detection at +// runtime in all threads. If memory leak detection is already disabled, +// then calling this function has no effect. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDGlobalDisable (); + +// VLDGlobalEnable - Enables Visual Leak Detector's memory leak detection +// at runtime in all threads. If memory leak detection is already enabled, +// which it is by default, then calling this function has no effect. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDGlobalEnable (); + // VLDReportLeaks - Report leaks up to the execution point. // // Return Value: @@ -132,6 +152,65 @@ __declspec(dllimport) void VLDEnableModule(HMODULE); // __declspec(dllimport) void VLDDisableModule(HMODULE); +// VLDGetOptions - Return all current options. +// +// Return Value: +// +// Mask of current options. +// +__declspec(dllimport) UINT32 VLDGetOptions(); + +// VLDGetReportFilename - Return current report filename. +// +// filename: current report filename (max characters - MAX_PATH). +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDGetReportFilename(WCHAR *filename); + +// VLDSetOptions - Update the report options via function call rather than INI file. +// +// option_mask: Only the following flags are checked +// VLD_OPT_AGGREGATE_DUPLICATES +// VLD_OPT_SAFE_STACK_WALK +// VLD_OPT_SLOW_DEBUGGER_DUMP +// VLD_OPT_TRACE_INTERNAL_FRAMES +// VLD_OPT_START_DISABLED +// +// maxDataDump: maximum number of user-data bytes to dump for each leaked block. +// +// maxTraceFrames: maximum number of frames per stack trace for each leaked block. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDSetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); + +// VLDSetIncludeModules - Set list of modules included in leak detection. +// +// modules: list of modules to be forcefully included in leak detection. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDSetIncludeModules(CONST WCHAR *modules); + +// VLDGetIncludeModules - Return current list of included modules. +// +// modules: destination string for list of included modules (maximum length 512 characters). +// +// size: maximum string size. +// +// Return Value: +// +// None. +// +__declspec(dllimport) BOOL VLDGetIncludeModules(WCHAR *modules, UINT size); + // VLDSetOptions - Update the report options via function call rather than INI file. // // Only the following flags are checked @@ -141,11 +220,12 @@ __declspec(dllimport) void VLDDisableModule(HMODULE); // VLD_OPT_UNICODE_REPORT // // filename is optional and can be NULL. +// // Return Value: // // None. // -__declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, WCHAR *filename); +__declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR *filename); #ifdef __cplusplus } @@ -160,6 +240,11 @@ __declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, WCHAR *filena #define VLDRefreshModules() #define VLDEnableModule(a) #define VLDDisableModule(b) +#define VLDGetOptions() 0 +#define VLDGetReportFilename(a) +#define VLDSetOptions(a, b, c) +#define VLDSetIncludeModules(a) +#define VLDGetIncludeModules(a, b) FALSE #define VLDSetReportOptions(a, b) #endif // _DEBUG diff --git a/vldapi.cpp b/vldapi.cpp index 443349e1..f93c1f22 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -35,79 +35,81 @@ extern VisualLeakDetector vld; // Visual Leak Detector APIs - see vldapi.h for each function's details. // -extern "C" __declspec(dllexport) void VLDDisable () -{ - tls_t *tls; - - if (vld.m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } +extern "C" { - // Disable memory leak detection for the current thread. There are two flags - // because if neither flag is set, it means that we are in the default or - // "starting" state, which could be either enabled or disabled depending on - // the configuration. - tls = vld.gettls(); - tls->oldflags = tls->flags; - tls->flags &= ~VLD_TLS_ENABLED; - tls->flags |= VLD_TLS_DISABLED; +__declspec(dllexport) void VLDDisable () +{ + vld.DisableLeakDetection(); } -extern "C" __declspec(dllexport) void VLDEnable () +__declspec(dllexport) void VLDEnable () { - tls_t *tls; - - if (vld.m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - // Enable memory leak detection for the current thread. - tls = vld.gettls(); - tls->oldflags = tls->flags; - tls->flags &= ~VLD_TLS_DISABLED; - tls->flags |= VLD_TLS_ENABLED; - vld.m_status &= ~VLD_STATUS_NEVER_ENABLED; + vld.EnableLeakDetection(); } -extern "C" __declspec(dllexport) void VLDRestore () +__declspec(dllexport) void VLDRestore () { - tls_t *tls; + vld.RestoreLeakDetectionState(); +} - if (vld.m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } +__declspec(dllexport) void VLDGlobalDisable () +{ + vld.GlobalDisableLeakDetection(); +} - // Restore state memory leak detection for the current thread. - tls = vld.gettls(); - tls->flags &= ~(VLD_TLS_DISABLED | VLD_TLS_ENABLED); - tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); +__declspec(dllexport) void VLDGlobalEnable () +{ + vld.GlobalEnableLeakDetection(); } -extern "C" __declspec(dllexport) void VLDReportLeaks () +__declspec(dllexport) void VLDReportLeaks () { vld.Reportleaks(); } -extern "C" __declspec(dllexport) void VLDRefreshModules() +__declspec(dllexport) void VLDRefreshModules() { vld.RefreshModules(); } -extern "C" __declspec(dllexport) void VLDEnableModule(HMODULE module) +__declspec(dllexport) void VLDEnableModule(HMODULE module) { vld.EnableModule(module); } -extern "C" __declspec(dllexport) void VLDDisableModule(HMODULE module) +__declspec(dllexport) void VLDDisableModule(HMODULE module) { vld.DisableModule(module); } +__declspec(dllexport) UINT32 VLDGetOptions() +{ + return vld.GetOptions(); +} -extern "C" __declspec(dllexport) void VLDSetReportOptions(UINT32 option_mask,WCHAR *filename) +__declspec(dllexport) void VLDGetReportFilename(WCHAR *filename) +{ + vld.GetReportFilename(filename); +} + +__declspec(dllexport) void VLDSetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames) +{ + vld.SetOptions(option_mask, maxDataDump, maxTraceFrames); +} + +__declspec(dllexport) void VLDSetIncludeModules(CONST WCHAR *modules) +{ + vld.SetIncludeModules(modules); +} + +__declspec(dllexport) BOOL VLDGetIncludeModules(WCHAR *modules, UINT size) +{ + return vld.GetIncludeModules(modules, size); +} + +__declspec(dllexport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR *filename) { vld.SetReportOptions(option_mask,filename); } + +} diff --git a/vldint.h b/vldint.h index 7fce2a1c..c33f12dc 100644 --- a/vldint.h +++ b/vldint.h @@ -210,10 +210,21 @@ class VisualLeakDetector : public IMalloc LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); ULONG __stdcall Release (); + void __stdcall DisableLeakDetection (); + void __stdcall EnableLeakDetection (); + void __stdcall RestoreLeakDetectionState (); + void __stdcall GlobalDisableLeakDetection (); + void __stdcall GlobalEnableLeakDetection (); + VOID __stdcall Reportleaks(); VOID __stdcall EnableModule(HMODULE module); VOID __stdcall DisableModule(HMODULE module); - void __stdcall SetReportOptions(UINT32 option_mask,WCHAR *filename); + UINT32 __stdcall GetOptions(); + VOID __stdcall GetReportFilename(WCHAR *filename); + VOID __stdcall SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); + VOID __stdcall SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); + VOID __stdcall SetIncludeModules(CONST WCHAR *modules); + bool __stdcall GetIncludeModules(WCHAR *modules, UINT size); static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); @@ -303,7 +314,6 @@ class VisualLeakDetector : public IMalloc typedef FARPROC __stdcall _GetProcAddressType(HMODULE module, LPCSTR procname); VOID __stdcall ChangeModuleState(HMODULE module,bool on); - static _GetProcAddressType * m_original_GetProcAddress; // The Visual Leak Detector APIs are our friends. From 7bea8732b5264d437a19055edc2058d2e1e6ac9a Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 4 Mar 2011 21:02:15 +0000 Subject: [PATCH 016/321] Compiling with PreFAST codeanalysis will generate some warnings. This patch will remove some of the most obvious warnings, but not all. GetModuleHandle is called explicit with wide characters, then the function called should be GetModuleHandleW. Patch by jerker_back git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64156 --- callstack.cpp | 2 +- crtmfcpatch.h | 22 +++++++++++----------- utility.cpp | 2 +- vld.cpp | 30 +++++++++++++++--------------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 320ff0e0..7f99ee08 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -378,7 +378,7 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) static USHORT (WINAPI *s_pfnCaptureStackBackTrace)(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash) = 0; if (s_pfnCaptureStackBackTrace == 0) { - const HMODULE hNtDll = GetModuleHandle(L"ntdll.dll"); + const HMODULE hNtDll = GetModuleHandleW(L"ntdll.dll"); reinterpret_cast(s_pfnCaptureStackBackTrace) = ::GetProcAddress(hNtDll, "RtlCaptureStackBackTrace"); if (s_pfnCaptureStackBackTrace == 0) diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 2b2aee42..977dd1bd 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -133,7 +133,7 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, if (pcrtxxd__calloc_dbg == NULL) { // This is the first call to this function. Link to the real // _calloc_dbg. - msvcrxxd = GetModuleHandle(crtddll); + msvcrxxd = GetModuleHandleW(crtddll); pcrtxxd__calloc_dbg = (_calloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_calloc_dbg"); } @@ -172,7 +172,7 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, if (pcrtxxd__malloc_dbg == NULL) { // This is the first call to this function. Link to the real // _malloc_dbg. - msvcrxxd = GetModuleHandle(crtddll); + msvcrxxd = GetModuleHandleW(crtddll); pcrtxxd__malloc_dbg = (_malloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_malloc_dbg"); } @@ -214,7 +214,7 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, if (pcrtxxd__realloc_dbg == NULL) { // This is the first call to this function. Link to the real // _realloc_dbg. - msvcrxxd = GetModuleHandle(crtddll); + msvcrxxd = GetModuleHandleW(crtddll); pcrtxxd__realloc_dbg = (_realloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_realloc_dbg"); } @@ -302,7 +302,7 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) if (pcrtxxd_calloc == NULL) { // This is the first call to this function. Link to the real malloc. - msvcrxxd = GetModuleHandle(crtddll); + msvcrxxd = GetModuleHandleW(crtddll); pcrtxxd_calloc = (calloc_t)vld._RGetProcAddress(msvcrxxd, "calloc"); } @@ -332,7 +332,7 @@ void* CrtMfcPatch::crtd_malloc (size_t size) if (pcrtxxd_malloc == NULL) { // This is the first call to this function. Link to the real malloc. - msvcrxxd = GetModuleHandle(crtddll); + msvcrxxd = GetModuleHandleW(crtddll); pcrtxxd_malloc = (malloc_t)vld._RGetProcAddress(msvcrxxd, "malloc"); } @@ -364,7 +364,7 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) if (pcrtxxd_realloc == NULL) { // This is the first call to this function. Link to the real realloc. - msvcrxxd = GetModuleHandle(crtddll); + msvcrxxd = GetModuleHandleW(crtddll); pcrtxxd_realloc = (realloc_t)vld._RGetProcAddress(msvcrxxd, "realloc"); } @@ -442,7 +442,7 @@ void* CrtMfcPatch::crtd_new_dbg (context_t& context, if (pcrtxxd_new_dbg == NULL) { // This is the first call to this function. Link to the real CRT debug // new operator. - msvcrxxd = GetModuleHandle(crtddll); + msvcrxxd = GetModuleHandleW(crtddll); pcrtxxd_new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(msvcrxxd, procname); } @@ -473,7 +473,7 @@ void* CrtMfcPatch::crtd_new (context_t& context, size_t size) if (pcrtxxd_scalar_new == NULL) { // This is the first call to this function. Link to the real CRT new // operator. - msvcrxxd = GetModuleHandle(crtddll); + msvcrxxd = GetModuleHandleW(crtddll); pcrtxxd_scalar_new = (new_t)vld._RGetProcAddress(msvcrxxd, procname); } @@ -815,7 +815,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, if (pmfcxxd__new_dbg == NULL) { // This is the first call to this function. Link to the real MFC debug // new operator. - mfcxxd = GetModuleHandle(mfcdll); + mfcxxd = GetModuleHandleW(mfcdll); pmfcxxd__new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } @@ -856,7 +856,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, if (pmfcxxd__new_dbg == NULL) { // This is the first call to this function. Link to the real MFC debug // new operator. - mfcxxd = GetModuleHandle(mfcdll); + mfcxxd = GetModuleHandleW(mfcdll); pmfcxxd__new_dbg = (new_dbg_mfc_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } @@ -887,7 +887,7 @@ void* CrtMfcPatch::mfcd_new (context_t& context, size_t size) if (pmfcxxd_new == NULL) { // This is the first call to this function. Link to the real CRT new // operator. - mfcxxd = GetModuleHandle(mfcdll); + mfcxxd = GetModuleHandleW(mfcdll); pmfcxxd_new = (new_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } diff --git a/utility.cpp b/utility.cpp index 083cc47c..91fa975f 100644 --- a/utility.cpp +++ b/utility.cpp @@ -861,7 +861,7 @@ DWORD _GetProcessIdOfThread (HANDLE thread) NTSTATUS status; HMODULE ntdll; if (NtQueryInformationThread == NULL) { - ntdll = GetModuleHandle(L"ntdll.dll"); + ntdll = GetModuleHandleW(L"ntdll.dll"); NtQueryInformationThread = (PNtQueryInformationThread)GetProcAddress(ntdll, "NtQueryInformationThread"); if (NtQueryInformationThread == NULL) { return 0; diff --git a/vld.cpp b/vld.cpp index e966518f..6d1192d0 100644 --- a/vld.cpp +++ b/vld.cpp @@ -358,8 +358,8 @@ VisualLeakDetector::VisualLeakDetector () return; } - kernel32 = GetModuleHandle(L"kernel32.dll"); - ntdll = GetModuleHandle(L"ntdll.dll"); + kernel32 = GetModuleHandleW(L"kernel32.dll"); + ntdll = GetModuleHandleW(L"ntdll.dll"); m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); // Initialize global variables. @@ -812,7 +812,7 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () // executable image. So, we'll manually add the location of the executable // to the search path since that is often where the PDB will be located. path[0] = L'\0'; - module = GetModuleHandle(NULL); + module = GetModuleHandleW(NULL); GetModuleFileName(module, path, MAX_PATH); _wsplitpath_s(path, drive, _MAX_DRIVE, directory, _MAX_DIR, NULL, 0, NULL, 0); wcsncpy_s(path, MAX_PATH, drive, _TRUNCATE); @@ -2749,7 +2749,7 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) // This is the first call to this function. Link to the real // CoGetMalloc and get a pointer to the system implementation of the // IMalloc interface. - ole32 = GetModuleHandle(L"ole32.dll"); + ole32 = GetModuleHandleW(L"ole32.dll"); pCoGetMalloc = (CoGetMalloc_t)vld._RGetProcAddress(ole32, "CoGetMalloc"); hr = pCoGetMalloc(context, &vld.m_imalloc); } @@ -2800,7 +2800,7 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) if (pCoTaskMemAlloc == NULL) { // This is the first call to this function. Link to the real // CoTaskMemAlloc. - ole32 = GetModuleHandle(L"ole32.dll"); + ole32 = GetModuleHandleW(L"ole32.dll"); pCoTaskMemAlloc = (CoTaskMemAlloc_t)vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); } @@ -2856,7 +2856,7 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) if (pCoTaskMemRealloc == NULL) { // This is the first call to this function. Link to the real // CoTaskMemRealloc. - ole32 = GetModuleHandle(L"ole32.dll"); + ole32 = GetModuleHandleW(L"ole32.dll"); pCoTaskMemRealloc = (CoTaskMemRealloc_t)vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); } @@ -2896,7 +2896,7 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) ULONG VisualLeakDetector::AddRef () { assert(m_imalloc != NULL); - return m_imalloc->AddRef(); + return (m_imalloc) ? m_imalloc->AddRef() : 0; } // Alloc - Calls to IMalloc::Alloc end up here. This function is just a wrapper @@ -2925,7 +2925,7 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) // Do the allocation. The block will be mapped by _RtlAllocateHeap. assert(m_imalloc != NULL); - block = m_imalloc->Alloc(size); + block = (m_imalloc) ? m_imalloc->Alloc(size) : NULL; if (firstcall) { @@ -2956,7 +2956,7 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) INT VisualLeakDetector::DidAlloc (LPVOID mem) { assert(m_imalloc != NULL); - return m_imalloc->DidAlloc(mem); + return (m_imalloc) ? m_imalloc->DidAlloc(mem) : 0; } // Free - Calls to IMalloc::Free will end up here. This function is just a @@ -2971,7 +2971,7 @@ INT VisualLeakDetector::DidAlloc (LPVOID mem) VOID VisualLeakDetector::Free (LPVOID mem) { assert(m_imalloc != NULL); - m_imalloc->Free(mem); + if (m_imalloc) m_imalloc->Free(mem); } // GetSize - Calls to IMalloc::GetSize will end up here. This function is just a @@ -2987,7 +2987,7 @@ VOID VisualLeakDetector::Free (LPVOID mem) SIZE_T VisualLeakDetector::GetSize (LPVOID mem) { assert(m_imalloc != NULL); - return m_imalloc->GetSize(mem); + return (m_imalloc) ? m_imalloc->GetSize(mem) : 0; } // HeapMinimize - Calls to IMalloc::HeapMinimize will end up here. This function @@ -3000,7 +3000,7 @@ SIZE_T VisualLeakDetector::GetSize (LPVOID mem) VOID VisualLeakDetector::HeapMinimize () { assert(m_imalloc != NULL); - m_imalloc->HeapMinimize(); + if (m_imalloc) m_imalloc->HeapMinimize(); } // QueryInterface - Calls to IMalloc::QueryInterface will end up here. This @@ -3020,7 +3020,7 @@ VOID VisualLeakDetector::HeapMinimize () HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) { assert(m_imalloc != NULL); - return m_imalloc->QueryInterface(iid, object); + return (m_imalloc) ? m_imalloc->QueryInterface(iid, object) : E_UNEXPECTED; } // Realloc - Calls to IMalloc::Realloc will end up here. This function is just a @@ -3053,7 +3053,7 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) // Do the allocation. The block will be mapped by _RtlReAllocateHeap. assert(m_imalloc != NULL); - block = m_imalloc->Realloc(mem, size); + block = (m_imalloc) ? m_imalloc->Realloc(mem, size) : NULL; if (firstcall) { @@ -3082,7 +3082,7 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) ULONG VisualLeakDetector::Release () { assert(m_imalloc != NULL); - return m_imalloc->Release(); + return (m_imalloc) ? m_imalloc->Release() : 0; } From 53c1973c5176036ca1dc7564039cadcc6db93a3a Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 4 Mar 2011 21:06:14 +0000 Subject: [PATCH 017/321] Improved LdrLoadDll hooking on Windows 7. On Windows 7 VLD doesn't attach to newly loaded DLLs, because LdrLoadDll is called from KernelBase.dll instead of kernel32.dll (older systems). This patch should fix it. Patch by geordi git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64157 --- vld.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vld.cpp b/vld.cpp index 6d1192d0..692315ab 100644 --- a/vld.cpp +++ b/vld.cpp @@ -337,7 +337,7 @@ moduleentry_t VisualLeakDetector::m_patchtable [] = { // VisualLeakDetector::VisualLeakDetector () { - HMODULE kernel32; + HMODULE kernel32, kernelBase; ModuleSet *newmodules; HMODULE ntdll; LPWSTR symbolpath; @@ -359,6 +359,7 @@ VisualLeakDetector::VisualLeakDetector () } kernel32 = GetModuleHandleW(L"kernel32.dll"); + kernelBase = GetModuleHandleW(L"KernelBase.dll"); ntdll = GetModuleHandleW(L"ntdll.dll"); m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); @@ -443,6 +444,8 @@ VisualLeakDetector::VisualLeakDetector () "ntdll.dll", (UINT_PTR)ntdll, ntdllPatch, }; patchimport(kernel32, ldrLoadDllPatch); + if (kernelBase != NULL) + patchimport(kernelBase, ldrLoadDllPatch); // Attach Visual Leak Detector to every module loaded in the process. newmodules = new ModuleSet; From e01c26ce28be5ddd2a9e82c8672d2f13a609d021 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 4 Mar 2011 22:01:06 +0000 Subject: [PATCH 018/321] Option VLD_OPT_SKIP_HEAPFREE_LEAKS added git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64162 --- vld.cpp | 20 +++++++++++++------- vld_def.h | 25 +++++++++++++------------ 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/vld.cpp b/vld.cpp index 692315ab..4d0c1746 100644 --- a/vld.cpp +++ b/vld.cpp @@ -964,6 +964,11 @@ VOID VisualLeakDetector::configure () m_options |= VLD_OPT_TRACE_INTERNAL_FRAMES; } + GetPrivateProfileString(L"Options", L"SkipHeapFreeLeaks", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_SKIP_HEAPFREE_LEAKS; + } + // Read the integer configuration options. m_maxdatadump = GetPrivateProfileInt(L"Options", L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); m_maxtraceframes = GetPrivateProfileInt(L"Options", L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); @@ -2386,7 +2391,8 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) // from the process's address space. So, we'd better generate a leak report // for this heap now, while we can still read from the memory blocks // allocated to it. - vld.reportleaks(heap); + if (!(vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) + vld.reportleaks(heap); vld.unmapheap(heap); @@ -3230,12 +3236,11 @@ UINT32 __stdcall VisualLeakDetector::GetOptions() void __stdcall VisualLeakDetector::SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames) { - m_options &= ~(VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | VLD_OPT_TRACE_INTERNAL_FRAMES); // clear used bits + UINT32 mask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | + VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS; - m_options |= option_mask & VLD_OPT_AGGREGATE_DUPLICATES; - m_options |= option_mask & VLD_OPT_SAFE_STACK_WALK; - m_options |= option_mask & VLD_OPT_SLOW_DEBUGGER_DUMP; - m_options |= option_mask & VLD_OPT_TRACE_INTERNAL_FRAMES; + m_options &= ~mask; // clear used bits + m_options |= option_mask & mask; m_maxdatadump = maxDataDump; m_maxtraceframes = maxTraceFrames; @@ -3281,7 +3286,8 @@ void __stdcall VisualLeakDetector::GetReportFilename(WCHAR *filename) void __stdcall VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filename) { - m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits + m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | + VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits m_options |= option_mask & VLD_OPT_REPORT_TO_DEBUGGER; if ( (option_mask & VLD_OPT_REPORT_TO_FILE) && ( filename != NULL )) diff --git a/vld_def.h b/vld_def.h index dbf8ec13..42315b2f 100644 --- a/vld_def.h +++ b/vld_def.h @@ -23,16 +23,17 @@ #pragma once -#define VLD_OPT_AGGREGATE_DUPLICATES 0x001 // If set, aggregate duplicate leaks in the leak report. -#define VLD_OPT_MODULE_LIST_INCLUDE 0x002 // If set, modules in the module list are included, all others are excluded. -#define VLD_OPT_REPORT_TO_DEBUGGER 0x004 // If set, the memory leak report is sent to the debugger. -#define VLD_OPT_REPORT_TO_FILE 0x008 // If set, the memory leak report is sent to a file. -#define VLD_OPT_SAFE_STACK_WALK 0x010 // If set, the stack is walked using the "safe" method (StackWalk64). -#define VLD_OPT_SELF_TEST 0x020 // If set, perform a self-test to verify memory leak self-checking. -#define VLD_OPT_SLOW_DEBUGGER_DUMP 0x040 // If set, inserts a slight delay between sending output to the debugger. -#define VLD_OPT_START_DISABLED 0x080 // If set, memory leak detection will initially disabled. -#define VLD_OPT_TRACE_INTERNAL_FRAMES 0x100 // If set, include useless frames (e.g. internal to VLD) in call stacks. -#define VLD_OPT_UNICODE_REPORT 0x200 // If set, the leak report will be encoded UTF-16 instead of ASCII. -#define VLD_OPT_VLDOFF 0x400 // If set, VLD will be completely deactivated. It will not attach to any modules. -#define VLD_OPT_REPORT_TO_STDOUT 0x800 // If set, the memory leak report is sent to stdout. +#define VLD_OPT_AGGREGATE_DUPLICATES 0x0001 // If set, aggregate duplicate leaks in the leak report. +#define VLD_OPT_MODULE_LIST_INCLUDE 0x0002 // If set, modules in the module list are included, all others are excluded. +#define VLD_OPT_REPORT_TO_DEBUGGER 0x0004 // If set, the memory leak report is sent to the debugger. +#define VLD_OPT_REPORT_TO_FILE 0x0008 // If set, the memory leak report is sent to a file. +#define VLD_OPT_SAFE_STACK_WALK 0x0010 // If set, the stack is walked using the "safe" method (StackWalk64). +#define VLD_OPT_SELF_TEST 0x0020 // If set, perform a self-test to verify memory leak self-checking. +#define VLD_OPT_SLOW_DEBUGGER_DUMP 0x0040 // If set, inserts a slight delay between sending output to the debugger. +#define VLD_OPT_START_DISABLED 0x0080 // If set, memory leak detection will initially disabled. +#define VLD_OPT_TRACE_INTERNAL_FRAMES 0x0100 // If set, include useless frames (e.g. internal to VLD) in call stacks. +#define VLD_OPT_UNICODE_REPORT 0x0200 // If set, the leak report will be encoded UTF-16 instead of ASCII. +#define VLD_OPT_VLDOFF 0x0400 // If set, VLD will be completely deactivated. It will not attach to any modules. +#define VLD_OPT_REPORT_TO_STDOUT 0x0800 // If set, the memory leak report is sent to stdout. +#define VLD_OPT_SKIP_HEAPFREE_LEAKS 0x1000 // If set, VLD skip HeapFree memory leaks. From bfdc8521dd3c72aef616072e048dfbf598b30553 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 4 Mar 2011 22:16:45 +0000 Subject: [PATCH 019/321] Issue #7584 fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64164 --- testsuite/testsuite.vcxproj | 18 ------------------ utility.cpp | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/testsuite/testsuite.vcxproj b/testsuite/testsuite.vcxproj index 32f28493..bf7db441 100644 --- a/testsuite/testsuite.vcxproj +++ b/testsuite/testsuite.vcxproj @@ -129,9 +129,6 @@ $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true - false - - @@ -151,9 +148,6 @@ false true true - false - - @@ -171,9 +165,6 @@ $(SolutionDir)\$(Platform)\Release;%(AdditionalLibraryDirectories) true - false - - @@ -194,9 +185,6 @@ $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true - false - - MachineX64 @@ -220,9 +208,6 @@ false true true - false - - MachineX64 @@ -244,9 +229,6 @@ $(SolutionDir)\$(Platform)\Release;%(AdditionalLibraryDirectories) true - false - - MachineX64 true diff --git a/utility.cpp b/utility.cpp index 91fa975f..d7da0de3 100644 --- a/utility.cpp +++ b/utility.cpp @@ -486,7 +486,7 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) // writable. if ( import != replacement ) { - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); iate->u1.Function = (DWORD_PTR)replacement; VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); } @@ -685,7 +685,7 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) // Found the IAT entry. Overwrite the address stored in the IAT // entry with the import's real address. Note that the IAT entry may // be write-protected, so we must first ensure that it is writable. - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_READWRITE, &protect); + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); iate->u1.Function = (DWORD_PTR)import; VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); break; From 3b083858a96417952b82d90b6e4b63d995cadf51 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 4 Mar 2011 22:27:33 +0000 Subject: [PATCH 020/321] Copyright string updated git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64165 --- CHANGES.txt | 15 ++++++++++++++- README.html | 2 +- callstack.cpp | 2 +- callstack.h | 2 +- crtmfcpatch.h | 4 ++-- map.h | 2 +- ntapi.cpp | 2 +- ntapi.h | 2 +- set.h | 2 +- setup/vld-setup.nsi | 4 ++-- testsuite/testsuite.cpp | 2 +- tree.h | 2 +- utility.cpp | 2 +- utility.h | 2 +- vld.cpp | 2 +- vld.h | 2 +- vld.rc | 6 +++--- vld_def.h | 2 +- vldapi.cpp | 2 +- vldheap.cpp | 2 +- vldheap.h | 2 +- vldint.h | 4 ++-- 22 files changed, 40 insertions(+), 27 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 74629fd6..1068f980 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,21 @@ -Visual Leak Detector (VLD) Version 2.0b +Visual Leak Detector (VLD) Version 2.1 Change Log / Release Notes +2.1 (05 March 2011) +---------------------------- + Enhancements: + + New functions added: VLDGlobalDisable, VLDGlobalEnable, VLDGetOptions, + VLDGetReportFilename, VLDSetOptions, VLDSetIncludeModules, + VLDGetIncludeModules (see vld.h). + + Option VLD_OPT_SKIP_HEAPFREE_LEAKS added. + + Hash for each leak added + + Bugs Fixed: + + Improved LdrLoadDll hooking on Windows 7. + + "HMODULE not founded" bug fixed. + 2.0b (24 August 2010) ---------------------------- Enhancements: diff --git a/README.html b/README.html index 2f5234f9..11a06854 100644 --- a/README.html +++ b/README.html @@ -771,7 +771,7 @@

Additional Developers Wanted

- + diff --git a/callstack.cpp b/callstack.cpp index 7f99ee08..46871255 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Implementations -// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/callstack.h b/callstack.h index ad1fc659..5eedabb2 100644 --- a/callstack.h +++ b/callstack.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Definitions -// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 977dd1bd..517f6650 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CRT and MFC IAT Patch Functions Header -// Copyright (c) 2005-2010 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -981,7 +981,7 @@ typedef CrtMfcPatch #endif VS90; -// Visual Studio 2010 +// Visual Studio 2011 typedef CrtMfcPatch Date: Fri, 4 Mar 2011 22:33:03 +0000 Subject: [PATCH 021/321] Setup URL fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64166 --- setup/vld-setup.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 1eedccee..72254b20 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -123,8 +123,8 @@ Section "Uninstaller" WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "DisplayName" "Visual Leak Detector ${VLD_VERSION}" WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "UninstallString" "$INSTDIR\uninstall.exe" WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "InstallLocation" "$INSTDIR" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "Publisher" "Dan Moulding" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "URLInfoAbout" "http://www.danm.net" + WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "Publisher" "VLD Team" + WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "URLInfoAbout" "http://vld.codeplex.com/" WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "DisplayVersion" "${VLD_VERSION}" WriteRegDWORD HKLM "${REG_KEY_UNINSTALL}" "NoModify" 1 WriteRegDWORD HKLM "${REG_KEY_UNINSTALL}" "NoRepair" 1 From 542139469e3187bb478e3e584083ef44ee093c2a Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 4 Mar 2011 23:38:15 +0000 Subject: [PATCH 022/321] HMODULE fixed again Callstack displacement fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64169 --- callstack.cpp | 1 + vld.h | 3 ++- vld.rc | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 46871255..3f682e63 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -238,6 +238,7 @@ VOID CallStack::dump (BOOL showinternalframes) const // counter address. if (SymFromAddrW(currentprocess, (*this)[frame], &displacement64, functioninfo)) { functionname = functioninfo->Name; + displacement = (DWORD)displacement64; } else { functionname = L"(Function name unavailable)"; diff --git a/vld.h b/vld.h index 186fe772..ff8bca1a 100644 --- a/vld.h +++ b/vld.h @@ -23,11 +23,12 @@ #pragma once -#include #include "vld_def.h" #ifdef _DEBUG +#include + #pragma comment(lib, "vld.lib") // Force a symbolic reference to the global VisualLeakDetector class object from diff --git a/vld.rc b/vld.rc index de705493..aeff18e4 100755 --- a/vld.rc +++ b/vld.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,0 - PRODUCTVERSION 2,0,0,0 + FILEVERSION 2,1,0,0 + PRODUCTVERSION 2,1,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x3L @@ -70,7 +70,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Visual Leak Detector DLL" - VALUE "FileVersion", "2, 1, 0, 0" + VALUE "FileVersion", "2.1.0.0" VALUE "InternalName", "vld" VALUE "LegalCopyright", "Copyright (C) 2005-2011" #ifndef WIN64 @@ -79,7 +79,7 @@ BEGIN VALUE "OriginalFilename", "vld_x64.dll" #endif VALUE "ProductName", "Visual Leak Detector" - VALUE "ProductVersion", "2, 1, 0, 0" + VALUE "ProductVersion", "2.1.0.0" END END BLOCK "VarFileInfo" From c4d7daf0cbaaa718fbdbd0f5ba36a3ccee6bc501 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 6 Mar 2011 19:33:06 +0000 Subject: [PATCH 023/321] VLDSetIncludeModules/VLDGetIncludeModules fixed Batch file for building setup added Supported loading symbols from Visual Studio symbol cache directory git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64236 --- callstack.cpp | 13 +++-- setup/build_version.bat | 77 +++++++++++++++++++++++++++++ vld.cpp | 107 ++++++++++++++++++++++++---------------- vld.h | 24 +++++---- vld.ini | 4 +- vld_vs10.sln | 10 ++++ vldapi.cpp | 10 ++-- vldint.h | 35 ++++++------- 8 files changed, 195 insertions(+), 85 deletions(-) create mode 100644 setup/build_version.bat diff --git a/callstack.cpp b/callstack.cpp index 3f682e63..5db0cbfc 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -236,26 +236,29 @@ VOID CallStack::dump (BOOL showinternalframes) const // Try to get the name of the function containing this program // counter address. - if (SymFromAddrW(currentprocess, (*this)[frame], &displacement64, functioninfo)) { + if (SymFromAddrW(currentprocess, programcounter, &displacement64, functioninfo)) { functionname = functioninfo->Name; - displacement = (DWORD)displacement64; } else { functionname = L"(Function name unavailable)"; + displacement64 = 0; } LeaveCriticalSection(&symbollock); // Display the current stack frame's information. if (foundline) { - if (displacement64 == 0) + if (displacement == 0) report(L" %s (%d): %s\n", sourceinfo.FileName, sourceinfo.LineNumber, functionname); else report(L" %s (%d): %s + 0x%X bytes\n", sourceinfo.FileName, sourceinfo.LineNumber, functionname, displacement); } else { report(L" " ADDRESSFORMAT L" (File and line number not available): ", (*this)[frame]); - report(L"%s\n", functionname); - } + if (displacement64 == 0) + report(L"%s\n", functionname); + else + report(L"%s + 0x%X bytes\n", functionname, (DWORD)displacement64); + } } } diff --git a/setup/build_version.bat b/setup/build_version.bat new file mode 100644 index 00000000..49f6b40a --- /dev/null +++ b/setup/build_version.bat @@ -0,0 +1,77 @@ +@ECHO OFF + +TITLE Building VLD... + +SETLOCAL ENABLEDELAYEDEXPANSION + +REM Check if the needed files are present +IF "%VS100COMNTOOLS%"=="" GOTO :BadPaths + +CD %~dp0/.. + +GOTO :GoodPaths + +:BadPaths +ECHO: "Not all build dependencies found. To build iZ3D Driver you need:" +ECHO: "* Visual Studio 2010 installed" +PAUSE +GOTO :EndGood + +:GoodPaths +SET BUILDTYPE=/%1 +IF "%1"=="" SET BUILDTYPE=/rebuild +rem IF "%1"=="build" SET BUILDTYPE= + +SET ORIGPATH="%CD%" +CALL "%VS100COMNTOOLS%vsvars32.bat" +CD %ORIGPATH% + +:: Store start time +FOR /f "tokens=1-4 delims=:.," %%T IN ("%TIME%") DO ( + SET StartTIME=%TIME% + :: Fix leading zero problem + SET /a Start100S=%%T*360000+1%%U*6000+1%%V*100+1%%W - 610100 +) + +devenv /nologo vld_vs10.sln %BUILDTYPE% "Release|Win32" /Project vld +IF %ERRORLEVEL% NEQ 0 GOTO EndBad +devenv /nologo vld_vs10.sln %BUILDTYPE% "Release|x64" /Project vld +IF %ERRORLEVEL% NEQ 0 GOTO EndBad + +if not exist "%ProgramFiles%\NSIS\makensis.exe" GOTO EndBad +"%ProgramFiles%\NSIS\makensis.exe" /V3 setup\vld-setup.nsi +IF %ERRORLEVEL% NEQ 0 GOTO EndBad +CD setup + +ECHO  + +:: Retrieve Stop time +FOR /f "tokens=1-4 delims=:.," %%T IN ("%TIME%") DO ( + SET StopTIME=%TIME% + :: Fix leading zero problem + SET /a Stop100S=%%T*360000+1%%U*6000+1%%V*100+1%%W - 610100 +) + +:: Test midnight rollover. If so, add 1 day=8640000 1/100ths secs +IF %Stop100S% LSS %Start100S% SET /a Stop100S+=8640000 +SET /a TookTimeSec=(%Stop100S%-%Start100S%)/100 +SET /a TookTimeMin=TookTimeSec/60 +SET /a TookTimeSec=%TookTimeSec%-%TookTimeMin%*60 + +ECHO Started: %StartTime% +ECHO Stopped: %StopTime% +ECHO Elapsed: %TookTimeMin% min. %TookTimeSec% sec. + +PAUSE + +GOTO :EndGood + +:EndBad +CD setup +ECHO: " " +ECHO: ERROR: Build failed and aborted +PAUSE +GOTO :EOF + +:EndGood +GOTO :EOF \ No newline at end of file diff --git a/vld.cpp b/vld.cpp index a308e5fe..f034fa03 100644 --- a/vld.cpp +++ b/vld.cpp @@ -429,7 +429,11 @@ VisualLeakDetector::VisualLeakDetector () // Initialize the symbol handler. We use it for obtaining source file/line // number information and function names for the memory leak report. symbolpath = buildsymbolsearchpath(); +#ifdef _DEBUG + SymSetOptions(SYMOPT_DEBUG | SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); +#else SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); +#endif if (!SymInitializeW(currentprocess, symbolpath, FALSE)) { report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" L" File and function names will probably not be available in call stacks.\n", GetLastError()); @@ -748,11 +752,15 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // process, guaranteeing the symbols' availability when generating the // leak report. moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); - if ((SymGetModuleInfoW64(currentprocess, (DWORD64)modulebase, &moduleimageinfo) == TRUE) || - ((SymLoadModule64(currentprocess, NULL, modulepath, NULL, modulebase, modulesize) == modulebase) && - (SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo) == TRUE))) { - moduleflags |= VLD_MODULE_SYMBOLSLOADED; + BOOL SymbolsLoaded = SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo); + if (!SymbolsLoaded) + { + DWORD64 module = SymLoadModule64(currentprocess, NULL, modulepath, NULL, modulebase, modulesize); + if (module == modulebase) + SymbolsLoaded = SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo); } + if (SymbolsLoaded) + moduleflags |= VLD_MODULE_SYMBOLSLOADED; LeaveCriticalSection(&symbollock); if (_stricmp(VLDDLL, modulename) == 0) { @@ -852,7 +860,7 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () delete [] env; } - // Append %_NT_ALT_SYMBOL_PATH%. + // Append %_NT_ALT_SYMBOL_PATH%. envlen = GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", NULL, 0); if (envlen != 0) { env = new WCHAR [envlen]; @@ -863,6 +871,28 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () delete [] env; } + // Append Visual Studio 2010/2008 symbols cache directory. + HKEY debuggerkey; + WCHAR symbolCacheDir [MAX_PATH]; + LSTATUS regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\10.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); + if (regstatus != ERROR_SUCCESS) + regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\9.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); + + if (regstatus == ERROR_SUCCESS) + { + DWORD valuetype; + DWORD dirLength = MAX_PATH * sizeof(WCHAR); + regstatus = RegQueryValueEx(debuggerkey, L"SymbolCacheDir", NULL, &valuetype, (LPBYTE)&symbolCacheDir, &dirLength); + if (regstatus == ERROR_SUCCESS && valuetype == REG_SZ) + { + strapp(&path, L";cache*"); + strapp(&path, symbolCacheDir); + strapp(&path, L"\\MicrosoftPublicSymbols;cache*"); + strapp(&path, symbolCacheDir); + } + RegCloseKey(debuggerkey); + } + // Remove any quotes from the path. The symbol handler doesn't like them. pos = 0; length = wcslen(path); @@ -3095,7 +3125,7 @@ ULONG VisualLeakDetector::Release () } -VOID __stdcall VisualLeakDetector::Reportleaks( ) +VOID VisualLeakDetector::ReportLeaks( ) { HeapMap::Iterator heapit; HANDLE heap; @@ -3107,7 +3137,7 @@ VOID __stdcall VisualLeakDetector::Reportleaks( ) } } -void __stdcall VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) +void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) { ModuleSet::Iterator moduleit; @@ -3131,17 +3161,17 @@ void __stdcall VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) } -void __stdcall VisualLeakDetector::EnableModule(HMODULE module) +void VisualLeakDetector::EnableModule(HMODULE module) { ChangeModuleState(module,true); } -void __stdcall VisualLeakDetector::DisableModule(HMODULE module) +void VisualLeakDetector::DisableModule(HMODULE module) { ChangeModuleState(module,false); } -void __stdcall VisualLeakDetector::DisableLeakDetection () +void VisualLeakDetector::DisableLeakDetection () { tls_t *tls; @@ -3160,7 +3190,7 @@ void __stdcall VisualLeakDetector::DisableLeakDetection () tls->flags |= VLD_TLS_DISABLED; } -void __stdcall VisualLeakDetector::EnableLeakDetection () +void VisualLeakDetector::EnableLeakDetection () { if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. @@ -3177,7 +3207,7 @@ void __stdcall VisualLeakDetector::EnableLeakDetection () m_status &= ~VLD_STATUS_NEVER_ENABLED; } -void __stdcall VisualLeakDetector::RestoreLeakDetectionState () +void VisualLeakDetector::RestoreLeakDetectionState () { tls_t *tls; @@ -3192,7 +3222,7 @@ void __stdcall VisualLeakDetector::RestoreLeakDetectionState () tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); } -void __stdcall VisualLeakDetector::GlobalDisableLeakDetection () +void VisualLeakDetector::GlobalDisableLeakDetection () { if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. @@ -3210,7 +3240,7 @@ void __stdcall VisualLeakDetector::GlobalDisableLeakDetection () LeaveCriticalSection(&m_tlslock); } -void __stdcall VisualLeakDetector::GlobalEnableLeakDetection () +void VisualLeakDetector::GlobalEnableLeakDetection () { if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. @@ -3229,18 +3259,19 @@ void __stdcall VisualLeakDetector::GlobalEnableLeakDetection () m_status &= ~VLD_STATUS_NEVER_ENABLED; } -UINT32 __stdcall VisualLeakDetector::GetOptions() +CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_INCLUDE | + VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | + VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS; + +UINT32 VisualLeakDetector::GetOptions() { - return m_options; + return m_options & OptionsMask; } -void __stdcall VisualLeakDetector::SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames) +void VisualLeakDetector::SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames) { - UINT32 mask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | - VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS; - - m_options &= ~mask; // clear used bits - m_options |= option_mask & mask; + m_options &= ~OptionsMask; // clear used bits + m_options |= option_mask & OptionsMask; m_maxdatadump = maxDataDump; m_maxtraceframes = maxTraceFrames; @@ -3253,38 +3284,28 @@ void __stdcall VisualLeakDetector::SetOptions(UINT32 option_mask, SIZE_T maxData GlobalDisableLeakDetection(); } -void __stdcall VisualLeakDetector::SetIncludeModules(CONST WCHAR *modules) +void VisualLeakDetector::SetModulesList(CONST WCHAR *modules, BOOL includeModules) { - if (modules && modules[0] != '\0') - { - m_options &= !VLD_OPT_MODULE_LIST_INCLUDE; - wcsncpy_s(m_forcedmodulelist, MAXMODULELISTLENGTH, modules, _TRUNCATE); - _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); - } - else + wcsncpy_s(m_forcedmodulelist, MAXMODULELISTLENGTH, modules, _TRUNCATE); + _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); + if (includeModules) m_options |= VLD_OPT_MODULE_LIST_INCLUDE; + else + m_options &= ~VLD_OPT_MODULE_LIST_INCLUDE; } -bool __stdcall VisualLeakDetector::GetIncludeModules(WCHAR *modules, UINT size) +bool VisualLeakDetector::GetModulesList(WCHAR *modules, UINT size) { - if (m_options & VLD_OPT_MODULE_LIST_INCLUDE) - { - wcsncpy_s(modules, size, m_forcedmodulelist, _TRUNCATE); - return true; - } - else - { - modules[0] = '\0'; - return false; - } + wcsncpy_s(modules, size, m_forcedmodulelist, _TRUNCATE); + return (m_options & VLD_OPT_MODULE_LIST_INCLUDE) > 0; } -void __stdcall VisualLeakDetector::GetReportFilename(WCHAR *filename) +void VisualLeakDetector::GetReportFilename(WCHAR *filename) { wcsncpy_s(filename, MAX_PATH, m_reportfilepath, _TRUNCATE); } -void __stdcall VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filename) +void VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filename) { m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits diff --git a/vld.h b/vld.h index ff8bca1a..1240cae6 100644 --- a/vld.h +++ b/vld.h @@ -190,29 +190,33 @@ __declspec(dllimport) void VLDGetReportFilename(WCHAR *filename); // __declspec(dllimport) void VLDSetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); -// VLDSetIncludeModules - Set list of modules included in leak detection. +// VLDSetModulesList - Set list of modules included/excluded in leak detection +// depending on parameter "includeModules". // -// modules: list of modules to be forcefully included in leak detection. +// modules: list of modules to be forcefully included/excluded in leak detection. +// +// includeModules: include or exclude that modules. // // Return Value: // // None. // -__declspec(dllimport) void VLDSetIncludeModules(CONST WCHAR *modules); +__declspec(dllimport) void VLDSetModulesList(CONST WCHAR *modules, BOOL includeModules); -// VLDGetIncludeModules - Return current list of included modules. +// VLDGetModulesList - Return current list of included/excluded modules +// depending on flag VLD_OPT_TRACE_INTERNAL_FRAMES. // -// modules: destination string for list of included modules (maximum length 512 characters). +// modules: destination string for list of included/excluded modules (maximum length 512 characters). // // size: maximum string size. // // Return Value: // -// None. +// BOOL: TRUE if include modules, otherwise FALSE. // -__declspec(dllimport) BOOL VLDGetIncludeModules(WCHAR *modules, UINT size); +__declspec(dllimport) BOOL VLDGetModulesList(WCHAR *modules, UINT size); -// VLDSetOptions - Update the report options via function call rather than INI file. +// VLDSetReportOptions - Update the report options via function call rather than INI file. // // Only the following flags are checked // VLD_OPT_REPORT_TO_DEBUGGER @@ -244,8 +248,8 @@ __declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR * #define VLDGetOptions() 0 #define VLDGetReportFilename(a) #define VLDSetOptions(a, b, c) -#define VLDSetIncludeModules(a) -#define VLDGetIncludeModules(a, b) FALSE +#define VLDSetModulesList(a) +#define VLDGetModulesList(a, b) FALSE #define VLDSetReportOptions(a, b) #endif // _DEBUG diff --git a/vld.ini b/vld.ini index 7d298f62..35d0d2c0 100644 --- a/vld.ini +++ b/vld.ini @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Visual Leak Detector - Initialization/Configuration File -;; Copyright (c) 2006 Dan Moulding +;; Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -55,7 +55,7 @@ AggregateDuplicates = no ; Valid Values: Any list containing module names (i.e. names of EXEs or DLLs). ; Default: None. ; -ForceIncludeModules = +ForceIncludeModules = d3d9.dll;dxgi.dll;d3d10.dll;d3d10_1.dll;d3d11.dll ; Maximum number of data bytes to display for each leaked block. If zero, then ; the data dump is completely suppressed and only call stacks are shown. diff --git a/vld_vs10.sln b/vld_vs10.sln index cc9375e7..4706373d 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -8,6 +8,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "testsuite\test {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bugtest", "bugtest\bugtest.vcxproj", "{90990D55-04C9-46AB-A638-CE07E33DB560}" +EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 5 @@ -52,6 +54,14 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Debug(Release)|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Debug(Release)|x64 + {90990D55-04C9-46AB-A638-CE07E33DB560}.Debug|Win32.ActiveCfg = Debug|Win32 + {90990D55-04C9-46AB-A638-CE07E33DB560}.Debug|Win32.Build.0 = Debug|Win32 + {90990D55-04C9-46AB-A638-CE07E33DB560}.Debug|x64.ActiveCfg = Debug|x64 + {90990D55-04C9-46AB-A638-CE07E33DB560}.Debug|x64.Build.0 = Debug|x64 + {90990D55-04C9-46AB-A638-CE07E33DB560}.Release|Win32.ActiveCfg = Release|Win32 + {90990D55-04C9-46AB-A638-CE07E33DB560}.Release|Win32.Build.0 = Release|Win32 + {90990D55-04C9-46AB-A638-CE07E33DB560}.Release|x64.ActiveCfg = Release|x64 + {90990D55-04C9-46AB-A638-CE07E33DB560}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vldapi.cpp b/vldapi.cpp index b533ebbb..17d70f5d 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -64,7 +64,7 @@ __declspec(dllexport) void VLDGlobalEnable () __declspec(dllexport) void VLDReportLeaks () { - vld.Reportleaks(); + vld.ReportLeaks(); } __declspec(dllexport) void VLDRefreshModules() @@ -97,14 +97,14 @@ __declspec(dllexport) void VLDSetOptions(UINT32 option_mask, SIZE_T maxDataDump, vld.SetOptions(option_mask, maxDataDump, maxTraceFrames); } -__declspec(dllexport) void VLDSetIncludeModules(CONST WCHAR *modules) +__declspec(dllexport) void VLDSetModulesList(CONST WCHAR *modules, BOOL includeModules) { - vld.SetIncludeModules(modules); + vld.SetModulesList(modules, includeModules); } -__declspec(dllexport) BOOL VLDGetIncludeModules(WCHAR *modules, UINT size) +__declspec(dllexport) BOOL VLDGetModulesList(WCHAR *modules, UINT size) { - return vld.GetIncludeModules(modules, size); + return vld.GetModulesList(modules, size); } __declspec(dllexport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR *filename) diff --git a/vldint.h b/vldint.h index 15777cba..ed79b184 100644 --- a/vldint.h +++ b/vldint.h @@ -210,21 +210,21 @@ class VisualLeakDetector : public IMalloc LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); ULONG __stdcall Release (); - void __stdcall DisableLeakDetection (); - void __stdcall EnableLeakDetection (); - void __stdcall RestoreLeakDetectionState (); - void __stdcall GlobalDisableLeakDetection (); - void __stdcall GlobalEnableLeakDetection (); - - VOID __stdcall Reportleaks(); - VOID __stdcall EnableModule(HMODULE module); - VOID __stdcall DisableModule(HMODULE module); - UINT32 __stdcall GetOptions(); - VOID __stdcall GetReportFilename(WCHAR *filename); - VOID __stdcall SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); - VOID __stdcall SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); - VOID __stdcall SetIncludeModules(CONST WCHAR *modules); - bool __stdcall GetIncludeModules(WCHAR *modules, UINT size); + void DisableLeakDetection (); + void EnableLeakDetection (); + void RestoreLeakDetectionState (); + void GlobalDisableLeakDetection (); + void GlobalEnableLeakDetection (); + + VOID ReportLeaks(); + VOID EnableModule(HMODULE module); + VOID DisableModule(HMODULE module); + UINT32 GetOptions(); + VOID GetReportFilename(WCHAR *filename); + VOID SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); + VOID SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); + VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); + bool GetModulesList(WCHAR *modules, UINT size); static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); @@ -315,11 +315,6 @@ class VisualLeakDetector : public IMalloc VOID __stdcall ChangeModuleState(HMODULE module,bool on); static _GetProcAddressType * m_original_GetProcAddress; - - // The Visual Leak Detector APIs are our friends. - friend __declspec(dllexport) void VLDDisable (); - friend __declspec(dllexport) void VLDEnable (); - friend __declspec(dllexport) void VLDRestore (); }; // Configuration option default values From 9c4f2405ba79c80225efce64f82947906b0f1679 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 6 Mar 2011 19:35:17 +0000 Subject: [PATCH 024/321] Minor fix git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64237 --- vld_vs10.sln | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/vld_vs10.sln b/vld_vs10.sln index 4706373d..cc9375e7 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -8,8 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "testsuite\test {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bugtest", "bugtest\bugtest.vcxproj", "{90990D55-04C9-46AB-A638-CE07E33DB560}" -EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 5 @@ -54,14 +52,6 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Debug(Release)|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Debug(Release)|x64 - {90990D55-04C9-46AB-A638-CE07E33DB560}.Debug|Win32.ActiveCfg = Debug|Win32 - {90990D55-04C9-46AB-A638-CE07E33DB560}.Debug|Win32.Build.0 = Debug|Win32 - {90990D55-04C9-46AB-A638-CE07E33DB560}.Debug|x64.ActiveCfg = Debug|x64 - {90990D55-04C9-46AB-A638-CE07E33DB560}.Debug|x64.Build.0 = Debug|x64 - {90990D55-04C9-46AB-A638-CE07E33DB560}.Release|Win32.ActiveCfg = Release|Win32 - {90990D55-04C9-46AB-A638-CE07E33DB560}.Release|Win32.Build.0 = Release|Win32 - {90990D55-04C9-46AB-A638-CE07E33DB560}.Release|x64.ActiveCfg = Release|x64 - {90990D55-04C9-46AB-A638-CE07E33DB560}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 13262f2d2938e015fd782c427b7755ea7016d52f Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 6 Mar 2011 20:36:55 +0000 Subject: [PATCH 025/321] CHANGES.txt updated git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64239 --- CHANGES.txt | 9 +++++---- callstack.cpp | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 1068f980..bd57a7c6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,15 +3,16 @@ Visual Leak Detector (VLD) Version 2.1 Change Log / Release Notes -2.1 (05 March 2011) +2.1 (06 March 2011) ---------------------------- Enhancements: + New functions added: VLDGlobalDisable, VLDGlobalEnable, VLDGetOptions, - VLDGetReportFilename, VLDSetOptions, VLDSetIncludeModules, - VLDGetIncludeModules (see vld.h). + VLDGetReportFilename, VLDSetOptions, VLDSetModulesList, + VLDGetModulesList (see vld.h). + Option VLD_OPT_SKIP_HEAPFREE_LEAKS added. + Hash for each leak added - + + Supported loading symbols from Visual Studio symbol cache directory + Bugs Fixed: + Improved LdrLoadDll hooking on Windows 7. + "HMODULE not founded" bug fixed. diff --git a/callstack.cpp b/callstack.cpp index 5db0cbfc..cd4f0c9f 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -241,7 +241,7 @@ VOID CallStack::dump (BOOL showinternalframes) const } else { functionname = L"(Function name unavailable)"; - displacement64 = 0; + displacement64 = 0; } LeaveCriticalSection(&symbollock); From b4e6e9361b0e10c47195f01929126b3c8b6ce015 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 7 Mar 2011 18:06:49 +0000 Subject: [PATCH 026/321] Function name now undecorated Module name to report added git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64283 --- callstack.cpp | 49 ++++++++++++++++++++++++++++++++++++++++++++----- callstack.h | 2 ++ vld.cpp | 29 +++++++++++++++++++++++++++-- vldint.h | 1 + 4 files changed, 74 insertions(+), 7 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index cd4f0c9f..0d0b5498 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -175,6 +175,24 @@ VOID CallStack::clear () m_topindex = 0; } +// GetCallingModule - Return calling module by address. +// +// Return Value: +// +// Module handle. +// +HMODULE CallStack::GetCallingModule( UINT_PTR pCaller ) const +{ + HMODULE hModule = NULL; + MEMORY_BASIC_INFORMATION mbi; + if ( VirtualQuery((LPCVOID)pCaller, &mbi, sizeof(MEMORY_BASIC_INFORMATION)) == sizeof(MEMORY_BASIC_INFORMATION) ) + { + // the allocation base is the beginning of a PE file + hModule = (HMODULE) mbi.AllocationBase; + } + return hModule; +} + // dump - Dumps a nicely formatted rendition of the CallStack, including // symbolic information (function names and line numbers) if available. // @@ -199,6 +217,9 @@ VOID CallStack::dump (BOOL showinternalframes) const UINT_PTR programcounter; IMAGEHLP_LINE64 sourceinfo = { 0 }; BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; + WCHAR undecoratedname [MAXSYMBOLNAMELENGTH]; + WCHAR callingmodulename [MAX_PATH]; + LPWSTR modulename; if (m_status & CALLSTACK_STATUS_INCOMPLETE) { // This call stack appears to be incomplete. Using StackWalk64 may be @@ -237,7 +258,11 @@ VOID CallStack::dump (BOOL showinternalframes) const // Try to get the name of the function containing this program // counter address. if (SymFromAddrW(currentprocess, programcounter, &displacement64, functioninfo)) { - functionname = functioninfo->Name; + // Undecorate function name. + if (UnDecorateSymbolName(functioninfo->Name, undecoratedname, MAXSYMBOLNAMELENGTH, UNDNAME_NAME_ONLY) > 0) + functionname = undecoratedname; + else + functionname = functioninfo->Name; } else { functionname = L"(Function name unavailable)"; @@ -245,19 +270,33 @@ VOID CallStack::dump (BOOL showinternalframes) const } LeaveCriticalSection(&symbollock); + HMODULE hCallingModule = GetCallingModule(programcounter); + modulename = L"(Module name unavailable)"; + if (hCallingModule && + GetModuleFileName(hCallingModule, callingmodulename, sizeof(callingmodulename)) > 0) + { + modulename = wcsrchr(callingmodulename, L'\\'); + if (modulename == NULL) + modulename = wcsrchr(callingmodulename, L'/'); + if (modulename != NULL) + modulename++; + else + modulename = callingmodulename; + } + // Display the current stack frame's information. if (foundline) { if (displacement == 0) - report(L" %s (%d): %s\n", sourceinfo.FileName, sourceinfo.LineNumber, functionname); + report(L" %s (%d): %s!%s\n", sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname); else - report(L" %s (%d): %s + 0x%X bytes\n", sourceinfo.FileName, sourceinfo.LineNumber, functionname, displacement); + report(L" %s (%d): %s!%s + 0x%X bytes\n", sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname, displacement); } else { report(L" " ADDRESSFORMAT L" (File and line number not available): ", (*this)[frame]); if (displacement64 == 0) - report(L"%s\n", functionname); + report(L"%s!%s\n", modulename, functionname); else - report(L"%s + 0x%X bytes\n", functionname, (DWORD)displacement64); + report(L"%s!%s + 0x%X bytes\n", modulename, functionname, (DWORD)displacement64); } } } diff --git a/callstack.h b/callstack.h index 5eedabb2..02ec8ae1 100644 --- a/callstack.h +++ b/callstack.h @@ -74,6 +74,8 @@ class CallStack UINT32 m_status; // Status flags: #define CALLSTACK_STATUS_INCOMPLETE 0x1 // If set, the stack trace stored in this CallStack appears to be incomplete. + HMODULE GetCallingModule(UINT_PTR pCaller) const; + private: // The chunk list is made of a linked list of Chunks. typedef struct chunk_s { diff --git a/vld.cpp b/vld.cpp index f034fa03..7e6a9aed 100644 --- a/vld.cpp +++ b/vld.cpp @@ -885,9 +885,9 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () regstatus = RegQueryValueEx(debuggerkey, L"SymbolCacheDir", NULL, &valuetype, (LPBYTE)&symbolCacheDir, &dirLength); if (regstatus == ERROR_SUCCESS && valuetype == REG_SZ) { - strapp(&path, L";cache*"); + strapp(&path, L";srv*"); strapp(&path, symbolCacheDir); - strapp(&path, L"\\MicrosoftPublicSymbols;cache*"); + strapp(&path, L"\\MicrosoftPublicSymbols;srv*"); strapp(&path, symbolCacheDir); } RegCloseKey(debuggerkey); @@ -2663,6 +2663,26 @@ BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) return excluded; } +// Find name of the module. +BOOL VisualLeakDetector::GetModuleName(UINT_PTR address, LPSTR modulepath, ULONG modulelength) +{ + BOOL succeded = FALSE; + moduleinfo_t moduleinfo; + ModuleSet::Iterator moduleit; + moduleinfo.addrhigh = address; + moduleinfo.addrlow = address; + EnterCriticalSection(&m_moduleslock); + moduleit = m_loadedmodules->find(moduleinfo); + if (moduleit != m_loadedmodules->end()) { + strncpy_s(modulepath, modulelength, (*moduleit).name, _TRUNCATE); + succeded = true; + } + else + modulepath[0] = '\0'; + LeaveCriticalSection(&m_moduleslock); + return succeded; +} + // _RtlReAllocateHeap - Calls to RtlReAllocateHeap are patched through to this // function. This function invokes the real RtlReAllocateHeap and then calls // VLD's reallocation tracking function. All arguments passed to this function @@ -3330,6 +3350,11 @@ void VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filen if (m_options & VLD_OPT_REPORT_TO_FILE) { SetupReporting(); } + else { + //Close the previous report file if needed. + if ( m_reportfile ) + fclose(m_reportfile); + } } void VisualLeakDetector::SetupReporting() diff --git a/vldint.h b/vldint.h index ed79b184..882f8960 100644 --- a/vldint.h +++ b/vldint.h @@ -253,6 +253,7 @@ class VisualLeakDetector : public IMalloc // Utils static BOOL IsModuleExcluded (UINT_PTR returnaddress); static void getcallstack( CallStack **&ppcallstack, context_t &context ); + BOOL GetModuleName(UINT_PTR address, LPSTR modulepath, ULONG modulelength); void SetupReporting(); //////////////////////////////////////////////////////////////////////////////// From f63a1ec8f22f04336664721e946ceb8f66cf6417 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 7 Mar 2011 18:11:03 +0000 Subject: [PATCH 027/321] Minor fix git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64285 --- vld.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vld.cpp b/vld.cpp index 7e6a9aed..8c50835e 100644 --- a/vld.cpp +++ b/vld.cpp @@ -3350,10 +3350,9 @@ void VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filen if (m_options & VLD_OPT_REPORT_TO_FILE) { SetupReporting(); } - else { - //Close the previous report file if needed. - if ( m_reportfile ) - fclose(m_reportfile); + else if ( m_reportfile ) { //Close the previous report file if needed. + fclose(m_reportfile); + m_reportfile = NULL; } } From 0b6ac02ee925ef5a446a84d17bee06a5022988eb Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 7 Mar 2011 19:07:28 +0000 Subject: [PATCH 028/321] Asserts added git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64288 --- crtmfcpatch.h | 13 ++++++++++++- mfc/vldmfc.cpp | 10 +++++----- mfc/vldmfcdlg.cpp | 16 ++++++++-------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 517f6650..cee850ae 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -134,6 +134,7 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, // This is the first call to this function. Link to the real // _calloc_dbg. msvcrxxd = GetModuleHandleW(crtddll); + assert(msvcrxxd != NULL); pcrtxxd__calloc_dbg = (_calloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_calloc_dbg"); } @@ -173,6 +174,7 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, // This is the first call to this function. Link to the real // _malloc_dbg. msvcrxxd = GetModuleHandleW(crtddll); + assert(msvcrxxd != NULL); pcrtxxd__malloc_dbg = (_malloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_malloc_dbg"); } @@ -215,6 +217,7 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, // This is the first call to this function. Link to the real // _realloc_dbg. msvcrxxd = GetModuleHandleW(crtddll); + assert(msvcrxxd != NULL); pcrtxxd__realloc_dbg = (_realloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_realloc_dbg"); } @@ -303,6 +306,7 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) if (pcrtxxd_calloc == NULL) { // This is the first call to this function. Link to the real malloc. msvcrxxd = GetModuleHandleW(crtddll); + assert(msvcrxxd != NULL); pcrtxxd_calloc = (calloc_t)vld._RGetProcAddress(msvcrxxd, "calloc"); } @@ -333,6 +337,7 @@ void* CrtMfcPatch::crtd_malloc (size_t size) if (pcrtxxd_malloc == NULL) { // This is the first call to this function. Link to the real malloc. msvcrxxd = GetModuleHandleW(crtddll); + assert(msvcrxxd != NULL); pcrtxxd_malloc = (malloc_t)vld._RGetProcAddress(msvcrxxd, "malloc"); } @@ -365,6 +370,7 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) if (pcrtxxd_realloc == NULL) { // This is the first call to this function. Link to the real realloc. msvcrxxd = GetModuleHandleW(crtddll); + assert(msvcrxxd != NULL); pcrtxxd_realloc = (realloc_t)vld._RGetProcAddress(msvcrxxd, "realloc"); } @@ -443,6 +449,7 @@ void* CrtMfcPatch::crtd_new_dbg (context_t& context, // This is the first call to this function. Link to the real CRT debug // new operator. msvcrxxd = GetModuleHandleW(crtddll); + assert(msvcrxxd != NULL); pcrtxxd_new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(msvcrxxd, procname); } @@ -474,6 +481,7 @@ void* CrtMfcPatch::crtd_new (context_t& context, size_t size) // This is the first call to this function. Link to the real CRT new // operator. msvcrxxd = GetModuleHandleW(crtddll); + assert(msvcrxxd != NULL); pcrtxxd_scalar_new = (new_t)vld._RGetProcAddress(msvcrxxd, procname); } @@ -816,6 +824,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, // This is the first call to this function. Link to the real MFC debug // new operator. mfcxxd = GetModuleHandleW(mfcdll); + assert(mfcxxd != NULL); pmfcxxd__new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } @@ -857,6 +866,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, // This is the first call to this function. Link to the real MFC debug // new operator. mfcxxd = GetModuleHandleW(mfcdll); + assert(mfcxxd != NULL); pmfcxxd__new_dbg = (new_dbg_mfc_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } @@ -888,6 +898,7 @@ void* CrtMfcPatch::mfcd_new (context_t& context, size_t size) // This is the first call to this function. Link to the real CRT new // operator. mfcxxd = GetModuleHandleW(mfcdll); + assert(mfcxxd != NULL); pmfcxxd_new = (new_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } @@ -981,7 +992,7 @@ typedef CrtMfcPatch #endif VS90; -// Visual Studio 2011 +// Visual Studio 2010 typedef CrtMfcPatch Date: Mon, 7 Mar 2011 20:19:07 +0000 Subject: [PATCH 029/321] SkipHeapFreeLeaks added to ini file git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64293 --- vld.ini | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/vld.ini b/vld.ini index 35d0d2c0..d565b30f 100644 --- a/vld.ini +++ b/vld.ini @@ -52,10 +52,11 @@ AggregateDuplicates = no ; Only modules that link with the debug CRT libraries should be listed here. ; Doing otherwise might result in false memory leak reports or even crashes. ; -; Valid Values: Any list containing module names (i.e. names of EXEs or DLLs). +; Valid Values: Any list containing module names (i.e. names of EXEs or DLLs), +; for example, d3d9.dll;dxgi.dll;d3d10.dll;d3d10_1.dll;d3d11.dll ; Default: None. ; -ForceIncludeModules = d3d9.dll;dxgi.dll;d3d10.dll;d3d10_1.dll;d3d11.dll +ForceIncludeModules = ; Maximum number of data bytes to display for each leaked block. If zero, then ; the data dump is completely suppressed and only call stacks are shown. @@ -153,3 +154,10 @@ StartDisabled = no ; Default: no ; TraceInternalFrames = no + +; Determines whether or not report memory leaks when missing HeapFree calls. +; +; Valid Values: yes, no +; Default: no +; +SkipHeapFreeLeaks = no From 19aacf6e02c526c3614a8ac5067d4f2758d061a5 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 7 Mar 2011 22:51:06 +0000 Subject: [PATCH 030/321] Crashes fixed when VLD off. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64301 --- vld.cpp | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- vldint.h | 3 +-- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/vld.cpp b/vld.cpp index 8c50835e..fb9f86c8 100644 --- a/vld.cpp +++ b/vld.cpp @@ -2493,11 +2493,16 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod return status; } -NTSTATUS VisualLeakDetector::RefreshModules() +VOID VisualLeakDetector::RefreshModules() { ModuleSet::Iterator moduleit; ModuleSet *newmodules; ModuleSet *oldmodules; + + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } EnterCriticalSection(&vld.m_loaderlock); @@ -2524,9 +2529,8 @@ NTSTATUS VisualLeakDetector::RefreshModules() delete oldmodules; LeaveCriticalSection(&vld.m_loaderlock); - - return STATUS_SUCCESS; } + void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &context_ ) { CallStack *callstack; @@ -3147,6 +3151,11 @@ ULONG VisualLeakDetector::Release () VOID VisualLeakDetector::ReportLeaks( ) { + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + HeapMap::Iterator heapit; HANDLE heap; @@ -3183,11 +3192,21 @@ void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) void VisualLeakDetector::EnableModule(HMODULE module) { + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + ChangeModuleState(module,true); } void VisualLeakDetector::DisableModule(HMODULE module) { + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + ChangeModuleState(module,false); } @@ -3290,6 +3309,11 @@ UINT32 VisualLeakDetector::GetOptions() void VisualLeakDetector::SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames) { + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + m_options &= ~OptionsMask; // clear used bits m_options |= option_mask & OptionsMask; @@ -3306,6 +3330,11 @@ void VisualLeakDetector::SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT void VisualLeakDetector::SetModulesList(CONST WCHAR *modules, BOOL includeModules) { + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + wcsncpy_s(m_forcedmodulelist, MAXMODULELISTLENGTH, modules, _TRUNCATE); _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); if (includeModules) @@ -3316,17 +3345,34 @@ void VisualLeakDetector::SetModulesList(CONST WCHAR *modules, BOOL includeModule bool VisualLeakDetector::GetModulesList(WCHAR *modules, UINT size) { + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + modules[0] = '\0'; + return true; + } + wcsncpy_s(modules, size, m_forcedmodulelist, _TRUNCATE); return (m_options & VLD_OPT_MODULE_LIST_INCLUDE) > 0; } void VisualLeakDetector::GetReportFilename(WCHAR *filename) { + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + m_reportfilepath[0] = '\0'; + return; + } + wcsncpy_s(filename, MAX_PATH, m_reportfilepath, _TRUNCATE); } void VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filename) { + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits diff --git a/vldint.h b/vldint.h index 882f8960..0e07058b 100644 --- a/vldint.h +++ b/vldint.h @@ -173,8 +173,6 @@ class VisualLeakDetector : public IMalloc VisualLeakDetector(); ~VisualLeakDetector(); - NTSTATUS RefreshModules(); - //////////////////////////////////////////////////////////////////////////////// // Public CRT and MFC Common Handlers // @@ -216,6 +214,7 @@ class VisualLeakDetector : public IMalloc void GlobalDisableLeakDetection (); void GlobalEnableLeakDetection (); + VOID RefreshModules(); VOID ReportLeaks(); VOID EnableModule(HMODULE module); VOID DisableModule(HMODULE module); From e497e7e0bfb9a370797f5cdc80668e9774dcdb66 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Thu, 10 Mar 2011 20:51:13 +0000 Subject: [PATCH 031/321] vlddelete bug fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64402 --- vldheap.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vldheap.cpp b/vldheap.cpp index 60409a2e..2913d28e 100644 --- a/vldheap.cpp +++ b/vldheap.cpp @@ -142,6 +142,9 @@ void* operator new [] (size_t size, const char *file, int line) // void vlddelete (void *block) { + if (block == NULL) + return; + BOOL freed; vldblockheader_t *header = VLDBLOCKHEADER((LPVOID)block); From 204d9da0224cc35005e1c6a9fb5bd6e0fce04dae Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 11 Mar 2011 00:29:50 +0000 Subject: [PATCH 032/321] GetProcAddress hook improved on Win7 Minor code refactoring git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld;C64421 --- utility.cpp | 189 ++++++++++++++++++++++++++-------------------------- vld.cpp | 184 ++++++++++++++++++++++++++++---------------------- vldheap.cpp | 4 +- vldint.h | 1 + 4 files changed, 204 insertions(+), 174 deletions(-) diff --git a/utility.cpp b/utility.cpp index 3490bbe9..5ec46494 100644 --- a/utility.cpp +++ b/utility.cpp @@ -193,49 +193,40 @@ VOID dumpmemoryw (LPCVOID address, SIZE_T size) } } -// findimport - Determines if the specified module imports the named import +// findoriginalimportdescriptor - Determines if the specified module imports the named import // from the named exporting module. // // - importmodule (IN): Handle (base address) of the module to be searched to // see if it imports the specified import. // -// - exportmodule (IN): Handle (base address) of the module that exports the -// import to be searched for. -// // - exportmodulename (IN): ANSI string containing the name of the module that // exports the import to be searched for. // -// - importname (IN): ANSI string containing the name of the import to search -// for. May be an integer cast to a string if the import is exported by -// ordinal. -// // Return Value: // -// Returns TRUE if the module imports to the specified import. Otherwise -// returns FALSE. +// Returns pointer to descriptor. // -BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname) +IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPCSTR exportmodulename) { - IMAGE_THUNK_DATA *iate; IMAGE_IMPORT_DESCRIPTOR *idte; - FARPROC import; IMAGE_SECTION_HEADER *section; ULONG size; - + // Locate the importing module's Import Directory Table (IDT) entry for the // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. EnterCriticalSection(&imagelock); idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); LeaveCriticalSection(&imagelock); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). - return FALSE; + return NULL; } while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { + PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); + if (_stricmp(name, exportmodulename) == 0) { // Found the IDT entry for the exporting module. break; } @@ -244,8 +235,41 @@ BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodule if (idte->OriginalFirstThunk == 0x0) { // The importing module does not import anything from the exporting // module. - return FALSE; + return NULL; } + return idte; +} + +// findimport - Determines if the specified module imports the named import +// from the named exporting module. +// +// - importmodule (IN): Handle (base address) of the module to be searched to +// see if it imports the specified import. +// +// - exportmodule (IN): Handle (base address) of the module that exports the +// import to be searched for. +// +// - exportmodulename (IN): ANSI string containing the name of the module that +// exports the import to be searched for. +// +// - importname (IN): ANSI string containing the name of the import to search +// for. May be an integer cast to a string if the import is exported by +// ordinal. +// +// Return Value: +// +// Returns TRUE if the module imports to the specified import. Otherwise +// returns FALSE. +// +BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname) +{ + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_THUNK_DATA *iate; + FARPROC import; + + idte = findoriginalimportdescriptor(importmodule, exportmodulename); + if (idte == NULL) + return FALSE; // Get the *real* address of the import. If we find this address in the IAT, // then we've found that the module does import the named import. @@ -287,33 +311,10 @@ BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodule BOOL findpatch (HMODULE importmodule, moduleentry_t *module) { IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return FALSE; - } - while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), module->exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. + idte = findoriginalimportdescriptor(importmodule, module->exportmodulename); + if (idte == NULL) return FALSE; - } int i = 0; patchentry_t *entry = module->patchtable; @@ -391,6 +392,53 @@ BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT ta return FALSE; } +// findimportdescriptor - Determines if the specified module imports the named import +// from the named exporting module. +// +// - importmodule (IN): Handle (base address) of the module to be searched to +// see if it imports the specified import. +// +// - exportmodulename (IN): ANSI string containing the name of the module that +// exports the import to be searched for. +// +// Return Value: +// +// Returns pointer to descriptor. +// +IMAGE_IMPORT_DESCRIPTOR* findimportdescriptor (HMODULE importmodule, LPCSTR exportmodulename) +{ + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return NULL; + } + while (idte->FirstThunk != 0x0) { + PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); + if (_stricmp(name, exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->FirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return NULL; + } + return idte; +} + // patchimport - Patches all future calls to an imported function, or references // to an imported variable, through to a replacement function or variable. // Patching is done by replacing the import's address in the specified target @@ -426,35 +474,11 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) DWORD result = 0; HMODULE exportmodule = (HMODULE)module->modulebase; LPCSTR exportmodulename = module->exportmodulename; - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return FALSE; - } - while (idte->FirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->FirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. + idte = findimportdescriptor(importmodule, exportmodulename); + if (idte == NULL) return FALSE; - } patchentry_t *entry = module->patchtable; int i = 0; @@ -631,36 +655,13 @@ VOID report (LPCWSTR format, ...) VOID restoreimport (HMODULE importmodule, moduleentry_t* module) { IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; HMODULE exportmodule = (HMODULE)module->modulebase; LPCSTR exportmodulename = module->exportmodulename; - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). + idte = findoriginalimportdescriptor(importmodule, exportmodulename); + if (idte == NULL) return; - } - while (idte->OriginalFirstThunk != 0x0) { - if (_stricmp((PCHAR)R2VA(importmodule, idte->Name), exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return; - } int i = 0; patchentry_t *entry = module->patchtable; diff --git a/vld.cpp b/vld.cpp index fb9f86c8..ae51bd6f 100644 --- a/vld.cpp +++ b/vld.cpp @@ -66,8 +66,12 @@ __declspec(dllexport) VisualLeakDetector vld; // The import patch table: lists the heap-related API imports that VLD patches // through to replacement functions provided by VLD. Having this table simply // makes it more convenient to add additional IAT patches. -patchentry_t VisualLeakDetector::m_kernel32Patch [] = { +patchentry_t VisualLeakDetector::m_kernelbasePatch [] = { "GetProcAddress", _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. + NULL, NULL +}; + +patchentry_t VisualLeakDetector::m_kernel32Patch [] = { "HeapAlloc", _RtlAllocateHeap, "HeapCreate", _HeapCreate, "HeapDestroy", _HeapDestroy, @@ -76,127 +80,128 @@ patchentry_t VisualLeakDetector::m_kernel32Patch [] = { NULL, NULL }; +#define ORDINAL(x) (LPCSTR)x #if !defined(_M_X64) -#define ORDINAL(x86, x64) (LPCSTR)x86 +#define ORDINAL2(x86, x64) (LPCSTR)x86 #else -#define ORDINAL(x86, x64) (LPCSTR)x64 +#define ORDINAL2(x86, x64) (LPCSTR)x64 #endif VisualLeakDetector::_GetProcAddressType *VisualLeakDetector::m_original_GetProcAddress = NULL; static patchentry_t mfc42dPatch [] = { // XXX why are the vector new operators missing for mfc42d.dll? - (LPCSTR)711, VS60::mfcd_scalar_new, - (LPCSTR)712, VS60::mfcd__scalar_new_dbg_4p, - (LPCSTR)714, VS60::mfcd__scalar_new_dbg_3p, + ORDINAL(711), VS60::mfcd_scalar_new, + ORDINAL(712), VS60::mfcd__scalar_new_dbg_4p, + ORDINAL(714), VS60::mfcd__scalar_new_dbg_3p, NULL, NULL }; static patchentry_t mfc42udPatch [] = { // XXX why are the vector new operators missing for mfc42ud.dll? - (LPCSTR)711, VS60::mfcud_scalar_new, - (LPCSTR)712, VS60::mfcud__scalar_new_dbg_4p, - (LPCSTR)714, VS60::mfcud__scalar_new_dbg_3p, + ORDINAL(711), VS60::mfcud_scalar_new, + ORDINAL(712), VS60::mfcud__scalar_new_dbg_4p, + ORDINAL(714), VS60::mfcud__scalar_new_dbg_3p, NULL, NULL }; static patchentry_t mfc70dPatch [] = { - (LPCSTR)257, VS70::mfcd_vector_new, - (LPCSTR)258, VS70::mfcd__vector_new_dbg_4p, - (LPCSTR)259, VS70::mfcd__vector_new_dbg_3p, - (LPCSTR)832, VS70::mfcd_scalar_new, - (LPCSTR)833, VS70::mfcd__scalar_new_dbg_4p, - (LPCSTR)834, VS70::mfcd__scalar_new_dbg_3p, + ORDINAL(257), VS70::mfcd_vector_new, + ORDINAL(258), VS70::mfcd__vector_new_dbg_4p, + ORDINAL(259), VS70::mfcd__vector_new_dbg_3p, + ORDINAL(832), VS70::mfcd_scalar_new, + ORDINAL(833), VS70::mfcd__scalar_new_dbg_4p, + ORDINAL(834), VS70::mfcd__scalar_new_dbg_3p, NULL, NULL }; static patchentry_t mfc70udPatch [] = { - (LPCSTR)258, VS70::mfcud_vector_new, - (LPCSTR)259, VS70::mfcud__vector_new_dbg_4p, - (LPCSTR)260, VS70::mfcud__vector_new_dbg_3p, - (LPCSTR)833, VS70::mfcud_scalar_new, - (LPCSTR)834, VS70::mfcud__scalar_new_dbg_4p, - (LPCSTR)835, VS70::mfcud__scalar_new_dbg_3p, + ORDINAL(258), VS70::mfcud_vector_new, + ORDINAL(259), VS70::mfcud__vector_new_dbg_4p, + ORDINAL(260), VS70::mfcud__vector_new_dbg_3p, + ORDINAL(833), VS70::mfcud_scalar_new, + ORDINAL(834), VS70::mfcud__scalar_new_dbg_4p, + ORDINAL(835), VS70::mfcud__scalar_new_dbg_3p, NULL, NULL }; static patchentry_t mfc71dPatch [] = { - (LPCSTR)267, VS71::mfcd_vector_new, - (LPCSTR)268, VS71::mfcd__vector_new_dbg_4p, - (LPCSTR)269, VS71::mfcd__vector_new_dbg_3p, - (LPCSTR)893, VS71::mfcd_scalar_new, - (LPCSTR)894, VS71::mfcd__scalar_new_dbg_4p, - (LPCSTR)895, VS71::mfcd__scalar_new_dbg_3p, + ORDINAL(267), VS71::mfcd_vector_new, + ORDINAL(268), VS71::mfcd__vector_new_dbg_4p, + ORDINAL(269), VS71::mfcd__vector_new_dbg_3p, + ORDINAL(893), VS71::mfcd_scalar_new, + ORDINAL(894), VS71::mfcd__scalar_new_dbg_4p, + ORDINAL(895), VS71::mfcd__scalar_new_dbg_3p, NULL, NULL }; static patchentry_t mfc71udPatch [] = { - (LPCSTR)267, VS71::mfcud_vector_new, - (LPCSTR)268, VS71::mfcud__vector_new_dbg_4p, - (LPCSTR)269, VS71::mfcud__vector_new_dbg_3p, - (LPCSTR)893, VS71::mfcud_scalar_new, - (LPCSTR)894, VS71::mfcud__scalar_new_dbg_4p, - (LPCSTR)895, VS71::mfcud__scalar_new_dbg_3p, + ORDINAL(267), VS71::mfcud_vector_new, + ORDINAL(268), VS71::mfcud__vector_new_dbg_4p, + ORDINAL(269), VS71::mfcud__vector_new_dbg_3p, + ORDINAL(893), VS71::mfcud_scalar_new, + ORDINAL(894), VS71::mfcud__scalar_new_dbg_4p, + ORDINAL(895), VS71::mfcud__scalar_new_dbg_3p, NULL, NULL }; static patchentry_t mfc80dPatch [] = { - (LPCSTR)267, VS80::mfcd_vector_new, - (LPCSTR)268, VS80::mfcd__vector_new_dbg_4p, - (LPCSTR)269, VS80::mfcd__vector_new_dbg_3p, - ORDINAL(893,907), VS80::mfcd_scalar_new, - ORDINAL(894,908), VS80::mfcd__scalar_new_dbg_4p, - ORDINAL(895,909), VS80::mfcd__scalar_new_dbg_3p, + ORDINAL(267), VS80::mfcd_vector_new, + ORDINAL(268), VS80::mfcd__vector_new_dbg_4p, + ORDINAL(269), VS80::mfcd__vector_new_dbg_3p, + ORDINAL2(893,907), VS80::mfcd_scalar_new, + ORDINAL2(894,908), VS80::mfcd__scalar_new_dbg_4p, + ORDINAL2(895,909), VS80::mfcd__scalar_new_dbg_3p, NULL, NULL }; static patchentry_t mfc80udPatch [] = { - (LPCSTR)267, VS80::mfcud_vector_new, - (LPCSTR)268, VS80::mfcud__vector_new_dbg_4p, - (LPCSTR)269, VS80::mfcud__vector_new_dbg_3p, - ORDINAL(893,907), VS80::mfcud_scalar_new, - ORDINAL(894,908), VS80::mfcud__scalar_new_dbg_4p, - ORDINAL(895,909), VS80::mfcud__scalar_new_dbg_3p, + ORDINAL(267), VS80::mfcud_vector_new, + ORDINAL(268), VS80::mfcud__vector_new_dbg_4p, + ORDINAL(269), VS80::mfcud__vector_new_dbg_3p, + ORDINAL2(893,907), VS80::mfcud_scalar_new, + ORDINAL2(894,908), VS80::mfcud__scalar_new_dbg_4p, + ORDINAL2(895,909), VS80::mfcud__scalar_new_dbg_3p, NULL, NULL }; static patchentry_t mfc90dPatch [] = { - (LPCSTR)267, VS90::mfcd_vector_new, - (LPCSTR)268, VS90::mfcd__vector_new_dbg_4p, - (LPCSTR)269, VS90::mfcd__vector_new_dbg_3p, - ORDINAL(931, 909), VS90::mfcd_scalar_new, - ORDINAL(932, 910), VS90::mfcd__scalar_new_dbg_4p, - ORDINAL(933, 911), VS90::mfcd__scalar_new_dbg_3p, + ORDINAL(267), VS90::mfcd_vector_new, + ORDINAL(268), VS90::mfcd__vector_new_dbg_4p, + ORDINAL(269), VS90::mfcd__vector_new_dbg_3p, + ORDINAL2(931, 909), VS90::mfcd_scalar_new, + ORDINAL2(932, 910), VS90::mfcd__scalar_new_dbg_4p, + ORDINAL2(933, 911), VS90::mfcd__scalar_new_dbg_3p, NULL, NULL }; static patchentry_t mfc90udPatch [] = { - (LPCSTR)267, VS90::mfcud_vector_new, - (LPCSTR)268, VS90::mfcud__vector_new_dbg_4p, - (LPCSTR)269, VS90::mfcud__vector_new_dbg_3p, - ORDINAL(935, 913), VS90::mfcud_scalar_new, - ORDINAL(936, 914), VS90::mfcud__scalar_new_dbg_4p, - ORDINAL(937, 915), VS90::mfcud__scalar_new_dbg_3p, + ORDINAL(267), VS90::mfcud_vector_new, + ORDINAL(268), VS90::mfcud__vector_new_dbg_4p, + ORDINAL(269), VS90::mfcud__vector_new_dbg_3p, + ORDINAL2(935, 913), VS90::mfcud_scalar_new, + ORDINAL2(936, 914), VS90::mfcud__scalar_new_dbg_4p, + ORDINAL2(937, 915), VS90::mfcud__scalar_new_dbg_3p, NULL, NULL }; static patchentry_t mfc100dPatch [] = { - (LPCSTR)267, VS100::mfcd_vector_new, - (LPCSTR)268, VS100::mfcd__vector_new_dbg_4p, - (LPCSTR)269, VS100::mfcd__vector_new_dbg_3p, - ORDINAL(1427, 1405), VS100::mfcd_scalar_new, - ORDINAL(1428, 1406), VS100::mfcd__scalar_new_dbg_4p, - ORDINAL(1429, 1407), VS100::mfcd__scalar_new_dbg_3p, + ORDINAL(267), VS100::mfcd_vector_new, + ORDINAL(268), VS100::mfcd__vector_new_dbg_4p, + ORDINAL(269), VS100::mfcd__vector_new_dbg_3p, + ORDINAL2(1427, 1405), VS100::mfcd_scalar_new, + ORDINAL2(1428, 1406), VS100::mfcd__scalar_new_dbg_4p, + ORDINAL2(1429, 1407), VS100::mfcd__scalar_new_dbg_3p, NULL, NULL }; static patchentry_t mfc100udPatch [] = { - (LPCSTR)267, VS100::mfcud_vector_new, - (LPCSTR)268, VS100::mfcud__vector_new_dbg_4p, - (LPCSTR)269, VS100::mfcud__vector_new_dbg_3p, - ORDINAL(1434, 1412), VS100::mfcud_scalar_new, - ORDINAL(1435, 1413), VS100::mfcud__scalar_new_dbg_4p, - ORDINAL(1436, 1414), VS100::mfcud__scalar_new_dbg_3p, + ORDINAL(267), VS100::mfcud_vector_new, + ORDINAL(268), VS100::mfcud__vector_new_dbg_4p, + ORDINAL(269), VS100::mfcud__vector_new_dbg_3p, + ORDINAL2(1434, 1412), VS100::mfcud_scalar_new, + ORDINAL2(1435, 1413), VS100::mfcud__scalar_new_dbg_4p, + ORDINAL2(1436, 1414), VS100::mfcud__scalar_new_dbg_3p, NULL, NULL }; @@ -300,6 +305,7 @@ patchentry_t VisualLeakDetector::m_ole32Patch [] = { moduleentry_t VisualLeakDetector::m_patchtable [] = { // Win32 heap APIs. + "kernel32.dll", 0x0, m_kernelbasePatch, // we patch this record on Win7 "kernel32.dll", 0x0, m_kernel32Patch, // MFC new operators (exported by ordinal). @@ -313,8 +319,8 @@ moduleentry_t VisualLeakDetector::m_patchtable [] = { "mfc80ud.dll", 0x0, mfc80udPatch, "mfc90d.dll", 0x0, mfc90dPatch, "mfc90ud.dll", 0x0, mfc90udPatch, - "mfc100d.dll", 0x0, mfc100dPatch, - "mfc100ud.dll", 0x0, mfc100udPatch, + "mfc100d.dll", 0x0, mfc100dPatch, + "mfc100ud.dll", 0x0, mfc100udPatch, // CRT new operators and heap APIs. "msvcrtd.dll", 0x0, msvcrtdPatch, @@ -322,22 +328,36 @@ moduleentry_t VisualLeakDetector::m_patchtable [] = { "msvcr71d.dll", 0x0, msvcr71dPatch, "msvcr80d.dll", 0x0, msvcr80dPatch, "msvcr90d.dll", 0x0, msvcr90dPatch, - "msvcr100d.dll", 0x0, msvcr100dPatch, + "msvcr100d.dll",0x0, msvcr100dPatch, // NT APIs. - "ntdll.dll", 0x0, m_ntdllPatch, + "ntdll.dll", 0x0, m_ntdllPatch, // COM heap APIs. - "ole32.dll", 0x0, m_ole32Patch + "ole32.dll", 0x0, m_ole32Patch }; +BOOL IsWin7OrBetter() +{ + OSVERSIONINFOEX info = { sizeof(OSVERSIONINFOEX) }; + GetVersionEx((LPOSVERSIONINFO)&info); + if (info.dwMajorVersion > 6) + return TRUE; + + if (info.dwMajorVersion == 6 && info.dwMinorVersion >= 1) + return TRUE; + + return FALSE; +} + // Constructor - Initializes private data, loads configuration options, and // attaches Visual Leak Detector to all other modules loaded into the current // process. // VisualLeakDetector::VisualLeakDetector () { - HMODULE kernel32, kernelBase; + HMODULE kernel32; + HMODULE kernelBase; ModuleSet *newmodules; HMODULE ntdll; LPWSTR symbolpath; @@ -362,7 +382,15 @@ VisualLeakDetector::VisualLeakDetector () kernelBase = GetModuleHandleW(L"KernelBase.dll"); ntdll = GetModuleHandleW(L"ntdll.dll"); - m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); + if (!IsWin7OrBetter()) // kernel32.dll + m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); + else + { + assert(m_patchtable[0].patchtable == m_kernelbasePatch); + m_patchtable[0].exportmodulename = "kernelbase.dll"; + m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernelBase,"GetProcAddress"); + } + // Initialize global variables. currentprocess = GetCurrentProcess(); currentthread = GetCurrentThread(); @@ -2319,7 +2347,7 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) if ((SIZE_T)patchentry->importname < (SIZE_T)vld.m_vldbase) { // This entry's import name is not a valid pointer to data in // vld.dll. It must be an ordinal value. - if ((UINT)patchentry->importname == (UINT)procname) { + if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { return (FARPROC)patchentry->replacement; } } @@ -2332,7 +2360,7 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) } __except(EXCEPTION_EXECUTE_HANDLER) { - if ((UINT)patchentry->importname == (UINT)procname) { + if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { return (FARPROC)patchentry->replacement; } } diff --git a/vldheap.cpp b/vldheap.cpp index 2913d28e..730f7231 100644 --- a/vldheap.cpp +++ b/vldheap.cpp @@ -168,10 +168,10 @@ void vlddelete (void *block) } // vldnew - Local helper function that actually allocates memory from VLD's -// private heap. Prepends a header, which is used for bookeeping information +// private heap. Prepends a header, which is used for bookkeeping information // that allows VLD to detect and report internal memory leaks, to the returned // block, but the header is transparent to the caller because the returned -// pointer points to the useable section of memory requested by the caller, it +// pointer points to the usable section of memory requested by the caller, it // does not point to the block header. // // - size (IN): Size of the memory block to be allocated. diff --git a/vldint.h b/vldint.h index 0e07058b..800f0a43 100644 --- a/vldint.h +++ b/vldint.h @@ -293,6 +293,7 @@ class VisualLeakDetector : public IMalloc CRITICAL_SECTION m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. UINT32 m_options; // Configuration options: + static patchentry_t m_kernelbasePatch []; static patchentry_t m_kernel32Patch []; static patchentry_t m_ntdllPatch []; static patchentry_t m_ole32Patch []; From a556eea42ffa331ec05becaf0f4b0cff91ca1f03 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 19 Mar 2011 18:19:05 +0000 Subject: [PATCH 033/321] This fixes a bunch of things 1. Mainly enabling call stacks to get resolved early, before application exit. This is used to solve bug 8211 (See that for description of the problem). 2. There were a host of other things that I fixed, or made a bit more stable, for example, checking pointers before they are used, etc... Path by chrisJohnson git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C64711 --- callstack.cpp | 178 +++++++++++++++++++++------ callstack.h | 93 +++++++++----- utility.cpp | 67 ++++++++-- utility.h | 3 + vld.cpp | 324 +++++++++++++++++++++++++++++------------------- vldapi.cpp | 5 + vldint.h | 333 +++++++++++++++++++++++++------------------------- 7 files changed, 629 insertions(+), 374 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 0d0b5498..a7b1184d 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -47,6 +47,7 @@ CallStack::CallStack () m_store.next = NULL; m_topchunk = &m_store; m_topindex = 0; + m_Resolved = NULL; } // Copy Constructor - For efficiency, we want to avoid ever making copies of @@ -72,6 +73,18 @@ CallStack::~CallStack () chunk = temp->next; delete temp; } + + if (m_Resolved) + { + for (UINT32 frame = 0; frame < m_size; frame++) + { + delete m_Resolved[frame]; + m_Resolved[frame] = NULL; + } + delete [] m_Resolved; + } + + m_Resolved = NULL; } // operator = - Assignment operator. For efficiency, we want to avoid ever @@ -193,9 +206,17 @@ HMODULE CallStack::GetCallingModule( UINT_PTR pCaller ) const return hModule; } + + + // dump - Dumps a nicely formatted rendition of the CallStack, including // symbolic information (function names and line numbers) if available. -// +// Had to get rid of the const qualifier because calling resolve can modify +// a member variable. This is a result of the combined duties of CallStack::resolve +// which can both dump or save the formatted stack info. Otherwise there would +// be nearly identical code in both methods, which is worse than removing a mere +// const qualifier + // Note: The symbol handler must be initialized prior to calling this // function. // @@ -206,42 +227,82 @@ HMODULE CallStack::GetCallingModule( UINT_PTR pCaller ) const // // None. // -VOID CallStack::dump (BOOL showinternalframes) const +VOID CallStack::dump (BOOL showinternalframes) { - DWORD displacement; - DWORD64 displacement64; - BOOL foundline; - UINT32 frame; - SYMBOL_INFO *functioninfo; - LPWSTR functionname; - UINT_PTR programcounter; - IMAGEHLP_LINE64 sourceinfo = { 0 }; - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; - WCHAR undecoratedname [MAXSYMBOLNAMELENGTH]; - WCHAR callingmodulename [MAX_PATH]; - LPWSTR modulename; + // The stack was dumped already + if (m_Resolved) + { + DumpResolved(); + return; + } + + resolve(showinternalframes, FALSE); +} +void CallStack::Resolve(BOOL showinternalframes) +{ + if (m_Resolved != NULL) + { + resolve(showinternalframes, TRUE); + } +} + +// Resolve - Creates a nicely formatted rendition of the CallStack, including +// symbolic information (function names and line numbers) if available. and +// saves it for later retrieval. This is almost identical to Callstack::dump above. +// +// Note: The symbol handler must be initialized prior to calling this +// function. +// +// - showinternalframes (IN): If true, then all frames in the CallStack will be +// dumped. Otherwise, frames internal to the heap will not be dumped. +// +// - ResolveOnly (IN): If true, it does not print the results out to the standard +// outputs, but saves the formatted rendition for later retrieval. +// +// Return Value: +// +// None. +// +void CallStack::resolve(BOOL showinternalframes, BOOL ResolveOnly) +{ if (m_status & CALLSTACK_STATUS_INCOMPLETE) { // This call stack appears to be incomplete. Using StackWalk64 may be // more reliable. report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" - L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" - L" complete stack trace.\n"); + L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" + L" complete stack trace.\n"); } - // Initialize structures passed to the symbol handler. - functioninfo = (SYMBOL_INFO*)&symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + IMAGEHLP_LINE64 sourceinfo = { 0 }; sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + if (ResolveOnly) + { + m_Resolved = new WCHAR*[m_size]; + ZeroMemory(m_Resolved, sizeof(WCHAR*) * m_size); + } + + const UINT32 symbolBufSize = sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1; + BYTE symbolbuffer [symbolBufSize] = { 0 }; + // Use static here to increase performance, and avoid heap allocs. Hopefully this won't + // prove to be an issue in thread safety. If it does, it will have to be simply non-static. + static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; + WCHAR undecoratedname [MAXSYMBOLNAMELENGTH]; + WCHAR callingmodulename [MAX_PATH]; + // Iterate through each frame in the call stack. - for (frame = 0; frame < m_size; frame++) { + for (UINT32 frame = 0; frame < m_size; frame++) + { // Try to get the source file and line number associated with // this program counter address. - programcounter = (*this)[frame]; + SIZE_T programcounter = (*this)[frame]; EnterCriticalSection(&symbollock); - if ((foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo)) == TRUE) { + BOOL foundline = FALSE; + DWORD displacement = 0; + foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo); + if (foundline) + { if (!showinternalframes) { _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); if (wcsstr(sourceinfo.FileName, L"afxmem.cpp") || @@ -249,14 +310,23 @@ VOID CallStack::dump (BOOL showinternalframes) const wcsstr(sourceinfo.FileName, L"malloc.c") || wcsstr(sourceinfo.FileName, L"new.cpp") || wcsstr(sourceinfo.FileName, L"newaop.cpp")) { - // Don't show frames in files internal to the heap. - continue; + // Don't show frames in files internal to the heap. + LeaveCriticalSection(&symbollock); + continue; + } } } + // Initialize structures passed to the symbol handler. + SYMBOL_INFO* functioninfo = (SYMBOL_INFO*)&symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + // Try to get the name of the function containing this program // counter address. + DWORD64 displacement64 = 0; + LPWSTR functionname; if (SymFromAddrW(currentprocess, programcounter, &displacement64, functioninfo)) { // Undecorate function name. if (UnDecorateSymbolName(functioninfo->Name, undecoratedname, MAXSYMBOLNAMELENGTH, UNDNAME_NAME_ONLY) > 0) @@ -265,13 +335,14 @@ VOID CallStack::dump (BOOL showinternalframes) const functionname = functioninfo->Name; } else { + // GetFormattedMessage( GetLastError() ); functionname = L"(Function name unavailable)"; displacement64 = 0; } LeaveCriticalSection(&symbollock); HMODULE hCallingModule = GetCallingModule(programcounter); - modulename = L"(Module name unavailable)"; + LPWSTR modulename = L"(Module name unavailable)"; if (hCallingModule && GetModuleFileName(hCallingModule, callingmodulename, sizeof(callingmodulename)) > 0) { @@ -284,23 +355,52 @@ VOID CallStack::dump (BOOL showinternalframes) const modulename = callingmodulename; } + int NumChars = -1; // Display the current stack frame's information. if (foundline) { if (displacement == 0) - report(L" %s (%d): %s!%s\n", sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname); + NumChars = _snwprintf_s(stack_line, _TRUNCATE, L" %s (%d): %s!%s\n", + sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname); else - report(L" %s (%d): %s!%s + 0x%X bytes\n", sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname, displacement); + NumChars = _snwprintf_s(stack_line, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", + sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname, displacement); } else { - report(L" " ADDRESSFORMAT L" (File and line number not available): ", (*this)[frame]); if (displacement64 == 0) - report(L"%s!%s\n", modulename, functionname); - else - report(L"%s!%s + 0x%X bytes\n", modulename, functionname, (DWORD)displacement64); - } + NumChars = _snwprintf_s(stack_line, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", + programcounter, modulename, functionname); + else + NumChars = _snwprintf_s(stack_line, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", + programcounter, modulename, functionname, (DWORD)displacement64); + } + if (ResolveOnly) { + // Just truncate anything that is too long. + if (NumChars >= 0) + { + m_Resolved[frame] = new WCHAR[NumChars + 1]; + wcscpy_s(m_Resolved[frame], NumChars + 1, stack_line); + } + } + else { + print(stack_line); + } } } +// DumpResolve +void CallStack::DumpResolved() const +{ + if (m_Resolved) + { + for (UINT32 frame = 0; frame < m_size; frame++) + { + report(L"%s", m_Resolved[frame]); + } + } +} + + + // getHashValue - Generate callstack hash value. // // Return Value: @@ -493,9 +593,9 @@ VOID SafeCallStack::getstacktrace (UINT32 maxdepth, context_t& context) currentcontext.BPREG = (DWORD64)framepointer; currentcontext.IPREG = context.Rip; #else -// If you want to retarget Visual Leak Detector to another processor -// architecture then you'll need to provide architecture-specific code to -// obtain the program counter and stack pointer from the given frame pointer. + // If you want to retarget Visual Leak Detector to another processor + // architecture then you'll need to provide architecture-specific code to + // obtain the program counter and stack pointer from the given frame pointer. #error "Visual Leak Detector is not supported on this architecture." #endif // _M_IX86 || _M_X64 @@ -514,9 +614,9 @@ VOID SafeCallStack::getstacktrace (UINT32 maxdepth, context_t& context) while (count < maxdepth) { count++; if (!StackWalk64(architecture, currentprocess, currentthread, &frame, ¤tcontext, NULL, - SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { - // Couldn't trace back through any more frames. - break; + SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { + // Couldn't trace back through any more frames. + break; } if (frame.AddrFrame.Offset == 0) { // End of stack. diff --git a/callstack.h b/callstack.h index 02ec8ae1..7fe42954 100644 --- a/callstack.h +++ b/callstack.h @@ -25,8 +25,8 @@ #ifndef VLDBUILD #error \ -"This header should only be included by Visual Leak Detector when building it from source. \ -Applications should never include this header." + "This header should only be included by Visual Leak Detector when building it from source. \ + Applications should never include this header." #endif #include @@ -53,42 +53,75 @@ Applications should never include this header." // way, the CallStack can grow dynamically as needed. New frames are always // pushed onto the chunk at the end of the list known as the "top" chunk. // +// IMPORTANT NOTE: This class as originally written makes two fatal assumptions: +// First: That the application will never load modules (call LoadLibrary) during the +// lifetime of the app. +// Second: That modules will never get unloaded (call to FreeLibrary) +// during the lifetime of the app. +// The result of this assumption is that +// memory allocations whose call stacks goes through dynamically loaded modules +// will be incomplete. This is manifested by stack frames that cannot be resolved +// when the stack is 'dumped' because the binaries have been unloaded from the +// process. +// To rectify this situation, it is up to the caller to resolve or format the call stacks +// into human readable form, BEFORE the callers process unloads any modules. That is +// done by calling VisualLeakDetector::ResolveCallstacks, which can be called from +// external code by the exported VLDResolveCallstacks function. +// When this happens, the call stacks are formatted, and then cached for later dumping. +// This has performance penalties, as the current implementation saves all info to heap memory, +// and it is wasteful, as some of the 'converted' memory is not a true leak, but will get +// properly de-allocated at a later time. However there is no other way to work around the +// fact that the call stacks can only get formatted when the binary is loaded in the process. +// class CallStack { public: - CallStack (); - CallStack (const CallStack &other); - ~CallStack (); + CallStack (); + ~CallStack (); + + // Public APIs - see each function definition for details. + VOID clear (); + VOID dump (BOOL showinternalframes); + VOID Resolve(BOOL showinternalframes); + DWORD getHashValue () const; + virtual VOID getstacktrace (UINT32 maxdepth, context_t& context) = 0; + CallStack& operator = (const CallStack &other); + BOOL operator == (const CallStack &other) const; + UINT_PTR operator [] (UINT32 index) const; + VOID push_back (const UINT_PTR programcounter); - // Public APIs - see each function definition for details. - VOID clear (); - VOID dump (BOOL showinternalframes) const; - DWORD getHashValue () const; - virtual VOID getstacktrace (UINT32 maxdepth, context_t& context) = 0; - CallStack& operator = (const CallStack &other); - BOOL operator == (const CallStack &other) const; - UINT_PTR operator [] (UINT32 index) const; - VOID push_back (const UINT_PTR programcounter); protected: - // Protected data. - UINT32 m_status; // Status flags: + // Protected data. + UINT32 m_status; // Status flags: #define CALLSTACK_STATUS_INCOMPLETE 0x1 // If set, the stack trace stored in this CallStack appears to be incomplete. - HMODULE GetCallingModule(UINT_PTR pCaller) const; + HMODULE GetCallingModule(UINT_PTR pCaller) const; private: - // The chunk list is made of a linked list of Chunks. - typedef struct chunk_s { - struct chunk_s *next; // Pointer to the next chunk in the chunk list. - UINT_PTR frames [CALLSTACKCHUNKSIZE]; // Pushed frames (program counter addresses) are stored in this array. - } chunk_t; + CallStack (const CallStack &other); // Don't allow this!! + // Performs the actual formatting of the callstack into human readable form. + void resolve(BOOL showinternalframes, BOOL ResolveOnly); + // The chunk list is made of a linked list of Chunks. + typedef struct chunk_s { + struct chunk_s *next; // Pointer to the next chunk in the chunk list. + UINT_PTR frames [CALLSTACKCHUNKSIZE]; // Pushed frames (program counter addresses) are stored in this array. + } chunk_t; + + // Private data. + UINT32 m_capacity; // Current capacity limit (in frames) + UINT32 m_size; // Current size (in frames) + CallStack::chunk_t m_store; // Pointer to the underlying data store (i.e. head of the chunk list) + CallStack::chunk_t *m_topchunk; // Pointer to the chunk at the top of the stack + UINT32 m_topindex; // Index, within the top chunk, of the top of the stack - // Private data. - UINT32 m_capacity; // Current capacity limit (in frames) - UINT32 m_size; // Current size (in frames) - CallStack::chunk_t m_store; // Pointer to the underlying data store (i.e. head of the chunk list) - CallStack::chunk_t *m_topchunk; // Pointer to the chunk at the top of the stack - UINT32 m_topindex; // Index, within the top chunk, of the top of the stack + // An array of strings that contains the stack converted into a human readable format. + // The number of strings is always equal to m_size + // Currently I'm only allowing a maximum of (MAX_PATH * 2) characters in each string. + // This is always NULL if the callstack has not been 'converted'. + WCHAR** m_Resolved; + // Prints out the strings in m_Resolved when the time comes to report the callstack in + // human readable form. Currently this is only called by the dump method. + void DumpResolved() const; }; @@ -102,7 +135,7 @@ class CallStack class FastCallStack : public CallStack { public: - VOID getstacktrace (UINT32 maxdepth, context_t& context); + VOID getstacktrace (UINT32 maxdepth, context_t& context); }; //////////////////////////////////////////////////////////////////////////////// @@ -115,5 +148,5 @@ class FastCallStack : public CallStack class SafeCallStack : public CallStack { public: - VOID getstacktrace (UINT32 maxdepth, context_t& context); + VOID getstacktrace (UINT32 maxdepth, context_t& context); }; diff --git a/utility.cpp b/utility.cpp index 5ec46494..1639a885 100644 --- a/utility.cpp +++ b/utility.cpp @@ -565,32 +565,21 @@ BOOL patchmodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tables return patched; } -// report - Sends a printf-style formatted message to the debugger for display +// print - Sends a message to the debugger for display // and/or to a file. // // Note: A message longer than MAXREPORTLENGTH characters will be truncated // to MAXREPORTLENGTH. // -// - format (IN): Specifies a printf-compliant format string containing the -// message to be sent to the debugger. -// // - ... (IN): Arguments to be formatted using the specified format string. // // Return Value: // // None. // -VOID report (LPCWSTR format, ...) +VOID print (LPCWSTR messagew) { - va_list args; size_t count; - CHAR messagea [MAXREPORTLENGTH + 1]; - WCHAR messagew [MAXREPORTLENGTH + 1]; - - va_start(args, format); - _vsnwprintf_s(messagew, MAXREPORTLENGTH + 1, _TRUNCATE, format, args); - va_end(args); - messagew[MAXREPORTLENGTH] = L'\0'; if (reportencoding == unicode) { if (reportfile != NULL) { @@ -605,6 +594,7 @@ VOID report (LPCWSTR format, ...) } } else { + CHAR messagea [MAXREPORTLENGTH + 1]; if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) == -1) { // Failed to convert the Unicode message to ASCII. assert(FALSE); @@ -629,6 +619,35 @@ VOID report (LPCWSTR format, ...) } } +// report - Sends a printf-style formatted message to the debugger for display +// and/or to a file. +// +// Note: A message longer than MAXREPORTLENGTH characters will be truncated +// to MAXREPORTLENGTH. +// +// - format (IN): Specifies a printf-compliant format string containing the +// message to be sent to the debugger. +// +// - ... (IN): Arguments to be formatted using the specified format string. +// +// Return Value: +// +// None. +// +VOID report (LPCWSTR format, ...) +{ + va_list args; + WCHAR messagew [MAXREPORTLENGTH + 1]; + + va_start(args, format); + int result = _vsnwprintf_s(messagew, MAXREPORTLENGTH + 1, _TRUNCATE, format, args); + va_end(args); + messagew[MAXREPORTLENGTH] = L'\0'; + + if (result >= 0) + print(messagew); +} + // restoreimport - Restores the IAT entry for an import previously patched via // a call to "patchimport" to the original address of the import. // @@ -939,3 +958,25 @@ DWORD CalculateCRC32(UINT_PTR p, UINT startValue) #endif return hash; } + +// Formats a message string using the specified message and variable +// list of arguments. +void GetFormattedMessage(DWORD last_error) +{ + // Retrieve the system error message for the last-error code + WCHAR lpMsgBuf[MAX_PATH] = {0}; + + FormatMessage( + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + last_error, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + lpMsgBuf, + MAX_PATH, + NULL ); + + // Display the error message and exit the process + report(L"%s", lpMsgBuf); +} + diff --git a/utility.h b/utility.h index ce4009d1..ca5ab7c8 100644 --- a/utility.h +++ b/utility.h @@ -121,6 +121,7 @@ VOID insertreportdelay (); BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); BOOL patchimport (HMODULE importmodule, moduleentry_t *module); BOOL patchmodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); +VOID print (LPCWSTR message); VOID report (LPCWSTR format, ...); VOID restoreimport (HMODULE importmodule, moduleentry_t* module); VOID restoremodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); @@ -133,3 +134,5 @@ DWORD _GetProcessIdOfThread (HANDLE thread); #define GetProcessIdOfThread _GetProcessIdOfThread #endif DWORD CalculateCRC32(UINT_PTR p, UINT startValue = 0xD202EF8D); +void GetFormattedMessage(DWORD last_error); + diff --git a/vld.cpp b/vld.cpp index ae51bd6f..4982d94d 100644 --- a/vld.cpp +++ b/vld.cpp @@ -356,12 +356,6 @@ BOOL IsWin7OrBetter() // VisualLeakDetector::VisualLeakDetector () { - HMODULE kernel32; - HMODULE kernelBase; - ModuleSet *newmodules; - HMODULE ntdll; - LPWSTR symbolpath; - // Initialize configuration options and related private data. _wcsnset_s(m_forcedmodulelist, MAXMODULELISTLENGTH, '\0', _TRUNCATE); m_maxdatadump = 0xffffffff; @@ -378,9 +372,9 @@ VisualLeakDetector::VisualLeakDetector () return; } - kernel32 = GetModuleHandleW(L"kernel32.dll"); - kernelBase = GetModuleHandleW(L"KernelBase.dll"); - ntdll = GetModuleHandleW(L"ntdll.dll"); + HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); + HMODULE kernelBase = GetModuleHandleW(L"KernelBase.dll"); + HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); if (!IsWin7OrBetter()) // kernel32.dll m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); @@ -450,13 +444,13 @@ VisualLeakDetector::VisualLeakDetector () // we got a valid TLS index. if (m_tlsindex == TLS_OUT_OF_INDEXES) { report(L"ERROR: Visual Leak Detector could not be installed because thread local" - L" storage could not be allocated."); + L" storage could not be allocated."); return; } // Initialize the symbol handler. We use it for obtaining source file/line // number information and function names for the memory leak report. - symbolpath = buildsymbolsearchpath(); + LPWSTR symbolpath = buildsymbolsearchpath(); #ifdef _DEBUG SymSetOptions(SYMOPT_DEBUG | SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); #else @@ -464,7 +458,7 @@ VisualLeakDetector::VisualLeakDetector () #endif if (!SymInitializeW(currentprocess, symbolpath, FALSE)) { report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" - L" File and function names will probably not be available in call stacks.\n", GetLastError()); + L" File and function names will probably not be available in call stacks.\n", GetLastError()); } delete [] symbolpath; @@ -480,7 +474,7 @@ VisualLeakDetector::VisualLeakDetector () patchimport(kernelBase, ldrLoadDllPatch); // Attach Visual Leak Detector to every module loaded in the process. - newmodules = new ModuleSet; + ModuleSet* newmodules = new ModuleSet(); newmodules->reserve(MODULESETRESERVE); EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); attachtoloadedmodules(newmodules); @@ -491,9 +485,9 @@ VisualLeakDetector::VisualLeakDetector () if (m_status & VLD_STATUS_FORCE_REPORT_TO_FILE) { // The report is being forced to a file. Let the human know why. report(L"NOTE: Visual Leak Detector: Unicode-encoded reporting has been enabled, but the\n" - L" debugger is the only selected report destination. The debugger cannot display\n" - L" Unicode characters, so the report will also be sent to a file. If no file has\n" - L" been specified, the default file name is \"" VLD_DEFAULT_REPORT_FILE_NAME L"\".\n"); + L" debugger is the only selected report destination. The debugger cannot display\n" + L" Unicode characters, so the report will also be sent to a file. If no file has\n" + L" been specified, the default file name is \"" VLD_DEFAULT_REPORT_FILE_NAME L"\".\n"); } reportconfig(); @@ -509,7 +503,6 @@ VisualLeakDetector::~VisualLeakDetector () BlockMap *blockmap; size_t count; vldblockheader_t *header; - HANDLE heap; HeapMap::Iterator heapit; SIZE_T internalleaks = 0; const char *leakfile = NULL; @@ -573,10 +566,7 @@ VisualLeakDetector::~VisualLeakDetector () } else { // Generate a memory leak report for each heap in the process. - for (heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - heap = (*heapit).first; - reportleaks(heap); - } + ReportLeaks(); // Show a summary. if (m_leaksfound == 0) { @@ -591,7 +581,7 @@ VisualLeakDetector::~VisualLeakDetector () // Free resources used by the symbol handler. if (!SymCleanup(currentprocess)) { report(L"WARNING: Visual Leak Detector: The symbol handler failed to deallocate resources (error=%lu).\n", - GetLastError()); + GetLastError()); } // Free internally allocated resources used by the heapmap and blockmap. @@ -629,7 +619,7 @@ VisualLeakDetector::~VisualLeakDetector () mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, - VLDBLOCKDATA(header), header->size); + VLDBLOCKDATA(header), header->size); report(L" Call Stack:\n"); report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); if (m_maxdatadump != 0) { @@ -771,7 +761,7 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // Discard the previously loaded symbols, so we can refresh them. if (SymUnloadModule64(currentprocess, modulebase) == FALSE) { report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" - L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); + L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); } } @@ -801,9 +791,9 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) mbstowcs_s(&count, modulenamew, MAXMODULENAME, modulename, _TRUNCATE); if ((findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A") == FALSE) && (wcsstr(vld.m_forcedmodulelist, modulenamew) == NULL)) { - // This module does not import VLD. This means that none of the module's - // sources #included vld.h. Exclude this module from leak detection. - moduleflags |= VLD_MODULE_EXCLUDED; + // This module does not import VLD. This means that none of the module's + // sources #included vld.h. Exclude this module from leak detection. + moduleflags |= VLD_MODULE_EXCLUDED; } else if (!(moduleflags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { // This module is going to be included in leak detection, but complete @@ -811,8 +801,8 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // traces through this module may lack information, like line numbers // and function names. report(L"WARNING: Visual Leak Detector: A module, %s, included in memory leak detection\n" - L" does not have any debugging symbols available, or they could not be located.\n" - L" Function names and/or line numbers for this module may not be available.\n", modulename); + L" does not have any debugging symbols available, or they could not be located.\n" + L" Function names and/or line numbers for this module may not be available.\n", modulename); } // Update the module's flags in the "new modules" set. @@ -945,15 +935,15 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () VOID VisualLeakDetector::configure () { #define BSIZE 64 - WCHAR buffer [BSIZE]; - WCHAR filename [MAX_PATH]; - WCHAR inipath [MAX_PATH]; + WCHAR buffer [BSIZE] = {0}; + WCHAR filename [MAX_PATH] = {0}; + WCHAR inipath [MAX_PATH] = {0}; BOOL keyopen = FALSE; - DWORD length; - HKEY productkey; - LONG regstatus; + DWORD length = 0; + HKEY productkey = 0; + LONG regstatus = 0; struct _stat s; - DWORD valuetype; + DWORD valuetype = 0; if (_wstat(L".\\vld.ini", &s) == 0) { // Found a copy of vld.ini in the working directory. Use it. @@ -964,7 +954,8 @@ VOID VisualLeakDetector::configure () regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); if (regstatus == ERROR_SUCCESS) { keyopen = TRUE; - regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); + length = MAX_PATH * sizeof(WCHAR); + regstatus = RegQueryValueExW(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); } if (keyopen) { RegCloseKey(productkey); @@ -976,6 +967,7 @@ VOID VisualLeakDetector::configure () regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); if (regstatus == ERROR_SUCCESS) { keyopen = TRUE; + length = MAX_PATH * sizeof(WCHAR); regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); } if (keyopen) { @@ -1143,6 +1135,9 @@ SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) continue; } info = (*blockit).second; + if ((info->callstack == NULL) || elementinfo->callstack == NULL) { + continue; + } if ((info->size == elementinfo->size) && (*(info->callstack) == *(elementinfo->callstack))) { // Found a duplicate. Erase it. delete info->callstack; @@ -1168,7 +1163,7 @@ SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) tls_t* VisualLeakDetector::gettls () { tls_t *tls; - + // Get the pointer to this thread's thread local storage structure. tls = (tls_t*)TlsGetValue(m_tlsindex); assert(GetLastError() == ERROR_SUCCESS); @@ -1318,7 +1313,7 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) // None. // VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - BOOL crtalloc, CallStack **&ppcallstack) + BOOL crtalloc, CallStack **&ppcallstack) { BlockMap::Iterator blockit; BlockMap *blockmap; @@ -1361,7 +1356,11 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // Found the blockinfo_t entry for this block. Update it with // a new callstack and new size. info = (*blockit).second; - info->callstack->clear(); + if (info->callstack) + { + info->callstack->clear(); + } + if (crtalloc) { // The heap that this block was allocated from is a CRT heap. (*heapit).second->flags |= VLD_HEAP_CRT; @@ -1437,39 +1436,33 @@ VOID VisualLeakDetector::reportconfig () // VOID VisualLeakDetector::reportleaks (HANDLE heap) { - LPCVOID address; - LPCVOID block; - BlockMap::Iterator blockit; - BlockMap *blockmap; - crtdbgblockheader_t *crtheader; - SIZE_T duplicates; - heapinfo_t *heapinfo; - HeapMap::Iterator heapit; - blockinfo_t *info; - SIZE_T size; + assert(heap != NULL); // Find the heap's information (blockmap, etc). EnterCriticalSection(&m_maplock); - heapit = m_heapmap->find(heap); + HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // Nothing is allocated from this heap. No leaks. LeaveCriticalSection(&m_maplock); return; } - heapinfo = (*heapit).second; - blockmap = &heapinfo->blockmap; - for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + heapinfo_t* heapinfo = (*heapit).second; + BlockMap* blockmap = &heapinfo->blockmap; + + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) + { // Found a block which is still in the BlockMap. We've identified a // potential memory leak. - block = (*blockit).first; - info = (*blockit).second; - address = block; - size = info->size; + LPCVOID block = (*blockit).first; + blockinfo_t* info = (*blockit).second; + LPCVOID address = block; + SIZE_T size = info->size; + if (heapinfo->flags & VLD_HEAP_CRT) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header prepended to it. - crtheader = (crtdbgblockheader_t*)block; + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. @@ -1482,8 +1475,9 @@ VOID VisualLeakDetector::reportleaks (HANDLE heap) address = CRTDBGBLOCKDATA(block); size = crtheader->size; } + // It looks like a real memory leak. - if (m_leaksfound == 0) { + if (m_leaksfound == 0) { // A confusing way to only display this message once report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); } m_leaksfound++; @@ -1491,15 +1485,20 @@ VOID VisualLeakDetector::reportleaks (HANDLE heap) if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { // Aggregate all other leaks which are duplicates of this one // under this same heading, to cut down on clutter. - duplicates = eraseduplicates(blockit) + 1; + SIZE_T duplicates = eraseduplicates(blockit) + 1; if (duplicates > 1) m_leaksfound += duplicates; - report(L"Leak Hash: 0x%08IX Count: %lu\n", - CalculateCRC32(info->size, info->callstack->getHashValue()), duplicates); + + report(L"Leak Hash: 0x%08IX Count: %lu\n", CalculateCRC32(info->size, info->callstack->getHashValue()), duplicates); } // Dump the call stack. report(L" Call Stack:\n"); - info->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + assert(info->callstack); + if (info->callstack) + { + info->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + } + // Dump the data in the user data section of the memory block. if (m_maxdatadump != 0) { report(L" Data:\n"); @@ -1706,7 +1705,7 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, // Always returns TRUE. // BOOL VisualLeakDetector::detachfrommodule (PCWSTR /*modulepath*/, DWORD64 modulebase, ULONG /*modulesize*/, - PVOID /*context*/) + PVOID /*context*/) { UINT tablesize = _countof(m_patchtable); @@ -1743,11 +1742,10 @@ BOOL VisualLeakDetector::detachfrommodule (PCWSTR /*modulepath*/, DWORD64 module // Returns the value returned from the specified calloc. // void* VisualLeakDetector::_calloc (calloc_t pcalloc, - context_t& context, - size_t num, - size_t size) + context_t& context, + size_t num, + size_t size) { - void *block; tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. @@ -1761,7 +1759,7 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, } // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pcalloc(num, size); + void* block = pcalloc(num, size); if (firstcall) { @@ -1892,9 +1890,9 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) // Returns the value returned from the specified realloc. // void* VisualLeakDetector::_realloc (realloc_t prealloc, - context_t& context, - void *mem, - size_t size) + context_t& context, + void *mem, + size_t size) { void *block; tls_t *tls = vld.gettls(); @@ -1961,12 +1959,12 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // Returns the value returned by the specified _calloc_dbg. // void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, - context_t& context, - size_t num, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t num, + size_t size, + int type, + char const *file, + int line) { void *block; tls_t *tls = vld.gettls(); @@ -2023,11 +2021,11 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // Returns the value returned by the specified _malloc_dbg. // void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t size, + int type, + char const *file, + int line) { void *block; tls_t *tls = vld.gettls(); @@ -2084,11 +2082,11 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t size, + int type, + char const *file, + int line) { void *block; tls_t *tls = vld.gettls(); @@ -2145,11 +2143,11 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t size, + int type, + char const *file, + int line) { void *block; tls_t *tls = vld.gettls(); @@ -2201,10 +2199,10 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, // Returns the value returned by the specified MFC debug new operator. // void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, - context_t& context, - size_t size, - char const *file, - int line) + context_t& context, + size_t size, + char const *file, + int line) { void *block; tls_t *tls = vld.gettls(); @@ -2260,12 +2258,12 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, - context_t& context, - void *mem, - size_t size, - int type, - char const *file, - int line) + context_t& context, + void *mem, + size_t size, + int type, + char const *file, + int line) { void *block; tls_t *tls = vld.gettls(); @@ -2480,7 +2478,7 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) // Returns the value returned by LdrLoadDll. // NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle) + PHANDLE modulehandle) { ModuleSet::Iterator moduleit; ModuleSet *newmodules; @@ -2491,8 +2489,9 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod // Load the DLL. status = LdrLoadDll(searchpath, flags, modulename, modulehandle); - + if (STATUS_SUCCESS == status) { + // Duplicate code here from VisualLeakDetector::RefreshModules. Consider refactoring this out. // Create a new set of all loaded modules, including any newly loaded // modules. newmodules = new ModuleSet; @@ -2523,20 +2522,16 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod VOID VisualLeakDetector::RefreshModules() { - ModuleSet::Iterator moduleit; - ModuleSet *newmodules; - ModuleSet *oldmodules; - - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. + if (vld.m_options & VLD_OPT_VLDOFF) + { return; } EnterCriticalSection(&vld.m_loaderlock); - + // Duplicate code here in this method. Consider refactoring out to another method. // Create a new set of all loaded modules, including any newly loaded // modules. - newmodules = new ModuleSet; + ModuleSet* newmodules = new ModuleSet(); newmodules->reserve(MODULESETRESERVE); EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); @@ -2545,12 +2540,12 @@ VOID VisualLeakDetector::RefreshModules() // Start using the new set of loaded modules. EnterCriticalSection(&vld.m_moduleslock); - oldmodules = vld.m_loadedmodules; + ModuleSet* oldmodules = vld.m_loadedmodules; vld.m_loadedmodules = newmodules; LeaveCriticalSection(&vld.m_moduleslock); // Free resources used by the old module list. - for (moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { + for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { delete (*moduleit).name; delete (*moduleit).path; } @@ -2561,7 +2556,7 @@ VOID VisualLeakDetector::RefreshModules() void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &context_ ) { - CallStack *callstack; + CallStack* callstack = NULL; if (vld.m_options & VLD_OPT_SAFE_STACK_WALK) { callstack = new SafeCallStack; } @@ -2910,7 +2905,7 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; } - + return block; } @@ -3158,7 +3153,7 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) tls->context.fp = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; } - + return block; } @@ -3184,12 +3179,9 @@ VOID VisualLeakDetector::ReportLeaks( ) return; } - HeapMap::Iterator heapit; - HANDLE heap; - // Generate a memory leak report for each heap in the process. - for (heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - heap = (*heapit).first; + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + HANDLE heap = (*heapit).first; reportleaks(heap); } } @@ -3301,7 +3293,7 @@ void VisualLeakDetector::GlobalDisableLeakDetection () TlsSet::Iterator tlsit; for (tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { (*tlsit)->oldflags = (*tlsit)->flags; - (*tlsit)->flags &= ~VLD_TLS_ENABLED; + (*tlsit)->flags &= ~VLD_TLS_ENABLED; (*tlsit)->flags |= VLD_TLS_DISABLED; } LeaveCriticalSection(&m_tlslock); @@ -3464,10 +3456,90 @@ void VisualLeakDetector::SetupReporting() } if (m_reportfile == NULL) { report(L"WARNING: Visual Leak Detector: Couldn't open report file for writing: %s\n" - L" The report will be sent to the debugger instead.\n", m_reportfilepath); + L" The report will be sent to the debugger instead.\n", m_reportfilepath); } else { // Set the "report" function to write to the file. setreportfile(m_reportfile, m_options & VLD_OPT_REPORT_TO_DEBUGGER, m_options & VLD_OPT_REPORT_TO_STDOUT); } } + +void VisualLeakDetector::resolveStacks(HANDLE heap) +{ + // Find the heap's information (blockmap, etc). + EnterCriticalSection(&m_maplock); + HeapMap::Iterator heapiter = m_heapmap->find(heap); + if (heapiter == m_heapmap->end()) { + // Nothing is allocated from this heap. No leaks. + LeaveCriticalSection(&m_maplock); + return; + } + + heapinfo_t* heapinfo = (*heapiter).second; + BlockMap& blockmap = heapinfo->blockmap; + + for (BlockMap::Iterator blockit = blockmap.begin(); blockit != blockmap.end(); ++blockit) { + // Found a block which is still in the BlockMap. We've identified a + // potential memory leak. + const void* block = (*blockit).first; + blockinfo_t* info = (*blockit).second; + assert(info); + if (info == NULL) + { + continue; + } + // The actuall memory address + const void* address = block; + assert(address != NULL); + + SIZE_T size = info->size; + + if (heapinfo->flags & VLD_HEAP_CRT) { + // This block is allocated to a CRT heap, so the block has a CRT + // memory block header prepended to it. + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { + // This block is marked as being used internally by the CRT. + // The CRT will free the block after VLD is destroyed. + continue; + } + // The CRT header is more or less transparent to the user, so + // the information about the contained block will probably be + // more useful to the user. Accordingly, that's the information + // we'll include in the report. + address = CRTDBGBLOCKDATA(block); + size = crtheader->size; + } + + if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { + // Aggregate all other leaks which are duplicates of this one + // under this same heading, to cut down on clutter. + eraseduplicates(blockit); + } + // Dump the call stack. + if (info->callstack) + { + info->callstack->Resolve(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + } + } + + LeaveCriticalSection(&m_maplock); +} + +void VisualLeakDetector::ResolveCallstacks() +{ + if (vld.m_options & VLD_OPT_VLDOFF) + { + return; + } + + // Generate the Callstacks early + for (HeapMap::Iterator heapiter = m_heapmap->begin(); + heapiter != m_heapmap->end(); + ++heapiter) + { + HANDLE heap = (*heapiter).first; + resolveStacks(heap); + } +} + diff --git a/vldapi.cpp b/vldapi.cpp index 17d70f5d..d7b9b38d 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -112,4 +112,9 @@ __declspec(dllexport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR * vld.SetReportOptions(option_mask,filename); } +__declspec(dllexport) void VLDResolveCallstacks() +{ + vld.ResolveCallstacks(); +} + } diff --git a/vldint.h b/vldint.h index 800f0a43..f6385df1 100644 --- a/vldint.h +++ b/vldint.h @@ -25,8 +25,8 @@ #ifndef VLDBUILD #error \ -"This header should only be included by Visual Leak Detector when building it from source. \ -Applications should never include this header." + "This header should only be included by Visual Leak Detector when building it from source. \ + Applications should never include this header." #endif #include @@ -74,9 +74,9 @@ typedef void* (__cdecl *realloc_t) (void *, size_t); // a BlockMap which maps each of these structures to its corresponding memory // block. typedef struct blockinfo_s { - CallStack *callstack; - SIZE_T serialnumber; - SIZE_T size; + CallStack *callstack; + SIZE_T serialnumber; + SIZE_T size; } blockinfo_t; // BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. @@ -86,8 +86,8 @@ typedef Map BlockMap; // this is used for mapping heaps to all of the blocks allocated from those // heaps. typedef struct heapinfo_s { - BlockMap blockmap; // Map of all blocks allocated from this heap. - UINT32 flags; // Heap status flags: + BlockMap blockmap; // Map of all blocks allocated from this heap. + UINT32 flags; // Heap status flags: #define VLD_HEAP_CRT 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). } heapinfo_t; @@ -98,23 +98,23 @@ typedef Map HeapMap; // a given module and can be used with the Set template because it supports the // '<' operator (sorts by virtual address range). typedef struct moduleinfo_s { - BOOL operator < (const struct moduleinfo_s &other) const - { - if (addrhigh < other.addrlow) { - return TRUE; - } - else { - return FALSE; - } - } - - SIZE_T addrlow; // Lowest address within the module's virtual address space (i.e. base address). - SIZE_T addrhigh; // Highest address within the module's virtual address space (i.e. base + size). - UINT32 flags; // Module flags: + BOOL operator < (const struct moduleinfo_s &other) const + { + if (addrhigh < other.addrlow) { + return TRUE; + } + else { + return FALSE; + } + } + + SIZE_T addrlow; // Lowest address within the module's virtual address space (i.e. base address). + SIZE_T addrhigh; // Highest address within the module's virtual address space (i.e. base + size). + UINT32 flags; // Module flags: #define VLD_MODULE_EXCLUDED 0x1 // If set, this module is excluded from leak detection. #define VLD_MODULE_SYMBOLSLOADED 0x2 // If set, this module's debug symbols have been loaded. - LPCSTR name; // The module's name (e.g. "kernel32.dll"). - LPCSTR path; // The fully qualified path from where the module was loaded. + LPCSTR name; // The module's name (e.g. "kernel32.dll"). + LPCSTR path; // The fully qualified path from where the module was loaded. } moduleinfo_t; // ModuleSets store information about modules loaded in the process. @@ -125,14 +125,14 @@ typedef Set ModuleSet; // detection status (enabled or disabled) and the address that initiated the // current allocation is stored here. typedef struct tls_s { - context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. - UINT32 flags; // Thread-local status flags: + context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. + UINT32 flags; // Thread-local status flags: #define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. #define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. #define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. - UINT32 oldflags; // Thread-local status old flags - DWORD threadid; // Thread ID of the thread that owns this TLS structure. - CallStack **ppcallstack; // Memory block callstack pointer. + UINT32 oldflags; // Thread-local status old flags + DWORD threadid; // Thread ID of the thread that owns this TLS structure. + CallStack **ppcallstack; // Memory block callstack pointer. } tls_t; // The TlsSet allows VLD to keep track of all thread local storage structures @@ -170,152 +170,153 @@ class CallStack; class VisualLeakDetector : public IMalloc { public: - VisualLeakDetector(); - ~VisualLeakDetector(); - -//////////////////////////////////////////////////////////////////////////////// -// Public CRT and MFC Common Handlers -// -// Many heap functions are indirectly rerouted to these handlers. One common -// function exists for each heap function with a given signature. These -// handlers are not direct IAT replacements, but are called by the individual -// IAT replacement functions. -//////////////////////////////////////////////////////////////////////////////// - // Standard CRT and MFC common handlers - void* _calloc (calloc_t pcalloc, context_t& context, size_t num, size_t size); - void* _malloc (malloc_t pmalloc, context_t& context, size_t size); - void* _new (new_t pnew, context_t& context, size_t size); - void* _realloc (realloc_t prealloc, context_t& context, void *mem, size_t size); - - // Debug CRT and MFC common handlers - void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, size_t num, size_t size, int type, char const *file, int line); - void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, size_t size, int type, char const *file, int line); - void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, size_t size, int type, char const *file, int line); - void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); - void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); - void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, void *mem, size_t size, int type, char const *file, int line); - -//////////////////////////////////////////////////////////////////////////////// -// Public IMalloc methods - for support of COM-based memory leak detection. -//////////////////////////////////////////////////////////////////////////////// - ULONG __stdcall AddRef (); - LPVOID __stdcall Alloc (SIZE_T size); - INT __stdcall DidAlloc (LPVOID mem); - VOID __stdcall Free (LPVOID mem); - SIZE_T __stdcall GetSize (LPVOID mem); - VOID __stdcall HeapMinimize (); - HRESULT __stdcall QueryInterface (REFIID iid, LPVOID *object); - LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); - ULONG __stdcall Release (); - - void DisableLeakDetection (); - void EnableLeakDetection (); - void RestoreLeakDetectionState (); - void GlobalDisableLeakDetection (); - void GlobalEnableLeakDetection (); - - VOID RefreshModules(); - VOID ReportLeaks(); - VOID EnableModule(HMODULE module); - VOID DisableModule(HMODULE module); - UINT32 GetOptions(); - VOID GetReportFilename(WCHAR *filename); - VOID SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); - VOID SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); - VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); - bool GetModulesList(WCHAR *modules, UINT size); - - - static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); + VisualLeakDetector(); + ~VisualLeakDetector(); + + //////////////////////////////////////////////////////////////////////////////// + // Public CRT and MFC Common Handlers + // + // Many heap functions are indirectly rerouted to these handlers. One common + // function exists for each heap function with a given signature. These + // handlers are not direct IAT replacements, but are called by the individual + // IAT replacement functions. + //////////////////////////////////////////////////////////////////////////////// + // Standard CRT and MFC common handlers + void* _calloc (calloc_t pcalloc, context_t& context, size_t num, size_t size); + void* _malloc (malloc_t pmalloc, context_t& context, size_t size); + void* _new (new_t pnew, context_t& context, size_t size); + void* _realloc (realloc_t prealloc, context_t& context, void *mem, size_t size); + + // Debug CRT and MFC common handlers + void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, size_t num, size_t size, int type, char const *file, int line); + void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, size_t size, int type, char const *file, int line); + void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, size_t size, int type, char const *file, int line); + void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); + void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); + void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, void *mem, size_t size, int type, char const *file, int line); + + //////////////////////////////////////////////////////////////////////////////// + // Public IMalloc methods - for support of COM-based memory leak detection. + //////////////////////////////////////////////////////////////////////////////// + ULONG __stdcall AddRef (); + LPVOID __stdcall Alloc (SIZE_T size); + INT __stdcall DidAlloc (LPVOID mem); + VOID __stdcall Free (LPVOID mem); + SIZE_T __stdcall GetSize (LPVOID mem); + VOID __stdcall HeapMinimize (); + HRESULT __stdcall QueryInterface (REFIID iid, LPVOID *object); + LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); + ULONG __stdcall Release (); + + void DisableLeakDetection (); + void EnableLeakDetection (); + void RestoreLeakDetectionState (); + void GlobalDisableLeakDetection (); + void GlobalEnableLeakDetection (); + + VOID RefreshModules(); + VOID ReportLeaks(); + VOID EnableModule(HMODULE module); + VOID DisableModule(HMODULE module); + UINT32 GetOptions(); + VOID GetReportFilename(WCHAR *filename); + VOID SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); + VOID SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); + VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); + bool GetModulesList(WCHAR *modules, UINT size); + VOID ResolveCallstacks(); + + static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); private: -//////////////////////////////////////////////////////////////////////////////// -// Private leak detection functions - see each function definition for details. -//////////////////////////////////////////////////////////////////////////////// - VOID attachtoloadedmodules (ModuleSet *newmodules); - LPWSTR buildsymbolsearchpath (); - VOID configure (); - BOOL enabled (); - SIZE_T eraseduplicates (const BlockMap::Iterator &element); - tls_t* gettls (); - VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); - VOID mapheap (HANDLE heap); - VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); - VOID reportconfig (); - VOID reportleaks (HANDLE heap); - VOID unmapblock (HANDLE heap, LPCVOID mem); - VOID unmapheap (HANDLE heap); - - // Static functions (callbacks) - static BOOL __stdcall addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - static BOOL __stdcall detachfrommodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - - // Utils - static BOOL IsModuleExcluded (UINT_PTR returnaddress); - static void getcallstack( CallStack **&ppcallstack, context_t &context ); - BOOL GetModuleName(UINT_PTR address, LPSTR modulepath, ULONG modulelength); - void SetupReporting(); - -//////////////////////////////////////////////////////////////////////////////// -// IAT replacement functions - see each function definition for details. -// -// Because there are so many virtually identical CRT and MFC replacement -// functions, they are excluded from the class to reduce the amount of noise -// within this class's code. See crtmfcpatch.cpp for those functions. -//////////////////////////////////////////////////////////////////////////////// - // Win32 IAT replacement functions - static FARPROC __stdcall _GetProcAddress (HMODULE module, LPCSTR procname); - static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); - static BOOL __stdcall _HeapDestroy (HANDLE heap); - static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle); - static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); - - static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); - static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); - - // COM IAT replacement functions - static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); - static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); - static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); - -//////////////////////////////////////////////////////////////////////////////// -// Private data -//////////////////////////////////////////////////////////////////////////////// - WCHAR m_forcedmodulelist [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. - HeapMap *m_heapmap; // Map of all active heaps in the process. - IMalloc *m_imalloc; // Pointer to the system implementation of IMalloc. - SIZE_T m_leaksfound; // Total number of leaks found. - ModuleSet *m_loadedmodules; // Contains information about all modules loaded in the process. - CRITICAL_SECTION m_loaderlock; // Serializes the attachment of newly loaded modules. - CRITICAL_SECTION m_maplock; // Serializes access to the heap and block maps. - SIZE_T m_maxdatadump; // Maximum number of user-data bytes to dump for each leaked block. - UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. - CRITICAL_SECTION m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. - UINT32 m_options; // Configuration options: - - static patchentry_t m_kernelbasePatch []; - static patchentry_t m_kernel32Patch []; - static patchentry_t m_ntdllPatch []; - static patchentry_t m_ole32Patch []; - static moduleentry_t m_patchtable []; // Table of imports patched for attaching VLD to other modules. - FILE *m_reportfile; // File where the memory leak report may be sent to. - WCHAR m_reportfilepath [MAX_PATH]; // Full path and name of file to send memory leak report to. - const char *m_selftestfile; // Filename where the memory leak self-test block is leaked. - int m_selftestline; // Line number where the memory leak self-test block is leaked. - UINT32 m_status; // Status flags: + //////////////////////////////////////////////////////////////////////////////// + // Private leak detection functions - see each function definition for details. + //////////////////////////////////////////////////////////////////////////////// + VOID attachtoloadedmodules (ModuleSet *newmodules); + LPWSTR buildsymbolsearchpath (); + VOID configure (); + BOOL enabled (); + SIZE_T eraseduplicates (const BlockMap::Iterator &element); + tls_t* gettls (); + VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); + VOID mapheap (HANDLE heap); + VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); + VOID reportconfig (); + VOID reportleaks (HANDLE heap); + VOID unmapblock (HANDLE heap, LPCVOID mem); + VOID unmapheap (HANDLE heap); + void resolveStacks(HANDLE heap); + + // Static functions (callbacks) + static BOOL __stdcall addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + static BOOL __stdcall detachfrommodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + + // Utils + static BOOL IsModuleExcluded (UINT_PTR returnaddress); + static void getcallstack( CallStack **&ppcallstack, context_t &context ); + BOOL GetModuleName(UINT_PTR address, LPSTR modulepath, ULONG modulelength); + void SetupReporting(); + + //////////////////////////////////////////////////////////////////////////////// + // IAT replacement functions - see each function definition for details. + // + // Because there are so many virtually identical CRT and MFC replacement + // functions, they are excluded from the class to reduce the amount of noise + // within this class's code. See crtmfcpatch.cpp for those functions. + //////////////////////////////////////////////////////////////////////////////// + // Win32 IAT replacement functions + static FARPROC __stdcall _GetProcAddress (HMODULE module, LPCSTR procname); + static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); + static BOOL __stdcall _HeapDestroy (HANDLE heap); + static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, + PHANDLE modulehandle); + static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); + + static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); + static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); + + // COM IAT replacement functions + static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); + static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); + static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); + + //////////////////////////////////////////////////////////////////////////////// + // Private data + //////////////////////////////////////////////////////////////////////////////// + WCHAR m_forcedmodulelist [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. + HeapMap *m_heapmap; // Map of all active heaps in the process. + IMalloc *m_imalloc; // Pointer to the system implementation of IMalloc. + SIZE_T m_leaksfound; // Total number of leaks found. + ModuleSet *m_loadedmodules; // Contains information about all modules loaded in the process. + CRITICAL_SECTION m_loaderlock; // Serializes the attachment of newly loaded modules. + CRITICAL_SECTION m_maplock; // Serializes access to the heap and block maps. + SIZE_T m_maxdatadump; // Maximum number of user-data bytes to dump for each leaked block. + UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. + CRITICAL_SECTION m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. + UINT32 m_options; // Configuration options: + + static patchentry_t m_kernelbasePatch []; + static patchentry_t m_kernel32Patch []; + static patchentry_t m_ntdllPatch []; + static patchentry_t m_ole32Patch []; + static moduleentry_t m_patchtable []; // Table of imports patched for attaching VLD to other modules. + FILE *m_reportfile; // File where the memory leak report may be sent to. + WCHAR m_reportfilepath [MAX_PATH]; // Full path and name of file to send memory leak report to. + const char *m_selftestfile; // Filename where the memory leak self-test block is leaked. + int m_selftestline; // Line number where the memory leak self-test block is leaked. + UINT32 m_status; // Status flags: #define VLD_STATUS_DBGHELPLINKED 0x1 // If set, the explicit dynamic link to the Debug Help Library succeeded. #define VLD_STATUS_INSTALLED 0x2 // If set, VLD was successfully installed. #define VLD_STATUS_NEVER_ENABLED 0x4 // If set, VLD started disabled, and has not yet been manually enabled. #define VLD_STATUS_FORCE_REPORT_TO_FILE 0x8 // If set, the leak report is being forced to a file. - DWORD m_tlsindex; // Thread-local storage index. - CRITICAL_SECTION m_tlslock; // Protects accesses to the Set of TLS structures. - TlsSet *m_tlsset; // Set of all all thread-local storage structres for the process. - HMODULE m_vldbase; // Visual Leak Detector's own module handle (base address). + DWORD m_tlsindex; // Thread-local storage index. + CRITICAL_SECTION m_tlslock; // Protects accesses to the Set of TLS structures. + TlsSet *m_tlsset; // Set of all all thread-local storage structres for the process. + HMODULE m_vldbase; // Visual Leak Detector's own module handle (base address). - typedef FARPROC __stdcall _GetProcAddressType(HMODULE module, LPCSTR procname); + typedef FARPROC __stdcall _GetProcAddressType(HMODULE module, LPCSTR procname); - VOID __stdcall ChangeModuleState(HMODULE module,bool on); - static _GetProcAddressType * m_original_GetProcAddress; + VOID __stdcall ChangeModuleState(HMODULE module,bool on); + static _GetProcAddressType * m_original_GetProcAddress; }; // Configuration option default values From 63587103a44316361901082bc5ae9176d49fd882 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Mon, 21 Mar 2011 08:32:09 +0000 Subject: [PATCH 034/321] Adding comments to a few methods. No Code Review since it is comments only. Tests: Ran the TestSuite, which detected 16 memory leaks. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C64772 --- callstack.cpp | 1 + callstack.h | 3 +++ utility.cpp | 30 +++++++++++++++--------------- utility.h | 2 ++ vld.h | 13 +++++++++++++ 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index a7b1184d..64ba8014 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -239,6 +239,7 @@ VOID CallStack::dump (BOOL showinternalframes) resolve(showinternalframes, FALSE); } +// Formats the stack frame into a human readable format, and saves it for later retrieval. void CallStack::Resolve(BOOL showinternalframes) { if (m_Resolved != NULL) diff --git a/callstack.h b/callstack.h index 7fe42954..5d754716 100644 --- a/callstack.h +++ b/callstack.h @@ -81,7 +81,10 @@ class CallStack // Public APIs - see each function definition for details. VOID clear (); + // Prints the Callstack to one of either / or the debug output window and or + // a log file. VOID dump (BOOL showinternalframes); + // Formats the stack frame into a human readable format, and saves it for later retrieval. VOID Resolve(BOOL showinternalframes); DWORD getHashValue () const; virtual VOID getstacktrace (UINT32 maxdepth, context_t& context) = 0; diff --git a/utility.cpp b/utility.cpp index 1639a885..44e2d2e3 100644 --- a/utility.cpp +++ b/utility.cpp @@ -963,20 +963,20 @@ DWORD CalculateCRC32(UINT_PTR p, UINT startValue) // list of arguments. void GetFormattedMessage(DWORD last_error) { - // Retrieve the system error message for the last-error code - WCHAR lpMsgBuf[MAX_PATH] = {0}; - - FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - last_error, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - lpMsgBuf, - MAX_PATH, - NULL ); - - // Display the error message and exit the process - report(L"%s", lpMsgBuf); + // Retrieve the system error message for the last-error code + WCHAR lpMsgBuf[MAX_PATH] = {0}; + + FormatMessage( + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + last_error, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + lpMsgBuf, + MAX_PATH, + NULL ); + + // Display the error message. + report(L"%s", lpMsgBuf); } diff --git a/utility.h b/utility.h index ca5ab7c8..2e76a4fc 100644 --- a/utility.h +++ b/utility.h @@ -134,5 +134,7 @@ DWORD _GetProcessIdOfThread (HANDLE thread); #define GetProcessIdOfThread _GetProcessIdOfThread #endif DWORD CalculateCRC32(UINT_PTR p, UINT startValue = 0xD202EF8D); +// Formats a message string using the specified message and variable +// list of arguments. void GetFormattedMessage(DWORD last_error); diff --git a/vld.h b/vld.h index 1240cae6..61e1bb94 100644 --- a/vld.h +++ b/vld.h @@ -232,6 +232,19 @@ __declspec(dllimport) BOOL VLDGetModulesList(WCHAR *modules, UINT size); // __declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR *filename); +// VLDResolveCallstacks - Performs symbol resolution for all saved extent CallStack's that have +// been tracked by Visual Leak Detector. This function is necessary for applications that +// dynamically load and unload modules, and through which memory leaks might be included. +// If this is NOT called, stack traces may have stack frames with no symbol information. This +// happens because the symbol API's cannot look up symbols for a binary / module that has been unloaded +// from the process. +// +// Return Value: +// +// None. +// +__declspec(dllexport) void VLDResolveCallstacks(); + #ifdef __cplusplus } #endif // __cplusplus From 23727f0f7e62b170343db40d50409ab8e96e5c99 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 21 Mar 2011 19:58:51 +0000 Subject: [PATCH 035/321] Minor changes git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C64786 --- vld.cpp | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/vld.cpp b/vld.cpp index 4982d94d..13763610 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1114,35 +1114,30 @@ BOOL VisualLeakDetector::enabled () // SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) { - BlockMap::Iterator blockit; - BlockMap *blockmap; - blockinfo_t *elementinfo; - SIZE_T erased = 0; - HeapMap::Iterator heapit; - blockinfo_t *info; - BlockMap::Iterator previt; + SIZE_T erased = 0; + blockinfo_t *elementinfo = (*element).second; - elementinfo = (*element).second; + if (elementinfo->callstack == NULL) + return erased; // Iteratate through all block maps, looking for blocks with the same size // and callstack as the specified element. - for (heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - blockmap = &(*heapit).second->blockmap; - for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + BlockMap *blockmap = &(*heapit).second->blockmap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { if (blockit == element) { // Don't delete the element of which we are searching for // duplicates. continue; } - info = (*blockit).second; - if ((info->callstack == NULL) || elementinfo->callstack == NULL) { + blockinfo_t *info = (*blockit).second; + if (info->callstack == NULL) continue; - } if ((info->size == elementinfo->size) && (*(info->callstack) == *(elementinfo->callstack))) { // Found a duplicate. Erase it. delete info->callstack; delete info; - previt = blockit - 1; + BlockMap::Iterator previt = blockit - 1; blockmap->erase(blockit); blockit = previt; erased++; From b768d5881d86efb4cd9a018a065f33c21388ca61 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 25 Mar 2011 16:08:22 +0000 Subject: [PATCH 036/321] Problem fixed with GetModuleHandleW for SxS dll's (mfc*.dll, msvcr*.dll) git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C64864 --- callstack.cpp | 20 --------- callstack.h | 2 - crtmfcpatch.h | 72 +++++++++++++++---------------- utility.cpp | 17 ++++++++ utility.h | 2 +- vld.cpp | 117 +++++++++++++++++++++++++------------------------- vldint.h | 1 + 7 files changed, 113 insertions(+), 118 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 64ba8014..1f362b70 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -188,26 +188,6 @@ VOID CallStack::clear () m_topindex = 0; } -// GetCallingModule - Return calling module by address. -// -// Return Value: -// -// Module handle. -// -HMODULE CallStack::GetCallingModule( UINT_PTR pCaller ) const -{ - HMODULE hModule = NULL; - MEMORY_BASIC_INFORMATION mbi; - if ( VirtualQuery((LPCVOID)pCaller, &mbi, sizeof(MEMORY_BASIC_INFORMATION)) == sizeof(MEMORY_BASIC_INFORMATION) ) - { - // the allocation base is the beginning of a PE file - hModule = (HMODULE) mbi.AllocationBase; - } - return hModule; -} - - - // dump - Dumps a nicely formatted rendition of the CallStack, including // symbolic information (function names and line numbers) if available. diff --git a/callstack.h b/callstack.h index 5d754716..0226c671 100644 --- a/callstack.h +++ b/callstack.h @@ -98,8 +98,6 @@ class CallStack UINT32 m_status; // Status flags: #define CALLSTACK_STATUS_INCOMPLETE 0x1 // If set, the stack trace stored in this CallStack appears to be incomplete. - HMODULE GetCallingModule(UINT_PTR pCaller) const; - private: CallStack (const CallStack &other); // Don't allow this!! // Performs the actual formatting of the callstack into human readable form. diff --git a/crtmfcpatch.h b/crtmfcpatch.h index cee850ae..031c46b1 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -33,7 +33,7 @@ Applications should never include this header." extern __declspec(dllexport) VisualLeakDetector vld; #define TEMPLATE_HEADER \ -template + template static void* __cdecl mfcd_new_dbg (context_t& context, size_t size, int type, char const *file, int line); - template + template static void* __cdecl mfcd_new_dbg (context_t& context, size_t size, char const *file, int line); - template + template static void* __cdecl mfcd_new (context_t& context, size_t size); }; @@ -133,7 +133,7 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, if (pcrtxxd__calloc_dbg == NULL) { // This is the first call to this function. Link to the real // _calloc_dbg. - msvcrxxd = GetModuleHandleW(crtddll); + msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd__calloc_dbg = (_calloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_calloc_dbg"); } @@ -173,7 +173,7 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, if (pcrtxxd__malloc_dbg == NULL) { // This is the first call to this function. Link to the real // _malloc_dbg. - msvcrxxd = GetModuleHandleW(crtddll); + msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd__malloc_dbg = (_malloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_malloc_dbg"); } @@ -216,7 +216,7 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, if (pcrtxxd__realloc_dbg == NULL) { // This is the first call to this function. Link to the real // _realloc_dbg. - msvcrxxd = GetModuleHandleW(crtddll); + msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd__realloc_dbg = (_realloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_realloc_dbg"); } @@ -305,7 +305,7 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) if (pcrtxxd_calloc == NULL) { // This is the first call to this function. Link to the real malloc. - msvcrxxd = GetModuleHandleW(crtddll); + msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd_calloc = (calloc_t)vld._RGetProcAddress(msvcrxxd, "calloc"); } @@ -336,7 +336,7 @@ void* CrtMfcPatch::crtd_malloc (size_t size) if (pcrtxxd_malloc == NULL) { // This is the first call to this function. Link to the real malloc. - msvcrxxd = GetModuleHandleW(crtddll); + msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd_malloc = (malloc_t)vld._RGetProcAddress(msvcrxxd, "malloc"); } @@ -369,7 +369,7 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) if (pcrtxxd_realloc == NULL) { // This is the first call to this function. Link to the real realloc. - msvcrxxd = GetModuleHandleW(crtddll); + msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd_realloc = (realloc_t)vld._RGetProcAddress(msvcrxxd, "realloc"); } @@ -448,7 +448,7 @@ void* CrtMfcPatch::crtd_new_dbg (context_t& context, if (pcrtxxd_new_dbg == NULL) { // This is the first call to this function. Link to the real CRT debug // new operator. - msvcrxxd = GetModuleHandleW(crtddll); + msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd_new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(msvcrxxd, procname); } @@ -480,7 +480,7 @@ void* CrtMfcPatch::crtd_new (context_t& context, size_t size) if (pcrtxxd_scalar_new == NULL) { // This is the first call to this function. Link to the real CRT new // operator. - msvcrxxd = GetModuleHandleW(crtddll); + msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd_scalar_new = (new_t)vld._RGetProcAddress(msvcrxxd, procname); } @@ -809,7 +809,7 @@ void* CrtMfcPatch::mfcud_vector_new (size_t size) // Returns the value returned by the MFC debug new operator. // TEMPLATE_HEADER -template +template void* CrtMfcPatch::mfcd_new_dbg (context_t& context, size_t size, int type, @@ -823,7 +823,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, if (pmfcxxd__new_dbg == NULL) { // This is the first call to this function. Link to the real MFC debug // new operator. - mfcxxd = GetModuleHandleW(mfcdll); + mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); assert(mfcxxd != NULL); pmfcxxd__new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } @@ -852,7 +852,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, // Returns the value returned by the MFC debug new operator. // TEMPLATE_HEADER -template +template void* CrtMfcPatch::mfcd_new_dbg (context_t& context, size_t size, char const *file, @@ -865,7 +865,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, if (pmfcxxd__new_dbg == NULL) { // This is the first call to this function. Link to the real MFC debug // new operator. - mfcxxd = GetModuleHandleW(mfcdll); + mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); assert(mfcxxd != NULL); pmfcxxd__new_dbg = (new_dbg_mfc_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } @@ -887,7 +887,7 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, // Returns the value returned by the MFC new operator. // TEMPLATE_HEADER -template +template void* CrtMfcPatch::mfcd_new (context_t& context, size_t size) { static new_t pmfcxxd_new = NULL; @@ -897,7 +897,7 @@ void* CrtMfcPatch::mfcd_new (context_t& context, size_t size) if (pmfcxxd_new == NULL) { // This is the first call to this function. Link to the real CRT new // operator. - mfcxxd = GetModuleHandleW(mfcdll); + mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); assert(mfcxxd != NULL); pmfcxxd_new = (new_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } @@ -928,24 +928,24 @@ const extern char scalar_new_name[] = "??2@YAPEAX_K@Z"; const extern char vector_new_name[] = "??_U@YAPEAX_K@Z"; #endif -const extern wchar_t msvcrtd_dll[] = L"msvcrtd.dll"; -const extern wchar_t mfc42d_dll[] = L"mfc42d.dll"; -const extern wchar_t mfc42ud_dll[] = L"mfc42ud.dll"; -const extern wchar_t msvcr70d_dll[] = L"msvcr70d.dll"; -const extern wchar_t mfc70d_dll[] = L"mfc70d.dll"; -const extern wchar_t mfc70ud_dll[] = L"mfc70ud.dll"; -const extern wchar_t msvcr71d_dll[] = L"msvcr71d.dll"; -const extern wchar_t mfc71d_dll[] = L"mfc71d.dll"; -const extern wchar_t mfc71ud_dll[] = L"mfc71ud.dll"; -const extern wchar_t msvcr80d_dll[] = L"msvcr80d.dll"; -const extern wchar_t mfc80d_dll[] = L"mfc80d.dll"; -const extern wchar_t mfc80ud_dll[] = L"mfc80ud.dll"; -const extern wchar_t msvcr90d_dll[] = L"msvcr90d.dll"; -const extern wchar_t mfc90d_dll[] = L"mfc90d.dll"; -const extern wchar_t mfc90ud_dll[] = L"mfc90ud.dll"; -const extern wchar_t msvcr100d_dll[] = L"msvcr100d.dll"; -const extern wchar_t mfc100d_dll[] = L"mfc100d.dll"; -const extern wchar_t mfc100ud_dll[] = L"mfc100ud.dll"; +const extern char msvcrtd_dll[] = "msvcrtd.dll"; +const extern char mfc42d_dll[] = "mfc42d.dll"; +const extern char mfc42ud_dll[] = "mfc42ud.dll"; +const extern char msvcr70d_dll[] = "msvcr70d.dll"; +const extern char mfc70d_dll[] = "mfc70d.dll"; +const extern char mfc70ud_dll[] = "mfc70ud.dll"; +const extern char msvcr71d_dll[] = "msvcr71d.dll"; +const extern char mfc71d_dll[] = "mfc71d.dll"; +const extern char mfc71ud_dll[] = "mfc71ud.dll"; +const extern char msvcr80d_dll[] = "msvcr80d.dll"; +const extern char mfc80d_dll[] = "mfc80d.dll"; +const extern char mfc80ud_dll[] = "mfc80ud.dll"; +const extern char msvcr90d_dll[] = "msvcr90d.dll"; +const extern char mfc90d_dll[] = "mfc90d.dll"; +const extern char mfc90ud_dll[] = "mfc90ud.dll"; +const extern char msvcr100d_dll[] = "msvcr100d.dll"; +const extern char mfc100d_dll[] = "mfc100d.dll"; +const extern char mfc100ud_dll[] = "mfc100ud.dll"; // Visual Studio 6.0 typedef CrtMfcPatchbegin(); newit != newmodules->end(); ++newit) { - modulebase = (DWORD64)(*newit).addrlow; - moduleflags = 0x0; - modulename = (*newit).name; - modulepath = (*newit).path; - modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; - - refresh = FALSE; - EnterCriticalSection(&m_moduleslock); - oldmodules = m_loadedmodules; + for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { + DWORD64 modulebase = (DWORD64)(*newit).addrlow; + UINT32 moduleflags = 0x0; + LPCSTR modulename = (*newit).name; + LPCSTR modulepath = (*newit).path; + DWORD modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; + + BOOL refresh = FALSE; + EnterCriticalSection(&m_moduleslock); + ModuleSet* oldmodules = m_loadedmodules; if (oldmodules != NULL) { // This is not the first time we have been called to attach to the // currently loaded modules. - oldit = oldmodules->find(*newit); + ModuleSet::Iterator oldit = oldmodules->find(*newit); if (oldit != oldmodules->end()) { // We've seen this "new" module loaded in the process before. moduleflags = (*oldit).flags; - LeaveCriticalSection(&m_moduleslock); - if (moduleispatched((HMODULE)modulebase, m_patchtable, tablesize)) { + LeaveCriticalSection(&m_moduleslock); + if (moduleispatched((HMODULE)modulebase, m_patchtable, _countof(m_patchtable))) { // This module is already attached. Just update the module's // flags, nothing more. - updateit = newit; + updateit = newit; (*updateit).flags = moduleflags; continue; } @@ -768,7 +754,8 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // Try to load the module's symbols. This ensures that we have loaded // the symbols for every module that has ever been loaded into the // process, guaranteeing the symbols' availability when generating the - // leak report. + // leak report. + IMAGEHLP_MODULE64 moduleimageinfo; moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); BOOL SymbolsLoaded = SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo); if (!SymbolsLoaded) @@ -788,6 +775,9 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) continue; } + size_t count; +#define MAXMODULENAME (_MAX_FNAME + _MAX_EXT) + WCHAR modulenamew [MAXMODULENAME]; mbstowcs_s(&count, modulenamew, MAXMODULENAME, modulename, _TRUNCATE); if ((findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A") == FALSE) && (wcsstr(vld.m_forcedmodulelist, modulenamew) == NULL)) { @@ -809,8 +799,8 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) updateit = newit; (*updateit).flags = moduleflags; - // Attach to the module. - patchmodule((HMODULE)modulebase, m_patchtable, tablesize); + // Attach to the module. + patchmodule((HMODULE)modulebase, m_patchtable, _countof(m_patchtable)); } } @@ -1630,27 +1620,18 @@ VOID VisualLeakDetector::unmapheap (HANDLE heap) // BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context) { - size_t count; - moduleentry_t *entry; - CHAR extension [_MAX_EXT]; - CHAR filename [_MAX_FNAME]; - UINT index; - moduleinfo_t moduleinfo; - LPSTR modulenamea; - LPSTR modulepatha; - ModuleSet* newmodules = (ModuleSet*)context; - SIZE_T size; - UINT tablesize = _countof(m_patchtable); - // Convert the module path to ASCII. - size = wcslen(modulepath) + 1; - modulepatha = new CHAR [size]; + SIZE_T size = wcslen(modulepath) + 1; + LPSTR modulepatha = new CHAR [size]; + size_t count; wcstombs_s(&count, modulepatha, size, modulepath, _TRUNCATE); - // Extract just the filename and extension from the module path. + // Extract just the filename and extension from the module path. + CHAR filename [_MAX_FNAME]; + CHAR extension [_MAX_EXT]; _splitpath_s(modulepatha, NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); size = strlen(filename) + strlen(extension) + 1; - modulenamea = new CHAR [size]; + LPSTR modulenamea = new CHAR [size]; strncpy_s(modulenamea, size, filename, _TRUNCATE); strncat_s(modulenamea, size, extension, _TRUNCATE); _strlwr_s(modulenamea, size); @@ -1661,21 +1642,25 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, } else { // See if this is a module listed in the patch table. If it is, update - // the corresponding patch table entries' module base address. - for (index = 0; index < tablesize; index++) { - entry = &m_patchtable[index]; + // the corresponding patch table entries' module base address. + UINT tablesize = _countof(m_patchtable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &m_patchtable[index]; if (_stricmp(entry->exportmodulename, modulenamea) == 0) { entry->modulebase = (UINT_PTR)modulebase; } } } - // Record the module's information and store it in the set. + // Record the module's information and store it in the set. + moduleinfo_t moduleinfo; moduleinfo.addrlow = (UINT_PTR)modulebase; moduleinfo.addrhigh = (UINT_PTR)(modulebase + modulesize) - 1; moduleinfo.flags = 0x0; moduleinfo.name = modulenamea; - moduleinfo.path = modulepatha; + moduleinfo.path = modulepatha; + + ModuleSet* newmodules = (ModuleSet*)context; newmodules->insert(moduleinfo); return TRUE; @@ -2317,14 +2302,11 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) { - moduleentry_t *entry; - UINT index; - UINT tablesize = _countof(vld.m_patchtable); - // See if there is an entry in the patch table that matches the requested // function. - for (index = 0; index < tablesize; index++) { - entry = &vld.m_patchtable[index]; + UINT tablesize = _countof(vld.m_patchtable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &vld.m_patchtable[index]; if ((entry->modulebase == 0x0) || ((HMODULE)entry->modulebase != module)) { // This patch table entry is for a different module. continue; @@ -3538,3 +3520,20 @@ void VisualLeakDetector::ResolveCallstacks() } } +HMODULE VisualLeakDetector::GetSxSModuleHandle(LPCSTR modulenamea) +{ + HMODULE hDll = NULL; + UINT tablesize = _countof(m_patchtable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &m_patchtable[index]; + if (_stricmp(entry->exportmodulename, modulenamea) == 0) { + hDll = (HMODULE)entry->modulebase; + break; + } + } + + if (hDll == NULL) + hDll = GetModuleHandleA(modulenamea); + + return hDll; +} diff --git a/vldint.h b/vldint.h index f6385df1..7509b23c 100644 --- a/vldint.h +++ b/vldint.h @@ -226,6 +226,7 @@ class VisualLeakDetector : public IMalloc bool GetModulesList(WCHAR *modules, UINT size); VOID ResolveCallstacks(); + static HMODULE GetSxSModuleHandle(LPCSTR modulenamea); static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); private: //////////////////////////////////////////////////////////////////////////////// From 8d4d7cd5b8dbaee274ae8567e7ebc59f0481813b Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 25 Mar 2011 20:47:37 +0000 Subject: [PATCH 037/321] Unicode-to-multibyte conversion fixed Patch by VictorKharkov git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C64871 --- callstack.cpp | 36 +++---- crtmfcpatch.h | 48 +++------ utility.cpp | 125 +++++++++++----------- vld.cpp | 282 ++++++++++++++++++++++---------------------------- vldapi.cpp | 2 +- 5 files changed, 213 insertions(+), 280 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 1f362b70..fe109b65 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -112,11 +112,6 @@ CallStack& CallStack::operator = (const CallStack &) // BOOL CallStack::operator == (const CallStack &other) const { - const CallStack::chunk_t *chunk = &m_store; - UINT32 index; - const CallStack::chunk_t *otherchunk = &other.m_store; - const CallStack::chunk_t *prevchunk = NULL; - if (m_size != other.m_size) { // They can't be equal if the sizes are different. return FALSE; @@ -124,8 +119,11 @@ BOOL CallStack::operator == (const CallStack &other) const // Walk the chunk list and within each chunk walk the frames array until we // either find a mismatch, or until we reach the end of the call stacks. + const CallStack::chunk_t *prevchunk = NULL; + const CallStack::chunk_t *chunk = &m_store; + const CallStack::chunk_t *otherchunk = &other.m_store; while (prevchunk != m_topchunk) { - for (index = 0; index < ((chunk == m_topchunk) ? m_topindex : CALLSTACKCHUNKSIZE); index++) { + for (UINT32 index = 0; index < ((chunk == m_topchunk) ? m_topindex : CALLSTACKCHUNKSIZE); index++) { if (chunk->frames[index] != otherchunk->frames[index]) { // Found a mismatch. They are not equal. return FALSE; @@ -159,11 +157,10 @@ BOOL CallStack::operator == (const CallStack &other) const // UINT_PTR CallStack::operator [] (UINT32 index) const { - UINT32 count; - const CallStack::chunk_t *chunk = &m_store; UINT32 chunknumber = index / CALLSTACKCHUNKSIZE; + const CallStack::chunk_t *chunk = &m_store; - for (count = 0; count < chunknumber; count++) { + for (UINT32 count = 0; count < chunknumber; count++) { chunk = chunk->next; } @@ -390,13 +387,11 @@ void CallStack::DumpResolved() const // DWORD CallStack::getHashValue () const { - UINT32 frame; - UINT_PTR programcounter; DWORD hashcode = 0xD202EF8D; // Iterate through each frame in the call stack. - for (frame = 0; frame < m_size; frame++) { - programcounter = (*this)[frame]; + for (UINT32 frame = 0; frame < m_size; frame++) { + UINT_PTR programcounter = (*this)[frame]; hashcode = CalculateCRC32(programcounter, hashcode); } return hashcode; @@ -417,11 +412,9 @@ DWORD CallStack::getHashValue () const // VOID CallStack::push_back (const UINT_PTR programcounter) { - CallStack::chunk_t *chunk; - if (m_size == m_capacity) { // At current capacity. Allocate additional storage. - chunk = new CallStack::chunk_t; + CallStack::chunk_t *chunk = new CallStack::chunk_t; chunk->next = NULL; m_topchunk->next = chunk; m_topchunk = chunk; @@ -551,14 +544,9 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) // VOID SafeCallStack::getstacktrace (UINT32 maxdepth, context_t& context) { - DWORD architecture; - CONTEXT currentcontext; - UINT32 count = 0; - STACKFRAME64 frame; - UINT_PTR* framepointer = context.fp; - - architecture = X86X64ARCHITECTURE; + DWORD architecture = X86X64ARCHITECTURE; + CONTEXT currentcontext; memset(¤tcontext, 0, sizeof(currentcontext)); // Get the required values for initialization of the STACKFRAME64 structure @@ -581,6 +569,7 @@ VOID SafeCallStack::getstacktrace (UINT32 maxdepth, context_t& context) #endif // _M_IX86 || _M_X64 // Initialize the STACKFRAME64 structure. + STACKFRAME64 frame; memset(&frame, 0x0, sizeof(frame)); frame.AddrPC.Offset = currentcontext.IPREG; frame.AddrPC.Mode = AddrModeFlat; @@ -592,6 +581,7 @@ VOID SafeCallStack::getstacktrace (UINT32 maxdepth, context_t& context) // Walk the stack. EnterCriticalSection(&stackwalklock); + UINT32 count = 0; while (count < maxdepth) { count++; if (!StackWalk64(architecture, currentprocess, currentthread, &frame, ¤tcontext, NULL, diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 031c46b1..95529e7c 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -126,14 +126,13 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, static _calloc_dbg_t pcrtxxd__calloc_dbg = NULL; context_t context; - HMODULE msvcrxxd; CAPTURE_CONTEXT(context); if (pcrtxxd__calloc_dbg == NULL) { // This is the first call to this function. Link to the real // _calloc_dbg. - msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd__calloc_dbg = (_calloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_calloc_dbg"); } @@ -166,14 +165,13 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, static _malloc_dbg_t pcrtxxd__malloc_dbg = NULL; context_t context; - HMODULE msvcrxxd; CAPTURE_CONTEXT(context); if (pcrtxxd__malloc_dbg == NULL) { // This is the first call to this function. Link to the real // _malloc_dbg. - msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd__malloc_dbg = (_malloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_malloc_dbg"); } @@ -209,14 +207,13 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, static _realloc_dbg_t pcrtxxd__realloc_dbg = NULL; context_t context; - HMODULE msvcrxxd; CAPTURE_CONTEXT(context); if (pcrtxxd__realloc_dbg == NULL) { // This is the first call to this function. Link to the real // _realloc_dbg. - msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd__realloc_dbg = (_realloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_realloc_dbg"); } @@ -299,13 +296,12 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) static calloc_t pcrtxxd_calloc = NULL; context_t context; - HMODULE msvcrxxd; CAPTURE_CONTEXT(context); if (pcrtxxd_calloc == NULL) { // This is the first call to this function. Link to the real malloc. - msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd_calloc = (calloc_t)vld._RGetProcAddress(msvcrxxd, "calloc"); } @@ -330,13 +326,12 @@ void* CrtMfcPatch::crtd_malloc (size_t size) static malloc_t pcrtxxd_malloc = NULL; context_t context; - HMODULE msvcrxxd; CAPTURE_CONTEXT(context); if (pcrtxxd_malloc == NULL) { // This is the first call to this function. Link to the real malloc. - msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd_malloc = (malloc_t)vld._RGetProcAddress(msvcrxxd, "malloc"); } @@ -363,13 +358,12 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) static realloc_t pcrtxxd_realloc = NULL; context_t context; - HMODULE msvcrxxd; CAPTURE_CONTEXT(context); if (pcrtxxd_realloc == NULL) { // This is the first call to this function. Link to the real realloc. - msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd_realloc = (realloc_t)vld._RGetProcAddress(msvcrxxd, "realloc"); } @@ -442,13 +436,11 @@ void* CrtMfcPatch::crtd_new_dbg (context_t& context, int line) { static new_dbg_crt_t pcrtxxd_new_dbg = NULL; - - HMODULE msvcrxxd; - + if (pcrtxxd_new_dbg == NULL) { // This is the first call to this function. Link to the real CRT debug // new operator. - msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd_new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(msvcrxxd, procname); } @@ -474,13 +466,11 @@ template void* CrtMfcPatch::crtd_new (context_t& context, size_t size) { static new_t pcrtxxd_scalar_new = NULL; - - HMODULE msvcrxxd; - + if (pcrtxxd_scalar_new == NULL) { // This is the first call to this function. Link to the real CRT new // operator. - msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); assert(msvcrxxd != NULL); pcrtxxd_scalar_new = (new_t)vld._RGetProcAddress(msvcrxxd, procname); } @@ -817,13 +807,11 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, int line) { static new_dbg_crt_t pmfcxxd__new_dbg = NULL; - - HMODULE mfcxxd; - + if (pmfcxxd__new_dbg == NULL) { // This is the first call to this function. Link to the real MFC debug // new operator. - mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); + HMODULE mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); assert(mfcxxd != NULL); pmfcxxd__new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } @@ -859,13 +847,11 @@ void* CrtMfcPatch::mfcd_new_dbg (context_t& context, int line) { static new_dbg_mfc_t pmfcxxd__new_dbg = NULL; - - HMODULE mfcxxd; - + if (pmfcxxd__new_dbg == NULL) { // This is the first call to this function. Link to the real MFC debug // new operator. - mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); + HMODULE mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); assert(mfcxxd != NULL); pmfcxxd__new_dbg = (new_dbg_mfc_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } @@ -891,13 +877,11 @@ template void* CrtMfcPatch::mfcd_new (context_t& context, size_t size) { static new_t pmfcxxd_new = NULL; - - HMODULE mfcxxd; - + if (pmfcxxd_new == NULL) { // This is the first call to this function. Link to the real CRT new // operator. - mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); + HMODULE mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); assert(mfcxxd != NULL); pmfcxxd_new = (new_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); } diff --git a/utility.cpp b/utility.cpp index 85c52916..84c7f76b 100644 --- a/utility.cpp +++ b/utility.cpp @@ -51,17 +51,8 @@ static encoding_e reportencoding = ascii; // Output encoding of the memory lea // VOID dumpmemorya (LPCVOID address, SIZE_T size) { - WCHAR ascdump [18] = {0}; - SIZE_T ascindex; - BYTE byte; - SIZE_T byteindex; - SIZE_T bytesdone; - SIZE_T dumplen; - WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; - WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; - SIZE_T hexindex; - // Each line of output is 16 bytes. + SIZE_T dumplen; if ((size % 16) == 0) { // No padding needed. dumplen = size; @@ -73,12 +64,15 @@ VOID dumpmemorya (LPCVOID address, SIZE_T size) // For each byte of data, get both the ASCII equivalent (if it is a // printable character) and the hex representation. - bytesdone = 0; - for (byteindex = 0; byteindex < dumplen; byteindex++) { - hexindex = 3 * ((byteindex % 16) + ((byteindex % 16) / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. - ascindex = (byteindex % 16) + (byteindex % 16) / 8; // 1 character per byte, plus a 1-character space after every 8 bytes. + SIZE_T bytesdone = 0; + WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; + WCHAR ascdump [18] = {0}; + WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; + for (SIZE_T byteindex = 0; byteindex < dumplen; byteindex++) { + SIZE_T hexindex = 3 * ((byteindex % 16) + ((byteindex % 16) / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. + SIZE_T ascindex = (byteindex % 16) + (byteindex % 16) / 8; // 1 character per byte, plus a 1-character space after every 8 bytes. if (byteindex < size) { - byte = ((PBYTE)address)[byteindex]; + BYTE byte = ((PBYTE)address)[byteindex]; _snwprintf_s(formatbuf, BYTEFORMATBUFFERLENGTH, _TRUNCATE, L"%.2X ", byte); formatbuf[3] = '\0'; wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, formatbuf, 4); @@ -126,18 +120,8 @@ VOID dumpmemorya (LPCVOID address, SIZE_T size) // VOID dumpmemoryw (LPCVOID address, SIZE_T size) { - BYTE byte; - SIZE_T byteindex; - SIZE_T bytesdone; - SIZE_T dumplen; - WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; - WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; - SIZE_T hexindex; - WORD word; - WCHAR unidump [18] = {0}; - SIZE_T uniindex; - // Each line of output is 16 bytes. + SIZE_T dumplen; if ((size % 16) == 0) { // No padding needed. dumplen = size; @@ -149,18 +133,21 @@ VOID dumpmemoryw (LPCVOID address, SIZE_T size) // For each word of data, get both the Unicode equivalent and the hex // representation. - bytesdone = 0; - for (byteindex = 0; byteindex < dumplen; byteindex++) { - hexindex = 3 * ((byteindex % 16) + ((byteindex % 16) / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. - uniindex = ((byteindex / 2) % 8) + ((byteindex / 2) % 8) / 8; // 1 character every other byte, plus a 1-character space after every 8 bytes. + WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; + WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; + WCHAR unidump [18] = {0}; + SIZE_T bytesdone = 0; + for (SIZE_T byteindex = 0; byteindex < dumplen; byteindex++) { + SIZE_T hexindex = 3 * ((byteindex % 16) + ((byteindex % 16) / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. + SIZE_T uniindex = ((byteindex / 2) % 8) + ((byteindex / 2) % 8) / 8; // 1 character every other byte, plus a 1-character space after every 8 bytes. if (byteindex < size) { - byte = ((PBYTE)address)[byteindex]; + BYTE byte = ((PBYTE)address)[byteindex]; _snwprintf_s(formatbuf, BYTEFORMATBUFFERLENGTH, _TRUNCATE, L"%.2X ", byte); formatbuf[BYTEFORMATBUFFERLENGTH - 1] = '\0'; wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, formatbuf, 4); if (((byteindex % 2) == 0) && ((byteindex + 1) < dumplen)) { // On every even byte, print one character. - word = ((PWORD)address)[byteindex / 2]; + WORD word = ((PWORD)address)[byteindex / 2]; if ((word == 0x0000) || (word == 0x0020)) { unidump[uniindex] = L'.'; } @@ -274,7 +261,17 @@ BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodule // Get the *real* address of the import. If we find this address in the IAT, // then we've found that the module does import the named import. import = GetProcAddress(exportmodule, importname); - assert(import != NULL); // Perhaps the named export module does not actually export the named import? + + // Perhaps the named export module does not actually export the named import? + //assert(import != NULL); - on my Windows 7 x64, VS 9 SP1, Win x32 project assertion failure will cause new DLL loading, and then infinite loop of calls to findimport() and stack overflow. Maybe it's caused by antivirus, nevertheless this solution fixes infinite loop + if ( import == NULL ) // - instead of assert + { + OutputDebugStringW(__FUNCTIONW__ L"(" __FILEW__ L") : import == NULL\n" ); + if ( ::IsDebuggerPresent() ) + __debugbreak(); + + return FALSE; + } // Locate the import's IAT entry. iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); @@ -372,15 +369,12 @@ VOID insertreportdelay () // BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize) { - moduleentry_t *entry; - BOOL found = FALSE; - UINT index; - // Loop through the import patch table, individually checking each patch // entry to see if it is installed in the import module. If any patch entry // is installed in the import module, then the module has been patched. - for (index = 0; index < tablesize; index++) { - entry = &patchtable[index]; + BOOL found = FALSE; + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &patchtable[index]; found = findpatch(importmodule, entry); if (found == TRUE) { // Found one of the listed patches installed in the import module. @@ -807,11 +801,8 @@ VOID setreportfile (FILE *file, BOOL copydebugger, BOOL tostdout) // VOID strapp (LPWSTR *dest, LPCWSTR source) { - SIZE_T length; - LPWSTR temp; - - temp = *dest; - length = wcslen(*dest) + wcslen(source); + LPWSTR temp = *dest; + SIZE_T length = wcslen(*dest) + wcslen(source); *dest = new WCHAR [length + 1]; wcsncpy_s(*dest, length + 1, temp, _TRUNCATE); wcsncat_s(*dest, length + 1, source, _TRUNCATE); @@ -963,21 +954,21 @@ DWORD CalculateCRC32(UINT_PTR p, UINT startValue) // list of arguments. void GetFormattedMessage(DWORD last_error) { - // Retrieve the system error message for the last-error code - WCHAR lpMsgBuf[MAX_PATH] = {0}; - - FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - last_error, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - lpMsgBuf, - MAX_PATH, - NULL ); - - // Display the error message. - report(L"%s", lpMsgBuf); + // Retrieve the system error message for the last-error code + WCHAR lpMsgBuf[MAX_PATH] = {0}; + + FormatMessage( + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + last_error, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + lpMsgBuf, + MAX_PATH, + NULL ); + + // Display the error message. + report(L"%s", lpMsgBuf); } // GetCallingModule - Return calling module by address. @@ -988,12 +979,12 @@ void GetFormattedMessage(DWORD last_error) // HMODULE GetCallingModule( UINT_PTR pCaller ) { - HMODULE hModule = NULL; - MEMORY_BASIC_INFORMATION mbi; - if ( VirtualQuery((LPCVOID)pCaller, &mbi, sizeof(MEMORY_BASIC_INFORMATION)) == sizeof(MEMORY_BASIC_INFORMATION) ) - { - // the allocation base is the beginning of a PE file - hModule = (HMODULE) mbi.AllocationBase; - } - return hModule; + HMODULE hModule = NULL; + MEMORY_BASIC_INFORMATION mbi; + if ( VirtualQuery((LPCVOID)pCaller, &mbi, sizeof(MEMORY_BASIC_INFORMATION)) == sizeof(MEMORY_BASIC_INFORMATION) ) + { + // the allocation base is the beginning of a PE file + hModule = (HMODULE) mbi.AllocationBase; + } + return hModule; } diff --git a/vld.cpp b/vld.cpp index 0278228d..37738a44 100644 --- a/vld.cpp +++ b/vld.cpp @@ -499,41 +499,32 @@ VisualLeakDetector::VisualLeakDetector () // VisualLeakDetector::~VisualLeakDetector () { - BlockMap::Iterator blockit; - BlockMap *blockmap; - size_t count; - vldblockheader_t *header; - HeapMap::Iterator heapit; - SIZE_T internalleaks = 0; - const char *leakfile = NULL; - WCHAR leakfilew [MAX_PATH]; - int leakline = 0; - ModuleSet::Iterator moduleit; - HANDLE thread; - BOOL threadsactive= FALSE; - TlsSet::Iterator tlsit; - DWORD dwCurProcessID; - if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. return; } + size_t count; + SIZE_T internalleaks = 0; + WCHAR leakfilew [MAX_PATH]; + const char *leakfile = NULL; + int leakline = 0; + BOOL threadsactive= FALSE; if (m_status & VLD_STATUS_INSTALLED) { // Detach Visual Leak Detector from all previously attached modules. EnumerateLoadedModulesW64(currentprocess, detachfrommodule, NULL); - dwCurProcessID = GetCurrentProcessId(); + DWORD dwCurProcessID = GetCurrentProcessId(); // See if any threads that have ever entered VLD's code are still active. EnterCriticalSection(&m_tlslock); - for (tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { + for (TlsSet::Iterator tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { if ((*tlsit)->threadid == GetCurrentThreadId()) { // Don't wait for the current thread to exit. continue; } - thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit)->threadid); + HANDLE thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit)->threadid); if (thread == NULL) { // Couldn't query this thread. We'll assume that it exited. continue; // XXX should we check GetLastError()? @@ -585,9 +576,9 @@ VisualLeakDetector::~VisualLeakDetector () } // Free internally allocated resources used by the heapmap and blockmap. - for (heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - blockmap = &(*heapit).second->blockmap; - for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + BlockMap *blockmap = &(*heapit).second->blockmap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { delete (*blockit).second->callstack; delete (*blockit).second; } @@ -596,20 +587,20 @@ VisualLeakDetector::~VisualLeakDetector () delete m_heapmap; // Free internally allocated resources used by the loaded module set. - for (moduleit = m_loadedmodules->begin(); moduleit != m_loadedmodules->end(); ++moduleit) { + for (ModuleSet::Iterator moduleit = m_loadedmodules->begin(); moduleit != m_loadedmodules->end(); ++moduleit) { delete (*moduleit).name; delete (*moduleit).path; } delete m_loadedmodules; // Free internally allocated resources used for thread local storage. - for (tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { + for (TlsSet::Iterator tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { delete *tlsit; } delete m_tlsset; // Do a memory leak self-check. - header = vldblocklist; + vldblockheader_t *header = vldblocklist; while (header) { // Doh! VLD still has an internally allocated block! // This won't ever actually happen, right guys?... guys? @@ -699,31 +690,31 @@ VisualLeakDetector::~VisualLeakDetector () // VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) { - ModuleSet::Muterator updateit; + ModuleSet::Muterator updateit; // Iterate through the supplied set, until all modules have been attached. for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { - DWORD64 modulebase = (DWORD64)(*newit).addrlow; + DWORD64 modulebase = (DWORD64)(*newit).addrlow; UINT32 moduleflags = 0x0; LPCSTR modulename = (*newit).name; LPCSTR modulepath = (*newit).path; DWORD modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; - BOOL refresh = FALSE; - EnterCriticalSection(&m_moduleslock); - ModuleSet* oldmodules = m_loadedmodules; + BOOL refresh = FALSE; + EnterCriticalSection(&m_moduleslock); + ModuleSet* oldmodules = m_loadedmodules; if (oldmodules != NULL) { // This is not the first time we have been called to attach to the // currently loaded modules. - ModuleSet::Iterator oldit = oldmodules->find(*newit); + ModuleSet::Iterator oldit = oldmodules->find(*newit); if (oldit != oldmodules->end()) { // We've seen this "new" module loaded in the process before. moduleflags = (*oldit).flags; - LeaveCriticalSection(&m_moduleslock); + LeaveCriticalSection(&m_moduleslock); if (moduleispatched((HMODULE)modulebase, m_patchtable, _countof(m_patchtable))) { // This module is already attached. Just update the module's // flags, nothing more. - updateit = newit; + updateit = newit; (*updateit).flags = moduleflags; continue; } @@ -754,8 +745,8 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // Try to load the module's symbols. This ensures that we have loaded // the symbols for every module that has ever been loaded into the // process, guaranteeing the symbols' availability when generating the - // leak report. - IMAGEHLP_MODULE64 moduleimageinfo; + // leak report. + IMAGEHLP_MODULE64 moduleimageinfo; moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); BOOL SymbolsLoaded = SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo); if (!SymbolsLoaded) @@ -775,9 +766,9 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) continue; } - size_t count; + size_t count; #define MAXMODULENAME (_MAX_FNAME + _MAX_EXT) - WCHAR modulenamew [MAXMODULENAME]; + WCHAR modulenamew [MAXMODULENAME]; mbstowcs_s(&count, modulenamew, MAXMODULENAME, modulename, _TRUNCATE); if ((findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A") == FALSE) && (wcsstr(vld.m_forcedmodulelist, modulenamew) == NULL)) { @@ -799,7 +790,7 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) updateit = newit; (*updateit).flags = moduleflags; - // Attach to the module. + // Attach to the module. patchmodule((HMODULE)modulebase, m_patchtable, _countof(m_patchtable)); } } @@ -815,23 +806,14 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // LPWSTR VisualLeakDetector::buildsymbolsearchpath () { - WCHAR directory [_MAX_DIR]; - WCHAR drive [_MAX_DRIVE]; - LPWSTR env; - DWORD envlen; - SIZE_T index; - SIZE_T length; - HMODULE module; - LPWSTR path = new WCHAR [MAX_PATH]; - SIZE_T pos = 0; - WCHAR system [MAX_PATH]; - WCHAR windows [MAX_PATH]; - // Oddly, the symbol handler ignores the link to the PDB embedded in the // executable image. So, we'll manually add the location of the executable // to the search path since that is often where the PDB will be located. + WCHAR directory [_MAX_DIR]; + WCHAR drive [_MAX_DRIVE]; + LPWSTR path = new WCHAR [MAX_PATH]; path[0] = L'\0'; - module = GetModuleHandleW(NULL); + HMODULE module = GetModuleHandleW(NULL); GetModuleFileName(module, path, MAX_PATH); _wsplitpath_s(path, drive, _MAX_DRIVE, directory, _MAX_DIR, NULL, 0, NULL, 0); wcsncpy_s(path, MAX_PATH, drive, _TRUNCATE); @@ -846,21 +828,23 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () strapp(&path, L";.\\"); // Append the Windows directory. + WCHAR windows [MAX_PATH]; if (GetWindowsDirectory(windows, MAX_PATH) != 0) { strapp(&path, L";"); strapp(&path, windows); } // Append the system directory. + WCHAR system [MAX_PATH]; if (GetSystemDirectory(system, MAX_PATH) != 0) { strapp(&path, L";"); strapp(&path, system); } // Append %_NT_SYMBOL_PATH%. - envlen = GetEnvironmentVariable(L"_NT_SYMBOL_PATH", NULL, 0); + DWORD envlen = GetEnvironmentVariable(L"_NT_SYMBOL_PATH", NULL, 0); if (envlen != 0) { - env = new WCHAR [envlen]; + LPWSTR env = new WCHAR [envlen]; if (GetEnvironmentVariable(L"_NT_SYMBOL_PATH", env, envlen) != 0) { strapp(&path, L";"); strapp(&path, env); @@ -871,7 +855,7 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () // Append %_NT_ALT_SYMBOL_PATH%. envlen = GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", NULL, 0); if (envlen != 0) { - env = new WCHAR [envlen]; + LPWSTR env = new WCHAR [envlen]; if (GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", env, envlen) != 0) { strapp(&path, L";"); strapp(&path, env); @@ -902,11 +886,11 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () } // Remove any quotes from the path. The symbol handler doesn't like them. - pos = 0; - length = wcslen(path); + SIZE_T pos = 0; + SIZE_T length = wcslen(path); while (pos < length) { if (path[pos] == L'\"') { - for (index = pos; index < length; index++) { + for (SIZE_T index = pos; index < length; index++) { path[index] = path[index + 1]; } } @@ -924,24 +908,20 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () // VOID VisualLeakDetector::configure () { -#define BSIZE 64 - WCHAR buffer [BSIZE] = {0}; - WCHAR filename [MAX_PATH] = {0}; WCHAR inipath [MAX_PATH] = {0}; - BOOL keyopen = FALSE; - DWORD length = 0; - HKEY productkey = 0; - LONG regstatus = 0; struct _stat s; - DWORD valuetype = 0; - if (_wstat(L".\\vld.ini", &s) == 0) { // Found a copy of vld.ini in the working directory. Use it. wcsncpy_s(inipath, MAX_PATH, L".\\vld.ini", _TRUNCATE); } else { + BOOL keyopen = FALSE; + HKEY productkey = 0; + DWORD length = 0; + DWORD valuetype = 0; + // Get the location of the vld.ini file from the registry. - regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + LONG regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); if (regstatus == ERROR_SUCCESS) { keyopen = TRUE; length = MAX_PATH * sizeof(WCHAR); @@ -972,6 +952,8 @@ VOID VisualLeakDetector::configure () } } +#define BSIZE 64 + WCHAR buffer [BSIZE] = {0}; // Read the boolean options. GetPrivateProfileString(L"Options", L"VLD", L"on", buffer, BSIZE, inipath); if (strtobool(buffer) == FALSE) { @@ -1021,6 +1003,7 @@ VOID VisualLeakDetector::configure () _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); // Read the report destination (debugger, file, or both). + WCHAR filename [MAX_PATH] = {0}; GetPrivateProfileString(L"Options", L"ReportFile", L"", filename, MAX_PATH, inipath); if (wcslen(filename) == 0) { wcsncpy_s(filename, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); @@ -1194,14 +1177,10 @@ tls_t* VisualLeakDetector::gettls () // VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack) { - blockinfo_t *blockinfo; - BlockMap::Iterator blockit; - BlockMap *blockmap; - HeapMap::Iterator heapit; - static SIZE_T serialnumber = 0; + static SIZE_T serialnumber = 0; // Record the block's information. - blockinfo = new blockinfo_t; + blockinfo_t *blockinfo = new blockinfo_t; blockinfo->callstack = NULL; ppcallstack = &blockinfo->callstack; blockinfo->serialnumber = serialnumber++; @@ -1209,7 +1188,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c // Insert the block's information into the block map. EnterCriticalSection(&m_maplock); - heapit = m_heapmap->find(heap); + HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We haven't mapped this heap to a block map yet. Do it now. mapheap(heap); @@ -1220,8 +1199,8 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c // The heap that this block was allocated from is a CRT heap. (*heapit).second->flags |= VLD_HEAP_CRT; } - blockmap = &(*heapit).second->blockmap; - blockit = blockmap->insert(mem, blockinfo); + BlockMap *blockmap = &(*heapit).second->blockmap; + BlockMap::Iterator blockit = blockmap->insert(mem, blockinfo); if (blockit == blockmap->end()) { // A block with this address has already been allocated. The // previously allocated block must have been freed (probably by some @@ -1300,11 +1279,6 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack) { - BlockMap::Iterator blockit; - BlockMap *blockmap; - HeapMap::Iterator heapit; - blockinfo_t *info; - if (newmem != mem) { // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. @@ -1316,7 +1290,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was reallocated in-place. Find the existing blockinfo_t // entry in the block map and update it with the new callstack and size. EnterCriticalSection(&m_maplock); - heapit = m_heapmap->find(heap); + HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We haven't mapped this heap to a block map yet. Obviously the // block has also not been mapped to a blockinfo_t entry yet either, @@ -1328,8 +1302,8 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S } // Find the block's blockinfo_t structure so that we can update it. - blockmap = &(*heapit).second->blockmap; - blockit = blockmap->find(mem); + BlockMap *blockmap = &(*heapit).second->blockmap; + BlockMap::Iterator blockit = blockmap->find(mem); if (blockit == blockmap->end()) { // The block hasn't been mapped to a blockinfo_t entry yet. // Treat this reallocation as a new allocation. @@ -1340,7 +1314,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // Found the blockinfo_t entry for this block. Update it with // a new callstack and new size. - info = (*blockit).second; + blockinfo_t *info = (*blockit).second; if (info->callstack) { info->callstack->clear(); @@ -1513,14 +1487,9 @@ VOID VisualLeakDetector::reportleaks (HANDLE heap) // VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) { - BlockMap::Iterator blockit; - BlockMap *blockmap; - HeapMap::Iterator heapit; - blockinfo_t *info; - // Find this heap's block map. EnterCriticalSection(&m_maplock); - heapit = m_heapmap->find(heap); + HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We don't have a block map for this heap. We must not have monitored // this allocation (probably happened before VLD was initialized). @@ -1529,8 +1498,8 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) } // Find this block in the block map. - blockmap = &(*heapit).second->blockmap; - blockit = blockmap->find(mem); + BlockMap *blockmap = &(*heapit).second->blockmap; + BlockMap::Iterator blockit = blockmap->find(mem); if (blockit == blockmap->end()) { // This block is not in the block map. We must not have monitored this // allocation (probably happened before VLD was initialized). @@ -1539,7 +1508,7 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) } // Free the blockinfo_t structure and erase it from the block map. - info = (*blockit).second; + blockinfo_t *info = (*blockit).second; delete info->callstack; delete info; blockmap->erase(blockit); @@ -1558,14 +1527,9 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) // VOID VisualLeakDetector::unmapheap (HANDLE heap) { - BlockMap::Iterator blockit; - BlockMap *blockmap; - heapinfo_t *heapinfo; - HeapMap::Iterator heapit; - // Find this heap's block map. EnterCriticalSection(&m_maplock); - heapit = m_heapmap->find(heap); + HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // This heap hasn't been mapped. We must not have monitored this heap's // creation (probably happened before VLD was initialized). @@ -1574,9 +1538,9 @@ VOID VisualLeakDetector::unmapheap (HANDLE heap) } // Free all of the blockinfo_t structures stored in the block map. - heapinfo = (*heapit).second; - blockmap = &heapinfo->blockmap; - for (blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + heapinfo_t *heapinfo = (*heapit).second; + BlockMap *blockmap = &heapinfo->blockmap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { delete (*blockit).second->callstack; delete (*blockit).second; } @@ -1621,20 +1585,34 @@ VOID VisualLeakDetector::unmapheap (HANDLE heap) BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context) { // Convert the module path to ASCII. - SIZE_T size = wcslen(modulepath) + 1; - LPSTR modulepatha = new CHAR [size]; - size_t count; - wcstombs_s(&count, modulepatha, size, modulepath, _TRUNCATE); - - // Extract just the filename and extension from the module path. - CHAR filename [_MAX_FNAME]; - CHAR extension [_MAX_EXT]; + size_t length = wcslen(modulepath) + 1; + LPSTR modulepatha = new CHAR [length]; + + // wcstombs_s requires locale to be already set up correctly, but it might not be correct on vld init step. So use WideCharToMultiByte instead + CHAR defaultChar = '?'; + BOOL defaultCharUsed = FALSE; + + int count = ::WideCharToMultiByte(CP_ACP, 0/*flags*/, modulepath, (int)length, modulepatha, (int)length, &defaultChar, &defaultCharUsed); + assert(count != 0); + if ( defaultCharUsed ) + { + ::OutputDebugStringW(__FILEW__ L": " __FUNCTIONW__ L" - defaultChar was used while convertion from \""); + ::OutputDebugStringW(modulepath); + ::OutputDebugStringW(L"\" to ANSI \""); + ::OutputDebugStringA(modulepatha); + ::OutputDebugStringW(L"\". Result can be wrong.\n"); + } + + // Extract just the filename and extension from the module path. + CHAR filename [_MAX_FNAME]; + CHAR extension [_MAX_EXT]; _splitpath_s(modulepatha, NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); - size = strlen(filename) + strlen(extension) + 1; - LPSTR modulenamea = new CHAR [size]; - strncpy_s(modulenamea, size, filename, _TRUNCATE); - strncat_s(modulenamea, size, extension, _TRUNCATE); - _strlwr_s(modulenamea, size); + + length = strlen(filename) + strlen(extension) + 1; + LPSTR modulenamea = new CHAR [length]; + strncpy_s(modulenamea, length, filename, _TRUNCATE); + strncat_s(modulenamea, length, extension, _TRUNCATE); + _strlwr_s(modulenamea, length); if (_stricmp(modulenamea, VLDDLL) == 0) { // Record Visual Leak Detector's own base address. @@ -1642,8 +1620,8 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, } else { // See if this is a module listed in the patch table. If it is, update - // the corresponding patch table entries' module base address. - UINT tablesize = _countof(m_patchtable); + // the corresponding patch table entries' module base address. + UINT tablesize = _countof(m_patchtable); for (UINT index = 0; index < tablesize; index++) { moduleentry_t *entry = &m_patchtable[index]; if (_stricmp(entry->exportmodulename, modulenamea) == 0) { @@ -1652,15 +1630,15 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, } } - // Record the module's information and store it in the set. - moduleinfo_t moduleinfo; + // Record the module's information and store it in the set. + moduleinfo_t moduleinfo; moduleinfo.addrlow = (UINT_PTR)modulebase; moduleinfo.addrhigh = (UINT_PTR)(modulebase + modulesize) - 1; moduleinfo.flags = 0x0; moduleinfo.name = modulenamea; - moduleinfo.path = modulepatha; + moduleinfo.path = modulepatha; - ModuleSet* newmodules = (ModuleSet*)context; + ModuleSet* newmodules = (ModuleSet*)context; newmodules->insert(moduleinfo); return TRUE; @@ -2304,7 +2282,7 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) { // See if there is an entry in the patch table that matches the requested // function. - UINT tablesize = _countof(vld.m_patchtable); + UINT tablesize = _countof(vld.m_patchtable); for (UINT index = 0; index < tablesize; index++) { moduleentry_t *entry = &vld.m_patchtable[index]; if ((entry->modulebase == 0x0) || ((HMODULE)entry->modulebase != module)) { @@ -2370,35 +2348,29 @@ FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) // HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) { - DWORD64 displacement; - SYMBOL_INFO *functioninfo; - HANDLE heap; - HeapMap::Iterator heapit; - UINT_PTR ra; - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; - BOOL symfound; - // Get the return address within the calling function. - ra = (UINT_PTR)_ReturnAddress(); + UINT_PTR ra = (UINT_PTR)_ReturnAddress(); // Create the heap. - heap = HeapCreate(options, initsize, maxsize); + HANDLE heap = HeapCreate(options, initsize, maxsize); // Map the created heap handle to a new block map. vld.mapheap(heap); // Try to get the name of the function containing the return address. - functioninfo = (SYMBOL_INFO*)&symbolbuffer; + BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; + SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; EnterCriticalSection(&symbollock); - symfound = SymFromAddrW(currentprocess, ra, &displacement, functioninfo); + DWORD64 displacement; + BOOL symfound = SymFromAddrW(currentprocess, ra, &displacement, functioninfo); LeaveCriticalSection(&symbollock); if (symfound == TRUE) { if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { // HeapCreate was called by _heap_init. This is a static CRT heap. EnterCriticalSection(&vld.m_maplock); - heapit = vld.m_heapmap->find(heap); + HeapMap::Iterator heapit = vld.m_heapmap->find(heap); assert(heapit != vld.m_heapmap->end()); (*heapit).second->flags |= VLD_HEAP_CRT; LeaveCriticalSection(&vld.m_maplock); @@ -2457,21 +2429,17 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, PHANDLE modulehandle) { - ModuleSet::Iterator moduleit; - ModuleSet *newmodules; - ModuleSet *oldmodules; - NTSTATUS status; EnterCriticalSection(&vld.m_loaderlock); // Load the DLL. - status = LdrLoadDll(searchpath, flags, modulename, modulehandle); + NTSTATUS status = LdrLoadDll(searchpath, flags, modulename, modulehandle); if (STATUS_SUCCESS == status) { // Duplicate code here from VisualLeakDetector::RefreshModules. Consider refactoring this out. // Create a new set of all loaded modules, including any newly loaded // modules. - newmodules = new ModuleSet; + ModuleSet *newmodules = new ModuleSet; newmodules->reserve(MODULESETRESERVE); EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); @@ -2480,12 +2448,12 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod // Start using the new set of loaded modules. EnterCriticalSection(&vld.m_moduleslock); - oldmodules = vld.m_loadedmodules; + ModuleSet *oldmodules = vld.m_loadedmodules; vld.m_loadedmodules = newmodules; LeaveCriticalSection(&vld.m_moduleslock); // Free resources used by the old module list. - for (moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { + for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { delete (*moduleit).name; delete (*moduleit).path; } @@ -3522,18 +3490,18 @@ void VisualLeakDetector::ResolveCallstacks() HMODULE VisualLeakDetector::GetSxSModuleHandle(LPCSTR modulenamea) { - HMODULE hDll = NULL; - UINT tablesize = _countof(m_patchtable); - for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &m_patchtable[index]; - if (_stricmp(entry->exportmodulename, modulenamea) == 0) { - hDll = (HMODULE)entry->modulebase; - break; - } - } - - if (hDll == NULL) - hDll = GetModuleHandleA(modulenamea); - - return hDll; + HMODULE hDll = NULL; + UINT tablesize = _countof(m_patchtable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &m_patchtable[index]; + if (_stricmp(entry->exportmodulename, modulenamea) == 0) { + hDll = (HMODULE)entry->modulebase; + break; + } + } + + if (hDll == NULL) + hDll = GetModuleHandleA(modulenamea); + + return hDll; } diff --git a/vldapi.cpp b/vldapi.cpp index d7b9b38d..db47ec5c 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -114,7 +114,7 @@ __declspec(dllexport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR * __declspec(dllexport) void VLDResolveCallstacks() { - vld.ResolveCallstacks(); + vld.ResolveCallstacks(); } } From 79fdca9a9d39b39cab27783743719f1d68dcce4f Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 25 Mar 2011 21:22:13 +0000 Subject: [PATCH 038/321] SVN properties changed This commit fixes 7054 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C64875 --- utility.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/utility.cpp b/utility.cpp index 84c7f76b..bb881e7c 100644 --- a/utility.cpp +++ b/utility.cpp @@ -204,8 +204,15 @@ IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPC // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + __try + { + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + } + __except(1) + { + idte = NULL; + } LeaveCriticalSection(&imagelock); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). @@ -410,8 +417,15 @@ IMAGE_IMPORT_DESCRIPTOR* findimportdescriptor (HMODULE importmodule, LPCSTR expo // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. EnterCriticalSection(&imagelock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + __try + { + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + } + __except(1) + { + idte = NULL; + } LeaveCriticalSection(&imagelock); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). From 678a48543287ba9085d333bd7711721f695841b1 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 25 Mar 2011 22:50:46 +0000 Subject: [PATCH 039/321] Updated CHANGES.txt git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C64878 --- CHANGES.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index bd57a7c6..c54edca7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,19 +3,22 @@ Visual Leak Detector (VLD) Version 2.1 Change Log / Release Notes -2.1 (06 March 2011) +2.1 (26 March 2011) ---------------------------- Enhancements: + New functions added: VLDGlobalDisable, VLDGlobalEnable, VLDGetOptions, VLDGetReportFilename, VLDSetOptions, VLDSetModulesList, - VLDGetModulesList (see vld.h). + VLDGetModulesList, VLDResolveCallstacks (see vld.h). + Option VLD_OPT_SKIP_HEAPFREE_LEAKS added. + Hash for each leak added + Supported loading symbols from Visual Studio symbol cache directory Bugs Fixed: - + Improved LdrLoadDll hooking on Windows 7. + + Improved LdrLoadDll, GetProcAddress hooking on Windows 7. + "HMODULE not founded" bug fixed. + + Bugs fixed when VLD off. + + Problem fixed with GetModuleHandleW for SxS dll's (mfc*.dll, msvcr*.dll). + + Unicode-to-multibyte conversion fixed. 2.0b (24 August 2010) ---------------------------- From c2058aecd23faf165ba87792af9f4a0f5e56bb60 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 30 Mar 2011 15:48:22 +0000 Subject: [PATCH 040/321] Some printf strings fixed in x64 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C64994 --- callstack.cpp | 2 +- utility.cpp | 7 ++++--- vld.cpp | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index fe109b65..bd92170a 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -460,7 +460,7 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) #if defined(_M_IX86) while (count < maxdepth) { - if (*framepointer < (UINT)framepointer) { + if (*framepointer < (UINT_PTR)framepointer) { if (*framepointer == NULL) { // Looks like we reached the end of the stack. break; diff --git a/utility.cpp b/utility.cpp index bb881e7c..c62ba7b5 100644 --- a/utility.cpp +++ b/utility.cpp @@ -67,10 +67,11 @@ VOID dumpmemorya (LPCVOID address, SIZE_T size) SIZE_T bytesdone = 0; WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; WCHAR ascdump [18] = {0}; - WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; + WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; for (SIZE_T byteindex = 0; byteindex < dumplen; byteindex++) { - SIZE_T hexindex = 3 * ((byteindex % 16) + ((byteindex % 16) / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. - SIZE_T ascindex = (byteindex % 16) + (byteindex % 16) / 8; // 1 character per byte, plus a 1-character space after every 8 bytes. + SIZE_T wordIndex = byteindex % 16; + SIZE_T hexindex = 3 * (wordIndex + (wordIndex / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. + SIZE_T ascindex = wordIndex + wordIndex / 8; // 1 character per byte, plus a 1-character space after every 8 bytes. if (byteindex < size) { BYTE byte = ((PBYTE)address)[byteindex]; _snwprintf_s(formatbuf, BYTEFORMATBUFFERLENGTH, _TRUNCATE, L"%.2X ", byte); diff --git a/vld.cpp b/vld.cpp index 37738a44..930e5a79 100644 --- a/vld.cpp +++ b/vld.cpp @@ -564,7 +564,7 @@ VisualLeakDetector::~VisualLeakDetector () report(L"No memory leaks detected.\n"); } else { - report(L"Visual Leak Detector detected %lu memory leak", m_leaksfound); + report(L"Visual Leak Detector detected %Iu memory leak", m_leaksfound); report((m_leaksfound > 1) ? L"s.\n" : L".\n"); } } @@ -1350,7 +1350,7 @@ VOID VisualLeakDetector::reportconfig () report(L" Suppressing data dumps.\n"); } else { - report(L" Limiting data dumps to %lu bytes.\n", m_maxdatadump); + report(L" Limiting data dumps to %Iu bytes.\n", m_maxdatadump); } } if (m_maxtraceframes != VLD_DEFAULT_MAX_TRACE_FRAMES) { @@ -1448,7 +1448,8 @@ VOID VisualLeakDetector::reportleaks (HANDLE heap) if (duplicates > 1) m_leaksfound += duplicates; - report(L"Leak Hash: 0x%08IX Count: %lu\n", CalculateCRC32(info->size, info->callstack->getHashValue()), duplicates); + DWORD callstackCRC = CalculateCRC32(info->size, info->callstack->getHashValue()); + report(L"Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, duplicates); } // Dump the call stack. report(L" Call Stack:\n"); From 6f80987f57954f9445d917fd8a545f31aeb04981 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 30 Mar 2011 16:20:26 +0000 Subject: [PATCH 041/321] Minor printf fix git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C64995 --- vld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vld.cpp b/vld.cpp index 930e5a79..a739170c 100644 --- a/vld.cpp +++ b/vld.cpp @@ -609,7 +609,7 @@ VisualLeakDetector::~VisualLeakDetector () leakline = header->line; mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); - report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, + report(L"---------- Block %Iu at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, VLDBLOCKDATA(header), header->size); report(L" Call Stack:\n"); report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); From 90c759a8bf45ba98e36b4424695ad31f178a82fd Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 4 Apr 2011 00:18:30 +0000 Subject: [PATCH 042/321] DbgHelp.dll loading fixed on OS Windows XP and bellow This commit fixes 8064 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65102 --- setup/dbghelp/x64/Microsoft.DTfW.DHL.manifest | 7 +++++++ setup/dbghelp/x86/Microsoft.DTfW.DHL.manifest | 7 +++++++ setup/vld-setup.nsi | 12 ++++++------ vld.dll.dependency.x64.manifest | 8 ++++++++ vld.dll.dependency.x86.manifest | 8 ++++++++ vld.rc | 8 ++++---- vld.vcxproj | 4 ++++ 7 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 setup/dbghelp/x64/Microsoft.DTfW.DHL.manifest create mode 100644 setup/dbghelp/x86/Microsoft.DTfW.DHL.manifest create mode 100644 vld.dll.dependency.x64.manifest create mode 100644 vld.dll.dependency.x86.manifest diff --git a/setup/dbghelp/x64/Microsoft.DTfW.DHL.manifest b/setup/dbghelp/x64/Microsoft.DTfW.DHL.manifest new file mode 100644 index 00000000..1ea64d51 --- /dev/null +++ b/setup/dbghelp/x64/Microsoft.DTfW.DHL.manifest @@ -0,0 +1,7 @@ + + + + + + + diff --git a/setup/dbghelp/x86/Microsoft.DTfW.DHL.manifest b/setup/dbghelp/x86/Microsoft.DTfW.DHL.manifest new file mode 100644 index 00000000..e61222f0 --- /dev/null +++ b/setup/dbghelp/x86/Microsoft.DTfW.DHL.manifest @@ -0,0 +1,7 @@ + + + + + + + diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 72254b20..00581d8b 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -26,7 +26,7 @@ !include "MUI.nsh" # Provides the modern user-interface # Version number -!define VLD_VERSION "2.1" +!define VLD_VERSION "2.1.1" # Define build system paths #!define CRT_PATH "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT" @@ -168,10 +168,10 @@ addtopath: skipaddtopath: SetOutPath "${BIN_PATH}\Win32" !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "dbghelp\x86\${DHL_DLL}" "${BIN_PATH}\Win32\${DHL_DLL}" $INSTDIR + File "dbghelp\x86\Microsoft.DTfW.DHL.manifest" SetOutPath "${BIN_PATH}\Win64" !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "dbghelp\x64\${DHL_DLL}" "${BIN_PATH}\Win64\${DHL_DLL}" $INSTDIR -# !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${CRT_PATH}\${CRT_DLL}" "${BIN_PATH}\${CRT_DLL}" $INSTDIR -# File "..\Microsoft.DTfW.DHL.manifest" + File "dbghelp\x64\Microsoft.DTfW.DHL.manifest" # File "${CRT_PATH}\${CRT_MANIFEST}" SectionEnd @@ -187,7 +187,7 @@ Section "Source Code" File "..\vld.vcproj" File "..\vld.vcxproj" File "..\vld.vcxproj.filters" -# File "..\*.manifest" + File "..\*.manifest" File "..\*.rc" SectionEnd @@ -240,11 +240,11 @@ Section "un.Dynamic Link Libraries" System::Call "editenv::pathRemove(i ${ES_SYSTEM}, t '${BIN_PATH}\Win64') ? u" Delete "$PLUGINSDIR\${EDITENV_DLL}" !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win32\${DHL_DLL}" + Delete "${BIN_PATH}\Win32\Microsoft.DTfW.DHL.manifest" RMDir "${BIN_PATH}\Win32" !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win64\${DHL_DLL}" + Delete "${BIN_PATH}\Win64\Microsoft.DTfW.DHL.manifest" RMDir "${BIN_PATH}\Win64" -# !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\${CRT_DLL}" -# Delete "${BIN_PATH}\Microsoft.DTfW.DHL.manifest" # Delete "${BIN_PATH}\${CRT_MANIFEST}" RMDir "${BIN_PATH}" SectionEnd diff --git a/vld.dll.dependency.x64.manifest b/vld.dll.dependency.x64.manifest new file mode 100644 index 00000000..bc9fe1d2 --- /dev/null +++ b/vld.dll.dependency.x64.manifest @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/vld.dll.dependency.x86.manifest b/vld.dll.dependency.x86.manifest new file mode 100644 index 00000000..cad71ffa --- /dev/null +++ b/vld.dll.dependency.x86.manifest @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/vld.rc b/vld.rc index aeff18e4..25f28461 100755 --- a/vld.rc +++ b/vld.rc @@ -53,8 +53,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,0,0 - PRODUCTVERSION 2,1,0,0 + FILEVERSION 2,1,1,0 + PRODUCTVERSION 2,1,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x3L @@ -70,7 +70,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Visual Leak Detector DLL" - VALUE "FileVersion", "2.1.0.0" + VALUE "FileVersion", "2.1.1.0" VALUE "InternalName", "vld" VALUE "LegalCopyright", "Copyright (C) 2005-2011" #ifndef WIN64 @@ -79,7 +79,7 @@ BEGIN VALUE "OriginalFilename", "vld_x64.dll" #endif VALUE "ProductName", "Visual Leak Detector" - VALUE "ProductVersion", "2.1.0.0" + VALUE "ProductVersion", "2.1.1.0" END END BLOCK "VarFileInfo" diff --git a/vld.vcxproj b/vld.vcxproj index deaee34c..6075fa71 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -111,6 +111,7 @@ + vld.dll.dependency.x86.manifest copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y @@ -143,6 +144,7 @@ + vld.dll.dependency.x64.manifest copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y @@ -178,6 +180,7 @@ + vld.dll.dependency.x86.manifest copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y @@ -215,6 +218,7 @@ + vld.dll.dependency.x64.manifest copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y From 693da2f429ee8e41346d652437d89ca9bd7d991e Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 4 Apr 2011 19:31:56 +0000 Subject: [PATCH 043/321] CHANGES.txt updated git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65158 --- CHANGES.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index c54edca7..e3ca9950 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,28 @@ Visual Leak Detector (VLD) Version 2.1 Change Log / Release Notes +2.1.1 (5 April 2011) +---------------------------- + Bugs Fixed: + + Issue fixed with loading wrong version of dbghelp.dll on Windows XP and bellow. + +2.1 (26 March 2011) +---------------------------- + Enhancements: + + New functions added: VLDGlobalDisable, VLDGlobalEnable, VLDGetOptions, + VLDGetReportFilename, VLDSetOptions, VLDSetModulesList, + VLDGetModulesList, VLDResolveCallstacks (see vld.h). + + Option VLD_OPT_SKIP_HEAPFREE_LEAKS added. + + Hash for each leak added + + Supported loading symbols from Visual Studio symbol cache directory + + Bugs Fixed: + + Improved LdrLoadDll, GetProcAddress hooking on Windows 7. + + "HMODULE not founded" bug fixed. + + Bugs fixed when VLD off. + + Problem fixed with GetModuleHandleW for SxS dll's (mfc*.dll, msvcr*.dll). + + Unicode-to-multibyte conversion fixed. + 2.1 (26 March 2011) ---------------------------- Enhancements: From 3f883180b04a6518a8e4ef57f6a9133e9404b333 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Tue, 5 Apr 2011 14:16:16 +0000 Subject: [PATCH 044/321] Fix for Issue 8228. So the problem was here the changes I made earlier that combined the duties for Callstack::dump and Callstack::Resolve to one function called Callstack::resolve. So I'm fixing this by reverting the two functions into two seperate functions: 1. Callstack::dump to print out callstacks to the specified outputs 2. Callstack::resolve to store the formatted callstack for later retrieval. These two methods are almost identical, so any changes made to one needs to be made to the other. NOTE: I'm not sure why this was failing, but seperating out the code makes it work on my massive application. I also fixed the print function in utility.cpp which was not protected against NULL strings. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65202 --- callstack.cpp | 440 ++++++++++++++++++++++++++++++-------------------- callstack.h | 12 +- utility.cpp | 81 +++++----- 3 files changed, 316 insertions(+), 217 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index bd92170a..c975e487 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -65,26 +65,26 @@ CallStack::CallStack (const CallStack &) // CallStack::~CallStack () { - CallStack::chunk_t *chunk = m_store.next; - CallStack::chunk_t *temp; - - while (chunk) { - temp = chunk; - chunk = temp->next; - delete temp; - } - - if (m_Resolved) - { - for (UINT32 frame = 0; frame < m_size; frame++) - { - delete m_Resolved[frame]; - m_Resolved[frame] = NULL; - } - delete [] m_Resolved; - } - - m_Resolved = NULL; + CallStack::chunk_t *chunk = m_store.next; + CallStack::chunk_t *temp; + + while (chunk) { + temp = chunk; + chunk = temp->next; + delete temp; + } + + if (m_Resolved) + { + for (UINT32 frame = 0; frame < m_size; frame++) + { + delete m_Resolved[frame]; + m_Resolved[frame] = NULL; + } + delete [] m_Resolved; + } + + m_Resolved = NULL; } // operator = - Assignment operator. For efficiency, we want to avoid ever @@ -180,20 +180,23 @@ UINT_PTR CallStack::operator [] (UINT32 index) const // VOID CallStack::clear () { - m_size = 0; - m_topchunk = &m_store; - m_topindex = 0; + m_size = 0; + m_topchunk = &m_store; + m_topindex = 0; + + if (m_Resolved) + { + for (UINT32 frame = 0; frame < m_size; frame++) + { + m_Resolved[frame] = NULL; + } + } } // dump - Dumps a nicely formatted rendition of the CallStack, including // symbolic information (function names and line numbers) if available. -// Had to get rid of the const qualifier because calling resolve can modify -// a member variable. This is a result of the combined duties of CallStack::resolve -// which can both dump or save the formatted stack info. Otherwise there would -// be nearly identical code in both methods, which is worse than removing a mere -// const qualifier - +// // Note: The symbol handler must be initialized prior to calling this // function. // @@ -204,25 +207,121 @@ VOID CallStack::clear () // // None. // -VOID CallStack::dump (BOOL showinternalframes) +void CallStack::dump(BOOL showinternalframes) const { - // The stack was dumped already - if (m_Resolved) - { - DumpResolved(); - return; - } - - resolve(showinternalframes, FALSE); -} - -// Formats the stack frame into a human readable format, and saves it for later retrieval. -void CallStack::Resolve(BOOL showinternalframes) -{ - if (m_Resolved != NULL) - { - resolve(showinternalframes, TRUE); - } + // The stack was dumped already + if (m_Resolved) + { + DumpResolved(); + return; + } + + if (m_status & CALLSTACK_STATUS_INCOMPLETE) { + // This call stack appears to be incomplete. Using StackWalk64 may be + // more reliable. + report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" + L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" + L" complete stack trace.\n"); + } + + IMAGEHLP_LINE64 sourceinfo = { 0 }; + sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + + const UINT32 symbolBufSize = sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1; + BYTE symbolbuffer [symbolBufSize] = { 0 }; + + WCHAR undecoratedname [MAXSYMBOLNAMELENGTH]; + WCHAR callingmodulename [MAX_PATH]; + + const size_t max_size = MAXREPORTLENGTH + 1; + + // Iterate through each frame in the call stack. + for (UINT32 frame = 0; frame < m_size; frame++) + { + // Try to get the source file and line number associated with + // this program counter address. + SIZE_T programcounter = (*this)[frame]; + EnterCriticalSection(&symbollock); + BOOL foundline = FALSE; + DWORD displacement = 0; + foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo); + if (foundline) + { + if (!showinternalframes) { + _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); + if (wcsstr(sourceinfo.FileName, L"afxmem.cpp") || + wcsstr(sourceinfo.FileName, L"dbgheap.c") || + wcsstr(sourceinfo.FileName, L"malloc.c") || + wcsstr(sourceinfo.FileName, L"new.cpp") || + wcsstr(sourceinfo.FileName, L"newaop.cpp")) { + // Don't show frames in files internal to the heap. + LeaveCriticalSection(&symbollock); + continue; + } + } + } + + // Initialize structures passed to the symbol handler. + SYMBOL_INFO* functioninfo = (SYMBOL_INFO*)&symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + + // Try to get the name of the function containing this program + // counter address. + DWORD64 displacement64 = 0; + LPWSTR functionname; + if (SymFromAddrW(currentprocess, programcounter, &displacement64, functioninfo)) { + // Undecorate function name. + if (UnDecorateSymbolName(functioninfo->Name, undecoratedname, MAXSYMBOLNAMELENGTH, UNDNAME_NAME_ONLY) > 0) + functionname = undecoratedname; + else + functionname = functioninfo->Name; + } + else { + // GetFormattedMessage( GetLastError() ); + functionname = L"(Function name unavailable)"; + displacement64 = 0; + } + LeaveCriticalSection(&symbollock); + + HMODULE hCallingModule = GetCallingModule(programcounter); + LPWSTR modulename = L"(Module name unavailable)"; + if (hCallingModule && + GetModuleFileName(hCallingModule, callingmodulename, sizeof(callingmodulename)) > 0) + { + modulename = wcsrchr(callingmodulename, L'\\'); + if (modulename == NULL) + modulename = wcsrchr(callingmodulename, L'/'); + if (modulename != NULL) + modulename++; + else + modulename = callingmodulename; + } + + // Use static here to increase performance, and avoid heap allocs. Hopefully this won't + // prove to be an issue in thread safety. If it does, it will have to be simply non-static. + static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; + int NumChars = -1; + // Display the current stack frame's information. + if (foundline) { + if (displacement == 0) + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s\n", + sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname); + else + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", + sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname, displacement); + } + else { + if (displacement64 == 0) + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", + programcounter, modulename, functionname); + else + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", + programcounter, modulename, functionname, (DWORD)displacement64); + } + + print(stack_line); + } } // Resolve - Creates a nicely formatted rendition of the CallStack, including @@ -242,139 +341,132 @@ void CallStack::Resolve(BOOL showinternalframes) // // None. // -void CallStack::resolve(BOOL showinternalframes, BOOL ResolveOnly) +void CallStack::Resolve(BOOL showinternalframes) { - if (m_status & CALLSTACK_STATUS_INCOMPLETE) { - // This call stack appears to be incomplete. Using StackWalk64 may be - // more reliable. - report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" - L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" - L" complete stack trace.\n"); - } - - IMAGEHLP_LINE64 sourceinfo = { 0 }; - sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - - if (ResolveOnly) - { - m_Resolved = new WCHAR*[m_size]; - ZeroMemory(m_Resolved, sizeof(WCHAR*) * m_size); - } - - const UINT32 symbolBufSize = sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1; - BYTE symbolbuffer [symbolBufSize] = { 0 }; - // Use static here to increase performance, and avoid heap allocs. Hopefully this won't - // prove to be an issue in thread safety. If it does, it will have to be simply non-static. - static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; - WCHAR undecoratedname [MAXSYMBOLNAMELENGTH]; - WCHAR callingmodulename [MAX_PATH]; - - // Iterate through each frame in the call stack. - for (UINT32 frame = 0; frame < m_size; frame++) - { - // Try to get the source file and line number associated with - // this program counter address. - SIZE_T programcounter = (*this)[frame]; - EnterCriticalSection(&symbollock); - BOOL foundline = FALSE; - DWORD displacement = 0; - foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo); - if (foundline) - { - if (!showinternalframes) { - _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); - if (wcsstr(sourceinfo.FileName, L"afxmem.cpp") || - wcsstr(sourceinfo.FileName, L"dbgheap.c") || - wcsstr(sourceinfo.FileName, L"malloc.c") || - wcsstr(sourceinfo.FileName, L"new.cpp") || - wcsstr(sourceinfo.FileName, L"newaop.cpp")) { - // Don't show frames in files internal to the heap. - LeaveCriticalSection(&symbollock); - continue; - - } - } - } - - // Initialize structures passed to the symbol handler. - SYMBOL_INFO* functioninfo = (SYMBOL_INFO*)&symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; - - // Try to get the name of the function containing this program - // counter address. - DWORD64 displacement64 = 0; - LPWSTR functionname; - if (SymFromAddrW(currentprocess, programcounter, &displacement64, functioninfo)) { - // Undecorate function name. - if (UnDecorateSymbolName(functioninfo->Name, undecoratedname, MAXSYMBOLNAMELENGTH, UNDNAME_NAME_ONLY) > 0) - functionname = undecoratedname; - else - functionname = functioninfo->Name; - } - else { - // GetFormattedMessage( GetLastError() ); - functionname = L"(Function name unavailable)"; - displacement64 = 0; - } - LeaveCriticalSection(&symbollock); - - HMODULE hCallingModule = GetCallingModule(programcounter); - LPWSTR modulename = L"(Module name unavailable)"; - if (hCallingModule && - GetModuleFileName(hCallingModule, callingmodulename, sizeof(callingmodulename)) > 0) - { - modulename = wcsrchr(callingmodulename, L'\\'); - if (modulename == NULL) - modulename = wcsrchr(callingmodulename, L'/'); - if (modulename != NULL) - modulename++; - else - modulename = callingmodulename; - } - - int NumChars = -1; - // Display the current stack frame's information. - if (foundline) { - if (displacement == 0) - NumChars = _snwprintf_s(stack_line, _TRUNCATE, L" %s (%d): %s!%s\n", - sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname); - else - NumChars = _snwprintf_s(stack_line, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", - sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname, displacement); - } - else { - if (displacement64 == 0) - NumChars = _snwprintf_s(stack_line, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", - programcounter, modulename, functionname); - else - NumChars = _snwprintf_s(stack_line, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", - programcounter, modulename, functionname, (DWORD)displacement64); - } - if (ResolveOnly) { - // Just truncate anything that is too long. - if (NumChars >= 0) - { - m_Resolved[frame] = new WCHAR[NumChars + 1]; - wcscpy_s(m_Resolved[frame], NumChars + 1, stack_line); - } - } - else { - print(stack_line); - } - } + if (m_status & CALLSTACK_STATUS_INCOMPLETE) { + // This call stack appears to be incomplete. Using StackWalk64 may be + // more reliable. + report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" + L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" + L" complete stack trace.\n"); + } + + IMAGEHLP_LINE64 sourceinfo = { 0 }; + sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + + const UINT32 symbolBufSize = sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1; + BYTE symbolbuffer [symbolBufSize] = { 0 }; + + WCHAR undecoratedname [MAXSYMBOLNAMELENGTH] = L""; + WCHAR callingmodulename [MAX_PATH] = L""; + + m_Resolved = new WCHAR*[m_size]; + ZeroMemory(m_Resolved, sizeof(WCHAR*) * m_size); + const size_t max_size = MAXREPORTLENGTH + 1; + + // Iterate through each frame in the call stack. + for (UINT32 frame = 0; frame < m_size; frame++) + { + // Try to get the source file and line number associated with + // this program counter address. + SIZE_T programcounter = (*this)[frame]; + EnterCriticalSection(&symbollock); + BOOL foundline = FALSE; + DWORD displacement = 0; + foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo); + if (foundline) + { + if (!showinternalframes) { + _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); + if (wcsstr(sourceinfo.FileName, L"afxmem.cpp") || + wcsstr(sourceinfo.FileName, L"dbgheap.c") || + wcsstr(sourceinfo.FileName, L"malloc.c") || + wcsstr(sourceinfo.FileName, L"new.cpp") || + wcsstr(sourceinfo.FileName, L"newaop.cpp")) { + // Don't show frames in files internal to the heap. + LeaveCriticalSection(&symbollock); + continue; + } + } + } + + // Initialize structures passed to the symbol handler. + SYMBOL_INFO* functioninfo = (SYMBOL_INFO*)&symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + + // Try to get the name of the function containing this program + // counter address. + DWORD64 displacement64 = 0; + LPWSTR functionname; + if (SymFromAddrW(currentprocess, programcounter, &displacement64, functioninfo)) { + // Undecorate function name. + if (UnDecorateSymbolName(functioninfo->Name, undecoratedname, MAXSYMBOLNAMELENGTH, UNDNAME_NAME_ONLY) > 0) + functionname = undecoratedname; + else + functionname = functioninfo->Name; + } + else { + // GetFormattedMessage( GetLastError() ); + functionname = L"(Function name unavailable)"; + displacement64 = 0; + } + LeaveCriticalSection(&symbollock); + + HMODULE hCallingModule = GetCallingModule(programcounter); + LPWSTR modulename = L"(Module name unavailable)"; + if (hCallingModule && + GetModuleFileName(hCallingModule, callingmodulename, sizeof(callingmodulename)) > 0) + { + modulename = wcsrchr(callingmodulename, L'\\'); + if (modulename == NULL) + modulename = wcsrchr(callingmodulename, L'/'); + if (modulename != NULL) + modulename++; + else + modulename = callingmodulename; + } + + // Use static here to increase performance, and avoid heap allocs. Hopefully this won't + // prove to be an issue in thread safety. If it does, it will have to be simply non-static. + static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; + int NumChars = -1; + // Display the current stack frame's information. + if (foundline) { + // Just truncate anything that is too long. + if (displacement == 0) + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s\n", + sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname); + else + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", + sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname, displacement); + } + else { + if (displacement64 == 0) + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", + programcounter, modulename, functionname); + else + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", + programcounter, modulename, functionname, (DWORD)displacement64); + } + + if (NumChars >= 0) { + m_Resolved[frame] = new WCHAR[NumChars + 1]; + wcscpy_s(m_Resolved[frame], NumChars + 1, stack_line); + } + } // end for loop } // DumpResolve void CallStack::DumpResolved() const { - if (m_Resolved) - { - for (UINT32 frame = 0; frame < m_size; frame++) - { - report(L"%s", m_Resolved[frame]); - } - } + if (m_Resolved) + { + for (UINT32 frame = 0; frame < m_size; frame++) + { + print(m_Resolved[frame]); + } + } } diff --git a/callstack.h b/callstack.h index 0226c671..f30c79b0 100644 --- a/callstack.h +++ b/callstack.h @@ -83,12 +83,12 @@ class CallStack VOID clear (); // Prints the Callstack to one of either / or the debug output window and or // a log file. - VOID dump (BOOL showinternalframes); + VOID dump (BOOL showinternalframes) const; // Formats the stack frame into a human readable format, and saves it for later retrieval. VOID Resolve(BOOL showinternalframes); DWORD getHashValue () const; virtual VOID getstacktrace (UINT32 maxdepth, context_t& context) = 0; - CallStack& operator = (const CallStack &other); + BOOL operator == (const CallStack &other) const; UINT_PTR operator [] (UINT32 index) const; VOID push_back (const UINT_PTR programcounter); @@ -99,9 +99,11 @@ class CallStack #define CALLSTACK_STATUS_INCOMPLETE 0x1 // If set, the stack trace stored in this CallStack appears to be incomplete. private: - CallStack (const CallStack &other); // Don't allow this!! - // Performs the actual formatting of the callstack into human readable form. - void resolve(BOOL showinternalframes, BOOL ResolveOnly); + // Don't allow this!! + CallStack (const CallStack &other); + // Don't allow this!! + CallStack& operator = (const CallStack &other); + // The chunk list is made of a linked list of Chunks. typedef struct chunk_s { struct chunk_s *next; // Pointer to the next chunk in the chunk list. diff --git a/utility.cpp b/utility.cpp index c62ba7b5..b4a4fc7d 100644 --- a/utility.cpp +++ b/utility.cpp @@ -588,44 +588,49 @@ BOOL patchmodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tables // VOID print (LPCWSTR messagew) { - size_t count; - - if (reportencoding == unicode) { - if (reportfile != NULL) { - // Send the report to the previously specified file. - fwrite(messagew, sizeof(WCHAR), wcslen(messagew), reportfile); - } - if ( reporttostdout ) - fwprintf(stdout,messagew); - - if (reporttodebugger) { - OutputDebugStringW(messagew); - } - } - else { - CHAR messagea [MAXREPORTLENGTH + 1]; - if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) == -1) { - // Failed to convert the Unicode message to ASCII. - assert(FALSE); - return; - } - messagea[MAXREPORTLENGTH] = '\0'; - if (reportfile != NULL) { - // Send the report to the previously specified file. - fwrite(messagea, sizeof(CHAR), strlen(messagea), reportfile); - } - - if ( reporttostdout ) - printf(messagea); - - if (reporttodebugger) { - OutputDebugStringA(messagea); - } - } - - if (reporttodebugger && (reportdelay == TRUE)) { - Sleep(10); // Workaround the Visual Studio 6 bug where debug strings are sometimes lost if they're sent too fast. - } + if (NULL == messagew) + { + return; + } + + size_t count = 0; + + if (reportencoding == unicode) { + if (reportfile != NULL) { + // Send the report to the previously specified file. + fwrite(messagew, sizeof(WCHAR), wcslen(messagew), reportfile); + } + if ( reporttostdout ) + fwprintf(stdout,messagew); + + if (reporttodebugger) { + OutputDebugStringW(messagew); + } + } + else { + CHAR messagea [MAXREPORTLENGTH + 1]; + if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) == -1) { + // Failed to convert the Unicode message to ASCII. + assert(FALSE); + return; + } + messagea[MAXREPORTLENGTH] = '\0'; + if (reportfile != NULL) { + // Send the report to the previously specified file. + fwrite(messagea, sizeof(CHAR), strlen(messagea), reportfile); + } + + if ( reporttostdout ) + printf(messagea); + + if (reporttodebugger) { + OutputDebugStringA(messagea); + } + } + + if (reporttodebugger && (reportdelay == TRUE)) { + Sleep(10); // Workaround the Visual Studio 6 bug where debug strings are sometimes lost if they're sent too fast. + } } // report - Sends a printf-style formatted message to the debugger for display From b2d8b74cf7293ebda413e9b22062c110017490a3 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Wed, 6 Apr 2011 07:52:17 +0000 Subject: [PATCH 045/321] Turned off SYMOPT_DEBUG by changing the #ifdef from _DEBUG to something else. This can be turned on via an environment variable, without changing code using: To enable this debug output to be displayed to the console without changing your source code, set the DBGHELP_DBGOUT environment variable to a non-NULL value before calling the SymInitialize function. To log the information to a file, set the DBGHELP_LOG environment variable to the name of the log file to be used. Which I have documented exclusively in comments in the code. If anyone wants to reduce the comments feel free, but it may prove useful in the future. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65225 --- vld.cpp | 275 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 142 insertions(+), 133 deletions(-) diff --git a/vld.cpp b/vld.cpp index a739170c..a7192e16 100644 --- a/vld.cpp +++ b/vld.cpp @@ -356,141 +356,150 @@ BOOL IsWin7OrBetter() // VisualLeakDetector::VisualLeakDetector () { - // Initialize configuration options and related private data. - _wcsnset_s(m_forcedmodulelist, MAXMODULELISTLENGTH, '\0', _TRUNCATE); - m_maxdatadump = 0xffffffff; - m_maxtraceframes = 0xffffffff; - m_options = 0x0; - m_reportfile = NULL; - wcsncpy_s(m_reportfilepath, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); - m_status = 0x0; - - // Load configuration options. - configure(); - if (m_options & VLD_OPT_VLDOFF) { - report(L"Visual Leak Detector is turned off.\n"); - return; - } - - HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); - HMODULE kernelBase = GetModuleHandleW(L"KernelBase.dll"); - HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); - - if (!IsWin7OrBetter()) // kernel32.dll - m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); - else - { - assert(m_patchtable[0].patchtable == m_kernelbasePatch); - m_patchtable[0].exportmodulename = "kernelbase.dll"; - m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernelBase,"GetProcAddress"); - } - - // Initialize global variables. - currentprocess = GetCurrentProcess(); - currentthread = GetCurrentThread(); - InitializeCriticalSection(&imagelock); - LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); - processheap = GetProcessHeap(); - RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); - RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); - RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); - InitializeCriticalSection(&stackwalklock); - InitializeCriticalSection(&symbollock); - vldheap = HeapCreate(0x0, 0, 0); - InitializeCriticalSection(&vldheaplock); - - // Initialize remaining private data. - m_heapmap = new HeapMap; - m_heapmap->reserve(HEAPMAPRESERVE); - m_imalloc = NULL; - m_leaksfound = 0; - m_loadedmodules = NULL; - InitializeCriticalSection(&m_loaderlock); - InitializeCriticalSection(&m_maplock); - InitializeCriticalSection(&m_moduleslock); - m_selftestfile = __FILE__; - m_selftestline = 0; - m_tlsindex = TlsAlloc(); - InitializeCriticalSection(&m_tlslock); - m_tlsset = new TlsSet; - - if (m_options & VLD_OPT_SELF_TEST) { - // Self-test mode has been enabled. Intentionally leak a small amount of - // memory so that memory leak self-checking can be verified. - if (m_options & VLD_OPT_UNICODE_REPORT) { - wcsncpy_s(new WCHAR [wcslen(SELFTESTTEXTW) + 1], wcslen(SELFTESTTEXTW) + 1, SELFTESTTEXTW, _TRUNCATE); - m_selftestline = __LINE__ - 1; - } - else { - strncpy_s(new CHAR [strlen(SELFTESTTEXTA) + 1], strlen(SELFTESTTEXTA) + 1, SELFTESTTEXTA, _TRUNCATE); - m_selftestline = __LINE__ - 1; - } - } - if (m_options & VLD_OPT_START_DISABLED) { - // Memory leak detection will initially be disabled. - m_status |= VLD_STATUS_NEVER_ENABLED; - } - if (m_options & VLD_OPT_REPORT_TO_FILE) { - SetupReporting(); - } - if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { - // Insert a slight delay between messages sent to the debugger for - // output. (For working around a bug in VC6 where data sent to the - // debugger gets lost if it's sent too fast). - insertreportdelay(); - } - - // This is highly unlikely to happen, but just in case, check to be sure - // we got a valid TLS index. - if (m_tlsindex == TLS_OUT_OF_INDEXES) { - report(L"ERROR: Visual Leak Detector could not be installed because thread local" - L" storage could not be allocated."); - return; - } - - // Initialize the symbol handler. We use it for obtaining source file/line - // number information and function names for the memory leak report. - LPWSTR symbolpath = buildsymbolsearchpath(); -#ifdef _DEBUG - SymSetOptions(SYMOPT_DEBUG | SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); + // Initialize configuration options and related private data. + _wcsnset_s(m_forcedmodulelist, MAXMODULELISTLENGTH, '\0', _TRUNCATE); + m_maxdatadump = 0xffffffff; + m_maxtraceframes = 0xffffffff; + m_options = 0x0; + m_reportfile = NULL; + wcsncpy_s(m_reportfilepath, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); + m_status = 0x0; + + // Load configuration options. + configure(); + if (m_options & VLD_OPT_VLDOFF) { + report(L"Visual Leak Detector is turned off.\n"); + return; + } + + HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); + HMODULE kernelBase = GetModuleHandleW(L"KernelBase.dll"); + HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); + + if (!IsWin7OrBetter()) // kernel32.dll + m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); + else + { + assert(m_patchtable[0].patchtable == m_kernelbasePatch); + m_patchtable[0].exportmodulename = "kernelbase.dll"; + m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernelBase,"GetProcAddress"); + } + + // Initialize global variables. + currentprocess = GetCurrentProcess(); + currentthread = GetCurrentThread(); + InitializeCriticalSection(&imagelock); + LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); + processheap = GetProcessHeap(); + RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); + RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); + RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); + InitializeCriticalSection(&stackwalklock); + InitializeCriticalSection(&symbollock); + vldheap = HeapCreate(0x0, 0, 0); + InitializeCriticalSection(&vldheaplock); + + // Initialize remaining private data. + m_heapmap = new HeapMap; + m_heapmap->reserve(HEAPMAPRESERVE); + m_imalloc = NULL; + m_leaksfound = 0; + m_loadedmodules = NULL; + InitializeCriticalSection(&m_loaderlock); + InitializeCriticalSection(&m_maplock); + InitializeCriticalSection(&m_moduleslock); + m_selftestfile = __FILE__; + m_selftestline = 0; + m_tlsindex = TlsAlloc(); + InitializeCriticalSection(&m_tlslock); + m_tlsset = new TlsSet; + + if (m_options & VLD_OPT_SELF_TEST) { + // Self-test mode has been enabled. Intentionally leak a small amount of + // memory so that memory leak self-checking can be verified. + if (m_options & VLD_OPT_UNICODE_REPORT) { + wcsncpy_s(new WCHAR [wcslen(SELFTESTTEXTW) + 1], wcslen(SELFTESTTEXTW) + 1, SELFTESTTEXTW, _TRUNCATE); + m_selftestline = __LINE__ - 1; + } + else { + strncpy_s(new CHAR [strlen(SELFTESTTEXTA) + 1], strlen(SELFTESTTEXTA) + 1, SELFTESTTEXTA, _TRUNCATE); + m_selftestline = __LINE__ - 1; + } + } + if (m_options & VLD_OPT_START_DISABLED) { + // Memory leak detection will initially be disabled. + m_status |= VLD_STATUS_NEVER_ENABLED; + } + if (m_options & VLD_OPT_REPORT_TO_FILE) { + SetupReporting(); + } + if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { + // Insert a slight delay between messages sent to the debugger for + // output. (For working around a bug in VC6 where data sent to the + // debugger gets lost if it's sent too fast). + insertreportdelay(); + } + + // This is highly unlikely to happen, but just in case, check to be sure + // we got a valid TLS index. + if (m_tlsindex == TLS_OUT_OF_INDEXES) { + report(L"ERROR: Visual Leak Detector could not be installed because thread local" + L" storage could not be allocated."); + return; + } + + // Initialize the symbol handler. We use it for obtaining source file/line + // number information and function names for the memory leak report. + LPWSTR symbolpath = buildsymbolsearchpath(); +#ifdef NOISY_DBGHELP_DIAGOSTICS + // From MSDN docs about SYMOPT_DEBUG: + /* To view all attempts to load symbols, call SymSetOptions with SYMOPT_DEBUG. + This causes DbgHelp to call the OutputDebugString function with detailed + information on symbol searches, such as the directories it is searching and and error messages. + In other words, this will really pollute the debug output window with extra messages. + To enable this debug output to be displayed to the console without changing your source code, + set the DBGHELP_DBGOUT environment variable to a non-NULL value before calling the SymInitialize function. + To log the information to a file, set the DBGHELP_LOG environment variable to the name of the log file to be used. + */ + SymSetOptions(SYMOPT_DEBUG | SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); #else - SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); + SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); #endif - if (!SymInitializeW(currentprocess, symbolpath, FALSE)) { - report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" - L" File and function names will probably not be available in call stacks.\n", GetLastError()); - } - delete [] symbolpath; - - patchentry_t ntdllPatch [] = { - "LdrLoadDll", _LdrLoadDll, - NULL, NULL - }; - moduleentry_t ldrLoadDllPatch [] = { - "ntdll.dll", (UINT_PTR)ntdll, ntdllPatch, - }; - patchimport(kernel32, ldrLoadDllPatch); - if (kernelBase != NULL) - patchimport(kernelBase, ldrLoadDllPatch); - - // Attach Visual Leak Detector to every module loaded in the process. - ModuleSet* newmodules = new ModuleSet(); - newmodules->reserve(MODULESETRESERVE); - EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); - attachtoloadedmodules(newmodules); - m_loadedmodules = newmodules; - m_status |= VLD_STATUS_INSTALLED; - - report(L"Visual Leak Detector Version " VLDVERSION L" installed.\n"); - if (m_status & VLD_STATUS_FORCE_REPORT_TO_FILE) { - // The report is being forced to a file. Let the human know why. - report(L"NOTE: Visual Leak Detector: Unicode-encoded reporting has been enabled, but the\n" - L" debugger is the only selected report destination. The debugger cannot display\n" - L" Unicode characters, so the report will also be sent to a file. If no file has\n" - L" been specified, the default file name is \"" VLD_DEFAULT_REPORT_FILE_NAME L"\".\n"); - - } - reportconfig(); + if (!SymInitializeW(currentprocess, symbolpath, FALSE)) { + report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" + L" File and function names will probably not be available in call stacks.\n", GetLastError()); + } + delete [] symbolpath; + + patchentry_t ntdllPatch [] = { + "LdrLoadDll", _LdrLoadDll, + NULL, NULL + }; + moduleentry_t ldrLoadDllPatch [] = { + "ntdll.dll", (UINT_PTR)ntdll, ntdllPatch, + }; + patchimport(kernel32, ldrLoadDllPatch); + if (kernelBase != NULL) + patchimport(kernelBase, ldrLoadDllPatch); + + // Attach Visual Leak Detector to every module loaded in the process. + ModuleSet* newmodules = new ModuleSet(); + newmodules->reserve(MODULESETRESERVE); + EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); + attachtoloadedmodules(newmodules); + m_loadedmodules = newmodules; + m_status |= VLD_STATUS_INSTALLED; + + report(L"Visual Leak Detector Version " VLDVERSION L" installed.\n"); + if (m_status & VLD_STATUS_FORCE_REPORT_TO_FILE) { + // The report is being forced to a file. Let the human know why. + report(L"NOTE: Visual Leak Detector: Unicode-encoded reporting has been enabled, but the\n" + L" debugger is the only selected report destination. The debugger cannot display\n" + L" Unicode characters, so the report will also be sent to a file. If no file has\n" + L" been specified, the default file name is \"" VLD_DEFAULT_REPORT_FILE_NAME L"\".\n"); + + } + reportconfig(); } // Destructor - Detaches Visual Leak Detector from all modules loaded in the From f55eca73f0a31eb69290930d465a5e4bda6cbd3d Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 15 Apr 2011 15:37:21 +0000 Subject: [PATCH 046/321] Moving the original regression tests to a new location so it can be better associated with other regression tests I'm writing. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65819 --- {testsuite => tests/suite}/testsuite.cpp | 0 {testsuite => tests/suite}/testsuite.vcproj | 0 {testsuite => tests/suite}/testsuite.vcxproj | 31 ++++++++++++------- .../suite}/testsuite.vcxproj.filters | 0 .../suite}/testsuite.vcxproj.vspscc | 0 5 files changed, 19 insertions(+), 12 deletions(-) rename {testsuite => tests/suite}/testsuite.cpp (100%) rename {testsuite => tests/suite}/testsuite.vcproj (100%) rename {testsuite => tests/suite}/testsuite.vcxproj (92%) rename {testsuite => tests/suite}/testsuite.vcxproj.filters (100%) rename {testsuite => tests/suite}/testsuite.vcxproj.vspscc (100%) diff --git a/testsuite/testsuite.cpp b/tests/suite/testsuite.cpp similarity index 100% rename from testsuite/testsuite.cpp rename to tests/suite/testsuite.cpp diff --git a/testsuite/testsuite.vcproj b/tests/suite/testsuite.vcproj similarity index 100% rename from testsuite/testsuite.vcproj rename to tests/suite/testsuite.vcproj diff --git a/testsuite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj similarity index 92% rename from testsuite/testsuite.vcxproj rename to tests/suite/testsuite.vcxproj index bf7db441..5200d505 100644 --- a/testsuite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -83,18 +83,18 @@ <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\Release\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\Release\ - $(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ MinimumRecommendedRules.ruleset @@ -187,6 +187,13 @@ true MachineX64 + + + copy $(ProjectDir)..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + diff --git a/testsuite/testsuite.vcxproj.filters b/tests/suite/testsuite.vcxproj.filters similarity index 100% rename from testsuite/testsuite.vcxproj.filters rename to tests/suite/testsuite.vcxproj.filters diff --git a/testsuite/testsuite.vcxproj.vspscc b/tests/suite/testsuite.vcxproj.vspscc similarity index 100% rename from testsuite/testsuite.vcxproj.vspscc rename to tests/suite/testsuite.vcxproj.vspscc From 88b3ef28225380a82595ef635984b04842c8b900 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 15 Apr 2011 15:42:51 +0000 Subject: [PATCH 047/321] Adding a new test application. This tests all the CRT memory allocation hooks in VLD. This will be modfied later, but for now, this provides a moderate coverage for VLD. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65820 --- tests/basics/Allocs.cpp | 74 ++++++++++++ tests/basics/Allocs.h | 17 +++ tests/basics/LeakOption.h | 14 +++ tests/basics/basics.cpp | 58 ++++++++++ tests/basics/basics.vcxproj | 174 ++++++++++++++++++++++++++++ tests/basics/basics.vcxproj.filters | 42 +++++++ tests/basics/basics.vcxproj.user | 9 ++ tests/basics/stdafx.cpp | 8 ++ tests/basics/stdafx.h | 15 +++ tests/basics/targetver.h | 8 ++ 10 files changed, 419 insertions(+) create mode 100644 tests/basics/Allocs.cpp create mode 100644 tests/basics/Allocs.h create mode 100644 tests/basics/LeakOption.h create mode 100644 tests/basics/basics.cpp create mode 100644 tests/basics/basics.vcxproj create mode 100644 tests/basics/basics.vcxproj.filters create mode 100644 tests/basics/basics.vcxproj.user create mode 100644 tests/basics/stdafx.cpp create mode 100644 tests/basics/stdafx.h create mode 100644 tests/basics/targetver.h diff --git a/tests/basics/Allocs.cpp b/tests/basics/Allocs.cpp new file mode 100644 index 00000000..43f06ed9 --- /dev/null +++ b/tests/basics/Allocs.cpp @@ -0,0 +1,74 @@ +#include "stdafx.h" +#include "Allocs.h" + +#include // for placement new +#include + +void AllocF(LeakOption type) +{ + int* leaked_memory = NULL; + int* leaked_memory_dbg = NULL; + if (type == eMalloc) + { + leaked_memory = (int*)malloc(78); + leaked_memory_dbg = (int*)_malloc_dbg(78, _NORMAL_BLOCK,__FILE__,__LINE__); + } + else if (type == eNew) + { + leaked_memory = new int(4); + leaked_memory_dbg = new (_NORMAL_BLOCK, __FILE__, __LINE__) int(7); + } + else if (type == eNewArray) + { + leaked_memory = new int[45]; + leaked_memory_dbg = new (_NORMAL_BLOCK,__FILE__,__LINE__) int[7]; + + // placement new operator + int temp[4]; + void* place = temp; + float* placed_mem = new (place) float[4]; // doesn't work. Nothing gets patched by vld + float f = 4.5f; + } + else if (type == eCalloc) + { + leaked_memory = (int*)calloc(47,sizeof(int)); + leaked_memory_dbg = (int*)_calloc_dbg(39, sizeof(int), _NORMAL_BLOCK, __FILE__, __LINE__); + } + else if (type == eRealloc) + { + int* temp = (int*)malloc(17); + leaked_memory = (int*)realloc(temp, 23); + int* temp_dbg = (int*)malloc(9); + leaked_memory_dbg = (int*)_realloc_dbg(temp_dbg, 21, _NORMAL_BLOCK, __FILE__, __LINE__); + } +} + +void AllocE(LeakOption type) +{ + AllocF(type); +} + +void AllocD(LeakOption type) +{ + AllocE(type); +} + +void AllocC(LeakOption type) +{ + AllocD(type); +} + +void AllocB(LeakOption type) +{ + AllocC(type); +} + +void AllocA(LeakOption type) +{ + AllocB(type); +} + +void Alloc(LeakOption type) +{ + AllocA(type); +} \ No newline at end of file diff --git a/tests/basics/Allocs.h b/tests/basics/Allocs.h new file mode 100644 index 00000000..81fb794b --- /dev/null +++ b/tests/basics/Allocs.h @@ -0,0 +1,17 @@ +#pragma once +#include "LeakOption.h" + +void AllocF(LeakOption type); + +void AllocE(LeakOption type); + +void AllocD(LeakOption type); + +void AllocC(LeakOption type); + +void AllocB(LeakOption type); + +void AllocA(LeakOption type); + +void Alloc(LeakOption type); + diff --git a/tests/basics/LeakOption.h b/tests/basics/LeakOption.h new file mode 100644 index 00000000..d99afa18 --- /dev/null +++ b/tests/basics/LeakOption.h @@ -0,0 +1,14 @@ +#pragma once + + +enum LeakOption +{ + eMalloc, // "malloc" + eNew, // "new" + eNewArray, // "new_array" + eCalloc, // "calloc" + eRealloc, // "realloc" +}; + + + diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp new file mode 100644 index 00000000..e8bae953 --- /dev/null +++ b/tests/basics/basics.cpp @@ -0,0 +1,58 @@ +// basics.cpp : Defines the entry point for the console application. +// + +#include "stdafx.h" +#include "../../vld.h" +#include "Allocs.h" +#include + + +void LeakMemory(LeakOption type, int repeat) +{ + for (int i = 0; i < repeat; i++) + { + Alloc(type); + } +} + + +int _tmain(int argc, _TCHAR* argv[]) +{ + wprintf(_T("======================================\n")); + wprintf(_T("VLD Tests: basics\n")); + wprintf(_T("======================================\n")); + if (argc == 3) + { + LeakOption leak_type = eMalloc; + wprintf(_T("Memory leaks will be created \n")); + if (_tcsicmp(_T("malloc"), argv[1]) == 0) + { + leak_type = eMalloc; + } + else if (_tcsicmp(_T("new"), argv[1]) == 0) + { + leak_type = eNew; + } + else if (_tcsicmp(_T("new_array"), argv[1]) == 0) + { + leak_type = eNewArray; + } + else if (_tcsicmp(_T("calloc"), argv[1]) == 0) + { + leak_type = eCalloc; + } + else if (_tcsicmp(_T("realloc"), argv[1]) == 0) + { + leak_type = eRealloc; + } + + int repeat = _tstoi(argv[2]); + LeakMemory(leak_type,repeat); + } + else + { + wprintf(_T("No memory leaks will be created \n")); + } + return 0; +} + diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj new file mode 100644 index 00000000..a6a4502b --- /dev/null +++ b/tests/basics/basics.vcxproj @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0943354A-41E0-4215-878A-8D0FE758052C} + Win32Proj + basics + test_basics + + + + Application + true + Unicode + + + Application + true + Unicode + false + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + NotSet + 2.1 + %(AdditionalDependencies) + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + NotSet + 2.1 + %(AdditionalDependencies) + + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + \ No newline at end of file diff --git a/tests/basics/basics.vcxproj.filters b/tests/basics/basics.vcxproj.filters new file mode 100644 index 00000000..0acd1b47 --- /dev/null +++ b/tests/basics/basics.vcxproj.filters @@ -0,0 +1,42 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/tests/basics/basics.vcxproj.user b/tests/basics/basics.vcxproj.user new file mode 100644 index 00000000..8038a8b6 --- /dev/null +++ b/tests/basics/basics.vcxproj.user @@ -0,0 +1,9 @@ + + + + $(TargetDir) + WindowsLocalDebugger + $(TargetPath) + malloc 3 + + \ No newline at end of file diff --git a/tests/basics/stdafx.cpp b/tests/basics/stdafx.cpp new file mode 100644 index 00000000..27f0ee01 --- /dev/null +++ b/tests/basics/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// basics.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/tests/basics/stdafx.h b/tests/basics/stdafx.h new file mode 100644 index 00000000..b005a839 --- /dev/null +++ b/tests/basics/stdafx.h @@ -0,0 +1,15 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#include +#include + + + +// TODO: reference additional headers your program requires here diff --git a/tests/basics/targetver.h b/tests/basics/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/tests/basics/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include From ddf7c2a8b5475ed6c319c15d13ddd4e77f59b2a4 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 15 Apr 2011 15:55:18 +0000 Subject: [PATCH 048/321] Changing the output directory to be based off of the project directory, instead of the solution directory. Also the output and intermediate directory takes into account the platform(32/64 bit) and configuration (debug/release). This means the output and intermediate directory are the same. This will allow VLD to be integrated into other solutions and not mess things up. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65821 --- vld.vcxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/vld.vcxproj b/vld.vcxproj index 6075fa71..46546520 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -63,14 +63,14 @@ <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ MinimumRecommendedRules.ruleset From e6bb7c82791a8a67bd390d65f1160e5530c01af3 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 15 Apr 2011 17:06:38 +0000 Subject: [PATCH 049/321] This moves each test app to it's own directory. Each test app now has it's own copy of the VLD dll, and can be sandboxed away from any other test app. This will allow us to isolate test conditions. For instance test_basics doesn't have or use VLD.ini yet. Keeping this separated from 'testsuite' allows us to test this independently from each other, and not worry about the presence of an INI file messing up results. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65835 --- tests/basics/basics.cpp | 32 +- tests/basics/basics.vcxproj | 6 + tests/suite/testsuite.cpp | 597 +++++++++++++++++----------------- tests/suite/testsuite.vcxproj | 24 +- vld_vs10.sln | 40 ++- 5 files changed, 375 insertions(+), 324 deletions(-) diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index e8bae953..1cc9a545 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -4,8 +4,15 @@ #include "stdafx.h" #include "../../vld.h" #include "Allocs.h" -#include +void PrintUsage() +{ + wprintf(_T("Usage:\n")); + wprintf(_T("\ttest_basics \n")); + wprintf(_T("\t - The type of memory allocation to test with. This can be one of the following:\n")); + wprintf(_T("\t [malloc,new,new_array,calloc,realloc]\n")); + wprintf(_T("\t - The number of times to repeat each unique memory leak.\n\n")); +} void LeakMemory(LeakOption type, int repeat) { @@ -15,16 +22,19 @@ void LeakMemory(LeakOption type, int repeat) } } - int _tmain(int argc, _TCHAR* argv[]) { wprintf(_T("======================================\n")); - wprintf(_T("VLD Tests: basics\n")); + wprintf(_T("==\n")); + wprintf(_T("== VLD Tests: basics\n")); + wprintf(_T("==\n")); wprintf(_T("======================================\n")); if (argc == 3) { - LeakOption leak_type = eMalloc; - wprintf(_T("Memory leaks will be created \n")); + LeakOption leak_type = eMalloc; // default + + // Pick up options to determine which type of memory allocator + // to test with if (_tcsicmp(_T("malloc"), argv[1]) == 0) { leak_type = eMalloc; @@ -45,14 +55,24 @@ int _tmain(int argc, _TCHAR* argv[]) { leak_type = eRealloc; } + else + { + wprintf(_T("Error!: Invalid arguments\n")); + PrintUsage(); + return -1; + } + wprintf(_T("Options: %s \nNumber of Leaks: %s\n"), argv[1], argv[2]); + // Convert the string into it's integer equivalent int repeat = _tstoi(argv[2]); LeakMemory(leak_type,repeat); } else { - wprintf(_T("No memory leaks will be created \n")); + wprintf(_T("Error!: Invalid arguments\n")); + PrintUsage(); } + wprintf(_T("End of test app...\n\n")); return 0; } diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index a6a4502b..4d8c4766 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -96,6 +96,12 @@ 2.1 %(AdditionalDependencies) + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 0f6f6ba3..e5e1b244 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -35,15 +35,15 @@ #include enum action_e { - a_calloc, - a_comalloc, - a_getprocmalloc, - a_heapalloc, - a_icomalloc, - a_ignored, - a_malloc, - a_new, - numactions + a_calloc, + a_comalloc, + a_getprocmalloc, + a_heapalloc, + a_icomalloc, + a_ignored, + a_malloc, + a_new, + numactions }; // Name of the debug C Runtime Library DLL on this system @@ -66,20 +66,20 @@ enum action_e { #define ONCEINAWHILE 10 // Free a random block approx. once every... typedef struct blockholder_s { - action_e action; - PVOID block; - BOOL leak; + action_e action; + PVOID block; + BOOL leak; } blockholder_t; typedef void* (__cdecl *free_t) (void* mem); typedef void* (__cdecl *malloc_t) (size_t size); typedef struct threadcontext_s { - UINT index; - BOOL leaky; - DWORD seed; - BOOL terminated; - DWORD threadid; + UINT index; + BOOL leaky; + DWORD seed; + BOOL terminated; + DWORD threadid; } threadcontext_t; __declspec(thread) blockholder_t blocks [MAXBLOCKS]; @@ -93,303 +93,308 @@ __declspec(thread) ULONG total_allocs = 0; ULONG random (ULONG max) { - FLOAT d; - FLOAT r; - ULONG v; - - r = ((FLOAT)rand()) / ((FLOAT)RAND_MAX); - r *= ((FLOAT)max); - d = r - ((ULONG)r); - if (d >= 0.5) { - v = ((ULONG)r) + 1; - } - else { - v = (ULONG)r; - } - - return v; + FLOAT d; + FLOAT r; + ULONG v; + + r = ((FLOAT)rand()) / ((FLOAT)RAND_MAX); + r *= ((FLOAT)max); + d = r - ((ULONG)r); + if (d >= 0.5) { + v = ((ULONG)r) + 1; + } + else { + v = (ULONG)r; + } + + return v; } VOID allocateblock (action_e action, SIZE_T size) { - HMODULE crt; - ULONG index; - ULONG index2; - LPCSTR name; - PVOID *pblock; - HRESULT status; - - // Find the first unused index. - index = freeBlock; - for (index2 = freeBlock + 1; index2 < MAXBLOCKS; index2++) { - if (blocks[index2].block == NULL) { - freeBlock = index2; - break; - } - } - blocks[index].action = action; - - // Now do the randomized allocation. - pblock = &blocks[index].block; - switch (action) { - case a_calloc: - name = "calloc"; - *pblock = calloc(1, size); - break; - - case a_comalloc: - name = "CoTaskMemAlloc"; - *pblock = CoTaskMemAlloc(size); - break; - - case a_getprocmalloc: - name = "GetProcAddress"; - if (pmalloc == NULL) { - crt = LoadLibrary(CRTDLLNAME); - assert(crt != NULL); - pmalloc = (malloc_t)GetProcAddress(crt, "malloc"); - assert(pmalloc != NULL); - } - *pblock = pmalloc(size); - break; - - case a_heapalloc: - name = "HeapAlloc"; - if (threadheap == NULL) { - threadheap = HeapCreate(0x0, 0, 0); - } - *pblock = HeapAlloc(threadheap, 0x0, size); - break; - - case a_icomalloc: - name = "IMalloc"; - if (imalloc == NULL) { - status = CoGetMalloc(1, &imalloc); - assert(status == S_OK); - } - *pblock = imalloc->Alloc(size); - break; - - case a_ignored: - name = "Ignored"; - VLDDisable(); - *pblock = malloc(size); - VLDRestore(); - break; - - case a_malloc: - name = "malloc"; - *pblock = malloc(size); - break; - - case a_new: - name = "new"; - *pblock = new BYTE [size]; - break; - - default: - assert(FALSE); - } - counts[action]++; - total_allocs++; - - strncpy_s((char*)*pblock, size, name, _TRUNCATE); + HMODULE crt; + ULONG index; + ULONG index2; + LPCSTR name; + PVOID *pblock; + HRESULT status; + + // Find the first unused index. + index = freeBlock; + for (index2 = freeBlock + 1; index2 < MAXBLOCKS; index2++) { + if (blocks[index2].block == NULL) { + freeBlock = index2; + break; + } + } + blocks[index].action = action; + + // Now do the randomized allocation. + pblock = &blocks[index].block; + switch (action) { + case a_calloc: + name = "calloc"; + *pblock = calloc(1, size); + break; + + case a_comalloc: + name = "CoTaskMemAlloc"; + *pblock = CoTaskMemAlloc(size); + break; + + case a_getprocmalloc: + name = "GetProcAddress"; + if (pmalloc == NULL) { + crt = LoadLibrary(CRTDLLNAME); + assert(crt != NULL); + pmalloc = (malloc_t)GetProcAddress(crt, "malloc"); + assert(pmalloc != NULL); + } + *pblock = pmalloc(size); + break; + + case a_heapalloc: + name = "HeapAlloc"; + if (threadheap == NULL) { + threadheap = HeapCreate(0x0, 0, 0); + } + *pblock = HeapAlloc(threadheap, 0x0, size); + break; + + case a_icomalloc: + name = "IMalloc"; + if (imalloc == NULL) { + status = CoGetMalloc(1, &imalloc); + assert(status == S_OK); + } + *pblock = imalloc->Alloc(size); + break; + + case a_ignored: + name = "Ignored"; + VLDDisable(); + *pblock = malloc(size); + VLDRestore(); + break; + + case a_malloc: + name = "malloc"; + *pblock = malloc(size); + break; + + case a_new: + name = "new"; + *pblock = new BYTE [size]; + break; + + default: + assert(FALSE); + } + counts[action]++; + total_allocs++; + + strncpy_s((char*)*pblock, size, name, _TRUNCATE); } VOID freeblock (ULONG index) { - PVOID block; - HMODULE crt; - - block = blocks[index].block; - switch (blocks[index].action) { - case a_calloc: - free(block); - break; - - case a_comalloc: - CoTaskMemFree(block); - break; - - case a_getprocmalloc: - if (pfree == NULL) { - crt = GetModuleHandle(CRTDLLNAME); - assert(crt != NULL); - pfree = (free_t)GetProcAddress(crt, "free"); - assert(pfree != NULL); - } - pfree(block); - break; - - case a_heapalloc: - HeapFree(threadheap, 0x0, block); - break; - - case a_icomalloc: - imalloc->Free(block); - break; - - case a_ignored: - free(block); - break; - - case a_malloc: - free(block); - break; - - case a_new: - delete [] block; - break; - - default: - assert(FALSE); - } - blocks[index].block = NULL; - if (index < freeBlock) - freeBlock = index; - counts[blocks[index].action]--; - total_allocs--; + PVOID block; + HMODULE crt; + + block = blocks[index].block; + switch (blocks[index].action) { + case a_calloc: + free(block); + break; + + case a_comalloc: + CoTaskMemFree(block); + break; + + case a_getprocmalloc: + if (pfree == NULL) { + crt = GetModuleHandle(CRTDLLNAME); + assert(crt != NULL); + pfree = (free_t)GetProcAddress(crt, "free"); + assert(pfree != NULL); + } + pfree(block); + break; + + case a_heapalloc: + HeapFree(threadheap, 0x0, block); + break; + + case a_icomalloc: + imalloc->Free(block); + break; + + case a_ignored: + free(block); + break; + + case a_malloc: + free(block); + break; + + case a_new: + delete [] block; + break; + + default: + assert(FALSE); + } + blocks[index].block = NULL; + if (index < freeBlock) + freeBlock = index; + counts[blocks[index].action]--; + total_allocs--; } VOID recursivelyallocate (UINT depth, action_e action, SIZE_T size) { - if (depth == 0) { - allocateblock(action, size); - } - else { - recursivelyallocate(depth - 1, action, size); - } + if (depth == 0) { + allocateblock(action, size); + } + else { + recursivelyallocate(depth - 1, action, size); + } } DWORD __stdcall runtestsuite (LPVOID param) { - action_e action; - USHORT action_index; - BOOL allocate_more = TRUE; - threadcontext_t *context = (threadcontext_t*)param; - UINT depth; - ULONG index; - UINT leaks_selected; - SIZE_T size; - - srand(context->seed); - - for (index = 0; index < MAXBLOCKS; index++) { - blocks[index].block = NULL; - blocks[index].leak = FALSE; - } - - while (allocate_more == TRUE) { - // Select a random allocation action and a random size. - action = (action_e)random(numactions - 1); - size = random(MAXSIZE); - if (size < MINSIZE) { - size = MINSIZE; - } - if (counts[action] == MAXALLOC) { - // We've done enough of this type of allocation. Select another. - continue; - } - - // Allocate a block, using recursion to build up a stack of random - // depth. - depth = random(MAXDEPTH); - if (depth < MINDEPTH) { - depth = MINDEPTH; - } - recursivelyallocate(depth, action, size); - - // Every once in a while, free a random block. - if (random(ONCEINAWHILE) == ONCEINAWHILE) { - index = random(total_allocs); - if (blocks[index].block != NULL) { - freeblock(index); - } - } - - // See if we have allocated enough blocks using each type of action. - for (action_index = 0; action_index < numactions; action_index++) { - if (counts[action_index] < MAXALLOC) { - allocate_more = TRUE; - break; - } - allocate_more = FALSE; - } - } - - if (context->leaky == TRUE) { - // This is the leaky thread. Randomly select one block to be leaked from - // each type of allocation action. - for (action_index = 0; action_index < numactions; action_index++) { - leaks_selected = 0; - do { - index = random(MAXBLOCKS); - if ((blocks[index].block != NULL) && (blocks[index].action == (action_e)action_index)) { - blocks[index].leak = TRUE; - leaks_selected++; - } - } while (leaks_selected < (1 + NUMDUPLEAKS)); - } - } - - // Free all blocks except for those marked as leaks. - for (index = 0; index < MAXBLOCKS; index++) { - if ((blocks[index].block != NULL) && (blocks[index].leak == FALSE)) { - freeblock(index); - } - } - - // Do a sanity check. - if (context->leaky == TRUE) { - assert(total_allocs == (numactions * (1 + NUMDUPLEAKS))); - } - else { - assert(total_allocs == 0); - } - - context->terminated = TRUE; - return 0; + action_e action; + USHORT action_index; + BOOL allocate_more = TRUE; + threadcontext_t *context = (threadcontext_t*)param; + UINT depth; + ULONG index; + UINT leaks_selected; + SIZE_T size; + + srand(context->seed); + + for (index = 0; index < MAXBLOCKS; index++) { + blocks[index].block = NULL; + blocks[index].leak = FALSE; + } + + while (allocate_more == TRUE) { + // Select a random allocation action and a random size. + action = (action_e)random(numactions - 1); + size = random(MAXSIZE); + if (size < MINSIZE) { + size = MINSIZE; + } + if (counts[action] == MAXALLOC) { + // We've done enough of this type of allocation. Select another. + continue; + } + + // Allocate a block, using recursion to build up a stack of random + // depth. + depth = random(MAXDEPTH); + if (depth < MINDEPTH) { + depth = MINDEPTH; + } + recursivelyallocate(depth, action, size); + + // Every once in a while, free a random block. + if (random(ONCEINAWHILE) == ONCEINAWHILE) { + index = random(total_allocs); + if (blocks[index].block != NULL) { + freeblock(index); + } + } + + // See if we have allocated enough blocks using each type of action. + for (action_index = 0; action_index < numactions; action_index++) { + if (counts[action_index] < MAXALLOC) { + allocate_more = TRUE; + break; + } + allocate_more = FALSE; + } + } + + if (context->leaky == TRUE) { + // This is the leaky thread. Randomly select one block to be leaked from + // each type of allocation action. + for (action_index = 0; action_index < numactions; action_index++) { + leaks_selected = 0; + do { + index = random(MAXBLOCKS); + if ((blocks[index].block != NULL) && (blocks[index].action == (action_e)action_index)) { + blocks[index].leak = TRUE; + leaks_selected++; + } + } while (leaks_selected < (1 + NUMDUPLEAKS)); + } + } + + // Free all blocks except for those marked as leaks. + for (index = 0; index < MAXBLOCKS; index++) { + if ((blocks[index].block != NULL) && (blocks[index].leak == FALSE)) { + freeblock(index); + } + } + + // Do a sanity check. + if (context->leaky == TRUE) { + assert(total_allocs == (numactions * (1 + NUMDUPLEAKS))); + } + else { + assert(total_allocs == 0); + } + + context->terminated = TRUE; + return 0; } int main (int argc, char *argv []) { - threadcontext_t contexts [NUMTHREADS]; - DWORD end; - UINT index; -#define MESSAGESIZE 512 - char message [512]; - DWORD start; - UINT leakythread; - - //VLDDisable(); - - start = GetTickCount(); - srand(start); - - // Select a random thread to be the leaker. - leakythread = random(NUMTHREADS - 1); - - for (index = 0; index < NUMTHREADS; ++index) { - contexts[index].index = index; - if (index == leakythread) - contexts[index].leaky = TRUE; - else - contexts[index].leaky = FALSE; - contexts[index].seed = random(RAND_MAX); - contexts[index].terminated = FALSE; - CreateThread(NULL, 0, runtestsuite, &contexts[index], 0, &contexts[index].threadid); - } - - // Wait for all threads to terminate. - for (index = 0; index < NUMTHREADS; ++index) { - while (contexts[index].terminated == FALSE) { - Sleep(10); - } - } - - end = GetTickCount(); - _snprintf_s(message, 512, _TRUNCATE, "Elapsed Time = %ums\n", end - start); - OutputDebugString(message); - - return 0; + _tprintf(_T("======================================\n")); + _tprintf(_T("==\n")); + _tprintf(_T("== VLD Tests: thread suite\n")); + _tprintf(_T("==\n")); + _tprintf(_T("======================================\n")); + + threadcontext_t contexts [NUMTHREADS]; + //VLDDisable(); + + DWORD start = GetTickCount(); + srand(start); + + // Select a random thread to be the leaker. + UINT leakythread = random(NUMTHREADS - 1); + + for (UINT index = 0; index < NUMTHREADS; ++index) { + contexts[index].index = index; + if (index == leakythread) + contexts[index].leaky = TRUE; + else + contexts[index].leaky = FALSE; + contexts[index].seed = random(RAND_MAX); + contexts[index].terminated = FALSE; + CreateThread(NULL, 0, runtestsuite, &contexts[index], 0, &contexts[index].threadid); + } + + // Wait for all threads to terminate. + // BTW: This is NOT how to wait for the threads to finish. + // TODO: Fix this to use WaitForMultipleObjects... + // As a result of this, I'm getting asserts up at assert(total_allocs == 0), + // at the end of the threaded function + for (UINT index = 0; index < NUMTHREADS; ++index) { + while (contexts[index].terminated == FALSE) { + Sleep(10); + } + } + + DWORD end = GetTickCount(); + static const int MESSAGESIZE = 512; + char message [MESSAGESIZE] = {0}; + _snprintf_s(message, MESSAGESIZE, _TRUNCATE, "Elapsed Time = %ums\n", end - start); + OutputDebugString(message); + + return 0; } diff --git a/tests/suite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj index 5200d505..5467e1b3 100644 --- a/tests/suite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -130,6 +130,12 @@ $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + @@ -189,10 +195,10 @@ - copy $(ProjectDir)..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y @@ -243,16 +249,6 @@ copy $(ProjectDir)..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Mic - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - true - false - true - false - - diff --git a/vld_vs10.sln b/vld_vs10.sln index cc9375e7..cc85f582 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -3,11 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "testsuite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" +EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 5 @@ -26,16 +30,18 @@ Global SccProjectName4 = VLDPackage SccLocalPath4 = VLDPackage EndGlobalSection - GlobalSection(TestCaseManagementSettings) = postSolution - CategoryFile = vld_vs10.vsmdi - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug(Release)|Win32 = Debug(Release)|Win32 + Debug(Release)|x64 = Debug(Release)|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 @@ -44,16 +50,34 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + EndGlobalSection EndGlobal From 52acd1c4ba3e20dc91a59330542a9aae4d2bc87d Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 15 Apr 2011 17:11:36 +0000 Subject: [PATCH 050/321] Adding two batch scripts that fully execute test_basics.exe. There are two batch scripts, one for Win32, and the other for x64. These two scripts together cover 51% of the functions in VLD, and 42% of all branching conditions. Currently this doesn't test MFC at all. MFC will have to be tested in another app to be created in the future. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65836 --- tests/basics/ExecuteTestBasics_x64.bat | 13 +++++++++++++ tests/basics/ExecuteTestBasics_x86.bat | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 tests/basics/ExecuteTestBasics_x64.bat create mode 100644 tests/basics/ExecuteTestBasics_x86.bat diff --git a/tests/basics/ExecuteTestBasics_x64.bat b/tests/basics/ExecuteTestBasics_x64.bat new file mode 100644 index 00000000..5f215be1 --- /dev/null +++ b/tests/basics/ExecuteTestBasics_x64.bat @@ -0,0 +1,13 @@ +@echo off + +.\x64\Debug\test_basics +.\x64\Debug\test_basics invalid_argument 5 +.\x64\Debug\test_basics malloc 5 +.\x64\Debug\test_basics new 5 +.\x64\Debug\test_basics new_array 5 +.\x64\Debug\test_basics calloc 5 +.\x64\Debug\test_basics realloc 5 + +pause + +@echo on \ No newline at end of file diff --git a/tests/basics/ExecuteTestBasics_x86.bat b/tests/basics/ExecuteTestBasics_x86.bat new file mode 100644 index 00000000..825398a3 --- /dev/null +++ b/tests/basics/ExecuteTestBasics_x86.bat @@ -0,0 +1,13 @@ +@echo off + +.\Win32\Debug\test_basics +.\Win32\Debug\test_basics invalid_argument 5 +.\Win32\Debug\test_basics malloc 5 +.\Win32\Debug\test_basics new 5 +.\Win32\Debug\test_basics new_array 5 +.\Win32\Debug\test_basics calloc 5 +.\Win32\Debug\test_basics realloc 5 + +pause + +@echo on \ No newline at end of file From f5644dbe2ca2289445365745219821372f31b41c Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 15 Apr 2011 21:20:17 +0000 Subject: [PATCH 051/321] A call to eraseduplicates was miscontrued as returning the total amount of 'duplicate' callstacks. This was the case. That method returned the number of ERASED callstacks. Hence the true number of duplicates is erased + 1, which fact I took account for in the reporting methods. Tested using dynamic_app, my new test app, which I will be checking in soon. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65863 --- vld.cpp | 382 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 193 insertions(+), 189 deletions(-) diff --git a/vld.cpp b/vld.cpp index a7192e16..62386215 100644 --- a/vld.cpp +++ b/vld.cpp @@ -917,139 +917,139 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () // VOID VisualLeakDetector::configure () { - WCHAR inipath [MAX_PATH] = {0}; - struct _stat s; - if (_wstat(L".\\vld.ini", &s) == 0) { - // Found a copy of vld.ini in the working directory. Use it. - wcsncpy_s(inipath, MAX_PATH, L".\\vld.ini", _TRUNCATE); - } - else { - BOOL keyopen = FALSE; - HKEY productkey = 0; - DWORD length = 0; - DWORD valuetype = 0; - - // Get the location of the vld.ini file from the registry. - LONG regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); - if (regstatus == ERROR_SUCCESS) { - keyopen = TRUE; - length = MAX_PATH * sizeof(WCHAR); - regstatus = RegQueryValueExW(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); - } - if (keyopen) { - RegCloseKey(productkey); - } + WCHAR inipath [MAX_PATH] = {0}; + struct _stat s; + if (_wstat(L".\\vld.ini", &s) == 0) { + // Found a copy of vld.ini in the working directory. Use it. + wcsncpy_s(inipath, MAX_PATH, L".\\vld.ini", _TRUNCATE); + } + else { + BOOL keyopen = FALSE; + HKEY productkey = 0; + DWORD length = 0; + DWORD valuetype = 0; + + // Get the location of the vld.ini file from the registry. + LONG regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + if (regstatus == ERROR_SUCCESS) { + keyopen = TRUE; + length = MAX_PATH * sizeof(WCHAR); + regstatus = RegQueryValueExW(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); + } + if (keyopen) { + RegCloseKey(productkey); + } - if (!keyopen) - { - // Get the location of the vld.ini file from the registry. - regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); - if (regstatus == ERROR_SUCCESS) { - keyopen = TRUE; - length = MAX_PATH * sizeof(WCHAR); - regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); - } - if (keyopen) { - RegCloseKey(productkey); - } - } + if (!keyopen) + { + // Get the location of the vld.ini file from the registry. + regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + if (regstatus == ERROR_SUCCESS) { + keyopen = TRUE; + length = MAX_PATH * sizeof(WCHAR); + regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); + } + if (keyopen) { + RegCloseKey(productkey); + } + } - if ((regstatus != ERROR_SUCCESS) || (_wstat(inipath, &s) != 0)) { - // The location of vld.ini could not be read from the registry. As a - // last resort, look in the Windows directory. - wcsncpy_s(inipath, MAX_PATH, L"vld.ini", _TRUNCATE); - } - } + if ((regstatus != ERROR_SUCCESS) || (_wstat(inipath, &s) != 0)) { + // The location of vld.ini could not be read from the registry. As a + // last resort, look in the Windows directory. + wcsncpy_s(inipath, MAX_PATH, L"vld.ini", _TRUNCATE); + } + } #define BSIZE 64 - WCHAR buffer [BSIZE] = {0}; - // Read the boolean options. - GetPrivateProfileString(L"Options", L"VLD", L"on", buffer, BSIZE, inipath); - if (strtobool(buffer) == FALSE) { - m_options |= VLD_OPT_VLDOFF; - return; - } + WCHAR buffer [BSIZE] = {0}; + // Read the boolean options. + GetPrivateProfileString(L"Options", L"VLD", L"on", buffer, BSIZE, inipath); + if (strtobool(buffer) == FALSE) { + m_options |= VLD_OPT_VLDOFF; + return; + } - GetPrivateProfileString(L"Options", L"AggregateDuplicates", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_AGGREGATE_DUPLICATES; - } + GetPrivateProfileString(L"Options", L"AggregateDuplicates", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_AGGREGATE_DUPLICATES; + } - GetPrivateProfileString(L"Options", L"SelfTest", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_SELF_TEST; - } + GetPrivateProfileString(L"Options", L"SelfTest", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_SELF_TEST; + } - GetPrivateProfileString(L"Options", L"SlowDebuggerDump", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_SLOW_DEBUGGER_DUMP; - } + GetPrivateProfileString(L"Options", L"SlowDebuggerDump", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_SLOW_DEBUGGER_DUMP; + } - GetPrivateProfileString(L"Options", L"StartDisabled", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_START_DISABLED; - } + GetPrivateProfileString(L"Options", L"StartDisabled", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_START_DISABLED; + } - GetPrivateProfileString(L"Options", L"TraceInternalFrames", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_TRACE_INTERNAL_FRAMES; - } + GetPrivateProfileString(L"Options", L"TraceInternalFrames", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_TRACE_INTERNAL_FRAMES; + } - GetPrivateProfileString(L"Options", L"SkipHeapFreeLeaks", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_SKIP_HEAPFREE_LEAKS; - } + GetPrivateProfileString(L"Options", L"SkipHeapFreeLeaks", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_SKIP_HEAPFREE_LEAKS; + } - // Read the integer configuration options. - m_maxdatadump = GetPrivateProfileInt(L"Options", L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); - m_maxtraceframes = GetPrivateProfileInt(L"Options", L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); - if (m_maxtraceframes < 1) { - m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; - } + // Read the integer configuration options. + m_maxdatadump = GetPrivateProfileInt(L"Options", L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); + m_maxtraceframes = GetPrivateProfileInt(L"Options", L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); + if (m_maxtraceframes < 1) { + m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; + } - // Read the force-include module list. - GetPrivateProfileString(L"Options", L"ForceIncludeModules", L"", m_forcedmodulelist, MAXMODULELISTLENGTH, inipath); - _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); + // Read the force-include module list. + GetPrivateProfileString(L"Options", L"ForceIncludeModules", L"", m_forcedmodulelist, MAXMODULELISTLENGTH, inipath); + _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); - // Read the report destination (debugger, file, or both). - WCHAR filename [MAX_PATH] = {0}; - GetPrivateProfileString(L"Options", L"ReportFile", L"", filename, MAX_PATH, inipath); - if (wcslen(filename) == 0) { - wcsncpy_s(filename, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); - } - _wfullpath(m_reportfilepath, filename, MAX_PATH); - GetPrivateProfileString(L"Options", L"ReportTo", L"", buffer, BSIZE, inipath); - if (_wcsicmp(buffer, L"both") == 0) { - m_options |= (VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE); - } - else if (_wcsicmp(buffer, L"file") == 0) { - m_options |= VLD_OPT_REPORT_TO_FILE; - } - else if (_wcsicmp(buffer, L"stdout") == 0) { - m_options |= VLD_OPT_REPORT_TO_STDOUT; - } - else { - m_options |= VLD_OPT_REPORT_TO_DEBUGGER; - } + // Read the report destination (debugger, file, or both). + WCHAR filename [MAX_PATH] = {0}; + GetPrivateProfileString(L"Options", L"ReportFile", L"", filename, MAX_PATH, inipath); + if (wcslen(filename) == 0) { + wcsncpy_s(filename, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); + } + _wfullpath(m_reportfilepath, filename, MAX_PATH); + GetPrivateProfileString(L"Options", L"ReportTo", L"", buffer, BSIZE, inipath); + if (_wcsicmp(buffer, L"both") == 0) { + m_options |= (VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE); + } + else if (_wcsicmp(buffer, L"file") == 0) { + m_options |= VLD_OPT_REPORT_TO_FILE; + } + else if (_wcsicmp(buffer, L"stdout") == 0) { + m_options |= VLD_OPT_REPORT_TO_STDOUT; + } + else { + m_options |= VLD_OPT_REPORT_TO_DEBUGGER; + } - // Read the report file encoding (ascii or unicode). - GetPrivateProfileString(L"Options", L"ReportEncoding", L"", buffer, BSIZE, inipath); - if (_wcsicmp(buffer, L"unicode") == 0) { - m_options |= VLD_OPT_UNICODE_REPORT; - } - if ((m_options & VLD_OPT_UNICODE_REPORT) && !(m_options & VLD_OPT_REPORT_TO_FILE)) { - // If Unicode report encoding is enabled, then the report needs to be - // sent to a file because the debugger will not display Unicode - // characters, it will display question marks in their place instead. - m_options |= VLD_OPT_REPORT_TO_FILE; - m_status |= VLD_STATUS_FORCE_REPORT_TO_FILE; - } + // Read the report file encoding (ascii or unicode). + GetPrivateProfileString(L"Options", L"ReportEncoding", L"", buffer, BSIZE, inipath); + if (_wcsicmp(buffer, L"unicode") == 0) { + m_options |= VLD_OPT_UNICODE_REPORT; + } + if ((m_options & VLD_OPT_UNICODE_REPORT) && !(m_options & VLD_OPT_REPORT_TO_FILE)) { + // If Unicode report encoding is enabled, then the report needs to be + // sent to a file because the debugger will not display Unicode + // characters, it will display question marks in their place instead. + m_options |= VLD_OPT_REPORT_TO_FILE; + m_status |= VLD_STATUS_FORCE_REPORT_TO_FILE; + } - // Read the stack walking method. - GetPrivateProfileString(L"Options", L"StackWalkMethod", L"", buffer, BSIZE, inipath); - if (_wcsicmp(buffer, L"safe") == 0) { - m_options |= VLD_OPT_SAFE_STACK_WALK; - } + // Read the stack walking method. + GetPrivateProfileString(L"Options", L"StackWalkMethod", L"", buffer, BSIZE, inipath); + if (_wcsicmp(buffer, L"safe") == 0) { + m_options |= VLD_OPT_SAFE_STACK_WALK; + } } // enabled - Determines if memory leak detection is enabled for the current @@ -1404,84 +1404,88 @@ VOID VisualLeakDetector::reportconfig () // VOID VisualLeakDetector::reportleaks (HANDLE heap) { - assert(heap != NULL); + assert(heap != NULL); - // Find the heap's information (blockmap, etc). - EnterCriticalSection(&m_maplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // Nothing is allocated from this heap. No leaks. - LeaveCriticalSection(&m_maplock); - return; - } + // Find the heap's information (blockmap, etc). + EnterCriticalSection(&m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // Nothing is allocated from this heap. No leaks. + LeaveCriticalSection(&m_maplock); + return; + } - heapinfo_t* heapinfo = (*heapit).second; - BlockMap* blockmap = &heapinfo->blockmap; + heapinfo_t* heapinfo = (*heapit).second; + BlockMap* blockmap = &heapinfo->blockmap; - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) - { - // Found a block which is still in the BlockMap. We've identified a - // potential memory leak. - LPCVOID block = (*blockit).first; - blockinfo_t* info = (*blockit).second; - LPCVOID address = block; - SIZE_T size = info->size; - - if (heapinfo->flags & VLD_HEAP_CRT) { - // This block is allocated to a CRT heap, so the block has a CRT - // memory block header prepended to it. - crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { - // This block is marked as being used internally by the CRT. - // The CRT will free the block after VLD is destroyed. - continue; - } - // The CRT header is more or less transparent to the user, so - // the information about the contained block will probably be - // more useful to the user. Accordingly, that's the information - // we'll include in the report. - address = CRTDBGBLOCKDATA(block); - size = crtheader->size; - } + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) + { + // Found a block which is still in the BlockMap. We've identified a + // potential memory leak. + LPCVOID block = (*blockit).first; + blockinfo_t* info = (*blockit).second; + LPCVOID address = block; + SIZE_T size = info->size; + + if (heapinfo->flags & VLD_HEAP_CRT) { + // This block is allocated to a CRT heap, so the block has a CRT + // memory block header prepended to it. + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { + // This block is marked as being used internally by the CRT. + // The CRT will free the block after VLD is destroyed. + continue; + } + // The CRT header is more or less transparent to the user, so + // the information about the contained block will probably be + // more useful to the user. Accordingly, that's the information + // we'll include in the report. + address = CRTDBGBLOCKDATA(block); + size = crtheader->size; + } - // It looks like a real memory leak. - if (m_leaksfound == 0) { // A confusing way to only display this message once - report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); - } - m_leaksfound++; - report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialnumber, address, size); - if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { - // Aggregate all other leaks which are duplicates of this one - // under this same heading, to cut down on clutter. - SIZE_T duplicates = eraseduplicates(blockit) + 1; - if (duplicates > 1) - m_leaksfound += duplicates; + // It looks like a real memory leak. + if (m_leaksfound == 0) { // A confusing way to only display this message once + report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); + } + m_leaksfound++; + report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialnumber, address, size); + if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { + // Aggregate all other leaks which are duplicates of this one + // under this same heading, to cut down on clutter. + SIZE_T erased = eraseduplicates(blockit); + if (erased > 1) + { + // add only the number that were erased, since the 'one left over' + // is already recorded as a leak + m_leaksfound += erased; + } DWORD callstackCRC = CalculateCRC32(info->size, info->callstack->getHashValue()); - report(L"Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, duplicates); - } - // Dump the call stack. - report(L" Call Stack:\n"); - assert(info->callstack); - if (info->callstack) - { - info->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); - } - - // Dump the data in the user data section of the memory block. - if (m_maxdatadump != 0) { - report(L" Data:\n"); - if (m_options & VLD_OPT_UNICODE_REPORT) { - dumpmemoryw(address, (m_maxdatadump < size) ? m_maxdatadump : size); - } - else { - dumpmemorya(address, (m_maxdatadump < size) ? m_maxdatadump : size); - } - } - report(L"\n\n"); - } + report(L"Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, erased + 1); + } + // Dump the call stack. + report(L" Call Stack:\n"); + assert(info->callstack); + if (info->callstack) + { + info->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + } - LeaveCriticalSection(&m_maplock); + // Dump the data in the user data section of the memory block. + if (m_maxdatadump != 0) { + report(L" Data:\n"); + if (m_options & VLD_OPT_UNICODE_REPORT) { + dumpmemoryw(address, (m_maxdatadump < size) ? m_maxdatadump : size); + } + else { + dumpmemorya(address, (m_maxdatadump < size) ? m_maxdatadump : size); + } + } + report(L"\n\n"); + } + + LeaveCriticalSection(&m_maplock); } // unmapblock - Tracks memory blocks that are freed. Unmaps the specified block From d0157881d6300d06f1c55ea0ab4a842447edd7c8 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 15 Apr 2011 21:56:16 +0000 Subject: [PATCH 052/321] Add a test which loads a module dynamically during runtime. The app, dynamic.exe loads dynamic.dll during runtime and calls into an exported method. I also added some code in there to test for aggregating callstacks (using the INI file to control various options). What I found was that any memory leaks that actually leaked in the module itself were not reported. That is a bug which I will be reporting on later. All three tests combined push the code coverage up to 53% functions coverage, with 43% condition coverage. There is still a ways to go as far as increasing the coverage, but these test apps provide a good start for now. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65866 --- tests/dynamic_app/LoadTests.cpp | 65 +++++++ tests/dynamic_app/LoadTests.h | 4 + tests/dynamic_app/dynamic_app.cpp | 49 +++++ tests/dynamic_app/dynamic_app.vcxproj | 184 ++++++++++++++++++ tests/dynamic_app/dynamic_app.vcxproj.filters | 39 ++++ tests/dynamic_app/stdafx.cpp | 26 +++ tests/dynamic_app/stdafx.h | 15 ++ tests/dynamic_app/targetver.h | 8 + tests/dynamic_dll/dllmain.cpp | 19 ++ tests/dynamic_dll/dynamic.cpp | 44 +++++ tests/dynamic_dll/dynamic.h | 26 +++ tests/dynamic_dll/dynamic.vcxproj | 181 +++++++++++++++++ tests/dynamic_dll/dynamic.vcxproj.filters | 45 +++++ tests/dynamic_dll/stdafx.cpp | 8 + tests/dynamic_dll/stdafx.h | 16 ++ tests/dynamic_dll/targetver.h | 8 + vld_vs10.sln | 31 +++ 17 files changed, 768 insertions(+) create mode 100644 tests/dynamic_app/LoadTests.cpp create mode 100644 tests/dynamic_app/LoadTests.h create mode 100644 tests/dynamic_app/dynamic_app.cpp create mode 100644 tests/dynamic_app/dynamic_app.vcxproj create mode 100644 tests/dynamic_app/dynamic_app.vcxproj.filters create mode 100644 tests/dynamic_app/stdafx.cpp create mode 100644 tests/dynamic_app/stdafx.h create mode 100644 tests/dynamic_app/targetver.h create mode 100644 tests/dynamic_dll/dllmain.cpp create mode 100644 tests/dynamic_dll/dynamic.cpp create mode 100644 tests/dynamic_dll/dynamic.h create mode 100644 tests/dynamic_dll/dynamic.vcxproj create mode 100644 tests/dynamic_dll/dynamic.vcxproj.filters create mode 100644 tests/dynamic_dll/stdafx.cpp create mode 100644 tests/dynamic_dll/stdafx.h create mode 100644 tests/dynamic_dll/targetver.h diff --git a/tests/dynamic_app/LoadTests.cpp b/tests/dynamic_app/LoadTests.cpp new file mode 100644 index 00000000..7705e270 --- /dev/null +++ b/tests/dynamic_app/LoadTests.cpp @@ -0,0 +1,65 @@ +#include "stdafx.h" +#include "LoadTests.h" +// Hook in Visual Leak Detector to this application +#include "../../vld.h" +#include + +#ifdef _WIN64 + static const TCHAR* sVld_dll = _T("vld_x64.dll"); +#else + static const TCHAR* sVld_dll = _T("vld_x86.dll"); +#endif + +void CallVLDExportedMethod(const CHAR* function) +{ + HMODULE vld_module = GetModuleHandle(sVld_dll); + assert(vld_module); + typedef void (*VLDAPI_func)(); + if (vld_module != NULL) + { + VLDAPI_func func = (VLDAPI_func)GetProcAddress(vld_module, function); + assert(func); + if (func) + { + func(); + } + } +} + +void CallDynamicMethods(const CHAR* function) +{ + HMODULE dynamic_module = GetModuleHandle(_T("dynamic.dll")); + assert(dynamic_module); + typedef int (__cdecl *DYNAPI_FNC)(); + if (dynamic_module != NULL) + { + DYNAPI_FNC func = (DYNAPI_FNC)GetProcAddress(dynamic_module, function ); + //GetFormattedMessage(GetLastError()); + assert(func); + int result = -1; + if (func) + { + result = func(); + } + assert(42 == result); + } +} + +void RunLoaderTests( bool resolve ) +{ + HMODULE hVLD = LoadLibrary(_T("dynamic.dll")); + assert(hVLD); + if (hVLD) + { + // Now leak some memory + CallDynamicMethods("SimpleLeak_New"); // This requires ansi, not Unicode strings + + if (resolve) + { + CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings + } + + FreeLibrary(hVLD); + } +} + diff --git a/tests/dynamic_app/LoadTests.h b/tests/dynamic_app/LoadTests.h new file mode 100644 index 00000000..3a6f84a6 --- /dev/null +++ b/tests/dynamic_app/LoadTests.h @@ -0,0 +1,4 @@ +#pragma once + +void RunLoaderTests( bool resolve ); + diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp new file mode 100644 index 00000000..8a5574d1 --- /dev/null +++ b/tests/dynamic_app/dynamic_app.cpp @@ -0,0 +1,49 @@ +// dynamic_app.cpp : Defines the entry point for the console application. +// + +#include "stdafx.h" +#include "LoadTests.h" + +void PrintUsage() +{ + wprintf(_T("Usage:\n")); + wprintf(_T("\tdynamic [resolve:[true|false]]\n")); + wprintf(_T("\t - [OPTIONAL] Resolves callstacks before unloading the dynamic DLL.\n")); +} + +void LeakDuplicateLeaks() +{ + // For testing aggregation + for (int i = 0; i < 3; ++i) + { + int* tmp = new int(0x63); + tmp; + } + for (int i = 0; i < 3; ++i) + { + int* tmp = new int(0x63); + tmp; + } + // Should report 6 memory leaks +} + +int _tmain(int argc, _TCHAR* argv[]) +{ + wprintf(_T("======================================\n")); + wprintf(_T("==\n")); + wprintf(_T("== VLD Tests: Dynamic DLL Loading \n")); + wprintf(_T("==\n")); + wprintf(_T("======================================\n")); + + bool resolve = true; + if (argc == 2) + { + resolve = _tcsicmp(_T("true"), argv[1]) == 0; + } + + RunLoaderTests(resolve); + LeakDuplicateLeaks(); + + return 0; +} + diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj new file mode 100644 index 00000000..7e185468 --- /dev/null +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -0,0 +1,184 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} + Win32Proj + dynamic_app + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + dynamic + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + dynamic + true + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + dynamic + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + dynamic + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y + +del $(OutDir)*.tlog + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + Level4 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/dynamic_app/dynamic_app.vcxproj.filters b/tests/dynamic_app/dynamic_app.vcxproj.filters new file mode 100644 index 00000000..1465ba64 --- /dev/null +++ b/tests/dynamic_app/dynamic_app.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/tests/dynamic_app/stdafx.cpp b/tests/dynamic_app/stdafx.cpp new file mode 100644 index 00000000..a53726f5 --- /dev/null +++ b/tests/dynamic_app/stdafx.cpp @@ -0,0 +1,26 @@ +// stdafx.cpp : source file that includes just the standard includes +// dynamic_app.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// Formats a message string using the specified message and variable +// list of arguments. +void GetFormattedMessage(DWORD last_error) +{ + // Retrieve the system error message for the last-error code + WCHAR lpMsgBuf[MAX_PATH] = {0}; + + FormatMessage( + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + last_error, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + lpMsgBuf, + MAX_PATH, + NULL ); + + // Display the error message. + wprintf(_T("%s\n"), lpMsgBuf); +} diff --git a/tests/dynamic_app/stdafx.h b/tests/dynamic_app/stdafx.h new file mode 100644 index 00000000..33cd6e46 --- /dev/null +++ b/tests/dynamic_app/stdafx.h @@ -0,0 +1,15 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#include +#include +#include + + +void GetFormattedMessage(DWORD last_error); diff --git a/tests/dynamic_app/targetver.h b/tests/dynamic_app/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/tests/dynamic_app/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/tests/dynamic_dll/dllmain.cpp b/tests/dynamic_dll/dllmain.cpp new file mode 100644 index 00000000..69b58914 --- /dev/null +++ b/tests/dynamic_dll/dllmain.cpp @@ -0,0 +1,19 @@ +// dllmain.cpp : Defines the entry point for the DLL application. +#include "stdafx.h" + +BOOL APIENTRY DllMain( HMODULE hModule, + DWORD ul_reason_for_call, + LPVOID lpReserved + ) +{ + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + diff --git a/tests/dynamic_dll/dynamic.cpp b/tests/dynamic_dll/dynamic.cpp new file mode 100644 index 00000000..5a4f76ab --- /dev/null +++ b/tests/dynamic_dll/dynamic.cpp @@ -0,0 +1,44 @@ +// dynamic.cpp : Defines the exported functions for the DLL application. +// + +#include "stdafx.h" +#include "dynamic.h" +#include "../basics/Allocs.h" +#include "../basics/LeakOption.h" + +extern "C" { +// This is an example of an exported variable +DYNAMIC_API int ndynamic = 0; + +void LeakMemory(LeakOption type, int repeat) +{ + for (int i = 0; i < repeat; i++) + { + Alloc(type); + } +} + +// This is an example of an exported function. +DYNAMIC_API int SimpleLeak_New(void) +{ + + LeakMemory(eMalloc, 3); + LeakMemory(eNew, 3); + LeakMemory(eNewArray, 3); + LeakMemory(eCalloc, 3); + LeakMemory(eRealloc, 3); + + + int* pint = new int(5); + + return 42; +} + +// This is the constructor of a class that has been exported. +// see dynamic.h for the class definition +Cdynamic::Cdynamic() +{ + return; +} + +} \ No newline at end of file diff --git a/tests/dynamic_dll/dynamic.h b/tests/dynamic_dll/dynamic.h new file mode 100644 index 00000000..a56809ab --- /dev/null +++ b/tests/dynamic_dll/dynamic.h @@ -0,0 +1,26 @@ +// The following ifdef block is the standard way of creating macros which make exporting +// from a DLL simpler. All files within this DLL are compiled with the DYNAMIC_EXPORTS +// symbol defined on the command line. This symbol should not be defined on any project +// that uses this DLL. This way any other project whose source files include this file see +// DYNAMIC_API functions as being imported from a DLL, whereas this DLL sees symbols +// defined with this macro as being exported. +#ifdef DYNAMIC_EXPORTS +#define DYNAMIC_API __declspec(dllexport) +#else +#define DYNAMIC_API __declspec(dllimport) +#endif + +extern "C" { +// This class is exported from the dynamic.dll +class DYNAMIC_API Cdynamic { +public: + Cdynamic(void); + // TODO: add your methods here. +}; + +extern DYNAMIC_API int ndynamic; + +DYNAMIC_API int SimpleLeak_New(void); + +} + diff --git a/tests/dynamic_dll/dynamic.vcxproj b/tests/dynamic_dll/dynamic.vcxproj new file mode 100644 index 00000000..3a7512f7 --- /dev/null +++ b/tests/dynamic_dll/dynamic.vcxproj @@ -0,0 +1,181 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + Win32Proj + dynamic + dynamic + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + exported_methods.def + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + exported_methods.def + + + + + + + + + + + + false + false + + + + + false + false + + + + + + + + Create + Create + Create + Create + + + + + + \ No newline at end of file diff --git a/tests/dynamic_dll/dynamic.vcxproj.filters b/tests/dynamic_dll/dynamic.vcxproj.filters new file mode 100644 index 00000000..52e065e3 --- /dev/null +++ b/tests/dynamic_dll/dynamic.vcxproj.filters @@ -0,0 +1,45 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/tests/dynamic_dll/stdafx.cpp b/tests/dynamic_dll/stdafx.cpp new file mode 100644 index 00000000..98804d63 --- /dev/null +++ b/tests/dynamic_dll/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// dynamic.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/tests/dynamic_dll/stdafx.h b/tests/dynamic_dll/stdafx.h new file mode 100644 index 00000000..f3a07375 --- /dev/null +++ b/tests/dynamic_dll/stdafx.h @@ -0,0 +1,16 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +// Windows Header Files: +#include + + + +// TODO: reference additional headers your program requires here diff --git a/tests/dynamic_dll/targetver.h b/tests/dynamic_dll/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/tests/dynamic_dll/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/vld_vs10.sln b/vld_vs10.sln index cc85f582..55509513 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -12,6 +12,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" + ProjectSection(ProjectDependencies) = postProject + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 5 @@ -72,6 +80,27 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -79,5 +108,7 @@ Global GlobalSection(NestedProjects) = preSolution {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal From 82f3b3d1d841e5cff3e31bfcc22c9e459d9538ae Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Mon, 18 Apr 2011 11:39:51 +0000 Subject: [PATCH 053/321] Adding a DLL that is built on MFC called test_mfc. The project name is mfc, which you can see in the solution directory. This DLL is dynamically loaded and unloaded by dynamic.exe. Once the DLL is loaded, the test app calls two exported methods on it, attempting to perform some simple memory allocations in it. With the addition of this test suite, the function coverage is now 64%, and the condition coverage is now 52%. This is small, but important jump in coverage from the submissions of last week. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C65962 --- tests/basics/Allocs.cpp | 7 + tests/basics/ExecuteTestBasics_x64.bat | 1 + tests/basics/ExecuteTestBasics_x86.bat | 1 + tests/basics/LeakOption.h | 7 +- tests/basics/basics.cpp | 4 + tests/basics/basics.vcxproj.user | 9 -- tests/dynamic_app/LoadTests.cpp | 41 ++++- tests/dynamic_app/LoadTests.h | 2 +- tests/dynamic_app/dynamic_app.cpp | 1 + tests/dynamic_app/dynamic_app.vcxproj | 14 +- tests/mfc/Resource.h | 16 ++ tests/mfc/mfc.cpp | 94 +++++++++++ tests/mfc/mfc.def | 6 + tests/mfc/mfc.h | 27 ++++ tests/mfc/mfc.rc | Bin 0 -> 6466 bytes tests/mfc/mfc.vcxproj | 214 +++++++++++++++++++++++++ tests/mfc/mfc.vcxproj.filters | 52 ++++++ tests/mfc/res/mfc.rc2 | Bin 0 -> 790 bytes tests/mfc/stdafx.cpp | 7 + tests/mfc/stdafx.h | 39 +++++ tests/mfc/targetver.h | 8 + vld.cpp | 47 +++--- vld_vs10.sln | 14 ++ 23 files changed, 563 insertions(+), 48 deletions(-) delete mode 100644 tests/basics/basics.vcxproj.user create mode 100644 tests/mfc/Resource.h create mode 100644 tests/mfc/mfc.cpp create mode 100644 tests/mfc/mfc.def create mode 100644 tests/mfc/mfc.h create mode 100644 tests/mfc/mfc.rc create mode 100644 tests/mfc/mfc.vcxproj create mode 100644 tests/mfc/mfc.vcxproj.filters create mode 100644 tests/mfc/res/mfc.rc2 create mode 100644 tests/mfc/stdafx.cpp create mode 100644 tests/mfc/stdafx.h create mode 100644 tests/mfc/targetver.h diff --git a/tests/basics/Allocs.cpp b/tests/basics/Allocs.cpp index 43f06ed9..737ce595 100644 --- a/tests/basics/Allocs.cpp +++ b/tests/basics/Allocs.cpp @@ -3,6 +3,7 @@ #include // for placement new #include +#include void AllocF(LeakOption type) { @@ -41,6 +42,12 @@ void AllocF(LeakOption type) int* temp_dbg = (int*)malloc(9); leaked_memory_dbg = (int*)_realloc_dbg(temp_dbg, 21, _NORMAL_BLOCK, __FILE__, __LINE__); } + else if (type == eCoTaskMem) + { + void* leaked = CoTaskMemAlloc(7); + void* realloced = NULL; + CoTaskMemRealloc(leaked, 29); + } } void AllocE(LeakOption type) diff --git a/tests/basics/ExecuteTestBasics_x64.bat b/tests/basics/ExecuteTestBasics_x64.bat index 5f215be1..f3e06254 100644 --- a/tests/basics/ExecuteTestBasics_x64.bat +++ b/tests/basics/ExecuteTestBasics_x64.bat @@ -7,6 +7,7 @@ .\x64\Debug\test_basics new_array 5 .\x64\Debug\test_basics calloc 5 .\x64\Debug\test_basics realloc 5 +.\x64\Debug\test_basics CoTaskMem 5 pause diff --git a/tests/basics/ExecuteTestBasics_x86.bat b/tests/basics/ExecuteTestBasics_x86.bat index 825398a3..bf20b111 100644 --- a/tests/basics/ExecuteTestBasics_x86.bat +++ b/tests/basics/ExecuteTestBasics_x86.bat @@ -7,6 +7,7 @@ .\Win32\Debug\test_basics new_array 5 .\Win32\Debug\test_basics calloc 5 .\Win32\Debug\test_basics realloc 5 +.\Win32\Debug\test_basics CoTaskMem 5 pause diff --git a/tests/basics/LeakOption.h b/tests/basics/LeakOption.h index d99afa18..7dc5b743 100644 --- a/tests/basics/LeakOption.h +++ b/tests/basics/LeakOption.h @@ -3,11 +3,12 @@ enum LeakOption { - eMalloc, // "malloc" - eNew, // "new" - eNewArray, // "new_array" + eMalloc, // "malloc" + eNew, // "new" + eNewArray,// "new_array" eCalloc, // "calloc" eRealloc, // "realloc" + eCoTaskMem, // For COM, use "CoTaskMem" }; diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 1cc9a545..59966af1 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -55,6 +55,10 @@ int _tmain(int argc, _TCHAR* argv[]) { leak_type = eRealloc; } + else if (_tcsicmp(_T("CoTaskMem"), argv[1]) == 0) + { + leak_type = eCoTaskMem; + } else { wprintf(_T("Error!: Invalid arguments\n")); diff --git a/tests/basics/basics.vcxproj.user b/tests/basics/basics.vcxproj.user deleted file mode 100644 index 8038a8b6..00000000 --- a/tests/basics/basics.vcxproj.user +++ /dev/null @@ -1,9 +0,0 @@ - - - - $(TargetDir) - WindowsLocalDebugger - $(TargetPath) - malloc 3 - - \ No newline at end of file diff --git a/tests/dynamic_app/LoadTests.cpp b/tests/dynamic_app/LoadTests.cpp index 7705e270..2ebf96da 100644 --- a/tests/dynamic_app/LoadTests.cpp +++ b/tests/dynamic_app/LoadTests.cpp @@ -47,9 +47,9 @@ void CallDynamicMethods(const CHAR* function) void RunLoaderTests( bool resolve ) { - HMODULE hVLD = LoadLibrary(_T("dynamic.dll")); - assert(hVLD); - if (hVLD) + HMODULE hdyn = LoadLibrary(_T("dynamic.dll")); + assert(hdyn); + if (hdyn) { // Now leak some memory CallDynamicMethods("SimpleLeak_New"); // This requires ansi, not Unicode strings @@ -59,7 +59,40 @@ void RunLoaderTests( bool resolve ) CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings } - FreeLibrary(hVLD); + FreeLibrary(hdyn); + } +} + +void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function ) +{ + HMODULE dynamic_module = hmfcLib; + assert(dynamic_module); + typedef void (__cdecl *DYNAPI_FNC)(); + if (dynamic_module != NULL) + { + DYNAPI_FNC func = (DYNAPI_FNC)GetProcAddress(dynamic_module, function ); + //GetFormattedMessage(GetLastError()); + assert(func); + if (func) + { + func(); + } + } +} + +void RunMFCLoaderTests() +{ + HMODULE hmfcLib = LoadLibrary(_T("test_mfc.dll")); + assert(hmfcLib); + if (hmfcLib) + { + // Now leak some memory + CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // This requires ansi, not Unicode strings + CallLibraryMethods(hmfcLib, "MFC_LeakArray"); + + //CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings + + FreeLibrary(hmfcLib); } } diff --git a/tests/dynamic_app/LoadTests.h b/tests/dynamic_app/LoadTests.h index 3a6f84a6..10a86cbd 100644 --- a/tests/dynamic_app/LoadTests.h +++ b/tests/dynamic_app/LoadTests.h @@ -1,4 +1,4 @@ #pragma once void RunLoaderTests( bool resolve ); - +void RunMFCLoaderTests(); diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 8a5574d1..cc1daf94 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -42,6 +42,7 @@ int _tmain(int argc, _TCHAR* argv[]) } RunLoaderTests(resolve); + RunMFCLoaderTests(); LeakDuplicateLeaks(); return 0; diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index 7e185468..039aded4 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -65,26 +65,26 @@ true $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ dynamic true $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ dynamic true false $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ dynamic false $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ dynamic @@ -106,7 +106,8 @@ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y @@ -129,8 +130,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y - -del $(OutDir)*.tlog +copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y Copying over Visual Leak Detector Dependencies diff --git a/tests/mfc/Resource.h b/tests/mfc/Resource.h new file mode 100644 index 00000000..5906c537 --- /dev/null +++ b/tests/mfc/Resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by mfc.rc +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS + +#define _APS_NEXT_RESOURCE_VALUE 1000 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 1000 +#define _APS_NEXT_COMMAND_VALUE 32771 +#endif +#endif diff --git a/tests/mfc/mfc.cpp b/tests/mfc/mfc.cpp new file mode 100644 index 00000000..7250f415 --- /dev/null +++ b/tests/mfc/mfc.cpp @@ -0,0 +1,94 @@ +// mfc.cpp : Defines the initialization routines for the DLL. +// + +#include "stdafx.h" +#include "mfc.h" + +//#ifdef _DEBUG +//#define new DEBUG_NEW +//#endif + +// +//TODO: If this DLL is dynamically linked against the MFC DLLs, +// any functions exported from this DLL which call into +// MFC must have the AFX_MANAGE_STATE macro added at the +// very beginning of the function. +// +// For example: +// +// extern "C" BOOL PASCAL EXPORT ExportedFunction() +// { +// AFX_MANAGE_STATE(AfxGetStaticModuleState()); +// // normal function body here +// } +// +// It is very important that this macro appear in each +// function, prior to any calls into MFC. This means that +// it must appear as the first statement within the +// function, even before any object variable declarations +// as their constructors may generate calls into the MFC +// DLL. +// +// Please see MFC Technical Notes 33 and 58 for additional +// details. +// + +// CmfcApp + +BEGIN_MESSAGE_MAP(CmfcApp, CWinApp) +END_MESSAGE_MAP() + + +// CmfcApp construction + +CmfcApp::CmfcApp() +{ + // TODO: add construction code here, + // Place all significant initialization in InitInstance +} + + +// The one and only CmfcApp object + +CmfcApp theApp; + + +// CmfcApp initialization + +BOOL CmfcApp::InitInstance() +{ + CWinApp::InitInstance(); + + return TRUE; +} + +int CmfcApp::ExitInstance() +{ + // Without this, Dynamically unloading the MFC dll will crash + AfxEnableMemoryLeakDump(FALSE); + return 0; +} + +extern "C" void __declspec(dllexport) MFC_LeakSimple() +{ + AFX_MANAGE_STATE(AfxGetStaticModuleState()); + + // Attempt to allocate and leak some form of memory + CString* str_a = new CString(_T("I am a string in MFC")); + CString* str_b = new CString(_T("Another string in MFC")); + CString* str_c = DEBUG_NEW CString(_T("Another string in MFC")); + CString* str_d = new (_NORMAL_BLOCK, __FILE__, __LINE__) CString(_T("4 parameter new for mfc")); +} + +extern "C" void __declspec(dllexport) MFC_LeakArray() +{ + AFX_MANAGE_STATE(AfxGetStaticModuleState()); + + // Attempt to allocate and leak an array of CStrings + CString* mystr = new CString[3]; + + CString* strArray = DEBUG_NEW CString[3]; + + CString* another = new (_NORMAL_BLOCK, __FILE__, __LINE__) CString[3]; +} + diff --git a/tests/mfc/mfc.def b/tests/mfc/mfc.def new file mode 100644 index 00000000..50ae4094 --- /dev/null +++ b/tests/mfc/mfc.def @@ -0,0 +1,6 @@ +; mfc.def : Declares the module parameters for the DLL. + +LIBRARY + +EXPORTS + ; Explicit exports can go here diff --git a/tests/mfc/mfc.h b/tests/mfc/mfc.h new file mode 100644 index 00000000..7d05bc4b --- /dev/null +++ b/tests/mfc/mfc.h @@ -0,0 +1,27 @@ +// mfc.h : main header file for the mfc DLL +// + +#pragma once + +#ifndef __AFXWIN_H__ + #error "include 'stdafx.h' before including this file for PCH" +#endif + +#include "resource.h" // main symbols + + +// CmfcApp +// See mfc.cpp for the implementation of this class +// + +class CmfcApp : public CWinApp +{ +public: + CmfcApp(); + +// Overrides +public: + virtual BOOL InitInstance(); + virtual int ExitInstance(); // return app exit code + DECLARE_MESSAGE_MAP() +}; diff --git a/tests/mfc/mfc.rc b/tests/mfc/mfc.rc new file mode 100644 index 0000000000000000000000000000000000000000..859e16e01c69093220a345dda4499d7a16bfc24a GIT binary patch literal 6466 zcmdU!Yfl?T6o${|O8pPp z!`{t8P~^&5W_NbZnR9*ToaNttc5KHYJGN`Pu({pZf@^9^=0?md?B338#?yiQ$S<-h zyR;jwIrB@#33GEs(cN=*!F|M&xLw;FYqsrs`;J|9+_=T;4R2?xp18GffqvWmwAif{ z<(6AFb#&tW-cGD<0~=b?j;v>6JGB;c=yGO_6~eTLbRXfO zQtp)J)w&&oX-~WnZ6nL+%dTeYL&T^VUhz zdQpx8WO|QO!r+&c^#p!BY$3h_cV5=FL$!UB1CjlZIjtx5>cI#3J;vl+hu>?c{^l1| zQV!s8N^XylxQnk|S4Mt^m0ea284p<<**p7*zq=`lkZ)O(D9=5Aj-EmN3GH<9==|9u zb7Qzhu9}F5wp*^BpHM}qZo00lpB5=;C1oC8LR@?M)zKrH*U}+q5Ue3Qj>rX}jj%(Q zquTDmRULOuL!ru&GdLRq`IA0yjFJ0s9I8Tq%|5--ngxBm1?$vO@>t^6ZkelLBHTN^*QMk;k~$MO&ba! zdv;Yqt-D!4nWy*`ZCI}W7~P_5ZRAGvp(m5WR*^BCzVDoTXChN z_oxvnMxkws8fgeFdfkfDY5w{3iuf71f4PRbK{ek%YQKAu``P_^=%Af6>SP}9_oMTR zI=GL_z5!vgG&-epUWu;lDAL#$H0h(=zB|#&+jv`eCI&p z&-)_P^CZY(f!{gE9Fw8jSlVB^Pts8S)_0D%v(PMORlh_0P#sK&k=c{@ci?@6?Pty- zclO0a+!cNF5H=wa<;=CmC#4oXH}=2pi5H zZ1@~x$$Do1H&t&7Jfp93=`8fv?2*S;#Cv2!V}-L`;zZu$t_;ib^=RFi=l@h&eBC!V z^{=Sz%j7NV{sKlN64&efycF5mF5M03y{^s9^|Zvn5{cjR-;cVO_8&m=ItBm$ literal 0 HcmV?d00001 diff --git a/tests/mfc/mfc.vcxproj b/tests/mfc/mfc.vcxproj new file mode 100644 index 00000000..d86acf9b --- /dev/null +++ b/tests/mfc/mfc.vcxproj @@ -0,0 +1,214 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2178E5B2-1032-441F-A664-F3D8D1FD1913} + mfc + MFCDLLProj + + + + DynamicLibrary + true + Unicode + Dynamic + + + DynamicLibrary + true + Unicode + Dynamic + + + DynamicLibrary + false + true + Unicode + Dynamic + + + DynamicLibrary + false + true + Unicode + Dynamic + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + test_mfc + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + test_mfc + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + test_mfc + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + test_mfc + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/mfc/mfc.vcxproj.filters b/tests/mfc/mfc.vcxproj.filters new file mode 100644 index 00000000..656c5de1 --- /dev/null +++ b/tests/mfc/mfc.vcxproj.filters @@ -0,0 +1,52 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Resource Files + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/tests/mfc/res/mfc.rc2 b/tests/mfc/res/mfc.rc2 new file mode 100644 index 0000000000000000000000000000000000000000..ed6a2f98b0e6bb0f8a8272fff98c93955c37c6c9 GIT binary patch literal 790 zcmdUtO=WAa`iUQsRI&2d7cQ$9s@odUX8XBqKC3Pktft@5r^q Y^M<{z-(7mAw|`2dse8xmME|4f6Mwg71poj5 literal 0 HcmV?d00001 diff --git a/tests/mfc/stdafx.cpp b/tests/mfc/stdafx.cpp new file mode 100644 index 00000000..0d3689f5 --- /dev/null +++ b/tests/mfc/stdafx.cpp @@ -0,0 +1,7 @@ +// stdafx.cpp : source file that includes just the standard includes +// mfc.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + + diff --git a/tests/mfc/stdafx.h b/tests/mfc/stdafx.h new file mode 100644 index 00000000..d3d296b0 --- /dev/null +++ b/tests/mfc/stdafx.h @@ -0,0 +1,39 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently + +#pragma once + +#ifndef VC_EXTRALEAN +#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers +#endif + +#include "targetver.h" + +#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit + +#include // MFC core and standard components +#include // MFC extensions + +#ifndef _AFX_NO_OLE_SUPPORT +#include // MFC OLE classes +#include // MFC OLE dialog classes +#include // MFC Automation classes +#endif // _AFX_NO_OLE_SUPPORT + +#ifndef _AFX_NO_DB_SUPPORT +#include // MFC ODBC database classes +#endif // _AFX_NO_DB_SUPPORT + +#ifndef _AFX_NO_DAO_SUPPORT +#include // MFC DAO database classes +#endif // _AFX_NO_DAO_SUPPORT + +#ifndef _AFX_NO_OLE_SUPPORT +#include // MFC support for Internet Explorer 4 Common Controls +#endif +#ifndef _AFX_NO_AFXCMN_SUPPORT +#include // MFC support for Windows Common Controls +#endif // _AFX_NO_AFXCMN_SUPPORT + + diff --git a/tests/mfc/targetver.h b/tests/mfc/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/tests/mfc/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/vld.cpp b/vld.cpp index 62386215..b901a9a5 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1813,36 +1813,35 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t // void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) { - void *block; - tls_t *tls = vld.gettls(); + tls_t* tls = vld.gettls(); - // The new operator is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // The new operator is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pnew(size); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew(size); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } - return block; + return block; } // _realloc - This function is just a wrapper around the real realloc that sets diff --git a/vld_vs10.sln b/vld_vs10.sln index 55509513..d7e152d0 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -17,9 +17,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" ProjectSection(ProjectDependencies) = postProject {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfc", "tests\mfc\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" +EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 5 @@ -101,6 +104,16 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -110,5 +123,6 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal From 0ce4362107894eb2fcb22bca7624df9d3e785299 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Wed, 20 Apr 2011 15:12:11 +0000 Subject: [PATCH 054/321] vldint.h This is the fix for issue 8498 vld.cpp Slight cleanup of some code. No runtime changes here. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66044 --- vld.cpp | 642 +++++++++++++++++++++++++++---------------------------- vldint.h | 2 +- 2 files changed, 318 insertions(+), 326 deletions(-) diff --git a/vld.cpp b/vld.cpp index b901a9a5..1ed24390 100644 --- a/vld.cpp +++ b/vld.cpp @@ -699,109 +699,109 @@ VisualLeakDetector::~VisualLeakDetector () // VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) { - ModuleSet::Muterator updateit; - - // Iterate through the supplied set, until all modules have been attached. - for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { - DWORD64 modulebase = (DWORD64)(*newit).addrlow; - UINT32 moduleflags = 0x0; - LPCSTR modulename = (*newit).name; - LPCSTR modulepath = (*newit).path; - DWORD modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; - - BOOL refresh = FALSE; - EnterCriticalSection(&m_moduleslock); - ModuleSet* oldmodules = m_loadedmodules; - if (oldmodules != NULL) { - // This is not the first time we have been called to attach to the - // currently loaded modules. - ModuleSet::Iterator oldit = oldmodules->find(*newit); - if (oldit != oldmodules->end()) { - // We've seen this "new" module loaded in the process before. - moduleflags = (*oldit).flags; - LeaveCriticalSection(&m_moduleslock); - if (moduleispatched((HMODULE)modulebase, m_patchtable, _countof(m_patchtable))) { - // This module is already attached. Just update the module's - // flags, nothing more. - updateit = newit; - (*updateit).flags = moduleflags; - continue; - } - else { - // This module may have been attached before and has been - // detached. We'll need to try reattaching to it in case it - // was unloaded and then subsequently reloaded. - refresh = TRUE; - } - } - else { - LeaveCriticalSection(&m_moduleslock); - } - } - else { - LeaveCriticalSection(&m_moduleslock); - } + ModuleSet::Muterator updateit; + + // Iterate through the supplied set, until all modules have been attached. + for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { + DWORD64 modulebase = (DWORD64)(*newit).addrlow; + UINT32 moduleflags = 0x0; + LPCSTR modulename = (*newit).name; + LPCSTR modulepath = (*newit).path; + DWORD modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; + + BOOL refresh = FALSE; + EnterCriticalSection(&m_moduleslock); + ModuleSet* oldmodules = m_loadedmodules; + if (oldmodules != NULL) { + // This is not the first time we have been called to attach to the + // currently loaded modules. + ModuleSet::Iterator oldit = oldmodules->find(*newit); + if (oldit != oldmodules->end()) { + // We've seen this "new" module loaded in the process before. + moduleflags = (*oldit).flags; + LeaveCriticalSection(&m_moduleslock); + if (moduleispatched((HMODULE)modulebase, m_patchtable, _countof(m_patchtable))) { + // This module is already attached. Just update the module's + // flags, nothing more. + updateit = newit; + (*updateit).flags = moduleflags; + continue; + } + else { + // This module may have been attached before and has been + // detached. We'll need to try reattaching to it in case it + // was unloaded and then subsequently reloaded. + refresh = TRUE; + } + } + else { + LeaveCriticalSection(&m_moduleslock); + } + } + else { + LeaveCriticalSection(&m_moduleslock); + } - EnterCriticalSection(&symbollock); - if ((refresh == TRUE) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { - // Discard the previously loaded symbols, so we can refresh them. - if (SymUnloadModule64(currentprocess, modulebase) == FALSE) { - report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" - L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); - } - } + EnterCriticalSection(&symbollock); + if ((refresh == TRUE) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { + // Discard the previously loaded symbols, so we can refresh them. + if (SymUnloadModule64(currentprocess, modulebase) == FALSE) { + report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" + L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); + } + } - // Try to load the module's symbols. This ensures that we have loaded - // the symbols for every module that has ever been loaded into the - // process, guaranteeing the symbols' availability when generating the - // leak report. - IMAGEHLP_MODULE64 moduleimageinfo; - moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); - BOOL SymbolsLoaded = SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo); - if (!SymbolsLoaded) - { - DWORD64 module = SymLoadModule64(currentprocess, NULL, modulepath, NULL, modulebase, modulesize); - if (module == modulebase) - SymbolsLoaded = SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo); - } - if (SymbolsLoaded) - moduleflags |= VLD_MODULE_SYMBOLSLOADED; - LeaveCriticalSection(&symbollock); - - if (_stricmp(VLDDLL, modulename) == 0) { - // What happens when a module goes through it's own portal? Bad things. - // Like infinite recursion. And ugly bald men wearing dresses. VLD - // should not, therefore, attach to itself. - continue; - } + // Try to load the module's symbols. This ensures that we have loaded + // the symbols for every module that has ever been loaded into the + // process, guaranteeing the symbols' availability when generating the + // leak report. + IMAGEHLP_MODULE64 moduleimageinfo; + moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); + BOOL SymbolsLoaded = SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo); + if (!SymbolsLoaded) + { + DWORD64 module = SymLoadModule64(currentprocess, NULL, modulepath, NULL, modulebase, modulesize); + if (module == modulebase) + SymbolsLoaded = SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo); + } + if (SymbolsLoaded) + moduleflags |= VLD_MODULE_SYMBOLSLOADED; + LeaveCriticalSection(&symbollock); + + if (_stricmp(VLDDLL, modulename) == 0) { + // What happens when a module goes through it's own portal? Bad things. + // Like infinite recursion. And ugly bald men wearing dresses. VLD + // should not, therefore, attach to itself. + continue; + } - size_t count; + size_t count; #define MAXMODULENAME (_MAX_FNAME + _MAX_EXT) - WCHAR modulenamew [MAXMODULENAME]; - mbstowcs_s(&count, modulenamew, MAXMODULENAME, modulename, _TRUNCATE); - if ((findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A") == FALSE) && - (wcsstr(vld.m_forcedmodulelist, modulenamew) == NULL)) { - // This module does not import VLD. This means that none of the module's - // sources #included vld.h. Exclude this module from leak detection. - moduleflags |= VLD_MODULE_EXCLUDED; - } - else if (!(moduleflags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { - // This module is going to be included in leak detection, but complete - // symbols for this module couldn't be loaded. This means that any stack - // traces through this module may lack information, like line numbers - // and function names. - report(L"WARNING: Visual Leak Detector: A module, %s, included in memory leak detection\n" - L" does not have any debugging symbols available, or they could not be located.\n" - L" Function names and/or line numbers for this module may not be available.\n", modulename); - } + WCHAR modulenamew [MAXMODULENAME]; + mbstowcs_s(&count, modulenamew, MAXMODULENAME, modulename, _TRUNCATE); + if ((findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A") == FALSE) && + (wcsstr(vld.m_forcedmodulelist, modulenamew) == NULL)) { + // This module does not import VLD. This means that none of the module's + // sources #included vld.h. Exclude this module from leak detection. + moduleflags |= VLD_MODULE_EXCLUDED; + } + else if (!(moduleflags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { + // This module is going to be included in leak detection, but complete + // symbols for this module couldn't be loaded. This means that any stack + // traces through this module may lack information, like line numbers + // and function names. + report(L"WARNING: Visual Leak Detector: A module, %s, included in memory leak detection\n" + L" does not have any debugging symbols available, or they could not be located.\n" + L" Function names and/or line numbers for this module may not be available.\n", modulename); + } - // Update the module's flags in the "new modules" set. - updateit = newit; - (*updateit).flags = moduleflags; + // Update the module's flags in the "new modules" set. + updateit = newit; + (*updateit).flags = moduleflags; - // Attach to the module. - patchmodule((HMODULE)modulebase, m_patchtable, _countof(m_patchtable)); - } + // Attach to the module. + patchmodule((HMODULE)modulebase, m_patchtable, _countof(m_patchtable)); + } } // buildsymbolsearchpath - Builds the symbol search path for the symbol handler. @@ -1062,26 +1062,26 @@ VOID VisualLeakDetector::configure () // BOOL VisualLeakDetector::enabled () { - tls_t *tls = vld.gettls(); + tls_t* tls = vld.gettls(); - if (!(m_status & VLD_STATUS_INSTALLED)) { - // Memory leak detection is not yet enabled because VLD is still - // initializing. - return FALSE; - } + if (!(m_status & VLD_STATUS_INSTALLED)) { + // Memory leak detection is not yet enabled because VLD is still + // initializing. + return FALSE; + } - if (!(tls->flags & VLD_TLS_DISABLED) && !(tls->flags & VLD_TLS_ENABLED)) { - // The enabled/disabled state for the current thread has not been - // initialized yet. Use the default state. - if (m_options & VLD_OPT_START_DISABLED) { - tls->flags |= VLD_TLS_DISABLED; - } - else { - tls->flags |= VLD_TLS_ENABLED; - } - } + if (!(tls->flags & VLD_TLS_DISABLED) && !(tls->flags & VLD_TLS_ENABLED)) { + // The enabled/disabled state for the current thread has not been + // initialized yet. Use the default state. + if (m_options & VLD_OPT_START_DISABLED) { + tls->flags |= VLD_TLS_DISABLED; + } + else { + tls->flags |= VLD_TLS_ENABLED; + } + } - return ((tls->flags & VLD_TLS_ENABLED) != 0); + return ((tls->flags & VLD_TLS_ENABLED) != 0); } // eraseduplicates - Erases, from the block maps, blocks that appear to be @@ -1096,38 +1096,38 @@ BOOL VisualLeakDetector::enabled () // SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) { - SIZE_T erased = 0; - blockinfo_t *elementinfo = (*element).second; + SIZE_T erased = 0; + blockinfo_t *elementinfo = (*element).second; - if (elementinfo->callstack == NULL) - return erased; + if (elementinfo->callstack == NULL) + return erased; - // Iteratate through all block maps, looking for blocks with the same size - // and callstack as the specified element. - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - BlockMap *blockmap = &(*heapit).second->blockmap; - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - if (blockit == element) { - // Don't delete the element of which we are searching for - // duplicates. - continue; - } - blockinfo_t *info = (*blockit).second; - if (info->callstack == NULL) - continue; - if ((info->size == elementinfo->size) && (*(info->callstack) == *(elementinfo->callstack))) { - // Found a duplicate. Erase it. - delete info->callstack; - delete info; - BlockMap::Iterator previt = blockit - 1; - blockmap->erase(blockit); - blockit = previt; - erased++; - } - } - } + // Iteratate through all block maps, looking for blocks with the same size + // and callstack as the specified element. + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + BlockMap *blockmap = &(*heapit).second->blockmap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + if (blockit == element) { + // Don't delete the element of which we are searching for + // duplicates. + continue; + } + blockinfo_t *info = (*blockit).second; + if (info->callstack == NULL) + continue; + if ((info->size == elementinfo->size) && (*(info->callstack) == *(elementinfo->callstack))) { + // Found a duplicate. Erase it. + delete info->callstack; + delete info; + BlockMap::Iterator previt = blockit - 1; + blockmap->erase(blockit); + blockit = previt; + erased++; + } + } + } - return erased; + return erased; } // gettls - Obtains the thread local storage structure for the calling thread. @@ -1139,29 +1139,27 @@ SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) // tls_t* VisualLeakDetector::gettls () { - tls_t *tls; - - // Get the pointer to this thread's thread local storage structure. - tls = (tls_t*)TlsGetValue(m_tlsindex); - assert(GetLastError() == ERROR_SUCCESS); - - if (tls == NULL) { - // This thread's thread local storage structure has not been allocated. - tls = new tls_t; - TlsSetValue(m_tlsindex, tls); - ZeroMemory(&tls->context, sizeof(tls->context)); - tls->flags = 0x0; - tls->oldflags = 0x0; - tls->threadid = GetCurrentThreadId(); - tls->ppcallstack = NULL; - - // Add this thread's TLS to the TlsSet. - EnterCriticalSection(&m_tlslock); + // Get the pointer to this thread's thread local storage structure. + tls_t* tls = (tls_t*)TlsGetValue(m_tlsindex); + assert(GetLastError() == ERROR_SUCCESS); + + if (tls == NULL) { + // This thread's thread local storage structure has not been allocated. + tls = new tls_t; + TlsSetValue(m_tlsindex, tls); + ZeroMemory(&tls->context, sizeof(tls->context)); + tls->flags = 0x0; + tls->oldflags = 0x0; + tls->threadid = GetCurrentThreadId(); + tls->ppcallstack = NULL; + + // Add this thread's TLS to the TlsSet. + EnterCriticalSection(&m_tlslock); m_tlsset->insert(tls); - LeaveCriticalSection(&m_tlslock); - } + LeaveCriticalSection(&m_tlslock); + } - return tls; + return tls; } // mapblock - Tracks memory allocations. Information about allocated blocks is @@ -1189,7 +1187,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c static SIZE_T serialnumber = 0; // Record the block's information. - blockinfo_t *blockinfo = new blockinfo_t; + blockinfo_t* blockinfo = new blockinfo_t; blockinfo->callstack = NULL; ppcallstack = &blockinfo->callstack; blockinfo->serialnumber = serialnumber++; @@ -1208,7 +1206,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c // The heap that this block was allocated from is a CRT heap. (*heapit).second->flags |= VLD_HEAP_CRT; } - BlockMap *blockmap = &(*heapit).second->blockmap; + BlockMap* blockmap = &(*heapit).second->blockmap; BlockMap::Iterator blockit = blockmap->insert(mem, blockinfo); if (blockit == blockmap->end()) { // A block with this address has already been allocated. The @@ -1237,25 +1235,22 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c // VOID VisualLeakDetector::mapheap (HANDLE heap) { - heapinfo_t *heapinfo; - HeapMap::Iterator heapit; - - // Create a new block map for this heap and insert it into the heap map. - heapinfo = new heapinfo_t; - heapinfo->blockmap.reserve(BLOCKMAPRESERVE); - heapinfo->flags = 0x0; - EnterCriticalSection(&m_maplock); - heapit = m_heapmap->insert(heap, heapinfo); - if (heapit == m_heapmap->end()) { - // Somehow this heap has been created twice without being destroyed, - // or at least it was destroyed without VLD's knowledge. Unmap the heap - // from the existing heapinfo, and remap it to the new one. - report(L"WARNING: Visual Leak Detector detected a duplicate heap (" ADDRESSFORMAT L").\n", heap); - heapit = m_heapmap->find(heap); - unmapheap((*heapit).first); - m_heapmap->insert(heap, heapinfo); - } - LeaveCriticalSection(&m_maplock); + // Create a new block map for this heap and insert it into the heap map. + heapinfo_t* heapinfo = new heapinfo_t; + heapinfo->blockmap.reserve(BLOCKMAPRESERVE); + heapinfo->flags = 0x0; + EnterCriticalSection(&m_maplock); + HeapMap::Iterator heapit = m_heapmap->insert(heap, heapinfo); + if (heapit == m_heapmap->end()) { + // Somehow this heap has been created twice without being destroyed, + // or at least it was destroyed without VLD's knowledge. Unmap the heap + // from the existing heapinfo, and remap it to the new one. + report(L"WARNING: Visual Leak Detector detected a duplicate heap (" ADDRESSFORMAT L").\n", heap); + heapit = m_heapmap->find(heap); + unmapheap((*heapit).first); + m_heapmap->insert(heap, heapinfo); + } + LeaveCriticalSection(&m_maplock); } // remapblock - Tracks reallocations. Unmaps a block from its previously @@ -1323,7 +1318,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // Found the blockinfo_t entry for this block. Update it with // a new callstack and new size. - blockinfo_t *info = (*blockit).second; + blockinfo_t* info = (*blockit).second; if (info->callstack) { info->callstack->clear(); @@ -2440,42 +2435,42 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) // Returns the value returned by LdrLoadDll. // NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle) + PHANDLE modulehandle) { - EnterCriticalSection(&vld.m_loaderlock); + EnterCriticalSection(&vld.m_loaderlock); - // Load the DLL. - NTSTATUS status = LdrLoadDll(searchpath, flags, modulename, modulehandle); + // Load the DLL. + NTSTATUS status = LdrLoadDll(searchpath, flags, modulename, modulehandle); - if (STATUS_SUCCESS == status) { - // Duplicate code here from VisualLeakDetector::RefreshModules. Consider refactoring this out. - // Create a new set of all loaded modules, including any newly loaded - // modules. - ModuleSet *newmodules = new ModuleSet; - newmodules->reserve(MODULESETRESERVE); - EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); + if (STATUS_SUCCESS == status) { + // Duplicate code here from VisualLeakDetector::RefreshModules. Consider refactoring this out. + // Create a new set of all loaded modules, including any newly loaded + // modules. + ModuleSet *newmodules = new ModuleSet; + newmodules->reserve(MODULESETRESERVE); + EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); - // Attach to all modules included in the set. - vld.attachtoloadedmodules(newmodules); + // Attach to all modules included in the set. + vld.attachtoloadedmodules(newmodules); - // Start using the new set of loaded modules. - EnterCriticalSection(&vld.m_moduleslock); - ModuleSet *oldmodules = vld.m_loadedmodules; - vld.m_loadedmodules = newmodules; - LeaveCriticalSection(&vld.m_moduleslock); + // Start using the new set of loaded modules. + EnterCriticalSection(&vld.m_moduleslock); + ModuleSet *oldmodules = vld.m_loadedmodules; + vld.m_loadedmodules = newmodules; + LeaveCriticalSection(&vld.m_moduleslock); - // Free resources used by the old module list. - for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { - delete (*moduleit).name; - delete (*moduleit).path; - } - delete oldmodules; - } + // Free resources used by the old module list. + for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { + delete (*moduleit).name; + delete (*moduleit).path; + } + delete oldmodules; + } - LeaveCriticalSection(&vld.m_loaderlock); + LeaveCriticalSection(&vld.m_loaderlock); - return status; + return status; } VOID VisualLeakDetector::RefreshModules() @@ -2550,58 +2545,55 @@ void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &cont // LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) { - LPVOID block; - - // Allocate the block. - block = RtlAllocateHeap(heap, flags, size); + // Allocate the block. + LPVOID block = RtlAllocateHeap(heap, flags, size); if ((block == NULL) || !vld.enabled()) - return block; + return block; - tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; + tls_t* tls = vld.gettls(); + BOOL firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) - return block; + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } - tls->context = context; + tls->context = context; - BOOL crtalloc; - crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + BOOL crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - // The module that initiated this allocation is included in leak - // detection. Map this block to the specified heap. - vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); + // The module that initiated this allocation is included in leak + // detection. Map this block to the specified heap. + vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } - return block; + return block; } // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. @@ -2621,14 +2613,14 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si // BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) { - BOOL status; + BOOL status; - // Unmap the block from the specified heap. - vld.unmapblock(heap, mem); + // Unmap the block from the specified heap. + vld.unmapblock(heap, mem); - status = RtlFreeHeap(heap, flags, mem); + status = RtlFreeHeap(heap, flags, mem); - return status; + return status; } // Find the information for the module that initiated this reallocation. @@ -3424,81 +3416,81 @@ void VisualLeakDetector::SetupReporting() void VisualLeakDetector::resolveStacks(HANDLE heap) { - // Find the heap's information (blockmap, etc). - EnterCriticalSection(&m_maplock); - HeapMap::Iterator heapiter = m_heapmap->find(heap); - if (heapiter == m_heapmap->end()) { - // Nothing is allocated from this heap. No leaks. - LeaveCriticalSection(&m_maplock); - return; - } + // Find the heap's information (blockmap, etc). + EnterCriticalSection(&m_maplock); + HeapMap::Iterator heapiter = m_heapmap->find(heap); + if (heapiter == m_heapmap->end()) { + // Nothing is allocated from this heap. No leaks. + LeaveCriticalSection(&m_maplock); + return; + } - heapinfo_t* heapinfo = (*heapiter).second; - BlockMap& blockmap = heapinfo->blockmap; + heapinfo_t* heapinfo = (*heapiter).second; + BlockMap& blockmap = heapinfo->blockmap; - for (BlockMap::Iterator blockit = blockmap.begin(); blockit != blockmap.end(); ++blockit) { - // Found a block which is still in the BlockMap. We've identified a - // potential memory leak. - const void* block = (*blockit).first; - blockinfo_t* info = (*blockit).second; - assert(info); - if (info == NULL) - { - continue; - } - // The actuall memory address - const void* address = block; - assert(address != NULL); - - SIZE_T size = info->size; - - if (heapinfo->flags & VLD_HEAP_CRT) { - // This block is allocated to a CRT heap, so the block has a CRT - // memory block header prepended to it. - crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { - // This block is marked as being used internally by the CRT. - // The CRT will free the block after VLD is destroyed. - continue; - } - // The CRT header is more or less transparent to the user, so - // the information about the contained block will probably be - // more useful to the user. Accordingly, that's the information - // we'll include in the report. - address = CRTDBGBLOCKDATA(block); - size = crtheader->size; - } + for (BlockMap::Iterator blockit = blockmap.begin(); blockit != blockmap.end(); ++blockit) { + // Found a block which is still in the BlockMap. We've identified a + // potential memory leak. + const void* block = (*blockit).first; + blockinfo_t* info = (*blockit).second; + assert(info); + if (info == NULL) + { + continue; + } + // The actual memory address + const void* address = block; + assert(address != NULL); - if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { - // Aggregate all other leaks which are duplicates of this one - // under this same heading, to cut down on clutter. - eraseduplicates(blockit); - } - // Dump the call stack. - if (info->callstack) - { - info->callstack->Resolve(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); - } - } + SIZE_T size = info->size; - LeaveCriticalSection(&m_maplock); + if (heapinfo->flags & VLD_HEAP_CRT) { + // This block is allocated to a CRT heap, so the block has a CRT + // memory block header prepended to it. + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { + // This block is marked as being used internally by the CRT. + // The CRT will free the block after VLD is destroyed. + continue; + } + // The CRT header is more or less transparent to the user, so + // the information about the contained block will probably be + // more useful to the user. Accordingly, that's the information + // we'll include in the report. + address = CRTDBGBLOCKDATA(block); + size = crtheader->size; + } + + if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { + // Aggregate all other leaks which are duplicates of this one + // under this same heading, to cut down on clutter. + eraseduplicates(blockit); + } + // Dump the call stack. + if (info->callstack) + { + info->callstack->Resolve(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + } + } + + LeaveCriticalSection(&m_maplock); } void VisualLeakDetector::ResolveCallstacks() { - if (vld.m_options & VLD_OPT_VLDOFF) - { - return; - } + if (vld.m_options & VLD_OPT_VLDOFF) + { + return; + } - // Generate the Callstacks early - for (HeapMap::Iterator heapiter = m_heapmap->begin(); - heapiter != m_heapmap->end(); - ++heapiter) - { - HANDLE heap = (*heapiter).first; - resolveStacks(heap); - } + // Generate the Callstacks early + for (HeapMap::Iterator heapiter = m_heapmap->begin(); + heapiter != m_heapmap->end(); + ++heapiter) + { + HANDLE heap = (*heapiter).first; + resolveStacks(heap); + } } HMODULE VisualLeakDetector::GetSxSModuleHandle(LPCSTR modulenamea) diff --git a/vldint.h b/vldint.h index 7509b23c..7a86cc2e 100644 --- a/vldint.h +++ b/vldint.h @@ -100,7 +100,7 @@ typedef Map HeapMap; typedef struct moduleinfo_s { BOOL operator < (const struct moduleinfo_s &other) const { - if (addrhigh < other.addrlow) { + if (addrlow < other.addrlow) { return TRUE; } else { From 13cdf3f20b5f1843fa5eb34f82b3c1006ef0bb05 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Wed, 20 Apr 2011 21:39:31 +0000 Subject: [PATCH 055/321] The main problem in the bug is that VLD ignores allocations in DLL's that don't directly import or depend on vld_xxx.dll. Wierd I know, but that's how it works. Hence I'm reverting my previous change in vldint.h, and solving this by merely calling the exported VLDEnableModule and passing in the module handle of my dynamically loaded DLL's. So the rule is: If you dynamically load a module in your process space via LoadLibrary that does NOT link against vld_xxx.dll, then you must call VLDEnableModule and pass in the module handle for that DLL. Changes: -------------------------------- vld.cpp Altered VisualLeakDetector::IsModuleExcluded so that it just loops though moduleinfo_t's and directly checks if the address (which is not actually the base address) is in the range of the module. The assumption previously was that UINT_PTR address was the module base address, which it was not. It is merely the address of a stack frame. So here I check if it's higher than the base address, and lower than the high-address. I also removed VisualLeakDetector::GetModuleName which was completely unused. And since it's not good to have dead, uncalled, untested code here I took it out. If anyone needs it, they can look in the version control, and retrieve it. -------------------------------- vldint.h Reverted my last change to moduleinfo_s::operator<. -------------------------------- testsuite.cpp Put in a better way to wait for the threads to finish, instead of spinning wastefully in a loop. This uses WaitForMultipleObjects. -------------------------------- Other test suites: -------------------------------- I also updated a few of the other test suites. With these changes, the dynamic.exe test now correctly leaks exactly 31 memory allocations. Tested by running all test suites in 32 and 64 bit debug builds. As for Issue 8512, I cannot reproduce it anymore with these changes. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66054 --- tests/basics/Allocs.cpp | 9 +++--- tests/dynamic_app/LoadTests.cpp | 39 +++++++++++++---------- tests/dynamic_app/LoadTests.h | 2 +- tests/dynamic_app/dynamic_app.cpp | 8 +++-- tests/dynamic_dll/dynamic.cpp | 21 +++++++------ tests/dynamic_dll/dynamic.h | 7 ++++- tests/mfc/mfc.cpp | 2 ++ tests/suite/testsuite.cpp | 52 ++++++++++++++++++++++++------- vld.cpp | 47 ++++++++++------------------ vld_vs10.sln | 3 ++ vldint.h | 3 +- 11 files changed, 112 insertions(+), 81 deletions(-) diff --git a/tests/basics/Allocs.cpp b/tests/basics/Allocs.cpp index 737ce595..7201497f 100644 --- a/tests/basics/Allocs.cpp +++ b/tests/basics/Allocs.cpp @@ -21,14 +21,13 @@ void AllocF(LeakOption type) } else if (type == eNewArray) { - leaked_memory = new int[45]; - leaked_memory_dbg = new (_NORMAL_BLOCK,__FILE__,__LINE__) int[7]; + leaked_memory = new int[3]; + leaked_memory_dbg = new (_NORMAL_BLOCK,__FILE__,__LINE__) int[3]; // placement new operator - int temp[4]; + int temp[3]; void* place = temp; - float* placed_mem = new (place) float[4]; // doesn't work. Nothing gets patched by vld - float f = 4.5f; + float* placed_mem = new (place) float[3]; // doesn't work. Nothing gets patched by vld } else if (type == eCalloc) { diff --git a/tests/dynamic_app/LoadTests.cpp b/tests/dynamic_app/LoadTests.cpp index 2ebf96da..c6e0509f 100644 --- a/tests/dynamic_app/LoadTests.cpp +++ b/tests/dynamic_app/LoadTests.cpp @@ -26,22 +26,18 @@ void CallVLDExportedMethod(const CHAR* function) } } -void CallDynamicMethods(const CHAR* function) +void CallDynamicMethods(HMODULE module, const CHAR* function) { - HMODULE dynamic_module = GetModuleHandle(_T("dynamic.dll")); - assert(dynamic_module); - typedef int (__cdecl *DYNAPI_FNC)(); - if (dynamic_module != NULL) + typedef void (__cdecl *DYNAPI_FNC)(); + if (module != NULL) { - DYNAPI_FNC func = (DYNAPI_FNC)GetProcAddress(dynamic_module, function ); + DYNAPI_FNC func = (DYNAPI_FNC)GetProcAddress(module, function ); //GetFormattedMessage(GetLastError()); assert(func); - int result = -1; if (func) { - result = func(); + func(); } - assert(42 == result); } } @@ -51,8 +47,13 @@ void RunLoaderTests( bool resolve ) assert(hdyn); if (hdyn) { - // Now leak some memory - CallDynamicMethods("SimpleLeak_New"); // This requires ansi, not Unicode strings + VLDEnableModule(hdyn); + + // Should leak 18 memory allocations in total + // These requires ansi, not Unicode strings + CallDynamicMethods(hdyn, "SimpleLeak_Malloc"); // leaks 6 + CallDynamicMethods(hdyn, "SimpleLeak_New"); // leaks 6 + CallDynamicMethods(hdyn, "SimpleLeak_New_Array"); // leaks 6 if (resolve) { @@ -80,17 +81,23 @@ void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function ) } } -void RunMFCLoaderTests() + +void RunMFCLoaderTests(bool resolve) { HMODULE hmfcLib = LoadLibrary(_T("test_mfc.dll")); assert(hmfcLib); if (hmfcLib) { - // Now leak some memory - CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // This requires ansi, not Unicode strings - CallLibraryMethods(hmfcLib, "MFC_LeakArray"); + VLDEnableModule(hmfcLib); + // Should leak 7 memory allocations in total + // This requires ansi, not Unicode strings + CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // Leaks 4 + CallLibraryMethods(hmfcLib, "MFC_LeakArray"); // leaks 3 - //CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings + if (resolve) + { + CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings + } FreeLibrary(hmfcLib); } diff --git a/tests/dynamic_app/LoadTests.h b/tests/dynamic_app/LoadTests.h index 10a86cbd..208373c6 100644 --- a/tests/dynamic_app/LoadTests.h +++ b/tests/dynamic_app/LoadTests.h @@ -1,4 +1,4 @@ #pragma once void RunLoaderTests( bool resolve ); -void RunMFCLoaderTests(); +void RunMFCLoaderTests( bool resolve ); diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index cc1daf94..a8fcc9cb 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -11,6 +11,7 @@ void PrintUsage() wprintf(_T("\t - [OPTIONAL] Resolves callstacks before unloading the dynamic DLL.\n")); } +// Leaks 6 memory allocations void LeakDuplicateLeaks() { // For testing aggregation @@ -41,9 +42,10 @@ int _tmain(int argc, _TCHAR* argv[]) resolve = _tcsicmp(_T("true"), argv[1]) == 0; } - RunLoaderTests(resolve); - RunMFCLoaderTests(); - LeakDuplicateLeaks(); + RunLoaderTests(resolve); // leaks 18 + RunMFCLoaderTests(resolve); // leaks 7 + LeakDuplicateLeaks(); // leaks 6 + // ..................Total: 31 leaks total return 0; } diff --git a/tests/dynamic_dll/dynamic.cpp b/tests/dynamic_dll/dynamic.cpp index 5a4f76ab..074963d5 100644 --- a/tests/dynamic_dll/dynamic.cpp +++ b/tests/dynamic_dll/dynamic.cpp @@ -19,19 +19,20 @@ void LeakMemory(LeakOption type, int repeat) } // This is an example of an exported function. -DYNAMIC_API int SimpleLeak_New(void) -{ - - LeakMemory(eMalloc, 3); - LeakMemory(eNew, 3); - LeakMemory(eNewArray, 3); - LeakMemory(eCalloc, 3); - LeakMemory(eRealloc, 3); +void SimpleLeak_Malloc(void) +{ + LeakMemory(eMalloc, 3); // leaks 6 +} - int* pint = new int(5); +void SimpleLeak_New(void) +{ + LeakMemory(eNew, 3); // leaks 6 +} - return 42; +void SimpleLeak_New_Array(void) +{ + LeakMemory(eNewArray, 3); // leaks 6 } // This is the constructor of a class that has been exported. diff --git a/tests/dynamic_dll/dynamic.h b/tests/dynamic_dll/dynamic.h index a56809ab..5de4861b 100644 --- a/tests/dynamic_dll/dynamic.h +++ b/tests/dynamic_dll/dynamic.h @@ -20,7 +20,12 @@ class DYNAMIC_API Cdynamic { extern DYNAMIC_API int ndynamic; -DYNAMIC_API int SimpleLeak_New(void); +// Leaks 2*3=6 allocations +DYNAMIC_API void SimpleLeak_Malloc(void); +// Leaks 2*3=6 allocations +DYNAMIC_API void SimpleLeak_New(void); +// Leaks 2*3=6 allocations +DYNAMIC_API void SimpleLeak_New_Array(void); } diff --git a/tests/mfc/mfc.cpp b/tests/mfc/mfc.cpp index 7250f415..7a47e110 100644 --- a/tests/mfc/mfc.cpp +++ b/tests/mfc/mfc.cpp @@ -69,6 +69,7 @@ int CmfcApp::ExitInstance() return 0; } +// Leaks 4 memory allocations extern "C" void __declspec(dllexport) MFC_LeakSimple() { AFX_MANAGE_STATE(AfxGetStaticModuleState()); @@ -80,6 +81,7 @@ extern "C" void __declspec(dllexport) MFC_LeakSimple() CString* str_d = new (_NORMAL_BLOCK, __FILE__, __LINE__) CString(_T("4 parameter new for mfc")); } +// Leaks 3 memory allocations extern "C" void __declspec(dllexport) MFC_LeakArray() { AFX_MANAGE_STATE(AfxGetStaticModuleState()); diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index e5e1b244..3c0ba718 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -61,8 +61,8 @@ enum action_e { #define MAXSIZE 64 // Maximum block size to allocate #define MINDEPTH 0 // Minimum depth of the allocation call stack #define MINSIZE 16 // Minimum block size to allocate -#define NUMDUPLEAKS 3 // Number of times to duplicate each leak -#define NUMTHREADS 72 // Number of threads to run simultaneously +static const int NUMDUPLEAKS = 3; // Number of times to duplicate each leak +static const int NUMTHREADS = 63; // Number of threads to run simultaneously #define ONCEINAWHILE 10 // Free a random block approx. once every... typedef struct blockholder_s { @@ -261,7 +261,7 @@ VOID recursivelyallocate (UINT depth, action_e action, SIZE_T size) } } -DWORD __stdcall runtestsuite (LPVOID param) +DWORD __stdcall threadproc_test (LPVOID param) { action_e action; USHORT action_index; @@ -367,6 +367,7 @@ int main (int argc, char *argv []) // Select a random thread to be the leaker. UINT leakythread = random(NUMTHREADS - 1); + HANDLE threads[NUMTHREADS] = {0}; for (UINT index = 0; index < NUMTHREADS; ++index) { contexts[index].index = index; @@ -376,18 +377,45 @@ int main (int argc, char *argv []) contexts[index].leaky = FALSE; contexts[index].seed = random(RAND_MAX); contexts[index].terminated = FALSE; - CreateThread(NULL, 0, runtestsuite, &contexts[index], 0, &contexts[index].threadid); + HANDLE hthread = CreateThread(NULL, 0, threadproc_test, &contexts[index], 0, &contexts[index].threadid); + threads[index] = hthread; } - + // Wait for all threads to terminate. - // BTW: This is NOT how to wait for the threads to finish. - // TODO: Fix this to use WaitForMultipleObjects... - // As a result of this, I'm getting asserts up at assert(total_allocs == 0), - // at the end of the threaded function - for (UINT index = 0; index < NUMTHREADS; ++index) { - while (contexts[index].terminated == FALSE) { - Sleep(10); + BOOL wait_for_all = TRUE; + DWORD result = WaitForMultipleObjects(NUMTHREADS, threads, wait_for_all, 45*1000); + switch (result) + { + case WAIT_OBJECT_0: + _tprintf(_T("All threads finished correctly.\n")); + break; + case WAIT_ABANDONED_0: + _tprintf(_T("Abandoned mutex.\n")); + break; + case WAIT_TIMEOUT: + _tprintf(_T("All threads timed out\n")); + break; + case WAIT_FAILED: + { + _tprintf(_T("Function call to Wait failed with unknown error\n")); + TCHAR lpMsgBuf[MAX_PATH] = {0}; + FormatMessage( + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + lpMsgBuf, + MAX_PATH, + NULL ); + + _tprintf(_T("%s"), lpMsgBuf); } + + break; + default: + _tprintf(_T("Some other return value\n")); + break; } DWORD end = GetTickCount(); diff --git a/vld.cpp b/vld.cpp index 1ed24390..94c0170a 100644 --- a/vld.cpp +++ b/vld.cpp @@ -2626,38 +2626,23 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) // Find the information for the module that initiated this reallocation. BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) { - BOOL excluded = FALSE; - moduleinfo_t moduleinfo; - ModuleSet::Iterator moduleit; - moduleinfo.addrhigh = address; - moduleinfo.addrlow = address; - EnterCriticalSection(&vld.m_moduleslock); - moduleit = vld.m_loadedmodules->find(moduleinfo); - if (moduleit != vld.m_loadedmodules->end()) { - excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; - } - LeaveCriticalSection(&vld.m_moduleslock); - return excluded; -} + BOOL excluded = FALSE; -// Find name of the module. -BOOL VisualLeakDetector::GetModuleName(UINT_PTR address, LPSTR modulepath, ULONG modulelength) -{ - BOOL succeded = FALSE; - moduleinfo_t moduleinfo; - ModuleSet::Iterator moduleit; - moduleinfo.addrhigh = address; - moduleinfo.addrlow = address; - EnterCriticalSection(&m_moduleslock); - moduleit = m_loadedmodules->find(moduleinfo); - if (moduleit != m_loadedmodules->end()) { - strncpy_s(modulepath, modulelength, (*moduleit).name, _TRUNCATE); - succeded = true; - } - else - modulepath[0] = '\0'; - LeaveCriticalSection(&m_moduleslock); - return succeded; + EnterCriticalSection(&vld.m_moduleslock); + for (ModuleSet::Iterator it = vld.m_loadedmodules->begin(); + it != vld.m_loadedmodules->end(); + it++) + { + moduleinfo_t mod = (*it); + if ((mod.addrlow <= address) && (address <= mod.addrhigh)) + { + excluded = mod.flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; + break; + } + } + + LeaveCriticalSection(&vld.m_moduleslock); + return excluded; } // _RtlReAllocateHeap - Calls to RtlReAllocateHeap are patched through to this diff --git a/vld_vs10.sln b/vld_vs10.sln index d7e152d0..362fc73f 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -11,6 +11,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" EndProject diff --git a/vldint.h b/vldint.h index 7a86cc2e..ff36f3a1 100644 --- a/vldint.h +++ b/vldint.h @@ -100,7 +100,7 @@ typedef Map HeapMap; typedef struct moduleinfo_s { BOOL operator < (const struct moduleinfo_s &other) const { - if (addrlow < other.addrlow) { + if (addrhigh < other.addrlow) { return TRUE; } else { @@ -254,7 +254,6 @@ class VisualLeakDetector : public IMalloc // Utils static BOOL IsModuleExcluded (UINT_PTR returnaddress); static void getcallstack( CallStack **&ppcallstack, context_t &context ); - BOOL GetModuleName(UINT_PTR address, LPSTR modulepath, ULONG modulelength); void SetupReporting(); //////////////////////////////////////////////////////////////////////////////// From 6487d5b9c71b6ab7e64242030cf6b3affde3e24c Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Wed, 20 Apr 2011 21:48:25 +0000 Subject: [PATCH 056/321] Removed the copy constructor for class CallStack since it was private and not supposed to be use anyways. By removing it altogether, anything trying to use it will generate a linker error. (Note the declaration for it is still there). That is a much better way to enforce compliance, than putting an assert in the Copy Ctor. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66055 --- callstack.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index c975e487..dbe9b4c5 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -50,17 +50,6 @@ CallStack::CallStack () m_Resolved = NULL; } -// Copy Constructor - For efficiency, we want to avoid ever making copies of -// CallStacks (only pointer passing or reference passing should be performed). -// The sole purpose of this copy constructor is to ensure that no copying is -// being done inadvertently. -// -CallStack::CallStack (const CallStack &) -{ - // Don't make copies of CallStacks! - assert(FALSE); -} - // Destructor - Frees all memory allocated to the CallStack. // CallStack::~CallStack () @@ -373,7 +362,13 @@ void CallStack::Resolve(BOOL showinternalframes) EnterCriticalSection(&symbollock); BOOL foundline = FALSE; DWORD displacement = 0; + + // It turns out that calls to SymGetLineFromAddrW64 may free the very memory we are scrutinizing here + // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. + // When that happens there is nothing we can do except crash. foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo); + assert(m_Resolved != NULL); + if (foundline) { if (!showinternalframes) { From 2fa070ac35606dea232a75f5236fb0d311123b95 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 22 Apr 2011 21:28:41 +0000 Subject: [PATCH 057/321] Reverting my last changes to VisualLeakDetector::IsModuleExcluded since the performance was abismal. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66117 --- vld.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/vld.cpp b/vld.cpp index 94c0170a..81dec3ab 100644 --- a/vld.cpp +++ b/vld.cpp @@ -2626,21 +2626,18 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) // Find the information for the module that initiated this reallocation. BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) { - BOOL excluded = FALSE; + BOOL excluded = FALSE; + moduleinfo_t moduleinfo; + ModuleSet::Iterator moduleit; + moduleinfo.addrhigh = address; + moduleinfo.addrlow = address + 1024; + moduleinfo.flags = 0; EnterCriticalSection(&vld.m_moduleslock); - for (ModuleSet::Iterator it = vld.m_loadedmodules->begin(); - it != vld.m_loadedmodules->end(); - it++) - { - moduleinfo_t mod = (*it); - if ((mod.addrlow <= address) && (address <= mod.addrhigh)) - { - excluded = mod.flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; - break; - } + moduleit = vld.m_loadedmodules->find(moduleinfo); + if (moduleit != vld.m_loadedmodules->end()) { + excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; } - LeaveCriticalSection(&vld.m_moduleslock); return excluded; } From 383ff55766a98fc01c4176b5ac0dc043d4ae97c5 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Sat, 23 Apr 2011 22:35:41 +0000 Subject: [PATCH 058/321] Found a line of code that had been switched in VisualLeakDetector::IsModuleExcluded where a bad copy paste left address high and address low switched around. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66135 --- vld.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vld.cpp b/vld.cpp index 81dec3ab..b694ed7a 100644 --- a/vld.cpp +++ b/vld.cpp @@ -2629,8 +2629,8 @@ BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) BOOL excluded = FALSE; moduleinfo_t moduleinfo; ModuleSet::Iterator moduleit; - moduleinfo.addrhigh = address; - moduleinfo.addrlow = address + 1024; + moduleinfo.addrlow = address; + moduleinfo.addrhigh = address + 1024; moduleinfo.flags = 0; EnterCriticalSection(&vld.m_moduleslock); From aee1d9afe9cb7b81cd241e2c0fd18a33b331a7a0 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Mon, 25 Apr 2011 06:20:31 +0000 Subject: [PATCH 059/321] Resolved the internal memory leaks in LoadTests.cpp. What the problem was that the test unloaded the MFC Dll by calling FreeLibrary. The problem is that VLD hooks load library, but doesn't hook unload library. I don't know exactly what is going on here, but until I debug it, I"m turning off the code to unload the mfc dll. Now running dynamic_app in 64 bit mode, will report the correct 31 memory leaks with no extra warnings about internal memory leaks in VLD. vldint.h I also removed the typedef structs, as the microsoft C++ compiler can recognize a simple struct definition without resorting to confusing typdefs. Also, the thread local storage types (tls_t) were kept in a set. However sets are supposed to be immutable, which this set is not treated that way. Therefore replaced the set with a map. TESTS: Ran all the tests, and got the expected amount of memory leaks for each test. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66166 --- tests/dynamic_app/LoadTests.cpp | 19 +++++++++++------ vld.cpp | 38 ++++++++++++++++----------------- vldint.h | 22 +++++++++---------- 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/tests/dynamic_app/LoadTests.cpp b/tests/dynamic_app/LoadTests.cpp index c6e0509f..223024ab 100644 --- a/tests/dynamic_app/LoadTests.cpp +++ b/tests/dynamic_app/LoadTests.cpp @@ -82,7 +82,7 @@ void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function ) } -void RunMFCLoaderTests(bool resolve) +void RunMFCLoaderTests(bool /*resolve*/) { HMODULE hmfcLib = LoadLibrary(_T("test_mfc.dll")); assert(hmfcLib); @@ -94,12 +94,17 @@ void RunMFCLoaderTests(bool resolve) CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // Leaks 4 CallLibraryMethods(hmfcLib, "MFC_LeakArray"); // leaks 3 - if (resolve) - { - CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings - } - - FreeLibrary(hmfcLib); + // Attempting to unload an MFC Dll, will introduce a LOT of internal memory leaks inside + // of VLD.h. This only happens in 64 bit only. So until I figure out why this is happening, + // I will simply leak MFC loaded in the process, and also disable resolving the callstacks + // as resolving is only necessary when modules are explicitly unloaded. + + //if (resolve) + //{ + // CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings + //} + // + //FreeLibrary(hmfcLib); } } diff --git a/vld.cpp b/vld.cpp index b694ed7a..edecf734 100644 --- a/vld.cpp +++ b/vld.cpp @@ -412,7 +412,7 @@ VisualLeakDetector::VisualLeakDetector () m_selftestline = 0; m_tlsindex = TlsAlloc(); InitializeCriticalSection(&m_tlslock); - m_tlsset = new TlsSet; + m_tlsmap = new TlsMap; if (m_options & VLD_OPT_SELF_TEST) { // Self-test mode has been enabled. Intentionally leak a small amount of @@ -527,13 +527,13 @@ VisualLeakDetector::~VisualLeakDetector () // See if any threads that have ever entered VLD's code are still active. EnterCriticalSection(&m_tlslock); - for (TlsSet::Iterator tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { - if ((*tlsit)->threadid == GetCurrentThreadId()) { + for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + if ((*tlsit).second->threadid == GetCurrentThreadId()) { // Don't wait for the current thread to exit. continue; } - HANDLE thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit)->threadid); + HANDLE thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit).second->threadid); if (thread == NULL) { // Couldn't query this thread. We'll assume that it exited. continue; // XXX should we check GetLastError()? @@ -603,10 +603,10 @@ VisualLeakDetector::~VisualLeakDetector () delete m_loadedmodules; // Free internally allocated resources used for thread local storage. - for (TlsSet::Iterator tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { - delete *tlsit; + for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + delete (*tlsit).second; } - delete m_tlsset; + delete m_tlsmap; // Do a memory leak self-check. vldblockheader_t *header = vldblocklist; @@ -652,7 +652,7 @@ VisualLeakDetector::~VisualLeakDetector () else { // VLD failed to load properly. delete m_heapmap; - delete m_tlsset; + delete m_tlsmap; } HeapDestroy(vldheap); @@ -1155,7 +1155,7 @@ tls_t* VisualLeakDetector::gettls () // Add this thread's TLS to the TlsSet. EnterCriticalSection(&m_tlslock); - m_tlsset->insert(tls); + m_tlsmap->insert(tls->threadid,tls); LeaveCriticalSection(&m_tlslock); } @@ -3222,11 +3222,11 @@ void VisualLeakDetector::GlobalDisableLeakDetection () // Disable memory leak detection for all threads. EnterCriticalSection(&m_tlslock); - TlsSet::Iterator tlsit; - for (tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { - (*tlsit)->oldflags = (*tlsit)->flags; - (*tlsit)->flags &= ~VLD_TLS_ENABLED; - (*tlsit)->flags |= VLD_TLS_DISABLED; + TlsMap::Iterator tlsit; + for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + (*tlsit).second->oldflags = (*tlsit).second->flags; + (*tlsit).second->flags &= ~VLD_TLS_ENABLED; + (*tlsit).second->flags |= VLD_TLS_DISABLED; } LeaveCriticalSection(&m_tlslock); } @@ -3240,11 +3240,11 @@ void VisualLeakDetector::GlobalEnableLeakDetection () // Enable memory leak detection for all threads. EnterCriticalSection(&m_tlslock); - TlsSet::Iterator tlsit; - for (tlsit = m_tlsset->begin(); tlsit != m_tlsset->end(); ++tlsit) { - (*tlsit)->oldflags = (*tlsit)->flags; - (*tlsit)->flags &= ~VLD_TLS_DISABLED; - (*tlsit)->flags |= VLD_TLS_ENABLED; + TlsMap::Iterator tlsit; + for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + (*tlsit).second->oldflags = (*tlsit).second->flags; + (*tlsit).second->flags &= ~VLD_TLS_DISABLED; + (*tlsit).second->flags |= VLD_TLS_ENABLED; } LeaveCriticalSection(&m_tlslock); m_status &= ~VLD_STATUS_NEVER_ENABLED; diff --git a/vldint.h b/vldint.h index ff36f3a1..98119e0a 100644 --- a/vldint.h +++ b/vldint.h @@ -73,11 +73,11 @@ typedef void* (__cdecl *realloc_t) (void *, size_t); // The data is stored in this structure and these structures are stored in // a BlockMap which maps each of these structures to its corresponding memory // block. -typedef struct blockinfo_s { +struct blockinfo_t { CallStack *callstack; SIZE_T serialnumber; SIZE_T size; -} blockinfo_t; +}; // BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. typedef Map BlockMap; @@ -85,11 +85,11 @@ typedef Map BlockMap; // Information about each heap in the process is kept in this map. Primarily // this is used for mapping heaps to all of the blocks allocated from those // heaps. -typedef struct heapinfo_s { +struct heapinfo_t { BlockMap blockmap; // Map of all blocks allocated from this heap. UINT32 flags; // Heap status flags: #define VLD_HEAP_CRT 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). -} heapinfo_t; +}; // HeapMaps map heaps (via their handles) to BlockMaps. typedef Map HeapMap; @@ -97,8 +97,8 @@ typedef Map HeapMap; // This structure stores information, primarily the virtual address range, about // a given module and can be used with the Set template because it supports the // '<' operator (sorts by virtual address range). -typedef struct moduleinfo_s { - BOOL operator < (const struct moduleinfo_s &other) const +struct moduleinfo_t { + BOOL operator < (const struct moduleinfo_t& other) const { if (addrhigh < other.addrlow) { return TRUE; @@ -115,7 +115,7 @@ typedef struct moduleinfo_s { #define VLD_MODULE_SYMBOLSLOADED 0x2 // If set, this module's debug symbols have been loaded. LPCSTR name; // The module's name (e.g. "kernel32.dll"). LPCSTR path; // The fully qualified path from where the module was loaded. -} moduleinfo_t; +}; // ModuleSets store information about modules loaded in the process. typedef Set ModuleSet; @@ -124,7 +124,7 @@ typedef Set ModuleSet; // of this structure. Thread specific information, such as the current leak // detection status (enabled or disabled) and the address that initiated the // current allocation is stored here. -typedef struct tls_s { +struct tls_t { context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. UINT32 flags; // Thread-local status flags: #define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. @@ -133,11 +133,11 @@ typedef struct tls_s { UINT32 oldflags; // Thread-local status old flags DWORD threadid; // Thread ID of the thread that owns this TLS structure. CallStack **ppcallstack; // Memory block callstack pointer. -} tls_t; +}; // The TlsSet allows VLD to keep track of all thread local storage structures // allocated in the process. -typedef Set TlsSet; +typedef Map TlsMap; class CallStack; @@ -310,7 +310,7 @@ class VisualLeakDetector : public IMalloc #define VLD_STATUS_FORCE_REPORT_TO_FILE 0x8 // If set, the leak report is being forced to a file. DWORD m_tlsindex; // Thread-local storage index. CRITICAL_SECTION m_tlslock; // Protects accesses to the Set of TLS structures. - TlsSet *m_tlsset; // Set of all all thread-local storage structres for the process. + TlsMap *m_tlsmap; // Set of all all thread-local storage structres for the process. HMODULE m_vldbase; // Visual Leak Detector's own module handle (base address). typedef FARPROC __stdcall _GetProcAddressType(HMODULE module, LPCSTR procname); From 563a08f55d98f34c5621659ffe84767b59e86a09 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Mon, 25 Apr 2011 15:33:32 +0000 Subject: [PATCH 060/321] Changing the memory free calls from delete to delete [] for the strings that each moduleinfo_t owns. This should eliminate some definite undefined behavior, as threading issues can arise when allocation mismatches occur. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66172 --- vld.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vld.cpp b/vld.cpp index edecf734..be002458 100644 --- a/vld.cpp +++ b/vld.cpp @@ -597,8 +597,8 @@ VisualLeakDetector::~VisualLeakDetector () // Free internally allocated resources used by the loaded module set. for (ModuleSet::Iterator moduleit = m_loadedmodules->begin(); moduleit != m_loadedmodules->end(); ++moduleit) { - delete (*moduleit).name; - delete (*moduleit).path; + delete [] (*moduleit).name; + delete [] (*moduleit).path; } delete m_loadedmodules; @@ -2462,8 +2462,8 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod // Free resources used by the old module list. for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { - delete (*moduleit).name; - delete (*moduleit).path; + delete [] (*moduleit).name; + delete [] (*moduleit).path; } delete oldmodules; } @@ -2499,8 +2499,8 @@ VOID VisualLeakDetector::RefreshModules() // Free resources used by the old module list. for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { - delete (*moduleit).name; - delete (*moduleit).path; + delete [] (*moduleit).name; + delete [] (*moduleit).path; } delete oldmodules; From 3bf4444dece4396cd0062264e8ad382fd6d19bb0 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Mon, 25 Apr 2011 16:55:34 +0000 Subject: [PATCH 061/321] One more allocaiton mismatch, this time in the resolved strings for callstacks. replacing delete with delete[] git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66176 --- callstack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/callstack.cpp b/callstack.cpp index dbe9b4c5..24b3fee0 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -67,7 +67,7 @@ CallStack::~CallStack () { for (UINT32 frame = 0; frame < m_size; frame++) { - delete m_Resolved[frame]; + delete [] m_Resolved[frame]; m_Resolved[frame] = NULL; } delete [] m_Resolved; From d9de9df6c0aae676ac141b295771bff962c62c81 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Mon, 25 Apr 2011 21:23:17 +0000 Subject: [PATCH 062/321] Problem: Uncomment out the code in RunMFCLoaderTests. Rerun the test dynamic_app.exe Result: It will leak internal memory due to resolve strings not getting freed. The problem was made worse in that m_Resolved was a WCHAR**, which required a lot of allocations. Now I replaced with a WCHAR* and I simply concatenate strings to the end of it. Dump resolved call stacks looks just the same, only it's alot faster now. This does not resolve the internal memory leak, it just reduces the amount of strings that do get leaked. Using these changes, it should be a bit easier to identify the culprit. What I have found is that of all the callstacks that get resolved, most do correctly get free'd. Running dynamic_app.exe will leak 18 strings in both 32 and 64 bit configurations. (Remember, this is only when you FIRST resolve the callstacks, and then unload the MFC based dll). git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66187 --- callstack.cpp | 78 ++++++------- callstack.h | 8 +- vld.cpp | 302 +++++++++++++++++++++++++------------------------- 3 files changed, 191 insertions(+), 197 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 24b3fee0..0adbc422 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -41,13 +41,15 @@ extern CRITICAL_SECTION symbollock; // CallStack::CallStack () { - m_capacity = CALLSTACKCHUNKSIZE; - m_size = 0; - m_status = 0x0; - m_store.next = NULL; - m_topchunk = &m_store; - m_topindex = 0; - m_Resolved = NULL; + m_capacity = CALLSTACKCHUNKSIZE; + m_size = 0; + m_status = 0x0; + m_store.next = NULL; + m_topchunk = &m_store; + m_topindex = 0; + m_Resolved = NULL; + m_ResolvedCapacity = 0; + m_ResolvedLength = 0; } // Destructor - Frees all memory allocated to the CallStack. @@ -65,27 +67,12 @@ CallStack::~CallStack () if (m_Resolved) { - for (UINT32 frame = 0; frame < m_size; frame++) - { - delete [] m_Resolved[frame]; - m_Resolved[frame] = NULL; - } delete [] m_Resolved; } m_Resolved = NULL; -} - -// operator = - Assignment operator. For efficiency, we want to avoid ever -// making copies of CallStacks (only pointer passing or reference passing -// should be performed). The sole purpose of this assignment operator is to -// ensure that no copying is being done inadvertently. -// -CallStack& CallStack::operator = (const CallStack &) -{ - // Don't make copies of CallStacks! - assert(FALSE); - return *this; + m_ResolvedCapacity = 0; + m_ResolvedLength = 0; } // operator == - Equality operator. Compares the CallStack to another CallStack @@ -172,14 +159,13 @@ VOID CallStack::clear () m_size = 0; m_topchunk = &m_store; m_topindex = 0; - if (m_Resolved) { - for (UINT32 frame = 0; frame < m_size; frame++) - { - m_Resolved[frame] = NULL; - } + delete [] m_Resolved; + m_Resolved = NULL; } + m_ResolvedCapacity = 0; + m_ResolvedLength = 0; } @@ -349,10 +335,13 @@ void CallStack::Resolve(BOOL showinternalframes) WCHAR undecoratedname [MAXSYMBOLNAMELENGTH] = L""; WCHAR callingmodulename [MAX_PATH] = L""; - m_Resolved = new WCHAR*[m_size]; - ZeroMemory(m_Resolved, sizeof(WCHAR*) * m_size); - const size_t max_size = MAXREPORTLENGTH + 1; - + const size_t max_line_length = MAXREPORTLENGTH + 1; + m_ResolvedCapacity = m_size * max_line_length; + m_Resolved = new WCHAR[m_ResolvedCapacity]; + const size_t allocedBytes = m_ResolvedCapacity * sizeof(WCHAR); + ZeroMemory(m_Resolved, allocedBytes); + + // Iterate through each frame in the call stack. for (UINT32 frame = 0; frame < m_size; frame++) { @@ -424,30 +413,31 @@ void CallStack::Resolve(BOOL showinternalframes) // Use static here to increase performance, and avoid heap allocs. Hopefully this won't // prove to be an issue in thread safety. If it does, it will have to be simply non-static. - static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; + static WCHAR stack_line[max_line_length] = L""; int NumChars = -1; // Display the current stack frame's information. if (foundline) { // Just truncate anything that is too long. if (displacement == 0) - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s\n", + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s\n", sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname); else - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname, displacement); } else { if (displacement64 == 0) - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", programcounter, modulename, functionname); else - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", programcounter, modulename, functionname, (DWORD)displacement64); } if (NumChars >= 0) { - m_Resolved[frame] = new WCHAR[NumChars + 1]; - wcscpy_s(m_Resolved[frame], NumChars + 1, stack_line); + assert(m_Resolved != NULL); + m_ResolvedLength += NumChars; + wcsncat_s(m_Resolved, m_ResolvedCapacity, stack_line, NumChars); } } // end for loop } @@ -457,9 +447,13 @@ void CallStack::DumpResolved() const { if (m_Resolved) { - for (UINT32 frame = 0; frame < m_size; frame++) + int index = 0; + WCHAR* resolved_stack = m_Resolved; + while(index < m_ResolvedLength) { - print(m_Resolved[frame]); + print(resolved_stack); + resolved_stack += MAXREPORTLENGTH + 1; + index += MAXREPORTLENGTH + 1; } } } diff --git a/callstack.h b/callstack.h index f30c79b0..0c365879 100644 --- a/callstack.h +++ b/callstack.h @@ -117,11 +117,11 @@ class CallStack CallStack::chunk_t *m_topchunk; // Pointer to the chunk at the top of the stack UINT32 m_topindex; // Index, within the top chunk, of the top of the stack - // An array of strings that contains the stack converted into a human readable format. - // The number of strings is always equal to m_size - // Currently I'm only allowing a maximum of (MAX_PATH * 2) characters in each string. + // The string that contains the stack converted into a human readable format. // This is always NULL if the callstack has not been 'converted'. - WCHAR** m_Resolved; + WCHAR* m_Resolved; + int m_ResolvedCapacity; + int m_ResolvedLength; // Prints out the strings in m_Resolved when the time comes to report the callstack in // human readable form. Currently this is only called by the dump method. void DumpResolved() const; diff --git a/vld.cpp b/vld.cpp index be002458..31e30c1b 100644 --- a/vld.cpp +++ b/vld.cpp @@ -508,169 +508,169 @@ VisualLeakDetector::VisualLeakDetector () // VisualLeakDetector::~VisualLeakDetector () { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - size_t count; - SIZE_T internalleaks = 0; - WCHAR leakfilew [MAX_PATH]; - const char *leakfile = NULL; - int leakline = 0; - BOOL threadsactive= FALSE; - if (m_status & VLD_STATUS_INSTALLED) { - // Detach Visual Leak Detector from all previously attached modules. - EnumerateLoadedModulesW64(currentprocess, detachfrommodule, NULL); - - DWORD dwCurProcessID = GetCurrentProcessId(); - - // See if any threads that have ever entered VLD's code are still active. - EnterCriticalSection(&m_tlslock); - for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - if ((*tlsit).second->threadid == GetCurrentThreadId()) { - // Don't wait for the current thread to exit. - continue; - } + size_t count; + SIZE_T internalleaks = 0; + WCHAR leakfilew [MAX_PATH]; + BOOL threadsactive= FALSE; + if (m_status & VLD_STATUS_INSTALLED) { + // Detach Visual Leak Detector from all previously attached modules. + EnumerateLoadedModulesW64(currentprocess, detachfrommodule, NULL); - HANDLE thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit).second->threadid); - if (thread == NULL) { - // Couldn't query this thread. We'll assume that it exited. - continue; // XXX should we check GetLastError()? - } - if (GetProcessIdOfThread(thread) != dwCurProcessID) { - //The thread ID has been recycled. - CloseHandle(thread); - continue; - } - while (WaitForSingleObject(thread, 10000) == WAIT_TIMEOUT) { // 10 seconds - // There is still at least one other thread running. The CRT - // will stomp it dead when it cleans up, which is not a - // graceful way for a thread to go down. Warn about this, - // and wait until the thread has exited so that we know it - // can't still be off running somewhere in VLD's code. - // - // Since we've been waiting a while, let the human know we are - // still here and alive. - threadsactive = TRUE; - report(L"Visual Leak Detector: Waiting for threads to terminate...\n"); - } - CloseHandle(thread); - } - LeaveCriticalSection(&m_tlslock); + DWORD dwCurProcessID = GetCurrentProcessId(); - if (m_status & VLD_STATUS_NEVER_ENABLED) { - // Visual Leak Detector started with leak detection disabled and - // it was never enabled at runtime. A lot of good that does. - report(L"WARNING: Visual Leak Detector: Memory leak detection was never enabled.\n"); - } - else { - // Generate a memory leak report for each heap in the process. - ReportLeaks(); + // See if any threads that have ever entered VLD's code are still active. + EnterCriticalSection(&m_tlslock); + for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + if ((*tlsit).second->threadid == GetCurrentThreadId()) { + // Don't wait for the current thread to exit. + continue; + } - // Show a summary. - if (m_leaksfound == 0) { - report(L"No memory leaks detected.\n"); - } - else { - report(L"Visual Leak Detector detected %Iu memory leak", m_leaksfound); - report((m_leaksfound > 1) ? L"s.\n" : L".\n"); - } - } + HANDLE thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit).second->threadid); + if (thread == NULL) { + // Couldn't query this thread. We'll assume that it exited. + continue; // XXX should we check GetLastError()? + } + if (GetProcessIdOfThread(thread) != dwCurProcessID) { + //The thread ID has been recycled. + CloseHandle(thread); + continue; + } + while (WaitForSingleObject(thread, 10000) == WAIT_TIMEOUT) { // 10 seconds + // There is still at least one other thread running. The CRT + // will stomp it dead when it cleans up, which is not a + // graceful way for a thread to go down. Warn about this, + // and wait until the thread has exited so that we know it + // can't still be off running somewhere in VLD's code. + // + // Since we've been waiting a while, let the human know we are + // still here and alive. + threadsactive = TRUE; + report(L"Visual Leak Detector: Waiting for threads to terminate...\n"); + } + CloseHandle(thread); + } + LeaveCriticalSection(&m_tlslock); - // Free resources used by the symbol handler. - if (!SymCleanup(currentprocess)) { - report(L"WARNING: Visual Leak Detector: The symbol handler failed to deallocate resources (error=%lu).\n", - GetLastError()); - } + if (m_status & VLD_STATUS_NEVER_ENABLED) { + // Visual Leak Detector started with leak detection disabled and + // it was never enabled at runtime. A lot of good that does. + report(L"WARNING: Visual Leak Detector: Memory leak detection was never enabled.\n"); + } + else { + // Generate a memory leak report for each heap in the process. + ReportLeaks(); - // Free internally allocated resources used by the heapmap and blockmap. - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - BlockMap *blockmap = &(*heapit).second->blockmap; - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callstack; - delete (*blockit).second; - } - delete blockmap; - } - delete m_heapmap; + // Show a summary. + if (m_leaksfound == 0) { + report(L"No memory leaks detected.\n"); + } + else { + report(L"Visual Leak Detector detected %Iu memory leak", m_leaksfound); + report((m_leaksfound > 1) ? L"s.\n" : L".\n"); + } + } - // Free internally allocated resources used by the loaded module set. - for (ModuleSet::Iterator moduleit = m_loadedmodules->begin(); moduleit != m_loadedmodules->end(); ++moduleit) { - delete [] (*moduleit).name; - delete [] (*moduleit).path; - } - delete m_loadedmodules; + // Free resources used by the symbol handler. + if (!SymCleanup(currentprocess)) { + report(L"WARNING: Visual Leak Detector: The symbol handler failed to deallocate resources (error=%lu).\n", + GetLastError()); + } - // Free internally allocated resources used for thread local storage. - for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - delete (*tlsit).second; - } - delete m_tlsmap; - - // Do a memory leak self-check. - vldblockheader_t *header = vldblocklist; - while (header) { - // Doh! VLD still has an internally allocated block! - // This won't ever actually happen, right guys?... guys? - internalleaks++; - leakfile = header->file; - leakline = header->line; - mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); - report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); - report(L"---------- Block %Iu at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, - VLDBLOCKDATA(header), header->size); - report(L" Call Stack:\n"); - report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); - if (m_maxdatadump != 0) { - report(L" Data:\n"); - if (m_options & VLD_OPT_UNICODE_REPORT) { - dumpmemoryw(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); - } - else { - dumpmemorya(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); - } - } - report(L"\n"); - header = header->next; - } - if (m_options & VLD_OPT_SELF_TEST) { - if ((internalleaks == 1) && (strcmp(leakfile, m_selftestfile) == 0) && (leakline == m_selftestline)) { - report(L"Visual Leak Detector passed the memory leak self-test.\n"); - } - else { - report(L"ERROR: Visual Leak Detector: Failed the memory leak self-test.\n"); - } - } + // Free internally allocated resources used by the heapmap and blockmap. + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + BlockMap *blockmap = &(*heapit).second->blockmap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + delete (*blockit).second->callstack; + delete (*blockit).second; + } + delete blockmap; + } + delete m_heapmap; - if (threadsactive == TRUE) { - report(L"WARNING: Visual Leak Detector: Some threads appear to have not terminated normally.\n" - L" This could cause inaccurate leak detection results, including false positives.\n"); - } - report(L"Visual Leak Detector is now exiting.\n"); - } - else { - // VLD failed to load properly. - delete m_heapmap; - delete m_tlsmap; - } - HeapDestroy(vldheap); + // Free internally allocated resources used by the loaded module set. + for (ModuleSet::Iterator moduleit = m_loadedmodules->begin(); moduleit != m_loadedmodules->end(); ++moduleit) { + delete [] (*moduleit).name; + delete [] (*moduleit).path; + } + delete m_loadedmodules; - DeleteCriticalSection(&imagelock); - DeleteCriticalSection(&m_loaderlock); - DeleteCriticalSection(&m_maplock); - DeleteCriticalSection(&m_moduleslock); - DeleteCriticalSection(&stackwalklock); - DeleteCriticalSection(&symbollock); - DeleteCriticalSection(&vldheaplock); + // Free internally allocated resources used for thread local storage. + for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + delete (*tlsit).second; + } + delete m_tlsmap; + + const char* leakfile = NULL; + int leakline = 0; + + // Do a memory leak self-check. + vldblockheader_t *header = vldblocklist; + while (header) { + // Doh! VLD still has an internally allocated block! + // This won't ever actually happen, right guys?... guys? + internalleaks++; + leakfile = header->file; + leakline = header->line; + mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); + report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); + report(L"---------- Block %Iu at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, VLDBLOCKDATA(header), header->size); + report(L" Call Stack:\n"); + report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); + if (m_maxdatadump != 0) { + report(L" Data:\n"); + if (m_options & VLD_OPT_UNICODE_REPORT) { + dumpmemoryw(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); + } + else { + dumpmemorya(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); + } + } + report(L"\n"); + header = header->next; + } + if (m_options & VLD_OPT_SELF_TEST) { + if ((internalleaks == 1) && (strcmp(leakfile, m_selftestfile) == 0) && (leakline == m_selftestline)) { + report(L"Visual Leak Detector passed the memory leak self-test.\n"); + } + else { + report(L"ERROR: Visual Leak Detector: Failed the memory leak self-test.\n"); + } + } - if (m_tlsindex != TLS_OUT_OF_INDEXES) { - TlsFree(m_tlsindex); - } + if (threadsactive == TRUE) { + report(L"WARNING: Visual Leak Detector: Some threads appear to have not terminated normally.\n" + L" This could cause inaccurate leak detection results, including false positives.\n"); + } + report(L"Visual Leak Detector is now exiting.\n"); + } + else { + // VLD failed to load properly. + delete m_heapmap; + delete m_tlsmap; + } + HeapDestroy(vldheap); + + DeleteCriticalSection(&imagelock); + DeleteCriticalSection(&m_loaderlock); + DeleteCriticalSection(&m_maplock); + DeleteCriticalSection(&m_moduleslock); + DeleteCriticalSection(&stackwalklock); + DeleteCriticalSection(&symbollock); + DeleteCriticalSection(&vldheaplock); + + if (m_tlsindex != TLS_OUT_OF_INDEXES) { + TlsFree(m_tlsindex); + } - if (m_reportfile != NULL) { - fclose(m_reportfile); - } + if (m_reportfile != NULL) { + fclose(m_reportfile); + } } From d73300492058d8d7ede2acc0bf96f28986d4e540 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 26 Apr 2011 00:10:56 +0000 Subject: [PATCH 063/321] CoTaskMemAlloc memory leak detection fixed VLDGetLeaksCount function added git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66190 --- tests/basics/basics.cpp | 15 +- tests/basics/basics.vcxproj | 83 + tests/dynamic_app/dynamic_app.cpp | 11 +- tests/dynamic_app/dynamic_app.vcxproj | 84 + tests/dynamic_dll/dynamic.vcxproj | 2 - tests/suite/testsuite.vcxproj | 8 +- utility.cpp | 232 +- vld.cpp | 2810 +++++++++++++------------ vld_vs10.sln | 40 +- vldapi.cpp | 5 + vldint.h | 19 +- 11 files changed, 1805 insertions(+), 1504 deletions(-) diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 59966af1..1704183e 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -22,6 +22,11 @@ void LeakMemory(LeakOption type, int repeat) } } +// VLD internal API +extern "C" { +__declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal); +} + int _tmain(int argc, _TCHAR* argv[]) { wprintf(_T("======================================\n")); @@ -32,6 +37,7 @@ int _tmain(int argc, _TCHAR* argv[]) if (argc == 3) { LeakOption leak_type = eMalloc; // default + int multiplayer = 2; // Pick up options to determine which type of memory allocator // to test with @@ -58,6 +64,7 @@ int _tmain(int argc, _TCHAR* argv[]) else if (_tcsicmp(_T("CoTaskMem"), argv[1]) == 0) { leak_type = eCoTaskMem; + multiplayer = 1; } else { @@ -70,13 +77,17 @@ int _tmain(int argc, _TCHAR* argv[]) // Convert the string into it's integer equivalent int repeat = _tstoi(argv[2]); LeakMemory(leak_type,repeat); + int leaks = (int)VLDGetLeaksCount(false); + wprintf(_T("End of test app...\n\n")); + int diff = repeat * multiplayer - leaks; + return diff; } else { wprintf(_T("Error!: Invalid arguments\n")); PrintUsage(); + wprintf(_T("End of test app...\n\n")); + return 0; } - wprintf(_T("End of test app...\n\n")); - return 0; } diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index 4d8c4766..51e95f4f 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -1,6 +1,14 @@  + + Debug(Release) + Win32 + + + Debug(Release) + x64 + Debug Win32 @@ -30,12 +38,23 @@ true Unicode + + Application + true + Unicode + Application true Unicode false + + Application + true + Unicode + false + Application false @@ -54,9 +73,15 @@ + + + + + + @@ -69,11 +94,21 @@ $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + false $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + false @@ -100,6 +135,29 @@ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + NotSet + 2.1 + %(AdditionalDependencies) + + + copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y @@ -123,6 +181,29 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + NotSet + 2.1 + %(AdditionalDependencies) + + + copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y @@ -169,7 +250,9 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Create + Create Create + Create Create Create diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index a8fcc9cb..987f3eb6 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -28,6 +28,12 @@ void LeakDuplicateLeaks() // Should report 6 memory leaks } +// VLD internal API +extern "C" { + __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); +} + + int _tmain(int argc, _TCHAR* argv[]) { wprintf(_T("======================================\n")); @@ -43,10 +49,13 @@ int _tmain(int argc, _TCHAR* argv[]) } RunLoaderTests(resolve); // leaks 18 + SIZE_T leaks = VLDGetLeaksCount(); RunMFCLoaderTests(resolve); // leaks 7 + leaks = VLDGetLeaksCount(); LeakDuplicateLeaks(); // leaks 6 + leaks = VLDGetLeaksCount(); // ..................Total: 31 leaks total - return 0; + return 31 - leaks; } diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index 039aded4..07bdd8d2 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -1,6 +1,14 @@  + + Debug(Release) + Win32 + + + Debug(Release) + x64 + Debug Win32 @@ -29,11 +37,21 @@ true Unicode + + Application + true + Unicode + Application true Unicode + + Application + true + Unicode + Application false @@ -52,9 +70,15 @@ + + + + + + @@ -68,6 +92,12 @@ $(ProjectDir)obj\$(Platform)\$(Configuration)\ dynamic + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + true $(ProjectDir)$(Platform)\$(Configuration)\ @@ -75,6 +105,13 @@ dynamic true + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + true + false $(ProjectDir)$(Platform)\$(Configuration)\ @@ -106,6 +143,29 @@ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + + copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y @@ -129,6 +189,30 @@ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + + copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y Copying over Visual Leak Detector Dependencies diff --git a/tests/dynamic_dll/dynamic.vcxproj b/tests/dynamic_dll/dynamic.vcxproj index 3a7512f7..f9393bd1 100644 --- a/tests/dynamic_dll/dynamic.vcxproj +++ b/tests/dynamic_dll/dynamic.vcxproj @@ -125,7 +125,6 @@ true true true - exported_methods.def @@ -142,7 +141,6 @@ true true true - exported_methods.def diff --git a/tests/suite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj index 5467e1b3..06f94205 100644 --- a/tests/suite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -131,8 +131,8 @@ true - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y + copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y @@ -195,8 +195,8 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y + copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.pdb $(Outdir)\vld_x64.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y diff --git a/utility.cpp b/utility.cpp index b4a4fc7d..74e248da 100644 --- a/utility.cpp +++ b/utility.cpp @@ -67,9 +67,9 @@ VOID dumpmemorya (LPCVOID address, SIZE_T size) SIZE_T bytesdone = 0; WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; WCHAR ascdump [18] = {0}; - WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; + WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; for (SIZE_T byteindex = 0; byteindex < dumplen; byteindex++) { - SIZE_T wordIndex = byteindex % 16; + SIZE_T wordIndex = byteindex % 16; SIZE_T hexindex = 3 * (wordIndex + (wordIndex / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. SIZE_T ascindex = wordIndex + wordIndex / 8; // 1 character per byte, plus a 1-character space after every 8 bytes. if (byteindex < size) { @@ -394,60 +394,6 @@ BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT ta return FALSE; } -// findimportdescriptor - Determines if the specified module imports the named import -// from the named exporting module. -// -// - importmodule (IN): Handle (base address) of the module to be searched to -// see if it imports the specified import. -// -// - exportmodulename (IN): ANSI string containing the name of the module that -// exports the import to be searched for. -// -// Return Value: -// -// Returns pointer to descriptor. -// -IMAGE_IMPORT_DESCRIPTOR* findimportdescriptor (HMODULE importmodule, LPCSTR exportmodulename) -{ - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - __try - { - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - } - __except(1) - { - idte = NULL; - } - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return NULL; - } - while (idte->FirstThunk != 0x0) { - PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); - if (_stricmp(name, exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->FirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return NULL; - } - return idte; -} - // patchimport - Patches all future calls to an imported function, or references // to an imported variable, through to a replacement function or variable. // Patching is done by replacing the import's address in the specified target @@ -480,55 +426,83 @@ IMAGE_IMPORT_DESCRIPTOR* findimportdescriptor (HMODULE importmodule, LPCSTR expo // BOOL patchimport (HMODULE importmodule, moduleentry_t *module) { - DWORD result = 0; HMODULE exportmodule = (HMODULE)module->modulebase; - LPCSTR exportmodulename = module->exportmodulename; - IMAGE_IMPORT_DESCRIPTOR *idte; - - idte = findimportdescriptor(importmodule, exportmodulename); - if (idte == NULL) + if (exportmodule == NULL) return FALSE; - patchentry_t *entry = module->patchtable; - int i = 0; - while(entry->importname) - { - LPCSTR importname = entry->importname; - LPCVOID replacement = entry->replacement; - IMAGE_THUNK_DATA *iate; - DWORD protect; - FARPROC import = NULL; - FARPROC import2 = NULL; - - // Get the *real* address of the import. If we find this address in the IAT, - // then we've found the entry that needs to be patched. - import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); - import = GetProcAddress(exportmodule, importname); - if ( import2 ) - import = import2; + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; - assert(import != NULL); // Perhaps the named export module does not actually export the named import? + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + __try + { + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + } + __except(1) + { + idte = NULL; + } + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return NULL; + } + int result = 0; + while (idte->FirstThunk != 0x0) { + PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); + UNREFERENCED_PARAMETER(name); + + patchentry_t *entry = module->patchtable; + int i = 0; + while(entry->importname) + { + LPCSTR importname = entry->importname; + LPCVOID replacement = entry->replacement; + + // Get the *real* address of the import. If we find this address in the IAT, + // then we've found the entry that needs to be patched. + FARPROC import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); + FARPROC import = GetProcAddress(exportmodule, importname); + if ( import2 ) + import = import2; + + assert(import != NULL); // Perhaps the named export module does not actually export the named import? + + // Locate the import's IAT entry. + IMAGE_THUNK_DATA *iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) + { + if (iate->u1.Function != (DWORD_PTR)import) + { + iate++; + continue; + } - // Locate the import's IAT entry. - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)import) { // Found the IAT entry. Overwrite the address stored in the IAT // entry with the address of the replacement. Note that the IAT // entry may be write-protected, so we must first ensure that it is // writable. if ( import != replacement ) { + DWORD protect; VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); iate->u1.Function = (DWORD_PTR)replacement; VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); } // The patch has been installed in the import module. result++; + iate++; } - iate++; + entry++; i++; } - entry++; i++; + + idte++; } // The import's IAT entry was not found. The importing module does not @@ -588,49 +562,49 @@ BOOL patchmodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tables // VOID print (LPCWSTR messagew) { - if (NULL == messagew) - { - return; - } - - size_t count = 0; - - if (reportencoding == unicode) { - if (reportfile != NULL) { - // Send the report to the previously specified file. - fwrite(messagew, sizeof(WCHAR), wcslen(messagew), reportfile); - } - if ( reporttostdout ) - fwprintf(stdout,messagew); - - if (reporttodebugger) { - OutputDebugStringW(messagew); - } - } - else { - CHAR messagea [MAXREPORTLENGTH + 1]; - if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) == -1) { - // Failed to convert the Unicode message to ASCII. - assert(FALSE); - return; - } - messagea[MAXREPORTLENGTH] = '\0'; - if (reportfile != NULL) { - // Send the report to the previously specified file. - fwrite(messagea, sizeof(CHAR), strlen(messagea), reportfile); - } - - if ( reporttostdout ) - printf(messagea); - - if (reporttodebugger) { - OutputDebugStringA(messagea); - } - } - - if (reporttodebugger && (reportdelay == TRUE)) { - Sleep(10); // Workaround the Visual Studio 6 bug where debug strings are sometimes lost if they're sent too fast. - } + if (NULL == messagew) + { + return; + } + + size_t count = 0; + + if (reportencoding == unicode) { + if (reportfile != NULL) { + // Send the report to the previously specified file. + fwrite(messagew, sizeof(WCHAR), wcslen(messagew), reportfile); + } + if ( reporttostdout ) + fwprintf(stdout,messagew); + + if (reporttodebugger) { + OutputDebugStringW(messagew); + } + } + else { + CHAR messagea [MAXREPORTLENGTH + 1]; + if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) == -1) { + // Failed to convert the Unicode message to ASCII. + assert(FALSE); + return; + } + messagea[MAXREPORTLENGTH] = '\0'; + if (reportfile != NULL) { + // Send the report to the previously specified file. + fwrite(messagea, sizeof(CHAR), strlen(messagea), reportfile); + } + + if ( reporttostdout ) + printf(messagea); + + if (reporttodebugger) { + OutputDebugStringA(messagea); + } + } + + if (reporttodebugger && (reportdelay == TRUE)) { + Sleep(10); // Workaround the Visual Studio 6 bug where debug strings are sometimes lost if they're sent too fast. + } } // report - Sends a printf-style formatted message to the debugger for display diff --git a/vld.cpp b/vld.cpp index 31e30c1b..41d5eade 100644 --- a/vld.cpp +++ b/vld.cpp @@ -67,17 +67,17 @@ __declspec(dllexport) VisualLeakDetector vld; // through to replacement functions provided by VLD. Having this table simply // makes it more convenient to add additional IAT patches. patchentry_t VisualLeakDetector::m_kernelbasePatch [] = { - "GetProcAddress", _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. - NULL, NULL + "GetProcAddress", _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. + NULL, NULL }; patchentry_t VisualLeakDetector::m_kernel32Patch [] = { - "HeapAlloc", _RtlAllocateHeap, - "HeapCreate", _HeapCreate, - "HeapDestroy", _HeapDestroy, - "HeapFree", _RtlFreeHeap, - "HeapReAlloc", _RtlReAllocateHeap, - NULL, NULL + "HeapAlloc", _RtlAllocateHeap, + "HeapCreate", _HeapCreate, + "HeapDestroy", _HeapDestroy, + "HeapFree", _RtlFreeHeap, + "HeapReAlloc", _RtlReAllocateHeap, + NULL, NULL }; #define ORDINAL(x) (LPCSTR)x @@ -90,264 +90,264 @@ patchentry_t VisualLeakDetector::m_kernel32Patch [] = { VisualLeakDetector::_GetProcAddressType *VisualLeakDetector::m_original_GetProcAddress = NULL; static patchentry_t mfc42dPatch [] = { - // XXX why are the vector new operators missing for mfc42d.dll? - ORDINAL(711), VS60::mfcd_scalar_new, - ORDINAL(712), VS60::mfcd__scalar_new_dbg_4p, - ORDINAL(714), VS60::mfcd__scalar_new_dbg_3p, - NULL, NULL + // XXX why are the vector new operators missing for mfc42d.dll? + ORDINAL(711), VS60::mfcd_scalar_new, + ORDINAL(712), VS60::mfcd__scalar_new_dbg_4p, + ORDINAL(714), VS60::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc42udPatch [] = { - // XXX why are the vector new operators missing for mfc42ud.dll? - ORDINAL(711), VS60::mfcud_scalar_new, - ORDINAL(712), VS60::mfcud__scalar_new_dbg_4p, - ORDINAL(714), VS60::mfcud__scalar_new_dbg_3p, - NULL, NULL + // XXX why are the vector new operators missing for mfc42ud.dll? + ORDINAL(711), VS60::mfcud_scalar_new, + ORDINAL(712), VS60::mfcud__scalar_new_dbg_4p, + ORDINAL(714), VS60::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc70dPatch [] = { - ORDINAL(257), VS70::mfcd_vector_new, - ORDINAL(258), VS70::mfcd__vector_new_dbg_4p, - ORDINAL(259), VS70::mfcd__vector_new_dbg_3p, - ORDINAL(832), VS70::mfcd_scalar_new, - ORDINAL(833), VS70::mfcd__scalar_new_dbg_4p, - ORDINAL(834), VS70::mfcd__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(257), VS70::mfcd_vector_new, + ORDINAL(258), VS70::mfcd__vector_new_dbg_4p, + ORDINAL(259), VS70::mfcd__vector_new_dbg_3p, + ORDINAL(832), VS70::mfcd_scalar_new, + ORDINAL(833), VS70::mfcd__scalar_new_dbg_4p, + ORDINAL(834), VS70::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc70udPatch [] = { - ORDINAL(258), VS70::mfcud_vector_new, - ORDINAL(259), VS70::mfcud__vector_new_dbg_4p, - ORDINAL(260), VS70::mfcud__vector_new_dbg_3p, - ORDINAL(833), VS70::mfcud_scalar_new, - ORDINAL(834), VS70::mfcud__scalar_new_dbg_4p, - ORDINAL(835), VS70::mfcud__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(258), VS70::mfcud_vector_new, + ORDINAL(259), VS70::mfcud__vector_new_dbg_4p, + ORDINAL(260), VS70::mfcud__vector_new_dbg_3p, + ORDINAL(833), VS70::mfcud_scalar_new, + ORDINAL(834), VS70::mfcud__scalar_new_dbg_4p, + ORDINAL(835), VS70::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc71dPatch [] = { - ORDINAL(267), VS71::mfcd_vector_new, - ORDINAL(268), VS71::mfcd__vector_new_dbg_4p, - ORDINAL(269), VS71::mfcd__vector_new_dbg_3p, - ORDINAL(893), VS71::mfcd_scalar_new, - ORDINAL(894), VS71::mfcd__scalar_new_dbg_4p, - ORDINAL(895), VS71::mfcd__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), VS71::mfcd_vector_new, + ORDINAL(268), VS71::mfcd__vector_new_dbg_4p, + ORDINAL(269), VS71::mfcd__vector_new_dbg_3p, + ORDINAL(893), VS71::mfcd_scalar_new, + ORDINAL(894), VS71::mfcd__scalar_new_dbg_4p, + ORDINAL(895), VS71::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc71udPatch [] = { - ORDINAL(267), VS71::mfcud_vector_new, - ORDINAL(268), VS71::mfcud__vector_new_dbg_4p, - ORDINAL(269), VS71::mfcud__vector_new_dbg_3p, - ORDINAL(893), VS71::mfcud_scalar_new, - ORDINAL(894), VS71::mfcud__scalar_new_dbg_4p, - ORDINAL(895), VS71::mfcud__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), VS71::mfcud_vector_new, + ORDINAL(268), VS71::mfcud__vector_new_dbg_4p, + ORDINAL(269), VS71::mfcud__vector_new_dbg_3p, + ORDINAL(893), VS71::mfcud_scalar_new, + ORDINAL(894), VS71::mfcud__scalar_new_dbg_4p, + ORDINAL(895), VS71::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc80dPatch [] = { - ORDINAL(267), VS80::mfcd_vector_new, - ORDINAL(268), VS80::mfcd__vector_new_dbg_4p, - ORDINAL(269), VS80::mfcd__vector_new_dbg_3p, - ORDINAL2(893,907), VS80::mfcd_scalar_new, - ORDINAL2(894,908), VS80::mfcd__scalar_new_dbg_4p, - ORDINAL2(895,909), VS80::mfcd__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), VS80::mfcd_vector_new, + ORDINAL(268), VS80::mfcd__vector_new_dbg_4p, + ORDINAL(269), VS80::mfcd__vector_new_dbg_3p, + ORDINAL2(893,907), VS80::mfcd_scalar_new, + ORDINAL2(894,908), VS80::mfcd__scalar_new_dbg_4p, + ORDINAL2(895,909), VS80::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc80udPatch [] = { - ORDINAL(267), VS80::mfcud_vector_new, - ORDINAL(268), VS80::mfcud__vector_new_dbg_4p, - ORDINAL(269), VS80::mfcud__vector_new_dbg_3p, - ORDINAL2(893,907), VS80::mfcud_scalar_new, - ORDINAL2(894,908), VS80::mfcud__scalar_new_dbg_4p, - ORDINAL2(895,909), VS80::mfcud__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), VS80::mfcud_vector_new, + ORDINAL(268), VS80::mfcud__vector_new_dbg_4p, + ORDINAL(269), VS80::mfcud__vector_new_dbg_3p, + ORDINAL2(893,907), VS80::mfcud_scalar_new, + ORDINAL2(894,908), VS80::mfcud__scalar_new_dbg_4p, + ORDINAL2(895,909), VS80::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc90dPatch [] = { - ORDINAL(267), VS90::mfcd_vector_new, - ORDINAL(268), VS90::mfcd__vector_new_dbg_4p, - ORDINAL(269), VS90::mfcd__vector_new_dbg_3p, - ORDINAL2(931, 909), VS90::mfcd_scalar_new, - ORDINAL2(932, 910), VS90::mfcd__scalar_new_dbg_4p, - ORDINAL2(933, 911), VS90::mfcd__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), VS90::mfcd_vector_new, + ORDINAL(268), VS90::mfcd__vector_new_dbg_4p, + ORDINAL(269), VS90::mfcd__vector_new_dbg_3p, + ORDINAL2(931, 909), VS90::mfcd_scalar_new, + ORDINAL2(932, 910), VS90::mfcd__scalar_new_dbg_4p, + ORDINAL2(933, 911), VS90::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc90udPatch [] = { - ORDINAL(267), VS90::mfcud_vector_new, - ORDINAL(268), VS90::mfcud__vector_new_dbg_4p, - ORDINAL(269), VS90::mfcud__vector_new_dbg_3p, - ORDINAL2(935, 913), VS90::mfcud_scalar_new, - ORDINAL2(936, 914), VS90::mfcud__scalar_new_dbg_4p, - ORDINAL2(937, 915), VS90::mfcud__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), VS90::mfcud_vector_new, + ORDINAL(268), VS90::mfcud__vector_new_dbg_4p, + ORDINAL(269), VS90::mfcud__vector_new_dbg_3p, + ORDINAL2(935, 913), VS90::mfcud_scalar_new, + ORDINAL2(936, 914), VS90::mfcud__scalar_new_dbg_4p, + ORDINAL2(937, 915), VS90::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc100dPatch [] = { - ORDINAL(267), VS100::mfcd_vector_new, - ORDINAL(268), VS100::mfcd__vector_new_dbg_4p, - ORDINAL(269), VS100::mfcd__vector_new_dbg_3p, - ORDINAL2(1427, 1405), VS100::mfcd_scalar_new, - ORDINAL2(1428, 1406), VS100::mfcd__scalar_new_dbg_4p, - ORDINAL2(1429, 1407), VS100::mfcd__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), VS100::mfcd_vector_new, + ORDINAL(268), VS100::mfcd__vector_new_dbg_4p, + ORDINAL(269), VS100::mfcd__vector_new_dbg_3p, + ORDINAL2(1427, 1405), VS100::mfcd_scalar_new, + ORDINAL2(1428, 1406), VS100::mfcd__scalar_new_dbg_4p, + ORDINAL2(1429, 1407), VS100::mfcd__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t mfc100udPatch [] = { - ORDINAL(267), VS100::mfcud_vector_new, - ORDINAL(268), VS100::mfcud__vector_new_dbg_4p, - ORDINAL(269), VS100::mfcud__vector_new_dbg_3p, - ORDINAL2(1434, 1412), VS100::mfcud_scalar_new, - ORDINAL2(1435, 1413), VS100::mfcud__scalar_new_dbg_4p, - ORDINAL2(1436, 1414), VS100::mfcud__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), VS100::mfcud_vector_new, + ORDINAL(268), VS100::mfcud__vector_new_dbg_4p, + ORDINAL(269), VS100::mfcud__vector_new_dbg_3p, + ORDINAL2(1434, 1412), VS100::mfcud_scalar_new, + ORDINAL2(1435, 1413), VS100::mfcud__scalar_new_dbg_4p, + ORDINAL2(1436, 1414), VS100::mfcud__scalar_new_dbg_3p, + NULL, NULL }; static patchentry_t msvcrtdPatch [] = { - "_calloc_dbg", VS60::crtd__calloc_dbg, - "_malloc_dbg", VS60::crtd__malloc_dbg, - "_realloc_dbg", VS60::crtd__realloc_dbg, - scalar_new_dbg_name, VS60::crtd__scalar_new_dbg, - //vector_new_dbg_name, VS60::crtd__vector_new_dbg, - "calloc", VS60::crtd_calloc, - "malloc", VS60::crtd_malloc, - "realloc", VS60::crtd_realloc, - scalar_new_name, VS60::crtd_scalar_new, - //vector_new_name, VS60::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS60::crtd__calloc_dbg, + "_malloc_dbg", VS60::crtd__malloc_dbg, + "_realloc_dbg", VS60::crtd__realloc_dbg, + scalar_new_dbg_name, VS60::crtd__scalar_new_dbg, + //vector_new_dbg_name, VS60::crtd__vector_new_dbg, + "calloc", VS60::crtd_calloc, + "malloc", VS60::crtd_malloc, + "realloc", VS60::crtd_realloc, + scalar_new_name, VS60::crtd_scalar_new, + //vector_new_name, VS60::crtd_vector_new, + NULL, NULL }; static patchentry_t msvcr70dPatch [] = { - "_calloc_dbg", VS70::crtd__calloc_dbg, - "_malloc_dbg", VS70::crtd__malloc_dbg, - "_realloc_dbg", VS70::crtd__realloc_dbg, - scalar_new_dbg_name, VS70::crtd__scalar_new_dbg, - vector_new_dbg_name, VS70::crtd__vector_new_dbg, - "calloc", VS70::crtd_calloc, - "malloc", VS70::crtd_malloc, - "realloc", VS70::crtd_realloc, - scalar_new_name, VS70::crtd_scalar_new, - vector_new_name, VS70::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS70::crtd__calloc_dbg, + "_malloc_dbg", VS70::crtd__malloc_dbg, + "_realloc_dbg", VS70::crtd__realloc_dbg, + scalar_new_dbg_name, VS70::crtd__scalar_new_dbg, + vector_new_dbg_name, VS70::crtd__vector_new_dbg, + "calloc", VS70::crtd_calloc, + "malloc", VS70::crtd_malloc, + "realloc", VS70::crtd_realloc, + scalar_new_name, VS70::crtd_scalar_new, + vector_new_name, VS70::crtd_vector_new, + NULL, NULL }; static patchentry_t msvcr71dPatch [] = { - "_calloc_dbg", VS71::crtd__calloc_dbg, - "_malloc_dbg", VS71::crtd__malloc_dbg, - "_realloc_dbg", VS71::crtd__realloc_dbg, - scalar_new_dbg_name, VS71::crtd__scalar_new_dbg, - vector_new_dbg_name, VS71::crtd__vector_new_dbg, - "calloc", VS71::crtd_calloc, - "malloc", VS71::crtd_malloc, - "realloc", VS71::crtd_realloc, - scalar_new_name, VS71::crtd_scalar_new, - vector_new_name, VS71::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS71::crtd__calloc_dbg, + "_malloc_dbg", VS71::crtd__malloc_dbg, + "_realloc_dbg", VS71::crtd__realloc_dbg, + scalar_new_dbg_name, VS71::crtd__scalar_new_dbg, + vector_new_dbg_name, VS71::crtd__vector_new_dbg, + "calloc", VS71::crtd_calloc, + "malloc", VS71::crtd_malloc, + "realloc", VS71::crtd_realloc, + scalar_new_name, VS71::crtd_scalar_new, + vector_new_name, VS71::crtd_vector_new, + NULL, NULL }; static patchentry_t msvcr80dPatch [] = { - "_calloc_dbg", VS80::crtd__calloc_dbg, - "_malloc_dbg", VS80::crtd__malloc_dbg, - "_realloc_dbg", VS80::crtd__realloc_dbg, - scalar_new_dbg_name, VS80::crtd__scalar_new_dbg, - vector_new_dbg_name, VS80::crtd__vector_new_dbg, - "calloc", VS80::crtd_calloc, - "malloc", VS80::crtd_malloc, - "realloc", VS80::crtd_realloc, - scalar_new_name, VS80::crtd_scalar_new, - vector_new_name, VS80::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS80::crtd__calloc_dbg, + "_malloc_dbg", VS80::crtd__malloc_dbg, + "_realloc_dbg", VS80::crtd__realloc_dbg, + scalar_new_dbg_name, VS80::crtd__scalar_new_dbg, + vector_new_dbg_name, VS80::crtd__vector_new_dbg, + "calloc", VS80::crtd_calloc, + "malloc", VS80::crtd_malloc, + "realloc", VS80::crtd_realloc, + scalar_new_name, VS80::crtd_scalar_new, + vector_new_name, VS80::crtd_vector_new, + NULL, NULL }; static patchentry_t msvcr90dPatch [] = { - "_calloc_dbg", VS90::crtd__calloc_dbg, - "_malloc_dbg", VS90::crtd__malloc_dbg, - "_realloc_dbg", VS90::crtd__realloc_dbg, - scalar_new_dbg_name, VS90::crtd__scalar_new_dbg, - vector_new_dbg_name, VS90::crtd__vector_new_dbg, - "calloc", VS90::crtd_calloc, - "malloc", VS90::crtd_malloc, - "realloc", VS90::crtd_realloc, - scalar_new_name, VS90::crtd_scalar_new, - vector_new_name, VS90::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS90::crtd__calloc_dbg, + "_malloc_dbg", VS90::crtd__malloc_dbg, + "_realloc_dbg", VS90::crtd__realloc_dbg, + scalar_new_dbg_name, VS90::crtd__scalar_new_dbg, + vector_new_dbg_name, VS90::crtd__vector_new_dbg, + "calloc", VS90::crtd_calloc, + "malloc", VS90::crtd_malloc, + "realloc", VS90::crtd_realloc, + scalar_new_name, VS90::crtd_scalar_new, + vector_new_name, VS90::crtd_vector_new, + NULL, NULL }; static patchentry_t msvcr100dPatch [] = { - "_calloc_dbg", VS100::crtd__calloc_dbg, - "_malloc_dbg", VS100::crtd__malloc_dbg, - "_realloc_dbg", VS100::crtd__realloc_dbg, - scalar_new_dbg_name, VS100::crtd__scalar_new_dbg, - vector_new_dbg_name, VS100::crtd__vector_new_dbg, - "calloc", VS100::crtd_calloc, - "malloc", VS100::crtd_malloc, - "realloc", VS100::crtd_realloc, - scalar_new_name, VS100::crtd_scalar_new, - vector_new_name, VS100::crtd_vector_new, - NULL, NULL + "_calloc_dbg", VS100::crtd__calloc_dbg, + "_malloc_dbg", VS100::crtd__malloc_dbg, + "_realloc_dbg", VS100::crtd__realloc_dbg, + scalar_new_dbg_name, VS100::crtd__scalar_new_dbg, + vector_new_dbg_name, VS100::crtd__vector_new_dbg, + "calloc", VS100::crtd_calloc, + "malloc", VS100::crtd_malloc, + "realloc", VS100::crtd_realloc, + scalar_new_name, VS100::crtd_scalar_new, + vector_new_name, VS100::crtd_vector_new, + NULL, NULL }; patchentry_t VisualLeakDetector::m_ntdllPatch [] = { - "RtlAllocateHeap", VisualLeakDetector::_RtlAllocateHeap, - "RtlFreeHeap", VisualLeakDetector::_RtlFreeHeap, - "RtlReAllocateHeap", VisualLeakDetector::_RtlReAllocateHeap, - NULL, NULL + "RtlAllocateHeap", VisualLeakDetector::_RtlAllocateHeap, + "RtlFreeHeap", VisualLeakDetector::_RtlFreeHeap, + "RtlReAllocateHeap", VisualLeakDetector::_RtlReAllocateHeap, + NULL, NULL }; patchentry_t VisualLeakDetector::m_ole32Patch [] = { - "CoGetMalloc", VisualLeakDetector::_CoGetMalloc, - "CoTaskMemAlloc", VisualLeakDetector::_CoTaskMemAlloc, - "CoTaskMemRealloc", VisualLeakDetector::_CoTaskMemRealloc, - NULL, NULL + "CoGetMalloc", VisualLeakDetector::_CoGetMalloc, + "CoTaskMemAlloc", VisualLeakDetector::_CoTaskMemAlloc, + "CoTaskMemRealloc", VisualLeakDetector::_CoTaskMemRealloc, + NULL, NULL }; moduleentry_t VisualLeakDetector::m_patchtable [] = { - // Win32 heap APIs. - "kernel32.dll", 0x0, m_kernelbasePatch, // we patch this record on Win7 - "kernel32.dll", 0x0, m_kernel32Patch, - - // MFC new operators (exported by ordinal). - "mfc42d.dll", 0x0, mfc42dPatch, - "mfc42ud.dll", 0x0, mfc42udPatch, - "mfc70d.dll", 0x0, mfc70dPatch, - "mfc70ud.dll", 0x0, mfc70udPatch, - "mfc71d.dll", 0x0, mfc71dPatch, - "mfc71ud.dll", 0x0, mfc71udPatch, - "mfc80d.dll", 0x0, mfc80dPatch, - "mfc80ud.dll", 0x0, mfc80udPatch, - "mfc90d.dll", 0x0, mfc90dPatch, - "mfc90ud.dll", 0x0, mfc90udPatch, - "mfc100d.dll", 0x0, mfc100dPatch, - "mfc100ud.dll", 0x0, mfc100udPatch, - - // CRT new operators and heap APIs. - "msvcrtd.dll", 0x0, msvcrtdPatch, - "msvcr70d.dll", 0x0, msvcr70dPatch, - "msvcr71d.dll", 0x0, msvcr71dPatch, - "msvcr80d.dll", 0x0, msvcr80dPatch, - "msvcr90d.dll", 0x0, msvcr90dPatch, - "msvcr100d.dll",0x0, msvcr100dPatch, - - // NT APIs. - "ntdll.dll", 0x0, m_ntdllPatch, - - // COM heap APIs. - "ole32.dll", 0x0, m_ole32Patch + // Win32 heap APIs. + "kernel32.dll", 0x0, m_kernelbasePatch, // we patch this record on Win7 + "kernel32.dll", 0x0, m_kernel32Patch, + + // MFC new operators (exported by ordinal). + "mfc42d.dll", 0x0, mfc42dPatch, + "mfc42ud.dll", 0x0, mfc42udPatch, + "mfc70d.dll", 0x0, mfc70dPatch, + "mfc70ud.dll", 0x0, mfc70udPatch, + "mfc71d.dll", 0x0, mfc71dPatch, + "mfc71ud.dll", 0x0, mfc71udPatch, + "mfc80d.dll", 0x0, mfc80dPatch, + "mfc80ud.dll", 0x0, mfc80udPatch, + "mfc90d.dll", 0x0, mfc90dPatch, + "mfc90ud.dll", 0x0, mfc90udPatch, + "mfc100d.dll", 0x0, mfc100dPatch, + "mfc100ud.dll", 0x0, mfc100udPatch, + + // CRT new operators and heap APIs. + "msvcrtd.dll", 0x0, msvcrtdPatch, + "msvcr70d.dll", 0x0, msvcr70dPatch, + "msvcr71d.dll", 0x0, msvcr71dPatch, + "msvcr80d.dll", 0x0, msvcr80dPatch, + "msvcr90d.dll", 0x0, msvcr90dPatch, + "msvcr100d.dll",0x0, msvcr100dPatch, + + // NT APIs. + "ntdll.dll", 0x0, m_ntdllPatch, + + // COM heap APIs. + "ole32.dll", 0x0, m_ole32Patch }; BOOL IsWin7OrBetter() { - OSVERSIONINFOEX info = { sizeof(OSVERSIONINFOEX) }; - GetVersionEx((LPOSVERSIONINFO)&info); - if (info.dwMajorVersion > 6) - return TRUE; + OSVERSIONINFOEX info = { sizeof(OSVERSIONINFOEX) }; + GetVersionEx((LPOSVERSIONINFO)&info); + if (info.dwMajorVersion > 6) + return TRUE; - if (info.dwMajorVersion == 6 && info.dwMinorVersion >= 1) - return TRUE; + if (info.dwMajorVersion == 6 && info.dwMinorVersion >= 1) + return TRUE; - return FALSE; + return FALSE; } // Constructor - Initializes private data, loads configuration options, and @@ -356,6 +356,8 @@ BOOL IsWin7OrBetter() // VisualLeakDetector::VisualLeakDetector () { + _set_error_mode(_OUT_TO_STDERR); + // Initialize configuration options and related private data. _wcsnset_s(m_forcedmodulelist, MAXMODULELISTLENGTH, '\0', _TRUNCATE); m_maxdatadump = 0xffffffff; @@ -815,98 +817,98 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // LPWSTR VisualLeakDetector::buildsymbolsearchpath () { - // Oddly, the symbol handler ignores the link to the PDB embedded in the - // executable image. So, we'll manually add the location of the executable - // to the search path since that is often where the PDB will be located. - WCHAR directory [_MAX_DIR]; - WCHAR drive [_MAX_DRIVE]; - LPWSTR path = new WCHAR [MAX_PATH]; - path[0] = L'\0'; - HMODULE module = GetModuleHandleW(NULL); - GetModuleFileName(module, path, MAX_PATH); - _wsplitpath_s(path, drive, _MAX_DRIVE, directory, _MAX_DIR, NULL, 0, NULL, 0); - wcsncpy_s(path, MAX_PATH, drive, _TRUNCATE); - strapp(&path, directory); - - // When the symbol handler is given a custom symbol search path, it will no - // longer search the default directories (working directory, system root, - // etc). But we'd like it to still search those directories, so we'll add - // them to our custom search path. - // - // Append the working directory. - strapp(&path, L";.\\"); - - // Append the Windows directory. - WCHAR windows [MAX_PATH]; - if (GetWindowsDirectory(windows, MAX_PATH) != 0) { - strapp(&path, L";"); - strapp(&path, windows); - } - - // Append the system directory. - WCHAR system [MAX_PATH]; - if (GetSystemDirectory(system, MAX_PATH) != 0) { - strapp(&path, L";"); - strapp(&path, system); - } - - // Append %_NT_SYMBOL_PATH%. - DWORD envlen = GetEnvironmentVariable(L"_NT_SYMBOL_PATH", NULL, 0); - if (envlen != 0) { - LPWSTR env = new WCHAR [envlen]; - if (GetEnvironmentVariable(L"_NT_SYMBOL_PATH", env, envlen) != 0) { - strapp(&path, L";"); - strapp(&path, env); - } - delete [] env; - } - - // Append %_NT_ALT_SYMBOL_PATH%. - envlen = GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", NULL, 0); - if (envlen != 0) { - LPWSTR env = new WCHAR [envlen]; - if (GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", env, envlen) != 0) { - strapp(&path, L";"); - strapp(&path, env); - } - delete [] env; - } - - // Append Visual Studio 2010/2008 symbols cache directory. - HKEY debuggerkey; - WCHAR symbolCacheDir [MAX_PATH]; - LSTATUS regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\10.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); - if (regstatus != ERROR_SUCCESS) - regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\9.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); - - if (regstatus == ERROR_SUCCESS) - { - DWORD valuetype; - DWORD dirLength = MAX_PATH * sizeof(WCHAR); - regstatus = RegQueryValueEx(debuggerkey, L"SymbolCacheDir", NULL, &valuetype, (LPBYTE)&symbolCacheDir, &dirLength); - if (regstatus == ERROR_SUCCESS && valuetype == REG_SZ) - { - strapp(&path, L";srv*"); - strapp(&path, symbolCacheDir); - strapp(&path, L"\\MicrosoftPublicSymbols;srv*"); - strapp(&path, symbolCacheDir); - } - RegCloseKey(debuggerkey); - } - - // Remove any quotes from the path. The symbol handler doesn't like them. - SIZE_T pos = 0; - SIZE_T length = wcslen(path); - while (pos < length) { - if (path[pos] == L'\"') { - for (SIZE_T index = pos; index < length; index++) { - path[index] = path[index + 1]; - } - } - pos++; - } - - return path; + // Oddly, the symbol handler ignores the link to the PDB embedded in the + // executable image. So, we'll manually add the location of the executable + // to the search path since that is often where the PDB will be located. + WCHAR directory [_MAX_DIR]; + WCHAR drive [_MAX_DRIVE]; + LPWSTR path = new WCHAR [MAX_PATH]; + path[0] = L'\0'; + HMODULE module = GetModuleHandleW(NULL); + GetModuleFileName(module, path, MAX_PATH); + _wsplitpath_s(path, drive, _MAX_DRIVE, directory, _MAX_DIR, NULL, 0, NULL, 0); + wcsncpy_s(path, MAX_PATH, drive, _TRUNCATE); + strapp(&path, directory); + + // When the symbol handler is given a custom symbol search path, it will no + // longer search the default directories (working directory, system root, + // etc). But we'd like it to still search those directories, so we'll add + // them to our custom search path. + // + // Append the working directory. + strapp(&path, L";.\\"); + + // Append the Windows directory. + WCHAR windows [MAX_PATH]; + if (GetWindowsDirectory(windows, MAX_PATH) != 0) { + strapp(&path, L";"); + strapp(&path, windows); + } + + // Append the system directory. + WCHAR system [MAX_PATH]; + if (GetSystemDirectory(system, MAX_PATH) != 0) { + strapp(&path, L";"); + strapp(&path, system); + } + + // Append %_NT_SYMBOL_PATH%. + DWORD envlen = GetEnvironmentVariable(L"_NT_SYMBOL_PATH", NULL, 0); + if (envlen != 0) { + LPWSTR env = new WCHAR [envlen]; + if (GetEnvironmentVariable(L"_NT_SYMBOL_PATH", env, envlen) != 0) { + strapp(&path, L";"); + strapp(&path, env); + } + delete [] env; + } + + // Append %_NT_ALT_SYMBOL_PATH%. + envlen = GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", NULL, 0); + if (envlen != 0) { + LPWSTR env = new WCHAR [envlen]; + if (GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", env, envlen) != 0) { + strapp(&path, L";"); + strapp(&path, env); + } + delete [] env; + } + + // Append Visual Studio 2010/2008 symbols cache directory. + HKEY debuggerkey; + WCHAR symbolCacheDir [MAX_PATH]; + LSTATUS regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\10.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); + if (regstatus != ERROR_SUCCESS) + regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\9.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); + + if (regstatus == ERROR_SUCCESS) + { + DWORD valuetype; + DWORD dirLength = MAX_PATH * sizeof(WCHAR); + regstatus = RegQueryValueEx(debuggerkey, L"SymbolCacheDir", NULL, &valuetype, (LPBYTE)&symbolCacheDir, &dirLength); + if (regstatus == ERROR_SUCCESS && valuetype == REG_SZ) + { + strapp(&path, L";srv*"); + strapp(&path, symbolCacheDir); + strapp(&path, L"\\MicrosoftPublicSymbols;srv*"); + strapp(&path, symbolCacheDir); + } + RegCloseKey(debuggerkey); + } + + // Remove any quotes from the path. The symbol handler doesn't like them. + SIZE_T pos = 0; + SIZE_T length = wcslen(path); + while (pos < length) { + if (path[pos] == L'\"') { + for (SIZE_T index = pos; index < length; index++) { + path[index] = path[index + 1]; + } + } + pos++; + } + + return path; } // configure - Configures VLD using values read from the vld.ini file. @@ -1102,7 +1104,7 @@ SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) if (elementinfo->callstack == NULL) return erased; - // Iteratate through all block maps, looking for blocks with the same size + // Iterate through all block maps, looking for blocks with the same size // and callstack as the specified element. for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { BlockMap *blockmap = &(*heapit).second->blockmap; @@ -1184,43 +1186,43 @@ tls_t* VisualLeakDetector::gettls () // VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack) { - static SIZE_T serialnumber = 0; - - // Record the block's information. - blockinfo_t* blockinfo = new blockinfo_t; - blockinfo->callstack = NULL; - ppcallstack = &blockinfo->callstack; - blockinfo->serialnumber = serialnumber++; - blockinfo->size = size; - - // Insert the block's information into the block map. - EnterCriticalSection(&m_maplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // We haven't mapped this heap to a block map yet. Do it now. - mapheap(heap); - heapit = m_heapmap->find(heap); - assert(heapit != m_heapmap->end()); - } - if (crtalloc == TRUE) { - // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags |= VLD_HEAP_CRT; - } - BlockMap* blockmap = &(*heapit).second->blockmap; - BlockMap::Iterator blockit = blockmap->insert(mem, blockinfo); - if (blockit == blockmap->end()) { - // A block with this address has already been allocated. The - // previously allocated block must have been freed (probably by some - // mechanism unknown to VLD), or the heap wouldn't have allocated it - // again. Replace the previously allocated info with the new info. - blockit = blockmap->find(mem); - delete (*blockit).second->callstack; - delete (*blockit).second; - blockmap->erase(blockit); - blockmap->insert(mem, blockinfo); - ppcallstack = NULL; - } - LeaveCriticalSection(&m_maplock); + static SIZE_T serialnumber = 0; + + // Record the block's information. + blockinfo_t* blockinfo = new blockinfo_t; + blockinfo->callstack = NULL; + ppcallstack = &blockinfo->callstack; + blockinfo->serialnumber = serialnumber++; + blockinfo->size = size; + + // Insert the block's information into the block map. + EnterCriticalSection(&m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // We haven't mapped this heap to a block map yet. Do it now. + mapheap(heap); + heapit = m_heapmap->find(heap); + assert(heapit != m_heapmap->end()); + } + if (crtalloc == TRUE) { + // The heap that this block was allocated from is a CRT heap. + (*heapit).second->flags |= VLD_HEAP_CRT; + } + BlockMap* blockmap = &(*heapit).second->blockmap; + BlockMap::Iterator blockit = blockmap->insert(mem, blockinfo); + if (blockit == blockmap->end()) { + // A block with this address has already been allocated. The + // previously allocated block must have been freed (probably by some + // mechanism unknown to VLD), or the heap wouldn't have allocated it + // again. Replace the previously allocated info with the new info. + blockit = blockmap->find(mem); + delete (*blockit).second->callstack; + delete (*blockit).second; + blockmap->erase(blockit); + blockmap->insert(mem, blockinfo); + ppcallstack = NULL; + } + LeaveCriticalSection(&m_maplock); } // mapheap - Tracks heap creation. Creates a block map for tracking individual @@ -1281,57 +1283,57 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) // None. // VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - BOOL crtalloc, CallStack **&ppcallstack) -{ - if (newmem != mem) { - // The block was not reallocated in-place. Instead the old block was - // freed and a new block allocated to satisfy the new size. - unmapblock(heap, mem); - mapblock(heap, newmem, size, crtalloc, ppcallstack); - return; - } - - // The block was reallocated in-place. Find the existing blockinfo_t - // entry in the block map and update it with the new callstack and size. - EnterCriticalSection(&m_maplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // We haven't mapped this heap to a block map yet. Obviously the - // block has also not been mapped to a blockinfo_t entry yet either, - // so treat this reallocation as a brand-new allocation (this will - // also map the heap to a new block map). - mapblock(heap, newmem, size, crtalloc, ppcallstack); - LeaveCriticalSection(&m_maplock); - return; - } - - // Find the block's blockinfo_t structure so that we can update it. - BlockMap *blockmap = &(*heapit).second->blockmap; - BlockMap::Iterator blockit = blockmap->find(mem); - if (blockit == blockmap->end()) { - // The block hasn't been mapped to a blockinfo_t entry yet. - // Treat this reallocation as a new allocation. - mapblock(heap, newmem, size, crtalloc, ppcallstack); - LeaveCriticalSection(&m_maplock); - return; - } - - // Found the blockinfo_t entry for this block. Update it with - // a new callstack and new size. - blockinfo_t* info = (*blockit).second; - if (info->callstack) - { - info->callstack->clear(); - } - - if (crtalloc) { - // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags |= VLD_HEAP_CRT; - } - LeaveCriticalSection(&m_maplock); - - // Update the block's size. - info->size = size; + BOOL crtalloc, CallStack **&ppcallstack) +{ + if (newmem != mem) { + // The block was not reallocated in-place. Instead the old block was + // freed and a new block allocated to satisfy the new size. + unmapblock(heap, mem); + mapblock(heap, newmem, size, crtalloc, ppcallstack); + return; + } + + // The block was reallocated in-place. Find the existing blockinfo_t + // entry in the block map and update it with the new callstack and size. + EnterCriticalSection(&m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // We haven't mapped this heap to a block map yet. Obviously the + // block has also not been mapped to a blockinfo_t entry yet either, + // so treat this reallocation as a brand-new allocation (this will + // also map the heap to a new block map). + mapblock(heap, newmem, size, crtalloc, ppcallstack); + LeaveCriticalSection(&m_maplock); + return; + } + + // Find the block's blockinfo_t structure so that we can update it. + BlockMap *blockmap = &(*heapit).second->blockmap; + BlockMap::Iterator blockit = blockmap->find(mem); + if (blockit == blockmap->end()) { + // The block hasn't been mapped to a blockinfo_t entry yet. + // Treat this reallocation as a new allocation. + mapblock(heap, newmem, size, crtalloc, ppcallstack); + LeaveCriticalSection(&m_maplock); + return; + } + + // Found the blockinfo_t entry for this block. Update it with + // a new callstack and new size. + blockinfo_t* info = (*blockit).second; + if (info->callstack) + { + info->callstack->clear(); + } + + if (crtalloc) { + // The heap that this block was allocated from is a CRT heap. + (*heapit).second->flags |= VLD_HEAP_CRT; + } + LeaveCriticalSection(&m_maplock); + + // Update the block's size. + info->size = size; } // reportconfig - Generates a brief report summarizing Visual Leak Detector's @@ -1343,49 +1345,108 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // VOID VisualLeakDetector::reportconfig () { - if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { - report(L" Aggregating duplicate leaks.\n"); - } - if (wcslen(m_forcedmodulelist) != 0) { - report(L" Forcing inclusion of these modules in leak detection: %s\n", m_forcedmodulelist); - } - if (m_maxdatadump != VLD_DEFAULT_MAX_DATA_DUMP) { - if (m_maxdatadump == 0) { - report(L" Suppressing data dumps.\n"); - } - else { - report(L" Limiting data dumps to %Iu bytes.\n", m_maxdatadump); - } - } - if (m_maxtraceframes != VLD_DEFAULT_MAX_TRACE_FRAMES) { - report(L" Limiting stack traces to %u frames.\n", m_maxtraceframes); - } - if (m_options & VLD_OPT_UNICODE_REPORT) { - report(L" Generating a Unicode (UTF-16) encoded report.\n"); - } - if (m_options & VLD_OPT_REPORT_TO_FILE) { - if (m_options & VLD_OPT_REPORT_TO_DEBUGGER) { - report(L" Outputting the report to the debugger and to %s\n", m_reportfilepath); - } - else { - report(L" Outputting the report to %s\n", m_reportfilepath); - } - } - if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { - report(L" Outputting the report to the debugger at a slower rate.\n"); - } - if (m_options & VLD_OPT_SAFE_STACK_WALK) { - report(L" Using the \"safe\" (but slow) stack walking method.\n"); - } - if (m_options & VLD_OPT_SELF_TEST) { - report(L" Performing a memory leak self-test.\n"); - } - if (m_options & VLD_OPT_START_DISABLED) { - report(L" Starting with memory leak detection disabled.\n"); - } - if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { - report(L" Including heap and VLD internal frames in stack traces.\n"); - } + if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { + report(L" Aggregating duplicate leaks.\n"); + } + if (wcslen(m_forcedmodulelist) != 0) { + report(L" Forcing inclusion of these modules in leak detection: %s\n", m_forcedmodulelist); + } + if (m_maxdatadump != VLD_DEFAULT_MAX_DATA_DUMP) { + if (m_maxdatadump == 0) { + report(L" Suppressing data dumps.\n"); + } + else { + report(L" Limiting data dumps to %Iu bytes.\n", m_maxdatadump); + } + } + if (m_maxtraceframes != VLD_DEFAULT_MAX_TRACE_FRAMES) { + report(L" Limiting stack traces to %u frames.\n", m_maxtraceframes); + } + if (m_options & VLD_OPT_UNICODE_REPORT) { + report(L" Generating a Unicode (UTF-16) encoded report.\n"); + } + if (m_options & VLD_OPT_REPORT_TO_FILE) { + if (m_options & VLD_OPT_REPORT_TO_DEBUGGER) { + report(L" Outputting the report to the debugger and to %s\n", m_reportfilepath); + } + else { + report(L" Outputting the report to %s\n", m_reportfilepath); + } + } + if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { + report(L" Outputting the report to the debugger at a slower rate.\n"); + } + if (m_options & VLD_OPT_SAFE_STACK_WALK) { + report(L" Using the \"safe\" (but slow) stack walking method.\n"); + } + if (m_options & VLD_OPT_SELF_TEST) { + report(L" Performing a memory leak self-test.\n"); + } + if (m_options & VLD_OPT_START_DISABLED) { + report(L" Starting with memory leak detection disabled.\n"); + } + if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { + report(L" Including heap and VLD internal frames in stack traces.\n"); + } +} + +// getleakscount - Calculate number of memory leaks. +// +// - heap (IN): Handle to the heap for which to generate a memory leak +// report. +// +// Return Value: +// +// None. +// +SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) +{ + assert(heap != NULL); + + // Find the heap's information (blockmap, etc). + EnterCriticalSection(&m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // Nothing is allocated from this heap. No leaks. + LeaveCriticalSection(&m_maplock); + return 0; + } + + heapinfo_t* heapinfo = (*heapit).second; + BlockMap* blockmap = &heapinfo->blockmap; + SIZE_T memoryleaks = 0; + + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) + { + // Found a block which is still in the BlockMap. We've identified a + // potential memory leak. + LPCVOID block = (*blockit).first; + blockinfo_t* info = (*blockit).second; + LPCVOID address = block; + SIZE_T size = info->size; + + if (heapinfo->flags & VLD_HEAP_CRT) { + // This block is allocated to a CRT heap, so the block has a CRT + // memory block header pretended to it. + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL && !includingInternal) { + // This block is marked as being used internally by the CRT. + // The CRT will free the block after VLD is destroyed. + continue; + } + // The CRT header is more or less transparent to the user, so + // the information about the contained block will probably be + // more useful to the user. Accordingly, that's the information + // we'll include in the report. + address = CRTDBGBLOCKDATA(block); + size = crtheader->size; + } + + memoryleaks++; + } + + LeaveCriticalSection(&m_maplock); + return memoryleaks; } // reportleaks - Generates a memory leak report for the specified heap. @@ -1496,32 +1557,32 @@ VOID VisualLeakDetector::reportleaks (HANDLE heap) // VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) { - // Find this heap's block map. - EnterCriticalSection(&m_maplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // We don't have a block map for this heap. We must not have monitored - // this allocation (probably happened before VLD was initialized). - LeaveCriticalSection(&m_maplock); - return; - } - - // Find this block in the block map. - BlockMap *blockmap = &(*heapit).second->blockmap; - BlockMap::Iterator blockit = blockmap->find(mem); - if (blockit == blockmap->end()) { - // This block is not in the block map. We must not have monitored this - // allocation (probably happened before VLD was initialized). - LeaveCriticalSection(&m_maplock); - return; - } - - // Free the blockinfo_t structure and erase it from the block map. - blockinfo_t *info = (*blockit).second; - delete info->callstack; - delete info; - blockmap->erase(blockit); - LeaveCriticalSection(&m_maplock); + // Find this heap's block map. + EnterCriticalSection(&m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // We don't have a block map for this heap. We must not have monitored + // this allocation (probably happened before VLD was initialized). + LeaveCriticalSection(&m_maplock); + return; + } + + // Find this block in the block map. + BlockMap *blockmap = &(*heapit).second->blockmap; + BlockMap::Iterator blockit = blockmap->find(mem); + if (blockit == blockmap->end()) { + // This block is not in the block map. We must not have monitored this + // allocation (probably happened before VLD was initialized). + LeaveCriticalSection(&m_maplock); + return; + } + + // Free the blockinfo_t structure and erase it from the block map. + blockinfo_t *info = (*blockit).second; + delete info->callstack; + delete info; + blockmap->erase(blockit); + LeaveCriticalSection(&m_maplock); } // unmapheap - Tracks heap destruction. Unmaps the specified heap from its block @@ -1536,28 +1597,28 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) // VOID VisualLeakDetector::unmapheap (HANDLE heap) { - // Find this heap's block map. - EnterCriticalSection(&m_maplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // This heap hasn't been mapped. We must not have monitored this heap's - // creation (probably happened before VLD was initialized). - LeaveCriticalSection(&m_maplock); - return; - } + // Find this heap's block map. + EnterCriticalSection(&m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // This heap hasn't been mapped. We must not have monitored this heap's + // creation (probably happened before VLD was initialized). + LeaveCriticalSection(&m_maplock); + return; + } - // Free all of the blockinfo_t structures stored in the block map. - heapinfo_t *heapinfo = (*heapit).second; - BlockMap *blockmap = &heapinfo->blockmap; - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callstack; - delete (*blockit).second; - } - delete heapinfo; + // Free all of the blockinfo_t structures stored in the block map. + heapinfo_t *heapinfo = (*heapit).second; + BlockMap *blockmap = &heapinfo->blockmap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + delete (*blockit).second->callstack; + delete (*blockit).second; + } + delete heapinfo; - // Remove this heap's block map from the heap map. - m_heapmap->erase(heapit); - LeaveCriticalSection(&m_maplock); + // Remove this heap's block map from the heap map. + m_heapmap->erase(heapit); + LeaveCriticalSection(&m_maplock); } @@ -1593,64 +1654,64 @@ VOID VisualLeakDetector::unmapheap (HANDLE heap) // BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context) { - // Convert the module path to ASCII. - size_t length = wcslen(modulepath) + 1; - LPSTR modulepatha = new CHAR [length]; - - // wcstombs_s requires locale to be already set up correctly, but it might not be correct on vld init step. So use WideCharToMultiByte instead - CHAR defaultChar = '?'; - BOOL defaultCharUsed = FALSE; - - int count = ::WideCharToMultiByte(CP_ACP, 0/*flags*/, modulepath, (int)length, modulepatha, (int)length, &defaultChar, &defaultCharUsed); - assert(count != 0); - if ( defaultCharUsed ) - { - ::OutputDebugStringW(__FILEW__ L": " __FUNCTIONW__ L" - defaultChar was used while convertion from \""); - ::OutputDebugStringW(modulepath); - ::OutputDebugStringW(L"\" to ANSI \""); - ::OutputDebugStringA(modulepatha); - ::OutputDebugStringW(L"\". Result can be wrong.\n"); - } - - // Extract just the filename and extension from the module path. - CHAR filename [_MAX_FNAME]; - CHAR extension [_MAX_EXT]; - _splitpath_s(modulepatha, NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); - - length = strlen(filename) + strlen(extension) + 1; - LPSTR modulenamea = new CHAR [length]; - strncpy_s(modulenamea, length, filename, _TRUNCATE); - strncat_s(modulenamea, length, extension, _TRUNCATE); - _strlwr_s(modulenamea, length); - - if (_stricmp(modulenamea, VLDDLL) == 0) { - // Record Visual Leak Detector's own base address. - vld.m_vldbase = (HMODULE)modulebase; - } - else { - // See if this is a module listed in the patch table. If it is, update - // the corresponding patch table entries' module base address. - UINT tablesize = _countof(m_patchtable); - for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &m_patchtable[index]; - if (_stricmp(entry->exportmodulename, modulenamea) == 0) { - entry->modulebase = (UINT_PTR)modulebase; - } - } - } - - // Record the module's information and store it in the set. - moduleinfo_t moduleinfo; - moduleinfo.addrlow = (UINT_PTR)modulebase; - moduleinfo.addrhigh = (UINT_PTR)(modulebase + modulesize) - 1; - moduleinfo.flags = 0x0; - moduleinfo.name = modulenamea; - moduleinfo.path = modulepatha; - - ModuleSet* newmodules = (ModuleSet*)context; - newmodules->insert(moduleinfo); - - return TRUE; + // Convert the module path to ASCII. + size_t length = wcslen(modulepath) + 1; + LPSTR modulepatha = new CHAR [length]; + + // wcstombs_s requires locale to be already set up correctly, but it might not be correct on vld init step. So use WideCharToMultiByte instead + CHAR defaultChar = '?'; + BOOL defaultCharUsed = FALSE; + + int count = ::WideCharToMultiByte(CP_ACP, 0/*flags*/, modulepath, (int)length, modulepatha, (int)length, &defaultChar, &defaultCharUsed); + assert(count != 0); + if ( defaultCharUsed ) + { + ::OutputDebugStringW(__FILEW__ L": " __FUNCTIONW__ L" - defaultChar was used while convertion from \""); + ::OutputDebugStringW(modulepath); + ::OutputDebugStringW(L"\" to ANSI \""); + ::OutputDebugStringA(modulepatha); + ::OutputDebugStringW(L"\". Result can be wrong.\n"); + } + + // Extract just the filename and extension from the module path. + CHAR filename [_MAX_FNAME]; + CHAR extension [_MAX_EXT]; + _splitpath_s(modulepatha, NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); + + length = strlen(filename) + strlen(extension) + 1; + LPSTR modulenamea = new CHAR [length]; + strncpy_s(modulenamea, length, filename, _TRUNCATE); + strncat_s(modulenamea, length, extension, _TRUNCATE); + _strlwr_s(modulenamea, length); + + if (_stricmp(modulenamea, VLDDLL) == 0) { + // Record Visual Leak Detector's own base address. + vld.m_vldbase = (HMODULE)modulebase; + } + else { + // See if this is a module listed in the patch table. If it is, update + // the corresponding patch table entries' module base address. + UINT tablesize = _countof(m_patchtable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &m_patchtable[index]; + if (_stricmp(entry->exportmodulename, modulenamea) == 0) { + entry->modulebase = (UINT_PTR)modulebase; + } + } + } + + // Record the module's information and store it in the set. + moduleinfo_t moduleinfo; + moduleinfo.addrlow = (UINT_PTR)modulebase; + moduleinfo.addrhigh = (UINT_PTR)(modulebase + modulesize) - 1; + moduleinfo.flags = 0x0; + moduleinfo.name = modulenamea; + moduleinfo.path = modulepatha; + + ModuleSet* newmodules = (ModuleSet*)context; + newmodules->insert(moduleinfo); + + return TRUE; } // detachfrommodule - Callback function for EnumerateLoadedModules64 that @@ -1672,13 +1733,13 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, // Always returns TRUE. // BOOL VisualLeakDetector::detachfrommodule (PCWSTR /*modulepath*/, DWORD64 modulebase, ULONG /*modulesize*/, - PVOID /*context*/) + PVOID /*context*/) { - UINT tablesize = _countof(m_patchtable); + UINT tablesize = _countof(m_patchtable); - restoremodule((HMODULE)modulebase, m_patchtable, tablesize); + restoremodule((HMODULE)modulebase, m_patchtable, tablesize); - return TRUE; + return TRUE; } @@ -1709,39 +1770,42 @@ BOOL VisualLeakDetector::detachfrommodule (PCWSTR /*modulepath*/, DWORD64 module // Returns the value returned from the specified calloc. // void* VisualLeakDetector::_calloc (calloc_t pcalloc, - context_t& context, - size_t num, - size_t size) + context_t& context, + size_t num, + size_t size) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); + + // malloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + tls->blockprocessed = FALSE; - // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + } - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pcalloc(num, size); - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pcalloc(num, size); + assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } - return block; + return block; } // _malloc - This function is just a wrapper around the real malloc that sets @@ -1760,36 +1824,39 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t size) { - void *block; - tls_t *tls = vld.gettls(); + void *block; + tls_t *tls = vld.gettls(); - // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // malloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + tls->blockprocessed = FALSE; + + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + } - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pmalloc(size); - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pmalloc(size); + assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } - return block; + return block; } // _new - This function is just a wrapper around the real CRT and MFC new @@ -1812,6 +1879,7 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) // The new operator is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; + tls->blockprocessed = FALSE; BOOL firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -1823,6 +1891,8 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = pnew(size); + assert(tls->blockprocessed); + if (firstcall) { if (tls->ppcallstack) @@ -1856,40 +1926,43 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) // Returns the value returned from the specified realloc. // void* VisualLeakDetector::_realloc (realloc_t prealloc, - context_t& context, - void *mem, - size_t size) + context_t& context, + void *mem, + size_t size) { - void *block; - tls_t *tls = vld.gettls(); + void *block; + tls_t *tls = vld.gettls(); + + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + tls->blockprocessed = FALSE; - // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + } - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + block = prealloc(mem, size); - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = prealloc(mem, size); + assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } - return block; + return block; } //////////////////////////////////////////////////////////////////////////////// @@ -1925,43 +1998,46 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // Returns the value returned by the specified _calloc_dbg. // void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, - context_t& context, - size_t num, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t num, + size_t size, + int type, + char const *file, + int line) { - void *block; - tls_t *tls = vld.gettls(); + void *block; + tls_t *tls = vld.gettls(); + + // _malloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + tls->blockprocessed = FALSE; - // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + } - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = p_calloc_dbg(num, size, type, file, line); - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = p_calloc_dbg(num, size, type, file, line); + assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } - return block; + return block; } // __malloc_dbg - This function is just a wrapper around the real _malloc_dbg @@ -1987,46 +2063,49 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // Returns the value returned by the specified _malloc_dbg. // void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t size, + int type, + char const *file, + int line) { - void *block; - tls_t *tls = vld.gettls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + void *block; + tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = p_malloc_dbg(size, type, file, line); + // _malloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + tls->blockprocessed = FALSE; - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = p_malloc_dbg(size, type, file, line); - return block; -} + assert(tls->blockprocessed); -// new_dbg_crt - This function is just a wrapper around the real CRT debug new -// operators that sets appropriate flags to be consulted when the memory is + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } + + return block; +} + +// new_dbg_crt - This function is just a wrapper around the real CRT debug new +// operators that sets appropriate flags to be consulted when the memory is // actually allocated by RtlAllocateHeap. // // - pnew_dbg_crt (IN): Pointer to the particular CRT new operator @@ -2048,42 +2127,45 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t size, + int type, + char const *file, + int line) { - void *block; - tls_t *tls = vld.gettls(); + void *block; + tls_t *tls = vld.gettls(); - // The debug new operator is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // The debug new operator is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + tls->blockprocessed = FALSE; + + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + } - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pnew_dbg_crt(size, type, file, line); - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pnew_dbg_crt(size, type, file, line); + assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } - return block; + return block; } // new_dbg_mfc - This function is just a wrapper around the real MFC debug new @@ -2109,39 +2191,43 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t size, + int type, + char const *file, + int line) { - void *block; - tls_t *tls = vld.gettls(); + void *block; + tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + tls->blockprocessed = FALSE; - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pnew_dbg(size, type, file, line); + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + } - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pnew_dbg(size, type, file, line); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + assert(tls->blockprocessed); - return block; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } + + return block; } // new_dbg_mfc - This function is just a wrapper around the real MFC debug new @@ -2165,38 +2251,42 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, // Returns the value returned by the specified MFC debug new operator. // void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, - context_t& context, - size_t size, - char const *file, - int line) + context_t& context, + size_t size, + char const *file, + int line) { - void *block; - tls_t *tls = vld.gettls(); + void *block; + tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + tls->blockprocessed = FALSE; - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pnew_dbg_mfc(size, file, line); + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + } - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pnew_dbg_mfc(size, file, line); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + assert(tls->blockprocessed); - return block; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } + + return block; } // __realloc_debug - This function is just a wrapper around the real @@ -2224,43 +2314,46 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, - context_t& context, - void *mem, - size_t size, - int type, - char const *file, - int line) + context_t& context, + void *mem, + size_t size, + int type, + char const *file, + int line) { - void *block; - tls_t *tls = vld.gettls(); + void *block; + tls_t *tls = vld.gettls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + tls->blockprocessed = FALSE; - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = p_realloc_dbg(mem, size, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + block = p_realloc_dbg(mem, size, type, file, line); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + assert(tls->blockprocessed); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - return block; + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } + + return block; } //////////////////////////////////////////////////////////////////////////////// @@ -2288,56 +2381,56 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) { - // See if there is an entry in the patch table that matches the requested - // function. - UINT tablesize = _countof(vld.m_patchtable); - for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &vld.m_patchtable[index]; - if ((entry->modulebase == 0x0) || ((HMODULE)entry->modulebase != module)) { - // This patch table entry is for a different module. - continue; - } - - patchentry_t *patchentry = entry->patchtable; - while(patchentry->importname) - { - // This patch table entry is for the specified module. If the requested - // import's name matches the entry's import name (or ordinal), then - // return the address of the replacement instead of the address of the - // actual import. - if ((SIZE_T)patchentry->importname < (SIZE_T)vld.m_vldbase) { - // This entry's import name is not a valid pointer to data in - // vld.dll. It must be an ordinal value. - if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { - return (FARPROC)patchentry->replacement; - } - } - else { - __try - { - if (strcmp(patchentry->importname, procname) == 0) { - return (FARPROC)patchentry->replacement; - } - } - __except(EXCEPTION_EXECUTE_HANDLER) - { - if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { - return (FARPROC)patchentry->replacement; - } - } - } - patchentry++; - } - } - - // The requested function is not a patched function. Just return the real - // address of the requested function. - return vld._RGetProcAddress(module, procname); + // See if there is an entry in the patch table that matches the requested + // function. + UINT tablesize = _countof(vld.m_patchtable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &vld.m_patchtable[index]; + if ((entry->modulebase == 0x0) || ((HMODULE)entry->modulebase != module)) { + // This patch table entry is for a different module. + continue; + } + + patchentry_t *patchentry = entry->patchtable; + while(patchentry->importname) + { + // This patch table entry is for the specified module. If the requested + // import's name matches the entry's import name (or ordinal), then + // return the address of the replacement instead of the address of the + // actual import. + if ((SIZE_T)patchentry->importname < (SIZE_T)vld.m_vldbase) { + // This entry's import name is not a valid pointer to data in + // vld.dll. It must be an ordinal value. + if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { + return (FARPROC)patchentry->replacement; + } + } + else { + __try + { + if (strcmp(patchentry->importname, procname) == 0) { + return (FARPROC)patchentry->replacement; + } + } + __except(EXCEPTION_EXECUTE_HANDLER) + { + if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { + return (FARPROC)patchentry->replacement; + } + } + } + patchentry++; + } + } + + // The requested function is not a patched function. Just return the real + // address of the requested function. + return vld._RGetProcAddress(module, procname); } FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) { - return m_original_GetProcAddress(module, procname); + return m_original_GetProcAddress(module, procname); } // _HeapCreate - Calls to HeapCreate are patched through to this function. This @@ -2356,36 +2449,36 @@ FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) // HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) { - // Get the return address within the calling function. - UINT_PTR ra = (UINT_PTR)_ReturnAddress(); - - // Create the heap. - HANDLE heap = HeapCreate(options, initsize, maxsize); - - // Map the created heap handle to a new block map. - vld.mapheap(heap); - - // Try to get the name of the function containing the return address. - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; - SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; - EnterCriticalSection(&symbollock); - DWORD64 displacement; - BOOL symfound = SymFromAddrW(currentprocess, ra, &displacement, functioninfo); - LeaveCriticalSection(&symbollock); - if (symfound == TRUE) { - if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { - // HeapCreate was called by _heap_init. This is a static CRT heap. - EnterCriticalSection(&vld.m_maplock); - HeapMap::Iterator heapit = vld.m_heapmap->find(heap); - assert(heapit != vld.m_heapmap->end()); - (*heapit).second->flags |= VLD_HEAP_CRT; - LeaveCriticalSection(&vld.m_maplock); - } - } - - return heap; + // Get the return address within the calling function. + UINT_PTR ra = (UINT_PTR)_ReturnAddress(); + + // Create the heap. + HANDLE heap = HeapCreate(options, initsize, maxsize); + + // Map the created heap handle to a new block map. + vld.mapheap(heap); + + // Try to get the name of the function containing the return address. + BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; + SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + EnterCriticalSection(&symbollock); + DWORD64 displacement; + BOOL symfound = SymFromAddrW(currentprocess, ra, &displacement, functioninfo); + LeaveCriticalSection(&symbollock); + if (symfound == TRUE) { + if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { + // HeapCreate was called by _heap_init. This is a static CRT heap. + EnterCriticalSection(&vld.m_maplock); + HeapMap::Iterator heapit = vld.m_heapmap->find(heap); + assert(heapit != vld.m_heapmap->end()); + (*heapit).second->flags |= VLD_HEAP_CRT; + LeaveCriticalSection(&vld.m_maplock); + } + } + + return heap; } // _HeapDestroy - Calls to HeapDestroy are patched through to this function. @@ -2400,16 +2493,16 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m // BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) { - // After this heap is destroyed, the heap's address space will be unmapped - // from the process's address space. So, we'd better generate a leak report - // for this heap now, while we can still read from the memory blocks - // allocated to it. - if (!(vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) - vld.reportleaks(heap); + // After this heap is destroyed, the heap's address space will be unmapped + // from the process's address space. So, we'd better generate a leak report + // for this heap now, while we can still read from the memory blocks + // allocated to it. + if (!(vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) + vld.reportleaks(heap); - vld.unmapheap(heap); + vld.unmapheap(heap); - return HeapDestroy(heap); + return HeapDestroy(heap); } // _LdrLoadDll - Calls to LdrLoadDll are patched through to this function. This @@ -2475,56 +2568,56 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod VOID VisualLeakDetector::RefreshModules() { - if (vld.m_options & VLD_OPT_VLDOFF) - { - return; - } + if (vld.m_options & VLD_OPT_VLDOFF) + { + return; + } - EnterCriticalSection(&vld.m_loaderlock); - // Duplicate code here in this method. Consider refactoring out to another method. - // Create a new set of all loaded modules, including any newly loaded - // modules. - ModuleSet* newmodules = new ModuleSet(); - newmodules->reserve(MODULESETRESERVE); - EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); + EnterCriticalSection(&vld.m_loaderlock); + // Duplicate code here in this method. Consider refactoring out to another method. + // Create a new set of all loaded modules, including any newly loaded + // modules. + ModuleSet* newmodules = new ModuleSet(); + newmodules->reserve(MODULESETRESERVE); + EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); - // Attach to all modules included in the set. - vld.attachtoloadedmodules(newmodules); + // Attach to all modules included in the set. + vld.attachtoloadedmodules(newmodules); - // Start using the new set of loaded modules. - EnterCriticalSection(&vld.m_moduleslock); - ModuleSet* oldmodules = vld.m_loadedmodules; - vld.m_loadedmodules = newmodules; - LeaveCriticalSection(&vld.m_moduleslock); + // Start using the new set of loaded modules. + EnterCriticalSection(&vld.m_moduleslock); + ModuleSet* oldmodules = vld.m_loadedmodules; + vld.m_loadedmodules = newmodules; + LeaveCriticalSection(&vld.m_moduleslock); - // Free resources used by the old module list. - for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { - delete [] (*moduleit).name; - delete [] (*moduleit).path; - } - delete oldmodules; + // Free resources used by the old module list. + for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { + delete [] (*moduleit).name; + delete [] (*moduleit).path; + } + delete oldmodules; - LeaveCriticalSection(&vld.m_loaderlock); + LeaveCriticalSection(&vld.m_loaderlock); } void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &context_ ) { - CallStack* callstack = NULL; - if (vld.m_options & VLD_OPT_SAFE_STACK_WALK) { - callstack = new SafeCallStack; - } - else { - callstack = new FastCallStack; - } + CallStack* callstack = NULL; + if (vld.m_options & VLD_OPT_SAFE_STACK_WALK) { + callstack = new SafeCallStack; + } + else { + callstack = new FastCallStack; + } - // Reset thread local flags and variables, in case any libraries called - // into while mapping the block allocate some memory. - context_t context = context_; - *ppcallstack = callstack; - context_.fp = 0x0; - ppcallstack = NULL; + // Reset thread local flags and variables, in case any libraries called + // into while mapping the block allocate some memory. + context_t context = context_; + *ppcallstack = callstack; + context_.fp = 0x0; + ppcallstack = NULL; - callstack->getstacktrace(vld.m_maxtraceframes, context); + callstack->getstacktrace(vld.m_maxtraceframes, context); } // _RtlAllocateHeap - Calls to RtlAllocateHeap are patched through to this @@ -2548,7 +2641,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si // Allocate the block. LPVOID block = RtlAllocateHeap(heap, flags, size); - if ((block == NULL) || !vld.enabled()) + if ((block == NULL) || !vld.enabled()) return block; tls_t* tls = vld.gettls(); @@ -2579,6 +2672,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si // The module that initiated this allocation is included in leak // detection. Map this block to the specified heap. vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); + tls->blockprocessed = TRUE; if (firstcall) { @@ -2616,7 +2710,7 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) BOOL status; // Unmap the block from the specified heap. - vld.unmapblock(heap, mem); + vld.unmapblock(heap, mem); status = RtlFreeHeap(heap, flags, mem); @@ -2664,71 +2758,72 @@ BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) // LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { - LPVOID newmem; - - // Reallocate the block. - newmem = RtlReAllocateHeap(heap, flags, mem, size); - if (newmem == NULL) - return newmem; - - tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) - return newmem; - - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - BOOL crtalloc; - crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - - // Reset thread local flags and variables, in case any libraries called - // into while remapping the block allocate some memory. - tls->context.fp = 0x0; - if (crtalloc) - tls->flags |= VLD_TLS_CRTALLOC; - else - tls->flags &=~VLD_TLS_CRTALLOC; - - // The module that initiated this allocation is included in leak - // detection. Remap the block. - vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack); + LPVOID newmem; + + // Reallocate the block. + newmem = RtlReAllocateHeap(heap, flags, mem, size); + if (newmem == NULL) + return newmem; + + tls_t *tls = vld.gettls(); + BOOL firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return newmem; + + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + BOOL crtalloc; + crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + + // Reset thread local flags and variables, in case any libraries called + // into while remapping the block allocate some memory. + tls->context.fp = 0x0; + if (crtalloc) + tls->flags |= VLD_TLS_CRTALLOC; + else + tls->flags &=~VLD_TLS_CRTALLOC; + + // The module that initiated this allocation is included in leak + // detection. Remap the block. + vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack); + tls->blockprocessed = TRUE; #ifdef _DEBUG - if(tls->context.fp != 0) - __debugbreak(); + if(tls->context.fp != 0) + __debugbreak(); #endif - tls->context = context; - tls->flags |= crtalloc; + tls->context = context; + tls->flags |= crtalloc; - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->ppcallstack = NULL; - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->ppcallstack = NULL; + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } - return newmem; + return newmem; } //////////////////////////////////////////////////////////////////////////////// @@ -2755,36 +2850,36 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID // HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) { - static CoGetMalloc_t pCoGetMalloc = NULL; + static CoGetMalloc_t pCoGetMalloc = NULL; - HRESULT hr = S_OK; + HRESULT hr = S_OK; - HMODULE ole32; + HMODULE ole32; - *imalloc = (LPMALLOC)&vld; + *imalloc = (LPMALLOC)&vld; - if (pCoGetMalloc == NULL) { - // This is the first call to this function. Link to the real - // CoGetMalloc and get a pointer to the system implementation of the - // IMalloc interface. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoGetMalloc = (CoGetMalloc_t)vld._RGetProcAddress(ole32, "CoGetMalloc"); - hr = pCoGetMalloc(context, &vld.m_imalloc); - } - else - { - // wait for different thread initialization - int c = 0; - while(vld.m_imalloc == NULL && c < 10) - { - Sleep(1); - c++; - } - if (vld.m_imalloc == NULL) - hr = E_INVALIDARG; - } + if (pCoGetMalloc == NULL) { + // This is the first call to this function. Link to the real + // CoGetMalloc and get a pointer to the system implementation of the + // IMalloc interface. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoGetMalloc = (CoGetMalloc_t)vld._RGetProcAddress(ole32, "CoGetMalloc"); + hr = pCoGetMalloc(context, &vld.m_imalloc); + } + else + { + // wait for different thread initialization + int c = 0; + while(vld.m_imalloc == NULL && c < 10) + { + Sleep(1); + c++; + } + if (vld.m_imalloc == NULL) + hr = E_INVALIDARG; + } - return hr; + return hr; } // _CoTaskMemAlloc - Calls to CoTaskMemAlloc are patched through to this @@ -2800,45 +2895,49 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) // LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) { - static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; + static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; - LPVOID block; - context_t context; - HMODULE ole32; - tls_t *tls = vld.gettls(); + LPVOID block; + context_t context; + HMODULE ole32; + tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - } + tls->blockprocessed = FALSE; - if (pCoTaskMemAlloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemAlloc. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemAlloc = (CoTaskMemAlloc_t)vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); - } + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pCoTaskMemAlloc(size); + if (pCoTaskMemAlloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemAlloc. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoTaskMemAlloc = (CoTaskMemAlloc_t)vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); + } - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pCoTaskMemAlloc(size); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + assert(tls->blockprocessed); - return block; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } + + return block; } // _CoTaskMemRealloc - Calls to CoTaskMemRealloc are patched through to this @@ -2856,45 +2955,49 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) // LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) { - static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; + static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; - LPVOID block; - context_t context; - HMODULE ole32; - tls_t *tls = vld.gettls(); + LPVOID block; + context_t context; + HMODULE ole32; + tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - } + tls->blockprocessed = FALSE; - if (pCoTaskMemRealloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemRealloc. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemRealloc = (CoTaskMemRealloc_t)vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); - } + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = pCoTaskMemRealloc(mem, size); + if (pCoTaskMemRealloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemRealloc. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoTaskMemRealloc = (CoTaskMemRealloc_t)vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); + } - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + block = pCoTaskMemRealloc(mem, size); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + assert(tls->blockprocessed); - return block; + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } + + return block; } //////////////////////////////////////////////////////////////////////////////// @@ -2913,8 +3016,8 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) // ULONG VisualLeakDetector::AddRef () { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->AddRef() : 0; + assert(m_imalloc != NULL); + return (m_imalloc) ? m_imalloc->AddRef() : 0; } // Alloc - Calls to IMalloc::Alloc end up here. This function is just a wrapper @@ -2929,36 +3032,40 @@ ULONG VisualLeakDetector::AddRef () // LPVOID VisualLeakDetector::Alloc (SIZE_T size) { - LPVOID block; - context_t context; - tls_t *tls = vld.gettls(); + LPVOID block; + context_t context; + tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - } + tls->blockprocessed = FALSE; - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - assert(m_imalloc != NULL); - block = (m_imalloc) ? m_imalloc->Alloc(size) : NULL; + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + } - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + assert(m_imalloc != NULL); + block = (m_imalloc) ? m_imalloc->Alloc(size) : NULL; + + assert(tls->blockprocessed); + + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } - return block; + return block; } // DidAlloc - Calls to IMalloc::DidAlloc will end up here. This function is just @@ -2973,8 +3080,8 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) // INT VisualLeakDetector::DidAlloc (LPVOID mem) { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->DidAlloc(mem) : 0; + assert(m_imalloc != NULL); + return (m_imalloc) ? m_imalloc->DidAlloc(mem) : 0; } // Free - Calls to IMalloc::Free will end up here. This function is just a @@ -2988,8 +3095,8 @@ INT VisualLeakDetector::DidAlloc (LPVOID mem) // VOID VisualLeakDetector::Free (LPVOID mem) { - assert(m_imalloc != NULL); - if (m_imalloc) m_imalloc->Free(mem); + assert(m_imalloc != NULL); + if (m_imalloc) m_imalloc->Free(mem); } // GetSize - Calls to IMalloc::GetSize will end up here. This function is just a @@ -3004,8 +3111,8 @@ VOID VisualLeakDetector::Free (LPVOID mem) // SIZE_T VisualLeakDetector::GetSize (LPVOID mem) { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->GetSize(mem) : 0; + assert(m_imalloc != NULL); + return (m_imalloc) ? m_imalloc->GetSize(mem) : 0; } // HeapMinimize - Calls to IMalloc::HeapMinimize will end up here. This function @@ -3017,8 +3124,8 @@ SIZE_T VisualLeakDetector::GetSize (LPVOID mem) // VOID VisualLeakDetector::HeapMinimize () { - assert(m_imalloc != NULL); - if (m_imalloc) m_imalloc->HeapMinimize(); + assert(m_imalloc != NULL); + if (m_imalloc) m_imalloc->HeapMinimize(); } // QueryInterface - Calls to IMalloc::QueryInterface will end up here. This @@ -3037,8 +3144,8 @@ VOID VisualLeakDetector::HeapMinimize () // HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->QueryInterface(iid, object) : E_UNEXPECTED; + assert(m_imalloc != NULL); + return (m_imalloc) ? m_imalloc->QueryInterface(iid, object) : E_UNEXPECTED; } // Realloc - Calls to IMalloc::Realloc will end up here. This function is just a @@ -3057,36 +3164,40 @@ HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) // LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) { - LPVOID block; - context_t context; - tls_t *tls = vld.gettls(); + LPVOID block; + context_t context; + tls_t *tls = vld.gettls(); - BOOL firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - } + tls->blockprocessed = FALSE; - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - assert(m_imalloc != NULL); - block = (m_imalloc) ? m_imalloc->Realloc(mem, size) : NULL; + BOOL firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + } - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + assert(m_imalloc != NULL); + block = (m_imalloc) ? m_imalloc->Realloc(mem, size) : NULL; + + assert(tls->blockprocessed); - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + if (firstcall) + { + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + } - return block; + return block; } // Release - Calls to IMalloc::Release will end up here. This function is just @@ -3099,301 +3210,316 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) // ULONG VisualLeakDetector::Release () { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->Release() : 0; + assert(m_imalloc != NULL); + return (m_imalloc) ? m_imalloc->Release() : 0; } +SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) +{ + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return 0; + } + + SIZE_T leaksCount = 0; + // Generate a memory leak report for each heap in the process. + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + leaksCount += getleakscount(heap, includingInternal); + } + return leaksCount; +} VOID VisualLeakDetector::ReportLeaks( ) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - // Generate a memory leak report for each heap in the process. - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - HANDLE heap = (*heapit).first; - reportleaks(heap); - } + // Generate a memory leak report for each heap in the process. + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + reportleaks(heap); + } } void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) { - ModuleSet::Iterator moduleit; + ModuleSet::Iterator moduleit; - EnterCriticalSection(&vld.m_moduleslock); - moduleit = vld.m_loadedmodules->begin(); - while( moduleit != vld.m_loadedmodules->end() ) - { - if ( (*moduleit).addrlow == (UINT_PTR)module) - { - moduleinfo_t *mod = (moduleinfo_t *)&(*moduleit); - if ( on ) - mod->flags &= ~VLD_MODULE_EXCLUDED; - else - mod->flags |= VLD_MODULE_EXCLUDED; + EnterCriticalSection(&vld.m_moduleslock); + moduleit = vld.m_loadedmodules->begin(); + while( moduleit != vld.m_loadedmodules->end() ) + { + if ( (*moduleit).addrlow == (UINT_PTR)module) + { + moduleinfo_t *mod = (moduleinfo_t *)&(*moduleit); + if ( on ) + mod->flags &= ~VLD_MODULE_EXCLUDED; + else + mod->flags |= VLD_MODULE_EXCLUDED; - break; - } - moduleit++; - } - LeaveCriticalSection(&vld.m_moduleslock); + break; + } + moduleit++; + } + LeaveCriticalSection(&vld.m_moduleslock); } void VisualLeakDetector::EnableModule(HMODULE module) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - ChangeModuleState(module,true); + ChangeModuleState(module,true); } void VisualLeakDetector::DisableModule(HMODULE module) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - ChangeModuleState(module,false); + ChangeModuleState(module,false); } void VisualLeakDetector::DisableLeakDetection () { - tls_t *tls; + tls_t *tls; - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - // Disable memory leak detection for the current thread. There are two flags - // because if neither flag is set, it means that we are in the default or - // "starting" state, which could be either enabled or disabled depending on - // the configuration. - tls = gettls(); - tls->oldflags = tls->flags; - tls->flags &= ~VLD_TLS_ENABLED; - tls->flags |= VLD_TLS_DISABLED; + // Disable memory leak detection for the current thread. There are two flags + // because if neither flag is set, it means that we are in the default or + // "starting" state, which could be either enabled or disabled depending on + // the configuration. + tls = gettls(); + tls->oldflags = tls->flags; + tls->flags &= ~VLD_TLS_ENABLED; + tls->flags |= VLD_TLS_DISABLED; } void VisualLeakDetector::EnableLeakDetection () { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - tls_t *tls; + tls_t *tls; - // Enable memory leak detection for the current thread. - tls = gettls(); - tls->oldflags = tls->flags; - tls->flags &= ~VLD_TLS_DISABLED; - tls->flags |= VLD_TLS_ENABLED; - m_status &= ~VLD_STATUS_NEVER_ENABLED; + // Enable memory leak detection for the current thread. + tls = gettls(); + tls->oldflags = tls->flags; + tls->flags &= ~VLD_TLS_DISABLED; + tls->flags |= VLD_TLS_ENABLED; + m_status &= ~VLD_STATUS_NEVER_ENABLED; } void VisualLeakDetector::RestoreLeakDetectionState () { - tls_t *tls; + tls_t *tls; - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - // Restore state memory leak detection for the current thread. - tls = gettls(); - tls->flags &= ~(VLD_TLS_DISABLED | VLD_TLS_ENABLED); - tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); + // Restore state memory leak detection for the current thread. + tls = gettls(); + tls->flags &= ~(VLD_TLS_DISABLED | VLD_TLS_ENABLED); + tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); } void VisualLeakDetector::GlobalDisableLeakDetection () { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - // Disable memory leak detection for all threads. - EnterCriticalSection(&m_tlslock); - TlsMap::Iterator tlsit; - for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - (*tlsit).second->oldflags = (*tlsit).second->flags; - (*tlsit).second->flags &= ~VLD_TLS_ENABLED; - (*tlsit).second->flags |= VLD_TLS_DISABLED; - } - LeaveCriticalSection(&m_tlslock); + // Disable memory leak detection for all threads. + EnterCriticalSection(&m_tlslock); + TlsMap::Iterator tlsit; + for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + (*tlsit).second->oldflags = (*tlsit).second->flags; + (*tlsit).second->flags &= ~VLD_TLS_ENABLED; + (*tlsit).second->flags |= VLD_TLS_DISABLED; + } + LeaveCriticalSection(&m_tlslock); } void VisualLeakDetector::GlobalEnableLeakDetection () { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - // Enable memory leak detection for all threads. - EnterCriticalSection(&m_tlslock); - TlsMap::Iterator tlsit; - for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - (*tlsit).second->oldflags = (*tlsit).second->flags; - (*tlsit).second->flags &= ~VLD_TLS_DISABLED; - (*tlsit).second->flags |= VLD_TLS_ENABLED; - } - LeaveCriticalSection(&m_tlslock); - m_status &= ~VLD_STATUS_NEVER_ENABLED; + // Enable memory leak detection for all threads. + EnterCriticalSection(&m_tlslock); + TlsMap::Iterator tlsit; + for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + (*tlsit).second->oldflags = (*tlsit).second->flags; + (*tlsit).second->flags &= ~VLD_TLS_DISABLED; + (*tlsit).second->flags |= VLD_TLS_ENABLED; + } + LeaveCriticalSection(&m_tlslock); + m_status &= ~VLD_STATUS_NEVER_ENABLED; } CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_INCLUDE | - VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | - VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS; + VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | + VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS; UINT32 VisualLeakDetector::GetOptions() { - return m_options & OptionsMask; + return m_options & OptionsMask; } void VisualLeakDetector::SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - m_options &= ~OptionsMask; // clear used bits - m_options |= option_mask & OptionsMask; + m_options &= ~OptionsMask; // clear used bits + m_options |= option_mask & OptionsMask; - m_maxdatadump = maxDataDump; - m_maxtraceframes = maxTraceFrames; - if (m_maxtraceframes < 1) { - m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; - } + m_maxdatadump = maxDataDump; + m_maxtraceframes = maxTraceFrames; + if (m_maxtraceframes < 1) { + m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; + } - m_options |= option_mask & VLD_OPT_START_DISABLED; - if (m_options & VLD_OPT_START_DISABLED) - GlobalDisableLeakDetection(); + m_options |= option_mask & VLD_OPT_START_DISABLED; + if (m_options & VLD_OPT_START_DISABLED) + GlobalDisableLeakDetection(); } void VisualLeakDetector::SetModulesList(CONST WCHAR *modules, BOOL includeModules) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - wcsncpy_s(m_forcedmodulelist, MAXMODULELISTLENGTH, modules, _TRUNCATE); - _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); - if (includeModules) - m_options |= VLD_OPT_MODULE_LIST_INCLUDE; - else - m_options &= ~VLD_OPT_MODULE_LIST_INCLUDE; + wcsncpy_s(m_forcedmodulelist, MAXMODULELISTLENGTH, modules, _TRUNCATE); + _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); + if (includeModules) + m_options |= VLD_OPT_MODULE_LIST_INCLUDE; + else + m_options &= ~VLD_OPT_MODULE_LIST_INCLUDE; } bool VisualLeakDetector::GetModulesList(WCHAR *modules, UINT size) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - modules[0] = '\0'; - return true; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + modules[0] = '\0'; + return true; + } - wcsncpy_s(modules, size, m_forcedmodulelist, _TRUNCATE); - return (m_options & VLD_OPT_MODULE_LIST_INCLUDE) > 0; + wcsncpy_s(modules, size, m_forcedmodulelist, _TRUNCATE); + return (m_options & VLD_OPT_MODULE_LIST_INCLUDE) > 0; } void VisualLeakDetector::GetReportFilename(WCHAR *filename) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - m_reportfilepath[0] = '\0'; - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + m_reportfilepath[0] = '\0'; + return; + } - wcsncpy_s(filename, MAX_PATH, m_reportfilepath, _TRUNCATE); + wcsncpy_s(filename, MAX_PATH, m_reportfilepath, _TRUNCATE); } void VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filename) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | - VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits - - m_options |= option_mask & VLD_OPT_REPORT_TO_DEBUGGER; - if ( (option_mask & VLD_OPT_REPORT_TO_FILE) && ( filename != NULL )) - { - wcsncpy_s(m_reportfilepath, MAX_PATH, filename, _TRUNCATE); - m_options |= option_mask & VLD_OPT_REPORT_TO_FILE; - } - m_options |= option_mask & VLD_OPT_REPORT_TO_STDOUT; - m_options |= option_mask & VLD_OPT_UNICODE_REPORT; - - if ((m_options & VLD_OPT_UNICODE_REPORT) && !(m_options & VLD_OPT_REPORT_TO_FILE)) { - // If Unicode report encoding is enabled, then the report needs to be - // sent to a file because the debugger will not display Unicode - // characters, it will display question marks in their place instead. - m_options |= VLD_OPT_REPORT_TO_FILE; - m_status |= VLD_STATUS_FORCE_REPORT_TO_FILE; - } - - if (m_options & VLD_OPT_REPORT_TO_FILE) { - SetupReporting(); - } - else if ( m_reportfile ) { //Close the previous report file if needed. - fclose(m_reportfile); - m_reportfile = NULL; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | + VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits + + m_options |= option_mask & VLD_OPT_REPORT_TO_DEBUGGER; + if ( (option_mask & VLD_OPT_REPORT_TO_FILE) && ( filename != NULL )) + { + wcsncpy_s(m_reportfilepath, MAX_PATH, filename, _TRUNCATE); + m_options |= option_mask & VLD_OPT_REPORT_TO_FILE; + } + m_options |= option_mask & VLD_OPT_REPORT_TO_STDOUT; + m_options |= option_mask & VLD_OPT_UNICODE_REPORT; + + if ((m_options & VLD_OPT_UNICODE_REPORT) && !(m_options & VLD_OPT_REPORT_TO_FILE)) { + // If Unicode report encoding is enabled, then the report needs to be + // sent to a file because the debugger will not display Unicode + // characters, it will display question marks in their place instead. + m_options |= VLD_OPT_REPORT_TO_FILE; + m_status |= VLD_STATUS_FORCE_REPORT_TO_FILE; + } + + if (m_options & VLD_OPT_REPORT_TO_FILE) { + SetupReporting(); + } + else if ( m_reportfile ) { //Close the previous report file if needed. + fclose(m_reportfile); + m_reportfile = NULL; + } } void VisualLeakDetector::SetupReporting() { - WCHAR bom = BOM; // Unicode byte-order mark. - - //Close the previous report file if needed. - if ( m_reportfile ) - fclose(m_reportfile); - - // Reporting to file enabled. - if (m_options & VLD_OPT_UNICODE_REPORT) { - // Unicode data encoding has been enabled. Write the byte-order - // mark before anything else gets written to the file. Open the - // file for binary writing. - if (_wfopen_s(&m_reportfile, m_reportfilepath, L"wb") == EINVAL) { - // Couldn't open the file. - m_reportfile = NULL; - } - else { - fwrite(&bom, sizeof(WCHAR), 1, m_reportfile); - setreportencoding(unicode); - } - } - else { - // Open the file in text mode for ASCII output. - if (_wfopen_s(&m_reportfile, m_reportfilepath, L"w") == EINVAL) { - // Couldn't open the file. - m_reportfile = NULL; - } - else { - setreportencoding(ascii); - } - } - if (m_reportfile == NULL) { - report(L"WARNING: Visual Leak Detector: Couldn't open report file for writing: %s\n" - L" The report will be sent to the debugger instead.\n", m_reportfilepath); - } - else { - // Set the "report" function to write to the file. - setreportfile(m_reportfile, m_options & VLD_OPT_REPORT_TO_DEBUGGER, m_options & VLD_OPT_REPORT_TO_STDOUT); - } + WCHAR bom = BOM; // Unicode byte-order mark. + + //Close the previous report file if needed. + if ( m_reportfile ) + fclose(m_reportfile); + + // Reporting to file enabled. + if (m_options & VLD_OPT_UNICODE_REPORT) { + // Unicode data encoding has been enabled. Write the byte-order + // mark before anything else gets written to the file. Open the + // file for binary writing. + if (_wfopen_s(&m_reportfile, m_reportfilepath, L"wb") == EINVAL) { + // Couldn't open the file. + m_reportfile = NULL; + } + else { + fwrite(&bom, sizeof(WCHAR), 1, m_reportfile); + setreportencoding(unicode); + } + } + else { + // Open the file in text mode for ASCII output. + if (_wfopen_s(&m_reportfile, m_reportfilepath, L"w") == EINVAL) { + // Couldn't open the file. + m_reportfile = NULL; + } + else { + setreportencoding(ascii); + } + } + if (m_reportfile == NULL) { + report(L"WARNING: Visual Leak Detector: Couldn't open report file for writing: %s\n" + L" The report will be sent to the debugger instead.\n", m_reportfilepath); + } + else { + // Set the "report" function to write to the file. + setreportfile(m_reportfile, m_options & VLD_OPT_REPORT_TO_DEBUGGER, m_options & VLD_OPT_REPORT_TO_STDOUT); + } } void VisualLeakDetector::resolveStacks(HANDLE heap) @@ -3477,18 +3603,18 @@ void VisualLeakDetector::ResolveCallstacks() HMODULE VisualLeakDetector::GetSxSModuleHandle(LPCSTR modulenamea) { - HMODULE hDll = NULL; - UINT tablesize = _countof(m_patchtable); - for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &m_patchtable[index]; - if (_stricmp(entry->exportmodulename, modulenamea) == 0) { - hDll = (HMODULE)entry->modulebase; - break; - } - } - - if (hDll == NULL) - hDll = GetModuleHandleA(modulenamea); - - return hDll; + HMODULE hDll = NULL; + UINT tablesize = _countof(m_patchtable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &m_patchtable[index]; + if (_stricmp(entry->exportmodulename, modulenamea) == 0) { + hDll = (HMODULE)entry->modulebase; + break; + } + } + + if (hDll == NULL) + hDll = GetModuleHandleA(modulenamea); + + return hDll; } diff --git a/vld_vs10.sln b/vld_vs10.sln index 362fc73f..6ab0620b 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -53,7 +53,8 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -64,16 +65,18 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 @@ -86,9 +89,10 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 @@ -97,26 +101,30 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vldapi.cpp b/vldapi.cpp index db47ec5c..3354ab59 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -67,6 +67,11 @@ __declspec(dllexport) void VLDReportLeaks () vld.ReportLeaks(); } +__declspec(dllexport) SIZE_T VLDGetLeaksCount (BOOL includingInternal) +{ + return vld.GetLeaksCount(includingInternal); +} + __declspec(dllexport) void VLDRefreshModules() { vld.RefreshModules(); diff --git a/vldint.h b/vldint.h index 98119e0a..1a449fa2 100644 --- a/vldint.h +++ b/vldint.h @@ -125,14 +125,15 @@ typedef Set ModuleSet; // detection status (enabled or disabled) and the address that initiated the // current allocation is stored here. struct tls_t { - context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. - UINT32 flags; // Thread-local status flags: -#define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. -#define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. -#define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. - UINT32 oldflags; // Thread-local status old flags - DWORD threadid; // Thread ID of the thread that owns this TLS structure. - CallStack **ppcallstack; // Memory block callstack pointer. + context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. + UINT32 flags; // Thread-local status flags: +#define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. +#define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. +#define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. + UINT32 oldflags; // Thread-local status old flags + BOOL blockprocessed; // Internal diagnostic feature + DWORD threadid; // Thread ID of the thread that owns this TLS structure. + CallStack** ppcallstack; // Memory block callstack pointer. }; // The TlsSet allows VLD to keep track of all thread local storage structures @@ -215,6 +216,7 @@ class VisualLeakDetector : public IMalloc void GlobalEnableLeakDetection (); VOID RefreshModules(); + SIZE_T GetLeaksCount(BOOL includingInternal); VOID ReportLeaks(); VOID EnableModule(HMODULE module); VOID DisableModule(HMODULE module); @@ -242,6 +244,7 @@ class VisualLeakDetector : public IMalloc VOID mapheap (HANDLE heap); VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); VOID reportconfig (); + SIZE_T getleakscount (HANDLE heap, BOOL includingInternal); VOID reportleaks (HANDLE heap); VOID unmapblock (HANDLE heap, LPCVOID mem); VOID unmapheap (HANDLE heap); From dcff040910287999b4044a5ef257282d9c8f6be7 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 26 Apr 2011 14:56:52 +0000 Subject: [PATCH 064/321] Restore import fixed Realloc callstack fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66209 --- tests/basics/Allocs.cpp | 7 +- tests/basics/basics.cpp | 6 +- tests/basics/basics.vcxproj | 8 +-- tests/basics/stdafx.h | 1 + tests/dynamic_app/LoadTests.cpp | 2 + tests/dynamic_app/dynamic_app.cpp | 13 ++-- tests/dynamic_app/dynamic_app.vcxproj | 8 +-- tests/dynamic_dll/dynamic.vcxproj | 70 ++++++++++++++++++ tests/mfc/mfc.vcxproj | 84 ++++++++++++++++++++++ utility.cpp | 100 +++++++++++++++----------- vld.cpp | 37 ++++++---- vld.h | 4 +- vld.vcxproj | 8 +-- vld_vs10.sln | 16 ++--- vldapi.cpp | 4 +- vldint.h | 4 +- 16 files changed, 281 insertions(+), 91 deletions(-) diff --git a/tests/basics/Allocs.cpp b/tests/basics/Allocs.cpp index 7201497f..ecc27878 100644 --- a/tests/basics/Allocs.cpp +++ b/tests/basics/Allocs.cpp @@ -12,7 +12,7 @@ void AllocF(LeakOption type) if (type == eMalloc) { leaked_memory = (int*)malloc(78); - leaked_memory_dbg = (int*)_malloc_dbg(78, _NORMAL_BLOCK,__FILE__,__LINE__); + leaked_memory_dbg = (int*)_malloc_dbg(80, _NORMAL_BLOCK,__FILE__,__LINE__); } else if (type == eNew) { @@ -22,7 +22,7 @@ void AllocF(LeakOption type) else if (type == eNewArray) { leaked_memory = new int[3]; - leaked_memory_dbg = new (_NORMAL_BLOCK,__FILE__,__LINE__) int[3]; + leaked_memory_dbg = new (_NORMAL_BLOCK,__FILE__,__LINE__) int[4]; // placement new operator int temp[3]; @@ -44,8 +44,7 @@ void AllocF(LeakOption type) else if (type == eCoTaskMem) { void* leaked = CoTaskMemAlloc(7); - void* realloced = NULL; - CoTaskMemRealloc(leaked, 29); + void* realloced = CoTaskMemRealloc(leaked, 29); } } diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 1704183e..463bfa8c 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -23,9 +23,13 @@ void LeakMemory(LeakOption type, int repeat) } // VLD internal API +#ifdef _DEBUG extern "C" { -__declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal); + __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); } +#else +#define VLDGetLeaksCount() 0 +#endif int _tmain(int argc, _TCHAR* argv[]) { diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index 51e95f4f..cd9b9dbf 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -149,16 +149,16 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ Console true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\$(Platform)\Release NotSet 2.1 %(AdditionalDependencies) copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + Copying over Visual Leak Detector Dependencies @@ -195,16 +195,16 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Console true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\$(Platform)\Release NotSet 2.1 %(AdditionalDependencies) copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.pdb $(Outdir)\vld_x64.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + Copying over Visual Leak Detector Dependencies diff --git a/tests/basics/stdafx.h b/tests/basics/stdafx.h index b005a839..686c8f5b 100644 --- a/tests/basics/stdafx.h +++ b/tests/basics/stdafx.h @@ -9,6 +9,7 @@ #include #include +#include diff --git a/tests/dynamic_app/LoadTests.cpp b/tests/dynamic_app/LoadTests.cpp index 223024ab..d40cc438 100644 --- a/tests/dynamic_app/LoadTests.cpp +++ b/tests/dynamic_app/LoadTests.cpp @@ -60,6 +60,8 @@ void RunLoaderTests( bool resolve ) CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings } + UINT leaks = VLDReportLeaks(); + FreeLibrary(hdyn); } } diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 987f3eb6..5116d223 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -29,9 +29,13 @@ void LeakDuplicateLeaks() } // VLD internal API +#ifdef _DEBUG extern "C" { __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); } +#else +#define VLDGetLeaksCount() 0 +#endif int _tmain(int argc, _TCHAR* argv[]) @@ -49,13 +53,14 @@ int _tmain(int argc, _TCHAR* argv[]) } RunLoaderTests(resolve); // leaks 18 - SIZE_T leaks = VLDGetLeaksCount(); + int leaks = (int)VLDGetLeaksCount(); RunMFCLoaderTests(resolve); // leaks 7 - leaks = VLDGetLeaksCount(); + leaks = (int)VLDGetLeaksCount(); LeakDuplicateLeaks(); // leaks 6 - leaks = VLDGetLeaksCount(); + leaks = (int)VLDGetLeaksCount(); // ..................Total: 31 leaks total - return 31 - leaks; + int diff = 31 - leaks; + return diff; } diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index 07bdd8d2..26db4700 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -110,7 +110,6 @@ $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ dynamic - true false @@ -158,16 +157,16 @@ copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\tes Console true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\$(Platform)\Release copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y + Copying over Visual Leak Detector Dependencies @@ -205,11 +204,10 @@ copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\tes Console true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\$(Platform)\Release copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.pdb $(Outdir)\vld_x64.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y diff --git a/tests/dynamic_dll/dynamic.vcxproj b/tests/dynamic_dll/dynamic.vcxproj index f9393bd1..ef28b644 100644 --- a/tests/dynamic_dll/dynamic.vcxproj +++ b/tests/dynamic_dll/dynamic.vcxproj @@ -1,6 +1,14 @@  + + Debug(Release) + Win32 + + + Debug(Release) + x64 + Debug Win32 @@ -30,11 +38,21 @@ true Unicode + + DynamicLibrary + true + Unicode + DynamicLibrary true Unicode + + DynamicLibrary + true + Unicode + DynamicLibrary false @@ -53,9 +71,15 @@ + + + + + + @@ -68,11 +92,21 @@ $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + false $(ProjectDir)$(Platform)\$(Configuration)\ @@ -97,6 +131,20 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + Use @@ -111,6 +159,20 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + Level3 @@ -153,11 +215,17 @@ false + false false + false + + + + false false @@ -168,7 +236,9 @@ Create + Create Create + Create Create Create diff --git a/tests/mfc/mfc.vcxproj b/tests/mfc/mfc.vcxproj index d86acf9b..a6182f51 100644 --- a/tests/mfc/mfc.vcxproj +++ b/tests/mfc/mfc.vcxproj @@ -1,6 +1,14 @@  + + Debug(Release) + Win32 + + + Debug(Release) + x64 + Debug Win32 @@ -30,12 +38,24 @@ Unicode Dynamic + + DynamicLibrary + true + Unicode + Dynamic + DynamicLibrary true Unicode Dynamic + + DynamicLibrary + true + Unicode + Dynamic + DynamicLibrary false @@ -56,9 +76,15 @@ + + + + + + @@ -72,12 +98,24 @@ $(ProjectDir)$(Platform)\$(Configuration)\ test_mfc + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + test_mfc + true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ test_mfc + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + test_mfc + false $(ProjectDir)obj\$(Platform)\$(Configuration)\ @@ -112,6 +150,28 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + Use @@ -134,6 +194,28 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + Level3 @@ -194,7 +276,9 @@ Create + Create Create + Create Create Create diff --git a/utility.cpp b/utility.cpp index 74e248da..a670166b 100644 --- a/utility.cpp +++ b/utility.cpp @@ -661,47 +661,65 @@ VOID report (LPCWSTR format, ...) // VOID restoreimport (HMODULE importmodule, moduleentry_t* module) { - IMAGE_IMPORT_DESCRIPTOR *idte; - - HMODULE exportmodule = (HMODULE)module->modulebase; - LPCSTR exportmodulename = module->exportmodulename; - - idte = findoriginalimportdescriptor(importmodule, exportmodulename); - if (idte == NULL) - return; - - int i = 0; - patchentry_t *entry = module->patchtable; - while(entry->importname) - { - IMAGE_THUNK_DATA *iate; - FARPROC import; - DWORD protect; - - LPCSTR importname = entry->importname; - LPCVOID replacement = entry->replacement; - - // Get the *real* address of the import. - import = GetProcAddress(exportmodule, importname); - assert(import != NULL); // Perhaps the named export module does not actually export the named import? - - // Locate the import's original IAT entry (it currently has the replacement - // address in it). - iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)replacement) { - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the import's real address. Note that the IAT entry may - // be write-protected, so we must first ensure that it is writable. - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)import; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - break; - } - iate++; - } - entry++; i++; - } + HMODULE exportmodule = (HMODULE)module->modulebase; + if (exportmodule == NULL) + return; + + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + __try + { + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + } + __except(1) + { + idte = NULL; + } + LeaveCriticalSection(&imagelock); + + int i = 0; + while (idte->OriginalFirstThunk != 0x0) { + PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); + UNREFERENCED_PARAMETER(name); + + patchentry_t *entry = module->patchtable; + while(entry->importname) + { + LPCSTR importname = entry->importname; + LPCVOID replacement = entry->replacement; + + // Get the *real* address of the import. + FARPROC import = GetProcAddress(exportmodule, importname); + assert(import != NULL); // Perhaps the named export module does not actually export the named import? + + // Locate the import's original IAT entry (it currently has the replacement + // address in it). + IMAGE_THUNK_DATA* iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) { + if (iate->u1.Function == (DWORD_PTR)replacement) { + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the import's real address. Note that the IAT entry may + // be write-protected, so we must first ensure that it is writable. + DWORD protect; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)import; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + break; + } + iate++; + } + entry++; i++; + } + idte++; + } } // restoremodule - Restores all imports listed in the supplied patch table, and diff --git a/vld.cpp b/vld.cpp index 41d5eade..09434a4f 100644 --- a/vld.cpp +++ b/vld.cpp @@ -518,7 +518,7 @@ VisualLeakDetector::~VisualLeakDetector () size_t count; SIZE_T internalleaks = 0; WCHAR leakfilew [MAX_PATH]; - BOOL threadsactive= FALSE; + BOOL threadsactive = FALSE; if (m_status & VLD_STATUS_INSTALLED) { // Detach Visual Leak Detector from all previously attached modules. EnumerateLoadedModulesW64(currentprocess, detachfrommodule, NULL); @@ -1064,14 +1064,13 @@ VOID VisualLeakDetector::configure () // BOOL VisualLeakDetector::enabled () { - tls_t* tls = vld.gettls(); - if (!(m_status & VLD_STATUS_INSTALLED)) { // Memory leak detection is not yet enabled because VLD is still // initializing. return FALSE; } + tls_t* tls = vld.gettls(); if (!(tls->flags & VLD_TLS_DISABLED) && !(tls->flags & VLD_TLS_ENABLED)) { // The enabled/disabled state for the current thread has not been // initialized yet. Use the default state. @@ -1323,7 +1322,8 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S blockinfo_t* info = (*blockit).second; if (info->callstack) { - info->callstack->clear(); + delete info->callstack; + info->callstack = NULL; } if (crtalloc) { @@ -1334,6 +1334,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // Update the block's size. info->size = size; + ppcallstack = &info->callstack; } // reportconfig - Generates a brief report summarizing Visual Leak Detector's @@ -1458,7 +1459,7 @@ SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) // // None. // -VOID VisualLeakDetector::reportleaks (HANDLE heap) +UINT VisualLeakDetector::reportleaks (HANDLE heap) { assert(heap != NULL); @@ -1468,11 +1469,13 @@ VOID VisualLeakDetector::reportleaks (HANDLE heap) if (heapit == m_heapmap->end()) { // Nothing is allocated from this heap. No leaks. LeaveCriticalSection(&m_maplock); - return; + return 0; } heapinfo_t* heapinfo = (*heapit).second; BlockMap* blockmap = &heapinfo->blockmap; + SIZE_T leaksfound = 0; + bool firstleak = (m_leaksfound == 0); for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { @@ -1501,10 +1504,11 @@ VOID VisualLeakDetector::reportleaks (HANDLE heap) } // It looks like a real memory leak. - if (m_leaksfound == 0) { // A confusing way to only display this message once + if (firstleak) { // A confusing way to only display this message once report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); + firstleak = false; } - m_leaksfound++; + leaksfound++; report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialnumber, address, size); if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { // Aggregate all other leaks which are duplicates of this one @@ -1514,7 +1518,7 @@ VOID VisualLeakDetector::reportleaks (HANDLE heap) { // add only the number that were erased, since the 'one left over' // is already recorded as a leak - m_leaksfound += erased; + leaksfound += erased; } DWORD callstackCRC = CalculateCRC32(info->size, info->callstack->getHashValue()); @@ -1540,8 +1544,11 @@ VOID VisualLeakDetector::reportleaks (HANDLE heap) } report(L"\n\n"); } + m_leaksfound += leaksfound; LeaveCriticalSection(&m_maplock); + + return leaksfound; } // unmapblock - Tracks memory blocks that are freed. Unmaps the specified block @@ -2645,6 +2652,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si return block; tls_t* tls = vld.gettls(); + tls->blockprocessed = TRUE; BOOL firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { @@ -2672,7 +2680,6 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si // The module that initiated this allocation is included in leak // detection. Map this block to the specified heap. vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); - tls->blockprocessed = TRUE; if (firstcall) { @@ -2766,6 +2773,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID return newmem; tls_t *tls = vld.gettls(); + tls->blockprocessed = TRUE; BOOL firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { @@ -2800,7 +2808,6 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID // The module that initiated this allocation is included in leak // detection. Remap the block. vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack); - tls->blockprocessed = TRUE; #ifdef _DEBUG if(tls->context.fp != 0) @@ -3230,18 +3237,20 @@ SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) return leaksCount; } -VOID VisualLeakDetector::ReportLeaks( ) +UINT VisualLeakDetector::ReportLeaks( ) { if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. - return; + return 0; } // Generate a memory leak report for each heap in the process. + UINT leaksCount = 0; for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { HANDLE heap = (*heapit).first; - reportleaks(heap); + leaksCount += reportleaks(heap); } + return leaksCount; } void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) diff --git a/vld.h b/vld.h index 61e1bb94..36c9e389 100644 --- a/vld.h +++ b/vld.h @@ -123,7 +123,7 @@ __declspec(dllimport) void VLDGlobalEnable (); // // None. // -__declspec(dllimport) void VLDReportLeaks (); +__declspec(dllimport) UINT VLDReportLeaks (); // VLDRefreshModules - Look for recently loaded DLLs and patch them if necessary. @@ -254,7 +254,7 @@ __declspec(dllexport) void VLDResolveCallstacks(); #define VLDEnable() #define VLDDisable() #define VLDRestore() -#define VLDReportLeaks() +#define VLDReportLeaks() 0 #define VLDRefreshModules() #define VLDEnableModule(a) #define VLDDisableModule(b) diff --git a/vld.vcxproj b/vld.vcxproj index 46546520..b650672f 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -98,8 +98,8 @@ true Use Level4 - EditAndContinue false + EditAndContinue true @@ -130,8 +130,8 @@ true Use Level4 - ProgramDatabase false + EditAndContinue true @@ -165,7 +165,7 @@ false Fast Use - ProgramDatabase + OldStyle true @@ -201,7 +201,7 @@ false Fast Use - ProgramDatabase + OldStyle true diff --git a/vld_vs10.sln b/vld_vs10.sln index 6ab0620b..951abb72 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -89,10 +89,10 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 @@ -113,10 +113,10 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/vldapi.cpp b/vldapi.cpp index 3354ab59..30ec614a 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -62,9 +62,9 @@ __declspec(dllexport) void VLDGlobalEnable () vld.GlobalEnableLeakDetection(); } -__declspec(dllexport) void VLDReportLeaks () +__declspec(dllexport) UINT VLDReportLeaks () { - vld.ReportLeaks(); + return vld.ReportLeaks(); } __declspec(dllexport) SIZE_T VLDGetLeaksCount (BOOL includingInternal) diff --git a/vldint.h b/vldint.h index 1a449fa2..1d1db62e 100644 --- a/vldint.h +++ b/vldint.h @@ -217,7 +217,7 @@ class VisualLeakDetector : public IMalloc VOID RefreshModules(); SIZE_T GetLeaksCount(BOOL includingInternal); - VOID ReportLeaks(); + UINT ReportLeaks(); VOID EnableModule(HMODULE module); VOID DisableModule(HMODULE module); UINT32 GetOptions(); @@ -245,7 +245,7 @@ class VisualLeakDetector : public IMalloc VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); VOID reportconfig (); SIZE_T getleakscount (HANDLE heap, BOOL includingInternal); - VOID reportleaks (HANDLE heap); + UINT reportleaks (HANDLE heap); VOID unmapblock (HANDLE heap, LPCVOID mem); VOID unmapheap (HANDLE heap); void resolveStacks(HANDLE heap); From 2b4e4a568a47532e18ebd15307fd400ff1196fed Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 26 Apr 2011 15:16:29 +0000 Subject: [PATCH 065/321] Minor fix git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66210 --- utility.cpp | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/utility.cpp b/utility.cpp index a670166b..549910bd 100644 --- a/utility.cpp +++ b/utility.cpp @@ -451,8 +451,9 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) LeaveCriticalSection(&imagelock); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). - return NULL; + return FALSE; } + int result = 0; while (idte->FirstThunk != 0x0) { PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); @@ -478,7 +479,7 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) IMAGE_THUNK_DATA *iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); while (iate->u1.Function != 0x0) { - if (iate->u1.Function != (DWORD_PTR)import) + if (iate->u1.Function != (DWORD_PTR)import) { iate++; continue; @@ -684,6 +685,10 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) idte = NULL; } LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return; + } int i = 0; while (idte->OriginalFirstThunk != 0x0) { @@ -703,17 +708,21 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) // Locate the import's original IAT entry (it currently has the replacement // address in it). IMAGE_THUNK_DATA* iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) { - if (iate->u1.Function == (DWORD_PTR)replacement) { - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the import's real address. Note that the IAT entry may - // be write-protected, so we must first ensure that it is writable. - DWORD protect; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)import; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - break; + while (iate->u1.Function != 0x0) + { + if (iate->u1.Function != (DWORD_PTR)replacement) + { + iate++; + continue; } + + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the import's real address. Note that the IAT entry may + // be write-protected, so we must first ensure that it is writable. + DWORD protect; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)import; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); iate++; } entry++; i++; From e5be71839b2f160fe357c9fdae820ea4c1d6cd58 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Tue, 26 Apr 2011 15:50:41 +0000 Subject: [PATCH 066/321] Took out a redudant call to ReportLeaks. Also reset the leak count every time we call ReportLeaks. Also fixed some conversion compiler warnings about converting between an Unsigned Int and a size_t. Also fixed some other minor compiler warnings. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66212 --- tests/dynamic_app/LoadTests.cpp | 2 -- vld.cpp | 10 ++++++---- vld.vcxproj | 2 +- vldint.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/dynamic_app/LoadTests.cpp b/tests/dynamic_app/LoadTests.cpp index d40cc438..223024ab 100644 --- a/tests/dynamic_app/LoadTests.cpp +++ b/tests/dynamic_app/LoadTests.cpp @@ -60,8 +60,6 @@ void RunLoaderTests( bool resolve ) CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings } - UINT leaks = VLDReportLeaks(); - FreeLibrary(hdyn); } } diff --git a/vld.cpp b/vld.cpp index 09434a4f..0665c823 100644 --- a/vld.cpp +++ b/vld.cpp @@ -566,13 +566,14 @@ VisualLeakDetector::~VisualLeakDetector () } else { // Generate a memory leak report for each heap in the process. - ReportLeaks(); + SIZE_T leaks_count = ReportLeaks(); // Show a summary. if (m_leaksfound == 0) { report(L"No memory leaks detected.\n"); } else { + assert(m_leaksfound == leaks_count); report(L"Visual Leak Detector detected %Iu memory leak", m_leaksfound); report((m_leaksfound > 1) ? L"s.\n" : L".\n"); } @@ -1459,7 +1460,7 @@ SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) // // None. // -UINT VisualLeakDetector::reportleaks (HANDLE heap) +SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) { assert(heap != NULL); @@ -3237,7 +3238,7 @@ SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) return leaksCount; } -UINT VisualLeakDetector::ReportLeaks( ) +SIZE_T VisualLeakDetector::ReportLeaks( ) { if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. @@ -3245,7 +3246,8 @@ UINT VisualLeakDetector::ReportLeaks( ) } // Generate a memory leak report for each heap in the process. - UINT leaksCount = 0; + SIZE_T leaksCount = 0; + m_leaksfound = 0; for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { HANDLE heap = (*heapit).first; leaksCount += reportleaks(heap); diff --git a/vld.vcxproj b/vld.vcxproj index b650672f..4fff02cd 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -131,7 +131,7 @@ Use Level4 false - EditAndContinue + ProgramDatabase true diff --git a/vldint.h b/vldint.h index 1d1db62e..e355b691 100644 --- a/vldint.h +++ b/vldint.h @@ -217,7 +217,7 @@ class VisualLeakDetector : public IMalloc VOID RefreshModules(); SIZE_T GetLeaksCount(BOOL includingInternal); - UINT ReportLeaks(); + SIZE_T ReportLeaks(); VOID EnableModule(HMODULE module); VOID DisableModule(HMODULE module); UINT32 GetOptions(); @@ -245,7 +245,7 @@ class VisualLeakDetector : public IMalloc VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); VOID reportconfig (); SIZE_T getleakscount (HANDLE heap, BOOL includingInternal); - UINT reportleaks (HANDLE heap); + SIZE_T reportleaks (HANDLE heap); VOID unmapblock (HANDLE heap, LPCVOID mem); VOID unmapheap (HANDLE heap); void resolveStacks(HANDLE heap); From 51309794262d4972a011a65741ebcb75dcc60978 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Tue, 26 Apr 2011 16:29:06 +0000 Subject: [PATCH 067/321] Fixed an internal memory leak with VLD and resolved strings. Calling VisualLeakDetector::ResolveCallstacks multiple times would leak memory because CallStack::m_Resolved would just get overwritten. So the fix is to simply delete any existing memory that is there, before allocating the memory. I also turned on the code that unloads the MFC dll in the dynamic_app test suite. TESTS: Ran dynamic_app in 32/64 bit: passed Ran test_basics in 32/64 bit: passed Ran testsuite in 32/64 bit: passed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66215 --- callstack.cpp | 5 +++++ tests/dynamic_app/LoadTests.cpp | 19 +++++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 0adbc422..8de08e15 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -337,6 +337,11 @@ void CallStack::Resolve(BOOL showinternalframes) const size_t max_line_length = MAXREPORTLENGTH + 1; m_ResolvedCapacity = m_size * max_line_length; + if (m_Resolved) + { + // Prevent memory from getting leaked + delete [] m_Resolved; + } m_Resolved = new WCHAR[m_ResolvedCapacity]; const size_t allocedBytes = m_ResolvedCapacity * sizeof(WCHAR); ZeroMemory(m_Resolved, allocedBytes); diff --git a/tests/dynamic_app/LoadTests.cpp b/tests/dynamic_app/LoadTests.cpp index 223024ab..c6e0509f 100644 --- a/tests/dynamic_app/LoadTests.cpp +++ b/tests/dynamic_app/LoadTests.cpp @@ -82,7 +82,7 @@ void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function ) } -void RunMFCLoaderTests(bool /*resolve*/) +void RunMFCLoaderTests(bool resolve) { HMODULE hmfcLib = LoadLibrary(_T("test_mfc.dll")); assert(hmfcLib); @@ -94,17 +94,12 @@ void RunMFCLoaderTests(bool /*resolve*/) CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // Leaks 4 CallLibraryMethods(hmfcLib, "MFC_LeakArray"); // leaks 3 - // Attempting to unload an MFC Dll, will introduce a LOT of internal memory leaks inside - // of VLD.h. This only happens in 64 bit only. So until I figure out why this is happening, - // I will simply leak MFC loaded in the process, and also disable resolving the callstacks - // as resolving is only necessary when modules are explicitly unloaded. - - //if (resolve) - //{ - // CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings - //} - // - //FreeLibrary(hmfcLib); + if (resolve) + { + CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings + } + + FreeLibrary(hmfcLib); } } From 66099c441411832b0091f64b3178ced9ced2f878 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 26 Apr 2011 23:21:42 +0000 Subject: [PATCH 068/321] Leaks count fixed with aggregate duplicates and resolve callstack git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66238 --- tests/dynamic_app/dynamic_app.cpp | 20 +++++++++++++++----- vld.cpp | 21 +++++++++++---------- vldapi.cpp | 2 +- vldint.h | 1 + 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 5116d223..0b0375fe 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -2,6 +2,7 @@ // #include "stdafx.h" +#include #include "LoadTests.h" void PrintUsage() @@ -53,14 +54,23 @@ int _tmain(int argc, _TCHAR* argv[]) } RunLoaderTests(resolve); // leaks 18 - int leaks = (int)VLDGetLeaksCount(); + int totalleaks = (int)VLDGetLeaksCount(); + int leaks1 = totalleaks; + assert(leaks1 == 18); + RunMFCLoaderTests(resolve); // leaks 7 - leaks = (int)VLDGetLeaksCount(); + totalleaks = (int)VLDGetLeaksCount(); + int leaks2 = totalleaks - leaks1; + assert(leaks2 == 7); + LeakDuplicateLeaks(); // leaks 6 - leaks = (int)VLDGetLeaksCount(); - // ..................Total: 31 leaks total + int leaks3 = (int)VLDGetLeaksCount(); + leaks3 -= totalleaks; + assert(leaks3 == 6); - int diff = 31 - leaks; + // ..................Total: 31 leaks total + totalleaks = (int)VLDGetLeaksCount(); + int diff = 31 - totalleaks; return diff; } diff --git a/vld.cpp b/vld.cpp index 0665c823..91936c19 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1098,12 +1098,12 @@ BOOL VisualLeakDetector::enabled () // SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) { - SIZE_T erased = 0; blockinfo_t *elementinfo = (*element).second; if (elementinfo->callstack == NULL) - return erased; + return elementinfo->blocks - 1; + SIZE_T erased = 0; // Iterate through all block maps, looking for blocks with the same size // and callstack as the specified element. for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { @@ -1129,7 +1129,9 @@ SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) } } - return erased; + elementinfo->blocks += erased; + + return elementinfo->blocks - 1; } // gettls - Obtains the thread local storage structure for the calling thread. @@ -1194,6 +1196,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c ppcallstack = &blockinfo->callstack; blockinfo->serialnumber = serialnumber++; blockinfo->size = size; + blockinfo->blocks = 1; // Insert the block's information into the block map. EnterCriticalSection(&m_maplock); @@ -1444,7 +1447,7 @@ SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) size = crtheader->size; } - memoryleaks++; + memoryleaks += info->blocks; } LeaveCriticalSection(&m_maplock); @@ -1515,12 +1518,10 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) // Aggregate all other leaks which are duplicates of this one // under this same heading, to cut down on clutter. SIZE_T erased = eraseduplicates(blockit); - if (erased > 1) - { - // add only the number that were erased, since the 'one left over' - // is already recorded as a leak - leaksfound += erased; - } + + // add only the number that were erased, since the 'one left over' + // is already recorded as a leak + leaksfound += erased; DWORD callstackCRC = CalculateCRC32(info->size, info->callstack->getHashValue()); report(L"Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, erased + 1); diff --git a/vldapi.cpp b/vldapi.cpp index 30ec614a..15984fc1 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -64,7 +64,7 @@ __declspec(dllexport) void VLDGlobalEnable () __declspec(dllexport) UINT VLDReportLeaks () { - return vld.ReportLeaks(); + return (UINT)vld.ReportLeaks(); } __declspec(dllexport) SIZE_T VLDGetLeaksCount (BOOL includingInternal) diff --git a/vldint.h b/vldint.h index e355b691..ff57b6f2 100644 --- a/vldint.h +++ b/vldint.h @@ -77,6 +77,7 @@ struct blockinfo_t { CallStack *callstack; SIZE_T serialnumber; SIZE_T size; + SIZE_T blocks; }; // BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. From dc214ac75f9e96ab49848d535c025b8a11278c7a Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Wed, 27 Apr 2011 08:52:25 +0000 Subject: [PATCH 069/321] So the problem was that running Resolve twice on a CallStack pointer would erase the correct results, and provide the wrong module for the stack frame. Fixed by checking if the callstack has already been resolving before attempting to do it. If it has, then simply return early. This test in dynamic_app.exe that calls Resolve twice has been invaluable in shaking out bugs. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66244 --- callstack.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 8de08e15..9089ec3c 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -318,6 +318,13 @@ void CallStack::dump(BOOL showinternalframes) const // void CallStack::Resolve(BOOL showinternalframes) { + if (m_Resolved) + { + // already resolved, no need to do it again + // resolving twice may report an incorrect module for the stack frames + // if the memory was leaked in a dynamic library that was already unloaded. + return; + } if (m_status & CALLSTACK_STATUS_INCOMPLETE) { // This call stack appears to be incomplete. Using StackWalk64 may be // more reliable. @@ -337,11 +344,6 @@ void CallStack::Resolve(BOOL showinternalframes) const size_t max_line_length = MAXREPORTLENGTH + 1; m_ResolvedCapacity = m_size * max_line_length; - if (m_Resolved) - { - // Prevent memory from getting leaked - delete [] m_Resolved; - } m_Resolved = new WCHAR[m_ResolvedCapacity]; const size_t allocedBytes = m_ResolvedCapacity * sizeof(WCHAR); ZeroMemory(m_Resolved, allocedBytes); From 4920096ff1e27a2744ec48287374bc465216ed61 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Wed, 27 Apr 2011 12:24:26 +0000 Subject: [PATCH 070/321] Modified project settings for consistency in testsuite.vcxproj. Also made the application return the difference of the expected and actual memory leaks. This should help in automated testing. Modified basics.cpp to return -1 if it had invalid arguments. This should make it consistent with the other case where it returns early. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66247 --- tests/basics/basics.cpp | 2 +- tests/suite/testsuite.cpp | 15 +++++++++++- tests/suite/testsuite.vcxproj | 44 +++++++++++++++++++++++++++-------- 3 files changed, 49 insertions(+), 12 deletions(-) diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 463bfa8c..2f463ef2 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -91,7 +91,7 @@ int _tmain(int argc, _TCHAR* argv[]) wprintf(_T("Error!: Invalid arguments\n")); PrintUsage(); wprintf(_T("End of test app...\n\n")); - return 0; + return -1; } } diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 3c0ba718..9c18924d 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -91,6 +91,15 @@ __declspec(thread) malloc_t pmalloc = NULL; __declspec(thread) HANDLE threadheap; __declspec(thread) ULONG total_allocs = 0; +// VLD internal API +#ifdef _DEBUG +extern "C" { + __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); +} +#else +#define VLDGetLeaksCount() 0 +#endif + ULONG random (ULONG max) { FLOAT d; @@ -424,5 +433,9 @@ int main (int argc, char *argv []) _snprintf_s(message, MESSAGESIZE, _TRUNCATE, "Elapsed Time = %ums\n", end - start); OutputDebugString(message); - return 0; + int totalleaks = (int)VLDGetLeaksCount(); + int diff = 16 - totalleaks; + assert(diff == 0); + + return diff; } diff --git a/tests/suite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj index 06f94205..63cb32ef 100644 --- a/tests/suite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -84,17 +84,17 @@ <_ProjectFileVersion>10.0.30128.1 $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ MinimumRecommendedRules.ruleset @@ -131,8 +131,8 @@ true - copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y @@ -155,6 +155,12 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ true true + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + @@ -172,6 +178,12 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ $(SolutionDir)\$(Platform)\Release;%(AdditionalLibraryDirectories) true + + copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + @@ -195,8 +207,8 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ - copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.pdb $(Outdir)\vld_x64.pdb /y + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y @@ -223,6 +235,12 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ true MachineX64 + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + @@ -245,6 +263,12 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ MachineX64 true + + copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + From bd405763c3dc0e626e26671b01652a64dd6a0bea Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 27 Apr 2011 16:15:29 +0000 Subject: [PATCH 071/321] assert(tls->blockprocessed) fixed when VLD disabled git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66251 --- utility.cpp | 30 ++++-- vld.cpp | 296 ++++++++++------------------------------------------ vldint.h | 1 + 3 files changed, 78 insertions(+), 249 deletions(-) diff --git a/utility.cpp b/utility.cpp index 549910bd..1b9dd3d0 100644 --- a/utility.cpp +++ b/utility.cpp @@ -479,7 +479,7 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) IMAGE_THUNK_DATA *iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); while (iate->u1.Function != 0x0) { - if (iate->u1.Function != (DWORD_PTR)import) + if (iate->u1.Function != (DWORD_PTR)import) { iate++; continue; @@ -659,10 +659,12 @@ VOID report (LPCWSTR format, ...) // Return Value: // // None. -// +// VOID restoreimport (HMODULE importmodule, moduleentry_t* module) { HMODULE exportmodule = (HMODULE)module->modulebase; + LPCSTR exportmodulename = module->exportmodulename; + UNREFERENCED_PARAMETER(exportmodulename); if (exportmodule == NULL) return; @@ -690,11 +692,13 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) return; } - int i = 0; - while (idte->OriginalFirstThunk != 0x0) { + int result = 0; + while (idte->OriginalFirstThunk != 0x0) + { PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); UNREFERENCED_PARAMETER(name); + int i = 0; patchentry_t *entry = module->patchtable; while(entry->importname) { @@ -716,13 +720,17 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) continue; } - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the import's real address. Note that the IAT entry may - // be write-protected, so we must first ensure that it is writable. - DWORD protect; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)import; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + if (iate->u1.Function != (DWORD_PTR)import) + { + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the import's real address. Note that the IAT entry may + // be write-protected, so we must first ensure that it is writable. + DWORD protect; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)import; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + } + result++; iate++; } entry++; i++; diff --git a/vld.cpp b/vld.cpp index 91936c19..3cb2d0ff 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1751,6 +1751,18 @@ BOOL VisualLeakDetector::detachfrommodule (PCWSTR /*modulepath*/, DWORD64 module return TRUE; } +void VisualLeakDetector::firstalloccall(tls_t * tls) +{ + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; +} //////////////////////////////////////////////////////////////////////////////// // @@ -1787,32 +1799,20 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // malloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - tls->blockprocessed = FALSE; - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = pcalloc(num, size); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -1838,32 +1838,20 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t // malloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - tls->blockprocessed = FALSE; - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pmalloc(size); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -1888,32 +1876,20 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) // The new operator is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - tls->blockprocessed = FALSE; - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = pnew(size); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -1944,32 +1920,20 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // realloc is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - tls->blockprocessed = FALSE; - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. block = prealloc(mem, size); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -2019,32 +1983,20 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // _malloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - tls->blockprocessed = FALSE; - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = p_calloc_dbg(num, size, type, file, line); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -2083,32 +2035,20 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // _malloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - tls->blockprocessed = FALSE; - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = p_malloc_dbg(size, type, file, line); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -2147,32 +2087,20 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // The debug new operator is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - tls->blockprocessed = FALSE; - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg_crt(size, type, file, line); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -2209,32 +2137,19 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, void *block; tls_t *tls = vld.gettls(); - tls->blockprocessed = FALSE; - - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg(size, type, file, line); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -2268,32 +2183,19 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, void *block; tls_t *tls = vld.gettls(); - tls->blockprocessed = FALSE; - - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pnew_dbg_mfc(size, file, line); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -2335,32 +2237,20 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // _realloc_dbg is a CRT function and allocates from the CRT heap. tls->flags |= VLD_TLS_CRTALLOC; - tls->blockprocessed = FALSE; - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. block = p_realloc_dbg(mem, size, type, file, line); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -2655,7 +2545,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si tls_t* tls = vld.gettls(); tls->blockprocessed = TRUE; - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { // This is the first call to enter VLD for the current allocation. @@ -2684,17 +2574,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -2776,7 +2656,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID tls_t *tls = vld.gettls(); tls->blockprocessed = TRUE; - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { // This is the first call to enter VLD for the current allocation. @@ -2820,16 +2700,8 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID if (firstcall) { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. + firstalloccall(tls); tls->ppcallstack = NULL; - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; } return newmem; @@ -2911,14 +2783,13 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) HMODULE ole32; tls_t *tls = vld.gettls(); - tls->blockprocessed = FALSE; - - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); tls->context = context; + tls->blockprocessed = FALSE; } if (pCoTaskMemAlloc == NULL) { @@ -2931,20 +2802,8 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pCoTaskMemAlloc(size); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -2971,14 +2830,13 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) HMODULE ole32; tls_t *tls = vld.gettls(); - tls->blockprocessed = FALSE; - - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); tls->context = context; + tls->blockprocessed = FALSE; } if (pCoTaskMemRealloc == NULL) { @@ -2991,20 +2849,8 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) // Do the allocation. The block will be mapped by _RtlReAllocateHeap. block = pCoTaskMemRealloc(mem, size); - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -3045,34 +2891,21 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) context_t context; tls_t *tls = vld.gettls(); - tls->blockprocessed = FALSE; - - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. assert(m_imalloc != NULL); block = (m_imalloc) ? m_imalloc->Alloc(size) : NULL; - assert(tls->blockprocessed); - if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } @@ -3177,34 +3010,21 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) context_t context; tls_t *tls = vld.gettls(); - tls->blockprocessed = FALSE; - - BOOL firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. CAPTURE_CONTEXT(context); tls->context = context; + tls->blockprocessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. assert(m_imalloc != NULL); block = (m_imalloc) ? m_imalloc->Realloc(mem, size) : NULL; - - assert(tls->blockprocessed); if (firstcall) - { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - } + firstalloccall(tls); return block; } diff --git a/vldint.h b/vldint.h index ff57b6f2..4710884a 100644 --- a/vldint.h +++ b/vldint.h @@ -258,6 +258,7 @@ class VisualLeakDetector : public IMalloc // Utils static BOOL IsModuleExcluded (UINT_PTR returnaddress); static void getcallstack( CallStack **&ppcallstack, context_t &context ); + static inline void firstalloccall(tls_t * tls); void SetupReporting(); //////////////////////////////////////////////////////////////////////////////// From 5c3fffcf05f1ebf29ebd47401d12cd47dfc81e71 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 27 Apr 2011 17:01:37 +0000 Subject: [PATCH 072/321] Rare crash at exit on some platforms fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66252 --- vld.cpp | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++-- vld.vcxproj | 7 ++- vldint.h | 10 ++-- 3 files changed, 135 insertions(+), 10 deletions(-) diff --git a/vld.cpp b/vld.cpp index 3cb2d0ff..60969f53 100644 --- a/vld.cpp +++ b/vld.cpp @@ -72,11 +72,11 @@ patchentry_t VisualLeakDetector::m_kernelbasePatch [] = { }; patchentry_t VisualLeakDetector::m_kernel32Patch [] = { - "HeapAlloc", _RtlAllocateHeap, + "HeapAlloc", _HeapAlloc, "HeapCreate", _HeapCreate, "HeapDestroy", _HeapDestroy, - "HeapFree", _RtlFreeHeap, - "HeapReAlloc", _RtlReAllocateHeap, + "HeapFree", _HeapFree, + "HeapReAlloc", _HeapReAlloc, NULL, NULL }; @@ -2579,6 +2579,51 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si return block; } +// for kernel32.dll +LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) +{ + // Allocate the block. + LPVOID block = RtlAllocateHeap(heap, flags, size); + + if ((block == NULL) || !vld.enabled()) + return block; + + tls_t* tls = vld.gettls(); + tls->blockprocessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; + + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + tls->context = context; + + BOOL crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + + // The module that initiated this allocation is included in leak + // detection. Map this block to the specified heap. + vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); + + if (firstcall) + firstalloccall(tls); + + return block; +} + // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. // This function calls VLD's free tracking function and then invokes the real // RtlFreeHeap. Pretty much all memory frees will eventually result in a call @@ -2606,6 +2651,19 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) return status; } +// for kernel32.dll +BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) +{ + BOOL status; + + // Unmap the block from the specified heap. + vld.unmapblock(heap, mem); + + status = RtlFreeHeap(heap, flags, mem); + + return status; +} + // Find the information for the module that initiated this reallocation. BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) { @@ -2707,6 +2765,70 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID return newmem; } +// for kernel32.dll +LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) +{ + LPVOID newmem; + + // Reallocate the block. + newmem = RtlReAllocateHeap(heap, flags, mem, size); + if (newmem == NULL) + return newmem; + + tls_t *tls = vld.gettls(); + tls->blockprocessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return newmem; + + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + BOOL crtalloc; + crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + + // Reset thread local flags and variables, in case any libraries called + // into while remapping the block allocate some memory. + tls->context.fp = 0x0; + if (crtalloc) + tls->flags |= VLD_TLS_CRTALLOC; + else + tls->flags &=~VLD_TLS_CRTALLOC; + + // The module that initiated this allocation is included in leak + // detection. Remap the block. + vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack); + +#ifdef _DEBUG + if(tls->context.fp != 0) + __debugbreak(); +#endif + tls->context = context; + tls->flags |= crtalloc; + + if (firstcall) + { + firstalloccall(tls); + tls->ppcallstack = NULL; + } + + return newmem; +} + + //////////////////////////////////////////////////////////////////////////////// // // COM IAT Replacement Functions diff --git a/vld.vcxproj b/vld.vcxproj index 4fff02cd..d74e0a2e 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -95,7 +95,6 @@ WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug - true Use Level4 false @@ -127,7 +126,6 @@ WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug - true Use Level4 false @@ -166,7 +164,7 @@ Fast Use OldStyle - true + false true @@ -202,7 +200,8 @@ Fast Use OldStyle - true + false + false true diff --git a/vldint.h b/vldint.h index 4710884a..59b7c2a5 100644 --- a/vldint.h +++ b/vldint.h @@ -270,12 +270,16 @@ class VisualLeakDetector : public IMalloc //////////////////////////////////////////////////////////////////////////////// // Win32 IAT replacement functions static FARPROC __stdcall _GetProcAddress (HMODULE module, LPCSTR procname); - static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); - static BOOL __stdcall _HeapDestroy (HANDLE heap); static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, PHANDLE modulehandle); - static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); + static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); + static BOOL __stdcall _HeapDestroy (HANDLE heap); + static LPVOID __stdcall _HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size); + static BOOL __stdcall _HeapFree (HANDLE heap, DWORD flags, LPVOID mem); + static LPVOID __stdcall _HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); + + static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); From 0529154cb87056f936e007fd08070f7870e229c0 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 29 Apr 2011 00:56:39 +0000 Subject: [PATCH 073/321] 45 seconds is too short a time to wait for 64 threads to finish in the unit test. Increasing the timeout value to Infinite for the multi-threaded test. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66318 --- tests/suite/testsuite.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 9c18924d..2a423bc4 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -392,7 +392,7 @@ int main (int argc, char *argv []) // Wait for all threads to terminate. BOOL wait_for_all = TRUE; - DWORD result = WaitForMultipleObjects(NUMTHREADS, threads, wait_for_all, 45*1000); + DWORD result = WaitForMultipleObjects(NUMTHREADS, threads, wait_for_all, INFINITE); switch (result) { case WAIT_OBJECT_0: From b8f060d14940cdcdb7d7d631045ddd8cc1b9d289 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 29 Apr 2011 00:57:34 +0000 Subject: [PATCH 074/321] Renaming the project to make it more explicit that this is a DLL project, not a console application. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66319 --- tests/{mfc => mfc_dll}/Resource.h | 0 tests/{mfc => mfc_dll}/mfc.cpp | 0 tests/{mfc => mfc_dll}/mfc.def | 0 tests/{mfc => mfc_dll}/mfc.h | 0 tests/{mfc => mfc_dll}/mfc.rc | Bin tests/{mfc => mfc_dll}/mfc.vcxproj | 0 tests/{mfc => mfc_dll}/mfc.vcxproj.filters | 0 tests/{mfc => mfc_dll}/res/mfc.rc2 | Bin tests/{mfc => mfc_dll}/stdafx.cpp | 0 tests/{mfc => mfc_dll}/stdafx.h | 0 tests/{mfc => mfc_dll}/targetver.h | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename tests/{mfc => mfc_dll}/Resource.h (100%) rename tests/{mfc => mfc_dll}/mfc.cpp (100%) rename tests/{mfc => mfc_dll}/mfc.def (100%) rename tests/{mfc => mfc_dll}/mfc.h (100%) rename tests/{mfc => mfc_dll}/mfc.rc (100%) rename tests/{mfc => mfc_dll}/mfc.vcxproj (100%) rename tests/{mfc => mfc_dll}/mfc.vcxproj.filters (100%) rename tests/{mfc => mfc_dll}/res/mfc.rc2 (100%) rename tests/{mfc => mfc_dll}/stdafx.cpp (100%) rename tests/{mfc => mfc_dll}/stdafx.h (100%) rename tests/{mfc => mfc_dll}/targetver.h (100%) diff --git a/tests/mfc/Resource.h b/tests/mfc_dll/Resource.h similarity index 100% rename from tests/mfc/Resource.h rename to tests/mfc_dll/Resource.h diff --git a/tests/mfc/mfc.cpp b/tests/mfc_dll/mfc.cpp similarity index 100% rename from tests/mfc/mfc.cpp rename to tests/mfc_dll/mfc.cpp diff --git a/tests/mfc/mfc.def b/tests/mfc_dll/mfc.def similarity index 100% rename from tests/mfc/mfc.def rename to tests/mfc_dll/mfc.def diff --git a/tests/mfc/mfc.h b/tests/mfc_dll/mfc.h similarity index 100% rename from tests/mfc/mfc.h rename to tests/mfc_dll/mfc.h diff --git a/tests/mfc/mfc.rc b/tests/mfc_dll/mfc.rc similarity index 100% rename from tests/mfc/mfc.rc rename to tests/mfc_dll/mfc.rc diff --git a/tests/mfc/mfc.vcxproj b/tests/mfc_dll/mfc.vcxproj similarity index 100% rename from tests/mfc/mfc.vcxproj rename to tests/mfc_dll/mfc.vcxproj diff --git a/tests/mfc/mfc.vcxproj.filters b/tests/mfc_dll/mfc.vcxproj.filters similarity index 100% rename from tests/mfc/mfc.vcxproj.filters rename to tests/mfc_dll/mfc.vcxproj.filters diff --git a/tests/mfc/res/mfc.rc2 b/tests/mfc_dll/res/mfc.rc2 similarity index 100% rename from tests/mfc/res/mfc.rc2 rename to tests/mfc_dll/res/mfc.rc2 diff --git a/tests/mfc/stdafx.cpp b/tests/mfc_dll/stdafx.cpp similarity index 100% rename from tests/mfc/stdafx.cpp rename to tests/mfc_dll/stdafx.cpp diff --git a/tests/mfc/stdafx.h b/tests/mfc_dll/stdafx.h similarity index 100% rename from tests/mfc/stdafx.h rename to tests/mfc_dll/stdafx.h diff --git a/tests/mfc/targetver.h b/tests/mfc_dll/targetver.h similarity index 100% rename from tests/mfc/targetver.h rename to tests/mfc_dll/targetver.h From a21525760dbe7175e7b1b1b17a41c63c00d7cac5 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 29 Apr 2011 01:01:22 +0000 Subject: [PATCH 075/321] Moving the two MFC test apps to the tests folder. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66320 --- {mfc => tests/mfc}/README.txt | 0 {mfc => tests/mfc}/StdAfx.cpp | 0 {mfc => tests/mfc}/StdAfx.h | 0 {mfc => tests/mfc}/res/vldmfc.ico | Bin {mfc => tests/mfc}/res/vldmfc.rc2 | 0 {mfc => tests/mfc}/resource.h | 0 {mfc => tests/mfc}/vldmfc.cpp | 0 {mfc => tests/mfc}/vldmfc.h | 0 {mfc => tests/mfc}/vldmfc.rc | 0 {mfc => tests/mfc}/vldmfc.sln | 0 {mfc => tests/mfc}/vldmfc.vcproj | 0 {mfc => tests/mfc}/vldmfc.vcxproj | 0 {mfc => tests/mfc}/vldmfc.vcxproj.filters | 0 {mfc => tests/mfc}/vldmfc_vs10.sln | 0 {mfc => tests/mfc}/vldmfcdlg.cpp | 0 {mfc => tests/mfc}/vldmfcdlg.h | 0 {mfc_detect => tests/mfc_detect}/StdAfx.cpp | 0 {mfc_detect => tests/mfc_detect}/StdAfx.h | 0 {mfc_detect => tests/mfc_detect}/res/vldmfc.ico | Bin {mfc_detect => tests/mfc_detect}/res/vldmfc.rc2 | 0 {mfc_detect => tests/mfc_detect}/resource.h | 0 {mfc_detect => tests/mfc_detect}/vldmfc.cpp | 0 {mfc_detect => tests/mfc_detect}/vldmfc.h | 0 {mfc_detect => tests/mfc_detect}/vldmfc.rc | 0 {mfc_detect => tests/mfc_detect}/vldmfc_detect.sln | 0 .../mfc_detect}/vldmfc_detect.vcproj | 0 .../mfc_detect}/vldmfc_detect.vcxproj | 0 .../mfc_detect}/vldmfc_detect.vcxproj.filters | 0 .../mfc_detect}/vldmfc_detect_vs08.sln | 0 .../mfc_detect}/vldmfc_detect_vs08.vcproj | 0 .../mfc_detect}/vldmfc_detect_vs10.sln | 0 31 files changed, 0 insertions(+), 0 deletions(-) rename {mfc => tests/mfc}/README.txt (100%) rename {mfc => tests/mfc}/StdAfx.cpp (100%) rename {mfc => tests/mfc}/StdAfx.h (100%) rename {mfc => tests/mfc}/res/vldmfc.ico (100%) rename {mfc => tests/mfc}/res/vldmfc.rc2 (100%) rename {mfc => tests/mfc}/resource.h (100%) rename {mfc => tests/mfc}/vldmfc.cpp (100%) rename {mfc => tests/mfc}/vldmfc.h (100%) rename {mfc => tests/mfc}/vldmfc.rc (100%) rename {mfc => tests/mfc}/vldmfc.sln (100%) mode change 100755 => 100644 rename {mfc => tests/mfc}/vldmfc.vcproj (100%) mode change 100755 => 100644 rename {mfc => tests/mfc}/vldmfc.vcxproj (100%) rename {mfc => tests/mfc}/vldmfc.vcxproj.filters (100%) rename {mfc => tests/mfc}/vldmfc_vs10.sln (100%) rename {mfc => tests/mfc}/vldmfcdlg.cpp (100%) rename {mfc => tests/mfc}/vldmfcdlg.h (100%) rename {mfc_detect => tests/mfc_detect}/StdAfx.cpp (100%) rename {mfc_detect => tests/mfc_detect}/StdAfx.h (100%) rename {mfc_detect => tests/mfc_detect}/res/vldmfc.ico (100%) rename {mfc_detect => tests/mfc_detect}/res/vldmfc.rc2 (100%) rename {mfc_detect => tests/mfc_detect}/resource.h (100%) rename {mfc_detect => tests/mfc_detect}/vldmfc.cpp (100%) rename {mfc_detect => tests/mfc_detect}/vldmfc.h (100%) rename {mfc_detect => tests/mfc_detect}/vldmfc.rc (100%) rename {mfc_detect => tests/mfc_detect}/vldmfc_detect.sln (100%) rename {mfc_detect => tests/mfc_detect}/vldmfc_detect.vcproj (100%) rename {mfc_detect => tests/mfc_detect}/vldmfc_detect.vcxproj (100%) rename {mfc_detect => tests/mfc_detect}/vldmfc_detect.vcxproj.filters (100%) rename {mfc_detect => tests/mfc_detect}/vldmfc_detect_vs08.sln (100%) rename {mfc_detect => tests/mfc_detect}/vldmfc_detect_vs08.vcproj (100%) rename {mfc_detect => tests/mfc_detect}/vldmfc_detect_vs10.sln (100%) diff --git a/mfc/README.txt b/tests/mfc/README.txt similarity index 100% rename from mfc/README.txt rename to tests/mfc/README.txt diff --git a/mfc/StdAfx.cpp b/tests/mfc/StdAfx.cpp similarity index 100% rename from mfc/StdAfx.cpp rename to tests/mfc/StdAfx.cpp diff --git a/mfc/StdAfx.h b/tests/mfc/StdAfx.h similarity index 100% rename from mfc/StdAfx.h rename to tests/mfc/StdAfx.h diff --git a/mfc/res/vldmfc.ico b/tests/mfc/res/vldmfc.ico similarity index 100% rename from mfc/res/vldmfc.ico rename to tests/mfc/res/vldmfc.ico diff --git a/mfc/res/vldmfc.rc2 b/tests/mfc/res/vldmfc.rc2 similarity index 100% rename from mfc/res/vldmfc.rc2 rename to tests/mfc/res/vldmfc.rc2 diff --git a/mfc/resource.h b/tests/mfc/resource.h similarity index 100% rename from mfc/resource.h rename to tests/mfc/resource.h diff --git a/mfc/vldmfc.cpp b/tests/mfc/vldmfc.cpp similarity index 100% rename from mfc/vldmfc.cpp rename to tests/mfc/vldmfc.cpp diff --git a/mfc/vldmfc.h b/tests/mfc/vldmfc.h similarity index 100% rename from mfc/vldmfc.h rename to tests/mfc/vldmfc.h diff --git a/mfc/vldmfc.rc b/tests/mfc/vldmfc.rc similarity index 100% rename from mfc/vldmfc.rc rename to tests/mfc/vldmfc.rc diff --git a/mfc/vldmfc.sln b/tests/mfc/vldmfc.sln old mode 100755 new mode 100644 similarity index 100% rename from mfc/vldmfc.sln rename to tests/mfc/vldmfc.sln diff --git a/mfc/vldmfc.vcproj b/tests/mfc/vldmfc.vcproj old mode 100755 new mode 100644 similarity index 100% rename from mfc/vldmfc.vcproj rename to tests/mfc/vldmfc.vcproj diff --git a/mfc/vldmfc.vcxproj b/tests/mfc/vldmfc.vcxproj similarity index 100% rename from mfc/vldmfc.vcxproj rename to tests/mfc/vldmfc.vcxproj diff --git a/mfc/vldmfc.vcxproj.filters b/tests/mfc/vldmfc.vcxproj.filters similarity index 100% rename from mfc/vldmfc.vcxproj.filters rename to tests/mfc/vldmfc.vcxproj.filters diff --git a/mfc/vldmfc_vs10.sln b/tests/mfc/vldmfc_vs10.sln similarity index 100% rename from mfc/vldmfc_vs10.sln rename to tests/mfc/vldmfc_vs10.sln diff --git a/mfc/vldmfcdlg.cpp b/tests/mfc/vldmfcdlg.cpp similarity index 100% rename from mfc/vldmfcdlg.cpp rename to tests/mfc/vldmfcdlg.cpp diff --git a/mfc/vldmfcdlg.h b/tests/mfc/vldmfcdlg.h similarity index 100% rename from mfc/vldmfcdlg.h rename to tests/mfc/vldmfcdlg.h diff --git a/mfc_detect/StdAfx.cpp b/tests/mfc_detect/StdAfx.cpp similarity index 100% rename from mfc_detect/StdAfx.cpp rename to tests/mfc_detect/StdAfx.cpp diff --git a/mfc_detect/StdAfx.h b/tests/mfc_detect/StdAfx.h similarity index 100% rename from mfc_detect/StdAfx.h rename to tests/mfc_detect/StdAfx.h diff --git a/mfc_detect/res/vldmfc.ico b/tests/mfc_detect/res/vldmfc.ico similarity index 100% rename from mfc_detect/res/vldmfc.ico rename to tests/mfc_detect/res/vldmfc.ico diff --git a/mfc_detect/res/vldmfc.rc2 b/tests/mfc_detect/res/vldmfc.rc2 similarity index 100% rename from mfc_detect/res/vldmfc.rc2 rename to tests/mfc_detect/res/vldmfc.rc2 diff --git a/mfc_detect/resource.h b/tests/mfc_detect/resource.h similarity index 100% rename from mfc_detect/resource.h rename to tests/mfc_detect/resource.h diff --git a/mfc_detect/vldmfc.cpp b/tests/mfc_detect/vldmfc.cpp similarity index 100% rename from mfc_detect/vldmfc.cpp rename to tests/mfc_detect/vldmfc.cpp diff --git a/mfc_detect/vldmfc.h b/tests/mfc_detect/vldmfc.h similarity index 100% rename from mfc_detect/vldmfc.h rename to tests/mfc_detect/vldmfc.h diff --git a/mfc_detect/vldmfc.rc b/tests/mfc_detect/vldmfc.rc similarity index 100% rename from mfc_detect/vldmfc.rc rename to tests/mfc_detect/vldmfc.rc diff --git a/mfc_detect/vldmfc_detect.sln b/tests/mfc_detect/vldmfc_detect.sln similarity index 100% rename from mfc_detect/vldmfc_detect.sln rename to tests/mfc_detect/vldmfc_detect.sln diff --git a/mfc_detect/vldmfc_detect.vcproj b/tests/mfc_detect/vldmfc_detect.vcproj similarity index 100% rename from mfc_detect/vldmfc_detect.vcproj rename to tests/mfc_detect/vldmfc_detect.vcproj diff --git a/mfc_detect/vldmfc_detect.vcxproj b/tests/mfc_detect/vldmfc_detect.vcxproj similarity index 100% rename from mfc_detect/vldmfc_detect.vcxproj rename to tests/mfc_detect/vldmfc_detect.vcxproj diff --git a/mfc_detect/vldmfc_detect.vcxproj.filters b/tests/mfc_detect/vldmfc_detect.vcxproj.filters similarity index 100% rename from mfc_detect/vldmfc_detect.vcxproj.filters rename to tests/mfc_detect/vldmfc_detect.vcxproj.filters diff --git a/mfc_detect/vldmfc_detect_vs08.sln b/tests/mfc_detect/vldmfc_detect_vs08.sln similarity index 100% rename from mfc_detect/vldmfc_detect_vs08.sln rename to tests/mfc_detect/vldmfc_detect_vs08.sln diff --git a/mfc_detect/vldmfc_detect_vs08.vcproj b/tests/mfc_detect/vldmfc_detect_vs08.vcproj similarity index 100% rename from mfc_detect/vldmfc_detect_vs08.vcproj rename to tests/mfc_detect/vldmfc_detect_vs08.vcproj diff --git a/mfc_detect/vldmfc_detect_vs10.sln b/tests/mfc_detect/vldmfc_detect_vs10.sln similarity index 100% rename from mfc_detect/vldmfc_detect_vs10.sln rename to tests/mfc_detect/vldmfc_detect_vs10.sln From f708be7f176091cb957d55dbe41bf3a297031702 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 29 Apr 2011 01:02:33 +0000 Subject: [PATCH 076/321] Moving the last native console app test to the tests folder. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66321 --- {console => tests/console}/README.txt | 0 {console => tests/console}/main.c | 0 {console => tests/console}/main.cpp | 0 {console => tests/console}/vldconsole.sln | 0 {console => tests/console}/vldconsole.vcproj | 0 {console => tests/console}/vldconsole.vcxproj | 0 {console => tests/console}/vldconsole.vcxproj.filters | 0 {console => tests/console}/vldconsole_vs10.sln | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename {console => tests/console}/README.txt (100%) rename {console => tests/console}/main.c (100%) rename {console => tests/console}/main.cpp (100%) rename {console => tests/console}/vldconsole.sln (100%) mode change 100755 => 100644 rename {console => tests/console}/vldconsole.vcproj (100%) mode change 100755 => 100644 rename {console => tests/console}/vldconsole.vcxproj (100%) rename {console => tests/console}/vldconsole.vcxproj.filters (100%) rename {console => tests/console}/vldconsole_vs10.sln (100%) diff --git a/console/README.txt b/tests/console/README.txt similarity index 100% rename from console/README.txt rename to tests/console/README.txt diff --git a/console/main.c b/tests/console/main.c similarity index 100% rename from console/main.c rename to tests/console/main.c diff --git a/console/main.cpp b/tests/console/main.cpp similarity index 100% rename from console/main.cpp rename to tests/console/main.cpp diff --git a/console/vldconsole.sln b/tests/console/vldconsole.sln old mode 100755 new mode 100644 similarity index 100% rename from console/vldconsole.sln rename to tests/console/vldconsole.sln diff --git a/console/vldconsole.vcproj b/tests/console/vldconsole.vcproj old mode 100755 new mode 100644 similarity index 100% rename from console/vldconsole.vcproj rename to tests/console/vldconsole.vcproj diff --git a/console/vldconsole.vcxproj b/tests/console/vldconsole.vcxproj similarity index 100% rename from console/vldconsole.vcxproj rename to tests/console/vldconsole.vcxproj diff --git a/console/vldconsole.vcxproj.filters b/tests/console/vldconsole.vcxproj.filters similarity index 100% rename from console/vldconsole.vcxproj.filters rename to tests/console/vldconsole.vcxproj.filters diff --git a/console/vldconsole_vs10.sln b/tests/console/vldconsole_vs10.sln similarity index 100% rename from console/vldconsole_vs10.sln rename to tests/console/vldconsole_vs10.sln From 7081b245f176a548fb78864e51a6ffe2f0fbb395 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 29 Apr 2011 18:17:32 +0000 Subject: [PATCH 077/321] Fixing up solution file to include the newly renamed mfc_dll project. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66338 --- vld_vs10.sln | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vld_vs10.sln b/vld_vs10.sln index 951abb72..e0d107fd 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -24,7 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "tests\dynami {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfc", "tests\mfc\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution From 5d825fd1d0b3c4257de3878601e20815e682e807 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Sat, 30 Apr 2011 11:14:03 +0000 Subject: [PATCH 078/321] A little clean up of the unit tests. Added the already existing vldmfc application to the test folder in visual studio. Ran all the tests before submitting. testsuite.exe is still broken, and still throwing an assert during execution. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66359 --- tests/basics/basics.vcxproj | 10 +-- tests/dynamic_app/dynamic_app.vcxproj | 8 +-- tests/mfc/vldmfc.cpp | 2 +- tests/mfc/vldmfc.vcxproj | 56 +++++++++++----- vld_vs10.sln | 97 +++++++++++++++++++++++++++ 5 files changed, 148 insertions(+), 25 deletions(-) diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index cd9b9dbf..c86c0e51 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -92,28 +92,30 @@ false $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ false $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ false $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ false $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index 26db4700..7ca6ac7f 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -143,7 +143,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y @@ -165,7 +165,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y Copying over Visual Leak Detector Dependencies @@ -189,7 +189,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y Copying over Visual Leak Detector Dependencies @@ -212,7 +212,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y Copying over Visual Leak Detector Dependencies diff --git a/tests/mfc/vldmfc.cpp b/tests/mfc/vldmfc.cpp index 28952240..1565b50f 100644 --- a/tests/mfc/vldmfc.cpp +++ b/tests/mfc/vldmfc.cpp @@ -48,7 +48,7 @@ BOOL CMFCExampleApp::InitInstance() CMFCExampleDlg dlg; m_pMainWnd = &dlg; - int nResponse = dlg.DoModal(); + INT_PTR nResponse = dlg.DoModal(); if (nResponse == IDOK) { // TODO: Place code here to handle when the dialog is diff --git a/tests/mfc/vldmfc.vcxproj b/tests/mfc/vldmfc.vcxproj index fdf1e3c3..34c09f3d 100644 --- a/tests/mfc/vldmfc.vcxproj +++ b/tests/mfc/vldmfc.vcxproj @@ -65,16 +65,16 @@ <_ProjectFileVersion>10.0.30128.1 - ..\$(PlatformName)\$(Configuration)\ - ..\$(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ false false - ..\$(PlatformName)\$(Configuration)\ - ..\$(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ true true AllRules.ruleset @@ -103,7 +103,7 @@ MaxSpeed OnlyExplicitInline - ..\;%(AdditionalIncludeDirectories) + ..\..\;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -124,7 +124,7 @@ $(OutDir)\vldmfc.exe true - ..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) .\Release/vldmfc.pdb Windows false @@ -136,6 +136,12 @@ true .\Release/vldmfc.bsc + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest + @@ -149,7 +155,7 @@ MaxSpeed OnlyExplicitInline - ..\;%(AdditionalIncludeDirectories) + ..\..\;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +176,7 @@ $(OutDir)\vldmfc.exe true - ..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) .\Release/vldmfc.pdb Windows false @@ -181,6 +187,12 @@ true .\Release/vldmfc.bsc + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest + @@ -194,7 +206,7 @@ Disabled - ..\;%(AdditionalIncludeDirectories) + ..\..\;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -216,7 +228,7 @@ $(OutDir)\vldmfc.exe true - ..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) true .\Debug/vldmfc.pdb Windows @@ -229,6 +241,12 @@ true .\Debug/vldmfc.bsc + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest + @@ -241,7 +259,7 @@ Disabled - ..\;%(AdditionalIncludeDirectories) + ..\..\;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -262,7 +280,7 @@ $(OutDir)\vldmfc.exe true - ..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) true .\Debug/vldmfc.pdb Windows @@ -274,6 +292,12 @@ true .\Debug/vldmfc.bsc + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest + diff --git a/vld_vs10.sln b/vld_vs10.sln index e0d107fd..097022f7 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -26,6 +26,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "tests\dynami EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 5 @@ -45,6 +47,12 @@ Global SccLocalPath4 = VLDPackage EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution + C Debug|Win32 = C Debug|Win32 + C Debug|x64 = C Debug|x64 + CPP Debug|Win32 = CPP Debug|Win32 + CPP Debug|x64 = CPP Debug|x64 + Debug (Unicode)|Win32 = Debug (Unicode)|Win32 + Debug (Unicode)|x64 = Debug (Unicode)|x64 Debug(Release)|Win32 = Debug(Release)|Win32 Debug(Release)|x64 = Debug(Release)|x64 Debug|Win32 = Debug|Win32 @@ -53,6 +61,17 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.C Debug|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.C Debug|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.C Debug|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.C Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.CPP Debug|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.CPP Debug|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.CPP Debug|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.CPP Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug (Unicode)|x64.Build.0 = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 @@ -65,6 +84,17 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.C Debug|Win32.ActiveCfg = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.C Debug|Win32.Build.0 = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.C Debug|x64.ActiveCfg = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.C Debug|x64.Build.0 = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.CPP Debug|Win32.ActiveCfg = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.CPP Debug|Win32.Build.0 = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.CPP Debug|x64.ActiveCfg = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.CPP Debug|x64.Build.0 = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug (Unicode)|x64.Build.0 = Debug|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 @@ -77,6 +107,17 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.C Debug|Win32.ActiveCfg = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.C Debug|Win32.Build.0 = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.C Debug|x64.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.C Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.CPP Debug|Win32.ActiveCfg = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.CPP Debug|Win32.Build.0 = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.CPP Debug|x64.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.CPP Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug (Unicode)|x64.Build.0 = Debug|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 @@ -89,6 +130,17 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.C Debug|Win32.ActiveCfg = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.C Debug|Win32.Build.0 = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.C Debug|x64.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.C Debug|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.CPP Debug|Win32.ActiveCfg = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.CPP Debug|Win32.Build.0 = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.CPP Debug|x64.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.CPP Debug|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug (Unicode)|x64.Build.0 = Debug|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 @@ -101,6 +153,17 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.C Debug|Win32.ActiveCfg = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.C Debug|Win32.Build.0 = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.C Debug|x64.ActiveCfg = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.C Debug|x64.Build.0 = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.CPP Debug|Win32.ActiveCfg = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.CPP Debug|Win32.Build.0 = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.CPP Debug|x64.ActiveCfg = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.CPP Debug|x64.Build.0 = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug (Unicode)|x64.Build.0 = Debug|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 @@ -113,6 +176,17 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.C Debug|Win32.ActiveCfg = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.C Debug|Win32.Build.0 = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.C Debug|x64.ActiveCfg = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.C Debug|x64.Build.0 = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.CPP Debug|Win32.ActiveCfg = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.CPP Debug|Win32.Build.0 = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.CPP Debug|x64.ActiveCfg = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.CPP Debug|x64.Build.0 = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug (Unicode)|x64.Build.0 = Debug|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 @@ -125,6 +199,28 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.C Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.C Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.C Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.C Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.CPP Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.CPP Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.CPP Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.CPP Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -135,5 +231,6 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal From 4355fcfc3d5c9a432d112d550748df870cc855bb Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 30 Apr 2011 18:41:42 +0000 Subject: [PATCH 079/321] Minor fixes git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66390 --- tests/mfc_dll/mfc.cpp | 2 + utility.cpp | 154 +++++++++++++++++++++--------------------- vld_vs10.sln | 86 +---------------------- vldheap.h | 2 +- 4 files changed, 83 insertions(+), 161 deletions(-) diff --git a/tests/mfc_dll/mfc.cpp b/tests/mfc_dll/mfc.cpp index 7a47e110..65df4e5f 100644 --- a/tests/mfc_dll/mfc.cpp +++ b/tests/mfc_dll/mfc.cpp @@ -65,7 +65,9 @@ BOOL CmfcApp::InitInstance() int CmfcApp::ExitInstance() { // Without this, Dynamically unloading the MFC dll will crash +#ifdef _DEBUG // entire file AfxEnableMemoryLeakDump(FALSE); +#endif return 0; } diff --git a/utility.cpp b/utility.cpp index 1b9dd3d0..e17a3f87 100644 --- a/utility.cpp +++ b/utility.cpp @@ -473,7 +473,8 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) if ( import2 ) import = import2; - assert(import != NULL); // Perhaps the named export module does not actually export the named import? + if (import == NULL) // Perhaps the named export module does not actually export the named import? + continue; // Locate the import's IAT entry. IMAGE_THUNK_DATA *iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); @@ -662,81 +663,82 @@ VOID report (LPCWSTR format, ...) // VOID restoreimport (HMODULE importmodule, moduleentry_t* module) { - HMODULE exportmodule = (HMODULE)module->modulebase; - LPCSTR exportmodulename = module->exportmodulename; - UNREFERENCED_PARAMETER(exportmodulename); - if (exportmodule == NULL) - return; - - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); - __try - { - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - } - __except(1) - { - idte = NULL; - } - LeaveCriticalSection(&imagelock); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return; - } - - int result = 0; - while (idte->OriginalFirstThunk != 0x0) - { - PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); - UNREFERENCED_PARAMETER(name); - - int i = 0; - patchentry_t *entry = module->patchtable; - while(entry->importname) - { - LPCSTR importname = entry->importname; - LPCVOID replacement = entry->replacement; - - // Get the *real* address of the import. - FARPROC import = GetProcAddress(exportmodule, importname); - assert(import != NULL); // Perhaps the named export module does not actually export the named import? - - // Locate the import's original IAT entry (it currently has the replacement - // address in it). - IMAGE_THUNK_DATA* iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) - { - if (iate->u1.Function != (DWORD_PTR)replacement) - { - iate++; - continue; - } - - if (iate->u1.Function != (DWORD_PTR)import) - { - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the import's real address. Note that the IAT entry may - // be write-protected, so we must first ensure that it is writable. - DWORD protect; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)import; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - } - result++; - iate++; - } - entry++; i++; - } - idte++; - } + HMODULE exportmodule = (HMODULE)module->modulebase; + LPCSTR exportmodulename = module->exportmodulename; + UNREFERENCED_PARAMETER(exportmodulename); + if (exportmodule == NULL) + return; + + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + EnterCriticalSection(&imagelock); + __try + { + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + } + __except(1) + { + idte = NULL; + } + LeaveCriticalSection(&imagelock); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return; + } + + int result = 0; + while (idte->OriginalFirstThunk != 0x0) + { + PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); + UNREFERENCED_PARAMETER(name); + + int i = 0; + patchentry_t *entry = module->patchtable; + while(entry->importname) + { + LPCSTR importname = entry->importname; + LPCVOID replacement = entry->replacement; + + // Get the *real* address of the import. + FARPROC import = GetProcAddress(exportmodule, importname); + if (import == NULL) // Perhaps the named export module does not actually export the named import? + continue; + + // Locate the import's original IAT entry (it currently has the replacement + // address in it). + IMAGE_THUNK_DATA* iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) + { + if (iate->u1.Function != (DWORD_PTR)replacement) + { + iate++; + continue; + } + + if (iate->u1.Function != (DWORD_PTR)import) + { + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the import's real address. Note that the IAT entry may + // be write-protected, so we must first ensure that it is writable. + DWORD protect; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)import; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + } + result++; + iate++; + } + entry++; i++; + } + idte++; + } } // restoremodule - Restores all imports listed in the supplied patch table, and diff --git a/vld_vs10.sln b/vld_vs10.sln index 097022f7..d1422ea9 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -47,12 +47,6 @@ Global SccLocalPath4 = VLDPackage EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - C Debug|Win32 = C Debug|Win32 - C Debug|x64 = C Debug|x64 - CPP Debug|Win32 = CPP Debug|Win32 - CPP Debug|x64 = CPP Debug|x64 - Debug (Unicode)|Win32 = Debug (Unicode)|Win32 - Debug (Unicode)|x64 = Debug (Unicode)|x64 Debug(Release)|Win32 = Debug(Release)|Win32 Debug(Release)|x64 = Debug(Release)|x64 Debug|Win32 = Debug|Win32 @@ -61,17 +55,6 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.C Debug|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.C Debug|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.C Debug|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.C Debug|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.CPP Debug|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.CPP Debug|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.CPP Debug|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.CPP Debug|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug (Unicode)|x64.Build.0 = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 @@ -84,17 +67,6 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.C Debug|Win32.ActiveCfg = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.C Debug|Win32.Build.0 = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.C Debug|x64.ActiveCfg = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.C Debug|x64.Build.0 = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.CPP Debug|Win32.ActiveCfg = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.CPP Debug|Win32.Build.0 = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.CPP Debug|x64.ActiveCfg = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.CPP Debug|x64.Build.0 = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug (Unicode)|x64.Build.0 = Debug|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 @@ -107,17 +79,6 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.C Debug|Win32.ActiveCfg = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.C Debug|Win32.Build.0 = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.C Debug|x64.ActiveCfg = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.C Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.CPP Debug|Win32.ActiveCfg = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.CPP Debug|Win32.Build.0 = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.CPP Debug|x64.ActiveCfg = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.CPP Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug (Unicode)|x64.Build.0 = Debug|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 @@ -130,17 +91,6 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.C Debug|Win32.ActiveCfg = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.C Debug|Win32.Build.0 = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.C Debug|x64.ActiveCfg = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.C Debug|x64.Build.0 = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.CPP Debug|Win32.ActiveCfg = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.CPP Debug|Win32.Build.0 = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.CPP Debug|x64.ActiveCfg = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.CPP Debug|x64.Build.0 = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug (Unicode)|x64.Build.0 = Debug|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 @@ -153,17 +103,6 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.C Debug|Win32.ActiveCfg = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.C Debug|Win32.Build.0 = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.C Debug|x64.ActiveCfg = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.C Debug|x64.Build.0 = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.CPP Debug|Win32.ActiveCfg = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.CPP Debug|Win32.Build.0 = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.CPP Debug|x64.ActiveCfg = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.CPP Debug|x64.Build.0 = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug (Unicode)|x64.Build.0 = Debug|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 @@ -176,17 +115,6 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.C Debug|Win32.ActiveCfg = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.C Debug|Win32.Build.0 = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.C Debug|x64.ActiveCfg = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.C Debug|x64.Build.0 = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.CPP Debug|Win32.ActiveCfg = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.CPP Debug|Win32.Build.0 = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.CPP Debug|x64.ActiveCfg = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.CPP Debug|x64.Build.0 = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug (Unicode)|x64.Build.0 = Debug|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 @@ -199,18 +127,8 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.C Debug|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.C Debug|Win32.Build.0 = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.C Debug|x64.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.C Debug|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.CPP Debug|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.CPP Debug|Win32.Build.0 = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.CPP Debug|x64.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.CPP Debug|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 diff --git a/vldheap.h b/vldheap.h index 863ee899..cfec56e9 100644 --- a/vldheap.h +++ b/vldheap.h @@ -72,7 +72,7 @@ typedef struct vldblockheader_s const char *file; // Name of the file where this block was allocated. int line; // Line number within the above file where this block was allocated. size_t size; // The size of this memory block, not including this header. - SIZE_T serialnumber; // Each block is assigned a unique serial number, starting from zero. + size_t serialnumber; // Each block is assigned a unique serial number, starting from zero. } vldblockheader_t; // Data-to-Header and Header-to-Data conversion From 015dbc2dcd5ac598cad096c820086f860e43e66e Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 30 Apr 2011 22:57:25 +0000 Subject: [PATCH 080/321] TestSuite bug fixed Basic test enhanced git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66405 --- tests/basics/basics.cpp | 14 +++++++++++++- tests/suite/testsuite.cpp | 8 ++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 2f463ef2..c3c9f504 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -40,6 +40,7 @@ int _tmain(int argc, _TCHAR* argv[]) wprintf(_T("======================================\n")); if (argc == 3) { + bool checkAll = false; LeakOption leak_type = eMalloc; // default int multiplayer = 2; @@ -70,6 +71,11 @@ int _tmain(int argc, _TCHAR* argv[]) leak_type = eCoTaskMem; multiplayer = 1; } + else if (_tcsicmp(_T("all"), argv[1]) == 0) + { + checkAll = true; + multiplayer = 11; + } else { wprintf(_T("Error!: Invalid arguments\n")); @@ -80,7 +86,13 @@ int _tmain(int argc, _TCHAR* argv[]) wprintf(_T("Options: %s \nNumber of Leaks: %s\n"), argv[1], argv[2]); // Convert the string into it's integer equivalent int repeat = _tstoi(argv[2]); - LeakMemory(leak_type,repeat); + if (!checkAll) + LeakMemory(leak_type,repeat); + else + { + for (int leak_type = eMalloc; leak_type <= eCoTaskMem; leak_type++) + LeakMemory((LeakOption)leak_type,repeat); + } int leaks = (int)VLDGetLeaksCount(false); wprintf(_T("End of test app...\n\n")); int diff = repeat * multiplayer - leaks; diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 2a423bc4..a6be7961 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -91,6 +91,8 @@ __declspec(thread) malloc_t pmalloc = NULL; __declspec(thread) HANDLE threadheap; __declspec(thread) ULONG total_allocs = 0; +volatile ULONG leaks_count = 0; + // VLD internal API #ifdef _DEBUG extern "C" { @@ -333,9 +335,11 @@ DWORD __stdcall threadproc_test (LPVOID param) leaks_selected = 0; do { index = random(MAXBLOCKS); - if ((blocks[index].block != NULL) && (blocks[index].action == (action_e)action_index)) { + if (!blocks[index].leak && (blocks[index].block != NULL) && (blocks[index].action == (action_e)action_index)) { blocks[index].leak = TRUE; leaks_selected++; + if (blocks[index].action != a_ignored) + InterlockedIncrement(&leaks_count); } } while (leaks_selected < (1 + NUMDUPLEAKS)); } @@ -434,7 +438,7 @@ int main (int argc, char *argv []) OutputDebugString(message); int totalleaks = (int)VLDGetLeaksCount(); - int diff = 16 - totalleaks; + int diff = leaks_count - totalleaks; assert(diff == 0); return diff; From f81cb97e6be3f5c8b07bd92cd081dd9ab4107800 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 1 May 2011 22:33:03 +0000 Subject: [PATCH 081/321] Infinite loop at exit fixed with some app's git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66450 --- utility.cpp | 19 ++- utility.h | 1 + vld.cpp | 324 ++++++++++++++++++++++++++-------------------------- 3 files changed, 178 insertions(+), 166 deletions(-) diff --git a/utility.cpp b/utility.cpp index e17a3f87..b46a97f7 100644 --- a/utility.cpp +++ b/utility.cpp @@ -474,7 +474,10 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) import = import2; if (import == NULL) // Perhaps the named export module does not actually export the named import? + { + entry++; i++; continue; + } // Locate the import's IAT entry. IMAGE_THUNK_DATA *iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); @@ -492,6 +495,9 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) // writable. if ( import != replacement ) { + if (entry->original == NULL) + entry->original = (LPCVOID)iate->u1.Function; + DWORD protect; VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); iate->u1.Function = (DWORD_PTR)replacement; @@ -705,11 +711,16 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) { LPCSTR importname = entry->importname; LPCVOID replacement = entry->replacement; + UNREFERENCED_PARAMETER(importname); // Get the *real* address of the import. - FARPROC import = GetProcAddress(exportmodule, importname); - if (import == NULL) // Perhaps the named export module does not actually export the named import? + //LPCVOID original = entry->original; + LPCVOID original = GetProcAddress(exportmodule, importname); + if (original == NULL) // Perhaps the named export module does not actually export the named import? + { + entry++; i++; continue; + } // Locate the import's original IAT entry (it currently has the replacement // address in it). @@ -722,14 +733,14 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) continue; } - if (iate->u1.Function != (DWORD_PTR)import) + if (iate->u1.Function != (DWORD_PTR)original) { // Found the IAT entry. Overwrite the address stored in the IAT // entry with the import's real address. Note that the IAT entry may // be write-protected, so we must first ensure that it is writable. DWORD protect; VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)import; + iate->u1.Function = (DWORD_PTR)original; VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); } result++; diff --git a/utility.h b/utility.h index 3661fad7..19392082 100644 --- a/utility.h +++ b/utility.h @@ -102,6 +102,7 @@ enum encoding_e { typedef struct patchentry_s { LPCSTR importname; // The name (or ordinal) of the imported API being patched. + LPCVOID original; // Pointer to the original function. LPCVOID replacement; // Pointer to the function to which the imported API should be patched through to. } patchentry_t; diff --git a/vld.cpp b/vld.cpp index 60969f53..0d98eb0a 100644 --- a/vld.cpp +++ b/vld.cpp @@ -67,17 +67,17 @@ __declspec(dllexport) VisualLeakDetector vld; // through to replacement functions provided by VLD. Having this table simply // makes it more convenient to add additional IAT patches. patchentry_t VisualLeakDetector::m_kernelbasePatch [] = { - "GetProcAddress", _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. - NULL, NULL + "GetProcAddress", NULL, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. + NULL, NULL, NULL }; patchentry_t VisualLeakDetector::m_kernel32Patch [] = { - "HeapAlloc", _HeapAlloc, - "HeapCreate", _HeapCreate, - "HeapDestroy", _HeapDestroy, - "HeapFree", _HeapFree, - "HeapReAlloc", _HeapReAlloc, - NULL, NULL + "HeapAlloc", NULL, _HeapAlloc, + "HeapCreate", NULL, _HeapCreate, + "HeapDestroy", NULL, _HeapDestroy, + "HeapFree", NULL, _HeapFree, + "HeapReAlloc", NULL, _HeapReAlloc, + NULL, NULL, NULL }; #define ORDINAL(x) (LPCSTR)x @@ -91,216 +91,216 @@ VisualLeakDetector::_GetProcAddressType *VisualLeakDetector::m_original_GetProcA static patchentry_t mfc42dPatch [] = { // XXX why are the vector new operators missing for mfc42d.dll? - ORDINAL(711), VS60::mfcd_scalar_new, - ORDINAL(712), VS60::mfcd__scalar_new_dbg_4p, - ORDINAL(714), VS60::mfcd__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(711), NULL, VS60::mfcd_scalar_new, + ORDINAL(712), NULL, VS60::mfcd__scalar_new_dbg_4p, + ORDINAL(714), NULL, VS60::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc42udPatch [] = { // XXX why are the vector new operators missing for mfc42ud.dll? - ORDINAL(711), VS60::mfcud_scalar_new, - ORDINAL(712), VS60::mfcud__scalar_new_dbg_4p, - ORDINAL(714), VS60::mfcud__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(711), NULL, VS60::mfcud_scalar_new, + ORDINAL(712), NULL, VS60::mfcud__scalar_new_dbg_4p, + ORDINAL(714), NULL, VS60::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc70dPatch [] = { - ORDINAL(257), VS70::mfcd_vector_new, - ORDINAL(258), VS70::mfcd__vector_new_dbg_4p, - ORDINAL(259), VS70::mfcd__vector_new_dbg_3p, - ORDINAL(832), VS70::mfcd_scalar_new, - ORDINAL(833), VS70::mfcd__scalar_new_dbg_4p, - ORDINAL(834), VS70::mfcd__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(257), NULL, VS70::mfcd_vector_new, + ORDINAL(258), NULL, VS70::mfcd__vector_new_dbg_4p, + ORDINAL(259), NULL, VS70::mfcd__vector_new_dbg_3p, + ORDINAL(832), NULL, VS70::mfcd_scalar_new, + ORDINAL(833), NULL, VS70::mfcd__scalar_new_dbg_4p, + ORDINAL(834), NULL, VS70::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc70udPatch [] = { - ORDINAL(258), VS70::mfcud_vector_new, - ORDINAL(259), VS70::mfcud__vector_new_dbg_4p, - ORDINAL(260), VS70::mfcud__vector_new_dbg_3p, - ORDINAL(833), VS70::mfcud_scalar_new, - ORDINAL(834), VS70::mfcud__scalar_new_dbg_4p, - ORDINAL(835), VS70::mfcud__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(258), NULL, VS70::mfcud_vector_new, + ORDINAL(259), NULL, VS70::mfcud__vector_new_dbg_4p, + ORDINAL(260), NULL, VS70::mfcud__vector_new_dbg_3p, + ORDINAL(833), NULL, VS70::mfcud_scalar_new, + ORDINAL(834), NULL, VS70::mfcud__scalar_new_dbg_4p, + ORDINAL(835), NULL, VS70::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc71dPatch [] = { - ORDINAL(267), VS71::mfcd_vector_new, - ORDINAL(268), VS71::mfcd__vector_new_dbg_4p, - ORDINAL(269), VS71::mfcd__vector_new_dbg_3p, - ORDINAL(893), VS71::mfcd_scalar_new, - ORDINAL(894), VS71::mfcd__scalar_new_dbg_4p, - ORDINAL(895), VS71::mfcd__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), NULL, VS71::mfcd_vector_new, + ORDINAL(268), NULL, VS71::mfcd__vector_new_dbg_4p, + ORDINAL(269), NULL, VS71::mfcd__vector_new_dbg_3p, + ORDINAL(893), NULL, VS71::mfcd_scalar_new, + ORDINAL(894), NULL, VS71::mfcd__scalar_new_dbg_4p, + ORDINAL(895), NULL, VS71::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc71udPatch [] = { - ORDINAL(267), VS71::mfcud_vector_new, - ORDINAL(268), VS71::mfcud__vector_new_dbg_4p, - ORDINAL(269), VS71::mfcud__vector_new_dbg_3p, - ORDINAL(893), VS71::mfcud_scalar_new, - ORDINAL(894), VS71::mfcud__scalar_new_dbg_4p, - ORDINAL(895), VS71::mfcud__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), NULL, VS71::mfcud_vector_new, + ORDINAL(268), NULL, VS71::mfcud__vector_new_dbg_4p, + ORDINAL(269), NULL, VS71::mfcud__vector_new_dbg_3p, + ORDINAL(893), NULL, VS71::mfcud_scalar_new, + ORDINAL(894), NULL, VS71::mfcud__scalar_new_dbg_4p, + ORDINAL(895), NULL, VS71::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc80dPatch [] = { - ORDINAL(267), VS80::mfcd_vector_new, - ORDINAL(268), VS80::mfcd__vector_new_dbg_4p, - ORDINAL(269), VS80::mfcd__vector_new_dbg_3p, - ORDINAL2(893,907), VS80::mfcd_scalar_new, - ORDINAL2(894,908), VS80::mfcd__scalar_new_dbg_4p, - ORDINAL2(895,909), VS80::mfcd__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), NULL, VS80::mfcd_vector_new, + ORDINAL(268), NULL, VS80::mfcd__vector_new_dbg_4p, + ORDINAL(269), NULL, VS80::mfcd__vector_new_dbg_3p, + ORDINAL2(893,907), NULL, VS80::mfcd_scalar_new, + ORDINAL2(894,908), NULL, VS80::mfcd__scalar_new_dbg_4p, + ORDINAL2(895,909), NULL, VS80::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc80udPatch [] = { - ORDINAL(267), VS80::mfcud_vector_new, - ORDINAL(268), VS80::mfcud__vector_new_dbg_4p, - ORDINAL(269), VS80::mfcud__vector_new_dbg_3p, - ORDINAL2(893,907), VS80::mfcud_scalar_new, - ORDINAL2(894,908), VS80::mfcud__scalar_new_dbg_4p, - ORDINAL2(895,909), VS80::mfcud__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), NULL, VS80::mfcud_vector_new, + ORDINAL(268), NULL, VS80::mfcud__vector_new_dbg_4p, + ORDINAL(269), NULL, VS80::mfcud__vector_new_dbg_3p, + ORDINAL2(893,907), NULL, VS80::mfcud_scalar_new, + ORDINAL2(894,908), NULL, VS80::mfcud__scalar_new_dbg_4p, + ORDINAL2(895,909), NULL, VS80::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc90dPatch [] = { - ORDINAL(267), VS90::mfcd_vector_new, - ORDINAL(268), VS90::mfcd__vector_new_dbg_4p, - ORDINAL(269), VS90::mfcd__vector_new_dbg_3p, - ORDINAL2(931, 909), VS90::mfcd_scalar_new, - ORDINAL2(932, 910), VS90::mfcd__scalar_new_dbg_4p, - ORDINAL2(933, 911), VS90::mfcd__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), NULL, VS90::mfcd_vector_new, + ORDINAL(268), NULL, VS90::mfcd__vector_new_dbg_4p, + ORDINAL(269), NULL, VS90::mfcd__vector_new_dbg_3p, + ORDINAL2(931, 909), NULL, VS90::mfcd_scalar_new, + ORDINAL2(932, 910), NULL, VS90::mfcd__scalar_new_dbg_4p, + ORDINAL2(933, 911), NULL, VS90::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc90udPatch [] = { - ORDINAL(267), VS90::mfcud_vector_new, - ORDINAL(268), VS90::mfcud__vector_new_dbg_4p, - ORDINAL(269), VS90::mfcud__vector_new_dbg_3p, - ORDINAL2(935, 913), VS90::mfcud_scalar_new, - ORDINAL2(936, 914), VS90::mfcud__scalar_new_dbg_4p, - ORDINAL2(937, 915), VS90::mfcud__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), NULL, VS90::mfcud_vector_new, + ORDINAL(268), NULL, VS90::mfcud__vector_new_dbg_4p, + ORDINAL(269), NULL, VS90::mfcud__vector_new_dbg_3p, + ORDINAL2(935, 913), NULL, VS90::mfcud_scalar_new, + ORDINAL2(936, 914), NULL, VS90::mfcud__scalar_new_dbg_4p, + ORDINAL2(937, 915), NULL, VS90::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc100dPatch [] = { - ORDINAL(267), VS100::mfcd_vector_new, - ORDINAL(268), VS100::mfcd__vector_new_dbg_4p, - ORDINAL(269), VS100::mfcd__vector_new_dbg_3p, - ORDINAL2(1427, 1405), VS100::mfcd_scalar_new, - ORDINAL2(1428, 1406), VS100::mfcd__scalar_new_dbg_4p, - ORDINAL2(1429, 1407), VS100::mfcd__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), NULL, VS100::mfcd_vector_new, + ORDINAL(268), NULL, VS100::mfcd__vector_new_dbg_4p, + ORDINAL(269), NULL, VS100::mfcd__vector_new_dbg_3p, + ORDINAL2(1427, 1405), NULL, VS100::mfcd_scalar_new, + ORDINAL2(1428, 1406), NULL, VS100::mfcd__scalar_new_dbg_4p, + ORDINAL2(1429, 1407), NULL, VS100::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc100udPatch [] = { - ORDINAL(267), VS100::mfcud_vector_new, - ORDINAL(268), VS100::mfcud__vector_new_dbg_4p, - ORDINAL(269), VS100::mfcud__vector_new_dbg_3p, - ORDINAL2(1434, 1412), VS100::mfcud_scalar_new, - ORDINAL2(1435, 1413), VS100::mfcud__scalar_new_dbg_4p, - ORDINAL2(1436, 1414), VS100::mfcud__scalar_new_dbg_3p, - NULL, NULL + ORDINAL(267), NULL, VS100::mfcud_vector_new, + ORDINAL(268), NULL, VS100::mfcud__vector_new_dbg_4p, + ORDINAL(269), NULL, VS100::mfcud__vector_new_dbg_3p, + ORDINAL2(1434, 1412), NULL, VS100::mfcud_scalar_new, + ORDINAL2(1435, 1413), NULL, VS100::mfcud__scalar_new_dbg_4p, + ORDINAL2(1436, 1414), NULL, VS100::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t msvcrtdPatch [] = { - "_calloc_dbg", VS60::crtd__calloc_dbg, - "_malloc_dbg", VS60::crtd__malloc_dbg, - "_realloc_dbg", VS60::crtd__realloc_dbg, - scalar_new_dbg_name, VS60::crtd__scalar_new_dbg, - //vector_new_dbg_name, VS60::crtd__vector_new_dbg, - "calloc", VS60::crtd_calloc, - "malloc", VS60::crtd_malloc, - "realloc", VS60::crtd_realloc, - scalar_new_name, VS60::crtd_scalar_new, - //vector_new_name, VS60::crtd_vector_new, - NULL, NULL + "_calloc_dbg", NULL, VS60::crtd__calloc_dbg, + "_malloc_dbg", NULL, VS60::crtd__malloc_dbg, + "_realloc_dbg", NULL, VS60::crtd__realloc_dbg, + scalar_new_dbg_name, NULL, VS60::crtd__scalar_new_dbg, + //vector_new_dbg_name, NULL, VS60::crtd__vector_new_dbg, + "calloc", NULL, VS60::crtd_calloc, + "malloc", NULL, VS60::crtd_malloc, + "realloc", NULL, VS60::crtd_realloc, + scalar_new_name, NULL, VS60::crtd_scalar_new, + //vector_new_name, NULL, VS60::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr70dPatch [] = { - "_calloc_dbg", VS70::crtd__calloc_dbg, - "_malloc_dbg", VS70::crtd__malloc_dbg, - "_realloc_dbg", VS70::crtd__realloc_dbg, - scalar_new_dbg_name, VS70::crtd__scalar_new_dbg, - vector_new_dbg_name, VS70::crtd__vector_new_dbg, - "calloc", VS70::crtd_calloc, - "malloc", VS70::crtd_malloc, - "realloc", VS70::crtd_realloc, - scalar_new_name, VS70::crtd_scalar_new, - vector_new_name, VS70::crtd_vector_new, - NULL, NULL + "_calloc_dbg", NULL, VS70::crtd__calloc_dbg, + "_malloc_dbg", NULL, VS70::crtd__malloc_dbg, + "_realloc_dbg", NULL, VS70::crtd__realloc_dbg, + scalar_new_dbg_name, NULL, VS70::crtd__scalar_new_dbg, + vector_new_dbg_name, NULL, VS70::crtd__vector_new_dbg, + "calloc", NULL, VS70::crtd_calloc, + "malloc", NULL, VS70::crtd_malloc, + "realloc", NULL, VS70::crtd_realloc, + scalar_new_name, NULL, VS70::crtd_scalar_new, + vector_new_name, NULL, VS70::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr71dPatch [] = { - "_calloc_dbg", VS71::crtd__calloc_dbg, - "_malloc_dbg", VS71::crtd__malloc_dbg, - "_realloc_dbg", VS71::crtd__realloc_dbg, - scalar_new_dbg_name, VS71::crtd__scalar_new_dbg, - vector_new_dbg_name, VS71::crtd__vector_new_dbg, - "calloc", VS71::crtd_calloc, - "malloc", VS71::crtd_malloc, - "realloc", VS71::crtd_realloc, - scalar_new_name, VS71::crtd_scalar_new, - vector_new_name, VS71::crtd_vector_new, - NULL, NULL + "_calloc_dbg", NULL, VS71::crtd__calloc_dbg, + "_malloc_dbg", NULL, VS71::crtd__malloc_dbg, + "_realloc_dbg", NULL, VS71::crtd__realloc_dbg, + scalar_new_dbg_name, NULL, VS71::crtd__scalar_new_dbg, + vector_new_dbg_name, NULL, VS71::crtd__vector_new_dbg, + "calloc", NULL, VS71::crtd_calloc, + "malloc", NULL, VS71::crtd_malloc, + "realloc", NULL, VS71::crtd_realloc, + scalar_new_name, NULL, VS71::crtd_scalar_new, + vector_new_name, NULL, VS71::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr80dPatch [] = { - "_calloc_dbg", VS80::crtd__calloc_dbg, - "_malloc_dbg", VS80::crtd__malloc_dbg, - "_realloc_dbg", VS80::crtd__realloc_dbg, - scalar_new_dbg_name, VS80::crtd__scalar_new_dbg, - vector_new_dbg_name, VS80::crtd__vector_new_dbg, - "calloc", VS80::crtd_calloc, - "malloc", VS80::crtd_malloc, - "realloc", VS80::crtd_realloc, - scalar_new_name, VS80::crtd_scalar_new, - vector_new_name, VS80::crtd_vector_new, - NULL, NULL + "_calloc_dbg", NULL, VS80::crtd__calloc_dbg, + "_malloc_dbg", NULL, VS80::crtd__malloc_dbg, + "_realloc_dbg", NULL, VS80::crtd__realloc_dbg, + scalar_new_dbg_name, NULL, VS80::crtd__scalar_new_dbg, + vector_new_dbg_name, NULL, VS80::crtd__vector_new_dbg, + "calloc", NULL, VS80::crtd_calloc, + "malloc", NULL, VS80::crtd_malloc, + "realloc", NULL, VS80::crtd_realloc, + scalar_new_name, NULL, VS80::crtd_scalar_new, + vector_new_name, NULL, VS80::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr90dPatch [] = { - "_calloc_dbg", VS90::crtd__calloc_dbg, - "_malloc_dbg", VS90::crtd__malloc_dbg, - "_realloc_dbg", VS90::crtd__realloc_dbg, - scalar_new_dbg_name, VS90::crtd__scalar_new_dbg, - vector_new_dbg_name, VS90::crtd__vector_new_dbg, - "calloc", VS90::crtd_calloc, - "malloc", VS90::crtd_malloc, - "realloc", VS90::crtd_realloc, - scalar_new_name, VS90::crtd_scalar_new, - vector_new_name, VS90::crtd_vector_new, - NULL, NULL + "_calloc_dbg", NULL, VS90::crtd__calloc_dbg, + "_malloc_dbg", NULL, VS90::crtd__malloc_dbg, + "_realloc_dbg", NULL, VS90::crtd__realloc_dbg, + scalar_new_dbg_name, NULL, VS90::crtd__scalar_new_dbg, + vector_new_dbg_name, NULL, VS90::crtd__vector_new_dbg, + "calloc", NULL, VS90::crtd_calloc, + "malloc", NULL, VS90::crtd_malloc, + "realloc", NULL, VS90::crtd_realloc, + scalar_new_name, NULL, VS90::crtd_scalar_new, + vector_new_name, NULL, VS90::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr100dPatch [] = { - "_calloc_dbg", VS100::crtd__calloc_dbg, - "_malloc_dbg", VS100::crtd__malloc_dbg, - "_realloc_dbg", VS100::crtd__realloc_dbg, - scalar_new_dbg_name, VS100::crtd__scalar_new_dbg, - vector_new_dbg_name, VS100::crtd__vector_new_dbg, - "calloc", VS100::crtd_calloc, - "malloc", VS100::crtd_malloc, - "realloc", VS100::crtd_realloc, - scalar_new_name, VS100::crtd_scalar_new, - vector_new_name, VS100::crtd_vector_new, - NULL, NULL + "_calloc_dbg", NULL, VS100::crtd__calloc_dbg, + "_malloc_dbg", NULL, VS100::crtd__malloc_dbg, + "_realloc_dbg", NULL, VS100::crtd__realloc_dbg, + scalar_new_dbg_name, NULL, VS100::crtd__scalar_new_dbg, + vector_new_dbg_name, NULL, VS100::crtd__vector_new_dbg, + "calloc", NULL, VS100::crtd_calloc, + "malloc", NULL, VS100::crtd_malloc, + "realloc", NULL, VS100::crtd_realloc, + scalar_new_name, NULL, VS100::crtd_scalar_new, + vector_new_name, NULL, VS100::crtd_vector_new, + NULL, NULL, NULL }; patchentry_t VisualLeakDetector::m_ntdllPatch [] = { - "RtlAllocateHeap", VisualLeakDetector::_RtlAllocateHeap, - "RtlFreeHeap", VisualLeakDetector::_RtlFreeHeap, - "RtlReAllocateHeap", VisualLeakDetector::_RtlReAllocateHeap, - NULL, NULL + "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, + "RtlFreeHeap", NULL, VisualLeakDetector::_RtlFreeHeap, + "RtlReAllocateHeap", NULL, VisualLeakDetector::_RtlReAllocateHeap, + NULL, NULL, NULL }; patchentry_t VisualLeakDetector::m_ole32Patch [] = { - "CoGetMalloc", VisualLeakDetector::_CoGetMalloc, - "CoTaskMemAlloc", VisualLeakDetector::_CoTaskMemAlloc, - "CoTaskMemRealloc", VisualLeakDetector::_CoTaskMemRealloc, - NULL, NULL + "CoGetMalloc", NULL, VisualLeakDetector::_CoGetMalloc, + "CoTaskMemAlloc", NULL, VisualLeakDetector::_CoTaskMemAlloc, + "CoTaskMemRealloc", NULL, VisualLeakDetector::_CoTaskMemRealloc, + NULL, NULL, NULL }; moduleentry_t VisualLeakDetector::m_patchtable [] = { @@ -474,8 +474,8 @@ VisualLeakDetector::VisualLeakDetector () delete [] symbolpath; patchentry_t ntdllPatch [] = { - "LdrLoadDll", _LdrLoadDll, - NULL, NULL + "LdrLoadDll", NULL, _LdrLoadDll, + NULL, NULL, NULL }; moduleentry_t ldrLoadDllPatch [] = { "ntdll.dll", (UINT_PTR)ntdll, ntdllPatch, From 9301c9a8af9eae7fb3c822fee34d5d67781a0653 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Mon, 2 May 2011 11:31:03 +0000 Subject: [PATCH 082/321] Adding Heap Validation to VLD. One especially problematic way to crash an application is to allocate memory in one heap, and free it in another. The MS debug heaps do detect this, but they do NOT report any callstacks indicating the allocation callstack. The MS debug heaps simply report an error condition, and issue a break leaving the end user guessing what went wrong. Visual leak detector can now pinpoint EXACTLY report on such a situation by reporting callstacks of the allocation and deallocation of the memory that corrupted the heap. If a memory allocation is unmapped with the wrong heap handle, VLD will do a search through it's internal maps of memory allocations searching for the memory address. It will also find the heap handle that IS associated with the memory block. This of course comes at a cost, as there are many heap allocs and heap frees that VLD does not monitor. To seperate the two, and keep performance similar to what it was before, this extra checking must be explicitely be turned on via INI file, or by setting: VLD_OPT_VALIDATE_HEAPFREE via VLDSetOptions. I also wrote a unit test to verify this extra behavior. This test is called corruptions, and will be the test bed for further testing in VLD. I also cleaned up the silly semantics of the strapp method (what a stupid name), renaming it StringAppend, and having it return a string, instead of passing in a string by reference. Which goes to prove that trying to be really clever just makes everyone confused. TESTS: Ran all tests in 32 bit, and all passed. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66462 --- callstack.cpp | 17 +- callstack.h | 4 +- tests/corruption/Tests.cpp | 50 ++++++ tests/corruption/Tests.h | 8 + tests/corruption/corruption.cpp | 39 ++++ tests/corruption/corruption.vcxproj | 186 ++++++++++++++++++++ tests/corruption/corruption.vcxproj.filters | 39 ++++ tests/corruption/stdafx.cpp | 8 + tests/corruption/stdafx.h | 15 ++ tests/corruption/targetver.h | 8 + utility.cpp | 28 +-- utility.h | 2 +- vld.cpp | 170 +++++++++++++----- vld.h | 3 + vld_def.h | 1 + vld_vs10.sln | 16 ++ vldint.h | 3 +- 17 files changed, 535 insertions(+), 62 deletions(-) create mode 100644 tests/corruption/Tests.cpp create mode 100644 tests/corruption/Tests.h create mode 100644 tests/corruption/corruption.cpp create mode 100644 tests/corruption/corruption.vcxproj create mode 100644 tests/corruption/corruption.vcxproj.filters create mode 100644 tests/corruption/stdafx.cpp create mode 100644 tests/corruption/stdafx.h create mode 100644 tests/corruption/targetver.h diff --git a/callstack.cpp b/callstack.cpp index 9089ec3c..a8f479a5 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -35,6 +35,7 @@ extern HANDLE currentprocess; extern HANDLE currentthread; extern CRITICAL_SECTION stackwalklock; extern CRITICAL_SECTION symbollock; +extern VisualLeakDetector vld; // Constructor - Initializes the CallStack with an initial size of zero and one // Chunk of capacity. @@ -75,6 +76,18 @@ CallStack::~CallStack () m_ResolvedLength = 0; } +CallStack* CallStack::Create() +{ + CallStack* result = NULL; + if (vld.GetOptions() & VLD_OPT_SAFE_STACK_WALK) { + result = new SafeCallStack(); + } + else { + result = new FastCallStack(); + } + return result; + +} // operator == - Equality operator. Compares the CallStack to another CallStack // for equality. Two CallStacks are equal if they are the same size and if // every frame in each is identical to the corresponding frame in the other. @@ -182,7 +195,7 @@ VOID CallStack::clear () // // None. // -void CallStack::dump(BOOL showinternalframes) const +void CallStack::dump(BOOL showinternalframes, UINT start_frame) const { // The stack was dumped already if (m_Resolved) @@ -211,7 +224,7 @@ void CallStack::dump(BOOL showinternalframes) const const size_t max_size = MAXREPORTLENGTH + 1; // Iterate through each frame in the call stack. - for (UINT32 frame = 0; frame < m_size; frame++) + for (UINT32 frame = start_frame; frame < m_size; frame++) { // Try to get the source file and line number associated with // this program counter address. diff --git a/callstack.h b/callstack.h index 0c365879..b9332f38 100644 --- a/callstack.h +++ b/callstack.h @@ -78,12 +78,12 @@ class CallStack public: CallStack (); ~CallStack (); - + static CallStack* Create(); // Public APIs - see each function definition for details. VOID clear (); // Prints the Callstack to one of either / or the debug output window and or // a log file. - VOID dump (BOOL showinternalframes) const; + VOID dump (BOOL showinternalframes, UINT start_frame = 0) const; // Formats the stack frame into a human readable format, and saves it for later retrieval. VOID Resolve(BOOL showinternalframes); DWORD getHashValue () const; diff --git a/tests/corruption/Tests.cpp b/tests/corruption/Tests.cpp new file mode 100644 index 00000000..ac182eff --- /dev/null +++ b/tests/corruption/Tests.cpp @@ -0,0 +1,50 @@ +#include "StdAfx.h" +#include "Tests.h" +#include "stdlib.h" +#define WIN32_LEAN_AND_MEAN +#include + +void TestAllocationMismatch_malloc_delete() +{ + int* pint = (int*)malloc(56); + // use the wrong function to deallocate + delete pint; +} + +void TestAllocationMismatch_malloc_deleteVec() +{ + int* pint = (int*)malloc(56); + // use the wrong function to deallocate + delete [] pint; +} + +void TestAllocationMismatch_new_free() +{ + int* pint = new int(45); // scalar new + // use the wrong function to deallocate + free(pint); +} + +void TestAllocationMismatch_newVec_free() +{ + int* pint = new int[3]; // vector new + // use the wrong function to deallocate + free(pint); +} + +void TestHeapMismatch() +{ + HANDLE test_heap = HeapCreate(HEAP_GENERATE_EXCEPTIONS | HEAP_CREATE_ENABLE_EXECUTE, + 0, // initialize reserved size; + 0); // maximum size can grow + HANDLE default_heap = GetProcessHeap(); + // Have to initialize vld with something, so it doesn't dismiss + // the default heap as having no memory allocs in it. + void* aptr = HeapAlloc(default_heap, 0, 42); + // Allocate it in the new heap + void* vptr = HeapAlloc(test_heap, 0, 56); + // Free this using the WRONG heap! + HeapFree( default_heap, 0, vptr); + + HeapDestroy(test_heap); +} diff --git a/tests/corruption/Tests.h b/tests/corruption/Tests.h new file mode 100644 index 00000000..13a70c7f --- /dev/null +++ b/tests/corruption/Tests.h @@ -0,0 +1,8 @@ +#pragma once + +void TestAllocationMismatch_malloc_delete(); +void TestAllocationMismatch_malloc_deleteVec(); +void TestAllocationMismatch_new_free(); +void TestAllocationMismatch_newVec_free(); + +void TestHeapMismatch(); diff --git a/tests/corruption/corruption.cpp b/tests/corruption/corruption.cpp new file mode 100644 index 00000000..10e7ba26 --- /dev/null +++ b/tests/corruption/corruption.cpp @@ -0,0 +1,39 @@ +// corruption.cpp : Defines the entry point for the console application. +// + +#include "stdafx.h" +#include "Tests.h" +// This hooks vld into this app +#include "../../vld.h" + +int _tmain(int argc, _TCHAR* argv[]) +{ + wprintf(_T("======================================\n")); + wprintf(_T("==\n")); + wprintf(_T("== VLD Tests: Memory Corruption\n")); + wprintf(_T("==\n")); + wprintf(_T("======================================\n")); + + UINT vld_options = VLDGetOptions(); + vld_options |= VLD_OPT_VALIDATE_HEAPFREE; + VLDSetOptions(vld_options, 15, 25); + + if (argc == 2) + { + // Pick up options to determine which type of test to execute + if (_tcsicmp(_T("allocmismatch"), argv[1]) == 0) + { + TestAllocationMismatch_malloc_delete(); + TestAllocationMismatch_malloc_deleteVec(); + TestAllocationMismatch_new_free(); + TestAllocationMismatch_newVec_free(); + } + else if (_tcsicmp(_T("heapmismatch"), argv[1]) == 0) + { + TestHeapMismatch(); + } + } + + return 0; +} + diff --git a/tests/corruption/corruption.vcxproj b/tests/corruption/corruption.vcxproj new file mode 100644 index 00000000..aaa4d410 --- /dev/null +++ b/tests/corruption/corruption.vcxproj @@ -0,0 +1,186 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} + Win32Proj + corruption + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/corruption/corruption.vcxproj.filters b/tests/corruption/corruption.vcxproj.filters new file mode 100644 index 00000000..9194b4d8 --- /dev/null +++ b/tests/corruption/corruption.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/tests/corruption/stdafx.cpp b/tests/corruption/stdafx.cpp new file mode 100644 index 00000000..397f6346 --- /dev/null +++ b/tests/corruption/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// corruption.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/tests/corruption/stdafx.h b/tests/corruption/stdafx.h new file mode 100644 index 00000000..b005a839 --- /dev/null +++ b/tests/corruption/stdafx.h @@ -0,0 +1,15 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#include +#include + + + +// TODO: reference additional headers your program requires here diff --git a/tests/corruption/targetver.h b/tests/corruption/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/tests/corruption/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/utility.cpp b/utility.cpp index b46a97f7..210c439d 100644 --- a/utility.cpp +++ b/utility.cpp @@ -827,28 +827,34 @@ VOID setreportfile (FILE *file, BOOL copydebugger, BOOL tostdout) reporttostdout = tostdout; } -// strapp - Appends the specified source string to the specified destination +// AppendString - Appends the specified source string to the specified destination // string. Allocates additional space so that the destination string "grows" -// as new strings are appended to it. This function is fairly infrequently +// as new strings are appended to it. This is accomplished by deleting the +// destination string after the new longer string is gets the copied contents +// of the destination and additional text. This function is fairly infrequently // used so efficiency is not a major concern. // -// - dest (IN/OUT): Address of the destination string. Receives the resulting +// - dest (IN): Address of the destination string. Receives the resulting // combined string after the append operation. // // - source (IN): Source string to be appended to the destination string. // // Return Value: // -// None. +// The new concatenated string. // -VOID strapp (LPWSTR *dest, LPCWSTR source) +LPWSTR AppendString (LPWSTR dest, LPCWSTR source) { - LPWSTR temp = *dest; - SIZE_T length = wcslen(*dest) + wcslen(source); - *dest = new WCHAR [length + 1]; - wcsncpy_s(*dest, length + 1, temp, _TRUNCATE); - wcsncat_s(*dest, length + 1, source, _TRUNCATE); - delete [] temp; + if ((source == NULL) || (wcslen(source) == 0)) + { + return dest; + } + SIZE_T length = wcslen(dest) + wcslen(source); + LPWSTR new_str = new WCHAR [length + 1]; + wcsncpy_s(new_str, length + 1, dest, _TRUNCATE); + wcsncat_s(new_str, length + 1, source, _TRUNCATE); + delete [] dest; + return new_str; } // strtobool - Converts string values (e.g. "yes", "no", "on", "off") to boolean diff --git a/utility.h b/utility.h index 19392082..88369cbc 100644 --- a/utility.h +++ b/utility.h @@ -128,7 +128,7 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module); VOID restoremodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); VOID setreportencoding (encoding_e encoding); VOID setreportfile (FILE *file, BOOL copydebugger, BOOL copytostdout); -VOID strapp (LPWSTR *dest, LPCWSTR source); +LPWSTR AppendString (LPWSTR dest, LPCWSTR source); BOOL strtobool (LPCWSTR s); #if _WIN32_WINNT < 0x0600 // Windows XP or earlier, no GetProcessIdOfThread() DWORD _GetProcessIdOfThread (HANDLE thread); diff --git a/vld.cpp b/vld.cpp index 0d98eb0a..356d5e83 100644 --- a/vld.cpp +++ b/vld.cpp @@ -821,15 +821,16 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () // Oddly, the symbol handler ignores the link to the PDB embedded in the // executable image. So, we'll manually add the location of the executable // to the search path since that is often where the PDB will be located. - WCHAR directory [_MAX_DIR]; - WCHAR drive [_MAX_DRIVE]; + WCHAR directory [_MAX_DIR] = {0}; + WCHAR drive [_MAX_DRIVE] = {0}; LPWSTR path = new WCHAR [MAX_PATH]; path[0] = L'\0'; + HMODULE module = GetModuleHandleW(NULL); GetModuleFileName(module, path, MAX_PATH); _wsplitpath_s(path, drive, _MAX_DRIVE, directory, _MAX_DIR, NULL, 0, NULL, 0); wcsncpy_s(path, MAX_PATH, drive, _TRUNCATE); - strapp(&path, directory); + path = AppendString(path, directory); // When the symbol handler is given a custom symbol search path, it will no // longer search the default directories (working directory, system root, @@ -837,20 +838,20 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () // them to our custom search path. // // Append the working directory. - strapp(&path, L";.\\"); + path = AppendString(path, L";.\\"); // Append the Windows directory. - WCHAR windows [MAX_PATH]; + WCHAR windows [MAX_PATH] = {0}; if (GetWindowsDirectory(windows, MAX_PATH) != 0) { - strapp(&path, L";"); - strapp(&path, windows); + path = AppendString(path, L";"); + path = AppendString(path, windows); } // Append the system directory. - WCHAR system [MAX_PATH]; + WCHAR system [MAX_PATH] = {0}; if (GetSystemDirectory(system, MAX_PATH) != 0) { - strapp(&path, L";"); - strapp(&path, system); + path = AppendString(path, L";"); + path = AppendString(path, system); } // Append %_NT_SYMBOL_PATH%. @@ -858,8 +859,8 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () if (envlen != 0) { LPWSTR env = new WCHAR [envlen]; if (GetEnvironmentVariable(L"_NT_SYMBOL_PATH", env, envlen) != 0) { - strapp(&path, L";"); - strapp(&path, env); + path = AppendString(path, L";"); + path = AppendString(path, env); } delete [] env; } @@ -869,15 +870,15 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () if (envlen != 0) { LPWSTR env = new WCHAR [envlen]; if (GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", env, envlen) != 0) { - strapp(&path, L";"); - strapp(&path, env); + path = AppendString(path, L";"); + path = AppendString(path, env); } delete [] env; } // Append Visual Studio 2010/2008 symbols cache directory. HKEY debuggerkey; - WCHAR symbolCacheDir [MAX_PATH]; + WCHAR symbolCacheDir [MAX_PATH] = {0}; LSTATUS regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\10.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); if (regstatus != ERROR_SUCCESS) regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\9.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); @@ -889,10 +890,10 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () regstatus = RegQueryValueEx(debuggerkey, L"SymbolCacheDir", NULL, &valuetype, (LPBYTE)&symbolCacheDir, &dirLength); if (regstatus == ERROR_SUCCESS && valuetype == REG_SZ) { - strapp(&path, L";srv*"); - strapp(&path, symbolCacheDir); - strapp(&path, L"\\MicrosoftPublicSymbols;srv*"); - strapp(&path, symbolCacheDir); + path = AppendString(path, L";srv*"); + path = AppendString(path, symbolCacheDir); + path = AppendString(path, L"\\MicrosoftPublicSymbols;srv*"); + path = AppendString(path, symbolCacheDir); } RegCloseKey(debuggerkey); } @@ -1053,6 +1054,11 @@ VOID VisualLeakDetector::configure () if (_wcsicmp(buffer, L"safe") == 0) { m_options |= VLD_OPT_SAFE_STACK_WALK; } + + GetPrivateProfileString(L"Options", L"ValidateHeapAllocs", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_VALIDATE_HEAPFREE; + } } // enabled - Determines if memory leak detection is enabled for the current @@ -1553,6 +1559,54 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) return leaksfound; } +// FindAllocedBlock - Find if a particular memory allocation is tracked inside of VLD. +// This is a really good example of how to iterate through the data structures +// that represent heaps and their associated memory blocks. +// Pre Condition: Be VERY sure that this is only called within a block that already has +// acquired a critical section for m_maplock. +// +// mem - The particular memory address to search for. +// +// Return Value: +// If mem is found, it will return the blockinfo_t pointer, otherwise NULL +// +blockinfo_t* VisualLeakDetector::FindAllocedBlock(LPCVOID mem, __out HANDLE& heap) +{ + blockinfo_t* result = NULL; + // Iterate through all heaps + for (HeapMap::Iterator it = m_heapmap->begin(); + it != m_heapmap->end(); + it++) + { + HANDLE heap_handle = (*it).first; + (heap_handle); // unused + heapinfo_t* heapPtr = (*it).second; + + // Iterate through all memory blocks in each heap + BlockMap& p_block_map = heapPtr->blockmap; + for (BlockMap::Iterator iter = p_block_map.begin(); + iter != p_block_map.end(); + iter++) + { + if ((*iter).first == mem) + { + // Found the block. + blockinfo_t* alloc_block = (*iter).second; + heap = heap_handle; + result = alloc_block; + break; + } + } + + if (result) + { + break; + } + } + + return result; +} + // unmapblock - Tracks memory blocks that are freed. Unmaps the specified block // from the block's information, relinquishing internally allocated resources. // @@ -1566,6 +1620,9 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) // VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) { + if (NULL == mem) + return; + // Find this heap's block map. EnterCriticalSection(&m_maplock); HeapMap::Iterator heapit = m_heapmap->find(heap); @@ -1580,8 +1637,43 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) BlockMap *blockmap = &(*heapit).second->blockmap; BlockMap::Iterator blockit = blockmap->find(mem); if (blockit == blockmap->end()) { - // This block is not in the block map. We must not have monitored this + // This memory block is not in the block map. We must not have monitored this // allocation (probably happened before VLD was initialized). + + // This can also result from allocating on one heap, and freeing on another heap. + // This is an especially bad way to corrupt the application. + // Now we have to search through every heap and every single block in each to make + // sure that this is indeed the case. + if (m_options & VLD_OPT_VALIDATE_HEAPFREE) + { + HANDLE other_heap = NULL; + blockinfo_t* alloc_block = FindAllocedBlock(mem, __out other_heap); + bool diff = other_heap != heap; // Check indeed if the other heap is different + if (alloc_block && alloc_block->callstack && diff) + { + report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); + report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); + report(L" Call Stack:\n"); + alloc_block->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + + // Now we need a way to print the current callstack at this point: + context_t context; + CAPTURE_CONTEXT(context); + // now what? + CallStack* stack_here = CallStack::Create(); + stack_here->getstacktrace(vld.m_maxtraceframes, context); + report(L"Deallocation Call stack.\n"); + report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); + report(L" Call Stack:\n"); + UINT dont_show_vld_frames = 1; + stack_here->dump(FALSE,dont_show_vld_frames); + // Now it should be safe to delete our temporary callstack + delete stack_here; + stack_here = NULL; + DebugBreak(); + } + } + LeaveCriticalSection(&m_maplock); return; } @@ -1675,7 +1767,7 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, assert(count != 0); if ( defaultCharUsed ) { - ::OutputDebugStringW(__FILEW__ L": " __FUNCTIONW__ L" - defaultChar was used while convertion from \""); + ::OutputDebugStringW(__FILEW__ L": " __FUNCTIONW__ L" - defaultChar was used while conversion from \""); ::OutputDebugStringW(modulepath); ::OutputDebugStringW(L"\" to ANSI \""); ::OutputDebugStringA(modulepatha); @@ -1833,7 +1925,6 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t size) { - void *block; tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. @@ -1848,7 +1939,7 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t } // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pmalloc(size); + void* block = pmalloc(size); if (firstcall) firstalloccall(tls); @@ -1915,7 +2006,6 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, void *mem, size_t size) { - void *block; tls_t *tls = vld.gettls(); // realloc is a CRT function and allocates from the CRT heap. @@ -1930,7 +2020,7 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = prealloc(mem, size); + void* block = prealloc(mem, size); if (firstcall) firstalloccall(tls); @@ -1978,7 +2068,6 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, char const *file, int line) { - void *block; tls_t *tls = vld.gettls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. @@ -1993,7 +2082,7 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, } // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = p_calloc_dbg(num, size, type, file, line); + void* block = p_calloc_dbg(num, size, type, file, line); if (firstcall) firstalloccall(tls); @@ -2030,7 +2119,6 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, char const *file, int line) { - void *block; tls_t *tls = vld.gettls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. @@ -2045,7 +2133,7 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, } // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = p_malloc_dbg(size, type, file, line); + void* block = p_malloc_dbg(size, type, file, line); if (firstcall) firstalloccall(tls); @@ -2082,7 +2170,6 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, char const *file, int line) { - void *block; tls_t *tls = vld.gettls(); // The debug new operator is a CRT function and allocates from the CRT heap. @@ -2097,7 +2184,7 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, } // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pnew_dbg_crt(size, type, file, line); + void* block = pnew_dbg_crt(size, type, file, line); if (firstcall) firstalloccall(tls); @@ -2134,7 +2221,6 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, char const *file, int line) { - void *block; tls_t *tls = vld.gettls(); bool firstcall = (tls->context.fp == 0x0); @@ -2146,7 +2232,7 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, } // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pnew_dbg(size, type, file, line); + void* block = pnew_dbg(size, type, file, line); if (firstcall) firstalloccall(tls); @@ -2180,7 +2266,6 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, char const *file, int line) { - void *block; tls_t *tls = vld.gettls(); bool firstcall = (tls->context.fp == 0x0); @@ -2192,7 +2277,7 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, } // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pnew_dbg_mfc(size, file, line); + void* block = pnew_dbg_mfc(size, file, line); if (firstcall) firstalloccall(tls); @@ -2232,7 +2317,6 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, char const *file, int line) { - void *block; tls_t *tls = vld.gettls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. @@ -2247,7 +2331,7 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = p_realloc_dbg(mem, size, type, file, line); + void* block = p_realloc_dbg(mem, size, type, file, line); if (firstcall) firstalloccall(tls); @@ -2501,13 +2585,7 @@ VOID VisualLeakDetector::RefreshModules() void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &context_ ) { - CallStack* callstack = NULL; - if (vld.m_options & VLD_OPT_SAFE_STACK_WALK) { - callstack = new SafeCallStack; - } - else { - callstack = new FastCallStack; - } + CallStack* callstack = CallStack::Create(); // Reset thread local flags and variables, in case any libraries called // into while mapping the block allocate some memory. @@ -2683,6 +2761,8 @@ BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) return excluded; } + + // _RtlReAllocateHeap - Calls to RtlReAllocateHeap are patched through to this // function. This function invokes the real RtlReAllocateHeap and then calls // VLD's reallocation tracking function. All arguments passed to this function @@ -3332,7 +3412,7 @@ void VisualLeakDetector::GlobalEnableLeakDetection () CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_INCLUDE | VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | - VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS; + VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS | VLD_OPT_VALIDATE_HEAPFREE; UINT32 VisualLeakDetector::GetOptions() { diff --git a/vld.h b/vld.h index 36c9e389..dc1e5e01 100644 --- a/vld.h +++ b/vld.h @@ -175,10 +175,13 @@ __declspec(dllimport) void VLDGetReportFilename(WCHAR *filename); // // option_mask: Only the following flags are checked // VLD_OPT_AGGREGATE_DUPLICATES +// VLD_OPT_MODULE_LIST_INCLUDE // VLD_OPT_SAFE_STACK_WALK // VLD_OPT_SLOW_DEBUGGER_DUMP // VLD_OPT_TRACE_INTERNAL_FRAMES // VLD_OPT_START_DISABLED +// VLD_OPT_SKIP_HEAPFREE_LEAKS +// VLD_OPT_VALIDATE_HEAPFREE // // maxDataDump: maximum number of user-data bytes to dump for each leaked block. // diff --git a/vld_def.h b/vld_def.h index 1a652867..02a560b7 100644 --- a/vld_def.h +++ b/vld_def.h @@ -36,4 +36,5 @@ #define VLD_OPT_VLDOFF 0x0400 // If set, VLD will be completely deactivated. It will not attach to any modules. #define VLD_OPT_REPORT_TO_STDOUT 0x0800 // If set, the memory leak report is sent to stdout. #define VLD_OPT_SKIP_HEAPFREE_LEAKS 0x1000 // If set, VLD skip HeapFree memory leaks. +#define VLD_OPT_VALIDATE_HEAPFREE 0x2000 // If set, VLD verfies and reports heap consistency for HeapFree calls. diff --git a/vld_vs10.sln b/vld_vs10.sln index d1422ea9..b61e8310 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -28,6 +28,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfc", "tests\mfc_dll\mfc.vc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 5 @@ -139,6 +144,16 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -150,5 +165,6 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal diff --git a/vldint.h b/vldint.h index 59b7c2a5..086e5ad6 100644 --- a/vldint.h +++ b/vldint.h @@ -77,7 +77,7 @@ struct blockinfo_t { CallStack *callstack; SIZE_T serialnumber; SIZE_T size; - SIZE_T blocks; + SIZE_T blocks; // The number of duplicates for this particular block. }; // BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. @@ -257,6 +257,7 @@ class VisualLeakDetector : public IMalloc // Utils static BOOL IsModuleExcluded (UINT_PTR returnaddress); + blockinfo_t* FindAllocedBlock(LPCVOID, __out HANDLE& heap); static void getcallstack( CallStack **&ppcallstack, context_t &context ); static inline void firstalloccall(tls_t * tls); void SetupReporting(); From 7dbb9c5385c04bb79f324ff11f0077c33bc0eeb5 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 3 May 2011 23:37:03 +0000 Subject: [PATCH 083/321] _aligned... functions and _recalloc support added git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66539 --- crtmfcpatch.h | 388 ++++++++++++++++++++++++++++- tests/basics/Allocs.cpp | 10 + tests/basics/LeakOption.h | 2 + tests/basics/basics.cpp | 9 +- vld.cpp | 500 ++++++++++++++++++++++++++++++++++++++ vldint.h | 21 ++ 6 files changed, 923 insertions(+), 7 deletions(-) diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 95529e7c..b27d618d 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -57,14 +57,25 @@ class CrtMfcPatch static void* __cdecl crtd__calloc_dbg (size_t num, size_t size, int type, char const *file, int line); static void* __cdecl crtd__malloc_dbg (size_t size, int type, const char *file, int line); static void* __cdecl crtd__realloc_dbg (void *mem, size_t size, int type, char const *file, int line); + static void* __cdecl crtd__recalloc_dbg (void *mem, size_t num, size_t size, int type, char const *file, int line); static void* __cdecl crtd__scalar_new_dbg (size_t size, int type, char const *file, int line); static void* __cdecl crtd__vector_new_dbg (size_t size, int type, char const *file, int line); static void* __cdecl crtd_calloc (size_t num, size_t size); static void* __cdecl crtd_malloc (size_t size); static void* __cdecl crtd_realloc (void *mem, size_t size); + static void* __cdecl crtd__recalloc (void *mem, size_t num, size_t size); static void* __cdecl crtd_scalar_new (size_t size); static void* __cdecl crtd_vector_new (size_t size); + static void* __cdecl crtd__aligned_malloc_dbg (size_t size, size_t alignment, int type, const char *file, int line); + static void* __cdecl crtd__aligned_offset_malloc_dbg (size_t size, size_t alignment, size_t offset, int type, const char *file, int line); + static void* __cdecl crtd__aligned_realloc_dbg (void *mem, size_t size, size_t alignment, int type, char const *file, int line); + static void* __cdecl crtd__aligned_offset_realloc_dbg (void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + static void* __cdecl crtd__aligned_malloc (size_t size, size_t alignment); + static void* __cdecl crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset); + static void* __cdecl crtd__aligned_realloc (void *memblock, size_t size, size_t alignment); + static void* __cdecl crtd__aligned_offset_realloc (void *memblock, size_t size, size_t alignment, size_t offset); + template static void* __cdecl crtd_new_dbg (context_t& context, size_t size, int type, char const *file, int line); template @@ -198,11 +209,11 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, // Returns the value returned by _realloc_dbg. // TEMPLATE_HEADER -void* CrtMfcPatch::crtd__realloc_dbg (void *mem, - size_t size, - int type, - char const *file, - int line) + void* CrtMfcPatch::crtd__realloc_dbg (void *mem, + size_t size, + int type, + char const *file, + int line) { static _realloc_dbg_t pcrtxxd__realloc_dbg = NULL; @@ -221,6 +232,49 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, return vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, type, file, line); } +// crtd__recalloc_dbg - Calls to _recalloc_dbg from msvcrXXd.dll are patched +// through to this function. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by _realloc_dbg. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, + size_t num, + size_t size, + int type, + char const *file, + int line) +{ + static _recalloc_dbg_t pcrtxxd__recalloc_dbg = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd__recalloc_dbg == NULL) { + // This is the first call to this function. Link to the real + // _realloc_dbg. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd__recalloc_dbg = (_recalloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_recalloc_dbg"); + } + + return vld.__recalloc_dbg(pcrtxxd__recalloc_dbg, context, mem, num, size, type, file, line); +} + // crtd__scalar_new_dbg - Calls to the CRT's debug scalar new operator from // msvcrXXd.dll are patched through to this function. // @@ -371,6 +425,330 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) return vld._realloc(pcrtxxd_realloc, context, mem, size); } +// crtd__recalloc - Calls to _recalloc from msvcrXXd.dll are patched through to +// this function. +// +// - dll (IN): The name of the dll +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from realloc. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, size_t size) +{ + static _recalloc_t pcrtxxd_recalloc = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd_recalloc == NULL) { + // This is the first call to this function. Link to the real realloc. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd_recalloc = (_recalloc_t)vld._RGetProcAddress(msvcrxxd, "_recalloc"); + } + + return vld.__recalloc(pcrtxxd_recalloc, context, mem, num, size); +} + +// crtd__aligned_malloc_dbg - Calls to _aligned_malloc_dbg from msvcrXXd.dll are patched +// through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by _aligned_malloc_dbg. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size, + size_t alignment, + int type, + char const *file, + int line) +{ + static _aligned_malloc_dbg_t pcrtxxd__malloc_dbg = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd__malloc_dbg == NULL) { + // This is the first call to this function. Link to the real + // _malloc_dbg. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd__malloc_dbg = (_aligned_malloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_malloc_dbg"); + } + + return vld.__aligned_malloc_dbg(pcrtxxd__malloc_dbg, context, size, alignment, type, file, line); +} + +// crtd__aligned_offset_malloc_dbg - Calls to _aligned_offset_malloc_dbg from msvcrXXd.dll are patched +// through to this function. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by _aligned_offset_malloc_dbg. +// +TEMPLATE_HEADER + void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) +{ + static _aligned_offset_malloc_dbg_t pcrtxxd__malloc_dbg = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd__malloc_dbg == NULL) { + // This is the first call to this function. Link to the real + // _malloc_dbg. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd__malloc_dbg = (_aligned_offset_malloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_malloc_dbg"); + } + + return vld.__aligned_offset_malloc_dbg(pcrtxxd__malloc_dbg, context, size, alignment, offset, type, file, line); +} + +// crtd__aligned_realloc_dbg - Calls to _aligned_realloc_dbg from msvcrXXd.dll are patched +// through to this function. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by _aligned_realloc_dbg. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem, + size_t size, + size_t alignment, + int type, + char const *file, + int line) +{ + static _aligned_realloc_dbg_t pcrtxxd__realloc_dbg = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd__realloc_dbg == NULL) { + // This is the first call to this function. Link to the real + // _realloc_dbg. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd__realloc_dbg = (_aligned_realloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_realloc_dbg"); + } + + return vld.__aligned_realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, alignment, type, file, line); +} + +// crtd__aligned_offset_realloc_dbg - Calls to _aligned_offset_realloc_dbg from msvcrXXd.dll are patched +// through to this function. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by _aligned_offset_realloc_dbg. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void *mem, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) +{ + static _aligned_offset_realloc_dbg_t pcrtxxd__realloc_dbg = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd__realloc_dbg == NULL) { + // This is the first call to this function. Link to the real + // _realloc_dbg. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd__realloc_dbg = (_aligned_offset_realloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_realloc_dbg"); + } + + return vld.__aligned_offset_realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, alignment, offset, type, file, line); +} + +// crtd__aligned_malloc - Calls to malloc from msvcrXXd.dll are patched through to +// this function. +// +// - dll (IN): The name of the dll +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the valued returned from malloc. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t alignment) +{ + static _aligned_malloc_t pcrtxxd_malloc = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd_malloc == NULL) { + // This is the first call to this function. Link to the real malloc. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd_malloc = (_aligned_malloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_malloc"); + } + + return vld.__aligned_malloc(pcrtxxd_malloc, context, size, alignment); +} + +// crtd__aligned_offset_malloc - Calls to malloc from msvcrXXd.dll are patched through to +// this function. +// +// - dll (IN): The name of the dll +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the valued returned from malloc. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset) +{ + static _aligned_offset_malloc_t pcrtxxd_malloc = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd_malloc == NULL) { + // This is the first call to this function. Link to the real malloc. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd_malloc = (_aligned_offset_malloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_malloc"); + } + + return vld.__aligned_offset_malloc(pcrtxxd_malloc, context, size, alignment, offset); +} + +// crtd__aligned_realloc - Calls to realloc from msvcrXXd.dll are patched through to +// this function. +// +// - dll (IN): The name of the dll +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from realloc. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t size, size_t alignment) +{ + static _aligned_realloc_t pcrtxxd_realloc = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd_realloc == NULL) { + // This is the first call to this function. Link to the real realloc. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd_realloc = (_aligned_realloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_realloc"); + } + + return vld.__aligned_realloc(pcrtxxd_realloc, context, mem, size, alignment); +} + +// crtd__aligned_offset_realloc - Calls to realloc from msvcrXXd.dll are patched through to +// this function. +// +// - dll (IN): The name of the dll +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from realloc. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, size_t size, size_t alignment, size_t offset) +{ + static _aligned_offset_realloc_t pcrtxxd_realloc = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd_realloc == NULL) { + // This is the first call to this function. Link to the real realloc. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd_realloc = (_aligned_offset_realloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_realloc"); + } + + return vld.__aligned_offset_realloc(pcrtxxd_realloc, context, mem, size, alignment, offset); +} + // crtd_scalar_new - Calls to the CRT's scalar new operator from msvcrXXd.dll // are patched through to this function. // diff --git a/tests/basics/Allocs.cpp b/tests/basics/Allocs.cpp index ecc27878..8bb89ba5 100644 --- a/tests/basics/Allocs.cpp +++ b/tests/basics/Allocs.cpp @@ -38,6 +38,7 @@ void AllocF(LeakOption type) { int* temp = (int*)malloc(17); leaked_memory = (int*)realloc(temp, 23); + leaked_memory = (int*)_recalloc(leaked_memory, 1, 31); int* temp_dbg = (int*)malloc(9); leaked_memory_dbg = (int*)_realloc_dbg(temp_dbg, 21, _NORMAL_BLOCK, __FILE__, __LINE__); } @@ -46,6 +47,15 @@ void AllocF(LeakOption type) void* leaked = CoTaskMemAlloc(7); void* realloced = CoTaskMemRealloc(leaked, 29); } + else if (type == eAlignedMalloc) + { + void* leaked = _aligned_offset_malloc(64, 16, 1); + leaked_memory = (int*)_aligned_malloc(64, 16); + leaked_memory_dbg = (int*)_aligned_malloc_dbg(32, 16, __FILE__, __LINE__); + leaked = (int*)_aligned_offset_realloc(leaked, 48, 16, 2); + leaked_memory = (int*)_aligned_realloc(leaked_memory, 128, 16); + leaked_memory_dbg = (int*)_aligned_realloc_dbg(leaked_memory_dbg, 48, 16, __FILE__, __LINE__); + } } void AllocE(LeakOption type) diff --git a/tests/basics/LeakOption.h b/tests/basics/LeakOption.h index 7dc5b743..a59df491 100644 --- a/tests/basics/LeakOption.h +++ b/tests/basics/LeakOption.h @@ -9,6 +9,8 @@ enum LeakOption eCalloc, // "calloc" eRealloc, // "realloc" eCoTaskMem, // For COM, use "CoTaskMem" + eAlignedMalloc, // "_aligned_malloc" + eCount, }; diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index c3c9f504..34584066 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -71,10 +71,15 @@ int _tmain(int argc, _TCHAR* argv[]) leak_type = eCoTaskMem; multiplayer = 1; } + else if (_tcsicmp(_T("AlignedMalloc"), argv[1]) == 0) + { + leak_type = eAlignedMalloc; + multiplayer = 3; + } else if (_tcsicmp(_T("all"), argv[1]) == 0) { checkAll = true; - multiplayer = 11; + multiplayer = 14; } else { @@ -90,7 +95,7 @@ int _tmain(int argc, _TCHAR* argv[]) LeakMemory(leak_type,repeat); else { - for (int leak_type = eMalloc; leak_type <= eCoTaskMem; leak_type++) + for (int leak_type = 0; leak_type < eCount; leak_type++) LeakMemory((LeakOption)leak_type,repeat); } int leaks = (int)VLDGetLeaksCount(false); diff --git a/vld.cpp b/vld.cpp index 356d5e83..8d64230a 100644 --- a/vld.cpp +++ b/vld.cpp @@ -265,13 +265,23 @@ static patchentry_t msvcr90dPatch [] = { "_calloc_dbg", NULL, VS90::crtd__calloc_dbg, "_malloc_dbg", NULL, VS90::crtd__malloc_dbg, "_realloc_dbg", NULL, VS90::crtd__realloc_dbg, + "_recalloc_dbg", NULL, VS90::crtd__recalloc_dbg, scalar_new_dbg_name, NULL, VS90::crtd__scalar_new_dbg, vector_new_dbg_name, NULL, VS90::crtd__vector_new_dbg, "calloc", NULL, VS90::crtd_calloc, "malloc", NULL, VS90::crtd_malloc, "realloc", NULL, VS90::crtd_realloc, + "_recalloc", NULL, VS90::crtd__recalloc, scalar_new_name, NULL, VS90::crtd_scalar_new, vector_new_name, NULL, VS90::crtd_vector_new, + "_aligned_malloc_dbg", NULL, VS90::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", NULL, VS90::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", NULL, VS90::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", NULL, VS90::crtd__aligned_offset_realloc_dbg, + "_aligned_malloc", NULL, VS90::crtd__aligned_malloc, + "_aligned_offset_malloc", NULL, VS90::crtd__aligned_offset_malloc, + "_aligned_realloc", NULL, VS90::crtd__aligned_realloc, + "_aligned_offset_realloc", NULL, VS90::crtd__aligned_offset_realloc, NULL, NULL, NULL }; @@ -279,13 +289,23 @@ static patchentry_t msvcr100dPatch [] = { "_calloc_dbg", NULL, VS100::crtd__calloc_dbg, "_malloc_dbg", NULL, VS100::crtd__malloc_dbg, "_realloc_dbg", NULL, VS100::crtd__realloc_dbg, + "_recalloc_dbg", NULL, VS100::crtd__recalloc_dbg, scalar_new_dbg_name, NULL, VS100::crtd__scalar_new_dbg, vector_new_dbg_name, NULL, VS100::crtd__vector_new_dbg, "calloc", NULL, VS100::crtd_calloc, "malloc", NULL, VS100::crtd_malloc, "realloc", NULL, VS100::crtd_realloc, + "_recalloc", NULL, VS100::crtd__recalloc, scalar_new_name, NULL, VS100::crtd_scalar_new, vector_new_name, NULL, VS100::crtd_vector_new, + "_aligned_malloc_dbg", NULL, VS100::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", NULL, VS100::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", NULL, VS100::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", NULL, VS100::crtd__aligned_offset_realloc_dbg, + "_aligned_malloc", NULL, VS100::crtd__aligned_malloc, + "_aligned_offset_malloc", NULL, VS100::crtd__aligned_offset_malloc, + "_aligned_realloc", NULL, VS100::crtd__aligned_realloc, + "_aligned_offset_realloc", NULL, VS100::crtd__aligned_offset_realloc, NULL, NULL, NULL }; @@ -2028,6 +2048,431 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, return block; } +// _recalloc - This function is just a wrapper around the real _recalloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - prealloc (IN): Pointer to the particular realloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified realloc. +// +void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, + context_t& context, + void *mem, + size_t num, + size_t size) +{ + tls_t *tls = vld.gettls(); + + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size); + + if (firstcall) + firstalloccall(tls); + + return block; +} + +// __aligned_malloc - This function is just a wrapper around the real malloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - pmalloc (IN): Pointer to the particular malloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned from the specified malloc. +// +void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, size_t size, size_t alignment) +{ + tls_t *tls = vld.gettls(); + + // malloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pmalloc(size, alignment); + + if (firstcall) + firstalloccall(tls); + + return block; +} + +// __aligned_offset_malloc - This function is just a wrapper around the real malloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - pmalloc (IN): Pointer to the particular malloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned from the specified _aligned_offset_malloc. +// +void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, size_t size, size_t alignment, size_t offset) +{ + tls_t *tls = vld.gettls(); + + // malloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pmalloc(size, alignment, offset); + + if (firstcall) + firstalloccall(tls); + + return block; +} + +// __aligned_realloc - This function is just a wrapper around the real realloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - prealloc (IN): Pointer to the particular realloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified _aligned_realloc. +// +void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, + context_t& context, + void *mem, + size_t size, + size_t alignment) +{ + tls_t *tls = vld.gettls(); + + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = prealloc(mem, size, alignment); + + if (firstcall) + firstalloccall(tls); + + return block; +} + +// __aligned_offset_realloc - This function is just a wrapper around the real realloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - prealloc (IN): Pointer to the particular realloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified _aligned_offset_realloc. +// +void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t prealloc, + context_t& context, + void *mem, + size_t size, + size_t alignment, + size_t offset) +{ + tls_t *tls = vld.gettls(); + + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = prealloc(mem, size, alignment, offset); + + if (firstcall) + firstalloccall(tls); + + return block; +} + +// __aligned_malloc_dbg - This function is just a wrapper around the real _aligned_malloc_dbg +// that sets appropriate flags to be consulted when the memory is actually +// allocated by RtlAllocateHeap. +// +// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to +// call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _aligned_malloc_dbg. +// +void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_dbg, + context_t& context, + size_t size, + size_t alignment, + int type, + char const *file, + int line) +{ + tls_t *tls = vld.gettls(); + + // _malloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_malloc_dbg(size, alignment, type, file, line); + + if (firstcall) + firstalloccall(tls); + + return block; +} + +// __aligned_offset_malloc_dbg - This function is just a wrapper around the real +// _aligned_offset_malloc_dbg that sets appropriate flags to be consulted when +// the memory is actually allocated by RtlAllocateHeap. +// +// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to +// call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _aligned_malloc_dbg. +// +void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_malloc_dbg, + context_t& context, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) +{ + tls_t *tls = vld.gettls(); + + // _malloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_malloc_dbg(size, alignment, offset, type, file, line); + + if (firstcall) + firstalloccall(tls); + + return block; +} + +// _aligned_realloc_debug - This function is just a wrapper around the real +// _aligned_realloc_dbg that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_realloc_dbg, + context_t& context, + void *mem, + size_t size, + size_t alignment, + int type, + char const *file, + int line) +{ + tls_t *tls = vld.gettls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_realloc_dbg(mem, size, alignment, type, file, line); + + if (firstcall) + firstalloccall(tls); + + return block; +} + +// _aligned_offset_realloc_debug - This function is just a wrapper around the real +// _aligned_offset_realloc_dbg that sets appropriate flags to be consulted when +// the memory is actually allocated by RtlAllocateHeap. +// +// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_realloc_dbg, + context_t& context, + void *mem, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) +{ + tls_t *tls = vld.gettls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_realloc_dbg(mem, size, alignment, offset, type, file, line); + + if (firstcall) + firstalloccall(tls); + + return block; +} + //////////////////////////////////////////////////////////////////////////////// // // Debug CRT and MFC IAT Replacement Functions @@ -2339,6 +2784,61 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, return block; } +// __recalloc_debug - This function is just a wrapper around the real +// _recalloc_dbg that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - p_recalloc_dbg (IN): Pointer to the particular __realloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, + context_t& context, + void *mem, + size_t num, + size_t size, + int type, + char const *file, + int line) +{ + tls_t *tls = vld.gettls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, type, file, line); + + if (firstcall) + firstalloccall(tls); + + return block; +} + //////////////////////////////////////////////////////////////////////////////// // // Win32 IAT Replacement Functions diff --git a/vldint.h b/vldint.h index 086e5ad6..12a97571 100644 --- a/vldint.h +++ b/vldint.h @@ -59,6 +59,7 @@ extern "C" __declspec(dllexport) void VLDRestore (); typedef void* (__cdecl *_calloc_dbg_t) (size_t, size_t, int, const char*, int); typedef void* (__cdecl *_malloc_dbg_t) (size_t, int, const char *, int); typedef void* (__cdecl *_realloc_dbg_t) (void *, size_t, int, const char *, int); +typedef void* (__cdecl *_recalloc_dbg_t) (void *, size_t, size_t, int, const char *, int); typedef void* (__cdecl *calloc_t) (size_t, size_t); typedef HRESULT (__stdcall *CoGetMalloc_t) (DWORD, LPMALLOC *); typedef LPVOID (__stdcall *CoTaskMemAlloc_t) (SIZE_T); @@ -68,6 +69,15 @@ typedef void* (__cdecl *new_t) (size_t); typedef void* (__cdecl *new_dbg_crt_t) (size_t, int, const char *, int); typedef void* (__cdecl *new_dbg_mfc_t) (size_t, const char *, int); typedef void* (__cdecl *realloc_t) (void *, size_t); +typedef void* (__cdecl *_recalloc_t) (void *, size_t, size_t); +typedef void* (__cdecl *_aligned_malloc_t) (size_t, size_t); +typedef void* (__cdecl *_aligned_offset_malloc_t) (size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_realloc_t) (void *, size_t, size_t); +typedef void* (__cdecl *_aligned_offset_realloc_t) (void *, size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_malloc_dbg_t) (size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_offset_malloc_dbg_t) (size_t, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_realloc_dbg_t) (void *, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_offset_realloc_dbg_t) (void *, size_t, size_t, size_t, int, const char *, int); // Data is collected for every block allocated from any heap in the process. // The data is stored in this structure and these structures are stored in @@ -188,6 +198,7 @@ class VisualLeakDetector : public IMalloc void* _malloc (malloc_t pmalloc, context_t& context, size_t size); void* _new (new_t pnew, context_t& context, size_t size); void* _realloc (realloc_t prealloc, context_t& context, void *mem, size_t size); + void* __recalloc (_recalloc_t precalloc, context_t& context, void *mem, size_t num, size_t size); // Debug CRT and MFC common handlers void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, size_t num, size_t size, int type, char const *file, int line); @@ -196,6 +207,16 @@ class VisualLeakDetector : public IMalloc void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, void *mem, size_t size, int type, char const *file, int line); + void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, void *mem, size_t num, size_t size, int type, char const *file, int line); + + void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, size_t size, size_t alignment); + void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, size_t size, size_t alignment, size_t offset); + void *__aligned_realloc (_aligned_realloc_t p_aligned_realloc, context_t& context, void *mem, size_t size, size_t alignment); + void *__aligned_offset_realloc (_aligned_offset_realloc_t p_aligned_offset_realloc, context_t& context, void *mem, size_t size, size_t alignment, size_t offset); + void* __aligned_malloc_dbg (_aligned_malloc_dbg_t p_aligned_malloc_dbg, context_t& context, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_aligned_offset_malloc_dbg, context_t& context, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + void* __aligned_realloc_dbg (_aligned_realloc_dbg_t p_aligned_realloc_dbg, context_t& context, void *mem, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_aligned_offset_realloc_dbg, context_t& context, void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); //////////////////////////////////////////////////////////////////////////////// // Public IMalloc methods - for support of COM-based memory leak detection. From 108cff8d4563336688c225b5c66461caad18de6a Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Wed, 4 May 2011 09:52:28 +0000 Subject: [PATCH 084/321] Fixing bug when dumping out the resolved callstack. It was cutting short a character every so often. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66553 --- callstack.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index a8f479a5..9bceab5b 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -472,8 +472,8 @@ void CallStack::DumpResolved() const while(index < m_ResolvedLength) { print(resolved_stack); - resolved_stack += MAXREPORTLENGTH + 1; - index += MAXREPORTLENGTH + 1; + resolved_stack += MAXREPORTLENGTH; + index += MAXREPORTLENGTH; } } } From 209ea273c3a0b477bb1def126a9435615511d152 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 4 May 2011 23:14:59 +0000 Subject: [PATCH 085/321] Minor code refactoring git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66570 --- callstack.cpp | 339 +++++++++++++++++++++++++------------------------- vld.cpp | 75 +++++------ vldint.h | 3 + 3 files changed, 203 insertions(+), 214 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 9bceab5b..2e799cb6 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -101,30 +101,30 @@ CallStack* CallStack::Create() // BOOL CallStack::operator == (const CallStack &other) const { - if (m_size != other.m_size) { - // They can't be equal if the sizes are different. - return FALSE; - } - - // Walk the chunk list and within each chunk walk the frames array until we - // either find a mismatch, or until we reach the end of the call stacks. - const CallStack::chunk_t *prevchunk = NULL; - const CallStack::chunk_t *chunk = &m_store; - const CallStack::chunk_t *otherchunk = &other.m_store; - while (prevchunk != m_topchunk) { - for (UINT32 index = 0; index < ((chunk == m_topchunk) ? m_topindex : CALLSTACKCHUNKSIZE); index++) { - if (chunk->frames[index] != otherchunk->frames[index]) { - // Found a mismatch. They are not equal. - return FALSE; - } - } - prevchunk = chunk; - chunk = chunk->next; - otherchunk = otherchunk->next; - } - - // Reached the end of the call stacks. They are equal. - return TRUE; + if (m_size != other.m_size) { + // They can't be equal if the sizes are different. + return FALSE; + } + + // Walk the chunk list and within each chunk walk the frames array until we + // either find a mismatch, or until we reach the end of the call stacks. + const CallStack::chunk_t *prevchunk = NULL; + const CallStack::chunk_t *chunk = &m_store; + const CallStack::chunk_t *otherchunk = &other.m_store; + while (prevchunk != m_topchunk) { + for (UINT32 index = 0; index < ((chunk == m_topchunk) ? m_topindex : CALLSTACKCHUNKSIZE); index++) { + if (chunk->frames[index] != otherchunk->frames[index]) { + // Found a mismatch. They are not equal. + return FALSE; + } + } + prevchunk = chunk; + chunk = chunk->next; + otherchunk = otherchunk->next; + } + + // Reached the end of the call stacks. They are equal. + return TRUE; } // operator [] - Random access operator. Retrieves the frame at the specified @@ -146,14 +146,14 @@ BOOL CallStack::operator == (const CallStack &other) const // UINT_PTR CallStack::operator [] (UINT32 index) const { - UINT32 chunknumber = index / CALLSTACKCHUNKSIZE; - const CallStack::chunk_t *chunk = &m_store; + UINT32 chunknumber = index / CALLSTACKCHUNKSIZE; + const CallStack::chunk_t *chunk = &m_store; - for (UINT32 count = 0; count < chunknumber; count++) { - chunk = chunk->next; - } + for (UINT32 count = 0; count < chunknumber; count++) { + chunk = chunk->next; + } - return chunk->frames[index % CALLSTACKCHUNKSIZE]; + return chunk->frames[index % CALLSTACKCHUNKSIZE]; } // clear - Resets the CallStack, returning it to a state where no frames have @@ -241,7 +241,10 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const wcsstr(sourceinfo.FileName, L"dbgheap.c") || wcsstr(sourceinfo.FileName, L"malloc.c") || wcsstr(sourceinfo.FileName, L"new.cpp") || - wcsstr(sourceinfo.FileName, L"newaop.cpp")) { + wcsstr(sourceinfo.FileName, L"newaop.cpp") || + wcsstr(sourceinfo.FileName, L"dbgcalloc.c") || + wcsstr(sourceinfo.FileName, L"realloc.c") || + wcsstr(sourceinfo.FileName, L"dbgrealloc.c")) { // Don't show frames in files internal to the heap. LeaveCriticalSection(&symbollock); continue; @@ -488,14 +491,14 @@ void CallStack::DumpResolved() const // DWORD CallStack::getHashValue () const { - DWORD hashcode = 0xD202EF8D; - - // Iterate through each frame in the call stack. - for (UINT32 frame = 0; frame < m_size; frame++) { - UINT_PTR programcounter = (*this)[frame]; - hashcode = CalculateCRC32(programcounter, hashcode); - } - return hashcode; + DWORD hashcode = 0xD202EF8D; + + // Iterate through each frame in the call stack. + for (UINT32 frame = 0; frame < m_size; frame++) { + UINT_PTR programcounter = (*this)[frame]; + hashcode = CalculateCRC32(programcounter, hashcode); + } + return hashcode; } // push_back - Pushes a frame's program counter onto the CallStack. Pushes are @@ -513,26 +516,26 @@ DWORD CallStack::getHashValue () const // VOID CallStack::push_back (const UINT_PTR programcounter) { - if (m_size == m_capacity) { - // At current capacity. Allocate additional storage. - CallStack::chunk_t *chunk = new CallStack::chunk_t; - chunk->next = NULL; - m_topchunk->next = chunk; - m_topchunk = chunk; - m_topindex = 0; - m_capacity += CALLSTACKCHUNKSIZE; - } - else if (m_topindex == CALLSTACKCHUNKSIZE) { - // There is more capacity, but not in this chunk. Go to the next chunk. - // Note that this only happens if this CallStack has previously been - // cleared (clearing resets the data, but doesn't give up any allocated - // space). - m_topchunk = m_topchunk->next; - m_topindex = 0; - } - - m_topchunk->frames[m_topindex++] = programcounter; - m_size++; + if (m_size == m_capacity) { + // At current capacity. Allocate additional storage. + CallStack::chunk_t *chunk = new CallStack::chunk_t; + chunk->next = NULL; + m_topchunk->next = chunk; + m_topchunk = chunk; + m_topindex = 0; + m_capacity += CALLSTACKCHUNKSIZE; + } + else if (m_topindex == CALLSTACKCHUNKSIZE) { + // There is more capacity, but not in this chunk. Go to the next chunk. + // Note that this only happens if this CallStack has previously been + // cleared (clearing resets the data, but doesn't give up any allocated + // space). + m_topchunk = m_topchunk->next; + m_topindex = 0; + } + + m_topchunk->frames[m_topindex++] = programcounter; + m_size++; } // getstacktrace - Traces the stack as far back as possible, or until 'maxdepth' @@ -556,71 +559,71 @@ VOID CallStack::push_back (const UINT_PTR programcounter) // VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) { - UINT32 count = 0; - UINT_PTR* framepointer = context.fp; + UINT32 count = 0; + UINT_PTR* framepointer = context.fp; #if defined(_M_IX86) - while (count < maxdepth) { - if (*framepointer < (UINT_PTR)framepointer) { - if (*framepointer == NULL) { - // Looks like we reached the end of the stack. - break; - } - else { - // Invalid frame pointer. Frame pointer addresses should always - // increase as we move up the stack. - m_status |= CALLSTACK_STATUS_INCOMPLETE; - break; - } - } - if (*framepointer & (sizeof(UINT_PTR*) - 1)) { - // Invalid frame pointer. Frame pointer addresses should always - // be aligned to the size of a pointer. This probably means that - // we've encountered a frame that was created by a module built with - // frame pointer omission (FPO) optimization turned on. - m_status |= CALLSTACK_STATUS_INCOMPLETE; - break; - } - if (IsBadReadPtr((UINT*)*framepointer, sizeof(UINT_PTR*))) { - // Bogus frame pointer. Again, this probably means that we've - // encountered a frame built with FPO optimization. - m_status |= CALLSTACK_STATUS_INCOMPLETE; - break; - } - count++; - push_back(*(framepointer + 1)); - framepointer = (UINT_PTR*)*framepointer; - } + while (count < maxdepth) { + if (*framepointer < (UINT_PTR)framepointer) { + if (*framepointer == NULL) { + // Looks like we reached the end of the stack. + break; + } + else { + // Invalid frame pointer. Frame pointer addresses should always + // increase as we move up the stack. + m_status |= CALLSTACK_STATUS_INCOMPLETE; + break; + } + } + if (*framepointer & (sizeof(UINT_PTR*) - 1)) { + // Invalid frame pointer. Frame pointer addresses should always + // be aligned to the size of a pointer. This probably means that + // we've encountered a frame that was created by a module built with + // frame pointer omission (FPO) optimization turned on. + m_status |= CALLSTACK_STATUS_INCOMPLETE; + break; + } + if (IsBadReadPtr((UINT*)*framepointer, sizeof(UINT_PTR*))) { + // Bogus frame pointer. Again, this probably means that we've + // encountered a frame built with FPO optimization. + m_status |= CALLSTACK_STATUS_INCOMPLETE; + break; + } + count++; + push_back(*(framepointer + 1)); + framepointer = (UINT_PTR*)*framepointer; + } #elif defined(_M_X64) - UINT32 maxframes = min(62, maxdepth + 10); - static USHORT (WINAPI *s_pfnCaptureStackBackTrace)(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash) = 0; - if (s_pfnCaptureStackBackTrace == 0) - { - const HMODULE hNtDll = GetModuleHandleW(L"ntdll.dll"); - reinterpret_cast(s_pfnCaptureStackBackTrace) - = ::GetProcAddress(hNtDll, "RtlCaptureStackBackTrace"); - if (s_pfnCaptureStackBackTrace == 0) - return; - } - UINT_PTR* myFrames = new UINT_PTR[maxframes]; - ZeroMemory(myFrames, sizeof(UINT_PTR) * maxframes); - s_pfnCaptureStackBackTrace(0, maxframes, (PVOID*)myFrames, NULL); - UINT32 startIndex = 0; - while (count < maxframes) { - if (myFrames[count] == 0) - break; - if (myFrames[count] == *(framepointer + 1)) - startIndex = count; - count++; - } - count = startIndex; - while (count < maxframes) { - if (myFrames[count] == 0) - break; - push_back(myFrames[count]); - count++; - } - delete [] myFrames; + UINT32 maxframes = min(62, maxdepth + 10); + static USHORT (WINAPI *s_pfnCaptureStackBackTrace)(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash) = 0; + if (s_pfnCaptureStackBackTrace == 0) + { + const HMODULE hNtDll = GetModuleHandleW(L"ntdll.dll"); + reinterpret_cast(s_pfnCaptureStackBackTrace) + = ::GetProcAddress(hNtDll, "RtlCaptureStackBackTrace"); + if (s_pfnCaptureStackBackTrace == 0) + return; + } + UINT_PTR* myFrames = new UINT_PTR[maxframes]; + ZeroMemory(myFrames, sizeof(UINT_PTR) * maxframes); + s_pfnCaptureStackBackTrace(0, maxframes, (PVOID*)myFrames, NULL); + UINT32 startIndex = 0; + while (count < maxframes) { + if (myFrames[count] == 0) + break; + if (myFrames[count] == *(framepointer + 1)) + startIndex = count; + count++; + } + count = startIndex; + while (count < maxframes) { + if (myFrames[count] == 0) + break; + push_back(myFrames[count]); + count++; + } + delete [] myFrames; #endif } @@ -645,58 +648,58 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) // VOID SafeCallStack::getstacktrace (UINT32 maxdepth, context_t& context) { - UINT_PTR* framepointer = context.fp; - DWORD architecture = X86X64ARCHITECTURE; - CONTEXT currentcontext; - memset(¤tcontext, 0, sizeof(currentcontext)); + UINT_PTR* framepointer = context.fp; + DWORD architecture = X86X64ARCHITECTURE; + CONTEXT currentcontext; + memset(¤tcontext, 0, sizeof(currentcontext)); - // Get the required values for initialization of the STACKFRAME64 structure - // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame. + // Get the required values for initialization of the STACKFRAME64 structure + // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame. #if defined(_M_IX86) - UINT_PTR programcounter = *(framepointer + 1); - UINT_PTR stackpointer = (*framepointer) - maxdepth * 10 * sizeof(void*); // An approximation. - currentcontext.SPREG = stackpointer; - currentcontext.BPREG = (DWORD64)framepointer; - currentcontext.IPREG = programcounter; + UINT_PTR programcounter = *(framepointer + 1); + UINT_PTR stackpointer = (*framepointer) - maxdepth * 10 * sizeof(void*); // An approximation. + currentcontext.SPREG = stackpointer; + currentcontext.BPREG = (DWORD64)framepointer; + currentcontext.IPREG = programcounter; #elif defined(_M_X64) - currentcontext.SPREG = context.Rsp; - currentcontext.BPREG = (DWORD64)framepointer; - currentcontext.IPREG = context.Rip; + currentcontext.SPREG = context.Rsp; + currentcontext.BPREG = (DWORD64)framepointer; + currentcontext.IPREG = context.Rip; #else - // If you want to retarget Visual Leak Detector to another processor - // architecture then you'll need to provide architecture-specific code to - // obtain the program counter and stack pointer from the given frame pointer. + // If you want to retarget Visual Leak Detector to another processor + // architecture then you'll need to provide architecture-specific code to + // obtain the program counter and stack pointer from the given frame pointer. #error "Visual Leak Detector is not supported on this architecture." #endif // _M_IX86 || _M_X64 - // Initialize the STACKFRAME64 structure. - STACKFRAME64 frame; - memset(&frame, 0x0, sizeof(frame)); - frame.AddrPC.Offset = currentcontext.IPREG; - frame.AddrPC.Mode = AddrModeFlat; - frame.AddrStack.Offset = currentcontext.SPREG; - frame.AddrStack.Mode = AddrModeFlat; - frame.AddrFrame.Offset = currentcontext.BPREG; - frame.AddrFrame.Mode = AddrModeFlat; - frame.Virtual = TRUE; - - // Walk the stack. - EnterCriticalSection(&stackwalklock); - UINT32 count = 0; - while (count < maxdepth) { - count++; - if (!StackWalk64(architecture, currentprocess, currentthread, &frame, ¤tcontext, NULL, - SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { - // Couldn't trace back through any more frames. - break; - } - if (frame.AddrFrame.Offset == 0) { - // End of stack. - break; - } - - // Push this frame's program counter onto the CallStack. - push_back((UINT_PTR)frame.AddrPC.Offset); - } - LeaveCriticalSection(&stackwalklock); + // Initialize the STACKFRAME64 structure. + STACKFRAME64 frame; + memset(&frame, 0x0, sizeof(frame)); + frame.AddrPC.Offset = currentcontext.IPREG; + frame.AddrPC.Mode = AddrModeFlat; + frame.AddrStack.Offset = currentcontext.SPREG; + frame.AddrStack.Mode = AddrModeFlat; + frame.AddrFrame.Offset = currentcontext.BPREG; + frame.AddrFrame.Mode = AddrModeFlat; + frame.Virtual = TRUE; + + // Walk the stack. + EnterCriticalSection(&stackwalklock); + UINT32 count = 0; + while (count < maxdepth) { + count++; + if (!StackWalk64(architecture, currentprocess, currentthread, &frame, ¤tcontext, NULL, + SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { + // Couldn't trace back through any more frames. + break; + } + if (frame.AddrFrame.Offset == 0) { + // End of stack. + break; + } + + // Push this frame's program counter onto the CallStack. + push_back((UINT_PTR)frame.AddrPC.Offset); + } + LeaveCriticalSection(&stackwalklock); } diff --git a/vld.cpp b/vld.cpp index 8d64230a..f3ba90cb 100644 --- a/vld.cpp +++ b/vld.cpp @@ -3145,11 +3145,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si tls->context = context; - BOOL crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - - // The module that initiated this allocation is included in leak - // detection. Map this block to the specified heap. - vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); + AllocateHeap(tls, heap, block, size); if (firstcall) firstalloccall(tls); @@ -3190,11 +3186,7 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) tls->context = context; - BOOL crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - - // The module that initiated this allocation is included in leak - // detection. Map this block to the specified heap. - vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); + AllocateHeap(tls, heap, block, size); if (firstcall) firstalloccall(tls); @@ -3202,6 +3194,15 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) return block; } +void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size) +{ + BOOL crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + + // The module that initiated this allocation is included in leak + // detection. Map this block to the specified heap. + vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); +} + // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. // This function calls VLD's free tracking function and then invokes the real // RtlFreeHeap. Pretty much all memory frees will eventually result in a call @@ -3232,12 +3233,7 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) // for kernel32.dll BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) { - BOOL status; - - // Unmap the block from the specified heap. - vld.unmapblock(heap, mem); - - status = RtlFreeHeap(heap, flags, mem); + BOOL status = _RtlFreeHeap(heap, flags, mem); return status; } @@ -3314,27 +3310,9 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID CAPTURE_CONTEXT(context); } - BOOL crtalloc; - crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - - // Reset thread local flags and variables, in case any libraries called - // into while remapping the block allocate some memory. - tls->context.fp = 0x0; - if (crtalloc) - tls->flags |= VLD_TLS_CRTALLOC; - else - tls->flags &=~VLD_TLS_CRTALLOC; + ReAllocateHeap(tls, heap, mem, newmem, size); - // The module that initiated this allocation is included in leak - // detection. Remap the block. - vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack); - -#ifdef _DEBUG - if(tls->context.fp != 0) - __debugbreak(); -#endif tls->context = context; - tls->flags |= crtalloc; if (firstcall) { @@ -3377,7 +3355,22 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S CAPTURE_CONTEXT(context); } - BOOL crtalloc; + ReAllocateHeap(tls, heap, mem, newmem, size); + + tls->context = context; + + if (firstcall) + { + firstalloccall(tls); + tls->ppcallstack = NULL; + } + + return newmem; +} + +void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size) +{ + BOOL crtalloc; crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; // Reset thread local flags and variables, in case any libraries called @@ -3396,19 +3389,9 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S if(tls->context.fp != 0) __debugbreak(); #endif - tls->context = context; tls->flags |= crtalloc; - - if (firstcall) - { - firstalloccall(tls); - tls->ppcallstack = NULL; - } - - return newmem; } - //////////////////////////////////////////////////////////////////////////////// // // COM IAT Replacement Functions diff --git a/vldint.h b/vldint.h index 12a97571..9336b657 100644 --- a/vldint.h +++ b/vldint.h @@ -310,6 +310,9 @@ class VisualLeakDetector : public IMalloc static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); + static void AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size); + static void ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size); + //////////////////////////////////////////////////////////////////////////////// // Private data //////////////////////////////////////////////////////////////////////////////// From 186e8ee4488bfee43e065db40003ee33ddac81f5 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Sat, 7 May 2011 11:54:01 +0000 Subject: [PATCH 086/321] Recent refactoring in changelist 66570 broke the heap mismatch detection feature. This resulted in printing an extra stack frame at the top of the stack that was internal to VLD, and not part of the users code. Please run all unit tests before checking in, otherwise quality will degrade. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66676 --- vld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vld.cpp b/vld.cpp index f3ba90cb..588da23f 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1685,7 +1685,7 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) report(L"Deallocation Call stack.\n"); report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); report(L" Call Stack:\n"); - UINT dont_show_vld_frames = 1; + UINT dont_show_vld_frames = 2; stack_here->dump(FALSE,dont_show_vld_frames); // Now it should be safe to delete our temporary callstack delete stack_here; From b000f29ab043e12c95ef5f326e4f009f99e65ac8 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 7 May 2011 21:06:24 +0000 Subject: [PATCH 087/321] Tests improved git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66687 --- callstack.cpp | 32 +++++++++-------- callstack.h | 7 ++-- tests/basics/Allocs.cpp | 61 ++++++++++++++++++++++++++------- tests/basics/Allocs.h | 14 ++++---- tests/basics/basics.cpp | 16 +++++---- tests/corruption/corruption.cpp | 44 ++++++++++++++++++++---- tests/corruption/stdafx.h | 1 + vld.cpp | 45 ++++++++++++++---------- vldint.h | 7 ++-- 9 files changed, 155 insertions(+), 72 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 2e799cb6..f0f3ac7b 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -237,14 +237,7 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const { if (!showinternalframes) { _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); - if (wcsstr(sourceinfo.FileName, L"afxmem.cpp") || - wcsstr(sourceinfo.FileName, L"dbgheap.c") || - wcsstr(sourceinfo.FileName, L"malloc.c") || - wcsstr(sourceinfo.FileName, L"new.cpp") || - wcsstr(sourceinfo.FileName, L"newaop.cpp") || - wcsstr(sourceinfo.FileName, L"dbgcalloc.c") || - wcsstr(sourceinfo.FileName, L"realloc.c") || - wcsstr(sourceinfo.FileName, L"dbgrealloc.c")) { + if (IsInternalModule(sourceinfo.FileName)) { // Don't show frames in files internal to the heap. LeaveCriticalSection(&symbollock); continue; @@ -385,11 +378,7 @@ void CallStack::Resolve(BOOL showinternalframes) { if (!showinternalframes) { _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); - if (wcsstr(sourceinfo.FileName, L"afxmem.cpp") || - wcsstr(sourceinfo.FileName, L"dbgheap.c") || - wcsstr(sourceinfo.FileName, L"malloc.c") || - wcsstr(sourceinfo.FileName, L"new.cpp") || - wcsstr(sourceinfo.FileName, L"newaop.cpp")) { + if (IsInternalModule(sourceinfo.FileName)) { // Don't show frames in files internal to the heap. LeaveCriticalSection(&symbollock); continue; @@ -538,6 +527,19 @@ VOID CallStack::push_back (const UINT_PTR programcounter) m_size++; } +bool CallStack::IsInternalModule( const PWSTR filename ) const +{ + return wcsstr(filename, L"afxmem.cpp") || + wcsstr(filename, L"dbgheap.c") || + wcsstr(filename, L"malloc.c") || + wcsstr(filename, L"new.cpp") || + wcsstr(filename, L"newaop.cpp") || + wcsstr(filename, L"dbgcalloc.c") || + wcsstr(filename, L"realloc.c") || + wcsstr(filename, L"dbgrealloc.c") || + wcsstr(filename, L"free.c"); +} + // getstacktrace - Traces the stack as far back as possible, or until 'maxdepth' // frames have been traced. Populates the CallStack with one entry for each // stack frame traced. @@ -557,7 +559,7 @@ VOID CallStack::push_back (const UINT_PTR programcounter) // // None. // -VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) +VOID FastCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) { UINT32 count = 0; UINT_PTR* framepointer = context.fp; @@ -646,7 +648,7 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, context_t& context) // // None. // -VOID SafeCallStack::getstacktrace (UINT32 maxdepth, context_t& context) +VOID SafeCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) { UINT_PTR* framepointer = context.fp; DWORD architecture = X86X64ARCHITECTURE; diff --git a/callstack.h b/callstack.h index b9332f38..dde1fd70 100644 --- a/callstack.h +++ b/callstack.h @@ -87,7 +87,7 @@ class CallStack // Formats the stack frame into a human readable format, and saves it for later retrieval. VOID Resolve(BOOL showinternalframes); DWORD getHashValue () const; - virtual VOID getstacktrace (UINT32 maxdepth, context_t& context) = 0; + virtual VOID getstacktrace (UINT32 maxdepth, const context_t& context) = 0; BOOL operator == (const CallStack &other) const; UINT_PTR operator [] (UINT32 index) const; @@ -125,6 +125,7 @@ class CallStack // Prints out the strings in m_Resolved when the time comes to report the callstack in // human readable form. Currently this is only called by the dump method. void DumpResolved() const; + bool IsInternalModule( const PWSTR filename ) const; }; @@ -138,7 +139,7 @@ class CallStack class FastCallStack : public CallStack { public: - VOID getstacktrace (UINT32 maxdepth, context_t& context); + VOID getstacktrace (UINT32 maxdepth, const context_t& context); }; //////////////////////////////////////////////////////////////////////////////// @@ -151,5 +152,5 @@ class FastCallStack : public CallStack class SafeCallStack : public CallStack { public: - VOID getstacktrace (UINT32 maxdepth, context_t& context); + VOID getstacktrace (UINT32 maxdepth, const context_t& context); }; diff --git a/tests/basics/Allocs.cpp b/tests/basics/Allocs.cpp index 8bb89ba5..f00b7040 100644 --- a/tests/basics/Allocs.cpp +++ b/tests/basics/Allocs.cpp @@ -5,7 +5,7 @@ #include #include -void AllocF(LeakOption type) +void AllocF(LeakOption type, bool bFree) { int* leaked_memory = NULL; int* leaked_memory_dbg = NULL; @@ -13,11 +13,21 @@ void AllocF(LeakOption type) { leaked_memory = (int*)malloc(78); leaked_memory_dbg = (int*)_malloc_dbg(80, _NORMAL_BLOCK,__FILE__,__LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + } } else if (type == eNew) { leaked_memory = new int(4); leaked_memory_dbg = new (_NORMAL_BLOCK, __FILE__, __LINE__) int(7); + if (bFree) + { + delete leaked_memory; + delete leaked_memory_dbg; + } } else if (type == eNewArray) { @@ -28,11 +38,21 @@ void AllocF(LeakOption type) int temp[3]; void* place = temp; float* placed_mem = new (place) float[3]; // doesn't work. Nothing gets patched by vld + if (bFree) + { + delete [] leaked_memory; + delete [] leaked_memory_dbg; + } } else if (type == eCalloc) { leaked_memory = (int*)calloc(47,sizeof(int)); leaked_memory_dbg = (int*)_calloc_dbg(39, sizeof(int), _NORMAL_BLOCK, __FILE__, __LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + } } else if (type == eRealloc) { @@ -41,11 +61,20 @@ void AllocF(LeakOption type) leaked_memory = (int*)_recalloc(leaked_memory, 1, 31); int* temp_dbg = (int*)malloc(9); leaked_memory_dbg = (int*)_realloc_dbg(temp_dbg, 21, _NORMAL_BLOCK, __FILE__, __LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + } } else if (type == eCoTaskMem) { void* leaked = CoTaskMemAlloc(7); void* realloced = CoTaskMemRealloc(leaked, 29); + if (bFree) + { + CoTaskMemFree(realloced); + } } else if (type == eAlignedMalloc) { @@ -55,35 +84,41 @@ void AllocF(LeakOption type) leaked = (int*)_aligned_offset_realloc(leaked, 48, 16, 2); leaked_memory = (int*)_aligned_realloc(leaked_memory, 128, 16); leaked_memory_dbg = (int*)_aligned_realloc_dbg(leaked_memory_dbg, 48, 16, __FILE__, __LINE__); + if (bFree) + { + _aligned_free(leaked); + _aligned_free(leaked_memory); + _aligned_free_dbg(leaked_memory_dbg); + } } } -void AllocE(LeakOption type) +void AllocE(LeakOption type, bool bFree) { - AllocF(type); + AllocF(type, bFree); } -void AllocD(LeakOption type) +void AllocD(LeakOption type, bool bFree) { - AllocE(type); + AllocE(type, bFree); } -void AllocC(LeakOption type) +void AllocC(LeakOption type, bool bFree) { - AllocD(type); + AllocD(type, bFree); } -void AllocB(LeakOption type) +void AllocB(LeakOption type, bool bFree) { - AllocC(type); + AllocC(type, bFree); } -void AllocA(LeakOption type) +void AllocA(LeakOption type, bool bFree) { - AllocB(type); + AllocB(type, bFree); } -void Alloc(LeakOption type) +void Alloc(LeakOption type, bool bFree) { - AllocA(type); + AllocA(type, bFree); } \ No newline at end of file diff --git a/tests/basics/Allocs.h b/tests/basics/Allocs.h index 81fb794b..4f414407 100644 --- a/tests/basics/Allocs.h +++ b/tests/basics/Allocs.h @@ -1,17 +1,17 @@ #pragma once #include "LeakOption.h" -void AllocF(LeakOption type); +void AllocF(LeakOption type, bool bFree); -void AllocE(LeakOption type); +void AllocE(LeakOption type, bool bFree); -void AllocD(LeakOption type); +void AllocD(LeakOption type, bool bFree); -void AllocC(LeakOption type); +void AllocC(LeakOption type, bool bFree); -void AllocB(LeakOption type); +void AllocB(LeakOption type, bool bFree); -void AllocA(LeakOption type); +void AllocA(LeakOption type, bool bFree); -void Alloc(LeakOption type); +void Alloc(LeakOption type, bool bFree = false); diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 34584066..7981b87c 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -14,11 +14,11 @@ void PrintUsage() wprintf(_T("\t - The number of times to repeat each unique memory leak.\n\n")); } -void LeakMemory(LeakOption type, int repeat) +void LeakMemory(LeakOption type, int repeat, bool bFree) { for (int i = 0; i < repeat; i++) { - Alloc(type); + Alloc(type, bFree); } } @@ -38,7 +38,8 @@ int _tmain(int argc, _TCHAR* argv[]) wprintf(_T("== VLD Tests: basics\n")); wprintf(_T("==\n")); wprintf(_T("======================================\n")); - if (argc == 3) + bool bFree = false; + if (argc >= 3) { bool checkAll = false; LeakOption leak_type = eMalloc; // default @@ -88,20 +89,23 @@ int _tmain(int argc, _TCHAR* argv[]) return -1; } + if (argc >= 4 && _tcsicmp(_T("free"), argv[3]) == 0) + bFree = true; + wprintf(_T("Options: %s \nNumber of Leaks: %s\n"), argv[1], argv[2]); // Convert the string into it's integer equivalent int repeat = _tstoi(argv[2]); if (!checkAll) - LeakMemory(leak_type,repeat); + LeakMemory(leak_type,repeat,bFree); else { for (int leak_type = 0; leak_type < eCount; leak_type++) - LeakMemory((LeakOption)leak_type,repeat); + LeakMemory((LeakOption)leak_type,repeat,bFree); } int leaks = (int)VLDGetLeaksCount(false); wprintf(_T("End of test app...\n\n")); int diff = repeat * multiplayer - leaks; - return diff; + return bFree ? leaks : diff; } else { diff --git a/tests/corruption/corruption.cpp b/tests/corruption/corruption.cpp index 10e7ba26..8e774153 100644 --- a/tests/corruption/corruption.cpp +++ b/tests/corruption/corruption.cpp @@ -6,6 +6,28 @@ // This hooks vld into this app #include "../../vld.h" +enum CorruptionType +{ + eAllocMismatch, + eHeapMismatch, + eCount +}; + +void TestCorruption( CorruptionType check ) +{ + if (check == eAllocMismatch) + { + TestAllocationMismatch_malloc_delete(); + TestAllocationMismatch_malloc_deleteVec(); + TestAllocationMismatch_new_free(); + TestAllocationMismatch_newVec_free(); + } + else if (check == eHeapMismatch) + { + TestHeapMismatch(); + } +} + int _tmain(int argc, _TCHAR* argv[]) { wprintf(_T("======================================\n")); @@ -18,21 +40,29 @@ int _tmain(int argc, _TCHAR* argv[]) vld_options |= VLD_OPT_VALIDATE_HEAPFREE; VLDSetOptions(vld_options, 15, 25); + CorruptionType check = (CorruptionType)-1; + if (argc == 2) { // Pick up options to determine which type of test to execute if (_tcsicmp(_T("allocmismatch"), argv[1]) == 0) - { - TestAllocationMismatch_malloc_delete(); - TestAllocationMismatch_malloc_deleteVec(); - TestAllocationMismatch_new_free(); - TestAllocationMismatch_newVec_free(); - } + check = eAllocMismatch; else if (_tcsicmp(_T("heapmismatch"), argv[1]) == 0) + check = eHeapMismatch; + TestCorruption(check); + } + + if (check == -1) + { + for (int i = 0; i < eCount; i++) { - TestHeapMismatch(); + TestCorruption((CorruptionType)i); } } + else + { + TestCorruption(check); + } return 0; } diff --git a/tests/corruption/stdafx.h b/tests/corruption/stdafx.h index b005a839..661cb268 100644 --- a/tests/corruption/stdafx.h +++ b/tests/corruption/stdafx.h @@ -9,6 +9,7 @@ #include #include +#include diff --git a/vld.cpp b/vld.cpp index 588da23f..a280dc82 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1312,12 +1312,12 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) // None. // VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - BOOL crtalloc, CallStack **&ppcallstack) + BOOL crtalloc, CallStack **&ppcallstack, const context_t &context) { if (newmem != mem) { // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. - unmapblock(heap, mem); + unmapblock(heap, mem, context); mapblock(heap, newmem, size, crtalloc, ppcallstack); return; } @@ -1638,7 +1638,7 @@ blockinfo_t* VisualLeakDetector::FindAllocedBlock(LPCVOID mem, __out HANDLE& hea // // None. // -VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) +VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t &context) { if (NULL == mem) return; @@ -1677,20 +1677,18 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem) alloc_block->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); // Now we need a way to print the current callstack at this point: - context_t context; - CAPTURE_CONTEXT(context); // now what? CallStack* stack_here = CallStack::Create(); stack_here->getstacktrace(vld.m_maxtraceframes, context); report(L"Deallocation Call stack.\n"); report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); report(L" Call Stack:\n"); - UINT dont_show_vld_frames = 2; - stack_here->dump(FALSE,dont_show_vld_frames); + stack_here->dump(FALSE, 0); // Now it should be safe to delete our temporary callstack delete stack_here; stack_here = NULL; - DebugBreak(); + if (IsDebuggerPresent()) + DebugBreak(); } } @@ -3222,8 +3220,12 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) { BOOL status; + context_t context; + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + // Unmap the block from the specified heap. - vld.unmapblock(heap, mem); + vld.unmapblock(heap, mem, context); status = RtlFreeHeap(heap, flags, mem); @@ -3233,7 +3235,16 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) // for kernel32.dll BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) { - BOOL status = _RtlFreeHeap(heap, flags, mem); + BOOL status; + + context_t context; + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + + // Unmap the block from the specified heap. + vld.unmapblock(heap, mem, context); + + status = RtlFreeHeap(heap, flags, mem); return status; } @@ -3310,9 +3321,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID CAPTURE_CONTEXT(context); } - ReAllocateHeap(tls, heap, mem, newmem, size); - - tls->context = context; + ReAllocateHeap(tls, heap, mem, newmem, size, context); if (firstcall) { @@ -3355,9 +3364,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S CAPTURE_CONTEXT(context); } - ReAllocateHeap(tls, heap, mem, newmem, size); - - tls->context = context; + ReAllocateHeap(tls, heap, mem, newmem, size, context); if (firstcall) { @@ -3368,7 +3375,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S return newmem; } -void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size) +void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context) { BOOL crtalloc; crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; @@ -3383,13 +3390,15 @@ void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LP // The module that initiated this allocation is included in leak // detection. Remap the block. - vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack); + vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack, context); #ifdef _DEBUG if(tls->context.fp != 0) __debugbreak(); #endif tls->flags |= crtalloc; + + tls->context = context; } //////////////////////////////////////////////////////////////////////////////// diff --git a/vldint.h b/vldint.h index 9336b657..5b81f387 100644 --- a/vldint.h +++ b/vldint.h @@ -264,11 +264,12 @@ class VisualLeakDetector : public IMalloc tls_t* gettls (); VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); VOID mapheap (HANDLE heap); - VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); + VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, + BOOL crtalloc, CallStack **&ppcallstack, const context_t &context); VOID reportconfig (); SIZE_T getleakscount (HANDLE heap, BOOL includingInternal); SIZE_T reportleaks (HANDLE heap); - VOID unmapblock (HANDLE heap, LPCVOID mem); + VOID unmapblock (HANDLE heap, LPCVOID mem, const context_t &context); VOID unmapheap (HANDLE heap); void resolveStacks(HANDLE heap); @@ -311,7 +312,7 @@ class VisualLeakDetector : public IMalloc static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); static void AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size); - static void ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size); + static void ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context); //////////////////////////////////////////////////////////////////////////////// // Private data From ab4cc4c897b34a903b719ac47c7796f092c13ab8 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 20 May 2011 09:26:04 +0000 Subject: [PATCH 088/321] This code adds a test that demonstrates a crash when using multiple threads. I have already logged an issue (8636). To reproduce the crash, run dynamic_app with "true" and "thread" for the parameters. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C66942 --- tests/dynamic_app/ThreadTest.cpp | 90 +++++++++++++++++++ tests/dynamic_app/ThreadTests.h | 4 + tests/dynamic_app/dynamic_app.cpp | 19 +++- tests/dynamic_app/dynamic_app.vcxproj | 2 + tests/dynamic_app/dynamic_app.vcxproj.filters | 6 ++ tests/suite/testsuite.cpp | 42 ++++----- 6 files changed, 137 insertions(+), 26 deletions(-) create mode 100644 tests/dynamic_app/ThreadTest.cpp create mode 100644 tests/dynamic_app/ThreadTests.h diff --git a/tests/dynamic_app/ThreadTest.cpp b/tests/dynamic_app/ThreadTest.cpp new file mode 100644 index 00000000..c45f276d --- /dev/null +++ b/tests/dynamic_app/ThreadTest.cpp @@ -0,0 +1,90 @@ +#include "stdafx.h" +#include "ThreadTests.h" +#include "LoadTests.h" + +void Call_LoaderLocks(bool resolve) +{ + //RunLoaderTests(resolve); // will not crash + RunMFCLoaderTests(resolve); // will crash + + //HMODULE this_app = NULL; + //WCHAR path_name[MAX_PATH] = {0}; + // This also acquires the loader lock + //GetModuleFileName(this_app, path_name, MAX_PATH); +} + +void Call_Three(bool resolve) +{ + Call_LoaderLocks(resolve); +} + +void Call_Two(bool resolve) +{ + Call_Three(resolve); +} + +void Call_One(bool resolve) +{ + Call_Two(resolve); +} + +DWORD __stdcall Dynamic_Thread_Procedure(LPVOID foo) +{ + bool* resolve = (bool*)(foo); + Call_One(*resolve); + return 0; +} + +void RunLoaderLockTests(bool resolve) +{ + static const int NUMTHREADS = 64; + HANDLE threads[NUMTHREADS] = {0}; + ULONG thread_id = NULL; + + for (UINT i = 0; i < NUMTHREADS; ++i) + { + threads[i] = CreateThread(NULL, // security attribute + 0, // stack size + Dynamic_Thread_Procedure, // start function + &resolve, // thread parameters + 0, // creation flags + &thread_id); // thread id + } + + BOOL wait_for_all = TRUE; + DWORD result = WaitForMultipleObjects(NUMTHREADS, threads, wait_for_all, INFINITE); + switch (result) + { + case WAIT_OBJECT_0: + _tprintf(_T("All threads finished correctly.\n")); + break; + case WAIT_ABANDONED_0: + _tprintf(_T("Abandoned mutex.\n")); + break; + case WAIT_TIMEOUT: + _tprintf(_T("All threads timed out\n")); + break; + case WAIT_FAILED: + { + _tprintf(_T("Function call to Wait failed with unknown error\n")); + TCHAR lpMsgBuf[MAX_PATH] = {0}; + FormatMessage( + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + lpMsgBuf, + MAX_PATH, + NULL ); + + _tprintf(_T("%s"), lpMsgBuf); + } + + break; + default: + _tprintf(_T("Some other return value\n")); + break; + } + +} diff --git a/tests/dynamic_app/ThreadTests.h b/tests/dynamic_app/ThreadTests.h new file mode 100644 index 00000000..f7d8bdd2 --- /dev/null +++ b/tests/dynamic_app/ThreadTests.h @@ -0,0 +1,4 @@ +#pragma once + +void RunLoaderLockTests(bool); + diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 0b0375fe..b5b2cc03 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include #include "LoadTests.h" +#include "ThreadTests.h" void PrintUsage() { @@ -39,6 +40,7 @@ extern "C" { #endif + int _tmain(int argc, _TCHAR* argv[]) { wprintf(_T("======================================\n")); @@ -48,10 +50,16 @@ int _tmain(int argc, _TCHAR* argv[]) wprintf(_T("======================================\n")); bool resolve = true; + bool doThreadTests = false; if (argc == 2) { resolve = _tcsicmp(_T("true"), argv[1]) == 0; - } + } + else if (argc == 3) + { + resolve = _tcsicmp(_T("true"), argv[1]) == 0; + doThreadTests = _tcsicmp(_T("thread"), argv[2]) == 0; + } RunLoaderTests(resolve); // leaks 18 int totalleaks = (int)VLDGetLeaksCount(); @@ -68,6 +76,15 @@ int _tmain(int argc, _TCHAR* argv[]) leaks3 -= totalleaks; assert(leaks3 == 6); + if (doThreadTests) + { + // This test will crash, indicating a bug that needs to be fixed. + RunLoaderLockTests(resolve); + int leaks4 = (int)VLDGetLeaksCount(); + leaks4 -= totalleaks; + assert(leaks4 == 1158); + } + // ..................Total: 31 leaks total totalleaks = (int)VLDGetLeaksCount(); int diff = 31 - totalleaks; diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index 7ca6ac7f..79e8fa89 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -254,11 +254,13 @@ copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir) + + diff --git a/tests/dynamic_app/dynamic_app.vcxproj.filters b/tests/dynamic_app/dynamic_app.vcxproj.filters index 1465ba64..72fba51d 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj.filters +++ b/tests/dynamic_app/dynamic_app.vcxproj.filters @@ -24,6 +24,9 @@ Header Files + + Header Files + @@ -35,5 +38,8 @@ Source Files + + Source Files + \ No newline at end of file diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index a6be7961..1d6ec5ba 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -65,22 +65,21 @@ static const int NUMDUPLEAKS = 3; // Number of times to duplicate eac static const int NUMTHREADS = 63; // Number of threads to run simultaneously #define ONCEINAWHILE 10 // Free a random block approx. once every... -typedef struct blockholder_s { +struct blockholder_t { action_e action; PVOID block; BOOL leak; -} blockholder_t; +}; typedef void* (__cdecl *free_t) (void* mem); typedef void* (__cdecl *malloc_t) (size_t size); -typedef struct threadcontext_s { +struct threadcontext_t { UINT index; BOOL leaky; DWORD seed; - BOOL terminated; DWORD threadid; -} threadcontext_t; +}; __declspec(thread) blockholder_t blocks [MAXBLOCKS]; __declspec(thread) ULONG freeBlock = (ULONG)0; @@ -274,26 +273,21 @@ VOID recursivelyallocate (UINT depth, action_e action, SIZE_T size) DWORD __stdcall threadproc_test (LPVOID param) { - action_e action; - USHORT action_index; - BOOL allocate_more = TRUE; - threadcontext_t *context = (threadcontext_t*)param; - UINT depth; - ULONG index; - UINT leaks_selected; - SIZE_T size; + threadcontext_t* context = (threadcontext_t*)param; + assert(context); srand(context->seed); - for (index = 0; index < MAXBLOCKS; index++) { + for (ULONG index = 0; index < MAXBLOCKS; index++) { blocks[index].block = NULL; blocks[index].leak = FALSE; } + BOOL allocate_more = TRUE; while (allocate_more == TRUE) { // Select a random allocation action and a random size. - action = (action_e)random(numactions - 1); - size = random(MAXSIZE); + action_e action = (action_e)random(numactions - 1); + SIZE_T size = random(MAXSIZE); if (size < MINSIZE) { size = MINSIZE; } @@ -304,7 +298,7 @@ DWORD __stdcall threadproc_test (LPVOID param) // Allocate a block, using recursion to build up a stack of random // depth. - depth = random(MAXDEPTH); + UINT depth = random(MAXDEPTH); if (depth < MINDEPTH) { depth = MINDEPTH; } @@ -312,14 +306,14 @@ DWORD __stdcall threadproc_test (LPVOID param) // Every once in a while, free a random block. if (random(ONCEINAWHILE) == ONCEINAWHILE) { - index = random(total_allocs); + ULONG index = random(total_allocs); if (blocks[index].block != NULL) { freeblock(index); } } // See if we have allocated enough blocks using each type of action. - for (action_index = 0; action_index < numactions; action_index++) { + for (USHORT action_index = 0; action_index < numactions; action_index++) { if (counts[action_index] < MAXALLOC) { allocate_more = TRUE; break; @@ -331,10 +325,10 @@ DWORD __stdcall threadproc_test (LPVOID param) if (context->leaky == TRUE) { // This is the leaky thread. Randomly select one block to be leaked from // each type of allocation action. - for (action_index = 0; action_index < numactions; action_index++) { - leaks_selected = 0; + for (USHORT action_index = 0; action_index < numactions; action_index++) { + UINT leaks_selected = 0; do { - index = random(MAXBLOCKS); + ULONG index = random(MAXBLOCKS); if (!blocks[index].leak && (blocks[index].block != NULL) && (blocks[index].action == (action_e)action_index)) { blocks[index].leak = TRUE; leaks_selected++; @@ -346,7 +340,7 @@ DWORD __stdcall threadproc_test (LPVOID param) } // Free all blocks except for those marked as leaks. - for (index = 0; index < MAXBLOCKS; index++) { + for (ULONG index = 0; index < MAXBLOCKS; index++) { if ((blocks[index].block != NULL) && (blocks[index].leak == FALSE)) { freeblock(index); } @@ -360,7 +354,6 @@ DWORD __stdcall threadproc_test (LPVOID param) assert(total_allocs == 0); } - context->terminated = TRUE; return 0; } @@ -389,7 +382,6 @@ int main (int argc, char *argv []) else contexts[index].leaky = FALSE; contexts[index].seed = random(RAND_MAX); - contexts[index].terminated = FALSE; HANDLE hthread = CreateThread(NULL, 0, threadproc_test, &contexts[index], 0, &contexts[index].threadid); threads[index] = hthread; } From 3fc0fc0471f9b2e5823c6026b6e6667acb3608af Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Thu, 26 May 2011 21:50:33 +0000 Subject: [PATCH 089/321] _aligned*_recalloc* functions implemented git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67119 --- crtmfcpatch.h | 165 ++++++++++++++++++++++++++++++++++++ vld.cpp | 229 +++++++++++++++++++++++++++++++++++++++++++++++++- vldint.h | 8 ++ 3 files changed, 401 insertions(+), 1 deletion(-) diff --git a/crtmfcpatch.h b/crtmfcpatch.h index b27d618d..05358817 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -71,10 +71,14 @@ class CrtMfcPatch static void* __cdecl crtd__aligned_offset_malloc_dbg (size_t size, size_t alignment, size_t offset, int type, const char *file, int line); static void* __cdecl crtd__aligned_realloc_dbg (void *mem, size_t size, size_t alignment, int type, char const *file, int line); static void* __cdecl crtd__aligned_offset_realloc_dbg (void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + static void* __cdecl crtd__aligned_recalloc_dbg (void *mem, size_t num, size_t size, size_t alignment, int type, char const *file, int line); + static void* __cdecl crtd__aligned_offset_recalloc_dbg (void *mem, size_t num, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); static void* __cdecl crtd__aligned_malloc (size_t size, size_t alignment); static void* __cdecl crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset); static void* __cdecl crtd__aligned_realloc (void *memblock, size_t size, size_t alignment); static void* __cdecl crtd__aligned_offset_realloc (void *memblock, size_t size, size_t alignment, size_t offset); + static void* __cdecl crtd__aligned_recalloc (void *memblock, size_t num, size_t size, size_t alignment); + static void* __cdecl crtd__aligned_offset_recalloc (void *memblock, size_t num, size_t size, size_t alignment, size_t offset); template static void* __cdecl crtd_new_dbg (context_t& context, size_t size, int type, char const *file, int line); @@ -625,6 +629,99 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void * return vld.__aligned_offset_realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, alignment, offset, type, file, line); } +// crtd__aligned_recalloc_dbg - Calls to _aligned_recalloc_dbg from msvcrXXd.dll are patched +// through to this function. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - num (IN): The count of the memory block to reallocate. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by _aligned_realloc_dbg. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *mem, + size_t num, + size_t size, + size_t alignment, + int type, + char const *file, + int line) +{ + static _aligned_recalloc_dbg_t pcrtxxd__recalloc_dbg = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd__recalloc_dbg == NULL) { + // This is the first call to this function. Link to the real + // _realloc_dbg. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd__recalloc_dbg = (_aligned_recalloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_recalloc_dbg"); + } + + return vld.__aligned_recalloc_dbg(pcrtxxd__recalloc_dbg, context, mem, num, size, alignment, type, file, line); +} + +// crtd__aligned_offset_recalloc_dbg - Calls to _aligned_offset_realloc_dbg from msvcrXXd.dll are patched +// through to this function. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - num (IN): The count of the memory block to reallocate. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by _aligned_offset_realloc_dbg. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void *mem, + size_t num, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) +{ + static _aligned_offset_recalloc_dbg_t pcrtxxd__recalloc_dbg = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd__recalloc_dbg == NULL) { + // This is the first call to this function. Link to the real + // _realloc_dbg. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd__recalloc_dbg = (_aligned_offset_recalloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_recalloc_dbg"); + } + + return vld.__aligned_offset_recalloc_dbg(pcrtxxd__recalloc_dbg, context, mem, num, size, alignment, offset, type, file, line); +} + // crtd__aligned_malloc - Calls to malloc from msvcrXXd.dll are patched through to // this function. // @@ -749,6 +846,74 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, size_ return vld.__aligned_offset_realloc(pcrtxxd_realloc, context, mem, size, alignment, offset); } +// crtd__aligned_recalloc - Calls to realloc from msvcrXXd.dll are patched through to +// this function. +// +// - dll (IN): The name of the dll +// +// - num (IN): Count of the memory block to reallocate. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from realloc. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t num, size_t size, size_t alignment) +{ + static _aligned_recalloc_t pcrtxxd_recalloc = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd_recalloc == NULL) { + // This is the first call to this function. Link to the real realloc. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd_recalloc = (_aligned_recalloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_recalloc"); + } + + return vld.__aligned_recalloc(pcrtxxd_recalloc, context, mem, num, size, alignment); +} + +// crtd__aligned_offset_recalloc - Calls to realloc from msvcrXXd.dll are patched through to +// this function. +// +// - dll (IN): The name of the dll +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - num (IN): Count of the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from realloc. +// +TEMPLATE_HEADER +void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, size_t num, size_t size, size_t alignment, size_t offset) +{ + static _aligned_offset_recalloc_t pcrtxxd_recalloc = NULL; + + context_t context; + + CAPTURE_CONTEXT(context); + + if (pcrtxxd_recalloc == NULL) { + // This is the first call to this function. Link to the real realloc. + HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); + assert(msvcrxxd != NULL); + pcrtxxd_recalloc = (_aligned_offset_recalloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_recalloc"); + } + + return vld.__aligned_offset_recalloc(pcrtxxd_recalloc, context, mem, num, size, alignment, offset); +} + // crtd_scalar_new - Calls to the CRT's scalar new operator from msvcrXXd.dll // are patched through to this function. // diff --git a/vld.cpp b/vld.cpp index a280dc82..2716c634 100644 --- a/vld.cpp +++ b/vld.cpp @@ -258,6 +258,14 @@ static patchentry_t msvcr80dPatch [] = { "realloc", NULL, VS80::crtd_realloc, scalar_new_name, NULL, VS80::crtd_scalar_new, vector_new_name, NULL, VS80::crtd_vector_new, + "_aligned_malloc_dbg", NULL, VS80::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", NULL, VS80::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", NULL, VS80::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", NULL, VS80::crtd__aligned_offset_realloc_dbg, + "_aligned_malloc", NULL, VS80::crtd__aligned_malloc, + "_aligned_offset_malloc", NULL, VS80::crtd__aligned_offset_malloc, + "_aligned_realloc", NULL, VS80::crtd__aligned_realloc, + "_aligned_offset_realloc", NULL, VS80::crtd__aligned_offset_realloc, NULL, NULL, NULL }; @@ -278,10 +286,14 @@ static patchentry_t msvcr90dPatch [] = { "_aligned_offset_malloc_dbg", NULL, VS90::crtd__aligned_offset_malloc_dbg, "_aligned_realloc_dbg", NULL, VS90::crtd__aligned_realloc_dbg, "_aligned_offset_realloc_dbg", NULL, VS90::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", NULL, VS90::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", NULL, VS90::crtd__aligned_offset_recalloc_dbg, "_aligned_malloc", NULL, VS90::crtd__aligned_malloc, "_aligned_offset_malloc", NULL, VS90::crtd__aligned_offset_malloc, "_aligned_realloc", NULL, VS90::crtd__aligned_realloc, "_aligned_offset_realloc", NULL, VS90::crtd__aligned_offset_realloc, + "_aligned_recalloc", NULL, VS90::crtd__aligned_recalloc, + "_aligned_offset_recalloc", NULL, VS90::crtd__aligned_offset_recalloc, NULL, NULL, NULL }; @@ -302,10 +314,14 @@ static patchentry_t msvcr100dPatch [] = { "_aligned_offset_malloc_dbg", NULL, VS100::crtd__aligned_offset_malloc_dbg, "_aligned_realloc_dbg", NULL, VS100::crtd__aligned_realloc_dbg, "_aligned_offset_realloc_dbg", NULL, VS100::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", NULL, VS100::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", NULL, VS100::crtd__aligned_offset_recalloc_dbg, "_aligned_malloc", NULL, VS100::crtd__aligned_malloc, "_aligned_offset_malloc", NULL, VS100::crtd__aligned_offset_malloc, "_aligned_realloc", NULL, VS100::crtd__aligned_realloc, "_aligned_offset_realloc", NULL, VS100::crtd__aligned_offset_realloc, + "_aligned_recalloc", NULL, VS100::crtd__aligned_recalloc, + "_aligned_offset_recalloc", NULL, VS100::crtd__aligned_offset_recalloc, NULL, NULL, NULL }; @@ -2255,6 +2271,101 @@ void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t p return block; } +// __aligned_recalloc - This function is just a wrapper around the real recalloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - precalloc (IN): Pointer to the particular recalloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - num (IN): Count of the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified _aligned_realloc. +// +void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, + context_t& context, + void *mem, + size_t num, + size_t size, + size_t alignment) +{ + tls_t *tls = vld.gettls(); + + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size, alignment); + + if (firstcall) + firstalloccall(tls); + + return block; +} + +// __aligned_offset_recalloc - This function is just a wrapper around the real recalloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - precalloc (IN): Pointer to the particular realloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - num (IN): Count of the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified _aligned_offset_realloc. +// +void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t precalloc, + context_t& context, + void *mem, + size_t num, + size_t size, + size_t alignment, + size_t offset) +{ + tls_t *tls = vld.gettls(); + + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size, alignment, offset); + + if (firstcall) + firstalloccall(tls); + + return block; +} + // __aligned_malloc_dbg - This function is just a wrapper around the real _aligned_malloc_dbg // that sets appropriate flags to be consulted when the memory is actually // allocated by RtlAllocateHeap. @@ -2471,6 +2582,123 @@ void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_ return block; } +// _aligned_recalloc_debug - This function is just a wrapper around the real +// _aligned_realloc_dbg that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - p_recalloc_dbg (IN): Pointer to the particular __recalloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - num (IN): The number of memory blocks to reallocate. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_recalloc_dbg, + context_t& context, + void *mem, + size_t num, + size_t size, + size_t alignment, + int type, + char const *file, + int line) +{ + tls_t *tls = vld.gettls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, alignment, type, file, line); + + if (firstcall) + firstalloccall(tls); + + return block; +} + +// _aligned_offset_recalloc_debug - This function is just a wrapper around the real +// _aligned_offset_recalloc_dbg that sets appropriate flags to be consulted when +// the memory is actually allocated by RtlAllocateHeap. +// +// - p_recalloc_dbg (IN): Pointer to the particular __recalloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - num (IN): The number of memory blocks to reallocate. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_recalloc_dbg, + context_t& context, + void *mem, + size_t num, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) +{ + tls_t *tls = vld.gettls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, alignment, offset, type, file, line); + + if (firstcall) + firstalloccall(tls); + + return block; +} + //////////////////////////////////////////////////////////////////////////////// // // Debug CRT and MFC IAT Replacement Functions @@ -3011,7 +3239,6 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, PHANDLE modulehandle) { - EnterCriticalSection(&vld.m_loaderlock); // Load the DLL. diff --git a/vldint.h b/vldint.h index 5b81f387..15d47f1b 100644 --- a/vldint.h +++ b/vldint.h @@ -74,10 +74,14 @@ typedef void* (__cdecl *_aligned_malloc_t) (size_t, size_t); typedef void* (__cdecl *_aligned_offset_malloc_t) (size_t, size_t, size_t); typedef void* (__cdecl *_aligned_realloc_t) (void *, size_t, size_t); typedef void* (__cdecl *_aligned_offset_realloc_t) (void *, size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_recalloc_t) (void *, size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_offset_recalloc_t) (void *, size_t, size_t, size_t, size_t); typedef void* (__cdecl *_aligned_malloc_dbg_t) (size_t, size_t, int, const char *, int); typedef void* (__cdecl *_aligned_offset_malloc_dbg_t) (size_t, size_t, size_t, int, const char *, int); typedef void* (__cdecl *_aligned_realloc_dbg_t) (void *, size_t, size_t, int, const char *, int); typedef void* (__cdecl *_aligned_offset_realloc_dbg_t) (void *, size_t, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_recalloc_dbg_t) (void *, size_t, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_offset_recalloc_dbg_t) (void *, size_t, size_t, size_t, size_t, int, const char *, int); // Data is collected for every block allocated from any heap in the process. // The data is stored in this structure and these structures are stored in @@ -213,10 +217,14 @@ class VisualLeakDetector : public IMalloc void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, size_t size, size_t alignment, size_t offset); void *__aligned_realloc (_aligned_realloc_t p_aligned_realloc, context_t& context, void *mem, size_t size, size_t alignment); void *__aligned_offset_realloc (_aligned_offset_realloc_t p_aligned_offset_realloc, context_t& context, void *mem, size_t size, size_t alignment, size_t offset); + void *__aligned_recalloc (_aligned_recalloc_t p_aligned_recalloc, context_t& context, void *mem, size_t num, size_t size, size_t alignment); + void *__aligned_offset_recalloc (_aligned_offset_recalloc_t p_aligned_offset_recalloc, context_t& context, void *mem, size_t num, size_t size, size_t alignment, size_t offset); void* __aligned_malloc_dbg (_aligned_malloc_dbg_t p_aligned_malloc_dbg, context_t& context, size_t size, size_t alignment, int type, char const *file, int line); void* __aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_aligned_offset_malloc_dbg, context_t& context, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); void* __aligned_realloc_dbg (_aligned_realloc_dbg_t p_aligned_realloc_dbg, context_t& context, void *mem, size_t size, size_t alignment, int type, char const *file, int line); void* __aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_aligned_offset_realloc_dbg, context_t& context, void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + void* __aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_aligned_recalloc_dbg, context_t& context, void *mem, size_t num, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_aligned_offset_recalloc_dbg, context_t& context, void *mem, size_t num, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); //////////////////////////////////////////////////////////////////////////////// // Public IMalloc methods - for support of COM-based memory leak detection. From a3b63a51c00a58bbcbc07cb7fd449b01309d94fa Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 27 May 2011 00:25:33 +0000 Subject: [PATCH 090/321] Crash fixed "dynamic_app true thread" git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67121 --- crtmfcpatch.h | 1051 ++++++++++++++++++++++--------------------------- utility.cpp | 24 +- utility.h | 4 +- vld.cpp | 378 +++++++++--------- vldint.h | 1 - 5 files changed, 659 insertions(+), 799 deletions(-) diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 05358817..5e2a3b70 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -32,25 +32,7 @@ Applications should never include this header." #include "vldint.h" extern __declspec(dllexport) VisualLeakDetector vld; -#define TEMPLATE_HEADER \ -template - -#define TEMPLATE_ARGS \ - crtddll, mfcddll, mfcuddll,\ - crtd_vector_new_name, crtd_vector_new_dbg_name,\ - crtd_scalar_new_name, crtd_scalar_new_dbg_name,\ - mfcd_vector_new_ordinal, mfcd_vector_new_dbg_4p_ordinal, mfcd_vector_new_dbg_3p_ordinal,\ - mfcd_scalar_new_ordinal, mfcd_scalar_new_dbg_4p_ordinal, mfcd_scalar_new_dbg_3p_ordinal,\ - mfcud_vector_new_ordinal, mfcud_vector_new_dbg_4p_ordinal, mfcud_vector_new_dbg_3p_ordinal,\ - mfcud_scalar_new_ordinal, mfcud_scalar_new_dbg_4p_ordinal, mfcud_scalar_new_dbg_3p_ordinal - -TEMPLATE_HEADER +template class CrtMfcPatch { public: @@ -79,12 +61,7 @@ class CrtMfcPatch static void* __cdecl crtd__aligned_offset_realloc (void *memblock, size_t size, size_t alignment, size_t offset); static void* __cdecl crtd__aligned_recalloc (void *memblock, size_t num, size_t size, size_t alignment); static void* __cdecl crtd__aligned_offset_recalloc (void *memblock, size_t num, size_t size, size_t alignment, size_t offset); - - template - static void* __cdecl crtd_new_dbg (context_t& context, size_t size, int type, char const *file, int line); - template - static void* __cdecl crtd_new (context_t& context, size_t size); - + static void* __cdecl mfcd_vector_new (size_t size); static void* __cdecl mfcd__vector_new_dbg_4p (size_t size, int type, char const *file, int line); static void* __cdecl mfcd__vector_new_dbg_3p (size_t size, char const *file, int line); @@ -98,12 +75,44 @@ class CrtMfcPatch static void* __cdecl mfcud__scalar_new_dbg_4p (size_t size, int type, char const *file, int line); static void* __cdecl mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line); - template - static void* __cdecl mfcd_new_dbg (context_t& context, size_t size, int type, char const *file, int line); - template - static void* __cdecl mfcd_new_dbg (context_t& context, size_t size, char const *file, int line); - template - static void* __cdecl mfcd_new (context_t& context, size_t size); + static void* pcrtd__calloc_dbg; + static void* pcrtd__malloc_dbg; + static void* pcrtd__realloc_dbg; + static void* pcrtd__recalloc_dbg; + static void* pcrtd_calloc; + static void* pcrtd_malloc; + static void* pcrtd_realloc; + static void* pcrtd_recalloc; + static void* pcrtd__aligned_malloc_dbg; + static void* pcrtd__aligned_offset_malloc_dbg; + static void* pcrtd__aligned_realloc_dbg; + static void* pcrtd__aligned_offset_realloc_dbg; + static void* pcrtd__aligned_recalloc_dbg; + static void* pcrtd__aligned_offset_recalloc_dbg; + static void* pcrtd_aligned_malloc; + static void* pcrtd_aligned_offset_malloc; + static void* pcrtd_aligned_realloc; + static void* pcrtd_aligned_offset_realloc; + static void* pcrtd_aligned_recalloc; + static void* pcrtd_aligned_offset_recalloc; + static void* pcrtd__scalar_new_dbg; + static void* pcrtd__vector_new_dbg; + static void* pcrtd_scalar_new; + static void* pcrtd_vector_new; + + static void* pmfcd_scalar_new; + static void* pmfcd_vector_new; + static void* pmfcd__scalar_new_dbg_4p; + static void* pmfcd__vector_new_dbg_4p; + static void* pmfcd__scalar_new_dbg_3p; + static void* pmfcd__vector_new_dbg_3p; + + static void* pmfcud_scalar_new; + static void* pmfcud_vector_new; + static void* pmfcud__scalar_new_dbg_4p; + static void* pmfcud__vector_new_dbg_4p; + static void* pmfcud__scalar_new_dbg_3p; + static void* pmfcud__vector_new_dbg_3p; }; @@ -131,27 +140,19 @@ class CrtMfcPatch // // Returns the value returned by _calloc_dbg. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__calloc_dbg (size_t num, +template +void* CrtMfcPatch::crtd__calloc_dbg (size_t num, size_t size, int type, char const *file, int line) { - static _calloc_dbg_t pcrtxxd__calloc_dbg = NULL; + _calloc_dbg_t pcrtxxd__calloc_dbg = (_calloc_dbg_t)pcrtd__calloc_dbg; + assert(pcrtxxd__calloc_dbg); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd__calloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _calloc_dbg. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd__calloc_dbg = (_calloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_calloc_dbg"); - } - return vld.__calloc_dbg(pcrtxxd__calloc_dbg, context, num, size, type, file, line); } @@ -171,26 +172,18 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, // // Returns the value returned by _malloc_dbg. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__malloc_dbg (size_t size, +template +void* CrtMfcPatch::crtd__malloc_dbg (size_t size, int type, char const *file, int line) { - static _malloc_dbg_t pcrtxxd__malloc_dbg = NULL; + _malloc_dbg_t pcrtxxd__malloc_dbg = (_malloc_dbg_t)pcrtd__malloc_dbg; + assert(pcrtxxd__malloc_dbg); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd__malloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _malloc_dbg. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd__malloc_dbg = (_malloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_malloc_dbg"); - } - return vld.__malloc_dbg(pcrtxxd__malloc_dbg, context, size, type, file, line); } @@ -212,27 +205,19 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, // // Returns the value returned by _realloc_dbg. // -TEMPLATE_HEADER - void* CrtMfcPatch::crtd__realloc_dbg (void *mem, +template +void* CrtMfcPatch::crtd__realloc_dbg (void *mem, size_t size, int type, char const *file, int line) { - static _realloc_dbg_t pcrtxxd__realloc_dbg = NULL; + _realloc_dbg_t pcrtxxd__realloc_dbg = (_realloc_dbg_t)pcrtd__realloc_dbg; + assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd__realloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _realloc_dbg. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd__realloc_dbg = (_realloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_realloc_dbg"); - } - return vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, type, file, line); } @@ -254,28 +239,20 @@ TEMPLATE_HEADER // // Returns the value returned by _realloc_dbg. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, +template +void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, size_t num, size_t size, int type, char const *file, int line) { - static _recalloc_dbg_t pcrtxxd__recalloc_dbg = NULL; + _recalloc_dbg_t pcrtxxd__recalloc_dbg = (_recalloc_dbg_t)pcrtd__recalloc_dbg; + assert(pcrtxxd__recalloc_dbg); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd__recalloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _realloc_dbg. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd__recalloc_dbg = (_recalloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_recalloc_dbg"); - } - return vld.__recalloc_dbg(pcrtxxd__recalloc_dbg, context, mem, num, size, type, file, line); } @@ -295,16 +272,19 @@ void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, // // Returns the value returned by the CRT debug scalar new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, +template +void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, int type, char const *file, int line) { + new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)pcrtd__scalar_new_dbg; + assert(pcrtxxd_new_dbg); + context_t context; CAPTURE_CONTEXT(context); - return crtd_new_dbg(context, size, type, file, line); + return vld.__new_dbg_crt(pcrtxxd_new_dbg, context, size, type, file, line); } // crtd__vector_new_dbg - Calls to the CRT's debug vector new operator from @@ -323,16 +303,19 @@ void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, // // Returns the value returned by the CRT debug vector new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, +template +void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, int type, char const *file, int line) { + new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)pcrtd__vector_new_dbg; + assert(pcrtxxd_new_dbg); + context_t context; CAPTURE_CONTEXT(context); - return crtd_new_dbg(context, size, type, file, line); + return vld.__new_dbg_crt(pcrtxxd_new_dbg, context, size, type, file, line); } // crtd_calloc - Calls to calloc from msvcrXXd.dll are patched through to @@ -348,22 +331,15 @@ void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, // // Returns the valued returned from calloc. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) +template +void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) { - static calloc_t pcrtxxd_calloc = NULL; + calloc_t pcrtxxd_calloc = (calloc_t)pcrtd_calloc; + assert(pcrtxxd_calloc); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd_calloc == NULL) { - // This is the first call to this function. Link to the real malloc. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_calloc = (calloc_t)vld._RGetProcAddress(msvcrxxd, "calloc"); - } - return vld._calloc(pcrtxxd_calloc, context, num, size); } @@ -378,22 +354,15 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) // // Returns the valued returned from malloc. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd_malloc (size_t size) +template +void* CrtMfcPatch::crtd_malloc (size_t size) { - static malloc_t pcrtxxd_malloc = NULL; + malloc_t pcrtxxd_malloc = (malloc_t)pcrtd_malloc; + assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd_malloc == NULL) { - // This is the first call to this function. Link to the real malloc. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_malloc = (malloc_t)vld._RGetProcAddress(msvcrxxd, "malloc"); - } - return vld._malloc(pcrtxxd_malloc, context, size); } @@ -410,22 +379,15 @@ void* CrtMfcPatch::crtd_malloc (size_t size) // // Returns the value returned from realloc. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) +template +void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) { - static realloc_t pcrtxxd_realloc = NULL; + realloc_t pcrtxxd_realloc = (realloc_t)pcrtd_realloc; + assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd_realloc == NULL) { - // This is the first call to this function. Link to the real realloc. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_realloc = (realloc_t)vld._RGetProcAddress(msvcrxxd, "realloc"); - } - return vld._realloc(pcrtxxd_realloc, context, mem, size); } @@ -442,22 +404,15 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) // // Returns the value returned from realloc. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, size_t size) +template +void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, size_t size) { - static _recalloc_t pcrtxxd_recalloc = NULL; + _recalloc_t pcrtxxd_recalloc = (_recalloc_t)pcrtd_recalloc; + assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd_recalloc == NULL) { - // This is the first call to this function. Link to the real realloc. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_recalloc = (_recalloc_t)vld._RGetProcAddress(msvcrxxd, "_recalloc"); - } - return vld.__recalloc(pcrtxxd_recalloc, context, mem, num, size); } @@ -477,28 +432,20 @@ void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, size_t // // Returns the value returned by _aligned_malloc_dbg. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size, +template +void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size, size_t alignment, int type, char const *file, int line) { - static _aligned_malloc_dbg_t pcrtxxd__malloc_dbg = NULL; + _aligned_malloc_dbg_t pcrtxxd__aligned_malloc_dbg = (_aligned_malloc_dbg_t)pcrtd__aligned_malloc_dbg; + assert(pcrtxxd__aligned_malloc_dbg); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd__malloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _malloc_dbg. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd__malloc_dbg = (_aligned_malloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_malloc_dbg"); - } - - return vld.__aligned_malloc_dbg(pcrtxxd__malloc_dbg, context, size, alignment, type, file, line); + return vld.__aligned_malloc_dbg(pcrtxxd__aligned_malloc_dbg, context, size, alignment, type, file, line); } // crtd__aligned_offset_malloc_dbg - Calls to _aligned_offset_malloc_dbg from msvcrXXd.dll are patched @@ -517,28 +464,20 @@ void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size, // // Returns the value returned by _aligned_offset_malloc_dbg. // -TEMPLATE_HEADER - void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t size, +template +void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t size, size_t alignment, size_t offset, int type, char const *file, int line) { - static _aligned_offset_malloc_dbg_t pcrtxxd__malloc_dbg = NULL; + _aligned_offset_malloc_dbg_t pcrtxxd__malloc_dbg = (_aligned_offset_malloc_dbg_t)pcrtd__aligned_offset_malloc_dbg; + assert(pcrtxxd__malloc_dbg); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd__malloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _malloc_dbg. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd__malloc_dbg = (_aligned_offset_malloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_malloc_dbg"); - } - return vld.__aligned_offset_malloc_dbg(pcrtxxd__malloc_dbg, context, size, alignment, offset, type, file, line); } @@ -560,28 +499,20 @@ TEMPLATE_HEADER // // Returns the value returned by _aligned_realloc_dbg. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem, +template +void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem, size_t size, size_t alignment, int type, char const *file, int line) { - static _aligned_realloc_dbg_t pcrtxxd__realloc_dbg = NULL; + _aligned_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_realloc_dbg_t)pcrtd__aligned_realloc_dbg; + assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd__realloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _realloc_dbg. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd__realloc_dbg = (_aligned_realloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_realloc_dbg"); - } - return vld.__aligned_realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, alignment, type, file, line); } @@ -603,8 +534,8 @@ void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem, // // Returns the value returned by _aligned_offset_realloc_dbg. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void *mem, +template +void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void *mem, size_t size, size_t alignment, size_t offset, @@ -612,20 +543,12 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void * char const *file, int line) { - static _aligned_offset_realloc_dbg_t pcrtxxd__realloc_dbg = NULL; + _aligned_offset_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_offset_realloc_dbg_t)pcrtd__aligned_offset_realloc_dbg; + assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd__realloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _realloc_dbg. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd__realloc_dbg = (_aligned_offset_realloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_realloc_dbg"); - } - return vld.__aligned_offset_realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, alignment, offset, type, file, line); } @@ -649,30 +572,22 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void * // // Returns the value returned by _aligned_realloc_dbg. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *mem, - size_t num, - size_t size, - size_t alignment, - int type, - char const *file, - int line) +template +void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *mem, + size_t num, + size_t size, + size_t alignment, + int type, + char const *file, + int line) { - static _aligned_recalloc_dbg_t pcrtxxd__recalloc_dbg = NULL; + _aligned_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_recalloc_dbg_t)pcrtd__aligned_recalloc_dbg; + assert(pcrtxxd__recalloc_dbg); - context_t context; - - CAPTURE_CONTEXT(context); - - if (pcrtxxd__recalloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _realloc_dbg. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd__recalloc_dbg = (_aligned_recalloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_recalloc_dbg"); - } + context_t context; + CAPTURE_CONTEXT(context); - return vld.__aligned_recalloc_dbg(pcrtxxd__recalloc_dbg, context, mem, num, size, alignment, type, file, line); + return vld.__aligned_recalloc_dbg(pcrtxxd__recalloc_dbg, context, mem, num, size, alignment, type, file, line); } // crtd__aligned_offset_recalloc_dbg - Calls to _aligned_offset_realloc_dbg from msvcrXXd.dll are patched @@ -695,31 +610,23 @@ void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *mem, // // Returns the value returned by _aligned_offset_realloc_dbg. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void *mem, - size_t num, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) +template +void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void *mem, + size_t num, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) { - static _aligned_offset_recalloc_dbg_t pcrtxxd__recalloc_dbg = NULL; - - context_t context; + _aligned_offset_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_offset_recalloc_dbg_t)pcrtd__aligned_offset_recalloc_dbg; + assert(pcrtxxd__recalloc_dbg); - CAPTURE_CONTEXT(context); - - if (pcrtxxd__recalloc_dbg == NULL) { - // This is the first call to this function. Link to the real - // _realloc_dbg. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd__recalloc_dbg = (_aligned_offset_recalloc_dbg_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_recalloc_dbg"); - } + context_t context; + CAPTURE_CONTEXT(context); - return vld.__aligned_offset_recalloc_dbg(pcrtxxd__recalloc_dbg, context, mem, num, size, alignment, offset, type, file, line); + return vld.__aligned_offset_recalloc_dbg(pcrtxxd__recalloc_dbg, context, mem, num, size, alignment, offset, type, file, line); } // crtd__aligned_malloc - Calls to malloc from msvcrXXd.dll are patched through to @@ -733,22 +640,15 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void // // Returns the valued returned from malloc. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t alignment) +template +void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t alignment) { - static _aligned_malloc_t pcrtxxd_malloc = NULL; + _aligned_malloc_t pcrtxxd_malloc = (_aligned_malloc_t)pcrtd_aligned_malloc; + assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd_malloc == NULL) { - // This is the first call to this function. Link to the real malloc. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_malloc = (_aligned_malloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_malloc"); - } - return vld.__aligned_malloc(pcrtxxd_malloc, context, size, alignment); } @@ -763,22 +663,15 @@ void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t alig // // Returns the valued returned from malloc. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset) +template +void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset) { - static _aligned_offset_malloc_t pcrtxxd_malloc = NULL; + _aligned_offset_malloc_t pcrtxxd_malloc = (_aligned_offset_malloc_t)pcrtd_aligned_offset_malloc; + assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd_malloc == NULL) { - // This is the first call to this function. Link to the real malloc. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_malloc = (_aligned_offset_malloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_malloc"); - } - return vld.__aligned_offset_malloc(pcrtxxd_malloc, context, size, alignment, offset); } @@ -795,22 +688,15 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, size // // Returns the value returned from realloc. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t size, size_t alignment) +template +void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t size, size_t alignment) { - static _aligned_realloc_t pcrtxxd_realloc = NULL; + _aligned_realloc_t pcrtxxd_realloc = (_aligned_realloc_t)pcrtd_aligned_realloc; + assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd_realloc == NULL) { - // This is the first call to this function. Link to the real realloc. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_realloc = (_aligned_realloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_realloc"); - } - return vld.__aligned_realloc(pcrtxxd_realloc, context, mem, size, alignment); } @@ -827,22 +713,15 @@ void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t size, // // Returns the value returned from realloc. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, size_t size, size_t alignment, size_t offset) +template +void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, size_t size, size_t alignment, size_t offset) { - static _aligned_offset_realloc_t pcrtxxd_realloc = NULL; + _aligned_offset_realloc_t pcrtxxd_realloc = (_aligned_offset_realloc_t)pcrtd_aligned_offset_realloc; + assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd_realloc == NULL) { - // This is the first call to this function. Link to the real realloc. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_realloc = (_aligned_offset_realloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_realloc"); - } - return vld.__aligned_offset_realloc(pcrtxxd_realloc, context, mem, size, alignment, offset); } @@ -861,22 +740,15 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, size_ // // Returns the value returned from realloc. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t num, size_t size, size_t alignment) +template +void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t num, size_t size, size_t alignment) { - static _aligned_recalloc_t pcrtxxd_recalloc = NULL; + _aligned_recalloc_t pcrtxxd_recalloc = (_aligned_recalloc_t)pcrtd_aligned_recalloc; + assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd_recalloc == NULL) { - // This is the first call to this function. Link to the real realloc. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_recalloc = (_aligned_recalloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_recalloc"); - } - return vld.__aligned_recalloc(pcrtxxd_recalloc, context, mem, num, size, alignment); } @@ -895,22 +767,15 @@ void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t num, // // Returns the value returned from realloc. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, size_t num, size_t size, size_t alignment, size_t offset) +template +void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, size_t num, size_t size, size_t alignment, size_t offset) { - static _aligned_offset_recalloc_t pcrtxxd_recalloc = NULL; + _aligned_offset_recalloc_t pcrtxxd_recalloc = (_aligned_offset_recalloc_t)pcrtd_aligned_offset_recalloc; + assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context); - if (pcrtxxd_recalloc == NULL) { - // This is the first call to this function. Link to the real realloc. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_recalloc = (_aligned_offset_recalloc_t)vld._RGetProcAddress(msvcrxxd, "_aligned_offset_recalloc"); - } - return vld.__aligned_offset_recalloc(pcrtxxd_recalloc, context, mem, num, size, alignment, offset); } @@ -923,13 +788,16 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, size // // Returns the value returned by the CRT scalar new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd_scalar_new (size_t size) +template +void* CrtMfcPatch::crtd_scalar_new (size_t size) { + new_t pcrtxxd_scalar_new = (new_t)pcrtd_scalar_new; + assert(pcrtxxd_scalar_new); + context_t context; CAPTURE_CONTEXT(context); - return crtd_new(context, size); + return vld._new(pcrtxxd_scalar_new, context, size); } // crtd_vector_new - Calls to the CRT's vector new operator from msvcrXXd.dll @@ -941,83 +809,15 @@ void* CrtMfcPatch::crtd_scalar_new (size_t size) // // Returns the value returned by the CRT vector new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::crtd_vector_new (size_t size) +template +void* CrtMfcPatch::crtd_vector_new (size_t size) { + new_t pcrtxxd_scalar_new = (new_t)pcrtd_vector_new; + assert(pcrtxxd_scalar_new); + context_t context; CAPTURE_CONTEXT(context); - return crtd_new(context, size); -} - -// crtd_new_dbg - A template function for implementation of patch functions to -// the CRT's debug new operator from msvcrXXd.dll -// -// - procname (IN): The debug new operator's name -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the CRT debug new operator. -// -TEMPLATE_HEADER -template -void* CrtMfcPatch::crtd_new_dbg (context_t& context, - size_t size, - int type, - char const *file, - int line) -{ - static new_dbg_crt_t pcrtxxd_new_dbg = NULL; - - if (pcrtxxd_new_dbg == NULL) { - // This is the first call to this function. Link to the real CRT debug - // new operator. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(msvcrxxd, procname); - } - - return vld.__new_dbg_crt(pcrtxxd_new_dbg, context, size, type, file, line); -} - -// crt_new - A template function for implementing patch functions to the -// CRT's new operator from msvcrXXd.dll -// -// - dll (IN): The name of the dll -// -// - procname (IN): The debug new operator's name -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the CRT new operator. -// -TEMPLATE_HEADER -template -void* CrtMfcPatch::crtd_new (context_t& context, size_t size) -{ - static new_t pcrtxxd_scalar_new = NULL; - - if (pcrtxxd_scalar_new == NULL) { - // This is the first call to this function. Link to the real CRT new - // operator. - HMODULE msvcrxxd = VisualLeakDetector::GetSxSModuleHandle(crtddll); - assert(msvcrxxd != NULL); - pcrtxxd_scalar_new = (new_t)vld._RGetProcAddress(msvcrxxd, procname); - } - return vld._new(pcrtxxd_scalar_new, context, size); } @@ -1043,17 +843,19 @@ void* CrtMfcPatch::crtd_new (context_t& context, size_t size) // // Returns the value returned by the MFC debug scalar new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size, +template +void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size, int type, char const *file, int line) { + new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)pmfcd__scalar_new_dbg_4p; + assert(pmfcxxd__new_dbg); + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new_dbg - (context, size, type, file, line); + return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } // mfcd__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from @@ -1070,16 +872,18 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size, // // Returns the value returned by the MFC debug scalar new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size, +template +void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size, char const *file, int line) { - context_t context; + new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)pmfcd__scalar_new_dbg_3p; + assert(pmfcxxd__new_dbg); + + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new_dbg - (context, size, file, line); + return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } // mfcd__vector_new_dbg_4p - Calls to the MFC debug vector new operator from @@ -1098,17 +902,19 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size, // // Returns the value returned by the MFC debug vector new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size, +template +void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size, int type, char const *file, int line) { + new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)pmfcd__scalar_new_dbg_4p; + assert(pmfcxxd__new_dbg); + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new_dbg - (context, size, type, file, line); + return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } // mfcd__vector_new_dbg_3p - Calls to the MFC debug vector new operator from @@ -1125,16 +931,18 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size, // // Returns the value returned by the MFC debug vector new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, +template +void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, char const *file, int line) { + new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)pmfcd__vector_new_dbg_3p; + assert(pmfcxxd__new_dbg); + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new_dbg - (context, size, file, line); + return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } // mfcd_scalar_new - Calls to the MFC scalar new operator from mfcXXd.dll are @@ -1146,13 +954,16 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, // // Returns the value returned by the MFC scalar new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd_scalar_new (size_t size) +template +void* CrtMfcPatch::mfcd_scalar_new (size_t size) { + new_t pmfcxxd_new = (new_t)pmfcd_scalar_new; + assert(pmfcxxd_new); + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new(context, size); + return vld._new(pmfcxxd_new, context, size); } // mfcd_vector_new - Calls to the MFC vector new operator from mfcXXd.dll are @@ -1164,13 +975,16 @@ void* CrtMfcPatch::mfcd_scalar_new (size_t size) // // Returns the value returned by the MFC vector new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcd_vector_new (size_t size) +template +void* CrtMfcPatch::mfcd_vector_new (size_t size) { + new_t pmfcxxd_new = (new_t)pmfcd_vector_new; + assert(pmfcxxd_new); + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new(context, size); + return vld._new(pmfcxxd_new, context, size); } // mfcud__scalar_new_dbg_4p - Calls to the MFC debug scalar new operator from @@ -1189,17 +1003,19 @@ void* CrtMfcPatch::mfcd_vector_new (size_t size) // // Returns the value returned by the MFC debug scalar new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size, +template +void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size, int type, char const *file, int line) { + new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)pmfcud__scalar_new_dbg_4p; + assert(pmfcxxd__new_dbg); + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new_dbg - (context, size, type, file, line); + return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } // mfcud__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from @@ -1216,16 +1032,18 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size, // // Returns the value returned by the MFC debug scalar new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size, +template +void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line) { + new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)pmfcud__scalar_new_dbg_3p; + assert(pmfcxxd__new_dbg); + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new_dbg - (context, size, file, line); + return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } // mfcud__vector_new_dbg_4p - Calls to the MFC debug vector new operator from @@ -1244,17 +1062,19 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size, // // Returns the value returned by the MFC debug vector new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size, +template +void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size, int type, char const *file, int line) { + new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)pmfcud__scalar_new_dbg_4p; + assert(pmfcxxd__new_dbg); + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new_dbg - (context, size, type, file, line); + return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } // mfcud__vector_new_dbg_3p - Calls to the MFC debug vector new operator from @@ -1271,16 +1091,18 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size, // // Returns the value returned by the MFC debug vector new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size, +template +void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size, char const *file, int line) { + new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)pmfcud__vector_new_dbg_3p; + assert(pmfcxxd__new_dbg); + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new_dbg - (context, size, file, line); + return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } // mfcud_scalar_new - Calls to the MFC scalar new operator from mfcXXud.dll are @@ -1292,13 +1114,16 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size, // // Returns the value returned by the MFC scalar new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud_scalar_new (size_t size) +template +void* CrtMfcPatch::mfcud_scalar_new (size_t size) { + new_t pmfcxxd_new = (new_t)pmfcud_scalar_new; + assert(pmfcxxd_new); + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new(context, size); + return vld._new(pmfcxxd_new, context, size); } // mfcud_vector_new - Calls to the MFC vector new operator from mfcXXud.dll are @@ -1310,130 +1135,20 @@ void* CrtMfcPatch::mfcud_scalar_new (size_t size) // // Returns the value returned by the MFC vector new operator. // -TEMPLATE_HEADER -void* CrtMfcPatch::mfcud_vector_new (size_t size) +template +void* CrtMfcPatch::mfcud_vector_new (size_t size) { + new_t pmfcxxd_new = (new_t)pmfcud_vector_new; + assert(pmfcxxd_new); + context_t context; CAPTURE_CONTEXT(context); - return mfcd_new(context, size); -} - -// mfcd_new_dbg - A generic function for implementing patch functions to the MFC -// debug new operators: -// void* __cdecl operator new[](size_t size, int type, char const *file, int line) -// void* __cdecl operator new(size_t size, int type, char const *file, int line) -// -// - mfcdll (IN): The name of the MFC DLL -// -// - ordinal (IN): The debug new operator's ordinal value -// -// - type (IN): The "use type" of the block to be allocated. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug new operator. -// -TEMPLATE_HEADER -template -void* CrtMfcPatch::mfcd_new_dbg (context_t& context, - size_t size, - int type, - char const *file, - int line) -{ - static new_dbg_crt_t pmfcxxd__new_dbg = NULL; - - if (pmfcxxd__new_dbg == NULL) { - // This is the first call to this function. Link to the real MFC debug - // new operator. - HMODULE mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); - assert(mfcxxd != NULL); - pmfcxxd__new_dbg = (new_dbg_crt_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); - } - - return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); -} - -// mfcd_new_dbg - A generic function for implementing patch functions to the MFC -// debug new operators: -// void* __cdecl operator new[](size_t size, char const *file, int line) -// void* __cdecl operator new(size_t size, char const *file, int line) -// -// - mfcdll (IN): The name of the MFC DLL -// -// - ordinal (IN): The debug new operator's ordinal value -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the MFC debug new operator. -// -TEMPLATE_HEADER -template -void* CrtMfcPatch::mfcd_new_dbg (context_t& context, - size_t size, - char const *file, - int line) -{ - static new_dbg_mfc_t pmfcxxd__new_dbg = NULL; - - if (pmfcxxd__new_dbg == NULL) { - // This is the first call to this function. Link to the real MFC debug - // new operator. - HMODULE mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); - assert(mfcxxd != NULL); - pmfcxxd__new_dbg = (new_dbg_mfc_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); - } - - return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); -} - -// mfcd_new - A generic function for implementing patch functions to the MFC new -// operators. -// -// - mfcdll (IN): The name of the MFC DLL -// -// - ordinal (IN): The new operator's ordinal value -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the MFC new operator. -// -TEMPLATE_HEADER -template -void* CrtMfcPatch::mfcd_new (context_t& context, size_t size) -{ - static new_t pmfcxxd_new = NULL; - - if (pmfcxxd_new == NULL) { - // This is the first call to this function. Link to the real CRT new - // operator. - HMODULE mfcxxd = VisualLeakDetector::GetSxSModuleHandle(mfcdll); - assert(mfcxxd != NULL); - pmfcxxd_new = (new_t)vld._RGetProcAddress(mfcxxd, (LPCSTR)ordinal); - } - return vld._new(pmfcxxd_new, context, size); } -#undef TEMPLATE_HEADER -#undef TEMPLATE_ARGS +#undef template +#undef specialization #ifndef WIN64 //void * __cdecl operator new(unsigned int,int,char const *,int) @@ -1455,79 +1170,243 @@ const extern char scalar_new_name[] = "??2@YAPEAX_K@Z"; const extern char vector_new_name[] = "??_U@YAPEAX_K@Z"; #endif -const extern char msvcrtd_dll[] = "msvcrtd.dll"; -const extern char mfc42d_dll[] = "mfc42d.dll"; -const extern char mfc42ud_dll[] = "mfc42ud.dll"; -const extern char msvcr70d_dll[] = "msvcr70d.dll"; -const extern char mfc70d_dll[] = "mfc70d.dll"; -const extern char mfc70ud_dll[] = "mfc70ud.dll"; -const extern char msvcr71d_dll[] = "msvcr71d.dll"; -const extern char mfc71d_dll[] = "mfc71d.dll"; -const extern char mfc71ud_dll[] = "mfc71ud.dll"; -const extern char msvcr80d_dll[] = "msvcr80d.dll"; -const extern char mfc80d_dll[] = "mfc80d.dll"; -const extern char mfc80ud_dll[] = "mfc80ud.dll"; -const extern char msvcr90d_dll[] = "msvcr90d.dll"; -const extern char mfc90d_dll[] = "mfc90d.dll"; -const extern char mfc90ud_dll[] = "mfc90ud.dll"; -const extern char msvcr100d_dll[] = "msvcr100d.dll"; -const extern char mfc100d_dll[] = "mfc100d.dll"; -const extern char mfc100ud_dll[] = "mfc100ud.dll"; - // Visual Studio 6.0 -typedef CrtMfcPatch +typedef CrtMfcPatch<60> VS60; // Visual Studio .NET 2002 -typedef CrtMfcPatch +typedef CrtMfcPatch<70> VS70; // Visual Studio .NET 2003 -typedef CrtMfcPatch +typedef CrtMfcPatch<71> VS71; // Visual Studio 2005 -typedef CrtMfcPatch -#else - 267, 268, 269, 907, 908, 909, - 267, 268, 269, 907, 908, 909> -#endif +typedef CrtMfcPatch<80> VS80; // Visual Studio 2008 -typedef CrtMfcPatch -#else - 267, 268, 269, 909, 910, 911, - 267, 268, 269, 913, 914, 915> -#endif +typedef CrtMfcPatch<90> VS90; // Visual Studio 2010 -typedef CrtMfcPatch -#else - 267, 268, 269, 1405, 1406, 1407, - 267, 268, 269, 1412, 1413, 1414> -#endif +typedef CrtMfcPatch<100> VS100; + +void* VS60::pcrtd__calloc_dbg = NULL; +void* VS60::pcrtd__malloc_dbg = NULL; +void* VS60::pcrtd__realloc_dbg = NULL; +void* VS60::pcrtd__recalloc_dbg = NULL; +void* VS60::pcrtd_calloc = NULL; +void* VS60::pcrtd_malloc = NULL; +void* VS60::pcrtd_realloc = NULL; +void* VS60::pcrtd_recalloc = NULL; +void* VS60::pcrtd__aligned_malloc_dbg = NULL; +void* VS60::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS60::pcrtd__aligned_realloc_dbg = NULL; +void* VS60::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS60::pcrtd__aligned_recalloc_dbg = NULL; +void* VS60::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS60::pcrtd_aligned_malloc = NULL; +void* VS60::pcrtd_aligned_offset_malloc = NULL; +void* VS60::pcrtd_aligned_realloc = NULL; +void* VS60::pcrtd_aligned_offset_realloc = NULL; +void* VS60::pcrtd_aligned_recalloc = NULL; +void* VS60::pcrtd_aligned_offset_recalloc = NULL; +void* VS60::pcrtd__scalar_new_dbg = NULL; +void* VS60::pcrtd__vector_new_dbg = NULL; +void* VS60::pcrtd_scalar_new = NULL; +void* VS60::pcrtd_vector_new = NULL; +void* VS60::pmfcd_scalar_new = NULL; +void* VS60::pmfcd_vector_new = NULL; +void* VS60::pmfcd__scalar_new_dbg_4p = NULL; +void* VS60::pmfcd__vector_new_dbg_4p = NULL; +void* VS60::pmfcd__scalar_new_dbg_3p = NULL; +void* VS60::pmfcd__vector_new_dbg_3p = NULL; +void* VS60::pmfcud_scalar_new = NULL; +void* VS60::pmfcud_vector_new = NULL; +void* VS60::pmfcud__scalar_new_dbg_4p = NULL; +void* VS60::pmfcud__vector_new_dbg_4p = NULL; +void* VS60::pmfcud__scalar_new_dbg_3p = NULL; +void* VS60::pmfcud__vector_new_dbg_3p = NULL; + +void* VS70::pcrtd__calloc_dbg = NULL; +void* VS70::pcrtd__malloc_dbg = NULL; +void* VS70::pcrtd__realloc_dbg = NULL; +void* VS70::pcrtd__recalloc_dbg = NULL; +void* VS70::pcrtd_calloc = NULL; +void* VS70::pcrtd_malloc = NULL; +void* VS70::pcrtd_realloc = NULL; +void* VS70::pcrtd_recalloc = NULL; +void* VS70::pcrtd__aligned_malloc_dbg = NULL; +void* VS70::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS70::pcrtd__aligned_realloc_dbg = NULL; +void* VS70::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS70::pcrtd__aligned_recalloc_dbg = NULL; +void* VS70::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS70::pcrtd_aligned_malloc = NULL; +void* VS70::pcrtd_aligned_offset_malloc = NULL; +void* VS70::pcrtd_aligned_realloc = NULL; +void* VS70::pcrtd_aligned_offset_realloc = NULL; +void* VS70::pcrtd_aligned_recalloc = NULL; +void* VS70::pcrtd_aligned_offset_recalloc = NULL; +void* VS70::pcrtd__scalar_new_dbg = NULL; +void* VS70::pcrtd__vector_new_dbg = NULL; +void* VS70::pcrtd_scalar_new = NULL; +void* VS70::pcrtd_vector_new = NULL; +void* VS70::pmfcd_scalar_new = NULL; +void* VS70::pmfcd_vector_new = NULL; +void* VS70::pmfcd__scalar_new_dbg_4p = NULL; +void* VS70::pmfcd__vector_new_dbg_4p = NULL; +void* VS70::pmfcd__scalar_new_dbg_3p = NULL; +void* VS70::pmfcd__vector_new_dbg_3p = NULL; +void* VS70::pmfcud_scalar_new = NULL; +void* VS70::pmfcud_vector_new = NULL; +void* VS70::pmfcud__scalar_new_dbg_4p = NULL; +void* VS70::pmfcud__vector_new_dbg_4p = NULL; +void* VS70::pmfcud__scalar_new_dbg_3p = NULL; +void* VS70::pmfcud__vector_new_dbg_3p = NULL; + +void* VS71::pcrtd__calloc_dbg = NULL; +void* VS71::pcrtd__malloc_dbg = NULL; +void* VS71::pcrtd__realloc_dbg = NULL; +void* VS71::pcrtd__recalloc_dbg = NULL; +void* VS71::pcrtd_calloc = NULL; +void* VS71::pcrtd_malloc = NULL; +void* VS71::pcrtd_realloc = NULL; +void* VS71::pcrtd_recalloc = NULL; +void* VS71::pcrtd__aligned_malloc_dbg = NULL; +void* VS71::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS71::pcrtd__aligned_realloc_dbg = NULL; +void* VS71::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS71::pcrtd__aligned_recalloc_dbg = NULL; +void* VS71::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS71::pcrtd_aligned_malloc = NULL; +void* VS71::pcrtd_aligned_offset_malloc = NULL; +void* VS71::pcrtd_aligned_realloc = NULL; +void* VS71::pcrtd_aligned_offset_realloc = NULL; +void* VS71::pcrtd_aligned_recalloc = NULL; +void* VS71::pcrtd_aligned_offset_recalloc = NULL; +void* VS71::pcrtd__scalar_new_dbg = NULL; +void* VS71::pcrtd__vector_new_dbg = NULL; +void* VS71::pcrtd_scalar_new = NULL; +void* VS71::pcrtd_vector_new = NULL; +void* VS71::pmfcd_scalar_new = NULL; +void* VS71::pmfcd_vector_new = NULL; +void* VS71::pmfcd__scalar_new_dbg_4p = NULL; +void* VS71::pmfcd__vector_new_dbg_4p = NULL; +void* VS71::pmfcd__scalar_new_dbg_3p = NULL; +void* VS71::pmfcd__vector_new_dbg_3p = NULL; +void* VS71::pmfcud_scalar_new = NULL; +void* VS71::pmfcud_vector_new = NULL; +void* VS71::pmfcud__scalar_new_dbg_4p = NULL; +void* VS71::pmfcud__vector_new_dbg_4p = NULL; +void* VS71::pmfcud__scalar_new_dbg_3p = NULL; +void* VS71::pmfcud__vector_new_dbg_3p = NULL; + +void* VS80::pcrtd__calloc_dbg = NULL; +void* VS80::pcrtd__malloc_dbg = NULL; +void* VS80::pcrtd__realloc_dbg = NULL; +void* VS80::pcrtd__recalloc_dbg = NULL; +void* VS80::pcrtd_calloc = NULL; +void* VS80::pcrtd_malloc = NULL; +void* VS80::pcrtd_realloc = NULL; +void* VS80::pcrtd_recalloc = NULL; +void* VS80::pcrtd__aligned_malloc_dbg = NULL; +void* VS80::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS80::pcrtd__aligned_realloc_dbg = NULL; +void* VS80::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS80::pcrtd__aligned_recalloc_dbg = NULL; +void* VS80::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS80::pcrtd_aligned_malloc = NULL; +void* VS80::pcrtd_aligned_offset_malloc = NULL; +void* VS80::pcrtd_aligned_realloc = NULL; +void* VS80::pcrtd_aligned_offset_realloc = NULL; +void* VS80::pcrtd_aligned_recalloc = NULL; +void* VS80::pcrtd_aligned_offset_recalloc = NULL; +void* VS80::pcrtd__scalar_new_dbg = NULL; +void* VS80::pcrtd__vector_new_dbg = NULL; +void* VS80::pcrtd_scalar_new = NULL; +void* VS80::pcrtd_vector_new = NULL; +void* VS80::pmfcd_scalar_new = NULL; +void* VS80::pmfcd_vector_new = NULL; +void* VS80::pmfcd__scalar_new_dbg_4p = NULL; +void* VS80::pmfcd__vector_new_dbg_4p = NULL; +void* VS80::pmfcd__scalar_new_dbg_3p = NULL; +void* VS80::pmfcd__vector_new_dbg_3p = NULL; +void* VS80::pmfcud_scalar_new = NULL; +void* VS80::pmfcud_vector_new = NULL; +void* VS80::pmfcud__scalar_new_dbg_4p = NULL; +void* VS80::pmfcud__vector_new_dbg_4p = NULL; +void* VS80::pmfcud__scalar_new_dbg_3p = NULL; +void* VS80::pmfcud__vector_new_dbg_3p = NULL; + +void* VS90::pcrtd__calloc_dbg = NULL; +void* VS90::pcrtd__malloc_dbg = NULL; +void* VS90::pcrtd__realloc_dbg = NULL; +void* VS90::pcrtd__recalloc_dbg = NULL; +void* VS90::pcrtd_calloc = NULL; +void* VS90::pcrtd_malloc = NULL; +void* VS90::pcrtd_realloc = NULL; +void* VS90::pcrtd_recalloc = NULL; +void* VS90::pcrtd__aligned_malloc_dbg = NULL; +void* VS90::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS90::pcrtd__aligned_realloc_dbg = NULL; +void* VS90::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS90::pcrtd__aligned_recalloc_dbg = NULL; +void* VS90::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS90::pcrtd_aligned_malloc = NULL; +void* VS90::pcrtd_aligned_offset_malloc = NULL; +void* VS90::pcrtd_aligned_realloc = NULL; +void* VS90::pcrtd_aligned_offset_realloc = NULL; +void* VS90::pcrtd_aligned_recalloc = NULL; +void* VS90::pcrtd_aligned_offset_recalloc = NULL; +void* VS90::pcrtd__scalar_new_dbg = NULL; +void* VS90::pcrtd__vector_new_dbg = NULL; +void* VS90::pcrtd_scalar_new = NULL; +void* VS90::pcrtd_vector_new = NULL; +void* VS90::pmfcd_scalar_new = NULL; +void* VS90::pmfcd_vector_new = NULL; +void* VS90::pmfcd__scalar_new_dbg_4p = NULL; +void* VS90::pmfcd__vector_new_dbg_4p = NULL; +void* VS90::pmfcd__scalar_new_dbg_3p = NULL; +void* VS90::pmfcd__vector_new_dbg_3p = NULL; +void* VS90::pmfcud_scalar_new = NULL; +void* VS90::pmfcud_vector_new = NULL; +void* VS90::pmfcud__scalar_new_dbg_4p = NULL; +void* VS90::pmfcud__vector_new_dbg_4p = NULL; +void* VS90::pmfcud__scalar_new_dbg_3p = NULL; +void* VS90::pmfcud__vector_new_dbg_3p = NULL; + +void* VS100::pcrtd__calloc_dbg = NULL; +void* VS100::pcrtd__malloc_dbg = NULL; +void* VS100::pcrtd__realloc_dbg = NULL; +void* VS100::pcrtd__recalloc_dbg = NULL; +void* VS100::pcrtd_calloc = NULL; +void* VS100::pcrtd_malloc = NULL; +void* VS100::pcrtd_realloc = NULL; +void* VS100::pcrtd_recalloc = NULL; +void* VS100::pcrtd__aligned_malloc_dbg = NULL; +void* VS100::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS100::pcrtd__aligned_realloc_dbg = NULL; +void* VS100::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS100::pcrtd__aligned_recalloc_dbg = NULL; +void* VS100::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS100::pcrtd_aligned_malloc = NULL; +void* VS100::pcrtd_aligned_offset_malloc = NULL; +void* VS100::pcrtd_aligned_realloc = NULL; +void* VS100::pcrtd_aligned_offset_realloc = NULL; +void* VS100::pcrtd_aligned_recalloc = NULL; +void* VS100::pcrtd_aligned_offset_recalloc = NULL; +void* VS100::pcrtd__scalar_new_dbg = NULL; +void* VS100::pcrtd__vector_new_dbg = NULL; +void* VS100::pcrtd_scalar_new = NULL; +void* VS100::pcrtd_vector_new = NULL; +void* VS100::pmfcd_scalar_new = NULL; +void* VS100::pmfcd_vector_new = NULL; +void* VS100::pmfcd__scalar_new_dbg_4p = NULL; +void* VS100::pmfcd__vector_new_dbg_4p = NULL; +void* VS100::pmfcd__scalar_new_dbg_3p = NULL; +void* VS100::pmfcd__vector_new_dbg_3p = NULL; +void* VS100::pmfcud_scalar_new = NULL; +void* VS100::pmfcud_vector_new = NULL; +void* VS100::pmfcud__scalar_new_dbg_4p = NULL; +void* VS100::pmfcud__vector_new_dbg_4p = NULL; +void* VS100::pmfcud__scalar_new_dbg_3p = NULL; +void* VS100::pmfcud__vector_new_dbg_3p = NULL; diff --git a/utility.cpp b/utility.cpp index 210c439d..7cfd9238 100644 --- a/utility.cpp +++ b/utility.cpp @@ -495,8 +495,8 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) // writable. if ( import != replacement ) { - if (entry->original == NULL) - entry->original = (LPCVOID)iate->u1.Function; + if (entry->original != NULL) + *entry->original = (LPVOID)iate->u1.Function; DWORD protect; VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); @@ -845,16 +845,16 @@ VOID setreportfile (FILE *file, BOOL copydebugger, BOOL tostdout) // LPWSTR AppendString (LPWSTR dest, LPCWSTR source) { - if ((source == NULL) || (wcslen(source) == 0)) - { - return dest; - } - SIZE_T length = wcslen(dest) + wcslen(source); - LPWSTR new_str = new WCHAR [length + 1]; - wcsncpy_s(new_str, length + 1, dest, _TRUNCATE); - wcsncat_s(new_str, length + 1, source, _TRUNCATE); - delete [] dest; - return new_str; + if ((source == NULL) || (wcslen(source) == 0)) + { + return dest; + } + SIZE_T length = wcslen(dest) + wcslen(source); + LPWSTR new_str = new WCHAR [length + 1]; + wcsncpy_s(new_str, length + 1, dest, _TRUNCATE); + wcsncat_s(new_str, length + 1, source, _TRUNCATE); + delete [] dest; + return new_str; } // strtobool - Converts string values (e.g. "yes", "no", "on", "off") to boolean diff --git a/utility.h b/utility.h index 88369cbc..a9c2f9bf 100644 --- a/utility.h +++ b/utility.h @@ -101,8 +101,8 @@ enum encoding_e { // through to replacement functions provided by VLD. typedef struct patchentry_s { - LPCSTR importname; // The name (or ordinal) of the imported API being patched. - LPCVOID original; // Pointer to the original function. + LPCSTR importname; // The name (or ordinal) of the imported API being patched. + LPVOID* original; // Pointer to the original function. LPCVOID replacement; // Pointer to the function to which the imported API should be patched through to. } patchentry_t; diff --git a/vld.cpp b/vld.cpp index 2716c634..3e1423f5 100644 --- a/vld.cpp +++ b/vld.cpp @@ -91,238 +91,238 @@ VisualLeakDetector::_GetProcAddressType *VisualLeakDetector::m_original_GetProcA static patchentry_t mfc42dPatch [] = { // XXX why are the vector new operators missing for mfc42d.dll? - ORDINAL(711), NULL, VS60::mfcd_scalar_new, - ORDINAL(712), NULL, VS60::mfcd__scalar_new_dbg_4p, - ORDINAL(714), NULL, VS60::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(711), &VS60::pmfcd_scalar_new, VS60::mfcd_scalar_new, + ORDINAL(712), &VS60::pmfcd__scalar_new_dbg_4p, VS60::mfcd__scalar_new_dbg_4p, + ORDINAL(714), &VS60::pmfcd__scalar_new_dbg_3p, VS60::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc42udPatch [] = { // XXX why are the vector new operators missing for mfc42ud.dll? - ORDINAL(711), NULL, VS60::mfcud_scalar_new, - ORDINAL(712), NULL, VS60::mfcud__scalar_new_dbg_4p, - ORDINAL(714), NULL, VS60::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(711), &VS60::pmfcud_scalar_new, VS60::mfcud_scalar_new, + ORDINAL(712), &VS60::pmfcud__scalar_new_dbg_4p, VS60::mfcud__scalar_new_dbg_4p, + ORDINAL(714), &VS60::pmfcud__scalar_new_dbg_3p, VS60::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc70dPatch [] = { - ORDINAL(257), NULL, VS70::mfcd_vector_new, - ORDINAL(258), NULL, VS70::mfcd__vector_new_dbg_4p, - ORDINAL(259), NULL, VS70::mfcd__vector_new_dbg_3p, - ORDINAL(832), NULL, VS70::mfcd_scalar_new, - ORDINAL(833), NULL, VS70::mfcd__scalar_new_dbg_4p, - ORDINAL(834), NULL, VS70::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(257), &VS70::pmfcd_vector_new, VS70::mfcd_vector_new, + ORDINAL(258), &VS70::pmfcd__vector_new_dbg_4p, VS70::mfcd__vector_new_dbg_4p, + ORDINAL(259), &VS70::pmfcd__vector_new_dbg_3p, VS70::mfcd__vector_new_dbg_3p, + ORDINAL(832), &VS70::pmfcd_scalar_new, VS70::mfcd_scalar_new, + ORDINAL(833), &VS70::pmfcd__scalar_new_dbg_4p, VS70::mfcd__scalar_new_dbg_4p, + ORDINAL(834), &VS70::pmfcd__scalar_new_dbg_3p, VS70::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc70udPatch [] = { - ORDINAL(258), NULL, VS70::mfcud_vector_new, - ORDINAL(259), NULL, VS70::mfcud__vector_new_dbg_4p, - ORDINAL(260), NULL, VS70::mfcud__vector_new_dbg_3p, - ORDINAL(833), NULL, VS70::mfcud_scalar_new, - ORDINAL(834), NULL, VS70::mfcud__scalar_new_dbg_4p, - ORDINAL(835), NULL, VS70::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(258), &VS70::pmfcud_vector_new, VS70::mfcud_vector_new, + ORDINAL(259), &VS70::pmfcud__vector_new_dbg_4p, VS70::mfcud__vector_new_dbg_4p, + ORDINAL(260), &VS70::pmfcud__vector_new_dbg_3p, VS70::mfcud__vector_new_dbg_3p, + ORDINAL(833), &VS70::pmfcud_scalar_new, VS70::mfcud_scalar_new, + ORDINAL(834), &VS70::pmfcud__scalar_new_dbg_4p, VS70::mfcud__scalar_new_dbg_4p, + ORDINAL(835), &VS70::pmfcud__scalar_new_dbg_3p, VS70::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc71dPatch [] = { - ORDINAL(267), NULL, VS71::mfcd_vector_new, - ORDINAL(268), NULL, VS71::mfcd__vector_new_dbg_4p, - ORDINAL(269), NULL, VS71::mfcd__vector_new_dbg_3p, - ORDINAL(893), NULL, VS71::mfcd_scalar_new, - ORDINAL(894), NULL, VS71::mfcd__scalar_new_dbg_4p, - ORDINAL(895), NULL, VS71::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS71::pmfcd_vector_new, VS71::mfcd_vector_new, + ORDINAL(268), &VS71::pmfcd__vector_new_dbg_4p, VS71::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS71::pmfcd__vector_new_dbg_3p, VS71::mfcd__vector_new_dbg_3p, + ORDINAL(893), &VS71::pmfcd_scalar_new, VS71::mfcd_scalar_new, + ORDINAL(894), &VS71::pmfcd__scalar_new_dbg_4p, VS71::mfcd__scalar_new_dbg_4p, + ORDINAL(895), &VS71::pmfcd__scalar_new_dbg_3p, VS71::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc71udPatch [] = { - ORDINAL(267), NULL, VS71::mfcud_vector_new, - ORDINAL(268), NULL, VS71::mfcud__vector_new_dbg_4p, - ORDINAL(269), NULL, VS71::mfcud__vector_new_dbg_3p, - ORDINAL(893), NULL, VS71::mfcud_scalar_new, - ORDINAL(894), NULL, VS71::mfcud__scalar_new_dbg_4p, - ORDINAL(895), NULL, VS71::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS71::pmfcud_vector_new, VS71::mfcud_vector_new, + ORDINAL(268), &VS71::pmfcud__vector_new_dbg_4p, VS71::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS71::pmfcud__vector_new_dbg_3p, VS71::mfcud__vector_new_dbg_3p, + ORDINAL(893), &VS71::pmfcud_scalar_new, VS71::mfcud_scalar_new, + ORDINAL(894), &VS71::pmfcud__scalar_new_dbg_4p, VS71::mfcud__scalar_new_dbg_4p, + ORDINAL(895), &VS71::pmfcud__scalar_new_dbg_3p, VS71::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc80dPatch [] = { - ORDINAL(267), NULL, VS80::mfcd_vector_new, - ORDINAL(268), NULL, VS80::mfcd__vector_new_dbg_4p, - ORDINAL(269), NULL, VS80::mfcd__vector_new_dbg_3p, - ORDINAL2(893,907), NULL, VS80::mfcd_scalar_new, - ORDINAL2(894,908), NULL, VS80::mfcd__scalar_new_dbg_4p, - ORDINAL2(895,909), NULL, VS80::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS80::pmfcd_vector_new, VS80::mfcd_vector_new, + ORDINAL(268), &VS80::pmfcd__vector_new_dbg_4p, VS80::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS80::pmfcd__vector_new_dbg_3p, VS80::mfcd__vector_new_dbg_3p, + ORDINAL2(893,907), &VS80::pmfcd_scalar_new, VS80::mfcd_scalar_new, + ORDINAL2(894,908), &VS80::pmfcd__scalar_new_dbg_4p, VS80::mfcd__scalar_new_dbg_4p, + ORDINAL2(895,909), &VS80::pmfcd__scalar_new_dbg_3p, VS80::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc80udPatch [] = { - ORDINAL(267), NULL, VS80::mfcud_vector_new, - ORDINAL(268), NULL, VS80::mfcud__vector_new_dbg_4p, - ORDINAL(269), NULL, VS80::mfcud__vector_new_dbg_3p, - ORDINAL2(893,907), NULL, VS80::mfcud_scalar_new, - ORDINAL2(894,908), NULL, VS80::mfcud__scalar_new_dbg_4p, - ORDINAL2(895,909), NULL, VS80::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS80::pmfcud_vector_new, VS80::mfcud_vector_new, + ORDINAL(268), &VS80::pmfcud__vector_new_dbg_4p, VS80::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS80::pmfcud__vector_new_dbg_3p, VS80::mfcud__vector_new_dbg_3p, + ORDINAL2(893,907), &VS80::pmfcud_scalar_new, VS80::mfcud_scalar_new, + ORDINAL2(894,908), &VS80::pmfcud__scalar_new_dbg_4p, VS80::mfcud__scalar_new_dbg_4p, + ORDINAL2(895,909), &VS80::pmfcud__scalar_new_dbg_3p, VS80::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc90dPatch [] = { - ORDINAL(267), NULL, VS90::mfcd_vector_new, - ORDINAL(268), NULL, VS90::mfcd__vector_new_dbg_4p, - ORDINAL(269), NULL, VS90::mfcd__vector_new_dbg_3p, - ORDINAL2(931, 909), NULL, VS90::mfcd_scalar_new, - ORDINAL2(932, 910), NULL, VS90::mfcd__scalar_new_dbg_4p, - ORDINAL2(933, 911), NULL, VS90::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS90::pmfcd_vector_new, VS90::mfcd_vector_new, + ORDINAL(268), &VS90::pmfcd__vector_new_dbg_4p, VS90::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS90::pmfcd__vector_new_dbg_3p, VS90::mfcd__vector_new_dbg_3p, + ORDINAL2(931, 909), &VS90::pmfcd_scalar_new, VS90::mfcd_scalar_new, + ORDINAL2(932, 910), &VS90::pmfcd__scalar_new_dbg_4p, VS90::mfcd__scalar_new_dbg_4p, + ORDINAL2(933, 911), &VS90::pmfcd__scalar_new_dbg_3p, VS90::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc90udPatch [] = { - ORDINAL(267), NULL, VS90::mfcud_vector_new, - ORDINAL(268), NULL, VS90::mfcud__vector_new_dbg_4p, - ORDINAL(269), NULL, VS90::mfcud__vector_new_dbg_3p, - ORDINAL2(935, 913), NULL, VS90::mfcud_scalar_new, - ORDINAL2(936, 914), NULL, VS90::mfcud__scalar_new_dbg_4p, - ORDINAL2(937, 915), NULL, VS90::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS90::pmfcud_vector_new, VS90::mfcud_vector_new, + ORDINAL(268), &VS90::pmfcud__vector_new_dbg_4p, VS90::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS90::pmfcud__vector_new_dbg_3p, VS90::mfcud__vector_new_dbg_3p, + ORDINAL2(935, 913), &VS90::pmfcud_scalar_new, VS90::mfcud_scalar_new, + ORDINAL2(936, 914), &VS90::pmfcud__scalar_new_dbg_4p, VS90::mfcud__scalar_new_dbg_4p, + ORDINAL2(937, 915), &VS90::pmfcud__scalar_new_dbg_3p, VS90::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc100dPatch [] = { - ORDINAL(267), NULL, VS100::mfcd_vector_new, - ORDINAL(268), NULL, VS100::mfcd__vector_new_dbg_4p, - ORDINAL(269), NULL, VS100::mfcd__vector_new_dbg_3p, - ORDINAL2(1427, 1405), NULL, VS100::mfcd_scalar_new, - ORDINAL2(1428, 1406), NULL, VS100::mfcd__scalar_new_dbg_4p, - ORDINAL2(1429, 1407), NULL, VS100::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS100::pmfcd_vector_new, VS100::mfcd_vector_new, + ORDINAL(268), &VS100::pmfcd__vector_new_dbg_4p, VS100::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS100::pmfcd__vector_new_dbg_3p, VS100::mfcd__vector_new_dbg_3p, + ORDINAL2(1427, 1405), &VS100::pmfcd_scalar_new, VS100::mfcd_scalar_new, + ORDINAL2(1428, 1406), &VS100::pmfcd__scalar_new_dbg_4p, VS100::mfcd__scalar_new_dbg_4p, + ORDINAL2(1429, 1407), &VS100::pmfcd__scalar_new_dbg_3p, VS100::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc100udPatch [] = { - ORDINAL(267), NULL, VS100::mfcud_vector_new, - ORDINAL(268), NULL, VS100::mfcud__vector_new_dbg_4p, - ORDINAL(269), NULL, VS100::mfcud__vector_new_dbg_3p, - ORDINAL2(1434, 1412), NULL, VS100::mfcud_scalar_new, - ORDINAL2(1435, 1413), NULL, VS100::mfcud__scalar_new_dbg_4p, - ORDINAL2(1436, 1414), NULL, VS100::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS100::pmfcud_vector_new, VS100::mfcud_vector_new, + ORDINAL(268), &VS100::pmfcud__vector_new_dbg_4p,VS100::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS100::pmfcud__vector_new_dbg_3p,VS100::mfcud__vector_new_dbg_3p, + ORDINAL2(1434, 1412), &VS100::pmfcud_scalar_new, VS100::mfcud_scalar_new, + ORDINAL2(1435, 1413), &VS100::pmfcud__scalar_new_dbg_4p,VS100::mfcud__scalar_new_dbg_4p, + ORDINAL2(1436, 1414), &VS100::pmfcud__scalar_new_dbg_3p,VS100::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t msvcrtdPatch [] = { - "_calloc_dbg", NULL, VS60::crtd__calloc_dbg, - "_malloc_dbg", NULL, VS60::crtd__malloc_dbg, - "_realloc_dbg", NULL, VS60::crtd__realloc_dbg, - scalar_new_dbg_name, NULL, VS60::crtd__scalar_new_dbg, - //vector_new_dbg_name, NULL, VS60::crtd__vector_new_dbg, - "calloc", NULL, VS60::crtd_calloc, - "malloc", NULL, VS60::crtd_malloc, - "realloc", NULL, VS60::crtd_realloc, - scalar_new_name, NULL, VS60::crtd_scalar_new, - //vector_new_name, NULL, VS60::crtd_vector_new, - NULL, NULL, NULL + "_calloc_dbg", &VS60::pcrtd__calloc_dbg, VS60::crtd__calloc_dbg, + "_malloc_dbg", &VS60::pcrtd__malloc_dbg, VS60::crtd__malloc_dbg, + "_realloc_dbg", &VS60::pcrtd__realloc_dbg, VS60::crtd__realloc_dbg, + scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, + //vector_new_dbg_name, &VS60::pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, + "calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, + "malloc", &VS60::pcrtd_malloc, VS60::crtd_malloc, + "realloc", &VS60::pcrtd_realloc, VS60::crtd_realloc, + scalar_new_name, &VS60::pcrtd_scalar_new, VS60::crtd_scalar_new, + //vector_new_name, &VS60::pcrtd_vector_new, VS60::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr70dPatch [] = { - "_calloc_dbg", NULL, VS70::crtd__calloc_dbg, - "_malloc_dbg", NULL, VS70::crtd__malloc_dbg, - "_realloc_dbg", NULL, VS70::crtd__realloc_dbg, - scalar_new_dbg_name, NULL, VS70::crtd__scalar_new_dbg, - vector_new_dbg_name, NULL, VS70::crtd__vector_new_dbg, - "calloc", NULL, VS70::crtd_calloc, - "malloc", NULL, VS70::crtd_malloc, - "realloc", NULL, VS70::crtd_realloc, - scalar_new_name, NULL, VS70::crtd_scalar_new, - vector_new_name, NULL, VS70::crtd_vector_new, - NULL, NULL, NULL + "_calloc_dbg", &VS70::pcrtd__calloc_dbg, VS70::crtd__calloc_dbg, + "_malloc_dbg", &VS70::pcrtd__malloc_dbg, VS70::crtd__malloc_dbg, + "_realloc_dbg", &VS70::pcrtd__realloc_dbg, VS70::crtd__realloc_dbg, + scalar_new_dbg_name, &VS70::pcrtd__scalar_new_dbg, VS70::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS70::pcrtd__vector_new_dbg, VS70::crtd__vector_new_dbg, + "calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, + "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, + "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, + scalar_new_name, &VS70::pcrtd_scalar_new, VS70::crtd_scalar_new, + vector_new_name, &VS70::pcrtd_vector_new, VS70::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr71dPatch [] = { - "_calloc_dbg", NULL, VS71::crtd__calloc_dbg, - "_malloc_dbg", NULL, VS71::crtd__malloc_dbg, - "_realloc_dbg", NULL, VS71::crtd__realloc_dbg, - scalar_new_dbg_name, NULL, VS71::crtd__scalar_new_dbg, - vector_new_dbg_name, NULL, VS71::crtd__vector_new_dbg, - "calloc", NULL, VS71::crtd_calloc, - "malloc", NULL, VS71::crtd_malloc, - "realloc", NULL, VS71::crtd_realloc, - scalar_new_name, NULL, VS71::crtd_scalar_new, - vector_new_name, NULL, VS71::crtd_vector_new, - NULL, NULL, NULL + "_calloc_dbg", &VS71::pcrtd__calloc_dbg, VS71::crtd__calloc_dbg, + "_malloc_dbg", &VS71::pcrtd__malloc_dbg, VS71::crtd__malloc_dbg, + "_realloc_dbg", &VS71::pcrtd__realloc_dbg, VS71::crtd__realloc_dbg, + scalar_new_dbg_name, &VS71::pcrtd__scalar_new_dbg, VS71::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS71::pcrtd__vector_new_dbg, VS71::crtd__vector_new_dbg, + "calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, + "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, + "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, + scalar_new_name, &VS71::pcrtd_scalar_new, VS71::crtd_scalar_new, + vector_new_name, &VS71::pcrtd_vector_new, VS71::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr80dPatch [] = { - "_calloc_dbg", NULL, VS80::crtd__calloc_dbg, - "_malloc_dbg", NULL, VS80::crtd__malloc_dbg, - "_realloc_dbg", NULL, VS80::crtd__realloc_dbg, - scalar_new_dbg_name, NULL, VS80::crtd__scalar_new_dbg, - vector_new_dbg_name, NULL, VS80::crtd__vector_new_dbg, - "calloc", NULL, VS80::crtd_calloc, - "malloc", NULL, VS80::crtd_malloc, - "realloc", NULL, VS80::crtd_realloc, - scalar_new_name, NULL, VS80::crtd_scalar_new, - vector_new_name, NULL, VS80::crtd_vector_new, - "_aligned_malloc_dbg", NULL, VS80::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", NULL, VS80::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", NULL, VS80::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", NULL, VS80::crtd__aligned_offset_realloc_dbg, - "_aligned_malloc", NULL, VS80::crtd__aligned_malloc, - "_aligned_offset_malloc", NULL, VS80::crtd__aligned_offset_malloc, - "_aligned_realloc", NULL, VS80::crtd__aligned_realloc, - "_aligned_offset_realloc", NULL, VS80::crtd__aligned_offset_realloc, - NULL, NULL, NULL + "_calloc_dbg", &VS80::pcrtd__calloc_dbg, VS80::crtd__calloc_dbg, + "_malloc_dbg", &VS80::pcrtd__malloc_dbg, VS80::crtd__malloc_dbg, + "_realloc_dbg", &VS80::pcrtd__realloc_dbg, VS80::crtd__realloc_dbg, + scalar_new_dbg_name, &VS80::pcrtd__scalar_new_dbg, VS80::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS80::pcrtd__vector_new_dbg, VS80::crtd__vector_new_dbg, + "calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, + "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, + "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, + scalar_new_name, &VS80::pcrtd_scalar_new, VS80::crtd_scalar_new, + vector_new_name, &VS80::pcrtd_vector_new, VS80::crtd_vector_new, + "_aligned_malloc_dbg", &VS80::pcrtd__aligned_malloc_dbg, VS80::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS80::pcrtd__aligned_offset_malloc_dbg, VS80::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS80::pcrtd__aligned_realloc_dbg, VS80::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS80::pcrtd__aligned_offset_realloc_dbg, VS80::crtd__aligned_offset_realloc_dbg, + "_aligned_malloc", &VS80::pcrtd_aligned_malloc, VS80::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS80::pcrtd_aligned_offset_malloc, VS80::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS80::pcrtd_aligned_realloc, VS80::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS80::pcrtd_aligned_offset_realloc, VS80::crtd__aligned_offset_realloc, + NULL, NULL, NULL }; static patchentry_t msvcr90dPatch [] = { - "_calloc_dbg", NULL, VS90::crtd__calloc_dbg, - "_malloc_dbg", NULL, VS90::crtd__malloc_dbg, - "_realloc_dbg", NULL, VS90::crtd__realloc_dbg, - "_recalloc_dbg", NULL, VS90::crtd__recalloc_dbg, - scalar_new_dbg_name, NULL, VS90::crtd__scalar_new_dbg, - vector_new_dbg_name, NULL, VS90::crtd__vector_new_dbg, - "calloc", NULL, VS90::crtd_calloc, - "malloc", NULL, VS90::crtd_malloc, - "realloc", NULL, VS90::crtd_realloc, - "_recalloc", NULL, VS90::crtd__recalloc, - scalar_new_name, NULL, VS90::crtd_scalar_new, - vector_new_name, NULL, VS90::crtd_vector_new, - "_aligned_malloc_dbg", NULL, VS90::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", NULL, VS90::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", NULL, VS90::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", NULL, VS90::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", NULL, VS90::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", NULL, VS90::crtd__aligned_offset_recalloc_dbg, - "_aligned_malloc", NULL, VS90::crtd__aligned_malloc, - "_aligned_offset_malloc", NULL, VS90::crtd__aligned_offset_malloc, - "_aligned_realloc", NULL, VS90::crtd__aligned_realloc, - "_aligned_offset_realloc", NULL, VS90::crtd__aligned_offset_realloc, - "_aligned_recalloc", NULL, VS90::crtd__aligned_recalloc, - "_aligned_offset_recalloc", NULL, VS90::crtd__aligned_offset_recalloc, - NULL, NULL, NULL + "_calloc_dbg", &VS90::pcrtd__calloc_dbg, VS90::crtd__calloc_dbg, + "_malloc_dbg", &VS90::pcrtd__malloc_dbg, VS90::crtd__malloc_dbg, + "_realloc_dbg", &VS90::pcrtd__realloc_dbg, VS90::crtd__realloc_dbg, + "_recalloc_dbg", &VS90::pcrtd__recalloc_dbg, VS90::crtd__recalloc_dbg, + scalar_new_dbg_name, &VS90::pcrtd__scalar_new_dbg, VS90::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS90::pcrtd__vector_new_dbg, VS90::crtd__vector_new_dbg, + "calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, + "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, + "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, + "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, + scalar_new_name, &VS90::pcrtd_scalar_new, VS90::crtd_scalar_new, + vector_new_name, &VS90::pcrtd_vector_new, VS90::crtd_vector_new, + "_aligned_malloc_dbg", &VS90::pcrtd__aligned_malloc_dbg, VS90::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS90::pcrtd__aligned_offset_malloc_dbg, VS90::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS90::pcrtd__aligned_realloc_dbg, VS90::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS90::pcrtd__aligned_offset_realloc_dbg, VS90::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS90::pcrtd__aligned_recalloc_dbg, VS90::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS90::pcrtd__aligned_offset_recalloc_dbg, VS90::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS90::pcrtd_aligned_malloc, VS90::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS90::pcrtd_aligned_offset_malloc, VS90::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS90::pcrtd_aligned_realloc, VS90::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS90::pcrtd_aligned_offset_realloc, VS90::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS90::pcrtd_aligned_recalloc, VS90::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS90::pcrtd_aligned_offset_recalloc, VS90::crtd__aligned_offset_recalloc, + NULL, NULL, NULL }; static patchentry_t msvcr100dPatch [] = { - "_calloc_dbg", NULL, VS100::crtd__calloc_dbg, - "_malloc_dbg", NULL, VS100::crtd__malloc_dbg, - "_realloc_dbg", NULL, VS100::crtd__realloc_dbg, - "_recalloc_dbg", NULL, VS100::crtd__recalloc_dbg, - scalar_new_dbg_name, NULL, VS100::crtd__scalar_new_dbg, - vector_new_dbg_name, NULL, VS100::crtd__vector_new_dbg, - "calloc", NULL, VS100::crtd_calloc, - "malloc", NULL, VS100::crtd_malloc, - "realloc", NULL, VS100::crtd_realloc, - "_recalloc", NULL, VS100::crtd__recalloc, - scalar_new_name, NULL, VS100::crtd_scalar_new, - vector_new_name, NULL, VS100::crtd_vector_new, - "_aligned_malloc_dbg", NULL, VS100::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", NULL, VS100::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", NULL, VS100::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", NULL, VS100::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", NULL, VS100::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", NULL, VS100::crtd__aligned_offset_recalloc_dbg, - "_aligned_malloc", NULL, VS100::crtd__aligned_malloc, - "_aligned_offset_malloc", NULL, VS100::crtd__aligned_offset_malloc, - "_aligned_realloc", NULL, VS100::crtd__aligned_realloc, - "_aligned_offset_realloc", NULL, VS100::crtd__aligned_offset_realloc, - "_aligned_recalloc", NULL, VS100::crtd__aligned_recalloc, - "_aligned_offset_recalloc", NULL, VS100::crtd__aligned_offset_recalloc, - NULL, NULL, NULL + "_calloc_dbg", &VS100::pcrtd__calloc_dbg, VS100::crtd__calloc_dbg, + "_malloc_dbg", &VS100::pcrtd__malloc_dbg, VS100::crtd__malloc_dbg, + "_realloc_dbg", &VS100::pcrtd__realloc_dbg, VS100::crtd__realloc_dbg, + "_recalloc_dbg", &VS100::pcrtd__recalloc_dbg, VS100::crtd__recalloc_dbg, + scalar_new_dbg_name, &VS100::pcrtd__scalar_new_dbg, VS100::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS100::pcrtd__vector_new_dbg, VS100::crtd__vector_new_dbg, + "calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, + "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, + "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, + "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, + scalar_new_name, &VS100::pcrtd_scalar_new, VS100::crtd_scalar_new, + vector_new_name, &VS100::pcrtd_vector_new, VS100::crtd_vector_new, + "_aligned_malloc_dbg", &VS100::pcrtd__aligned_malloc_dbg, VS100::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS100::pcrtd__aligned_offset_malloc_dbg, VS100::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS100::pcrtd__aligned_realloc_dbg, VS100::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS100::pcrtd__aligned_offset_realloc_dbg, VS100::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS100::pcrtd__aligned_recalloc_dbg, VS100::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS100::pcrtd__aligned_offset_recalloc_dbg, VS100::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS100::pcrtd_aligned_malloc, VS100::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS100::pcrtd_aligned_offset_malloc, VS100::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS100::pcrtd_aligned_realloc, VS100::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS100::pcrtd_aligned_offset_realloc, VS100::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS100::pcrtd_aligned_recalloc, VS100::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS100::pcrtd_aligned_offset_recalloc, VS100::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, }; patchentry_t VisualLeakDetector::m_ntdllPatch [] = { @@ -4353,21 +4353,3 @@ void VisualLeakDetector::ResolveCallstacks() resolveStacks(heap); } } - -HMODULE VisualLeakDetector::GetSxSModuleHandle(LPCSTR modulenamea) -{ - HMODULE hDll = NULL; - UINT tablesize = _countof(m_patchtable); - for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &m_patchtable[index]; - if (_stricmp(entry->exportmodulename, modulenamea) == 0) { - hDll = (HMODULE)entry->modulebase; - break; - } - } - - if (hDll == NULL) - hDll = GetModuleHandleA(modulenamea); - - return hDll; -} diff --git a/vldint.h b/vldint.h index 15d47f1b..8132b9c9 100644 --- a/vldint.h +++ b/vldint.h @@ -258,7 +258,6 @@ class VisualLeakDetector : public IMalloc bool GetModulesList(WCHAR *modules, UINT size); VOID ResolveCallstacks(); - static HMODULE GetSxSModuleHandle(LPCSTR modulenamea); static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); private: //////////////////////////////////////////////////////////////////////////////// From 17cda4f934e6e7b8f47c9d641a76116e1d493e54 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 27 May 2011 23:29:49 +0000 Subject: [PATCH 091/321] CriticalSection class added git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67151 --- callstack.cpp | 47 ++++++------- criticalsection.h | 51 ++++++++++++++ crtmfcpatch.h | 3 - tree.h | 75 ++++++-------------- utility.cpp | 22 +++--- vld.cpp | 168 ++++++++++++++++++-------------------------- vld.vcxproj | 1 + vld.vcxproj.filters | 3 + vldheap.cpp | 11 +-- vldint.h | 8 +-- 10 files changed, 187 insertions(+), 202 deletions(-) create mode 100644 criticalsection.h diff --git a/callstack.cpp b/callstack.cpp index f0f3ac7b..fa5d984f 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -33,8 +33,8 @@ // Imported global variables. extern HANDLE currentprocess; extern HANDLE currentthread; -extern CRITICAL_SECTION stackwalklock; -extern CRITICAL_SECTION symbollock; +extern CriticalSection stackwalklock; +extern CriticalSection symbollock; extern VisualLeakDetector vld; // Constructor - Initializes the CallStack with an initial size of zero and one @@ -229,19 +229,16 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const // Try to get the source file and line number associated with // this program counter address. SIZE_T programcounter = (*this)[frame]; - EnterCriticalSection(&symbollock); + symbollock.Enter(); BOOL foundline = FALSE; DWORD displacement = 0; foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo); - if (foundline) - { - if (!showinternalframes) { - _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); - if (IsInternalModule(sourceinfo.FileName)) { - // Don't show frames in files internal to the heap. - LeaveCriticalSection(&symbollock); - continue; - } + if (foundline && !showinternalframes) { + _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); + if (IsInternalModule(sourceinfo.FileName)) { + // Don't show frames in files internal to the heap. + symbollock.Leave(); + continue; } } @@ -266,7 +263,7 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const functionname = L"(Function name unavailable)"; displacement64 = 0; } - LeaveCriticalSection(&symbollock); + symbollock.Leave(); HMODULE hCallingModule = GetCallingModule(programcounter); LPWSTR modulename = L"(Module name unavailable)"; @@ -364,7 +361,7 @@ void CallStack::Resolve(BOOL showinternalframes) // Try to get the source file and line number associated with // this program counter address. SIZE_T programcounter = (*this)[frame]; - EnterCriticalSection(&symbollock); + symbollock.Enter(); BOOL foundline = FALSE; DWORD displacement = 0; @@ -374,15 +371,12 @@ void CallStack::Resolve(BOOL showinternalframes) foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo); assert(m_Resolved != NULL); - if (foundline) - { - if (!showinternalframes) { - _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); - if (IsInternalModule(sourceinfo.FileName)) { - // Don't show frames in files internal to the heap. - LeaveCriticalSection(&symbollock); - continue; - } + if (foundline && !showinternalframes) { + _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); + if (IsInternalModule(sourceinfo.FileName)) { + // Don't show frames in files internal to the heap. + symbollock.Leave(); + continue; } } @@ -400,14 +394,14 @@ void CallStack::Resolve(BOOL showinternalframes) if (UnDecorateSymbolName(functioninfo->Name, undecoratedname, MAXSYMBOLNAMELENGTH, UNDNAME_NAME_ONLY) > 0) functionname = undecoratedname; else - functionname = functioninfo->Name; + functionname = functioninfo->Name; } else { // GetFormattedMessage( GetLastError() ); functionname = L"(Function name unavailable)"; displacement64 = 0; } - LeaveCriticalSection(&symbollock); + symbollock.Leave(); HMODULE hCallingModule = GetCallingModule(programcounter); LPWSTR modulename = L"(Module name unavailable)"; @@ -686,7 +680,7 @@ VOID SafeCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) frame.Virtual = TRUE; // Walk the stack. - EnterCriticalSection(&stackwalklock); + CriticalSectionLocker cs(stackwalklock); UINT32 count = 0; while (count < maxdepth) { count++; @@ -703,5 +697,4 @@ VOID SafeCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) // Push this frame's program counter onto the CallStack. push_back((UINT_PTR)frame.AddrPC.Offset); } - LeaveCriticalSection(&stackwalklock); } diff --git a/criticalsection.h b/criticalsection.h new file mode 100644 index 00000000..687b72e3 --- /dev/null +++ b/criticalsection.h @@ -0,0 +1,51 @@ +#pragma once + +#define WIN32_LEAN_AND_MEAN +#define NOMINMAX +#include + +// you should consider CriticalSectionLocker whenever possible instead of +// directly working with CriticalSection class - it is safer +class CriticalSection +{ +public: + void Initialize() { m_critRegion.OwningThread = 0; InitializeCriticalSection(&m_critRegion); } + void Delete() { DeleteCriticalSection(&m_critRegion); } + + // enter the section + void Enter() + { + ULONG_PTR ownerThreadId = (ULONG_PTR)m_critRegion.OwningThread; + UNREFERENCED_PARAMETER(ownerThreadId); + EnterCriticalSection(&m_critRegion); + } + + // try enter the section + bool TryEnter() { return (TryEnterCriticalSection(&m_critRegion) != 0); } + + // leave the critical section + void Leave() { LeaveCriticalSection(&m_critRegion); } + +private: + CRITICAL_SECTION m_critRegion; +}; + +class CriticalSectionLocker +{ +public: + CriticalSectionLocker(CriticalSection& cs) + : m_critsect(cs) + { + m_critsect.Enter(); + } + + ~CriticalSectionLocker() + { + m_critsect.Leave(); + } + + CriticalSectionLocker & operator=( const CriticalSectionLocker & ) {} + +private: + CriticalSection& m_critsect; +}; diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 5e2a3b70..f878aa83 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1147,9 +1147,6 @@ void* CrtMfcPatch::mfcud_vector_new (size_t size) return vld._new(pmfcxxd_new, context, size); } -#undef template -#undef specialization - #ifndef WIN64 //void * __cdecl operator new(unsigned int,int,char const *,int) const extern char scalar_new_dbg_name[] = "??2@YAPAXIHPBDH@Z"; diff --git a/tree.h b/tree.h index c03954e7..dd2c44ef 100644 --- a/tree.h +++ b/tree.h @@ -30,6 +30,7 @@ Applications should never include this header." #endif #include "vldheap.h" // Provides internal new and delete operators. +#include "criticalsection.h" #define TREE_DEFAULT_RESERVE 32 // By default, trees reserve enough space, in advance, for this many nodes. @@ -83,7 +84,7 @@ class Tree Tree () { m_freelist = NULL; - InitializeCriticalSection(&m_lock); + m_lock.Initialize(); m_nil.color = black; m_nil.key = T(); m_nil.left = &m_nil; @@ -109,7 +110,7 @@ class Tree chunk_t *temp; // Free all the chunks in the chunk list. - EnterCriticalSection(&m_lock); + m_lock.Enter(); cur = m_store; while (cur != NULL) { temp = cur; @@ -117,8 +118,9 @@ class Tree delete [] temp->nodes; delete temp; } - LeaveCriticalSection(&m_lock); - DeleteCriticalSection(&m_lock); + m_lock.Leave(); + + m_lock.Delete(); } // operator = - Assignment operator. For efficiency, we want to avoid ever @@ -144,9 +146,8 @@ class Tree { node_t *cur; - EnterCriticalSection(&m_lock); + CriticalSectionLocker cs(m_lock); if (m_root == &m_nil) { - LeaveCriticalSection(&m_lock); return NULL; } @@ -154,7 +155,6 @@ class Tree while (cur->left != &m_nil) { cur = cur->left; } - LeaveCriticalSection(&m_lock); return cur; } @@ -177,7 +177,7 @@ class Tree node_t *erasure; node_t *sibling; - EnterCriticalSection(&m_lock); + CriticalSectionLocker cs(m_lock); if ((node->left == &m_nil) || (node->right == &m_nil)) { // The node to be erased has less than two children. It can be directly @@ -297,8 +297,6 @@ class Tree // Put the erased node onto the free list. erasure->next = m_freelist; m_freelist = erasure; - - LeaveCriticalSection(&m_lock); } // erase - Erases the specified key from the tree. Note that this does @@ -319,7 +317,7 @@ class Tree node_t *node; // Find the node to erase. - EnterCriticalSection(&m_lock); + CriticalSectionLocker cs(&m_lock); node = m_root; while (node != &m_nil) { if (node->key < key) { @@ -333,14 +331,11 @@ class Tree else { // Found it. erase(node); - LeaveCriticalSection(&m_lock); return; } } - LeaveCriticalSection(&m_lock); // 'key' is not in the tree. - return; } // find - Obtains a pointer to the node corresponding to the specified key. @@ -357,8 +352,8 @@ class Tree typename Tree::node_t* find (const T &key) const { node_t *cur; - - EnterCriticalSection(&m_lock); + + CriticalSectionLocker cs(m_lock); cur = m_root; while (cur != &m_nil) { if (cur->key < key) { @@ -371,11 +366,9 @@ class Tree } else { // Found it. - LeaveCriticalSection(&m_lock); return cur; } } - LeaveCriticalSection(&m_lock); // 'key' is not in the tree. return NULL; @@ -395,16 +388,11 @@ class Tree // typename Tree::node_t* insert (const T &key) { - node_t *cur; - node_t *node; - node_t *parent; - node_t *uncle; - - EnterCriticalSection(&m_lock); + CriticalSectionLocker cs(m_lock); // Find the location where the new node should be inserted.. - cur = m_root; - parent = &m_nil; + node_t *cur = m_root; + node_t *parent = &m_nil; while (cur != &m_nil) { parent = cur; if (cur->key < key) { @@ -417,7 +405,6 @@ class Tree } else { // Keys in the tree must be unique. - LeaveCriticalSection(&m_lock); return NULL; } } @@ -427,7 +414,7 @@ class Tree // Allocate additional storage. reserve(m_reserve); } - node = m_freelist; + node_t *node = m_freelist; m_freelist = m_freelist->next; // Initialize the new node and insert it. @@ -453,6 +440,7 @@ class Tree // Rebalance and/or adjust the tree, if necessary. cur = node; + node_t *uncle; while (cur->parent->color == red) { // Double-red violation. Rebalancing/adjustment needed. if (cur->parent == cur->parent->parent->left) { @@ -501,9 +489,6 @@ class Tree // The root node is always colored black. m_root->color = black; - - LeaveCriticalSection(&m_lock); - return node; } @@ -520,13 +505,11 @@ class Tree // typename Tree::node_t* next (typename Tree::node_t *node) const { - node_t* cur; - - if (node == NULL) { + if (node == NULL) return NULL; - } - EnterCriticalSection(&m_lock); + CriticalSectionLocker cs(m_lock); + node_t* cur; if (node->right != &m_nil) { // 'node' has a right child. Successor is the far left node in // the right subtree. @@ -534,14 +517,12 @@ class Tree while (cur->left != &m_nil) { cur = cur->left; } - LeaveCriticalSection(&m_lock); return cur; } else if (node->parent != &m_nil) { // 'node' has no right child, but does have a parent. if (node == node->parent->left) { // 'node' is a left child; node's parent is successor. - LeaveCriticalSection(&m_lock); return node->parent; } else { @@ -554,20 +535,17 @@ class Tree continue; } else { - LeaveCriticalSection(&m_lock); return cur->parent; } } // There is no parent greater than 'node'. 'node' is the // maximum node. - LeaveCriticalSection(&m_lock); return NULL; } } else { // 'node' is root and root is the maximum node. - LeaveCriticalSection(&m_lock); return NULL; } } @@ -585,13 +563,12 @@ class Tree // typename Tree::node_t* prev (typename Tree::node_t *node) const { - node_t* cur; - if (node == NULL) { return NULL; } - EnterCriticalSection(&m_lock); + CriticalSectionLocker cs(m_lock); + node_t* cur; if (node->left != &m_nil) { // 'node' has left child. Predecessor is the far right node in the // left subtree. @@ -599,14 +576,12 @@ class Tree while (cur->right != &m_nil) { cur = cur->right; } - LeaveCriticalSection(&m_lock); return cur; } else if (node->parent != & m_nil) { // 'node' has no left child, but does have a parent. if (node == node->parent->right) { // 'node' is a right child; node's parent is predecessor. - LeaveCriticalSection(&m_lock); return node->parent; } else { @@ -619,20 +594,17 @@ class Tree continue; } else { - LeaveCriticalSection(&m_lock); return cur->parent; } } // There is no parent less than 'node'. 'node' is the minimum // node. - LeaveCriticalSection(&m_lock); return NULL; } } else { // 'node' is root and root is the minimum node. - LeaveCriticalSection(&m_lock); return NULL; } } @@ -670,7 +642,7 @@ class Tree } } - EnterCriticalSection(&m_lock); + CriticalSectionLocker cs(m_lock); if (m_freelist == NULL) { // Allocate additional storage. // Link a new chunk into the chunk list. @@ -692,7 +664,6 @@ class Tree chunk->nodes[index].next = NULL; m_freelist = chunk->nodes; } - LeaveCriticalSection(&m_lock); return oldreserve; } @@ -776,7 +747,7 @@ class Tree // Private data members. node_t *m_freelist; // Pointer to the list of free nodes (reserve storage). - mutable CRITICAL_SECTION m_lock; // Protects the tree's integrity against concurrent accesses. + mutable CriticalSection m_lock; // Protects the tree's integrity against concurrent accesses. node_t m_nil; // The tree's nil node. All leaf nodes point to this. size_t m_reserve; // The size (in nodes) of the chunks of reserve storage. node_t *m_root; // Pointer to the tree's root node. diff --git a/utility.cpp b/utility.cpp index 7cfd9238..25f3a042 100644 --- a/utility.cpp +++ b/utility.cpp @@ -28,7 +28,7 @@ #include "vldint.h" // Imported Global Variables -extern CRITICAL_SECTION imagelock; +extern CriticalSection imagelock; // Global variables. static BOOL reportdelay = FALSE; // If TRUE, we sleep for a bit after calling OutputDebugString to give the debugger time to catch up. @@ -203,8 +203,8 @@ IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPC // Locate the importing module's Import Directory Table (IDT) entry for the // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); + // gives us the offset of the IAT for the module we are interested in. + imagelock.Enter(); __try { idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, @@ -213,8 +213,8 @@ IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPC __except(1) { idte = NULL; - } - LeaveCriticalSection(&imagelock); + } + imagelock.Leave(); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return NULL; @@ -438,7 +438,7 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); + imagelock.Enter(); __try { idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, @@ -448,7 +448,7 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) { idte = NULL; } - LeaveCriticalSection(&imagelock); + imagelock.Leave(); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return FALSE; @@ -682,8 +682,8 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) // Locate the importing module's Import Directory Table (IDT) entry for the // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - EnterCriticalSection(&imagelock); + // gives us the offset of the IAT for the module we are interested in. + imagelock.Enter(); __try { idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, @@ -692,8 +692,8 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) __except(1) { idte = NULL; - } - LeaveCriticalSection(&imagelock); + } + imagelock.Leave(); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return; diff --git a/vld.cpp b/vld.cpp index 3e1423f5..4fb29636 100644 --- a/vld.cpp +++ b/vld.cpp @@ -45,15 +45,15 @@ // Imported global variables. extern vldblockheader_t *vldblocklist; extern HANDLE vldheap; -extern CRITICAL_SECTION vldheaplock; +extern CriticalSection vldheaplock; // Global variables. HANDLE currentprocess; // Pseudo-handle for the current process. HANDLE currentthread; // Pseudo-handle for the current thread. -CRITICAL_SECTION imagelock; // Serializes calls to the Debug Help Library PE image access APIs. +CriticalSection imagelock; // Serializes calls to the Debug Help Library PE image access APIs. HANDLE processheap; // Handle to the process's heap (COM allocations come from here). -CRITICAL_SECTION stackwalklock; // Serializes calls to StackWalk64 from the Debug Help Library. -CRITICAL_SECTION symbollock; // Serializes calls to the Debug Help Library symbols handling APIs. +CriticalSection stackwalklock; // Serializes calls to StackWalk64 from the Debug Help Library. +CriticalSection symbollock; // Serializes calls to the Debug Help Library symbols handling APIs. // The one and only VisualLeakDetector object instance. __declspec(dllexport) VisualLeakDetector vld; @@ -426,16 +426,16 @@ VisualLeakDetector::VisualLeakDetector () // Initialize global variables. currentprocess = GetCurrentProcess(); currentthread = GetCurrentThread(); - InitializeCriticalSection(&imagelock); + imagelock.Initialize(); LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); processheap = GetProcessHeap(); RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); - InitializeCriticalSection(&stackwalklock); - InitializeCriticalSection(&symbollock); + stackwalklock.Initialize(); + symbollock.Initialize(); vldheap = HeapCreate(0x0, 0, 0); - InitializeCriticalSection(&vldheaplock); + vldheaplock.Initialize(); // Initialize remaining private data. m_heapmap = new HeapMap; @@ -443,13 +443,13 @@ VisualLeakDetector::VisualLeakDetector () m_imalloc = NULL; m_leaksfound = 0; m_loadedmodules = NULL; - InitializeCriticalSection(&m_loaderlock); - InitializeCriticalSection(&m_maplock); - InitializeCriticalSection(&m_moduleslock); + m_loaderlock.Initialize(); + m_maplock.Initialize(); + m_moduleslock.Initialize(); m_selftestfile = __FILE__; m_selftestline = 0; m_tlsindex = TlsAlloc(); - InitializeCriticalSection(&m_tlslock); + m_tlslock.Initialize(); m_tlsmap = new TlsMap; if (m_options & VLD_OPT_SELF_TEST) { @@ -562,7 +562,7 @@ VisualLeakDetector::~VisualLeakDetector () DWORD dwCurProcessID = GetCurrentProcessId(); // See if any threads that have ever entered VLD's code are still active. - EnterCriticalSection(&m_tlslock); + m_tlslock.Enter(); for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { if ((*tlsit).second->threadid == GetCurrentThreadId()) { // Don't wait for the current thread to exit. @@ -593,7 +593,7 @@ VisualLeakDetector::~VisualLeakDetector () } CloseHandle(thread); } - LeaveCriticalSection(&m_tlslock); + m_tlslock.Leave(); if (m_status & VLD_STATUS_NEVER_ENABLED) { // Visual Leak Detector started with leak detection disabled and @@ -695,13 +695,13 @@ VisualLeakDetector::~VisualLeakDetector () } HeapDestroy(vldheap); - DeleteCriticalSection(&imagelock); - DeleteCriticalSection(&m_loaderlock); - DeleteCriticalSection(&m_maplock); - DeleteCriticalSection(&m_moduleslock); - DeleteCriticalSection(&stackwalklock); - DeleteCriticalSection(&symbollock); - DeleteCriticalSection(&vldheaplock); + imagelock.Delete(); + m_loaderlock.Delete(); + m_maplock.Delete(); + m_moduleslock.Delete(); + stackwalklock.Delete(); + symbollock.Delete(); + vldheaplock.Delete(); if (m_tlsindex != TLS_OUT_OF_INDEXES) { TlsFree(m_tlsindex); @@ -748,43 +748,43 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) LPCSTR modulepath = (*newit).path; DWORD modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; - BOOL refresh = FALSE; - EnterCriticalSection(&m_moduleslock); + bool refresh = false; + bool moduleLoaded = false; + m_moduleslock.Enter(); ModuleSet* oldmodules = m_loadedmodules; if (oldmodules != NULL) { // This is not the first time we have been called to attach to the // currently loaded modules. ModuleSet::Iterator oldit = oldmodules->find(*newit); if (oldit != oldmodules->end()) { - // We've seen this "new" module loaded in the process before. + moduleLoaded = true; moduleflags = (*oldit).flags; - LeaveCriticalSection(&m_moduleslock); - if (moduleispatched((HMODULE)modulebase, m_patchtable, _countof(m_patchtable))) { - // This module is already attached. Just update the module's - // flags, nothing more. - updateit = newit; - (*updateit).flags = moduleflags; - continue; - } - else { - // This module may have been attached before and has been - // detached. We'll need to try reattaching to it in case it - // was unloaded and then subsequently reloaded. - refresh = TRUE; - } + } + } + m_moduleslock.Leave(); + + if (moduleLoaded) // We've seen this "new" module loaded in the process before. + { + if (moduleispatched((HMODULE)modulebase, m_patchtable, _countof(m_patchtable))) + { + // This module is already attached. Just update the module's + // flags, nothing more. + updateit = newit; + (*updateit).flags = moduleflags; + continue; } else { - LeaveCriticalSection(&m_moduleslock); + // This module may have been attached before and has been + // detached. We'll need to try reattaching to it in case it + // was unloaded and then subsequently reloaded. + refresh = true; } } - else { - LeaveCriticalSection(&m_moduleslock); - } - EnterCriticalSection(&symbollock); - if ((refresh == TRUE) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { + symbollock.Enter(); + if ((refresh == true) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { // Discard the previously loaded symbols, so we can refresh them. - if (SymUnloadModule64(currentprocess, modulebase) == FALSE) { + if (SymUnloadModule64(currentprocess, modulebase) == false) { report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); } @@ -805,7 +805,7 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) } if (SymbolsLoaded) moduleflags |= VLD_MODULE_SYMBOLSLOADED; - LeaveCriticalSection(&symbollock); + symbollock.Leave(); if (_stricmp(VLDDLL, modulename) == 0) { // What happens when a module goes through it's own portal? Bad things. @@ -1200,9 +1200,8 @@ tls_t* VisualLeakDetector::gettls () tls->ppcallstack = NULL; // Add this thread's TLS to the TlsSet. - EnterCriticalSection(&m_tlslock); + CriticalSectionLocker cs(m_tlslock); m_tlsmap->insert(tls->threadid,tls); - LeaveCriticalSection(&m_tlslock); } return tls; @@ -1241,7 +1240,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c blockinfo->blocks = 1; // Insert the block's information into the block map. - EnterCriticalSection(&m_maplock); + CriticalSectionLocker cs(m_maplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We haven't mapped this heap to a block map yet. Do it now. @@ -1267,7 +1266,6 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c blockmap->insert(mem, blockinfo); ppcallstack = NULL; } - LeaveCriticalSection(&m_maplock); } // mapheap - Tracks heap creation. Creates a block map for tracking individual @@ -1286,7 +1284,7 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) heapinfo_t* heapinfo = new heapinfo_t; heapinfo->blockmap.reserve(BLOCKMAPRESERVE); heapinfo->flags = 0x0; - EnterCriticalSection(&m_maplock); + CriticalSectionLocker cs(m_maplock); HeapMap::Iterator heapit = m_heapmap->insert(heap, heapinfo); if (heapit == m_heapmap->end()) { // Somehow this heap has been created twice without being destroyed, @@ -1297,7 +1295,6 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) unmapheap((*heapit).first); m_heapmap->insert(heap, heapinfo); } - LeaveCriticalSection(&m_maplock); } // remapblock - Tracks reallocations. Unmaps a block from its previously @@ -1340,7 +1337,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was reallocated in-place. Find the existing blockinfo_t // entry in the block map and update it with the new callstack and size. - EnterCriticalSection(&m_maplock); + CriticalSectionLocker cs(m_maplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We haven't mapped this heap to a block map yet. Obviously the @@ -1348,7 +1345,6 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // so treat this reallocation as a brand-new allocation (this will // also map the heap to a new block map). mapblock(heap, newmem, size, crtalloc, ppcallstack); - LeaveCriticalSection(&m_maplock); return; } @@ -1359,7 +1355,6 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block hasn't been mapped to a blockinfo_t entry yet. // Treat this reallocation as a new allocation. mapblock(heap, newmem, size, crtalloc, ppcallstack); - LeaveCriticalSection(&m_maplock); return; } @@ -1376,7 +1371,6 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The heap that this block was allocated from is a CRT heap. (*heapit).second->flags |= VLD_HEAP_CRT; } - LeaveCriticalSection(&m_maplock); // Update the block's size. info->size = size; @@ -1451,11 +1445,10 @@ SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) assert(heap != NULL); // Find the heap's information (blockmap, etc). - EnterCriticalSection(&m_maplock); + CriticalSectionLocker cs(m_maplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // Nothing is allocated from this heap. No leaks. - LeaveCriticalSection(&m_maplock); return 0; } @@ -1492,7 +1485,6 @@ SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) memoryleaks += info->blocks; } - LeaveCriticalSection(&m_maplock); return memoryleaks; } @@ -1510,11 +1502,10 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) assert(heap != NULL); // Find the heap's information (blockmap, etc). - EnterCriticalSection(&m_maplock); + CriticalSectionLocker cs(m_maplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // Nothing is allocated from this heap. No leaks. - LeaveCriticalSection(&m_maplock); return 0; } @@ -1590,8 +1581,6 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) } m_leaksfound += leaksfound; - LeaveCriticalSection(&m_maplock); - return leaksfound; } @@ -1660,12 +1649,11 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & return; // Find this heap's block map. - EnterCriticalSection(&m_maplock); + CriticalSectionLocker cs(m_maplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We don't have a block map for this heap. We must not have monitored // this allocation (probably happened before VLD was initialized). - LeaveCriticalSection(&m_maplock); return; } @@ -1707,8 +1695,6 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & DebugBreak(); } } - - LeaveCriticalSection(&m_maplock); return; } @@ -1717,7 +1703,6 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & delete info->callstack; delete info; blockmap->erase(blockit); - LeaveCriticalSection(&m_maplock); } // unmapheap - Tracks heap destruction. Unmaps the specified heap from its block @@ -1733,12 +1718,11 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & VOID VisualLeakDetector::unmapheap (HANDLE heap) { // Find this heap's block map. - EnterCriticalSection(&m_maplock); + CriticalSectionLocker cs(m_maplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // This heap hasn't been mapped. We must not have monitored this heap's // creation (probably happened before VLD was initialized). - LeaveCriticalSection(&m_maplock); return; } @@ -1753,7 +1737,6 @@ VOID VisualLeakDetector::unmapheap (HANDLE heap) // Remove this heap's block map from the heap map. m_heapmap->erase(heapit); - LeaveCriticalSection(&m_maplock); } @@ -3172,18 +3155,17 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; - EnterCriticalSection(&symbollock); + symbollock.Enter(); DWORD64 displacement; BOOL symfound = SymFromAddrW(currentprocess, ra, &displacement, functioninfo); - LeaveCriticalSection(&symbollock); + symbollock.Leave(); if (symfound == TRUE) { if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { // HeapCreate was called by _heap_init. This is a static CRT heap. - EnterCriticalSection(&vld.m_maplock); + CriticalSectionLocker cs(vld.m_maplock); HeapMap::Iterator heapit = vld.m_heapmap->find(heap); assert(heapit != vld.m_heapmap->end()); (*heapit).second->flags |= VLD_HEAP_CRT; - LeaveCriticalSection(&vld.m_maplock); } } @@ -3239,7 +3221,7 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, PHANDLE modulehandle) { - EnterCriticalSection(&vld.m_loaderlock); + CriticalSectionLocker cs(vld.m_loaderlock); // Load the DLL. NTSTATUS status = LdrLoadDll(searchpath, flags, modulename, modulehandle); @@ -3256,10 +3238,10 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod vld.attachtoloadedmodules(newmodules); // Start using the new set of loaded modules. - EnterCriticalSection(&vld.m_moduleslock); + vld.m_moduleslock.Enter(); ModuleSet *oldmodules = vld.m_loadedmodules; vld.m_loadedmodules = newmodules; - LeaveCriticalSection(&vld.m_moduleslock); + vld.m_moduleslock.Leave(); // Free resources used by the old module list. for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { @@ -3269,19 +3251,15 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod delete oldmodules; } - LeaveCriticalSection(&vld.m_loaderlock); - return status; } VOID VisualLeakDetector::RefreshModules() { if (vld.m_options & VLD_OPT_VLDOFF) - { return; - } - EnterCriticalSection(&vld.m_loaderlock); + CriticalSectionLocker cs(vld.m_loaderlock); // Duplicate code here in this method. Consider refactoring out to another method. // Create a new set of all loaded modules, including any newly loaded // modules. @@ -3293,10 +3271,10 @@ VOID VisualLeakDetector::RefreshModules() vld.attachtoloadedmodules(newmodules); // Start using the new set of loaded modules. - EnterCriticalSection(&vld.m_moduleslock); + vld.m_moduleslock.Enter(); ModuleSet* oldmodules = vld.m_loadedmodules; vld.m_loadedmodules = newmodules; - LeaveCriticalSection(&vld.m_moduleslock); + vld.m_moduleslock.Leave(); // Free resources used by the old module list. for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { @@ -3304,8 +3282,6 @@ VOID VisualLeakDetector::RefreshModules() delete [] (*moduleit).path; } delete oldmodules; - - LeaveCriticalSection(&vld.m_loaderlock); } void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &context_ ) @@ -3486,12 +3462,11 @@ BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) moduleinfo.addrhigh = address + 1024; moduleinfo.flags = 0; - EnterCriticalSection(&vld.m_moduleslock); + CriticalSectionLocker cs(vld.m_moduleslock); moduleit = vld.m_loadedmodules->find(moduleinfo); if (moduleit != vld.m_loadedmodules->end()) { excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; } - LeaveCriticalSection(&vld.m_moduleslock); return excluded; } @@ -4001,7 +3976,7 @@ void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) { ModuleSet::Iterator moduleit; - EnterCriticalSection(&vld.m_moduleslock); + CriticalSectionLocker cs(vld.m_moduleslock); moduleit = vld.m_loadedmodules->begin(); while( moduleit != vld.m_loadedmodules->end() ) { @@ -4017,8 +3992,6 @@ void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) } moduleit++; } - LeaveCriticalSection(&vld.m_moduleslock); - } void VisualLeakDetector::EnableModule(HMODULE module) @@ -4100,14 +4073,13 @@ void VisualLeakDetector::GlobalDisableLeakDetection () } // Disable memory leak detection for all threads. - EnterCriticalSection(&m_tlslock); + CriticalSectionLocker cs(m_tlslock); TlsMap::Iterator tlsit; for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { (*tlsit).second->oldflags = (*tlsit).second->flags; (*tlsit).second->flags &= ~VLD_TLS_ENABLED; (*tlsit).second->flags |= VLD_TLS_DISABLED; } - LeaveCriticalSection(&m_tlslock); } void VisualLeakDetector::GlobalEnableLeakDetection () @@ -4118,14 +4090,13 @@ void VisualLeakDetector::GlobalEnableLeakDetection () } // Enable memory leak detection for all threads. - EnterCriticalSection(&m_tlslock); + CriticalSectionLocker cs(m_tlslock); TlsMap::Iterator tlsit; for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { (*tlsit).second->oldflags = (*tlsit).second->flags; (*tlsit).second->flags &= ~VLD_TLS_DISABLED; (*tlsit).second->flags |= VLD_TLS_ENABLED; } - LeaveCriticalSection(&m_tlslock); m_status &= ~VLD_STATUS_NEVER_ENABLED; } @@ -4278,11 +4249,10 @@ void VisualLeakDetector::SetupReporting() void VisualLeakDetector::resolveStacks(HANDLE heap) { // Find the heap's information (blockmap, etc). - EnterCriticalSection(&m_maplock); + CriticalSectionLocker cs(m_maplock); HeapMap::Iterator heapiter = m_heapmap->find(heap); if (heapiter == m_heapmap->end()) { // Nothing is allocated from this heap. No leaks. - LeaveCriticalSection(&m_maplock); return; } @@ -4333,8 +4303,6 @@ void VisualLeakDetector::resolveStacks(HANDLE heap) info->callstack->Resolve(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); } } - - LeaveCriticalSection(&m_maplock); } void VisualLeakDetector::ResolveCallstacks() diff --git a/vld.vcxproj b/vld.vcxproj index d74e0a2e..02bf63ad 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -242,6 +242,7 @@ + diff --git a/vld.vcxproj.filters b/vld.vcxproj.filters index fb3682fe..11df3856 100644 --- a/vld.vcxproj.filters +++ b/vld.vcxproj.filters @@ -77,6 +77,9 @@ Header Files + + Header Files + diff --git a/vldheap.cpp b/vldheap.cpp index 730f7231..c8a06925 100644 --- a/vldheap.cpp +++ b/vldheap.cpp @@ -26,12 +26,13 @@ #define VLDBUILD // Declares that we are building Visual Leak Detector. #include "ntapi.h" // Provides access to NT APIs. #include "vldheap.h" // Provides access to VLD's internal heap data structures. +#include "criticalsection.h" #undef new // Do not map "new" to VLD's new operator in this file // Global variables. vldblockheader_t *vldblocklist = NULL; // List of internally allocated blocks on VLD's private heap. HANDLE vldheap; // VLD's private heap. -CRITICAL_SECTION vldheaplock; // Serializes access to VLD's private heap. +CriticalSection vldheaplock; // Serializes access to VLD's private heap. // Local helper functions. static inline void vlddelete (void *block); @@ -149,7 +150,7 @@ void vlddelete (void *block) vldblockheader_t *header = VLDBLOCKHEADER((LPVOID)block); // Unlink the block from the block list. - EnterCriticalSection(&vldheaplock); + vldheaplock.Enter(); if (header->prev) { header->prev->next = header->next; } @@ -160,7 +161,7 @@ void vlddelete (void *block) if (header->next) { header->next->prev = header->prev; } - LeaveCriticalSection(&vldheaplock); + vldheaplock.Leave(); // Free the block. freed = RtlFreeHeap(vldheap, 0x0, header); @@ -202,14 +203,14 @@ void* vldnew (size_t size, const char *file, int line) header->size = size; // Link the block into the block list. - EnterCriticalSection(&vldheaplock); + vldheaplock.Enter(); header->next = vldblocklist; if (header->next != NULL) { header->next->prev = header; } header->prev = NULL; vldblocklist = header; - LeaveCriticalSection(&vldheaplock); + vldheaplock.Leave(); // Return a pointer to the beginning of the data section of the block. return (void*)VLDBLOCKDATA(header); diff --git a/vldint.h b/vldint.h index 8132b9c9..88b12593 100644 --- a/vldint.h +++ b/vldint.h @@ -329,11 +329,11 @@ class VisualLeakDetector : public IMalloc IMalloc *m_imalloc; // Pointer to the system implementation of IMalloc. SIZE_T m_leaksfound; // Total number of leaks found. ModuleSet *m_loadedmodules; // Contains information about all modules loaded in the process. - CRITICAL_SECTION m_loaderlock; // Serializes the attachment of newly loaded modules. - CRITICAL_SECTION m_maplock; // Serializes access to the heap and block maps. + CriticalSection m_loaderlock; // Serializes the attachment of newly loaded modules. + CriticalSection m_maplock; // Serializes access to the heap and block maps. SIZE_T m_maxdatadump; // Maximum number of user-data bytes to dump for each leaked block. UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. - CRITICAL_SECTION m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. + CriticalSection m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. UINT32 m_options; // Configuration options: static patchentry_t m_kernelbasePatch []; @@ -351,7 +351,7 @@ class VisualLeakDetector : public IMalloc #define VLD_STATUS_NEVER_ENABLED 0x4 // If set, VLD started disabled, and has not yet been manually enabled. #define VLD_STATUS_FORCE_REPORT_TO_FILE 0x8 // If set, the leak report is being forced to a file. DWORD m_tlsindex; // Thread-local storage index. - CRITICAL_SECTION m_tlslock; // Protects accesses to the Set of TLS structures. + CriticalSection m_tlslock; // Protects accesses to the Set of TLS structures. TlsMap *m_tlsmap; // Set of all all thread-local storage structres for the process. HMODULE m_vldbase; // Visual Leak Detector's own module handle (base address). From e4ca7c1dc0d909180c7bac7c6da6833e93aa8f0f Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 28 May 2011 00:41:18 +0000 Subject: [PATCH 092/321] LoaderLock fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67152 --- tests/dynamic_app/dynamic_app.cpp | 18 +++++++++++++----- utility.cpp | 16 ++++++++-------- vld.cpp | 5 ++++- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index b5b2cc03..91acb643 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -64,25 +64,33 @@ int _tmain(int argc, _TCHAR* argv[]) RunLoaderTests(resolve); // leaks 18 int totalleaks = (int)VLDGetLeaksCount(); int leaks1 = totalleaks; + int prevleaks = totalleaks; assert(leaks1 == 18); RunMFCLoaderTests(resolve); // leaks 7 totalleaks = (int)VLDGetLeaksCount(); - int leaks2 = totalleaks - leaks1; + int leaks2 = totalleaks - prevleaks; + prevleaks = totalleaks; assert(leaks2 == 7); LeakDuplicateLeaks(); // leaks 6 - int leaks3 = (int)VLDGetLeaksCount(); - leaks3 -= totalleaks; + totalleaks = (int)VLDGetLeaksCount(); + int leaks3 = totalleaks - prevleaks; + prevleaks = totalleaks; assert(leaks3 == 6); if (doThreadTests) { // This test will crash, indicating a bug that needs to be fixed. RunLoaderLockTests(resolve); - int leaks4 = (int)VLDGetLeaksCount(); - leaks4 -= totalleaks; + totalleaks = (int)VLDGetLeaksCount(); + int leaks4 = totalleaks - prevleaks; assert(leaks4 == 1158); + + // ..................Total: 1189 leaks total + totalleaks = (int)VLDGetLeaksCount(); + int diff = 1189 - totalleaks; + return diff; } // ..................Total: 31 leaks total diff --git a/utility.cpp b/utility.cpp index 25f3a042..fdc7f0c6 100644 --- a/utility.cpp +++ b/utility.cpp @@ -203,8 +203,8 @@ IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPC // Locate the importing module's Import Directory Table (IDT) entry for the // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - imagelock.Enter(); + // gives us the offset of the IAT for the module we are interested in. + imagelock.Enter(); __try { idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, @@ -213,8 +213,8 @@ IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPC __except(1) { idte = NULL; - } - imagelock.Leave(); + } + imagelock.Leave(); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return NULL; @@ -682,8 +682,8 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) // Locate the importing module's Import Directory Table (IDT) entry for the // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - imagelock.Enter(); + // gives us the offset of the IAT for the module we are interested in. + imagelock.Enter(); __try { idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, @@ -692,8 +692,8 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) __except(1) { idte = NULL; - } - imagelock.Leave(); + } + imagelock.Leave(); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return; diff --git a/vld.cpp b/vld.cpp index 4fb29636..f21be9c1 100644 --- a/vld.cpp +++ b/vld.cpp @@ -781,15 +781,18 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) } } - symbollock.Enter(); if ((refresh == true) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { // Discard the previously loaded symbols, so we can refresh them. + CriticalSectionLocker cs(m_maplock); + symbollock.Enter(); if (SymUnloadModule64(currentprocess, modulebase) == false) { report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); } + symbollock.Leave(); } + symbollock.Enter(); // Try to load the module's symbols. This ensures that we have loaded // the symbols for every module that has ever been loaded into the // process, guaranteeing the symbols' availability when generating the From 78a0e9765df1154abe985a4832bd82098d603e1d Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Sun, 29 May 2011 11:05:04 +0000 Subject: [PATCH 093/321] Code analysis emited quite a few warnings about potential runtime problems. I don't know why this wasn't turned on before, but this is a very powerful static analyzer that finds subtle problems. I'm turning this on for 32 bit debug builds. ThreadTest.cpp - Fixed some comments dynamic_app.cpp - Change the number of leaks that should be found. vld.cpp - Added guards against possible NULL module handles passed to GetProcAddress. Added a structure exception filter function for use in an __except clause. Also added a guard against dereferencing a NULL crtdbgblockheader_t pointer. Other inconsequential changes to comments and stuff. utility.h - Added a declaration for a filter function to be used in structured exception handling utility.cpp Used filter function (that does nothing but continue the search for an exception handler) for __except statements, instead of constant epressions. Added a guard to protect against using a NULL module handler in a callt o GetProcAddress. criticalsection.h - Added a leave method to the CriticalSectionLocker class, so that it can call leave before the end of the scope. This class is written to ensure exception safety, but the additional method lets us limit the scope of the critical section usage. So you get the best of both features. callstack.h - removed an archaic typedef struct callstack.cpp We were passing in an incorrect buffer size parameter to GetModuleFileName. Thanks to code analysis for catching this one. Added a better guard against overrunning the chunck frames array. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67192 --- callstack.cpp | 6 +- callstack.h | 10 +- criticalsection.h | 26 +- tests/dynamic_app/ThreadTest.cpp | 2 +- tests/dynamic_app/dynamic_app.cpp | 6 +- utility.cpp | 511 +++++++++++++++--------------- utility.h | 2 + vld.cpp | 41 ++- vld.vcxproj | 1 + 9 files changed, 325 insertions(+), 280 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index fa5d984f..86e29441 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -268,7 +268,7 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const HMODULE hCallingModule = GetCallingModule(programcounter); LPWSTR modulename = L"(Module name unavailable)"; if (hCallingModule && - GetModuleFileName(hCallingModule, callingmodulename, sizeof(callingmodulename)) > 0) + GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) { modulename = wcsrchr(callingmodulename, L'\\'); if (modulename == NULL) @@ -406,7 +406,7 @@ void CallStack::Resolve(BOOL showinternalframes) HMODULE hCallingModule = GetCallingModule(programcounter); LPWSTR modulename = L"(Module name unavailable)"; if (hCallingModule && - GetModuleFileName(hCallingModule, callingmodulename, sizeof(callingmodulename)) > 0) + GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) { modulename = wcsrchr(callingmodulename, L'\\'); if (modulename == NULL) @@ -508,7 +508,7 @@ VOID CallStack::push_back (const UINT_PTR programcounter) m_topindex = 0; m_capacity += CALLSTACKCHUNKSIZE; } - else if (m_topindex == CALLSTACKCHUNKSIZE) { + else if (m_topindex >= CALLSTACKCHUNKSIZE) { // There is more capacity, but not in this chunk. Go to the next chunk. // Note that this only happens if this CallStack has previously been // cleared (clearing resets the data, but doesn't give up any allocated diff --git a/callstack.h b/callstack.h index dde1fd70..73eba3b4 100644 --- a/callstack.h +++ b/callstack.h @@ -105,16 +105,16 @@ class CallStack CallStack& operator = (const CallStack &other); // The chunk list is made of a linked list of Chunks. - typedef struct chunk_s { - struct chunk_s *next; // Pointer to the next chunk in the chunk list. - UINT_PTR frames [CALLSTACKCHUNKSIZE]; // Pushed frames (program counter addresses) are stored in this array. - } chunk_t; + struct chunk_t { + chunk_t* next; // Pointer to the next chunk in the chunk list. + UINT_PTR frames[CALLSTACKCHUNKSIZE]; // Pushed frames (program counter addresses) are stored in this array. + }; // Private data. UINT32 m_capacity; // Current capacity limit (in frames) UINT32 m_size; // Current size (in frames) CallStack::chunk_t m_store; // Pointer to the underlying data store (i.e. head of the chunk list) - CallStack::chunk_t *m_topchunk; // Pointer to the chunk at the top of the stack + CallStack::chunk_t* m_topchunk; // Pointer to the chunk at the top of the stack UINT32 m_topindex; // Index, within the top chunk, of the top of the stack // The string that contains the stack converted into a human readable format. diff --git a/criticalsection.h b/criticalsection.h index 687b72e3..d5d77dab 100644 --- a/criticalsection.h +++ b/criticalsection.h @@ -34,18 +34,34 @@ class CriticalSectionLocker { public: CriticalSectionLocker(CriticalSection& cs) - : m_critsect(cs) + : m_leave(false) + , m_critsect(cs) { m_critsect.Enter(); } ~CriticalSectionLocker() { - m_critsect.Leave(); + LeaveLock(); } - - CriticalSectionLocker & operator=( const CriticalSectionLocker & ) {} -private: + void Leave() + { + LeaveLock(); + } + + +private: + void LeaveLock() + { + if (!m_leave) + { + m_critsect.Leave(); + m_leave = true; + } + } + CriticalSectionLocker(); // not allowed + CriticalSectionLocker & operator=( const CriticalSectionLocker & ); // not allowed + bool m_leave; CriticalSection& m_critsect; }; diff --git a/tests/dynamic_app/ThreadTest.cpp b/tests/dynamic_app/ThreadTest.cpp index c45f276d..d8b051a0 100644 --- a/tests/dynamic_app/ThreadTest.cpp +++ b/tests/dynamic_app/ThreadTest.cpp @@ -5,7 +5,7 @@ void Call_LoaderLocks(bool resolve) { //RunLoaderTests(resolve); // will not crash - RunMFCLoaderTests(resolve); // will crash + RunMFCLoaderTests(resolve); // Leaks 7 allocs //HMODULE this_app = NULL; //WCHAR path_name[MAX_PATH] = {0}; diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 91acb643..18fe1ac7 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -81,15 +81,15 @@ int _tmain(int argc, _TCHAR* argv[]) if (doThreadTests) { - // This test will crash, indicating a bug that needs to be fixed. + // Creates 64 threads that each leaks 7 allocations. This equals 448 RunLoaderLockTests(resolve); totalleaks = (int)VLDGetLeaksCount(); int leaks4 = totalleaks - prevleaks; - assert(leaks4 == 1158); + assert(leaks4 == 448); // ..................Total: 1189 leaks total totalleaks = (int)VLDGetLeaksCount(); - int diff = 1189 - totalleaks; + int diff = 479 - totalleaks; return diff; } diff --git a/utility.cpp b/utility.cpp index fdc7f0c6..dcf40cec 100644 --- a/utility.cpp +++ b/utility.cpp @@ -181,6 +181,12 @@ VOID dumpmemoryw (LPCVOID address, SIZE_T size) } } +// FilterFunction - Used in structured exception handling +DWORD FilterFunction(long) +{ + return EXCEPTION_CONTINUE_SEARCH; +} + // findoriginalimportdescriptor - Determines if the specified module imports the named import // from the named exporting module. // @@ -196,43 +202,43 @@ VOID dumpmemoryw (LPCVOID address, SIZE_T size) // IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPCSTR exportmodulename) { - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - imagelock.Enter(); - __try - { - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - } - __except(1) - { - idte = NULL; - } - imagelock.Leave(); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return NULL; - } - while (idte->OriginalFirstThunk != 0x0) { - PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); - if (_stricmp(name, exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return NULL; - } - return idte; + IMAGE_IMPORT_DESCRIPTOR* idte = NULL; + IMAGE_SECTION_HEADER* section = NULL; + ULONG size = 0; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + imagelock.Enter(); + __try + { + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + } + __except(FilterFunction(GetExceptionCode())) + { + idte = NULL; + } + imagelock.Leave(); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return NULL; + } + while (idte->OriginalFirstThunk != 0x0) { + PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); + if (_stricmp(name, exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->OriginalFirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return NULL; + } + return idte; } // findimport - Determines if the specified module imports the named import @@ -426,96 +432,96 @@ BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT ta // BOOL patchimport (HMODULE importmodule, moduleentry_t *module) { - HMODULE exportmodule = (HMODULE)module->modulebase; - if (exportmodule == NULL) - return FALSE; - - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - imagelock.Enter(); - __try - { - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - } - __except(1) - { - idte = NULL; - } - imagelock.Leave(); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return FALSE; - } - - int result = 0; - while (idte->FirstThunk != 0x0) { - PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); - UNREFERENCED_PARAMETER(name); - - patchentry_t *entry = module->patchtable; - int i = 0; - while(entry->importname) - { - LPCSTR importname = entry->importname; - LPCVOID replacement = entry->replacement; - - // Get the *real* address of the import. If we find this address in the IAT, - // then we've found the entry that needs to be patched. - FARPROC import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); - FARPROC import = GetProcAddress(exportmodule, importname); - if ( import2 ) - import = import2; - - if (import == NULL) // Perhaps the named export module does not actually export the named import? - { - entry++; i++; - continue; - } - - // Locate the import's IAT entry. - IMAGE_THUNK_DATA *iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) - { - if (iate->u1.Function != (DWORD_PTR)import) - { - iate++; - continue; - } - - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the address of the replacement. Note that the IAT - // entry may be write-protected, so we must first ensure that it is - // writable. - if ( import != replacement ) - { - if (entry->original != NULL) - *entry->original = (LPVOID)iate->u1.Function; - - DWORD protect; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)replacement; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - } - // The patch has been installed in the import module. - result++; - iate++; - } - entry++; i++; - } - - idte++; - } - - // The import's IAT entry was not found. The importing module does not - // import the specified import. - return result > 0; + HMODULE exportmodule = (HMODULE)module->modulebase; + if (exportmodule == NULL) + return FALSE; + + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + imagelock.Enter(); + __try + { + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + } + __except(FilterFunction(GetExceptionCode())) + { + idte = NULL; + } + imagelock.Leave(); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return FALSE; + } + + int result = 0; + while (idte->FirstThunk != 0x0) { + PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); + UNREFERENCED_PARAMETER(name); + + patchentry_t *entry = module->patchtable; + int i = 0; + while(entry->importname) + { + LPCSTR importname = entry->importname; + LPCVOID replacement = entry->replacement; + + // Get the *real* address of the import. If we find this address in the IAT, + // then we've found the entry that needs to be patched. + FARPROC import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); + FARPROC import = GetProcAddress(exportmodule, importname); + if ( import2 ) + import = import2; + + if (import == NULL) // Perhaps the named export module does not actually export the named import? + { + entry++; i++; + continue; + } + + // Locate the import's IAT entry. + IMAGE_THUNK_DATA *iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) + { + if (iate->u1.Function != (DWORD_PTR)import) + { + iate++; + continue; + } + + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the address of the replacement. Note that the IAT + // entry may be write-protected, so we must first ensure that it is + // writable. + if ( import != replacement ) + { + if (entry->original != NULL) + *entry->original = (LPVOID)iate->u1.Function; + + DWORD protect; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)replacement; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + } + // The patch has been installed in the import module. + result++; + iate++; + } + entry++; i++; + } + + idte++; + } + + // The import's IAT entry was not found. The importing module does not + // import the specified import. + return result > 0; } // patchmodule - Patches all imports listed in the supplied patch table, and @@ -669,87 +675,87 @@ VOID report (LPCWSTR format, ...) // VOID restoreimport (HMODULE importmodule, moduleentry_t* module) { - HMODULE exportmodule = (HMODULE)module->modulebase; - LPCSTR exportmodulename = module->exportmodulename; - UNREFERENCED_PARAMETER(exportmodulename); - if (exportmodule == NULL) - return; - - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - imagelock.Enter(); - __try - { - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - } - __except(1) - { - idte = NULL; - } - imagelock.Leave(); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return; - } - - int result = 0; - while (idte->OriginalFirstThunk != 0x0) - { - PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); - UNREFERENCED_PARAMETER(name); - - int i = 0; - patchentry_t *entry = module->patchtable; - while(entry->importname) - { - LPCSTR importname = entry->importname; - LPCVOID replacement = entry->replacement; - UNREFERENCED_PARAMETER(importname); - - // Get the *real* address of the import. - //LPCVOID original = entry->original; - LPCVOID original = GetProcAddress(exportmodule, importname); - if (original == NULL) // Perhaps the named export module does not actually export the named import? - { - entry++; i++; - continue; - } - - // Locate the import's original IAT entry (it currently has the replacement - // address in it). - IMAGE_THUNK_DATA* iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) - { - if (iate->u1.Function != (DWORD_PTR)replacement) - { - iate++; - continue; - } - - if (iate->u1.Function != (DWORD_PTR)original) - { - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the import's real address. Note that the IAT entry may - // be write-protected, so we must first ensure that it is writable. - DWORD protect; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)original; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - } - result++; - iate++; - } - entry++; i++; - } - idte++; - } + HMODULE exportmodule = (HMODULE)module->modulebase; + LPCSTR exportmodulename = module->exportmodulename; + UNREFERENCED_PARAMETER(exportmodulename); + if (exportmodule == NULL) + return; + + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + imagelock.Enter(); + __try + { + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + } + __except(FilterFunction(GetExceptionCode())) + { + idte = NULL; + } + imagelock.Leave(); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return; + } + + int result = 0; + while (idte->OriginalFirstThunk != 0x0) + { + PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); + UNREFERENCED_PARAMETER(name); + + int i = 0; + patchentry_t *entry = module->patchtable; + while(entry->importname) + { + LPCSTR importname = entry->importname; + LPCVOID replacement = entry->replacement; + UNREFERENCED_PARAMETER(importname); + + // Get the *real* address of the import. + //LPCVOID original = entry->original; + LPCVOID original = GetProcAddress(exportmodule, importname); + if (original == NULL) // Perhaps the named export module does not actually export the named import? + { + entry++; i++; + continue; + } + + // Locate the import's original IAT entry (it currently has the replacement + // address in it). + IMAGE_THUNK_DATA* iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) + { + if (iate->u1.Function != (DWORD_PTR)replacement) + { + iate++; + continue; + } + + if (iate->u1.Function != (DWORD_PTR)original) + { + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the import's real address. Note that the IAT entry may + // be write-protected, so we must first ensure that it is writable. + DWORD protect; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)original; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + } + result++; + iate++; + } + entry++; i++; + } + idte++; + } } // restoremodule - Restores all imports listed in the supplied patch table, and @@ -891,49 +897,52 @@ BOOL strtobool (LPCWSTR s) { // DWORD _GetProcessIdOfThread (HANDLE thread) { - typedef struct _CLIENT_ID { - HANDLE UniqueProcess; - HANDLE UniqueThread; - } CLIENT_ID, *PCLIENT_ID; - - typedef LONG NTSTATUS; - typedef LONG KPRIORITY; - - typedef struct _THREAD_BASIC_INFORMATION { - NTSTATUS ExitStatus; - PVOID TebBaseAddress; - CLIENT_ID ClientId; - KAFFINITY AffinityMask; - KPRIORITY Priority; - KPRIORITY BasePriority; - } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION; - - const static THREADINFOCLASS ThreadBasicInformation = (THREADINFOCLASS)0; - - typedef NTSTATUS (WINAPI *PNtQueryInformationThread) (HANDLE thread, - THREADINFOCLASS infoclass, PVOID buffer, ULONG buffersize, - PULONG used); - - static PNtQueryInformationThread NtQueryInformationThread = NULL; - - THREAD_BASIC_INFORMATION tbi; - NTSTATUS status; - HMODULE ntdll; - if (NtQueryInformationThread == NULL) { - ntdll = GetModuleHandleW(L"ntdll.dll"); - NtQueryInformationThread = (PNtQueryInformationThread)GetProcAddress(ntdll, "NtQueryInformationThread"); - if (NtQueryInformationThread == NULL) { - return 0; - } - } - - status = NtQueryInformationThread(thread, ThreadBasicInformation, &tbi, sizeof(tbi), NULL); - if(status < 0) { - // Shall we go through all the trouble of setting last error? - return 0; - } - - return (DWORD)tbi.ClientId.UniqueProcess; + typedef struct _CLIENT_ID { + HANDLE UniqueProcess; + HANDLE UniqueThread; + } CLIENT_ID, *PCLIENT_ID; + + typedef LONG NTSTATUS; + typedef LONG KPRIORITY; + + typedef struct _THREAD_BASIC_INFORMATION { + NTSTATUS ExitStatus; + PVOID TebBaseAddress; + CLIENT_ID ClientId; + KAFFINITY AffinityMask; + KPRIORITY Priority; + KPRIORITY BasePriority; + } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION; + + const static THREADINFOCLASS ThreadBasicInformation = (THREADINFOCLASS)0; + + typedef NTSTATUS (WINAPI *PNtQueryInformationThread) (HANDLE thread, + THREADINFOCLASS infoclass, PVOID buffer, ULONG buffersize, + PULONG used); + + static PNtQueryInformationThread NtQueryInformationThread = NULL; + + THREAD_BASIC_INFORMATION tbi; + NTSTATUS status; + if (NtQueryInformationThread == NULL) { + HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); + if (ntdll) + { + NtQueryInformationThread = (PNtQueryInformationThread)GetProcAddress(ntdll, "NtQueryInformationThread"); + } + + if (NtQueryInformationThread == NULL) { + return 0; + } + } + + status = NtQueryInformationThread(thread, ThreadBasicInformation, &tbi, sizeof(tbi), NULL); + if(status < 0) { + // Shall we go through all the trouble of setting last error? + return 0; + } + + return (DWORD)tbi.ClientId.UniqueProcess; } static const DWORD crctab[256] = { diff --git a/utility.h b/utility.h index a9c2f9bf..301e42f3 100644 --- a/utility.h +++ b/utility.h @@ -139,3 +139,5 @@ DWORD CalculateCRC32(UINT_PTR p, UINT startValue = 0xD202EF8D); // list of arguments. void GetFormattedMessage(DWORD last_error); HMODULE GetCallingModule(UINT_PTR pCaller); +DWORD FilterFunction(long); + diff --git a/vld.cpp b/vld.cpp index f21be9c1..ad81232e 100644 --- a/vld.cpp +++ b/vld.cpp @@ -415,23 +415,34 @@ VisualLeakDetector::VisualLeakDetector () HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); if (!IsWin7OrBetter()) // kernel32.dll - m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); + { + if (kernel32) + { + m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); + } + } else { assert(m_patchtable[0].patchtable == m_kernelbasePatch); m_patchtable[0].exportmodulename = "kernelbase.dll"; - m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernelBase,"GetProcAddress"); + if (kernelBase) + { + m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernelBase,"GetProcAddress"); + } } // Initialize global variables. currentprocess = GetCurrentProcess(); currentthread = GetCurrentThread(); imagelock.Initialize(); - LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); processheap = GetProcessHeap(); - RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); - RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); - RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); + if (ntdll) + { + LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); + RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); + RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); + RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); + } stackwalklock.Initialize(); symbollock.Initialize(); vldheap = HeapCreate(0x0, 0, 0); @@ -1060,7 +1071,9 @@ VOID VisualLeakDetector::configure () if (wcslen(filename) == 0) { wcsncpy_s(filename, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); } - _wfullpath(m_reportfilepath, filename, MAX_PATH); + WCHAR* path = _wfullpath(m_reportfilepath, filename, MAX_PATH); + assert(path); + GetPrivateProfileString(L"Options", L"ReportTo", L"", buffer, BSIZE, inipath); if (_wcsicmp(buffer, L"both") == 0) { m_options |= (VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE); @@ -1674,7 +1687,7 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & if (m_options & VLD_OPT_VALIDATE_HEAPFREE) { HANDLE other_heap = NULL; - blockinfo_t* alloc_block = FindAllocedBlock(mem, __out other_heap); + blockinfo_t* alloc_block = FindAllocedBlock(mem, other_heap); // other_heap is an out parameter bool diff = other_heap != heap; // Check indeed if the other heap is different if (alloc_block && alloc_block->callstack && diff) { @@ -1684,13 +1697,12 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & alloc_block->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); // Now we need a way to print the current callstack at this point: - // now what? CallStack* stack_here = CallStack::Create(); stack_here->getstacktrace(vld.m_maxtraceframes, context); report(L"Deallocation Call stack.\n"); report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); report(L" Call Stack:\n"); - stack_here->dump(FALSE, 0); + stack_here->dump(FALSE); // Now it should be safe to delete our temporary callstack delete stack_here; stack_here = NULL; @@ -3090,7 +3102,7 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) while(patchentry->importname) { // This patch table entry is for the specified module. If the requested - // import's name matches the entry's import name (or ordinal), then + // imports name matches the entry's import name (or ordinal), then // return the address of the replacement instead of the address of the // actual import. if ((SIZE_T)patchentry->importname < (SIZE_T)vld.m_vldbase) { @@ -3107,7 +3119,7 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) return (FARPROC)patchentry->replacement; } } - __except(EXCEPTION_EXECUTE_HANDLER) + __except(FilterFunction(GetExceptionCode())) { if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { return (FARPROC)patchentry->replacement; @@ -4282,6 +4294,11 @@ void VisualLeakDetector::resolveStacks(HANDLE heap) // This block is allocated to a CRT heap, so the block has a CRT // memory block header prepended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + if (!crtheader) + { + continue; + } + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. diff --git a/vld.vcxproj b/vld.vcxproj index 02bf63ad..a4dc39c2 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -99,6 +99,7 @@ Level4 false EditAndContinue + true true From 240eebec5cf851ecb533bb663f05a5921075efbe Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 29 May 2011 20:35:47 +0000 Subject: [PATCH 094/321] Renamed global variables ResolveCallstacks fixed with aggregate duplicates git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67200 --- callstack.cpp | 32 +- tests/dynamic_app/dynamic_app.cpp | 2 +- utility.cpp | 14 +- vld.cpp | 5371 ++++++++++++++--------------- vldheap.cpp | 24 +- 5 files changed, 2717 insertions(+), 2726 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 86e29441..f197a265 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -31,10 +31,10 @@ #define MAXSYMBOLNAMELENGTH 256 // Imported global variables. -extern HANDLE currentprocess; -extern HANDLE currentthread; -extern CriticalSection stackwalklock; -extern CriticalSection symbollock; +extern HANDLE g_currentprocess; +extern HANDLE g_currentthread; +extern CriticalSection g_stackwalklock; +extern CriticalSection g_symbollock; extern VisualLeakDetector vld; // Constructor - Initializes the CallStack with an initial size of zero and one @@ -229,15 +229,15 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const // Try to get the source file and line number associated with // this program counter address. SIZE_T programcounter = (*this)[frame]; - symbollock.Enter(); + g_symbollock.Enter(); BOOL foundline = FALSE; DWORD displacement = 0; - foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo); + foundline = SymGetLineFromAddrW64(g_currentprocess, programcounter, &displacement, &sourceinfo); if (foundline && !showinternalframes) { _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); if (IsInternalModule(sourceinfo.FileName)) { // Don't show frames in files internal to the heap. - symbollock.Leave(); + g_symbollock.Leave(); continue; } } @@ -251,7 +251,7 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const // counter address. DWORD64 displacement64 = 0; LPWSTR functionname; - if (SymFromAddrW(currentprocess, programcounter, &displacement64, functioninfo)) { + if (SymFromAddrW(g_currentprocess, programcounter, &displacement64, functioninfo)) { // Undecorate function name. if (UnDecorateSymbolName(functioninfo->Name, undecoratedname, MAXSYMBOLNAMELENGTH, UNDNAME_NAME_ONLY) > 0) functionname = undecoratedname; @@ -263,7 +263,7 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const functionname = L"(Function name unavailable)"; displacement64 = 0; } - symbollock.Leave(); + g_symbollock.Leave(); HMODULE hCallingModule = GetCallingModule(programcounter); LPWSTR modulename = L"(Module name unavailable)"; @@ -361,21 +361,21 @@ void CallStack::Resolve(BOOL showinternalframes) // Try to get the source file and line number associated with // this program counter address. SIZE_T programcounter = (*this)[frame]; - symbollock.Enter(); + g_symbollock.Enter(); BOOL foundline = FALSE; DWORD displacement = 0; // It turns out that calls to SymGetLineFromAddrW64 may free the very memory we are scrutinizing here // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. // When that happens there is nothing we can do except crash. - foundline = SymGetLineFromAddrW64(currentprocess, programcounter, &displacement, &sourceinfo); + foundline = SymGetLineFromAddrW64(g_currentprocess, programcounter, &displacement, &sourceinfo); assert(m_Resolved != NULL); if (foundline && !showinternalframes) { _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); if (IsInternalModule(sourceinfo.FileName)) { // Don't show frames in files internal to the heap. - symbollock.Leave(); + g_symbollock.Leave(); continue; } } @@ -389,7 +389,7 @@ void CallStack::Resolve(BOOL showinternalframes) // counter address. DWORD64 displacement64 = 0; LPWSTR functionname; - if (SymFromAddrW(currentprocess, programcounter, &displacement64, functioninfo)) { + if (SymFromAddrW(g_currentprocess, programcounter, &displacement64, functioninfo)) { // Undecorate function name. if (UnDecorateSymbolName(functioninfo->Name, undecoratedname, MAXSYMBOLNAMELENGTH, UNDNAME_NAME_ONLY) > 0) functionname = undecoratedname; @@ -401,7 +401,7 @@ void CallStack::Resolve(BOOL showinternalframes) functionname = L"(Function name unavailable)"; displacement64 = 0; } - symbollock.Leave(); + g_symbollock.Leave(); HMODULE hCallingModule = GetCallingModule(programcounter); LPWSTR modulename = L"(Module name unavailable)"; @@ -680,11 +680,11 @@ VOID SafeCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) frame.Virtual = TRUE; // Walk the stack. - CriticalSectionLocker cs(stackwalklock); + CriticalSectionLocker cs(g_stackwalklock); UINT32 count = 0; while (count < maxdepth) { count++; - if (!StackWalk64(architecture, currentprocess, currentthread, &frame, ¤tcontext, NULL, + if (!StackWalk64(architecture, g_currentprocess, g_currentthread, &frame, ¤tcontext, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { // Couldn't trace back through any more frames. break; diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 18fe1ac7..b79ba0b5 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -87,7 +87,7 @@ int _tmain(int argc, _TCHAR* argv[]) int leaks4 = totalleaks - prevleaks; assert(leaks4 == 448); - // ..................Total: 1189 leaks total + // ..................Total: 479 leaks total totalleaks = (int)VLDGetLeaksCount(); int diff = 479 - totalleaks; return diff; diff --git a/utility.cpp b/utility.cpp index dcf40cec..3bddb34b 100644 --- a/utility.cpp +++ b/utility.cpp @@ -28,7 +28,7 @@ #include "vldint.h" // Imported Global Variables -extern CriticalSection imagelock; +extern CriticalSection g_imagelock; // Global variables. static BOOL reportdelay = FALSE; // If TRUE, we sleep for a bit after calling OutputDebugString to give the debugger time to catch up. @@ -210,7 +210,7 @@ IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPC // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. - imagelock.Enter(); + g_imagelock.Enter(); __try { idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, @@ -220,7 +220,7 @@ IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPC { idte = NULL; } - imagelock.Leave(); + g_imagelock.Leave(); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return NULL; @@ -444,7 +444,7 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. - imagelock.Enter(); + g_imagelock.Enter(); __try { idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, @@ -454,7 +454,7 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) { idte = NULL; } - imagelock.Leave(); + g_imagelock.Leave(); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return FALSE; @@ -689,7 +689,7 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. - imagelock.Enter(); + g_imagelock.Enter(); __try { idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, @@ -699,7 +699,7 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) { idte = NULL; } - imagelock.Leave(); + g_imagelock.Leave(); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return; diff --git a/vld.cpp b/vld.cpp index ad81232e..d9a2e072 100644 --- a/vld.cpp +++ b/vld.cpp @@ -43,17 +43,17 @@ #define MODULESETRESERVE 16 // There are likely to be several modules loaded in the process. // Imported global variables. -extern vldblockheader_t *vldblocklist; -extern HANDLE vldheap; -extern CriticalSection vldheaplock; +extern vldblockheader_t *g_vldblocklist; +extern HANDLE g_vldheap; +extern CriticalSection g_vldheaplock; // Global variables. -HANDLE currentprocess; // Pseudo-handle for the current process. -HANDLE currentthread; // Pseudo-handle for the current thread. -CriticalSection imagelock; // Serializes calls to the Debug Help Library PE image access APIs. -HANDLE processheap; // Handle to the process's heap (COM allocations come from here). -CriticalSection stackwalklock; // Serializes calls to StackWalk64 from the Debug Help Library. -CriticalSection symbollock; // Serializes calls to the Debug Help Library symbols handling APIs. +HANDLE g_currentprocess; // Pseudo-handle for the current process. +HANDLE g_currentthread; // Pseudo-handle for the current thread. +CriticalSection g_imagelock; // Serializes calls to the Debug Help Library PE image access APIs. +HANDLE g_processheap; // Handle to the process's heap (COM allocations come from here). +CriticalSection g_stackwalklock; // Serializes calls to StackWalk64 from the Debug Help Library. +CriticalSection g_symbollock; // Serializes calls to the Debug Help Library symbols handling APIs. // The one and only VisualLeakDetector object instance. __declspec(dllexport) VisualLeakDetector vld; @@ -67,17 +67,17 @@ __declspec(dllexport) VisualLeakDetector vld; // through to replacement functions provided by VLD. Having this table simply // makes it more convenient to add additional IAT patches. patchentry_t VisualLeakDetector::m_kernelbasePatch [] = { - "GetProcAddress", NULL, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. - NULL, NULL, NULL + "GetProcAddress", NULL, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. + NULL, NULL, NULL }; patchentry_t VisualLeakDetector::m_kernel32Patch [] = { - "HeapAlloc", NULL, _HeapAlloc, - "HeapCreate", NULL, _HeapCreate, - "HeapDestroy", NULL, _HeapDestroy, - "HeapFree", NULL, _HeapFree, - "HeapReAlloc", NULL, _HeapReAlloc, - NULL, NULL, NULL + "HeapAlloc", NULL, _HeapAlloc, + "HeapCreate", NULL, _HeapCreate, + "HeapDestroy", NULL, _HeapDestroy, + "HeapFree", NULL, _HeapFree, + "HeapReAlloc", NULL, _HeapReAlloc, + NULL, NULL, NULL }; #define ORDINAL(x) (LPCSTR)x @@ -90,300 +90,300 @@ patchentry_t VisualLeakDetector::m_kernel32Patch [] = { VisualLeakDetector::_GetProcAddressType *VisualLeakDetector::m_original_GetProcAddress = NULL; static patchentry_t mfc42dPatch [] = { - // XXX why are the vector new operators missing for mfc42d.dll? - ORDINAL(711), &VS60::pmfcd_scalar_new, VS60::mfcd_scalar_new, - ORDINAL(712), &VS60::pmfcd__scalar_new_dbg_4p, VS60::mfcd__scalar_new_dbg_4p, - ORDINAL(714), &VS60::pmfcd__scalar_new_dbg_3p, VS60::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + // XXX why are the vector new operators missing for mfc42d.dll? + ORDINAL(711), &VS60::pmfcd_scalar_new, VS60::mfcd_scalar_new, + ORDINAL(712), &VS60::pmfcd__scalar_new_dbg_4p, VS60::mfcd__scalar_new_dbg_4p, + ORDINAL(714), &VS60::pmfcd__scalar_new_dbg_3p, VS60::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc42udPatch [] = { - // XXX why are the vector new operators missing for mfc42ud.dll? - ORDINAL(711), &VS60::pmfcud_scalar_new, VS60::mfcud_scalar_new, - ORDINAL(712), &VS60::pmfcud__scalar_new_dbg_4p, VS60::mfcud__scalar_new_dbg_4p, - ORDINAL(714), &VS60::pmfcud__scalar_new_dbg_3p, VS60::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + // XXX why are the vector new operators missing for mfc42ud.dll? + ORDINAL(711), &VS60::pmfcud_scalar_new, VS60::mfcud_scalar_new, + ORDINAL(712), &VS60::pmfcud__scalar_new_dbg_4p, VS60::mfcud__scalar_new_dbg_4p, + ORDINAL(714), &VS60::pmfcud__scalar_new_dbg_3p, VS60::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc70dPatch [] = { - ORDINAL(257), &VS70::pmfcd_vector_new, VS70::mfcd_vector_new, - ORDINAL(258), &VS70::pmfcd__vector_new_dbg_4p, VS70::mfcd__vector_new_dbg_4p, - ORDINAL(259), &VS70::pmfcd__vector_new_dbg_3p, VS70::mfcd__vector_new_dbg_3p, - ORDINAL(832), &VS70::pmfcd_scalar_new, VS70::mfcd_scalar_new, - ORDINAL(833), &VS70::pmfcd__scalar_new_dbg_4p, VS70::mfcd__scalar_new_dbg_4p, - ORDINAL(834), &VS70::pmfcd__scalar_new_dbg_3p, VS70::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(257), &VS70::pmfcd_vector_new, VS70::mfcd_vector_new, + ORDINAL(258), &VS70::pmfcd__vector_new_dbg_4p, VS70::mfcd__vector_new_dbg_4p, + ORDINAL(259), &VS70::pmfcd__vector_new_dbg_3p, VS70::mfcd__vector_new_dbg_3p, + ORDINAL(832), &VS70::pmfcd_scalar_new, VS70::mfcd_scalar_new, + ORDINAL(833), &VS70::pmfcd__scalar_new_dbg_4p, VS70::mfcd__scalar_new_dbg_4p, + ORDINAL(834), &VS70::pmfcd__scalar_new_dbg_3p, VS70::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc70udPatch [] = { - ORDINAL(258), &VS70::pmfcud_vector_new, VS70::mfcud_vector_new, - ORDINAL(259), &VS70::pmfcud__vector_new_dbg_4p, VS70::mfcud__vector_new_dbg_4p, - ORDINAL(260), &VS70::pmfcud__vector_new_dbg_3p, VS70::mfcud__vector_new_dbg_3p, - ORDINAL(833), &VS70::pmfcud_scalar_new, VS70::mfcud_scalar_new, - ORDINAL(834), &VS70::pmfcud__scalar_new_dbg_4p, VS70::mfcud__scalar_new_dbg_4p, - ORDINAL(835), &VS70::pmfcud__scalar_new_dbg_3p, VS70::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(258), &VS70::pmfcud_vector_new, VS70::mfcud_vector_new, + ORDINAL(259), &VS70::pmfcud__vector_new_dbg_4p, VS70::mfcud__vector_new_dbg_4p, + ORDINAL(260), &VS70::pmfcud__vector_new_dbg_3p, VS70::mfcud__vector_new_dbg_3p, + ORDINAL(833), &VS70::pmfcud_scalar_new, VS70::mfcud_scalar_new, + ORDINAL(834), &VS70::pmfcud__scalar_new_dbg_4p, VS70::mfcud__scalar_new_dbg_4p, + ORDINAL(835), &VS70::pmfcud__scalar_new_dbg_3p, VS70::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc71dPatch [] = { - ORDINAL(267), &VS71::pmfcd_vector_new, VS71::mfcd_vector_new, - ORDINAL(268), &VS71::pmfcd__vector_new_dbg_4p, VS71::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS71::pmfcd__vector_new_dbg_3p, VS71::mfcd__vector_new_dbg_3p, - ORDINAL(893), &VS71::pmfcd_scalar_new, VS71::mfcd_scalar_new, - ORDINAL(894), &VS71::pmfcd__scalar_new_dbg_4p, VS71::mfcd__scalar_new_dbg_4p, - ORDINAL(895), &VS71::pmfcd__scalar_new_dbg_3p, VS71::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS71::pmfcd_vector_new, VS71::mfcd_vector_new, + ORDINAL(268), &VS71::pmfcd__vector_new_dbg_4p, VS71::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS71::pmfcd__vector_new_dbg_3p, VS71::mfcd__vector_new_dbg_3p, + ORDINAL(893), &VS71::pmfcd_scalar_new, VS71::mfcd_scalar_new, + ORDINAL(894), &VS71::pmfcd__scalar_new_dbg_4p, VS71::mfcd__scalar_new_dbg_4p, + ORDINAL(895), &VS71::pmfcd__scalar_new_dbg_3p, VS71::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc71udPatch [] = { - ORDINAL(267), &VS71::pmfcud_vector_new, VS71::mfcud_vector_new, - ORDINAL(268), &VS71::pmfcud__vector_new_dbg_4p, VS71::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS71::pmfcud__vector_new_dbg_3p, VS71::mfcud__vector_new_dbg_3p, - ORDINAL(893), &VS71::pmfcud_scalar_new, VS71::mfcud_scalar_new, - ORDINAL(894), &VS71::pmfcud__scalar_new_dbg_4p, VS71::mfcud__scalar_new_dbg_4p, - ORDINAL(895), &VS71::pmfcud__scalar_new_dbg_3p, VS71::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS71::pmfcud_vector_new, VS71::mfcud_vector_new, + ORDINAL(268), &VS71::pmfcud__vector_new_dbg_4p, VS71::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS71::pmfcud__vector_new_dbg_3p, VS71::mfcud__vector_new_dbg_3p, + ORDINAL(893), &VS71::pmfcud_scalar_new, VS71::mfcud_scalar_new, + ORDINAL(894), &VS71::pmfcud__scalar_new_dbg_4p, VS71::mfcud__scalar_new_dbg_4p, + ORDINAL(895), &VS71::pmfcud__scalar_new_dbg_3p, VS71::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc80dPatch [] = { - ORDINAL(267), &VS80::pmfcd_vector_new, VS80::mfcd_vector_new, - ORDINAL(268), &VS80::pmfcd__vector_new_dbg_4p, VS80::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS80::pmfcd__vector_new_dbg_3p, VS80::mfcd__vector_new_dbg_3p, - ORDINAL2(893,907), &VS80::pmfcd_scalar_new, VS80::mfcd_scalar_new, - ORDINAL2(894,908), &VS80::pmfcd__scalar_new_dbg_4p, VS80::mfcd__scalar_new_dbg_4p, - ORDINAL2(895,909), &VS80::pmfcd__scalar_new_dbg_3p, VS80::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS80::pmfcd_vector_new, VS80::mfcd_vector_new, + ORDINAL(268), &VS80::pmfcd__vector_new_dbg_4p, VS80::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS80::pmfcd__vector_new_dbg_3p, VS80::mfcd__vector_new_dbg_3p, + ORDINAL2(893,907), &VS80::pmfcd_scalar_new, VS80::mfcd_scalar_new, + ORDINAL2(894,908), &VS80::pmfcd__scalar_new_dbg_4p, VS80::mfcd__scalar_new_dbg_4p, + ORDINAL2(895,909), &VS80::pmfcd__scalar_new_dbg_3p, VS80::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc80udPatch [] = { - ORDINAL(267), &VS80::pmfcud_vector_new, VS80::mfcud_vector_new, - ORDINAL(268), &VS80::pmfcud__vector_new_dbg_4p, VS80::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS80::pmfcud__vector_new_dbg_3p, VS80::mfcud__vector_new_dbg_3p, - ORDINAL2(893,907), &VS80::pmfcud_scalar_new, VS80::mfcud_scalar_new, - ORDINAL2(894,908), &VS80::pmfcud__scalar_new_dbg_4p, VS80::mfcud__scalar_new_dbg_4p, - ORDINAL2(895,909), &VS80::pmfcud__scalar_new_dbg_3p, VS80::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS80::pmfcud_vector_new, VS80::mfcud_vector_new, + ORDINAL(268), &VS80::pmfcud__vector_new_dbg_4p, VS80::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS80::pmfcud__vector_new_dbg_3p, VS80::mfcud__vector_new_dbg_3p, + ORDINAL2(893,907), &VS80::pmfcud_scalar_new, VS80::mfcud_scalar_new, + ORDINAL2(894,908), &VS80::pmfcud__scalar_new_dbg_4p, VS80::mfcud__scalar_new_dbg_4p, + ORDINAL2(895,909), &VS80::pmfcud__scalar_new_dbg_3p, VS80::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc90dPatch [] = { - ORDINAL(267), &VS90::pmfcd_vector_new, VS90::mfcd_vector_new, - ORDINAL(268), &VS90::pmfcd__vector_new_dbg_4p, VS90::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS90::pmfcd__vector_new_dbg_3p, VS90::mfcd__vector_new_dbg_3p, - ORDINAL2(931, 909), &VS90::pmfcd_scalar_new, VS90::mfcd_scalar_new, - ORDINAL2(932, 910), &VS90::pmfcd__scalar_new_dbg_4p, VS90::mfcd__scalar_new_dbg_4p, - ORDINAL2(933, 911), &VS90::pmfcd__scalar_new_dbg_3p, VS90::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS90::pmfcd_vector_new, VS90::mfcd_vector_new, + ORDINAL(268), &VS90::pmfcd__vector_new_dbg_4p, VS90::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS90::pmfcd__vector_new_dbg_3p, VS90::mfcd__vector_new_dbg_3p, + ORDINAL2(931, 909), &VS90::pmfcd_scalar_new, VS90::mfcd_scalar_new, + ORDINAL2(932, 910), &VS90::pmfcd__scalar_new_dbg_4p, VS90::mfcd__scalar_new_dbg_4p, + ORDINAL2(933, 911), &VS90::pmfcd__scalar_new_dbg_3p, VS90::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc90udPatch [] = { - ORDINAL(267), &VS90::pmfcud_vector_new, VS90::mfcud_vector_new, - ORDINAL(268), &VS90::pmfcud__vector_new_dbg_4p, VS90::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS90::pmfcud__vector_new_dbg_3p, VS90::mfcud__vector_new_dbg_3p, - ORDINAL2(935, 913), &VS90::pmfcud_scalar_new, VS90::mfcud_scalar_new, - ORDINAL2(936, 914), &VS90::pmfcud__scalar_new_dbg_4p, VS90::mfcud__scalar_new_dbg_4p, - ORDINAL2(937, 915), &VS90::pmfcud__scalar_new_dbg_3p, VS90::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS90::pmfcud_vector_new, VS90::mfcud_vector_new, + ORDINAL(268), &VS90::pmfcud__vector_new_dbg_4p, VS90::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS90::pmfcud__vector_new_dbg_3p, VS90::mfcud__vector_new_dbg_3p, + ORDINAL2(935, 913), &VS90::pmfcud_scalar_new, VS90::mfcud_scalar_new, + ORDINAL2(936, 914), &VS90::pmfcud__scalar_new_dbg_4p, VS90::mfcud__scalar_new_dbg_4p, + ORDINAL2(937, 915), &VS90::pmfcud__scalar_new_dbg_3p, VS90::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc100dPatch [] = { - ORDINAL(267), &VS100::pmfcd_vector_new, VS100::mfcd_vector_new, - ORDINAL(268), &VS100::pmfcd__vector_new_dbg_4p, VS100::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS100::pmfcd__vector_new_dbg_3p, VS100::mfcd__vector_new_dbg_3p, - ORDINAL2(1427, 1405), &VS100::pmfcd_scalar_new, VS100::mfcd_scalar_new, - ORDINAL2(1428, 1406), &VS100::pmfcd__scalar_new_dbg_4p, VS100::mfcd__scalar_new_dbg_4p, - ORDINAL2(1429, 1407), &VS100::pmfcd__scalar_new_dbg_3p, VS100::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS100::pmfcd_vector_new, VS100::mfcd_vector_new, + ORDINAL(268), &VS100::pmfcd__vector_new_dbg_4p, VS100::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS100::pmfcd__vector_new_dbg_3p, VS100::mfcd__vector_new_dbg_3p, + ORDINAL2(1427, 1405), &VS100::pmfcd_scalar_new, VS100::mfcd_scalar_new, + ORDINAL2(1428, 1406), &VS100::pmfcd__scalar_new_dbg_4p, VS100::mfcd__scalar_new_dbg_4p, + ORDINAL2(1429, 1407), &VS100::pmfcd__scalar_new_dbg_3p, VS100::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc100udPatch [] = { - ORDINAL(267), &VS100::pmfcud_vector_new, VS100::mfcud_vector_new, - ORDINAL(268), &VS100::pmfcud__vector_new_dbg_4p,VS100::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS100::pmfcud__vector_new_dbg_3p,VS100::mfcud__vector_new_dbg_3p, - ORDINAL2(1434, 1412), &VS100::pmfcud_scalar_new, VS100::mfcud_scalar_new, - ORDINAL2(1435, 1413), &VS100::pmfcud__scalar_new_dbg_4p,VS100::mfcud__scalar_new_dbg_4p, - ORDINAL2(1436, 1414), &VS100::pmfcud__scalar_new_dbg_3p,VS100::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &VS100::pmfcud_vector_new, VS100::mfcud_vector_new, + ORDINAL(268), &VS100::pmfcud__vector_new_dbg_4p,VS100::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS100::pmfcud__vector_new_dbg_3p,VS100::mfcud__vector_new_dbg_3p, + ORDINAL2(1434, 1412), &VS100::pmfcud_scalar_new, VS100::mfcud_scalar_new, + ORDINAL2(1435, 1413), &VS100::pmfcud__scalar_new_dbg_4p,VS100::mfcud__scalar_new_dbg_4p, + ORDINAL2(1436, 1414), &VS100::pmfcud__scalar_new_dbg_3p,VS100::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t msvcrtdPatch [] = { - "_calloc_dbg", &VS60::pcrtd__calloc_dbg, VS60::crtd__calloc_dbg, - "_malloc_dbg", &VS60::pcrtd__malloc_dbg, VS60::crtd__malloc_dbg, - "_realloc_dbg", &VS60::pcrtd__realloc_dbg, VS60::crtd__realloc_dbg, - scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, - //vector_new_dbg_name, &VS60::pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, - "calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, - "malloc", &VS60::pcrtd_malloc, VS60::crtd_malloc, - "realloc", &VS60::pcrtd_realloc, VS60::crtd_realloc, - scalar_new_name, &VS60::pcrtd_scalar_new, VS60::crtd_scalar_new, - //vector_new_name, &VS60::pcrtd_vector_new, VS60::crtd_vector_new, - NULL, NULL, NULL + "_calloc_dbg", &VS60::pcrtd__calloc_dbg, VS60::crtd__calloc_dbg, + "_malloc_dbg", &VS60::pcrtd__malloc_dbg, VS60::crtd__malloc_dbg, + "_realloc_dbg", &VS60::pcrtd__realloc_dbg, VS60::crtd__realloc_dbg, + scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, + //vector_new_dbg_name, &VS60::pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, + "calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, + "malloc", &VS60::pcrtd_malloc, VS60::crtd_malloc, + "realloc", &VS60::pcrtd_realloc, VS60::crtd_realloc, + scalar_new_name, &VS60::pcrtd_scalar_new, VS60::crtd_scalar_new, + //vector_new_name, &VS60::pcrtd_vector_new, VS60::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr70dPatch [] = { - "_calloc_dbg", &VS70::pcrtd__calloc_dbg, VS70::crtd__calloc_dbg, - "_malloc_dbg", &VS70::pcrtd__malloc_dbg, VS70::crtd__malloc_dbg, - "_realloc_dbg", &VS70::pcrtd__realloc_dbg, VS70::crtd__realloc_dbg, - scalar_new_dbg_name, &VS70::pcrtd__scalar_new_dbg, VS70::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS70::pcrtd__vector_new_dbg, VS70::crtd__vector_new_dbg, - "calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, - "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, - "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, - scalar_new_name, &VS70::pcrtd_scalar_new, VS70::crtd_scalar_new, - vector_new_name, &VS70::pcrtd_vector_new, VS70::crtd_vector_new, - NULL, NULL, NULL + "_calloc_dbg", &VS70::pcrtd__calloc_dbg, VS70::crtd__calloc_dbg, + "_malloc_dbg", &VS70::pcrtd__malloc_dbg, VS70::crtd__malloc_dbg, + "_realloc_dbg", &VS70::pcrtd__realloc_dbg, VS70::crtd__realloc_dbg, + scalar_new_dbg_name, &VS70::pcrtd__scalar_new_dbg, VS70::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS70::pcrtd__vector_new_dbg, VS70::crtd__vector_new_dbg, + "calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, + "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, + "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, + scalar_new_name, &VS70::pcrtd_scalar_new, VS70::crtd_scalar_new, + vector_new_name, &VS70::pcrtd_vector_new, VS70::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr71dPatch [] = { - "_calloc_dbg", &VS71::pcrtd__calloc_dbg, VS71::crtd__calloc_dbg, - "_malloc_dbg", &VS71::pcrtd__malloc_dbg, VS71::crtd__malloc_dbg, - "_realloc_dbg", &VS71::pcrtd__realloc_dbg, VS71::crtd__realloc_dbg, - scalar_new_dbg_name, &VS71::pcrtd__scalar_new_dbg, VS71::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS71::pcrtd__vector_new_dbg, VS71::crtd__vector_new_dbg, - "calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, - "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, - "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, - scalar_new_name, &VS71::pcrtd_scalar_new, VS71::crtd_scalar_new, - vector_new_name, &VS71::pcrtd_vector_new, VS71::crtd_vector_new, - NULL, NULL, NULL + "_calloc_dbg", &VS71::pcrtd__calloc_dbg, VS71::crtd__calloc_dbg, + "_malloc_dbg", &VS71::pcrtd__malloc_dbg, VS71::crtd__malloc_dbg, + "_realloc_dbg", &VS71::pcrtd__realloc_dbg, VS71::crtd__realloc_dbg, + scalar_new_dbg_name, &VS71::pcrtd__scalar_new_dbg, VS71::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS71::pcrtd__vector_new_dbg, VS71::crtd__vector_new_dbg, + "calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, + "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, + "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, + scalar_new_name, &VS71::pcrtd_scalar_new, VS71::crtd_scalar_new, + vector_new_name, &VS71::pcrtd_vector_new, VS71::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr80dPatch [] = { - "_calloc_dbg", &VS80::pcrtd__calloc_dbg, VS80::crtd__calloc_dbg, - "_malloc_dbg", &VS80::pcrtd__malloc_dbg, VS80::crtd__malloc_dbg, - "_realloc_dbg", &VS80::pcrtd__realloc_dbg, VS80::crtd__realloc_dbg, - scalar_new_dbg_name, &VS80::pcrtd__scalar_new_dbg, VS80::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS80::pcrtd__vector_new_dbg, VS80::crtd__vector_new_dbg, - "calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, - "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, - "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, - scalar_new_name, &VS80::pcrtd_scalar_new, VS80::crtd_scalar_new, - vector_new_name, &VS80::pcrtd_vector_new, VS80::crtd_vector_new, - "_aligned_malloc_dbg", &VS80::pcrtd__aligned_malloc_dbg, VS80::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS80::pcrtd__aligned_offset_malloc_dbg, VS80::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS80::pcrtd__aligned_realloc_dbg, VS80::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS80::pcrtd__aligned_offset_realloc_dbg, VS80::crtd__aligned_offset_realloc_dbg, - "_aligned_malloc", &VS80::pcrtd_aligned_malloc, VS80::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS80::pcrtd_aligned_offset_malloc, VS80::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS80::pcrtd_aligned_realloc, VS80::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS80::pcrtd_aligned_offset_realloc, VS80::crtd__aligned_offset_realloc, - NULL, NULL, NULL + "_calloc_dbg", &VS80::pcrtd__calloc_dbg, VS80::crtd__calloc_dbg, + "_malloc_dbg", &VS80::pcrtd__malloc_dbg, VS80::crtd__malloc_dbg, + "_realloc_dbg", &VS80::pcrtd__realloc_dbg, VS80::crtd__realloc_dbg, + scalar_new_dbg_name, &VS80::pcrtd__scalar_new_dbg, VS80::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS80::pcrtd__vector_new_dbg, VS80::crtd__vector_new_dbg, + "calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, + "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, + "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, + scalar_new_name, &VS80::pcrtd_scalar_new, VS80::crtd_scalar_new, + vector_new_name, &VS80::pcrtd_vector_new, VS80::crtd_vector_new, + "_aligned_malloc_dbg", &VS80::pcrtd__aligned_malloc_dbg, VS80::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS80::pcrtd__aligned_offset_malloc_dbg, VS80::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS80::pcrtd__aligned_realloc_dbg, VS80::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS80::pcrtd__aligned_offset_realloc_dbg, VS80::crtd__aligned_offset_realloc_dbg, + "_aligned_malloc", &VS80::pcrtd_aligned_malloc, VS80::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS80::pcrtd_aligned_offset_malloc, VS80::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS80::pcrtd_aligned_realloc, VS80::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS80::pcrtd_aligned_offset_realloc, VS80::crtd__aligned_offset_realloc, + NULL, NULL, NULL }; static patchentry_t msvcr90dPatch [] = { - "_calloc_dbg", &VS90::pcrtd__calloc_dbg, VS90::crtd__calloc_dbg, - "_malloc_dbg", &VS90::pcrtd__malloc_dbg, VS90::crtd__malloc_dbg, - "_realloc_dbg", &VS90::pcrtd__realloc_dbg, VS90::crtd__realloc_dbg, - "_recalloc_dbg", &VS90::pcrtd__recalloc_dbg, VS90::crtd__recalloc_dbg, - scalar_new_dbg_name, &VS90::pcrtd__scalar_new_dbg, VS90::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS90::pcrtd__vector_new_dbg, VS90::crtd__vector_new_dbg, - "calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, - "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, - "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, - "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, - scalar_new_name, &VS90::pcrtd_scalar_new, VS90::crtd_scalar_new, - vector_new_name, &VS90::pcrtd_vector_new, VS90::crtd_vector_new, - "_aligned_malloc_dbg", &VS90::pcrtd__aligned_malloc_dbg, VS90::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS90::pcrtd__aligned_offset_malloc_dbg, VS90::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS90::pcrtd__aligned_realloc_dbg, VS90::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS90::pcrtd__aligned_offset_realloc_dbg, VS90::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", &VS90::pcrtd__aligned_recalloc_dbg, VS90::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", &VS90::pcrtd__aligned_offset_recalloc_dbg, VS90::crtd__aligned_offset_recalloc_dbg, - "_aligned_malloc", &VS90::pcrtd_aligned_malloc, VS90::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS90::pcrtd_aligned_offset_malloc, VS90::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS90::pcrtd_aligned_realloc, VS90::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS90::pcrtd_aligned_offset_realloc, VS90::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS90::pcrtd_aligned_recalloc, VS90::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS90::pcrtd_aligned_offset_recalloc, VS90::crtd__aligned_offset_recalloc, - NULL, NULL, NULL + "_calloc_dbg", &VS90::pcrtd__calloc_dbg, VS90::crtd__calloc_dbg, + "_malloc_dbg", &VS90::pcrtd__malloc_dbg, VS90::crtd__malloc_dbg, + "_realloc_dbg", &VS90::pcrtd__realloc_dbg, VS90::crtd__realloc_dbg, + "_recalloc_dbg", &VS90::pcrtd__recalloc_dbg, VS90::crtd__recalloc_dbg, + scalar_new_dbg_name, &VS90::pcrtd__scalar_new_dbg, VS90::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS90::pcrtd__vector_new_dbg, VS90::crtd__vector_new_dbg, + "calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, + "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, + "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, + "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, + scalar_new_name, &VS90::pcrtd_scalar_new, VS90::crtd_scalar_new, + vector_new_name, &VS90::pcrtd_vector_new, VS90::crtd_vector_new, + "_aligned_malloc_dbg", &VS90::pcrtd__aligned_malloc_dbg, VS90::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS90::pcrtd__aligned_offset_malloc_dbg, VS90::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS90::pcrtd__aligned_realloc_dbg, VS90::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS90::pcrtd__aligned_offset_realloc_dbg, VS90::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS90::pcrtd__aligned_recalloc_dbg, VS90::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS90::pcrtd__aligned_offset_recalloc_dbg, VS90::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS90::pcrtd_aligned_malloc, VS90::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS90::pcrtd_aligned_offset_malloc, VS90::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS90::pcrtd_aligned_realloc, VS90::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS90::pcrtd_aligned_offset_realloc, VS90::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS90::pcrtd_aligned_recalloc, VS90::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS90::pcrtd_aligned_offset_recalloc, VS90::crtd__aligned_offset_recalloc, + NULL, NULL, NULL }; static patchentry_t msvcr100dPatch [] = { - "_calloc_dbg", &VS100::pcrtd__calloc_dbg, VS100::crtd__calloc_dbg, - "_malloc_dbg", &VS100::pcrtd__malloc_dbg, VS100::crtd__malloc_dbg, - "_realloc_dbg", &VS100::pcrtd__realloc_dbg, VS100::crtd__realloc_dbg, - "_recalloc_dbg", &VS100::pcrtd__recalloc_dbg, VS100::crtd__recalloc_dbg, - scalar_new_dbg_name, &VS100::pcrtd__scalar_new_dbg, VS100::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS100::pcrtd__vector_new_dbg, VS100::crtd__vector_new_dbg, - "calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, - "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, - "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, - "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, - scalar_new_name, &VS100::pcrtd_scalar_new, VS100::crtd_scalar_new, - vector_new_name, &VS100::pcrtd_vector_new, VS100::crtd_vector_new, - "_aligned_malloc_dbg", &VS100::pcrtd__aligned_malloc_dbg, VS100::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS100::pcrtd__aligned_offset_malloc_dbg, VS100::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS100::pcrtd__aligned_realloc_dbg, VS100::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS100::pcrtd__aligned_offset_realloc_dbg, VS100::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", &VS100::pcrtd__aligned_recalloc_dbg, VS100::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", &VS100::pcrtd__aligned_offset_recalloc_dbg, VS100::crtd__aligned_offset_recalloc_dbg, - "_aligned_malloc", &VS100::pcrtd_aligned_malloc, VS100::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS100::pcrtd_aligned_offset_malloc, VS100::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS100::pcrtd_aligned_realloc, VS100::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS100::pcrtd_aligned_offset_realloc, VS100::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS100::pcrtd_aligned_recalloc, VS100::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS100::pcrtd_aligned_offset_recalloc, VS100::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + "_calloc_dbg", &VS100::pcrtd__calloc_dbg, VS100::crtd__calloc_dbg, + "_malloc_dbg", &VS100::pcrtd__malloc_dbg, VS100::crtd__malloc_dbg, + "_realloc_dbg", &VS100::pcrtd__realloc_dbg, VS100::crtd__realloc_dbg, + "_recalloc_dbg", &VS100::pcrtd__recalloc_dbg, VS100::crtd__recalloc_dbg, + scalar_new_dbg_name, &VS100::pcrtd__scalar_new_dbg, VS100::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS100::pcrtd__vector_new_dbg, VS100::crtd__vector_new_dbg, + "calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, + "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, + "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, + "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, + scalar_new_name, &VS100::pcrtd_scalar_new, VS100::crtd_scalar_new, + vector_new_name, &VS100::pcrtd_vector_new, VS100::crtd_vector_new, + "_aligned_malloc_dbg", &VS100::pcrtd__aligned_malloc_dbg, VS100::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS100::pcrtd__aligned_offset_malloc_dbg, VS100::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS100::pcrtd__aligned_realloc_dbg, VS100::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS100::pcrtd__aligned_offset_realloc_dbg, VS100::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS100::pcrtd__aligned_recalloc_dbg, VS100::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS100::pcrtd__aligned_offset_recalloc_dbg, VS100::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS100::pcrtd_aligned_malloc, VS100::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS100::pcrtd_aligned_offset_malloc, VS100::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS100::pcrtd_aligned_realloc, VS100::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS100::pcrtd_aligned_offset_realloc, VS100::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS100::pcrtd_aligned_recalloc, VS100::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS100::pcrtd_aligned_offset_recalloc, VS100::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, }; patchentry_t VisualLeakDetector::m_ntdllPatch [] = { - "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, - "RtlFreeHeap", NULL, VisualLeakDetector::_RtlFreeHeap, - "RtlReAllocateHeap", NULL, VisualLeakDetector::_RtlReAllocateHeap, - NULL, NULL, NULL + "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, + "RtlFreeHeap", NULL, VisualLeakDetector::_RtlFreeHeap, + "RtlReAllocateHeap", NULL, VisualLeakDetector::_RtlReAllocateHeap, + NULL, NULL, NULL }; patchentry_t VisualLeakDetector::m_ole32Patch [] = { - "CoGetMalloc", NULL, VisualLeakDetector::_CoGetMalloc, - "CoTaskMemAlloc", NULL, VisualLeakDetector::_CoTaskMemAlloc, - "CoTaskMemRealloc", NULL, VisualLeakDetector::_CoTaskMemRealloc, - NULL, NULL, NULL + "CoGetMalloc", NULL, VisualLeakDetector::_CoGetMalloc, + "CoTaskMemAlloc", NULL, VisualLeakDetector::_CoTaskMemAlloc, + "CoTaskMemRealloc", NULL, VisualLeakDetector::_CoTaskMemRealloc, + NULL, NULL, NULL }; moduleentry_t VisualLeakDetector::m_patchtable [] = { - // Win32 heap APIs. - "kernel32.dll", 0x0, m_kernelbasePatch, // we patch this record on Win7 - "kernel32.dll", 0x0, m_kernel32Patch, - - // MFC new operators (exported by ordinal). - "mfc42d.dll", 0x0, mfc42dPatch, - "mfc42ud.dll", 0x0, mfc42udPatch, - "mfc70d.dll", 0x0, mfc70dPatch, - "mfc70ud.dll", 0x0, mfc70udPatch, - "mfc71d.dll", 0x0, mfc71dPatch, - "mfc71ud.dll", 0x0, mfc71udPatch, - "mfc80d.dll", 0x0, mfc80dPatch, - "mfc80ud.dll", 0x0, mfc80udPatch, - "mfc90d.dll", 0x0, mfc90dPatch, - "mfc90ud.dll", 0x0, mfc90udPatch, - "mfc100d.dll", 0x0, mfc100dPatch, - "mfc100ud.dll", 0x0, mfc100udPatch, - - // CRT new operators and heap APIs. - "msvcrtd.dll", 0x0, msvcrtdPatch, - "msvcr70d.dll", 0x0, msvcr70dPatch, - "msvcr71d.dll", 0x0, msvcr71dPatch, - "msvcr80d.dll", 0x0, msvcr80dPatch, - "msvcr90d.dll", 0x0, msvcr90dPatch, - "msvcr100d.dll",0x0, msvcr100dPatch, - - // NT APIs. - "ntdll.dll", 0x0, m_ntdllPatch, - - // COM heap APIs. - "ole32.dll", 0x0, m_ole32Patch + // Win32 heap APIs. + "kernel32.dll", 0x0, m_kernelbasePatch, // we patch this record on Win7 + "kernel32.dll", 0x0, m_kernel32Patch, + + // MFC new operators (exported by ordinal). + "mfc42d.dll", 0x0, mfc42dPatch, + "mfc42ud.dll", 0x0, mfc42udPatch, + "mfc70d.dll", 0x0, mfc70dPatch, + "mfc70ud.dll", 0x0, mfc70udPatch, + "mfc71d.dll", 0x0, mfc71dPatch, + "mfc71ud.dll", 0x0, mfc71udPatch, + "mfc80d.dll", 0x0, mfc80dPatch, + "mfc80ud.dll", 0x0, mfc80udPatch, + "mfc90d.dll", 0x0, mfc90dPatch, + "mfc90ud.dll", 0x0, mfc90udPatch, + "mfc100d.dll", 0x0, mfc100dPatch, + "mfc100ud.dll", 0x0, mfc100udPatch, + + // CRT new operators and heap APIs. + "msvcrtd.dll", 0x0, msvcrtdPatch, + "msvcr70d.dll", 0x0, msvcr70dPatch, + "msvcr71d.dll", 0x0, msvcr71dPatch, + "msvcr80d.dll", 0x0, msvcr80dPatch, + "msvcr90d.dll", 0x0, msvcr90dPatch, + "msvcr100d.dll",0x0, msvcr100dPatch, + + // NT APIs. + "ntdll.dll", 0x0, m_ntdllPatch, + + // COM heap APIs. + "ole32.dll", 0x0, m_ole32Patch }; BOOL IsWin7OrBetter() { - OSVERSIONINFOEX info = { sizeof(OSVERSIONINFOEX) }; - GetVersionEx((LPOSVERSIONINFO)&info); - if (info.dwMajorVersion > 6) - return TRUE; + OSVERSIONINFOEX info = { sizeof(OSVERSIONINFOEX) }; + GetVersionEx((LPOSVERSIONINFO)&info); + if (info.dwMajorVersion > 6) + return TRUE; - if (info.dwMajorVersion == 6 && info.dwMinorVersion >= 1) - return TRUE; + if (info.dwMajorVersion == 6 && info.dwMinorVersion >= 1) + return TRUE; - return FALSE; + return FALSE; } // Constructor - Initializes private data, loads configuration options, and @@ -392,163 +392,163 @@ BOOL IsWin7OrBetter() // VisualLeakDetector::VisualLeakDetector () { - _set_error_mode(_OUT_TO_STDERR); - - // Initialize configuration options and related private data. - _wcsnset_s(m_forcedmodulelist, MAXMODULELISTLENGTH, '\0', _TRUNCATE); - m_maxdatadump = 0xffffffff; - m_maxtraceframes = 0xffffffff; - m_options = 0x0; - m_reportfile = NULL; - wcsncpy_s(m_reportfilepath, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); - m_status = 0x0; - - // Load configuration options. - configure(); - if (m_options & VLD_OPT_VLDOFF) { - report(L"Visual Leak Detector is turned off.\n"); - return; - } - - HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); - HMODULE kernelBase = GetModuleHandleW(L"KernelBase.dll"); - HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); - - if (!IsWin7OrBetter()) // kernel32.dll - { - if (kernel32) - { - m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); - } - } - else - { - assert(m_patchtable[0].patchtable == m_kernelbasePatch); - m_patchtable[0].exportmodulename = "kernelbase.dll"; - if (kernelBase) - { - m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernelBase,"GetProcAddress"); - } - } - - // Initialize global variables. - currentprocess = GetCurrentProcess(); - currentthread = GetCurrentThread(); - imagelock.Initialize(); - processheap = GetProcessHeap(); - if (ntdll) - { - LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); - RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); - RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); - RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); - } - stackwalklock.Initialize(); - symbollock.Initialize(); - vldheap = HeapCreate(0x0, 0, 0); - vldheaplock.Initialize(); - - // Initialize remaining private data. - m_heapmap = new HeapMap; - m_heapmap->reserve(HEAPMAPRESERVE); - m_imalloc = NULL; - m_leaksfound = 0; - m_loadedmodules = NULL; - m_loaderlock.Initialize(); - m_maplock.Initialize(); - m_moduleslock.Initialize(); - m_selftestfile = __FILE__; - m_selftestline = 0; - m_tlsindex = TlsAlloc(); - m_tlslock.Initialize(); - m_tlsmap = new TlsMap; - - if (m_options & VLD_OPT_SELF_TEST) { - // Self-test mode has been enabled. Intentionally leak a small amount of - // memory so that memory leak self-checking can be verified. - if (m_options & VLD_OPT_UNICODE_REPORT) { - wcsncpy_s(new WCHAR [wcslen(SELFTESTTEXTW) + 1], wcslen(SELFTESTTEXTW) + 1, SELFTESTTEXTW, _TRUNCATE); - m_selftestline = __LINE__ - 1; - } - else { - strncpy_s(new CHAR [strlen(SELFTESTTEXTA) + 1], strlen(SELFTESTTEXTA) + 1, SELFTESTTEXTA, _TRUNCATE); - m_selftestline = __LINE__ - 1; - } - } - if (m_options & VLD_OPT_START_DISABLED) { - // Memory leak detection will initially be disabled. - m_status |= VLD_STATUS_NEVER_ENABLED; - } - if (m_options & VLD_OPT_REPORT_TO_FILE) { - SetupReporting(); - } - if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { - // Insert a slight delay between messages sent to the debugger for - // output. (For working around a bug in VC6 where data sent to the - // debugger gets lost if it's sent too fast). - insertreportdelay(); - } - - // This is highly unlikely to happen, but just in case, check to be sure - // we got a valid TLS index. - if (m_tlsindex == TLS_OUT_OF_INDEXES) { - report(L"ERROR: Visual Leak Detector could not be installed because thread local" - L" storage could not be allocated."); - return; - } - - // Initialize the symbol handler. We use it for obtaining source file/line - // number information and function names for the memory leak report. - LPWSTR symbolpath = buildsymbolsearchpath(); + _set_error_mode(_OUT_TO_STDERR); + + // Initialize configuration options and related private data. + _wcsnset_s(m_forcedmodulelist, MAXMODULELISTLENGTH, '\0', _TRUNCATE); + m_maxdatadump = 0xffffffff; + m_maxtraceframes = 0xffffffff; + m_options = 0x0; + m_reportfile = NULL; + wcsncpy_s(m_reportfilepath, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); + m_status = 0x0; + + // Load configuration options. + configure(); + if (m_options & VLD_OPT_VLDOFF) { + report(L"Visual Leak Detector is turned off.\n"); + return; + } + + HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); + HMODULE kernelBase = GetModuleHandleW(L"KernelBase.dll"); + HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); + + if (!IsWin7OrBetter()) // kernel32.dll + { + if (kernel32) + { + m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); + } + } + else + { + assert(m_patchtable[0].patchtable == m_kernelbasePatch); + m_patchtable[0].exportmodulename = "kernelbase.dll"; + if (kernelBase) + { + m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernelBase,"GetProcAddress"); + } + } + + // Initialize global variables. + g_currentprocess = GetCurrentProcess(); + g_currentthread = GetCurrentThread(); + g_imagelock.Initialize(); + g_processheap = GetProcessHeap(); + if (ntdll) + { + LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); + RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); + RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); + RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); + } + g_stackwalklock.Initialize(); + g_symbollock.Initialize(); + g_vldheap = HeapCreate(0x0, 0, 0); + g_vldheaplock.Initialize(); + + // Initialize remaining private data. + m_heapmap = new HeapMap; + m_heapmap->reserve(HEAPMAPRESERVE); + m_imalloc = NULL; + m_leaksfound = 0; + m_loadedmodules = NULL; + m_loaderlock.Initialize(); + m_maplock.Initialize(); + m_moduleslock.Initialize(); + m_selftestfile = __FILE__; + m_selftestline = 0; + m_tlsindex = TlsAlloc(); + m_tlslock.Initialize(); + m_tlsmap = new TlsMap; + + if (m_options & VLD_OPT_SELF_TEST) { + // Self-test mode has been enabled. Intentionally leak a small amount of + // memory so that memory leak self-checking can be verified. + if (m_options & VLD_OPT_UNICODE_REPORT) { + wcsncpy_s(new WCHAR [wcslen(SELFTESTTEXTW) + 1], wcslen(SELFTESTTEXTW) + 1, SELFTESTTEXTW, _TRUNCATE); + m_selftestline = __LINE__ - 1; + } + else { + strncpy_s(new CHAR [strlen(SELFTESTTEXTA) + 1], strlen(SELFTESTTEXTA) + 1, SELFTESTTEXTA, _TRUNCATE); + m_selftestline = __LINE__ - 1; + } + } + if (m_options & VLD_OPT_START_DISABLED) { + // Memory leak detection will initially be disabled. + m_status |= VLD_STATUS_NEVER_ENABLED; + } + if (m_options & VLD_OPT_REPORT_TO_FILE) { + SetupReporting(); + } + if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { + // Insert a slight delay between messages sent to the debugger for + // output. (For working around a bug in VC6 where data sent to the + // debugger gets lost if it's sent too fast). + insertreportdelay(); + } + + // This is highly unlikely to happen, but just in case, check to be sure + // we got a valid TLS index. + if (m_tlsindex == TLS_OUT_OF_INDEXES) { + report(L"ERROR: Visual Leak Detector could not be installed because thread local" + L" storage could not be allocated."); + return; + } + + // Initialize the symbol handler. We use it for obtaining source file/line + // number information and function names for the memory leak report. + LPWSTR symbolpath = buildsymbolsearchpath(); #ifdef NOISY_DBGHELP_DIAGOSTICS - // From MSDN docs about SYMOPT_DEBUG: - /* To view all attempts to load symbols, call SymSetOptions with SYMOPT_DEBUG. - This causes DbgHelp to call the OutputDebugString function with detailed - information on symbol searches, such as the directories it is searching and and error messages. - In other words, this will really pollute the debug output window with extra messages. - To enable this debug output to be displayed to the console without changing your source code, - set the DBGHELP_DBGOUT environment variable to a non-NULL value before calling the SymInitialize function. - To log the information to a file, set the DBGHELP_LOG environment variable to the name of the log file to be used. - */ - SymSetOptions(SYMOPT_DEBUG | SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); + // From MSDN docs about SYMOPT_DEBUG: + /* To view all attempts to load symbols, call SymSetOptions with SYMOPT_DEBUG. + This causes DbgHelp to call the OutputDebugString function with detailed + information on symbol searches, such as the directories it is searching and and error messages. + In other words, this will really pollute the debug output window with extra messages. + To enable this debug output to be displayed to the console without changing your source code, + set the DBGHELP_DBGOUT environment variable to a non-NULL value before calling the SymInitialize function. + To log the information to a file, set the DBGHELP_LOG environment variable to the name of the log file to be used. + */ + SymSetOptions(SYMOPT_DEBUG | SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); #else - SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); + SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); #endif - if (!SymInitializeW(currentprocess, symbolpath, FALSE)) { - report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" - L" File and function names will probably not be available in call stacks.\n", GetLastError()); - } - delete [] symbolpath; - - patchentry_t ntdllPatch [] = { - "LdrLoadDll", NULL, _LdrLoadDll, - NULL, NULL, NULL - }; - moduleentry_t ldrLoadDllPatch [] = { - "ntdll.dll", (UINT_PTR)ntdll, ntdllPatch, - }; - patchimport(kernel32, ldrLoadDllPatch); - if (kernelBase != NULL) - patchimport(kernelBase, ldrLoadDllPatch); - - // Attach Visual Leak Detector to every module loaded in the process. - ModuleSet* newmodules = new ModuleSet(); - newmodules->reserve(MODULESETRESERVE); - EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); - attachtoloadedmodules(newmodules); - m_loadedmodules = newmodules; - m_status |= VLD_STATUS_INSTALLED; - - report(L"Visual Leak Detector Version " VLDVERSION L" installed.\n"); - if (m_status & VLD_STATUS_FORCE_REPORT_TO_FILE) { - // The report is being forced to a file. Let the human know why. - report(L"NOTE: Visual Leak Detector: Unicode-encoded reporting has been enabled, but the\n" - L" debugger is the only selected report destination. The debugger cannot display\n" - L" Unicode characters, so the report will also be sent to a file. If no file has\n" - L" been specified, the default file name is \"" VLD_DEFAULT_REPORT_FILE_NAME L"\".\n"); - - } - reportconfig(); + if (!SymInitializeW(g_currentprocess, symbolpath, FALSE)) { + report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" + L" File and function names will probably not be available in call stacks.\n", GetLastError()); + } + delete [] symbolpath; + + patchentry_t ntdllPatch [] = { + "LdrLoadDll", NULL, _LdrLoadDll, + NULL, NULL, NULL + }; + moduleentry_t ldrLoadDllPatch [] = { + "ntdll.dll", (UINT_PTR)ntdll, ntdllPatch, + }; + patchimport(kernel32, ldrLoadDllPatch); + if (kernelBase != NULL) + patchimport(kernelBase, ldrLoadDllPatch); + + // Attach Visual Leak Detector to every module loaded in the process. + ModuleSet* newmodules = new ModuleSet(); + newmodules->reserve(MODULESETRESERVE); + EnumerateLoadedModulesW64(g_currentprocess, addloadedmodule, newmodules); + attachtoloadedmodules(newmodules); + m_loadedmodules = newmodules; + m_status |= VLD_STATUS_INSTALLED; + + report(L"Visual Leak Detector Version " VLDVERSION L" installed.\n"); + if (m_status & VLD_STATUS_FORCE_REPORT_TO_FILE) { + // The report is being forced to a file. Let the human know why. + report(L"NOTE: Visual Leak Detector: Unicode-encoded reporting has been enabled, but the\n" + L" debugger is the only selected report destination. The debugger cannot display\n" + L" Unicode characters, so the report will also be sent to a file. If no file has\n" + L" been specified, the default file name is \"" VLD_DEFAULT_REPORT_FILE_NAME L"\".\n"); + + } + reportconfig(); } // Destructor - Detaches Visual Leak Detector from all modules loaded in the @@ -557,170 +557,170 @@ VisualLeakDetector::VisualLeakDetector () // VisualLeakDetector::~VisualLeakDetector () { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - size_t count; - SIZE_T internalleaks = 0; - WCHAR leakfilew [MAX_PATH]; - BOOL threadsactive = FALSE; - if (m_status & VLD_STATUS_INSTALLED) { - // Detach Visual Leak Detector from all previously attached modules. - EnumerateLoadedModulesW64(currentprocess, detachfrommodule, NULL); - - DWORD dwCurProcessID = GetCurrentProcessId(); - - // See if any threads that have ever entered VLD's code are still active. - m_tlslock.Enter(); - for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - if ((*tlsit).second->threadid == GetCurrentThreadId()) { - // Don't wait for the current thread to exit. - continue; - } - - HANDLE thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit).second->threadid); - if (thread == NULL) { - // Couldn't query this thread. We'll assume that it exited. - continue; // XXX should we check GetLastError()? - } - if (GetProcessIdOfThread(thread) != dwCurProcessID) { - //The thread ID has been recycled. - CloseHandle(thread); - continue; - } - while (WaitForSingleObject(thread, 10000) == WAIT_TIMEOUT) { // 10 seconds - // There is still at least one other thread running. The CRT - // will stomp it dead when it cleans up, which is not a - // graceful way for a thread to go down. Warn about this, - // and wait until the thread has exited so that we know it - // can't still be off running somewhere in VLD's code. - // - // Since we've been waiting a while, let the human know we are - // still here and alive. - threadsactive = TRUE; - report(L"Visual Leak Detector: Waiting for threads to terminate...\n"); - } - CloseHandle(thread); - } - m_tlslock.Leave(); - - if (m_status & VLD_STATUS_NEVER_ENABLED) { - // Visual Leak Detector started with leak detection disabled and - // it was never enabled at runtime. A lot of good that does. - report(L"WARNING: Visual Leak Detector: Memory leak detection was never enabled.\n"); - } - else { - // Generate a memory leak report for each heap in the process. - SIZE_T leaks_count = ReportLeaks(); - - // Show a summary. - if (m_leaksfound == 0) { - report(L"No memory leaks detected.\n"); - } - else { - assert(m_leaksfound == leaks_count); - report(L"Visual Leak Detector detected %Iu memory leak", m_leaksfound); - report((m_leaksfound > 1) ? L"s.\n" : L".\n"); - } - } - - // Free resources used by the symbol handler. - if (!SymCleanup(currentprocess)) { - report(L"WARNING: Visual Leak Detector: The symbol handler failed to deallocate resources (error=%lu).\n", - GetLastError()); - } - - // Free internally allocated resources used by the heapmap and blockmap. - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - BlockMap *blockmap = &(*heapit).second->blockmap; - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callstack; - delete (*blockit).second; - } - delete blockmap; - } - delete m_heapmap; - - // Free internally allocated resources used by the loaded module set. - for (ModuleSet::Iterator moduleit = m_loadedmodules->begin(); moduleit != m_loadedmodules->end(); ++moduleit) { - delete [] (*moduleit).name; - delete [] (*moduleit).path; - } - delete m_loadedmodules; - - // Free internally allocated resources used for thread local storage. - for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - delete (*tlsit).second; - } - delete m_tlsmap; - - const char* leakfile = NULL; - int leakline = 0; - - // Do a memory leak self-check. - vldblockheader_t *header = vldblocklist; - while (header) { - // Doh! VLD still has an internally allocated block! - // This won't ever actually happen, right guys?... guys? - internalleaks++; - leakfile = header->file; - leakline = header->line; - mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); - report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); - report(L"---------- Block %Iu at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, VLDBLOCKDATA(header), header->size); - report(L" Call Stack:\n"); - report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); - if (m_maxdatadump != 0) { - report(L" Data:\n"); - if (m_options & VLD_OPT_UNICODE_REPORT) { - dumpmemoryw(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); - } - else { - dumpmemorya(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); - } - } - report(L"\n"); - header = header->next; - } - if (m_options & VLD_OPT_SELF_TEST) { - if ((internalleaks == 1) && (strcmp(leakfile, m_selftestfile) == 0) && (leakline == m_selftestline)) { - report(L"Visual Leak Detector passed the memory leak self-test.\n"); - } - else { - report(L"ERROR: Visual Leak Detector: Failed the memory leak self-test.\n"); - } - } - - if (threadsactive == TRUE) { - report(L"WARNING: Visual Leak Detector: Some threads appear to have not terminated normally.\n" - L" This could cause inaccurate leak detection results, including false positives.\n"); - } - report(L"Visual Leak Detector is now exiting.\n"); - } - else { - // VLD failed to load properly. - delete m_heapmap; - delete m_tlsmap; - } - HeapDestroy(vldheap); - - imagelock.Delete(); - m_loaderlock.Delete(); - m_maplock.Delete(); - m_moduleslock.Delete(); - stackwalklock.Delete(); - symbollock.Delete(); - vldheaplock.Delete(); - - if (m_tlsindex != TLS_OUT_OF_INDEXES) { - TlsFree(m_tlsindex); - } - - if (m_reportfile != NULL) { - fclose(m_reportfile); - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + size_t count; + SIZE_T internalleaks = 0; + WCHAR leakfilew [MAX_PATH]; + BOOL threadsactive = FALSE; + if (m_status & VLD_STATUS_INSTALLED) { + // Detach Visual Leak Detector from all previously attached modules. + EnumerateLoadedModulesW64(g_currentprocess, detachfrommodule, NULL); + + DWORD dwCurProcessID = GetCurrentProcessId(); + + // See if any threads that have ever entered VLD's code are still active. + m_tlslock.Enter(); + for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + if ((*tlsit).second->threadid == GetCurrentThreadId()) { + // Don't wait for the current thread to exit. + continue; + } + + HANDLE thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit).second->threadid); + if (thread == NULL) { + // Couldn't query this thread. We'll assume that it exited. + continue; // XXX should we check GetLastError()? + } + if (GetProcessIdOfThread(thread) != dwCurProcessID) { + //The thread ID has been recycled. + CloseHandle(thread); + continue; + } + while (WaitForSingleObject(thread, 10000) == WAIT_TIMEOUT) { // 10 seconds + // There is still at least one other thread running. The CRT + // will stomp it dead when it cleans up, which is not a + // graceful way for a thread to go down. Warn about this, + // and wait until the thread has exited so that we know it + // can't still be off running somewhere in VLD's code. + // + // Since we've been waiting a while, let the human know we are + // still here and alive. + threadsactive = TRUE; + report(L"Visual Leak Detector: Waiting for threads to terminate...\n"); + } + CloseHandle(thread); + } + m_tlslock.Leave(); + + if (m_status & VLD_STATUS_NEVER_ENABLED) { + // Visual Leak Detector started with leak detection disabled and + // it was never enabled at runtime. A lot of good that does. + report(L"WARNING: Visual Leak Detector: Memory leak detection was never enabled.\n"); + } + else { + // Generate a memory leak report for each heap in the process. + SIZE_T leaks_count = ReportLeaks(); + + // Show a summary. + if (m_leaksfound == 0) { + report(L"No memory leaks detected.\n"); + } + else { + assert(m_leaksfound == leaks_count); + report(L"Visual Leak Detector detected %Iu memory leak", m_leaksfound); + report((m_leaksfound > 1) ? L"s.\n" : L".\n"); + } + } + + // Free resources used by the symbol handler. + if (!SymCleanup(g_currentprocess)) { + report(L"WARNING: Visual Leak Detector: The symbol handler failed to deallocate resources (error=%lu).\n", + GetLastError()); + } + + // Free internally allocated resources used by the heapmap and blockmap. + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + BlockMap *blockmap = &(*heapit).second->blockmap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + delete (*blockit).second->callstack; + delete (*blockit).second; + } + delete blockmap; + } + delete m_heapmap; + + // Free internally allocated resources used by the loaded module set. + for (ModuleSet::Iterator moduleit = m_loadedmodules->begin(); moduleit != m_loadedmodules->end(); ++moduleit) { + delete [] (*moduleit).name; + delete [] (*moduleit).path; + } + delete m_loadedmodules; + + // Free internally allocated resources used for thread local storage. + for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + delete (*tlsit).second; + } + delete m_tlsmap; + + const char* leakfile = NULL; + int leakline = 0; + + // Do a memory leak self-check. + vldblockheader_t *header = g_vldblocklist; + while (header) { + // Doh! VLD still has an internally allocated block! + // This won't ever actually happen, right guys?... guys? + internalleaks++; + leakfile = header->file; + leakline = header->line; + mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); + report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); + report(L"---------- Block %Iu at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, VLDBLOCKDATA(header), header->size); + report(L" Call Stack:\n"); + report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); + if (m_maxdatadump != 0) { + report(L" Data:\n"); + if (m_options & VLD_OPT_UNICODE_REPORT) { + dumpmemoryw(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); + } + else { + dumpmemorya(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); + } + } + report(L"\n"); + header = header->next; + } + if (m_options & VLD_OPT_SELF_TEST) { + if ((internalleaks == 1) && (strcmp(leakfile, m_selftestfile) == 0) && (leakline == m_selftestline)) { + report(L"Visual Leak Detector passed the memory leak self-test.\n"); + } + else { + report(L"ERROR: Visual Leak Detector: Failed the memory leak self-test.\n"); + } + } + + if (threadsactive == TRUE) { + report(L"WARNING: Visual Leak Detector: Some threads appear to have not terminated normally.\n" + L" This could cause inaccurate leak detection results, including false positives.\n"); + } + report(L"Visual Leak Detector is now exiting.\n"); + } + else { + // VLD failed to load properly. + delete m_heapmap; + delete m_tlsmap; + } + HeapDestroy(g_vldheap); + + g_imagelock.Delete(); + m_loaderlock.Delete(); + m_maplock.Delete(); + m_moduleslock.Delete(); + g_stackwalklock.Delete(); + g_symbollock.Delete(); + g_vldheaplock.Delete(); + + if (m_tlsindex != TLS_OUT_OF_INDEXES) { + TlsFree(m_tlsindex); + } + + if (m_reportfile != NULL) { + fclose(m_reportfile); + } } @@ -749,112 +749,112 @@ VisualLeakDetector::~VisualLeakDetector () // VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) { - ModuleSet::Muterator updateit; - - // Iterate through the supplied set, until all modules have been attached. - for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { - DWORD64 modulebase = (DWORD64)(*newit).addrlow; - UINT32 moduleflags = 0x0; - LPCSTR modulename = (*newit).name; - LPCSTR modulepath = (*newit).path; - DWORD modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; - - bool refresh = false; - bool moduleLoaded = false; - m_moduleslock.Enter(); - ModuleSet* oldmodules = m_loadedmodules; - if (oldmodules != NULL) { - // This is not the first time we have been called to attach to the - // currently loaded modules. - ModuleSet::Iterator oldit = oldmodules->find(*newit); - if (oldit != oldmodules->end()) { - moduleLoaded = true; - moduleflags = (*oldit).flags; - } - } - m_moduleslock.Leave(); - - if (moduleLoaded) // We've seen this "new" module loaded in the process before. - { - if (moduleispatched((HMODULE)modulebase, m_patchtable, _countof(m_patchtable))) - { - // This module is already attached. Just update the module's - // flags, nothing more. - updateit = newit; - (*updateit).flags = moduleflags; - continue; - } - else { - // This module may have been attached before and has been - // detached. We'll need to try reattaching to it in case it - // was unloaded and then subsequently reloaded. - refresh = true; - } - } - - if ((refresh == true) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { - // Discard the previously loaded symbols, so we can refresh them. - CriticalSectionLocker cs(m_maplock); - symbollock.Enter(); - if (SymUnloadModule64(currentprocess, modulebase) == false) { - report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" - L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); - } - symbollock.Leave(); - } - - symbollock.Enter(); - // Try to load the module's symbols. This ensures that we have loaded - // the symbols for every module that has ever been loaded into the - // process, guaranteeing the symbols' availability when generating the - // leak report. - IMAGEHLP_MODULE64 moduleimageinfo; - moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); - BOOL SymbolsLoaded = SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo); - if (!SymbolsLoaded) - { - DWORD64 module = SymLoadModule64(currentprocess, NULL, modulepath, NULL, modulebase, modulesize); - if (module == modulebase) - SymbolsLoaded = SymGetModuleInfoW64(currentprocess, modulebase, &moduleimageinfo); - } - if (SymbolsLoaded) - moduleflags |= VLD_MODULE_SYMBOLSLOADED; - symbollock.Leave(); - - if (_stricmp(VLDDLL, modulename) == 0) { - // What happens when a module goes through it's own portal? Bad things. - // Like infinite recursion. And ugly bald men wearing dresses. VLD - // should not, therefore, attach to itself. - continue; - } - - size_t count; + ModuleSet::Muterator updateit; + + // Iterate through the supplied set, until all modules have been attached. + for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { + DWORD64 modulebase = (DWORD64)(*newit).addrlow; + UINT32 moduleflags = 0x0; + LPCSTR modulename = (*newit).name; + LPCSTR modulepath = (*newit).path; + DWORD modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; + + bool refresh = false; + bool moduleLoaded = false; + m_moduleslock.Enter(); + ModuleSet* oldmodules = m_loadedmodules; + if (oldmodules != NULL) { + // This is not the first time we have been called to attach to the + // currently loaded modules. + ModuleSet::Iterator oldit = oldmodules->find(*newit); + if (oldit != oldmodules->end()) { + moduleLoaded = true; + moduleflags = (*oldit).flags; + } + } + m_moduleslock.Leave(); + + if (moduleLoaded) // We've seen this "new" module loaded in the process before. + { + if (moduleispatched((HMODULE)modulebase, m_patchtable, _countof(m_patchtable))) + { + // This module is already attached. Just update the module's + // flags, nothing more. + updateit = newit; + (*updateit).flags = moduleflags; + continue; + } + else { + // This module may have been attached before and has been + // detached. We'll need to try reattaching to it in case it + // was unloaded and then subsequently reloaded. + refresh = true; + } + } + + if ((refresh == true) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { + // Discard the previously loaded symbols, so we can refresh them. + CriticalSectionLocker cs(m_maplock); + g_symbollock.Enter(); + if (SymUnloadModule64(g_currentprocess, modulebase) == false) { + report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" + L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); + } + g_symbollock.Leave(); + } + + g_symbollock.Enter(); + // Try to load the module's symbols. This ensures that we have loaded + // the symbols for every module that has ever been loaded into the + // process, guaranteeing the symbols' availability when generating the + // leak report. + IMAGEHLP_MODULE64 moduleimageinfo; + moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); + BOOL SymbolsLoaded = SymGetModuleInfoW64(g_currentprocess, modulebase, &moduleimageinfo); + if (!SymbolsLoaded) + { + DWORD64 module = SymLoadModule64(g_currentprocess, NULL, modulepath, NULL, modulebase, modulesize); + if (module == modulebase) + SymbolsLoaded = SymGetModuleInfoW64(g_currentprocess, modulebase, &moduleimageinfo); + } + if (SymbolsLoaded) + moduleflags |= VLD_MODULE_SYMBOLSLOADED; + g_symbollock.Leave(); + + if (_stricmp(VLDDLL, modulename) == 0) { + // What happens when a module goes through it's own portal? Bad things. + // Like infinite recursion. And ugly bald men wearing dresses. VLD + // should not, therefore, attach to itself. + continue; + } + + size_t count; #define MAXMODULENAME (_MAX_FNAME + _MAX_EXT) - WCHAR modulenamew [MAXMODULENAME]; - mbstowcs_s(&count, modulenamew, MAXMODULENAME, modulename, _TRUNCATE); - if ((findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A") == FALSE) && - (wcsstr(vld.m_forcedmodulelist, modulenamew) == NULL)) { - // This module does not import VLD. This means that none of the module's - // sources #included vld.h. Exclude this module from leak detection. - moduleflags |= VLD_MODULE_EXCLUDED; - } - else if (!(moduleflags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { - // This module is going to be included in leak detection, but complete - // symbols for this module couldn't be loaded. This means that any stack - // traces through this module may lack information, like line numbers - // and function names. - report(L"WARNING: Visual Leak Detector: A module, %s, included in memory leak detection\n" - L" does not have any debugging symbols available, or they could not be located.\n" - L" Function names and/or line numbers for this module may not be available.\n", modulename); - } - - // Update the module's flags in the "new modules" set. - updateit = newit; - (*updateit).flags = moduleflags; - - // Attach to the module. - patchmodule((HMODULE)modulebase, m_patchtable, _countof(m_patchtable)); - } + WCHAR modulenamew [MAXMODULENAME]; + mbstowcs_s(&count, modulenamew, MAXMODULENAME, modulename, _TRUNCATE); + if ((findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A") == FALSE) && + (wcsstr(vld.m_forcedmodulelist, modulenamew) == NULL)) { + // This module does not import VLD. This means that none of the module's + // sources #included vld.h. Exclude this module from leak detection. + moduleflags |= VLD_MODULE_EXCLUDED; + } + else if (!(moduleflags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { + // This module is going to be included in leak detection, but complete + // symbols for this module couldn't be loaded. This means that any stack + // traces through this module may lack information, like line numbers + // and function names. + report(L"WARNING: Visual Leak Detector: A module, %s, included in memory leak detection\n" + L" does not have any debugging symbols available, or they could not be located.\n" + L" Function names and/or line numbers for this module may not be available.\n", modulename); + } + + // Update the module's flags in the "new modules" set. + updateit = newit; + (*updateit).flags = moduleflags; + + // Attach to the module. + patchmodule((HMODULE)modulebase, m_patchtable, _countof(m_patchtable)); + } } // buildsymbolsearchpath - Builds the symbol search path for the symbol handler. @@ -868,99 +868,99 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // LPWSTR VisualLeakDetector::buildsymbolsearchpath () { - // Oddly, the symbol handler ignores the link to the PDB embedded in the - // executable image. So, we'll manually add the location of the executable - // to the search path since that is often where the PDB will be located. - WCHAR directory [_MAX_DIR] = {0}; - WCHAR drive [_MAX_DRIVE] = {0}; - LPWSTR path = new WCHAR [MAX_PATH]; - path[0] = L'\0'; - - HMODULE module = GetModuleHandleW(NULL); - GetModuleFileName(module, path, MAX_PATH); - _wsplitpath_s(path, drive, _MAX_DRIVE, directory, _MAX_DIR, NULL, 0, NULL, 0); - wcsncpy_s(path, MAX_PATH, drive, _TRUNCATE); - path = AppendString(path, directory); - - // When the symbol handler is given a custom symbol search path, it will no - // longer search the default directories (working directory, system root, - // etc). But we'd like it to still search those directories, so we'll add - // them to our custom search path. - // - // Append the working directory. - path = AppendString(path, L";.\\"); - - // Append the Windows directory. - WCHAR windows [MAX_PATH] = {0}; - if (GetWindowsDirectory(windows, MAX_PATH) != 0) { - path = AppendString(path, L";"); - path = AppendString(path, windows); - } - - // Append the system directory. - WCHAR system [MAX_PATH] = {0}; - if (GetSystemDirectory(system, MAX_PATH) != 0) { - path = AppendString(path, L";"); - path = AppendString(path, system); - } - - // Append %_NT_SYMBOL_PATH%. - DWORD envlen = GetEnvironmentVariable(L"_NT_SYMBOL_PATH", NULL, 0); - if (envlen != 0) { - LPWSTR env = new WCHAR [envlen]; - if (GetEnvironmentVariable(L"_NT_SYMBOL_PATH", env, envlen) != 0) { - path = AppendString(path, L";"); - path = AppendString(path, env); - } - delete [] env; - } - - // Append %_NT_ALT_SYMBOL_PATH%. - envlen = GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", NULL, 0); - if (envlen != 0) { - LPWSTR env = new WCHAR [envlen]; - if (GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", env, envlen) != 0) { - path = AppendString(path, L";"); - path = AppendString(path, env); - } - delete [] env; - } - - // Append Visual Studio 2010/2008 symbols cache directory. - HKEY debuggerkey; - WCHAR symbolCacheDir [MAX_PATH] = {0}; - LSTATUS regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\10.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); - if (regstatus != ERROR_SUCCESS) - regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\9.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); - - if (regstatus == ERROR_SUCCESS) - { - DWORD valuetype; - DWORD dirLength = MAX_PATH * sizeof(WCHAR); - regstatus = RegQueryValueEx(debuggerkey, L"SymbolCacheDir", NULL, &valuetype, (LPBYTE)&symbolCacheDir, &dirLength); - if (regstatus == ERROR_SUCCESS && valuetype == REG_SZ) - { - path = AppendString(path, L";srv*"); - path = AppendString(path, symbolCacheDir); - path = AppendString(path, L"\\MicrosoftPublicSymbols;srv*"); - path = AppendString(path, symbolCacheDir); - } - RegCloseKey(debuggerkey); - } - - // Remove any quotes from the path. The symbol handler doesn't like them. - SIZE_T pos = 0; - SIZE_T length = wcslen(path); - while (pos < length) { - if (path[pos] == L'\"') { - for (SIZE_T index = pos; index < length; index++) { - path[index] = path[index + 1]; - } - } - pos++; - } - - return path; + // Oddly, the symbol handler ignores the link to the PDB embedded in the + // executable image. So, we'll manually add the location of the executable + // to the search path since that is often where the PDB will be located. + WCHAR directory [_MAX_DIR] = {0}; + WCHAR drive [_MAX_DRIVE] = {0}; + LPWSTR path = new WCHAR [MAX_PATH]; + path[0] = L'\0'; + + HMODULE module = GetModuleHandleW(NULL); + GetModuleFileName(module, path, MAX_PATH); + _wsplitpath_s(path, drive, _MAX_DRIVE, directory, _MAX_DIR, NULL, 0, NULL, 0); + wcsncpy_s(path, MAX_PATH, drive, _TRUNCATE); + path = AppendString(path, directory); + + // When the symbol handler is given a custom symbol search path, it will no + // longer search the default directories (working directory, system root, + // etc). But we'd like it to still search those directories, so we'll add + // them to our custom search path. + // + // Append the working directory. + path = AppendString(path, L";.\\"); + + // Append the Windows directory. + WCHAR windows [MAX_PATH] = {0}; + if (GetWindowsDirectory(windows, MAX_PATH) != 0) { + path = AppendString(path, L";"); + path = AppendString(path, windows); + } + + // Append the system directory. + WCHAR system [MAX_PATH] = {0}; + if (GetSystemDirectory(system, MAX_PATH) != 0) { + path = AppendString(path, L";"); + path = AppendString(path, system); + } + + // Append %_NT_SYMBOL_PATH%. + DWORD envlen = GetEnvironmentVariable(L"_NT_SYMBOL_PATH", NULL, 0); + if (envlen != 0) { + LPWSTR env = new WCHAR [envlen]; + if (GetEnvironmentVariable(L"_NT_SYMBOL_PATH", env, envlen) != 0) { + path = AppendString(path, L";"); + path = AppendString(path, env); + } + delete [] env; + } + + // Append %_NT_ALT_SYMBOL_PATH%. + envlen = GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", NULL, 0); + if (envlen != 0) { + LPWSTR env = new WCHAR [envlen]; + if (GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", env, envlen) != 0) { + path = AppendString(path, L";"); + path = AppendString(path, env); + } + delete [] env; + } + + // Append Visual Studio 2010/2008 symbols cache directory. + HKEY debuggerkey; + WCHAR symbolCacheDir [MAX_PATH] = {0}; + LSTATUS regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\10.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); + if (regstatus != ERROR_SUCCESS) + regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\9.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); + + if (regstatus == ERROR_SUCCESS) + { + DWORD valuetype; + DWORD dirLength = MAX_PATH * sizeof(WCHAR); + regstatus = RegQueryValueEx(debuggerkey, L"SymbolCacheDir", NULL, &valuetype, (LPBYTE)&symbolCacheDir, &dirLength); + if (regstatus == ERROR_SUCCESS && valuetype == REG_SZ) + { + path = AppendString(path, L";srv*"); + path = AppendString(path, symbolCacheDir); + path = AppendString(path, L"\\MicrosoftPublicSymbols;srv*"); + path = AppendString(path, symbolCacheDir); + } + RegCloseKey(debuggerkey); + } + + // Remove any quotes from the path. The symbol handler doesn't like them. + SIZE_T pos = 0; + SIZE_T length = wcslen(path); + while (pos < length) { + if (path[pos] == L'\"') { + for (SIZE_T index = pos; index < length; index++) { + path[index] = path[index + 1]; + } + } + pos++; + } + + return path; } // configure - Configures VLD using values read from the vld.ini file. @@ -971,146 +971,146 @@ LPWSTR VisualLeakDetector::buildsymbolsearchpath () // VOID VisualLeakDetector::configure () { - WCHAR inipath [MAX_PATH] = {0}; - struct _stat s; - if (_wstat(L".\\vld.ini", &s) == 0) { - // Found a copy of vld.ini in the working directory. Use it. - wcsncpy_s(inipath, MAX_PATH, L".\\vld.ini", _TRUNCATE); - } - else { - BOOL keyopen = FALSE; - HKEY productkey = 0; - DWORD length = 0; - DWORD valuetype = 0; - - // Get the location of the vld.ini file from the registry. - LONG regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); - if (regstatus == ERROR_SUCCESS) { - keyopen = TRUE; - length = MAX_PATH * sizeof(WCHAR); - regstatus = RegQueryValueExW(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); - } - if (keyopen) { - RegCloseKey(productkey); - } - - if (!keyopen) - { - // Get the location of the vld.ini file from the registry. - regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); - if (regstatus == ERROR_SUCCESS) { - keyopen = TRUE; - length = MAX_PATH * sizeof(WCHAR); - regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); - } - if (keyopen) { - RegCloseKey(productkey); - } - } - - if ((regstatus != ERROR_SUCCESS) || (_wstat(inipath, &s) != 0)) { - // The location of vld.ini could not be read from the registry. As a - // last resort, look in the Windows directory. - wcsncpy_s(inipath, MAX_PATH, L"vld.ini", _TRUNCATE); - } - } + WCHAR inipath [MAX_PATH] = {0}; + struct _stat s; + if (_wstat(L".\\vld.ini", &s) == 0) { + // Found a copy of vld.ini in the working directory. Use it. + wcsncpy_s(inipath, MAX_PATH, L".\\vld.ini", _TRUNCATE); + } + else { + BOOL keyopen = FALSE; + HKEY productkey = 0; + DWORD length = 0; + DWORD valuetype = 0; + + // Get the location of the vld.ini file from the registry. + LONG regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + if (regstatus == ERROR_SUCCESS) { + keyopen = TRUE; + length = MAX_PATH * sizeof(WCHAR); + regstatus = RegQueryValueExW(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); + } + if (keyopen) { + RegCloseKey(productkey); + } + + if (!keyopen) + { + // Get the location of the vld.ini file from the registry. + regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + if (regstatus == ERROR_SUCCESS) { + keyopen = TRUE; + length = MAX_PATH * sizeof(WCHAR); + regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); + } + if (keyopen) { + RegCloseKey(productkey); + } + } + + if ((regstatus != ERROR_SUCCESS) || (_wstat(inipath, &s) != 0)) { + // The location of vld.ini could not be read from the registry. As a + // last resort, look in the Windows directory. + wcsncpy_s(inipath, MAX_PATH, L"vld.ini", _TRUNCATE); + } + } #define BSIZE 64 - WCHAR buffer [BSIZE] = {0}; - // Read the boolean options. - GetPrivateProfileString(L"Options", L"VLD", L"on", buffer, BSIZE, inipath); - if (strtobool(buffer) == FALSE) { - m_options |= VLD_OPT_VLDOFF; - return; - } - - GetPrivateProfileString(L"Options", L"AggregateDuplicates", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_AGGREGATE_DUPLICATES; - } - - GetPrivateProfileString(L"Options", L"SelfTest", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_SELF_TEST; - } - - GetPrivateProfileString(L"Options", L"SlowDebuggerDump", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_SLOW_DEBUGGER_DUMP; - } - - GetPrivateProfileString(L"Options", L"StartDisabled", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_START_DISABLED; - } - - GetPrivateProfileString(L"Options", L"TraceInternalFrames", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_TRACE_INTERNAL_FRAMES; - } - - GetPrivateProfileString(L"Options", L"SkipHeapFreeLeaks", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_SKIP_HEAPFREE_LEAKS; - } - - // Read the integer configuration options. - m_maxdatadump = GetPrivateProfileInt(L"Options", L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); - m_maxtraceframes = GetPrivateProfileInt(L"Options", L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); - if (m_maxtraceframes < 1) { - m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; - } - - // Read the force-include module list. - GetPrivateProfileString(L"Options", L"ForceIncludeModules", L"", m_forcedmodulelist, MAXMODULELISTLENGTH, inipath); - _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); - - // Read the report destination (debugger, file, or both). - WCHAR filename [MAX_PATH] = {0}; - GetPrivateProfileString(L"Options", L"ReportFile", L"", filename, MAX_PATH, inipath); - if (wcslen(filename) == 0) { - wcsncpy_s(filename, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); - } - WCHAR* path = _wfullpath(m_reportfilepath, filename, MAX_PATH); - assert(path); - - GetPrivateProfileString(L"Options", L"ReportTo", L"", buffer, BSIZE, inipath); - if (_wcsicmp(buffer, L"both") == 0) { - m_options |= (VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE); - } - else if (_wcsicmp(buffer, L"file") == 0) { - m_options |= VLD_OPT_REPORT_TO_FILE; - } - else if (_wcsicmp(buffer, L"stdout") == 0) { - m_options |= VLD_OPT_REPORT_TO_STDOUT; - } - else { - m_options |= VLD_OPT_REPORT_TO_DEBUGGER; - } - - // Read the report file encoding (ascii or unicode). - GetPrivateProfileString(L"Options", L"ReportEncoding", L"", buffer, BSIZE, inipath); - if (_wcsicmp(buffer, L"unicode") == 0) { - m_options |= VLD_OPT_UNICODE_REPORT; - } - if ((m_options & VLD_OPT_UNICODE_REPORT) && !(m_options & VLD_OPT_REPORT_TO_FILE)) { - // If Unicode report encoding is enabled, then the report needs to be - // sent to a file because the debugger will not display Unicode - // characters, it will display question marks in their place instead. - m_options |= VLD_OPT_REPORT_TO_FILE; - m_status |= VLD_STATUS_FORCE_REPORT_TO_FILE; - } - - // Read the stack walking method. - GetPrivateProfileString(L"Options", L"StackWalkMethod", L"", buffer, BSIZE, inipath); - if (_wcsicmp(buffer, L"safe") == 0) { - m_options |= VLD_OPT_SAFE_STACK_WALK; - } - - GetPrivateProfileString(L"Options", L"ValidateHeapAllocs", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { - m_options |= VLD_OPT_VALIDATE_HEAPFREE; - } + WCHAR buffer [BSIZE] = {0}; + // Read the boolean options. + GetPrivateProfileString(L"Options", L"VLD", L"on", buffer, BSIZE, inipath); + if (strtobool(buffer) == FALSE) { + m_options |= VLD_OPT_VLDOFF; + return; + } + + GetPrivateProfileString(L"Options", L"AggregateDuplicates", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_AGGREGATE_DUPLICATES; + } + + GetPrivateProfileString(L"Options", L"SelfTest", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_SELF_TEST; + } + + GetPrivateProfileString(L"Options", L"SlowDebuggerDump", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_SLOW_DEBUGGER_DUMP; + } + + GetPrivateProfileString(L"Options", L"StartDisabled", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_START_DISABLED; + } + + GetPrivateProfileString(L"Options", L"TraceInternalFrames", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_TRACE_INTERNAL_FRAMES; + } + + GetPrivateProfileString(L"Options", L"SkipHeapFreeLeaks", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_SKIP_HEAPFREE_LEAKS; + } + + // Read the integer configuration options. + m_maxdatadump = GetPrivateProfileInt(L"Options", L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); + m_maxtraceframes = GetPrivateProfileInt(L"Options", L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); + if (m_maxtraceframes < 1) { + m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; + } + + // Read the force-include module list. + GetPrivateProfileString(L"Options", L"ForceIncludeModules", L"", m_forcedmodulelist, MAXMODULELISTLENGTH, inipath); + _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); + + // Read the report destination (debugger, file, or both). + WCHAR filename [MAX_PATH] = {0}; + GetPrivateProfileString(L"Options", L"ReportFile", L"", filename, MAX_PATH, inipath); + if (wcslen(filename) == 0) { + wcsncpy_s(filename, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); + } + WCHAR* path = _wfullpath(m_reportfilepath, filename, MAX_PATH); + assert(path); + + GetPrivateProfileString(L"Options", L"ReportTo", L"", buffer, BSIZE, inipath); + if (_wcsicmp(buffer, L"both") == 0) { + m_options |= (VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE); + } + else if (_wcsicmp(buffer, L"file") == 0) { + m_options |= VLD_OPT_REPORT_TO_FILE; + } + else if (_wcsicmp(buffer, L"stdout") == 0) { + m_options |= VLD_OPT_REPORT_TO_STDOUT; + } + else { + m_options |= VLD_OPT_REPORT_TO_DEBUGGER; + } + + // Read the report file encoding (ascii or unicode). + GetPrivateProfileString(L"Options", L"ReportEncoding", L"", buffer, BSIZE, inipath); + if (_wcsicmp(buffer, L"unicode") == 0) { + m_options |= VLD_OPT_UNICODE_REPORT; + } + if ((m_options & VLD_OPT_UNICODE_REPORT) && !(m_options & VLD_OPT_REPORT_TO_FILE)) { + // If Unicode report encoding is enabled, then the report needs to be + // sent to a file because the debugger will not display Unicode + // characters, it will display question marks in their place instead. + m_options |= VLD_OPT_REPORT_TO_FILE; + m_status |= VLD_STATUS_FORCE_REPORT_TO_FILE; + } + + // Read the stack walking method. + GetPrivateProfileString(L"Options", L"StackWalkMethod", L"", buffer, BSIZE, inipath); + if (_wcsicmp(buffer, L"safe") == 0) { + m_options |= VLD_OPT_SAFE_STACK_WALK; + } + + GetPrivateProfileString(L"Options", L"ValidateHeapAllocs", L"", buffer, BSIZE, inipath); + if (strtobool(buffer) == TRUE) { + m_options |= VLD_OPT_VALIDATE_HEAPFREE; + } } // enabled - Determines if memory leak detection is enabled for the current @@ -1123,25 +1123,25 @@ VOID VisualLeakDetector::configure () // BOOL VisualLeakDetector::enabled () { - if (!(m_status & VLD_STATUS_INSTALLED)) { - // Memory leak detection is not yet enabled because VLD is still - // initializing. - return FALSE; - } - - tls_t* tls = vld.gettls(); - if (!(tls->flags & VLD_TLS_DISABLED) && !(tls->flags & VLD_TLS_ENABLED)) { - // The enabled/disabled state for the current thread has not been - // initialized yet. Use the default state. - if (m_options & VLD_OPT_START_DISABLED) { - tls->flags |= VLD_TLS_DISABLED; - } - else { - tls->flags |= VLD_TLS_ENABLED; - } - } - - return ((tls->flags & VLD_TLS_ENABLED) != 0); + if (!(m_status & VLD_STATUS_INSTALLED)) { + // Memory leak detection is not yet enabled because VLD is still + // initializing. + return FALSE; + } + + tls_t* tls = vld.gettls(); + if (!(tls->flags & VLD_TLS_DISABLED) && !(tls->flags & VLD_TLS_ENABLED)) { + // The enabled/disabled state for the current thread has not been + // initialized yet. Use the default state. + if (m_options & VLD_OPT_START_DISABLED) { + tls->flags |= VLD_TLS_DISABLED; + } + else { + tls->flags |= VLD_TLS_ENABLED; + } + } + + return ((tls->flags & VLD_TLS_ENABLED) != 0); } // eraseduplicates - Erases, from the block maps, blocks that appear to be @@ -1156,40 +1156,40 @@ BOOL VisualLeakDetector::enabled () // SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) { - blockinfo_t *elementinfo = (*element).second; - - if (elementinfo->callstack == NULL) - return elementinfo->blocks - 1; - - SIZE_T erased = 0; - // Iterate through all block maps, looking for blocks with the same size - // and callstack as the specified element. - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - BlockMap *blockmap = &(*heapit).second->blockmap; - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - if (blockit == element) { - // Don't delete the element of which we are searching for - // duplicates. - continue; - } - blockinfo_t *info = (*blockit).second; - if (info->callstack == NULL) - continue; - if ((info->size == elementinfo->size) && (*(info->callstack) == *(elementinfo->callstack))) { - // Found a duplicate. Erase it. - delete info->callstack; - delete info; - BlockMap::Iterator previt = blockit - 1; - blockmap->erase(blockit); - blockit = previt; - erased++; - } - } - } - - elementinfo->blocks += erased; - - return elementinfo->blocks - 1; + blockinfo_t *elementinfo = (*element).second; + + if (elementinfo->callstack == NULL) + return elementinfo->blocks - 1; + + SIZE_T erased = 0; + // Iterate through all block maps, looking for blocks with the same size + // and callstack as the specified element. + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + BlockMap *blockmap = &(*heapit).second->blockmap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + if (blockit == element) { + // Don't delete the element of which we are searching for + // duplicates. + continue; + } + blockinfo_t *info = (*blockit).second; + if (info->callstack == NULL) + continue; + if ((info->size == elementinfo->size) && (*(info->callstack) == *(elementinfo->callstack))) { + // Found a duplicate. Erase it. + delete info->callstack; + delete info; + BlockMap::Iterator previt = blockit - 1; + blockmap->erase(blockit); + blockit = previt; + erased++; + } + } + } + + elementinfo->blocks += erased; + + return elementinfo->blocks - 1; } // gettls - Obtains the thread local storage structure for the calling thread. @@ -1201,26 +1201,26 @@ SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) // tls_t* VisualLeakDetector::gettls () { - // Get the pointer to this thread's thread local storage structure. - tls_t* tls = (tls_t*)TlsGetValue(m_tlsindex); - assert(GetLastError() == ERROR_SUCCESS); - - if (tls == NULL) { - // This thread's thread local storage structure has not been allocated. - tls = new tls_t; - TlsSetValue(m_tlsindex, tls); - ZeroMemory(&tls->context, sizeof(tls->context)); - tls->flags = 0x0; - tls->oldflags = 0x0; - tls->threadid = GetCurrentThreadId(); - tls->ppcallstack = NULL; - - // Add this thread's TLS to the TlsSet. - CriticalSectionLocker cs(m_tlslock); - m_tlsmap->insert(tls->threadid,tls); - } - - return tls; + // Get the pointer to this thread's thread local storage structure. + tls_t* tls = (tls_t*)TlsGetValue(m_tlsindex); + assert(GetLastError() == ERROR_SUCCESS); + + if (tls == NULL) { + // This thread's thread local storage structure has not been allocated. + tls = new tls_t; + TlsSetValue(m_tlsindex, tls); + ZeroMemory(&tls->context, sizeof(tls->context)); + tls->flags = 0x0; + tls->oldflags = 0x0; + tls->threadid = GetCurrentThreadId(); + tls->ppcallstack = NULL; + + // Add this thread's TLS to the TlsSet. + CriticalSectionLocker cs(m_tlslock); + m_tlsmap->insert(tls->threadid,tls); + } + + return tls; } // mapblock - Tracks memory allocations. Information about allocated blocks is @@ -1245,43 +1245,43 @@ tls_t* VisualLeakDetector::gettls () // VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack) { - static SIZE_T serialnumber = 0; - - // Record the block's information. - blockinfo_t* blockinfo = new blockinfo_t; - blockinfo->callstack = NULL; - ppcallstack = &blockinfo->callstack; - blockinfo->serialnumber = serialnumber++; - blockinfo->size = size; - blockinfo->blocks = 1; - - // Insert the block's information into the block map. - CriticalSectionLocker cs(m_maplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // We haven't mapped this heap to a block map yet. Do it now. - mapheap(heap); - heapit = m_heapmap->find(heap); - assert(heapit != m_heapmap->end()); - } - if (crtalloc == TRUE) { - // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags |= VLD_HEAP_CRT; - } - BlockMap* blockmap = &(*heapit).second->blockmap; - BlockMap::Iterator blockit = blockmap->insert(mem, blockinfo); - if (blockit == blockmap->end()) { - // A block with this address has already been allocated. The - // previously allocated block must have been freed (probably by some - // mechanism unknown to VLD), or the heap wouldn't have allocated it - // again. Replace the previously allocated info with the new info. - blockit = blockmap->find(mem); - delete (*blockit).second->callstack; - delete (*blockit).second; - blockmap->erase(blockit); - blockmap->insert(mem, blockinfo); - ppcallstack = NULL; - } + static SIZE_T serialnumber = 0; + + // Record the block's information. + blockinfo_t* blockinfo = new blockinfo_t; + blockinfo->callstack = NULL; + ppcallstack = &blockinfo->callstack; + blockinfo->serialnumber = serialnumber++; + blockinfo->size = size; + blockinfo->blocks = 1; + + // Insert the block's information into the block map. + CriticalSectionLocker cs(m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // We haven't mapped this heap to a block map yet. Do it now. + mapheap(heap); + heapit = m_heapmap->find(heap); + assert(heapit != m_heapmap->end()); + } + if (crtalloc == TRUE) { + // The heap that this block was allocated from is a CRT heap. + (*heapit).second->flags |= VLD_HEAP_CRT; + } + BlockMap* blockmap = &(*heapit).second->blockmap; + BlockMap::Iterator blockit = blockmap->insert(mem, blockinfo); + if (blockit == blockmap->end()) { + // A block with this address has already been allocated. The + // previously allocated block must have been freed (probably by some + // mechanism unknown to VLD), or the heap wouldn't have allocated it + // again. Replace the previously allocated info with the new info. + blockit = blockmap->find(mem); + delete (*blockit).second->callstack; + delete (*blockit).second; + blockmap->erase(blockit); + blockmap->insert(mem, blockinfo); + ppcallstack = NULL; + } } // mapheap - Tracks heap creation. Creates a block map for tracking individual @@ -1296,21 +1296,21 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c // VOID VisualLeakDetector::mapheap (HANDLE heap) { - // Create a new block map for this heap and insert it into the heap map. - heapinfo_t* heapinfo = new heapinfo_t; - heapinfo->blockmap.reserve(BLOCKMAPRESERVE); - heapinfo->flags = 0x0; - CriticalSectionLocker cs(m_maplock); - HeapMap::Iterator heapit = m_heapmap->insert(heap, heapinfo); - if (heapit == m_heapmap->end()) { - // Somehow this heap has been created twice without being destroyed, - // or at least it was destroyed without VLD's knowledge. Unmap the heap - // from the existing heapinfo, and remap it to the new one. - report(L"WARNING: Visual Leak Detector detected a duplicate heap (" ADDRESSFORMAT L").\n", heap); - heapit = m_heapmap->find(heap); - unmapheap((*heapit).first); - m_heapmap->insert(heap, heapinfo); - } + // Create a new block map for this heap and insert it into the heap map. + heapinfo_t* heapinfo = new heapinfo_t; + heapinfo->blockmap.reserve(BLOCKMAPRESERVE); + heapinfo->flags = 0x0; + CriticalSectionLocker cs(m_maplock); + HeapMap::Iterator heapit = m_heapmap->insert(heap, heapinfo); + if (heapit == m_heapmap->end()) { + // Somehow this heap has been created twice without being destroyed, + // or at least it was destroyed without VLD's knowledge. Unmap the heap + // from the existing heapinfo, and remap it to the new one. + report(L"WARNING: Visual Leak Detector detected a duplicate heap (" ADDRESSFORMAT L").\n", heap); + heapit = m_heapmap->find(heap); + unmapheap((*heapit).first); + m_heapmap->insert(heap, heapinfo); + } } // remapblock - Tracks reallocations. Unmaps a block from its previously @@ -1341,56 +1341,56 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) // None. // VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - BOOL crtalloc, CallStack **&ppcallstack, const context_t &context) + BOOL crtalloc, CallStack **&ppcallstack, const context_t &context) { - if (newmem != mem) { - // The block was not reallocated in-place. Instead the old block was - // freed and a new block allocated to satisfy the new size. - unmapblock(heap, mem, context); - mapblock(heap, newmem, size, crtalloc, ppcallstack); - return; - } - - // The block was reallocated in-place. Find the existing blockinfo_t - // entry in the block map and update it with the new callstack and size. - CriticalSectionLocker cs(m_maplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // We haven't mapped this heap to a block map yet. Obviously the - // block has also not been mapped to a blockinfo_t entry yet either, - // so treat this reallocation as a brand-new allocation (this will - // also map the heap to a new block map). - mapblock(heap, newmem, size, crtalloc, ppcallstack); - return; - } - - // Find the block's blockinfo_t structure so that we can update it. - BlockMap *blockmap = &(*heapit).second->blockmap; - BlockMap::Iterator blockit = blockmap->find(mem); - if (blockit == blockmap->end()) { - // The block hasn't been mapped to a blockinfo_t entry yet. - // Treat this reallocation as a new allocation. - mapblock(heap, newmem, size, crtalloc, ppcallstack); - return; - } - - // Found the blockinfo_t entry for this block. Update it with - // a new callstack and new size. - blockinfo_t* info = (*blockit).second; - if (info->callstack) - { - delete info->callstack; - info->callstack = NULL; - } - - if (crtalloc) { - // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags |= VLD_HEAP_CRT; - } - - // Update the block's size. - info->size = size; - ppcallstack = &info->callstack; + if (newmem != mem) { + // The block was not reallocated in-place. Instead the old block was + // freed and a new block allocated to satisfy the new size. + unmapblock(heap, mem, context); + mapblock(heap, newmem, size, crtalloc, ppcallstack); + return; + } + + // The block was reallocated in-place. Find the existing blockinfo_t + // entry in the block map and update it with the new callstack and size. + CriticalSectionLocker cs(m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // We haven't mapped this heap to a block map yet. Obviously the + // block has also not been mapped to a blockinfo_t entry yet either, + // so treat this reallocation as a brand-new allocation (this will + // also map the heap to a new block map). + mapblock(heap, newmem, size, crtalloc, ppcallstack); + return; + } + + // Find the block's blockinfo_t structure so that we can update it. + BlockMap *blockmap = &(*heapit).second->blockmap; + BlockMap::Iterator blockit = blockmap->find(mem); + if (blockit == blockmap->end()) { + // The block hasn't been mapped to a blockinfo_t entry yet. + // Treat this reallocation as a new allocation. + mapblock(heap, newmem, size, crtalloc, ppcallstack); + return; + } + + // Found the blockinfo_t entry for this block. Update it with + // a new callstack and new size. + blockinfo_t* info = (*blockit).second; + if (info->callstack) + { + delete info->callstack; + info->callstack = NULL; + } + + if (crtalloc) { + // The heap that this block was allocated from is a CRT heap. + (*heapit).second->flags |= VLD_HEAP_CRT; + } + + // Update the block's size. + info->size = size; + ppcallstack = &info->callstack; } // reportconfig - Generates a brief report summarizing Visual Leak Detector's @@ -1402,49 +1402,49 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // VOID VisualLeakDetector::reportconfig () { - if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { - report(L" Aggregating duplicate leaks.\n"); - } - if (wcslen(m_forcedmodulelist) != 0) { - report(L" Forcing inclusion of these modules in leak detection: %s\n", m_forcedmodulelist); - } - if (m_maxdatadump != VLD_DEFAULT_MAX_DATA_DUMP) { - if (m_maxdatadump == 0) { - report(L" Suppressing data dumps.\n"); - } - else { - report(L" Limiting data dumps to %Iu bytes.\n", m_maxdatadump); - } - } - if (m_maxtraceframes != VLD_DEFAULT_MAX_TRACE_FRAMES) { - report(L" Limiting stack traces to %u frames.\n", m_maxtraceframes); - } - if (m_options & VLD_OPT_UNICODE_REPORT) { - report(L" Generating a Unicode (UTF-16) encoded report.\n"); - } - if (m_options & VLD_OPT_REPORT_TO_FILE) { - if (m_options & VLD_OPT_REPORT_TO_DEBUGGER) { - report(L" Outputting the report to the debugger and to %s\n", m_reportfilepath); - } - else { - report(L" Outputting the report to %s\n", m_reportfilepath); - } - } - if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { - report(L" Outputting the report to the debugger at a slower rate.\n"); - } - if (m_options & VLD_OPT_SAFE_STACK_WALK) { - report(L" Using the \"safe\" (but slow) stack walking method.\n"); - } - if (m_options & VLD_OPT_SELF_TEST) { - report(L" Performing a memory leak self-test.\n"); - } - if (m_options & VLD_OPT_START_DISABLED) { - report(L" Starting with memory leak detection disabled.\n"); - } - if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { - report(L" Including heap and VLD internal frames in stack traces.\n"); - } + if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { + report(L" Aggregating duplicate leaks.\n"); + } + if (wcslen(m_forcedmodulelist) != 0) { + report(L" Forcing inclusion of these modules in leak detection: %s\n", m_forcedmodulelist); + } + if (m_maxdatadump != VLD_DEFAULT_MAX_DATA_DUMP) { + if (m_maxdatadump == 0) { + report(L" Suppressing data dumps.\n"); + } + else { + report(L" Limiting data dumps to %Iu bytes.\n", m_maxdatadump); + } + } + if (m_maxtraceframes != VLD_DEFAULT_MAX_TRACE_FRAMES) { + report(L" Limiting stack traces to %u frames.\n", m_maxtraceframes); + } + if (m_options & VLD_OPT_UNICODE_REPORT) { + report(L" Generating a Unicode (UTF-16) encoded report.\n"); + } + if (m_options & VLD_OPT_REPORT_TO_FILE) { + if (m_options & VLD_OPT_REPORT_TO_DEBUGGER) { + report(L" Outputting the report to the debugger and to %s\n", m_reportfilepath); + } + else { + report(L" Outputting the report to %s\n", m_reportfilepath); + } + } + if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { + report(L" Outputting the report to the debugger at a slower rate.\n"); + } + if (m_options & VLD_OPT_SAFE_STACK_WALK) { + report(L" Using the \"safe\" (but slow) stack walking method.\n"); + } + if (m_options & VLD_OPT_SELF_TEST) { + report(L" Performing a memory leak self-test.\n"); + } + if (m_options & VLD_OPT_START_DISABLED) { + report(L" Starting with memory leak detection disabled.\n"); + } + if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { + report(L" Including heap and VLD internal frames in stack traces.\n"); + } } // getleakscount - Calculate number of memory leaks. @@ -1458,50 +1458,50 @@ VOID VisualLeakDetector::reportconfig () // SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) { - assert(heap != NULL); - - // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(m_maplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // Nothing is allocated from this heap. No leaks. - return 0; - } - - heapinfo_t* heapinfo = (*heapit).second; - BlockMap* blockmap = &heapinfo->blockmap; - SIZE_T memoryleaks = 0; - - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) - { - // Found a block which is still in the BlockMap. We've identified a - // potential memory leak. - LPCVOID block = (*blockit).first; - blockinfo_t* info = (*blockit).second; - LPCVOID address = block; - SIZE_T size = info->size; - - if (heapinfo->flags & VLD_HEAP_CRT) { - // This block is allocated to a CRT heap, so the block has a CRT - // memory block header pretended to it. - crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL && !includingInternal) { - // This block is marked as being used internally by the CRT. - // The CRT will free the block after VLD is destroyed. - continue; - } - // The CRT header is more or less transparent to the user, so - // the information about the contained block will probably be - // more useful to the user. Accordingly, that's the information - // we'll include in the report. - address = CRTDBGBLOCKDATA(block); - size = crtheader->size; - } - - memoryleaks += info->blocks; - } - - return memoryleaks; + assert(heap != NULL); + + // Find the heap's information (blockmap, etc). + CriticalSectionLocker cs(m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // Nothing is allocated from this heap. No leaks. + return 0; + } + + heapinfo_t* heapinfo = (*heapit).second; + BlockMap* blockmap = &heapinfo->blockmap; + SIZE_T memoryleaks = 0; + + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) + { + // Found a block which is still in the BlockMap. We've identified a + // potential memory leak. + LPCVOID block = (*blockit).first; + blockinfo_t* info = (*blockit).second; + LPCVOID address = block; + SIZE_T size = info->size; + + if (heapinfo->flags & VLD_HEAP_CRT) { + // This block is allocated to a CRT heap, so the block has a CRT + // memory block header pretended to it. + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL && !includingInternal) { + // This block is marked as being used internally by the CRT. + // The CRT will free the block after VLD is destroyed. + continue; + } + // The CRT header is more or less transparent to the user, so + // the information about the contained block will probably be + // more useful to the user. Accordingly, that's the information + // we'll include in the report. + address = CRTDBGBLOCKDATA(block); + size = crtheader->size; + } + + memoryleaks += info->blocks; + } + + return memoryleaks; } // reportleaks - Generates a memory leak report for the specified heap. @@ -1515,89 +1515,89 @@ SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) // SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) { - assert(heap != NULL); - - // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(m_maplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // Nothing is allocated from this heap. No leaks. - return 0; - } - - heapinfo_t* heapinfo = (*heapit).second; - BlockMap* blockmap = &heapinfo->blockmap; - SIZE_T leaksfound = 0; - bool firstleak = (m_leaksfound == 0); - - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) - { - // Found a block which is still in the BlockMap. We've identified a - // potential memory leak. - LPCVOID block = (*blockit).first; - blockinfo_t* info = (*blockit).second; - LPCVOID address = block; - SIZE_T size = info->size; - - if (heapinfo->flags & VLD_HEAP_CRT) { - // This block is allocated to a CRT heap, so the block has a CRT - // memory block header prepended to it. - crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { - // This block is marked as being used internally by the CRT. - // The CRT will free the block after VLD is destroyed. - continue; - } - // The CRT header is more or less transparent to the user, so - // the information about the contained block will probably be - // more useful to the user. Accordingly, that's the information - // we'll include in the report. - address = CRTDBGBLOCKDATA(block); - size = crtheader->size; - } - - // It looks like a real memory leak. - if (firstleak) { // A confusing way to only display this message once - report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); - firstleak = false; - } - leaksfound++; - report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialnumber, address, size); - if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { - // Aggregate all other leaks which are duplicates of this one - // under this same heading, to cut down on clutter. - SIZE_T erased = eraseduplicates(blockit); - - // add only the number that were erased, since the 'one left over' - // is already recorded as a leak - leaksfound += erased; - - DWORD callstackCRC = CalculateCRC32(info->size, info->callstack->getHashValue()); - report(L"Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, erased + 1); - } - // Dump the call stack. - report(L" Call Stack:\n"); - assert(info->callstack); - if (info->callstack) - { - info->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); - } - - // Dump the data in the user data section of the memory block. - if (m_maxdatadump != 0) { - report(L" Data:\n"); - if (m_options & VLD_OPT_UNICODE_REPORT) { - dumpmemoryw(address, (m_maxdatadump < size) ? m_maxdatadump : size); - } - else { - dumpmemorya(address, (m_maxdatadump < size) ? m_maxdatadump : size); - } - } - report(L"\n\n"); - } - m_leaksfound += leaksfound; - - return leaksfound; + assert(heap != NULL); + + // Find the heap's information (blockmap, etc). + CriticalSectionLocker cs(m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // Nothing is allocated from this heap. No leaks. + return 0; + } + + heapinfo_t* heapinfo = (*heapit).second; + BlockMap* blockmap = &heapinfo->blockmap; + SIZE_T leaksfound = 0; + bool firstleak = (m_leaksfound == 0); + + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) + { + // Found a block which is still in the BlockMap. We've identified a + // potential memory leak. + LPCVOID block = (*blockit).first; + blockinfo_t* info = (*blockit).second; + LPCVOID address = block; + SIZE_T size = info->size; + + if (heapinfo->flags & VLD_HEAP_CRT) { + // This block is allocated to a CRT heap, so the block has a CRT + // memory block header prepended to it. + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { + // This block is marked as being used internally by the CRT. + // The CRT will free the block after VLD is destroyed. + continue; + } + // The CRT header is more or less transparent to the user, so + // the information about the contained block will probably be + // more useful to the user. Accordingly, that's the information + // we'll include in the report. + address = CRTDBGBLOCKDATA(block); + size = crtheader->size; + } + + // It looks like a real memory leak. + if (firstleak) { // A confusing way to only display this message once + report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); + firstleak = false; + } + leaksfound++; + report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialnumber, address, size); + if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { + // Aggregate all other leaks which are duplicates of this one + // under this same heading, to cut down on clutter. + SIZE_T erased = eraseduplicates(blockit); + + // add only the number that were erased, since the 'one left over' + // is already recorded as a leak + leaksfound += erased; + + DWORD callstackCRC = CalculateCRC32(info->size, info->callstack->getHashValue()); + report(L"Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, erased + 1); + } + // Dump the call stack. + report(L" Call Stack:\n"); + assert(info->callstack); + if (info->callstack) + { + info->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + } + + // Dump the data in the user data section of the memory block. + if (m_maxdatadump != 0) { + report(L" Data:\n"); + if (m_options & VLD_OPT_UNICODE_REPORT) { + dumpmemoryw(address, (m_maxdatadump < size) ? m_maxdatadump : size); + } + else { + dumpmemorya(address, (m_maxdatadump < size) ? m_maxdatadump : size); + } + } + report(L"\n\n"); + } + m_leaksfound += leaksfound; + + return leaksfound; } // FindAllocedBlock - Find if a particular memory allocation is tracked inside of VLD. @@ -1613,39 +1613,39 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) // blockinfo_t* VisualLeakDetector::FindAllocedBlock(LPCVOID mem, __out HANDLE& heap) { - blockinfo_t* result = NULL; - // Iterate through all heaps - for (HeapMap::Iterator it = m_heapmap->begin(); - it != m_heapmap->end(); - it++) - { - HANDLE heap_handle = (*it).first; - (heap_handle); // unused - heapinfo_t* heapPtr = (*it).second; - - // Iterate through all memory blocks in each heap - BlockMap& p_block_map = heapPtr->blockmap; - for (BlockMap::Iterator iter = p_block_map.begin(); - iter != p_block_map.end(); - iter++) - { - if ((*iter).first == mem) - { - // Found the block. - blockinfo_t* alloc_block = (*iter).second; - heap = heap_handle; - result = alloc_block; - break; - } - } - - if (result) - { - break; - } - } - - return result; + blockinfo_t* result = NULL; + // Iterate through all heaps + for (HeapMap::Iterator it = m_heapmap->begin(); + it != m_heapmap->end(); + it++) + { + HANDLE heap_handle = (*it).first; + (heap_handle); // unused + heapinfo_t* heapPtr = (*it).second; + + // Iterate through all memory blocks in each heap + BlockMap& p_block_map = heapPtr->blockmap; + for (BlockMap::Iterator iter = p_block_map.begin(); + iter != p_block_map.end(); + iter++) + { + if ((*iter).first == mem) + { + // Found the block. + blockinfo_t* alloc_block = (*iter).second; + heap = heap_handle; + result = alloc_block; + break; + } + } + + if (result) + { + break; + } + } + + return result; } // unmapblock - Tracks memory blocks that are freed. Unmaps the specified block @@ -1661,63 +1661,63 @@ blockinfo_t* VisualLeakDetector::FindAllocedBlock(LPCVOID mem, __out HANDLE& hea // VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t &context) { - if (NULL == mem) - return; - - // Find this heap's block map. - CriticalSectionLocker cs(m_maplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // We don't have a block map for this heap. We must not have monitored - // this allocation (probably happened before VLD was initialized). - return; - } - - // Find this block in the block map. - BlockMap *blockmap = &(*heapit).second->blockmap; - BlockMap::Iterator blockit = blockmap->find(mem); - if (blockit == blockmap->end()) { - // This memory block is not in the block map. We must not have monitored this - // allocation (probably happened before VLD was initialized). - - // This can also result from allocating on one heap, and freeing on another heap. - // This is an especially bad way to corrupt the application. - // Now we have to search through every heap and every single block in each to make - // sure that this is indeed the case. - if (m_options & VLD_OPT_VALIDATE_HEAPFREE) - { - HANDLE other_heap = NULL; - blockinfo_t* alloc_block = FindAllocedBlock(mem, other_heap); // other_heap is an out parameter - bool diff = other_heap != heap; // Check indeed if the other heap is different - if (alloc_block && alloc_block->callstack && diff) - { - report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); - report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); - report(L" Call Stack:\n"); - alloc_block->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); - - // Now we need a way to print the current callstack at this point: - CallStack* stack_here = CallStack::Create(); - stack_here->getstacktrace(vld.m_maxtraceframes, context); - report(L"Deallocation Call stack.\n"); - report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); - report(L" Call Stack:\n"); - stack_here->dump(FALSE); - // Now it should be safe to delete our temporary callstack - delete stack_here; - stack_here = NULL; - if (IsDebuggerPresent()) - DebugBreak(); - } - } - return; - } - - // Free the blockinfo_t structure and erase it from the block map. - blockinfo_t *info = (*blockit).second; - delete info->callstack; - delete info; - blockmap->erase(blockit); + if (NULL == mem) + return; + + // Find this heap's block map. + CriticalSectionLocker cs(m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // We don't have a block map for this heap. We must not have monitored + // this allocation (probably happened before VLD was initialized). + return; + } + + // Find this block in the block map. + BlockMap *blockmap = &(*heapit).second->blockmap; + BlockMap::Iterator blockit = blockmap->find(mem); + if (blockit == blockmap->end()) { + // This memory block is not in the block map. We must not have monitored this + // allocation (probably happened before VLD was initialized). + + // This can also result from allocating on one heap, and freeing on another heap. + // This is an especially bad way to corrupt the application. + // Now we have to search through every heap and every single block in each to make + // sure that this is indeed the case. + if (m_options & VLD_OPT_VALIDATE_HEAPFREE) + { + HANDLE other_heap = NULL; + blockinfo_t* alloc_block = FindAllocedBlock(mem, other_heap); // other_heap is an out parameter + bool diff = other_heap != heap; // Check indeed if the other heap is different + if (alloc_block && alloc_block->callstack && diff) + { + report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); + report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); + report(L" Call Stack:\n"); + alloc_block->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + + // Now we need a way to print the current callstack at this point: + CallStack* stack_here = CallStack::Create(); + stack_here->getstacktrace(vld.m_maxtraceframes, context); + report(L"Deallocation Call stack.\n"); + report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); + report(L" Call Stack:\n"); + stack_here->dump(FALSE); + // Now it should be safe to delete our temporary callstack + delete stack_here; + stack_here = NULL; + if (IsDebuggerPresent()) + DebugBreak(); + } + } + return; + } + + // Free the blockinfo_t structure and erase it from the block map. + blockinfo_t *info = (*blockit).second; + delete info->callstack; + delete info; + blockmap->erase(blockit); } // unmapheap - Tracks heap destruction. Unmaps the specified heap from its block @@ -1732,26 +1732,26 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & // VOID VisualLeakDetector::unmapheap (HANDLE heap) { - // Find this heap's block map. - CriticalSectionLocker cs(m_maplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // This heap hasn't been mapped. We must not have monitored this heap's - // creation (probably happened before VLD was initialized). - return; - } - - // Free all of the blockinfo_t structures stored in the block map. - heapinfo_t *heapinfo = (*heapit).second; - BlockMap *blockmap = &heapinfo->blockmap; - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callstack; - delete (*blockit).second; - } - delete heapinfo; - - // Remove this heap's block map from the heap map. - m_heapmap->erase(heapit); + // Find this heap's block map. + CriticalSectionLocker cs(m_maplock); + HeapMap::Iterator heapit = m_heapmap->find(heap); + if (heapit == m_heapmap->end()) { + // This heap hasn't been mapped. We must not have monitored this heap's + // creation (probably happened before VLD was initialized). + return; + } + + // Free all of the blockinfo_t structures stored in the block map. + heapinfo_t *heapinfo = (*heapit).second; + BlockMap *blockmap = &heapinfo->blockmap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + delete (*blockit).second->callstack; + delete (*blockit).second; + } + delete heapinfo; + + // Remove this heap's block map from the heap map. + m_heapmap->erase(heapit); } @@ -1787,64 +1787,64 @@ VOID VisualLeakDetector::unmapheap (HANDLE heap) // BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context) { - // Convert the module path to ASCII. - size_t length = wcslen(modulepath) + 1; - LPSTR modulepatha = new CHAR [length]; - - // wcstombs_s requires locale to be already set up correctly, but it might not be correct on vld init step. So use WideCharToMultiByte instead - CHAR defaultChar = '?'; - BOOL defaultCharUsed = FALSE; - - int count = ::WideCharToMultiByte(CP_ACP, 0/*flags*/, modulepath, (int)length, modulepatha, (int)length, &defaultChar, &defaultCharUsed); - assert(count != 0); - if ( defaultCharUsed ) - { - ::OutputDebugStringW(__FILEW__ L": " __FUNCTIONW__ L" - defaultChar was used while conversion from \""); - ::OutputDebugStringW(modulepath); - ::OutputDebugStringW(L"\" to ANSI \""); - ::OutputDebugStringA(modulepatha); - ::OutputDebugStringW(L"\". Result can be wrong.\n"); - } - - // Extract just the filename and extension from the module path. - CHAR filename [_MAX_FNAME]; - CHAR extension [_MAX_EXT]; - _splitpath_s(modulepatha, NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); - - length = strlen(filename) + strlen(extension) + 1; - LPSTR modulenamea = new CHAR [length]; - strncpy_s(modulenamea, length, filename, _TRUNCATE); - strncat_s(modulenamea, length, extension, _TRUNCATE); - _strlwr_s(modulenamea, length); - - if (_stricmp(modulenamea, VLDDLL) == 0) { - // Record Visual Leak Detector's own base address. - vld.m_vldbase = (HMODULE)modulebase; - } - else { - // See if this is a module listed in the patch table. If it is, update - // the corresponding patch table entries' module base address. - UINT tablesize = _countof(m_patchtable); - for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &m_patchtable[index]; - if (_stricmp(entry->exportmodulename, modulenamea) == 0) { - entry->modulebase = (UINT_PTR)modulebase; - } - } - } - - // Record the module's information and store it in the set. - moduleinfo_t moduleinfo; - moduleinfo.addrlow = (UINT_PTR)modulebase; - moduleinfo.addrhigh = (UINT_PTR)(modulebase + modulesize) - 1; - moduleinfo.flags = 0x0; - moduleinfo.name = modulenamea; - moduleinfo.path = modulepatha; - - ModuleSet* newmodules = (ModuleSet*)context; - newmodules->insert(moduleinfo); - - return TRUE; + // Convert the module path to ASCII. + size_t length = wcslen(modulepath) + 1; + LPSTR modulepatha = new CHAR [length]; + + // wcstombs_s requires locale to be already set up correctly, but it might not be correct on vld init step. So use WideCharToMultiByte instead + CHAR defaultChar = '?'; + BOOL defaultCharUsed = FALSE; + + int count = ::WideCharToMultiByte(CP_ACP, 0/*flags*/, modulepath, (int)length, modulepatha, (int)length, &defaultChar, &defaultCharUsed); + assert(count != 0); + if ( defaultCharUsed ) + { + ::OutputDebugStringW(__FILEW__ L": " __FUNCTIONW__ L" - defaultChar was used while conversion from \""); + ::OutputDebugStringW(modulepath); + ::OutputDebugStringW(L"\" to ANSI \""); + ::OutputDebugStringA(modulepatha); + ::OutputDebugStringW(L"\". Result can be wrong.\n"); + } + + // Extract just the filename and extension from the module path. + CHAR filename [_MAX_FNAME]; + CHAR extension [_MAX_EXT]; + _splitpath_s(modulepatha, NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); + + length = strlen(filename) + strlen(extension) + 1; + LPSTR modulenamea = new CHAR [length]; + strncpy_s(modulenamea, length, filename, _TRUNCATE); + strncat_s(modulenamea, length, extension, _TRUNCATE); + _strlwr_s(modulenamea, length); + + if (_stricmp(modulenamea, VLDDLL) == 0) { + // Record Visual Leak Detector's own base address. + vld.m_vldbase = (HMODULE)modulebase; + } + else { + // See if this is a module listed in the patch table. If it is, update + // the corresponding patch table entries' module base address. + UINT tablesize = _countof(m_patchtable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &m_patchtable[index]; + if (_stricmp(entry->exportmodulename, modulenamea) == 0) { + entry->modulebase = (UINT_PTR)modulebase; + } + } + } + + // Record the module's information and store it in the set. + moduleinfo_t moduleinfo; + moduleinfo.addrlow = (UINT_PTR)modulebase; + moduleinfo.addrhigh = (UINT_PTR)(modulebase + modulesize) - 1; + moduleinfo.flags = 0x0; + moduleinfo.name = modulenamea; + moduleinfo.path = modulepatha; + + ModuleSet* newmodules = (ModuleSet*)context; + newmodules->insert(moduleinfo); + + return TRUE; } // detachfrommodule - Callback function for EnumerateLoadedModules64 that @@ -1866,26 +1866,26 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, // Always returns TRUE. // BOOL VisualLeakDetector::detachfrommodule (PCWSTR /*modulepath*/, DWORD64 modulebase, ULONG /*modulesize*/, - PVOID /*context*/) + PVOID /*context*/) { - UINT tablesize = _countof(m_patchtable); + UINT tablesize = _countof(m_patchtable); - restoremodule((HMODULE)modulebase, m_patchtable, tablesize); + restoremodule((HMODULE)modulebase, m_patchtable, tablesize); - return TRUE; + return TRUE; } void VisualLeakDetector::firstalloccall(tls_t * tls) { - if (tls->ppcallstack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (tls->ppcallstack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getcallstack(tls->ppcallstack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; } //////////////////////////////////////////////////////////////////////////////// @@ -1915,30 +1915,30 @@ void VisualLeakDetector::firstalloccall(tls_t * tls) // Returns the value returned from the specified calloc. // void* VisualLeakDetector::_calloc (calloc_t pcalloc, - context_t& context, - size_t num, - size_t size) + context_t& context, + size_t num, + size_t size) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // malloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pcalloc(num, size); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pcalloc(num, size); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // _malloc - This function is just a wrapper around the real malloc that sets @@ -1957,26 +1957,26 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t size) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // malloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pmalloc(size); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // _new - This function is just a wrapper around the real CRT and MFC new @@ -1995,26 +1995,26 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t // void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) { - tls_t* tls = vld.gettls(); + tls_t* tls = vld.gettls(); - // The new operator is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // The new operator is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew(size); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew(size); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // _realloc - This function is just a wrapper around the real realloc that sets @@ -2034,30 +2034,30 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) // Returns the value returned from the specified realloc. // void* VisualLeakDetector::_realloc (realloc_t prealloc, - context_t& context, - void *mem, - size_t size) + context_t& context, + void *mem, + size_t size) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = prealloc(mem, size); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // _recalloc - This function is just a wrapper around the real _recalloc that sets @@ -2077,31 +2077,31 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // Returns the value returned from the specified realloc. // void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, - context_t& context, - void *mem, - size_t num, - size_t size) + context_t& context, + void *mem, + size_t num, + size_t size) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // __aligned_malloc - This function is just a wrapper around the real malloc that sets @@ -2120,26 +2120,26 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, // void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, size_t size, size_t alignment) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // malloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size, alignment); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pmalloc(size, alignment); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // __aligned_offset_malloc - This function is just a wrapper around the real malloc that sets @@ -2158,26 +2158,26 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t // void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, size_t size, size_t alignment, size_t offset) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // malloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size, alignment, offset); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pmalloc(size, alignment, offset); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // __aligned_realloc - This function is just a wrapper around the real realloc that sets @@ -2197,31 +2197,31 @@ void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmal // Returns the value returned from the specified _aligned_realloc. // void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, - context_t& context, - void *mem, - size_t size, - size_t alignment) + context_t& context, + void *mem, + size_t size, + size_t alignment) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size, alignment); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = prealloc(mem, size, alignment); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // __aligned_offset_realloc - This function is just a wrapper around the real realloc that sets @@ -2241,32 +2241,32 @@ void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, // Returns the value returned from the specified _aligned_offset_realloc. // void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t prealloc, - context_t& context, - void *mem, - size_t size, - size_t alignment, - size_t offset) + context_t& context, + void *mem, + size_t size, + size_t alignment, + size_t offset) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size, alignment, offset); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = prealloc(mem, size, alignment, offset); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // __aligned_recalloc - This function is just a wrapper around the real recalloc that sets @@ -2288,32 +2288,32 @@ void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t p // Returns the value returned from the specified _aligned_realloc. // void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, - context_t& context, - void *mem, - size_t num, - size_t size, - size_t alignment) + context_t& context, + void *mem, + size_t num, + size_t size, + size_t alignment) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size, alignment); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size, alignment); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // __aligned_offset_recalloc - This function is just a wrapper around the real recalloc that sets @@ -2335,33 +2335,33 @@ void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, // Returns the value returned from the specified _aligned_offset_realloc. // void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t precalloc, - context_t& context, - void *mem, - size_t num, - size_t size, - size_t alignment, - size_t offset) + context_t& context, + void *mem, + size_t num, + size_t size, + size_t alignment, + size_t offset) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size, alignment, offset); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size, alignment, offset); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // __aligned_malloc_dbg - This function is just a wrapper around the real _aligned_malloc_dbg @@ -2387,33 +2387,33 @@ void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t // Returns the value returned by the specified _aligned_malloc_dbg. // void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_dbg, - context_t& context, - size_t size, - size_t alignment, - int type, - char const *file, - int line) + context_t& context, + size_t size, + size_t alignment, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // _malloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, alignment, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_malloc_dbg(size, alignment, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // __aligned_offset_malloc_dbg - This function is just a wrapper around the real @@ -2439,34 +2439,34 @@ void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_ // Returns the value returned by the specified _aligned_malloc_dbg. // void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_malloc_dbg, - context_t& context, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) + context_t& context, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // _malloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, alignment, offset, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_malloc_dbg(size, alignment, offset, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // _aligned_realloc_debug - This function is just a wrapper around the real @@ -2494,34 +2494,34 @@ void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_db // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_realloc_dbg, - context_t& context, - void *mem, - size_t size, - size_t alignment, - int type, - char const *file, - int line) + context_t& context, + void *mem, + size_t size, + size_t alignment, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, alignment, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_realloc_dbg(mem, size, alignment, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // _aligned_offset_realloc_debug - This function is just a wrapper around the real @@ -2549,35 +2549,35 @@ void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_reall // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_realloc_dbg, - context_t& context, - void *mem, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) + context_t& context, + void *mem, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, alignment, offset, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_realloc_dbg(mem, size, alignment, offset, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // _aligned_recalloc_debug - This function is just a wrapper around the real @@ -2607,35 +2607,35 @@ void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_ // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - void *mem, - size_t num, - size_t size, - size_t alignment, - int type, - char const *file, - int line) + context_t& context, + void *mem, + size_t num, + size_t size, + size_t alignment, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, alignment, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, alignment, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // _aligned_offset_recalloc_debug - This function is just a wrapper around the real @@ -2665,36 +2665,36 @@ void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_rec // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - void *mem, - size_t num, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) + context_t& context, + void *mem, + size_t num, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, alignment, offset, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, alignment, offset, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } //////////////////////////////////////////////////////////////////////////////// @@ -2730,33 +2730,33 @@ void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recallo // Returns the value returned by the specified _calloc_dbg. // void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, - context_t& context, - size_t num, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t num, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // _malloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_calloc_dbg(num, size, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_calloc_dbg(num, size, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // __malloc_dbg - This function is just a wrapper around the real _malloc_dbg @@ -2782,32 +2782,32 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // Returns the value returned by the specified _malloc_dbg. // void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // _malloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_malloc_dbg(size, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // new_dbg_crt - This function is just a wrapper around the real CRT debug new @@ -2833,32 +2833,32 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // The debug new operator is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // The debug new operator is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg_crt(size, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew_dbg_crt(size, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // new_dbg_mfc - This function is just a wrapper around the real MFC debug new @@ -2884,29 +2884,29 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg(size, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew_dbg(size, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // new_dbg_mfc - This function is just a wrapper around the real MFC debug new @@ -2930,28 +2930,28 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, // Returns the value returned by the specified MFC debug new operator. // void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, - context_t& context, - size_t size, - char const *file, - int line) + context_t& context, + size_t size, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg_mfc(size, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew_dbg_mfc(size, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // __realloc_debug - This function is just a wrapper around the real @@ -2979,33 +2979,33 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, - context_t& context, - void *mem, - size_t size, - int type, - char const *file, - int line) + context_t& context, + void *mem, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_realloc_dbg(mem, size, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } // __recalloc_debug - This function is just a wrapper around the real @@ -3033,34 +3033,34 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - void *mem, - size_t num, - size_t size, - int type, - char const *file, - int line) + context_t& context, + void *mem, + size_t num, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockprocessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockprocessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, type, file, line); - if (firstcall) - firstalloccall(tls); + if (firstcall) + firstalloccall(tls); - return block; + return block; } //////////////////////////////////////////////////////////////////////////////// @@ -3088,56 +3088,56 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, // FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) { - // See if there is an entry in the patch table that matches the requested - // function. - UINT tablesize = _countof(vld.m_patchtable); - for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &vld.m_patchtable[index]; - if ((entry->modulebase == 0x0) || ((HMODULE)entry->modulebase != module)) { - // This patch table entry is for a different module. - continue; - } - - patchentry_t *patchentry = entry->patchtable; - while(patchentry->importname) - { - // This patch table entry is for the specified module. If the requested - // imports name matches the entry's import name (or ordinal), then - // return the address of the replacement instead of the address of the - // actual import. - if ((SIZE_T)patchentry->importname < (SIZE_T)vld.m_vldbase) { - // This entry's import name is not a valid pointer to data in - // vld.dll. It must be an ordinal value. - if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { - return (FARPROC)patchentry->replacement; - } - } - else { - __try - { - if (strcmp(patchentry->importname, procname) == 0) { - return (FARPROC)patchentry->replacement; - } - } - __except(FilterFunction(GetExceptionCode())) - { - if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { - return (FARPROC)patchentry->replacement; - } - } - } - patchentry++; - } - } - - // The requested function is not a patched function. Just return the real - // address of the requested function. - return vld._RGetProcAddress(module, procname); + // See if there is an entry in the patch table that matches the requested + // function. + UINT tablesize = _countof(vld.m_patchtable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &vld.m_patchtable[index]; + if ((entry->modulebase == 0x0) || ((HMODULE)entry->modulebase != module)) { + // This patch table entry is for a different module. + continue; + } + + patchentry_t *patchentry = entry->patchtable; + while(patchentry->importname) + { + // This patch table entry is for the specified module. If the requested + // imports name matches the entry's import name (or ordinal), then + // return the address of the replacement instead of the address of the + // actual import. + if ((SIZE_T)patchentry->importname < (SIZE_T)vld.m_vldbase) { + // This entry's import name is not a valid pointer to data in + // vld.dll. It must be an ordinal value. + if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { + return (FARPROC)patchentry->replacement; + } + } + else { + __try + { + if (strcmp(patchentry->importname, procname) == 0) { + return (FARPROC)patchentry->replacement; + } + } + __except(FilterFunction(GetExceptionCode())) + { + if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { + return (FARPROC)patchentry->replacement; + } + } + } + patchentry++; + } + } + + // The requested function is not a patched function. Just return the real + // address of the requested function. + return vld._RGetProcAddress(module, procname); } FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) { - return m_original_GetProcAddress(module, procname); + return m_original_GetProcAddress(module, procname); } // _HeapCreate - Calls to HeapCreate are patched through to this function. This @@ -3156,35 +3156,35 @@ FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) // HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) { - // Get the return address within the calling function. - UINT_PTR ra = (UINT_PTR)_ReturnAddress(); - - // Create the heap. - HANDLE heap = HeapCreate(options, initsize, maxsize); - - // Map the created heap handle to a new block map. - vld.mapheap(heap); - - // Try to get the name of the function containing the return address. - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; - SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; - symbollock.Enter(); - DWORD64 displacement; - BOOL symfound = SymFromAddrW(currentprocess, ra, &displacement, functioninfo); - symbollock.Leave(); - if (symfound == TRUE) { - if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { - // HeapCreate was called by _heap_init. This is a static CRT heap. - CriticalSectionLocker cs(vld.m_maplock); - HeapMap::Iterator heapit = vld.m_heapmap->find(heap); - assert(heapit != vld.m_heapmap->end()); - (*heapit).second->flags |= VLD_HEAP_CRT; - } - } - - return heap; + // Get the return address within the calling function. + UINT_PTR ra = (UINT_PTR)_ReturnAddress(); + + // Create the heap. + HANDLE heap = HeapCreate(options, initsize, maxsize); + + // Map the created heap handle to a new block map. + vld.mapheap(heap); + + // Try to get the name of the function containing the return address. + BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; + SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + g_symbollock.Enter(); + DWORD64 displacement; + BOOL symfound = SymFromAddrW(g_currentprocess, ra, &displacement, functioninfo); + g_symbollock.Leave(); + if (symfound == TRUE) { + if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { + // HeapCreate was called by _heap_init. This is a static CRT heap. + CriticalSectionLocker cs(vld.m_maplock); + HeapMap::Iterator heapit = vld.m_heapmap->find(heap); + assert(heapit != vld.m_heapmap->end()); + (*heapit).second->flags |= VLD_HEAP_CRT; + } + } + + return heap; } // _HeapDestroy - Calls to HeapDestroy are patched through to this function. @@ -3199,16 +3199,16 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m // BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) { - // After this heap is destroyed, the heap's address space will be unmapped - // from the process's address space. So, we'd better generate a leak report - // for this heap now, while we can still read from the memory blocks - // allocated to it. - if (!(vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) - vld.reportleaks(heap); + // After this heap is destroyed, the heap's address space will be unmapped + // from the process's address space. So, we'd better generate a leak report + // for this heap now, while we can still read from the memory blocks + // allocated to it. + if (!(vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) + vld.reportleaks(heap); - vld.unmapheap(heap); + vld.unmapheap(heap); - return HeapDestroy(heap); + return HeapDestroy(heap); } // _LdrLoadDll - Calls to LdrLoadDll are patched through to this function. This @@ -3234,83 +3234,83 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) // Returns the value returned by LdrLoadDll. // NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle) + PHANDLE modulehandle) { - CriticalSectionLocker cs(vld.m_loaderlock); - - // Load the DLL. - NTSTATUS status = LdrLoadDll(searchpath, flags, modulename, modulehandle); - - if (STATUS_SUCCESS == status) { - // Duplicate code here from VisualLeakDetector::RefreshModules. Consider refactoring this out. - // Create a new set of all loaded modules, including any newly loaded - // modules. - ModuleSet *newmodules = new ModuleSet; - newmodules->reserve(MODULESETRESERVE); - EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); - - // Attach to all modules included in the set. - vld.attachtoloadedmodules(newmodules); - - // Start using the new set of loaded modules. - vld.m_moduleslock.Enter(); - ModuleSet *oldmodules = vld.m_loadedmodules; - vld.m_loadedmodules = newmodules; - vld.m_moduleslock.Leave(); - - // Free resources used by the old module list. - for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { - delete [] (*moduleit).name; - delete [] (*moduleit).path; - } - delete oldmodules; - } - - return status; + CriticalSectionLocker cs(vld.m_loaderlock); + + // Load the DLL. + NTSTATUS status = LdrLoadDll(searchpath, flags, modulename, modulehandle); + + if (STATUS_SUCCESS == status) { + // Duplicate code here from VisualLeakDetector::RefreshModules. Consider refactoring this out. + // Create a new set of all loaded modules, including any newly loaded + // modules. + ModuleSet *newmodules = new ModuleSet; + newmodules->reserve(MODULESETRESERVE); + EnumerateLoadedModulesW64(g_currentprocess, addloadedmodule, newmodules); + + // Attach to all modules included in the set. + vld.attachtoloadedmodules(newmodules); + + // Start using the new set of loaded modules. + vld.m_moduleslock.Enter(); + ModuleSet *oldmodules = vld.m_loadedmodules; + vld.m_loadedmodules = newmodules; + vld.m_moduleslock.Leave(); + + // Free resources used by the old module list. + for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { + delete [] (*moduleit).name; + delete [] (*moduleit).path; + } + delete oldmodules; + } + + return status; } VOID VisualLeakDetector::RefreshModules() { - if (vld.m_options & VLD_OPT_VLDOFF) - return; - - CriticalSectionLocker cs(vld.m_loaderlock); - // Duplicate code here in this method. Consider refactoring out to another method. - // Create a new set of all loaded modules, including any newly loaded - // modules. - ModuleSet* newmodules = new ModuleSet(); - newmodules->reserve(MODULESETRESERVE); - EnumerateLoadedModulesW64(currentprocess, addloadedmodule, newmodules); - - // Attach to all modules included in the set. - vld.attachtoloadedmodules(newmodules); - - // Start using the new set of loaded modules. - vld.m_moduleslock.Enter(); - ModuleSet* oldmodules = vld.m_loadedmodules; - vld.m_loadedmodules = newmodules; - vld.m_moduleslock.Leave(); - - // Free resources used by the old module list. - for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { - delete [] (*moduleit).name; - delete [] (*moduleit).path; - } - delete oldmodules; + if (vld.m_options & VLD_OPT_VLDOFF) + return; + + CriticalSectionLocker cs(vld.m_loaderlock); + // Duplicate code here in this method. Consider refactoring out to another method. + // Create a new set of all loaded modules, including any newly loaded + // modules. + ModuleSet* newmodules = new ModuleSet(); + newmodules->reserve(MODULESETRESERVE); + EnumerateLoadedModulesW64(g_currentprocess, addloadedmodule, newmodules); + + // Attach to all modules included in the set. + vld.attachtoloadedmodules(newmodules); + + // Start using the new set of loaded modules. + vld.m_moduleslock.Enter(); + ModuleSet* oldmodules = vld.m_loadedmodules; + vld.m_loadedmodules = newmodules; + vld.m_moduleslock.Leave(); + + // Free resources used by the old module list. + for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { + delete [] (*moduleit).name; + delete [] (*moduleit).path; + } + delete oldmodules; } void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &context_ ) { - CallStack* callstack = CallStack::Create(); + CallStack* callstack = CallStack::Create(); - // Reset thread local flags and variables, in case any libraries called - // into while mapping the block allocate some memory. - context_t context = context_; - *ppcallstack = callstack; - context_.fp = 0x0; - ppcallstack = NULL; + // Reset thread local flags and variables, in case any libraries called + // into while mapping the block allocate some memory. + context_t context = context_; + *ppcallstack = callstack; + context_.fp = 0x0; + ppcallstack = NULL; - callstack->getstacktrace(vld.m_maxtraceframes, context); + callstack->getstacktrace(vld.m_maxtraceframes, context); } // _RtlAllocateHeap - Calls to RtlAllocateHeap are patched through to this @@ -3331,92 +3331,92 @@ void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &cont // LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) { - // Allocate the block. - LPVOID block = RtlAllocateHeap(heap, flags, size); - - if ((block == NULL) || !vld.enabled()) - return block; - - tls_t* tls = vld.gettls(); - tls->blockprocessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) - return block; - - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - tls->context = context; - - AllocateHeap(tls, heap, block, size); - - if (firstcall) - firstalloccall(tls); - - return block; + // Allocate the block. + LPVOID block = RtlAllocateHeap(heap, flags, size); + + if ((block == NULL) || !vld.enabled()) + return block; + + tls_t* tls = vld.gettls(); + tls->blockprocessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; + + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + tls->context = context; + + AllocateHeap(tls, heap, block, size); + + if (firstcall) + firstalloccall(tls); + + return block; } // for kernel32.dll LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) { - // Allocate the block. - LPVOID block = RtlAllocateHeap(heap, flags, size); - - if ((block == NULL) || !vld.enabled()) - return block; - - tls_t* tls = vld.gettls(); - tls->blockprocessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) - return block; - - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - tls->context = context; - - AllocateHeap(tls, heap, block, size); - - if (firstcall) - firstalloccall(tls); - - return block; + // Allocate the block. + LPVOID block = RtlAllocateHeap(heap, flags, size); + + if ((block == NULL) || !vld.enabled()) + return block; + + tls_t* tls = vld.gettls(); + tls->blockprocessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; + + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + tls->context = context; + + AllocateHeap(tls, heap, block, size); + + if (firstcall) + firstalloccall(tls); + + return block; } void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size) { - BOOL crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + BOOL crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - // The module that initiated this allocation is included in leak - // detection. Map this block to the specified heap. - vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); + // The module that initiated this allocation is included in leak + // detection. Map this block to the specified heap. + vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); } // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. @@ -3436,53 +3436,53 @@ void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SI // BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) { - BOOL status; + BOOL status; - context_t context; - // Record the current frame pointer. - CAPTURE_CONTEXT(context); + context_t context; + // Record the current frame pointer. + CAPTURE_CONTEXT(context); - // Unmap the block from the specified heap. - vld.unmapblock(heap, mem, context); + // Unmap the block from the specified heap. + vld.unmapblock(heap, mem, context); - status = RtlFreeHeap(heap, flags, mem); + status = RtlFreeHeap(heap, flags, mem); - return status; + return status; } // for kernel32.dll BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) { - BOOL status; + BOOL status; - context_t context; - // Record the current frame pointer. - CAPTURE_CONTEXT(context); + context_t context; + // Record the current frame pointer. + CAPTURE_CONTEXT(context); - // Unmap the block from the specified heap. - vld.unmapblock(heap, mem, context); + // Unmap the block from the specified heap. + vld.unmapblock(heap, mem, context); - status = RtlFreeHeap(heap, flags, mem); + status = RtlFreeHeap(heap, flags, mem); - return status; + return status; } // Find the information for the module that initiated this reallocation. BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) { - BOOL excluded = FALSE; - moduleinfo_t moduleinfo; - ModuleSet::Iterator moduleit; - moduleinfo.addrlow = address; - moduleinfo.addrhigh = address + 1024; - moduleinfo.flags = 0; - - CriticalSectionLocker cs(vld.m_moduleslock); - moduleit = vld.m_loadedmodules->find(moduleinfo); - if (moduleit != vld.m_loadedmodules->end()) { - excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; - } - return excluded; + BOOL excluded = FALSE; + moduleinfo_t moduleinfo; + ModuleSet::Iterator moduleit; + moduleinfo.addrlow = address; + moduleinfo.addrhigh = address + 1024; + moduleinfo.flags = 0; + + CriticalSectionLocker cs(vld.m_moduleslock); + moduleit = vld.m_loadedmodules->find(moduleinfo); + if (moduleit != vld.m_loadedmodules->end()) { + excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; + } + return excluded; } @@ -3509,113 +3509,113 @@ BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) // LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { - LPVOID newmem; - - // Reallocate the block. - newmem = RtlReAllocateHeap(heap, flags, mem, size); - if (newmem == NULL) - return newmem; - - tls_t *tls = vld.gettls(); - tls->blockprocessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) - return newmem; - - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - ReAllocateHeap(tls, heap, mem, newmem, size, context); - - if (firstcall) - { - firstalloccall(tls); - tls->ppcallstack = NULL; - } - - return newmem; + LPVOID newmem; + + // Reallocate the block. + newmem = RtlReAllocateHeap(heap, flags, mem, size); + if (newmem == NULL) + return newmem; + + tls_t *tls = vld.gettls(); + tls->blockprocessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return newmem; + + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + ReAllocateHeap(tls, heap, mem, newmem, size, context); + + if (firstcall) + { + firstalloccall(tls); + tls->ppcallstack = NULL; + } + + return newmem; } // for kernel32.dll LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { - LPVOID newmem; - - // Reallocate the block. - newmem = RtlReAllocateHeap(heap, flags, mem, size); - if (newmem == NULL) - return newmem; - - tls_t *tls = vld.gettls(); - tls->blockprocessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) - return newmem; - - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - ReAllocateHeap(tls, heap, mem, newmem, size, context); - - if (firstcall) - { - firstalloccall(tls); - tls->ppcallstack = NULL; - } - - return newmem; + LPVOID newmem; + + // Reallocate the block. + newmem = RtlReAllocateHeap(heap, flags, mem, size); + if (newmem == NULL) + return newmem; + + tls_t *tls = vld.gettls(); + tls->blockprocessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return newmem; + + if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + ReAllocateHeap(tls, heap, mem, newmem, size, context); + + if (firstcall) + { + firstalloccall(tls); + tls->ppcallstack = NULL; + } + + return newmem; } void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context) { - BOOL crtalloc; - crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + BOOL crtalloc; + crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; - // Reset thread local flags and variables, in case any libraries called - // into while remapping the block allocate some memory. - tls->context.fp = 0x0; - if (crtalloc) - tls->flags |= VLD_TLS_CRTALLOC; - else - tls->flags &=~VLD_TLS_CRTALLOC; + // Reset thread local flags and variables, in case any libraries called + // into while remapping the block allocate some memory. + tls->context.fp = 0x0; + if (crtalloc) + tls->flags |= VLD_TLS_CRTALLOC; + else + tls->flags &=~VLD_TLS_CRTALLOC; - // The module that initiated this allocation is included in leak - // detection. Remap the block. - vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack, context); + // The module that initiated this allocation is included in leak + // detection. Remap the block. + vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack, context); #ifdef _DEBUG - if(tls->context.fp != 0) - __debugbreak(); + if(tls->context.fp != 0) + __debugbreak(); #endif - tls->flags |= crtalloc; + tls->flags |= crtalloc; - tls->context = context; + tls->context = context; } //////////////////////////////////////////////////////////////////////////////// @@ -3642,36 +3642,36 @@ void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LP // HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) { - static CoGetMalloc_t pCoGetMalloc = NULL; - - HRESULT hr = S_OK; - - HMODULE ole32; - - *imalloc = (LPMALLOC)&vld; - - if (pCoGetMalloc == NULL) { - // This is the first call to this function. Link to the real - // CoGetMalloc and get a pointer to the system implementation of the - // IMalloc interface. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoGetMalloc = (CoGetMalloc_t)vld._RGetProcAddress(ole32, "CoGetMalloc"); - hr = pCoGetMalloc(context, &vld.m_imalloc); - } - else - { - // wait for different thread initialization - int c = 0; - while(vld.m_imalloc == NULL && c < 10) - { - Sleep(1); - c++; - } - if (vld.m_imalloc == NULL) - hr = E_INVALIDARG; - } - - return hr; + static CoGetMalloc_t pCoGetMalloc = NULL; + + HRESULT hr = S_OK; + + HMODULE ole32; + + *imalloc = (LPMALLOC)&vld; + + if (pCoGetMalloc == NULL) { + // This is the first call to this function. Link to the real + // CoGetMalloc and get a pointer to the system implementation of the + // IMalloc interface. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoGetMalloc = (CoGetMalloc_t)vld._RGetProcAddress(ole32, "CoGetMalloc"); + hr = pCoGetMalloc(context, &vld.m_imalloc); + } + else + { + // wait for different thread initialization + int c = 0; + while(vld.m_imalloc == NULL && c < 10) + { + Sleep(1); + c++; + } + if (vld.m_imalloc == NULL) + hr = E_INVALIDARG; + } + + return hr; } // _CoTaskMemAlloc - Calls to CoTaskMemAlloc are patched through to this @@ -3687,36 +3687,36 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) // LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) { - static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; - - LPVOID block; - context_t context; - HMODULE ole32; - tls_t *tls = vld.gettls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockprocessed = FALSE; - } - - if (pCoTaskMemAlloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemAlloc. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemAlloc = (CoTaskMemAlloc_t)vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pCoTaskMemAlloc(size); - - if (firstcall) - firstalloccall(tls); - - return block; + static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; + + LPVOID block; + context_t context; + HMODULE ole32; + tls_t *tls = vld.gettls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockprocessed = FALSE; + } + + if (pCoTaskMemAlloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemAlloc. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoTaskMemAlloc = (CoTaskMemAlloc_t)vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pCoTaskMemAlloc(size); + + if (firstcall) + firstalloccall(tls); + + return block; } // _CoTaskMemRealloc - Calls to CoTaskMemRealloc are patched through to this @@ -3734,36 +3734,36 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) // LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) { - static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; - - LPVOID block; - context_t context; - HMODULE ole32; - tls_t *tls = vld.gettls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockprocessed = FALSE; - } - - if (pCoTaskMemRealloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemRealloc. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemRealloc = (CoTaskMemRealloc_t)vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = pCoTaskMemRealloc(mem, size); - - if (firstcall) - firstalloccall(tls); - - return block; + static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; + + LPVOID block; + context_t context; + HMODULE ole32; + tls_t *tls = vld.gettls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockprocessed = FALSE; + } + + if (pCoTaskMemRealloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemRealloc. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoTaskMemRealloc = (CoTaskMemRealloc_t)vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + block = pCoTaskMemRealloc(mem, size); + + if (firstcall) + firstalloccall(tls); + + return block; } //////////////////////////////////////////////////////////////////////////////// @@ -3782,8 +3782,8 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) // ULONG VisualLeakDetector::AddRef () { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->AddRef() : 0; + assert(m_imalloc != NULL); + return (m_imalloc) ? m_imalloc->AddRef() : 0; } // Alloc - Calls to IMalloc::Alloc end up here. This function is just a wrapper @@ -3798,27 +3798,27 @@ ULONG VisualLeakDetector::AddRef () // LPVOID VisualLeakDetector::Alloc (SIZE_T size) { - LPVOID block; - context_t context; - tls_t *tls = vld.gettls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockprocessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - assert(m_imalloc != NULL); - block = (m_imalloc) ? m_imalloc->Alloc(size) : NULL; - - if (firstcall) - firstalloccall(tls); - - return block; + LPVOID block; + context_t context; + tls_t *tls = vld.gettls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + assert(m_imalloc != NULL); + block = (m_imalloc) ? m_imalloc->Alloc(size) : NULL; + + if (firstcall) + firstalloccall(tls); + + return block; } // DidAlloc - Calls to IMalloc::DidAlloc will end up here. This function is just @@ -3833,8 +3833,8 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) // INT VisualLeakDetector::DidAlloc (LPVOID mem) { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->DidAlloc(mem) : 0; + assert(m_imalloc != NULL); + return (m_imalloc) ? m_imalloc->DidAlloc(mem) : 0; } // Free - Calls to IMalloc::Free will end up here. This function is just a @@ -3848,8 +3848,8 @@ INT VisualLeakDetector::DidAlloc (LPVOID mem) // VOID VisualLeakDetector::Free (LPVOID mem) { - assert(m_imalloc != NULL); - if (m_imalloc) m_imalloc->Free(mem); + assert(m_imalloc != NULL); + if (m_imalloc) m_imalloc->Free(mem); } // GetSize - Calls to IMalloc::GetSize will end up here. This function is just a @@ -3864,8 +3864,8 @@ VOID VisualLeakDetector::Free (LPVOID mem) // SIZE_T VisualLeakDetector::GetSize (LPVOID mem) { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->GetSize(mem) : 0; + assert(m_imalloc != NULL); + return (m_imalloc) ? m_imalloc->GetSize(mem) : 0; } // HeapMinimize - Calls to IMalloc::HeapMinimize will end up here. This function @@ -3877,8 +3877,8 @@ SIZE_T VisualLeakDetector::GetSize (LPVOID mem) // VOID VisualLeakDetector::HeapMinimize () { - assert(m_imalloc != NULL); - if (m_imalloc) m_imalloc->HeapMinimize(); + assert(m_imalloc != NULL); + if (m_imalloc) m_imalloc->HeapMinimize(); } // QueryInterface - Calls to IMalloc::QueryInterface will end up here. This @@ -3897,8 +3897,8 @@ VOID VisualLeakDetector::HeapMinimize () // HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->QueryInterface(iid, object) : E_UNEXPECTED; + assert(m_imalloc != NULL); + return (m_imalloc) ? m_imalloc->QueryInterface(iid, object) : E_UNEXPECTED; } // Realloc - Calls to IMalloc::Realloc will end up here. This function is just a @@ -3917,27 +3917,27 @@ HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) // LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) { - LPVOID block; - context_t context; - tls_t *tls = vld.gettls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockprocessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - assert(m_imalloc != NULL); - block = (m_imalloc) ? m_imalloc->Realloc(mem, size) : NULL; - - if (firstcall) - firstalloccall(tls); - - return block; + LPVOID block; + context_t context; + tls_t *tls = vld.gettls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockprocessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + assert(m_imalloc != NULL); + block = (m_imalloc) ? m_imalloc->Realloc(mem, size) : NULL; + + if (firstcall) + firstalloccall(tls); + + return block; } // Release - Calls to IMalloc::Release will end up here. This function is just @@ -3950,394 +3950,385 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) // ULONG VisualLeakDetector::Release () { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->Release() : 0; + assert(m_imalloc != NULL); + return (m_imalloc) ? m_imalloc->Release() : 0; } SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return 0; - } - - SIZE_T leaksCount = 0; - // Generate a memory leak report for each heap in the process. - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - HANDLE heap = (*heapit).first; - leaksCount += getleakscount(heap, includingInternal); - } - return leaksCount; + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return 0; + } + + SIZE_T leaksCount = 0; + // Generate a memory leak report for each heap in the process. + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + leaksCount += getleakscount(heap, includingInternal); + } + return leaksCount; } SIZE_T VisualLeakDetector::ReportLeaks( ) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return 0; - } - - // Generate a memory leak report for each heap in the process. - SIZE_T leaksCount = 0; - m_leaksfound = 0; - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - HANDLE heap = (*heapit).first; - leaksCount += reportleaks(heap); - } - return leaksCount; + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return 0; + } + + // Generate a memory leak report for each heap in the process. + SIZE_T leaksCount = 0; + m_leaksfound = 0; + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + leaksCount += reportleaks(heap); + } + return leaksCount; } void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) { - ModuleSet::Iterator moduleit; - - CriticalSectionLocker cs(vld.m_moduleslock); - moduleit = vld.m_loadedmodules->begin(); - while( moduleit != vld.m_loadedmodules->end() ) - { - if ( (*moduleit).addrlow == (UINT_PTR)module) - { - moduleinfo_t *mod = (moduleinfo_t *)&(*moduleit); - if ( on ) - mod->flags &= ~VLD_MODULE_EXCLUDED; - else - mod->flags |= VLD_MODULE_EXCLUDED; - - break; - } - moduleit++; - } + ModuleSet::Iterator moduleit; + + CriticalSectionLocker cs(vld.m_moduleslock); + moduleit = vld.m_loadedmodules->begin(); + while( moduleit != vld.m_loadedmodules->end() ) + { + if ( (*moduleit).addrlow == (UINT_PTR)module) + { + moduleinfo_t *mod = (moduleinfo_t *)&(*moduleit); + if ( on ) + mod->flags &= ~VLD_MODULE_EXCLUDED; + else + mod->flags |= VLD_MODULE_EXCLUDED; + + break; + } + moduleit++; + } } void VisualLeakDetector::EnableModule(HMODULE module) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - ChangeModuleState(module,true); + ChangeModuleState(module,true); } void VisualLeakDetector::DisableModule(HMODULE module) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - ChangeModuleState(module,false); + ChangeModuleState(module,false); } void VisualLeakDetector::DisableLeakDetection () { - tls_t *tls; - - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - // Disable memory leak detection for the current thread. There are two flags - // because if neither flag is set, it means that we are in the default or - // "starting" state, which could be either enabled or disabled depending on - // the configuration. - tls = gettls(); - tls->oldflags = tls->flags; - tls->flags &= ~VLD_TLS_ENABLED; - tls->flags |= VLD_TLS_DISABLED; + tls_t *tls; + + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Disable memory leak detection for the current thread. There are two flags + // because if neither flag is set, it means that we are in the default or + // "starting" state, which could be either enabled or disabled depending on + // the configuration. + tls = gettls(); + tls->oldflags = tls->flags; + tls->flags &= ~VLD_TLS_ENABLED; + tls->flags |= VLD_TLS_DISABLED; } void VisualLeakDetector::EnableLeakDetection () { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - tls_t *tls; - - // Enable memory leak detection for the current thread. - tls = gettls(); - tls->oldflags = tls->flags; - tls->flags &= ~VLD_TLS_DISABLED; - tls->flags |= VLD_TLS_ENABLED; - m_status &= ~VLD_STATUS_NEVER_ENABLED; + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + tls_t *tls; + + // Enable memory leak detection for the current thread. + tls = gettls(); + tls->oldflags = tls->flags; + tls->flags &= ~VLD_TLS_DISABLED; + tls->flags |= VLD_TLS_ENABLED; + m_status &= ~VLD_STATUS_NEVER_ENABLED; } void VisualLeakDetector::RestoreLeakDetectionState () { - tls_t *tls; + tls_t *tls; - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } - // Restore state memory leak detection for the current thread. - tls = gettls(); - tls->flags &= ~(VLD_TLS_DISABLED | VLD_TLS_ENABLED); - tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); + // Restore state memory leak detection for the current thread. + tls = gettls(); + tls->flags &= ~(VLD_TLS_DISABLED | VLD_TLS_ENABLED); + tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); } void VisualLeakDetector::GlobalDisableLeakDetection () { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - // Disable memory leak detection for all threads. - CriticalSectionLocker cs(m_tlslock); - TlsMap::Iterator tlsit; - for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - (*tlsit).second->oldflags = (*tlsit).second->flags; - (*tlsit).second->flags &= ~VLD_TLS_ENABLED; - (*tlsit).second->flags |= VLD_TLS_DISABLED; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Disable memory leak detection for all threads. + CriticalSectionLocker cs(m_tlslock); + TlsMap::Iterator tlsit; + for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + (*tlsit).second->oldflags = (*tlsit).second->flags; + (*tlsit).second->flags &= ~VLD_TLS_ENABLED; + (*tlsit).second->flags |= VLD_TLS_DISABLED; + } } void VisualLeakDetector::GlobalEnableLeakDetection () { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - // Enable memory leak detection for all threads. - CriticalSectionLocker cs(m_tlslock); - TlsMap::Iterator tlsit; - for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - (*tlsit).second->oldflags = (*tlsit).second->flags; - (*tlsit).second->flags &= ~VLD_TLS_DISABLED; - (*tlsit).second->flags |= VLD_TLS_ENABLED; - } - m_status &= ~VLD_STATUS_NEVER_ENABLED; + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Enable memory leak detection for all threads. + CriticalSectionLocker cs(m_tlslock); + TlsMap::Iterator tlsit; + for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + (*tlsit).second->oldflags = (*tlsit).second->flags; + (*tlsit).second->flags &= ~VLD_TLS_DISABLED; + (*tlsit).second->flags |= VLD_TLS_ENABLED; + } + m_status &= ~VLD_STATUS_NEVER_ENABLED; } CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_INCLUDE | - VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | - VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS | VLD_OPT_VALIDATE_HEAPFREE; + VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | + VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS | VLD_OPT_VALIDATE_HEAPFREE; UINT32 VisualLeakDetector::GetOptions() { - return m_options & OptionsMask; + return m_options & OptionsMask; } void VisualLeakDetector::SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - m_options &= ~OptionsMask; // clear used bits - m_options |= option_mask & OptionsMask; - - m_maxdatadump = maxDataDump; - m_maxtraceframes = maxTraceFrames; - if (m_maxtraceframes < 1) { - m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; - } - - m_options |= option_mask & VLD_OPT_START_DISABLED; - if (m_options & VLD_OPT_START_DISABLED) - GlobalDisableLeakDetection(); + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + m_options &= ~OptionsMask; // clear used bits + m_options |= option_mask & OptionsMask; + + m_maxdatadump = maxDataDump; + m_maxtraceframes = maxTraceFrames; + if (m_maxtraceframes < 1) { + m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; + } + + m_options |= option_mask & VLD_OPT_START_DISABLED; + if (m_options & VLD_OPT_START_DISABLED) + GlobalDisableLeakDetection(); } void VisualLeakDetector::SetModulesList(CONST WCHAR *modules, BOOL includeModules) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - wcsncpy_s(m_forcedmodulelist, MAXMODULELISTLENGTH, modules, _TRUNCATE); - _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); - if (includeModules) - m_options |= VLD_OPT_MODULE_LIST_INCLUDE; - else - m_options &= ~VLD_OPT_MODULE_LIST_INCLUDE; + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + wcsncpy_s(m_forcedmodulelist, MAXMODULELISTLENGTH, modules, _TRUNCATE); + _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); + if (includeModules) + m_options |= VLD_OPT_MODULE_LIST_INCLUDE; + else + m_options &= ~VLD_OPT_MODULE_LIST_INCLUDE; } bool VisualLeakDetector::GetModulesList(WCHAR *modules, UINT size) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - modules[0] = '\0'; - return true; - } - - wcsncpy_s(modules, size, m_forcedmodulelist, _TRUNCATE); - return (m_options & VLD_OPT_MODULE_LIST_INCLUDE) > 0; + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + modules[0] = '\0'; + return true; + } + + wcsncpy_s(modules, size, m_forcedmodulelist, _TRUNCATE); + return (m_options & VLD_OPT_MODULE_LIST_INCLUDE) > 0; } void VisualLeakDetector::GetReportFilename(WCHAR *filename) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - m_reportfilepath[0] = '\0'; - return; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + m_reportfilepath[0] = '\0'; + return; + } - wcsncpy_s(filename, MAX_PATH, m_reportfilepath, _TRUNCATE); + wcsncpy_s(filename, MAX_PATH, m_reportfilepath, _TRUNCATE); } void VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filename) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | - VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits - - m_options |= option_mask & VLD_OPT_REPORT_TO_DEBUGGER; - if ( (option_mask & VLD_OPT_REPORT_TO_FILE) && ( filename != NULL )) - { - wcsncpy_s(m_reportfilepath, MAX_PATH, filename, _TRUNCATE); - m_options |= option_mask & VLD_OPT_REPORT_TO_FILE; - } - m_options |= option_mask & VLD_OPT_REPORT_TO_STDOUT; - m_options |= option_mask & VLD_OPT_UNICODE_REPORT; - - if ((m_options & VLD_OPT_UNICODE_REPORT) && !(m_options & VLD_OPT_REPORT_TO_FILE)) { - // If Unicode report encoding is enabled, then the report needs to be - // sent to a file because the debugger will not display Unicode - // characters, it will display question marks in their place instead. - m_options |= VLD_OPT_REPORT_TO_FILE; - m_status |= VLD_STATUS_FORCE_REPORT_TO_FILE; - } - - if (m_options & VLD_OPT_REPORT_TO_FILE) { - SetupReporting(); - } - else if ( m_reportfile ) { //Close the previous report file if needed. - fclose(m_reportfile); - m_reportfile = NULL; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | + VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits + + m_options |= option_mask & VLD_OPT_REPORT_TO_DEBUGGER; + if ( (option_mask & VLD_OPT_REPORT_TO_FILE) && ( filename != NULL )) + { + wcsncpy_s(m_reportfilepath, MAX_PATH, filename, _TRUNCATE); + m_options |= option_mask & VLD_OPT_REPORT_TO_FILE; + } + m_options |= option_mask & VLD_OPT_REPORT_TO_STDOUT; + m_options |= option_mask & VLD_OPT_UNICODE_REPORT; + + if ((m_options & VLD_OPT_UNICODE_REPORT) && !(m_options & VLD_OPT_REPORT_TO_FILE)) { + // If Unicode report encoding is enabled, then the report needs to be + // sent to a file because the debugger will not display Unicode + // characters, it will display question marks in their place instead. + m_options |= VLD_OPT_REPORT_TO_FILE; + m_status |= VLD_STATUS_FORCE_REPORT_TO_FILE; + } + + if (m_options & VLD_OPT_REPORT_TO_FILE) { + SetupReporting(); + } + else if ( m_reportfile ) { //Close the previous report file if needed. + fclose(m_reportfile); + m_reportfile = NULL; + } } void VisualLeakDetector::SetupReporting() { - WCHAR bom = BOM; // Unicode byte-order mark. - - //Close the previous report file if needed. - if ( m_reportfile ) - fclose(m_reportfile); - - // Reporting to file enabled. - if (m_options & VLD_OPT_UNICODE_REPORT) { - // Unicode data encoding has been enabled. Write the byte-order - // mark before anything else gets written to the file. Open the - // file for binary writing. - if (_wfopen_s(&m_reportfile, m_reportfilepath, L"wb") == EINVAL) { - // Couldn't open the file. - m_reportfile = NULL; - } - else { - fwrite(&bom, sizeof(WCHAR), 1, m_reportfile); - setreportencoding(unicode); - } - } - else { - // Open the file in text mode for ASCII output. - if (_wfopen_s(&m_reportfile, m_reportfilepath, L"w") == EINVAL) { - // Couldn't open the file. - m_reportfile = NULL; - } - else { - setreportencoding(ascii); - } - } - if (m_reportfile == NULL) { - report(L"WARNING: Visual Leak Detector: Couldn't open report file for writing: %s\n" - L" The report will be sent to the debugger instead.\n", m_reportfilepath); - } - else { - // Set the "report" function to write to the file. - setreportfile(m_reportfile, m_options & VLD_OPT_REPORT_TO_DEBUGGER, m_options & VLD_OPT_REPORT_TO_STDOUT); - } + WCHAR bom = BOM; // Unicode byte-order mark. + + //Close the previous report file if needed. + if ( m_reportfile ) + fclose(m_reportfile); + + // Reporting to file enabled. + if (m_options & VLD_OPT_UNICODE_REPORT) { + // Unicode data encoding has been enabled. Write the byte-order + // mark before anything else gets written to the file. Open the + // file for binary writing. + if (_wfopen_s(&m_reportfile, m_reportfilepath, L"wb") == EINVAL) { + // Couldn't open the file. + m_reportfile = NULL; + } + else { + fwrite(&bom, sizeof(WCHAR), 1, m_reportfile); + setreportencoding(unicode); + } + } + else { + // Open the file in text mode for ASCII output. + if (_wfopen_s(&m_reportfile, m_reportfilepath, L"w") == EINVAL) { + // Couldn't open the file. + m_reportfile = NULL; + } + else { + setreportencoding(ascii); + } + } + if (m_reportfile == NULL) { + report(L"WARNING: Visual Leak Detector: Couldn't open report file for writing: %s\n" + L" The report will be sent to the debugger instead.\n", m_reportfilepath); + } + else { + // Set the "report" function to write to the file. + setreportfile(m_reportfile, m_options & VLD_OPT_REPORT_TO_DEBUGGER, m_options & VLD_OPT_REPORT_TO_STDOUT); + } } void VisualLeakDetector::resolveStacks(HANDLE heap) { - // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(m_maplock); - HeapMap::Iterator heapiter = m_heapmap->find(heap); - if (heapiter == m_heapmap->end()) { - // Nothing is allocated from this heap. No leaks. - return; - } - - heapinfo_t* heapinfo = (*heapiter).second; - BlockMap& blockmap = heapinfo->blockmap; - - for (BlockMap::Iterator blockit = blockmap.begin(); blockit != blockmap.end(); ++blockit) { - // Found a block which is still in the BlockMap. We've identified a - // potential memory leak. - const void* block = (*blockit).first; - blockinfo_t* info = (*blockit).second; - assert(info); - if (info == NULL) - { - continue; - } - // The actual memory address - const void* address = block; - assert(address != NULL); - - SIZE_T size = info->size; - - if (heapinfo->flags & VLD_HEAP_CRT) { - // This block is allocated to a CRT heap, so the block has a CRT - // memory block header prepended to it. - crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - if (!crtheader) - { - continue; - } - - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { - // This block is marked as being used internally by the CRT. - // The CRT will free the block after VLD is destroyed. - continue; - } - // The CRT header is more or less transparent to the user, so - // the information about the contained block will probably be - // more useful to the user. Accordingly, that's the information - // we'll include in the report. - address = CRTDBGBLOCKDATA(block); - size = crtheader->size; - } - - if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { - // Aggregate all other leaks which are duplicates of this one - // under this same heading, to cut down on clutter. - eraseduplicates(blockit); - } - // Dump the call stack. - if (info->callstack) - { - info->callstack->Resolve(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); - } - } + // Find the heap's information (blockmap, etc). + CriticalSectionLocker cs(m_maplock); + HeapMap::Iterator heapiter = m_heapmap->find(heap); + if (heapiter == m_heapmap->end()) { + // Nothing is allocated from this heap. No leaks. + return; + } + + heapinfo_t* heapinfo = (*heapiter).second; + BlockMap& blockmap = heapinfo->blockmap; + + for (BlockMap::Iterator blockit = blockmap.begin(); blockit != blockmap.end(); ++blockit) { + // Found a block which is still in the BlockMap. We've identified a + // potential memory leak. + const void* block = (*blockit).first; + blockinfo_t* info = (*blockit).second; + assert(info); + if (info == NULL) + { + continue; + } + // The actual memory address + const void* address = block; + assert(address != NULL); + + SIZE_T size = info->size; + + if (heapinfo->flags & VLD_HEAP_CRT) { + // This block is allocated to a CRT heap, so the block has a CRT + // memory block header prepended to it. + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + if (!crtheader) + continue; + + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { + // This block is marked as being used internally by the CRT. + // The CRT will free the block after VLD is destroyed. + continue; + } + // The CRT header is more or less transparent to the user, so + // the information about the contained block will probably be + // more useful to the user. Accordingly, that's the information + // we'll include in the report. + address = CRTDBGBLOCKDATA(block); + size = crtheader->size; + } + + // Dump the call stack. + if (info->callstack) + { + info->callstack->Resolve(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + } + } } void VisualLeakDetector::ResolveCallstacks() { - if (vld.m_options & VLD_OPT_VLDOFF) - { - return; - } - - // Generate the Callstacks early - for (HeapMap::Iterator heapiter = m_heapmap->begin(); - heapiter != m_heapmap->end(); - ++heapiter) - { - HANDLE heap = (*heapiter).first; - resolveStacks(heap); - } + if (vld.m_options & VLD_OPT_VLDOFF) + return; + + // Generate the Callstacks early + for (HeapMap::Iterator heapiter = m_heapmap->begin(); + heapiter != m_heapmap->end(); + ++heapiter) + { + HANDLE heap = (*heapiter).first; + resolveStacks(heap); + } } diff --git a/vldheap.cpp b/vldheap.cpp index c8a06925..e817e4f8 100644 --- a/vldheap.cpp +++ b/vldheap.cpp @@ -30,9 +30,9 @@ #undef new // Do not map "new" to VLD's new operator in this file // Global variables. -vldblockheader_t *vldblocklist = NULL; // List of internally allocated blocks on VLD's private heap. -HANDLE vldheap; // VLD's private heap. -CriticalSection vldheaplock; // Serializes access to VLD's private heap. +vldblockheader_t *g_vldblocklist = NULL; // List of internally allocated blocks on VLD's private heap. +HANDLE g_vldheap; // VLD's private heap. +CriticalSection g_vldheaplock; // Serializes access to VLD's private heap. // Local helper functions. static inline void vlddelete (void *block); @@ -150,21 +150,21 @@ void vlddelete (void *block) vldblockheader_t *header = VLDBLOCKHEADER((LPVOID)block); // Unlink the block from the block list. - vldheaplock.Enter(); + g_vldheaplock.Enter(); if (header->prev) { header->prev->next = header->next; } else { - vldblocklist = header->next; + g_vldblocklist = header->next; } if (header->next) { header->next->prev = header->prev; } - vldheaplock.Leave(); + g_vldheaplock.Leave(); // Free the block. - freed = RtlFreeHeap(vldheap, 0x0, header); + freed = RtlFreeHeap(g_vldheap, 0x0, header); assert(freed != FALSE); } @@ -188,7 +188,7 @@ void vlddelete (void *block) // void* vldnew (size_t size, const char *file, int line) { - vldblockheader_t *header = (vldblockheader_t*)RtlAllocateHeap(vldheap, 0x0, size + sizeof(vldblockheader_t)); + vldblockheader_t *header = (vldblockheader_t*)RtlAllocateHeap(g_vldheap, 0x0, size + sizeof(vldblockheader_t)); static SIZE_T serialnumber = 0; if (header == NULL) { @@ -203,14 +203,14 @@ void* vldnew (size_t size, const char *file, int line) header->size = size; // Link the block into the block list. - vldheaplock.Enter(); - header->next = vldblocklist; + g_vldheaplock.Enter(); + header->next = g_vldblocklist; if (header->next != NULL) { header->next->prev = header; } header->prev = NULL; - vldblocklist = header; - vldheaplock.Leave(); + g_vldblocklist = header; + g_vldheaplock.Leave(); // Return a pointer to the beginning of the data section of the block. return (void*)VLDBLOCKDATA(header); From a8ffb2a306ac60df0a51c99911f584266c9f8253 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 31 May 2011 23:30:26 +0000 Subject: [PATCH 095/321] * Introduced define called VLD_FORCE_ENABLE that allows one to active VLD even if not running in DEBUG * Added support release CRT runtime * Added new API function called VLDReportAlloc * Added new API function called VLDReportFree * m_maplock renamed to m_heapmaplock I wanted to include updated project files, but my Visual Studio Express doesn't support 64 bit compiler, and ruins the project files. Requirements for detecting memory leaks in Release-builds: - "Omit Frame Pointers" optimization must be turned off for the testing application (Also whole program optimization) - Debug information must be turned on in the compiler- AND linker-options - Define VLD_FORCE_ENABLE before #include Patch by snakefoot plus my few improvements/changes git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67239 --- crtmfcpatch.h | 448 ++++++++--- mfc_detect/vldmfc.cpp | 290 +++++++ mfc_detect/vldmfc_detect.vcxproj | 611 ++++++++++++++ mfc_detect/vldmfc_detect_vs08.sln | 38 + mfc_detect/vldmfc_detect_vs08.vcproj | 1056 +++++++++++++++++++++++++ mfc_detect/vldmfc_detect_vs10.sln | 38 + setup/vld-setup.nsi | 2 +- tests/basics/basics.cpp | 2 +- tests/basics/basics.vcxproj | 20 +- tests/corruption/corruption.vcxproj | 6 +- tests/dynamic_app/dynamic_app.cpp | 134 ++-- tests/dynamic_app/dynamic_app.vcxproj | 30 +- tests/mfc/README.txt | 28 - tests/mfc/vldmfc.vcxproj | 42 +- tests/mfc/vldmfc.vcxproj.filters | 2 - tests/suite/testsuite.cpp | 14 +- tests/suite/testsuite.vcxproj | 14 +- utility.cpp | 512 ++++++------ vld.cpp | 880 ++++++++++++++------- vld.h | 19 +- vld.vcxproj | 1 + vld.vcxproj.filters | 3 + vld_vs10.sln | 13 +- vldapi.cpp | 10 + vldint.h | 59 +- 25 files changed, 3420 insertions(+), 852 deletions(-) create mode 100644 mfc_detect/vldmfc.cpp create mode 100644 mfc_detect/vldmfc_detect.vcxproj create mode 100644 mfc_detect/vldmfc_detect_vs08.sln create mode 100644 mfc_detect/vldmfc_detect_vs08.vcproj create mode 100644 mfc_detect/vldmfc_detect_vs10.sln delete mode 100644 tests/mfc/README.txt diff --git a/crtmfcpatch.h b/crtmfcpatch.h index f878aa83..81ad8b51 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -32,7 +32,7 @@ Applications should never include this header." #include "vldint.h" extern __declspec(dllexport) VisualLeakDetector vld; -template +template class CrtMfcPatch { public: @@ -140,8 +140,8 @@ class CrtMfcPatch // // Returns the value returned by _calloc_dbg. // -template -void* CrtMfcPatch::crtd__calloc_dbg (size_t num, +template +void* CrtMfcPatch::crtd__calloc_dbg (size_t num, size_t size, int type, char const *file, @@ -153,7 +153,7 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, context_t context; CAPTURE_CONTEXT(context); - return vld.__calloc_dbg(pcrtxxd__calloc_dbg, context, num, size, type, file, line); + return vld.__calloc_dbg(pcrtxxd__calloc_dbg, context, debug, num, size, type, file, line); } // crtd__malloc_dbg - Calls to _malloc_dbg from msvcrXXd.dll are patched @@ -172,8 +172,8 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, // // Returns the value returned by _malloc_dbg. // -template -void* CrtMfcPatch::crtd__malloc_dbg (size_t size, +template +void* CrtMfcPatch::crtd__malloc_dbg (size_t size, int type, char const *file, int line) @@ -184,7 +184,7 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, context_t context; CAPTURE_CONTEXT(context); - return vld.__malloc_dbg(pcrtxxd__malloc_dbg, context, size, type, file, line); + return vld.__malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, type, file, line); } // crtd__realloc_dbg - Calls to _realloc_dbg from msvcrXXd.dll are patched @@ -205,8 +205,8 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, // // Returns the value returned by _realloc_dbg. // -template -void* CrtMfcPatch::crtd__realloc_dbg (void *mem, +template +void* CrtMfcPatch::crtd__realloc_dbg (void *mem, size_t size, int type, char const *file, @@ -218,7 +218,7 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, context_t context; CAPTURE_CONTEXT(context); - return vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, type, file, line); + return vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, type, file, line); } // crtd__recalloc_dbg - Calls to _recalloc_dbg from msvcrXXd.dll are patched @@ -239,8 +239,8 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, // // Returns the value returned by _realloc_dbg. // -template -void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, +template +void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, size_t num, size_t size, int type, @@ -253,7 +253,7 @@ void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, context_t context; CAPTURE_CONTEXT(context); - return vld.__recalloc_dbg(pcrtxxd__recalloc_dbg, context, mem, num, size, type, file, line); + return vld.__recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, type, file, line); } // crtd__scalar_new_dbg - Calls to the CRT's debug scalar new operator from @@ -272,8 +272,8 @@ void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, // // Returns the value returned by the CRT debug scalar new operator. // -template -void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, +template +void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, int type, char const *file, int line) @@ -284,7 +284,7 @@ void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_crt(pcrtxxd_new_dbg, context, size, type, file, line); + return vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); } // crtd__vector_new_dbg - Calls to the CRT's debug vector new operator from @@ -303,8 +303,8 @@ void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, // // Returns the value returned by the CRT debug vector new operator. // -template -void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, +template +void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, int type, char const *file, int line) @@ -315,7 +315,7 @@ void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_crt(pcrtxxd_new_dbg, context, size, type, file, line); + return vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); } // crtd_calloc - Calls to calloc from msvcrXXd.dll are patched through to @@ -331,8 +331,8 @@ void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, // // Returns the valued returned from calloc. // -template -void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) +template +void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) { calloc_t pcrtxxd_calloc = (calloc_t)pcrtd_calloc; assert(pcrtxxd_calloc); @@ -340,7 +340,7 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._calloc(pcrtxxd_calloc, context, num, size); + return vld._calloc(pcrtxxd_calloc, context, debug, num, size); } // crtd_malloc - Calls to malloc from msvcrXXd.dll are patched through to @@ -354,8 +354,8 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) // // Returns the valued returned from malloc. // -template -void* CrtMfcPatch::crtd_malloc (size_t size) +template +void* CrtMfcPatch::crtd_malloc (size_t size) { malloc_t pcrtxxd_malloc = (malloc_t)pcrtd_malloc; assert(pcrtxxd_malloc); @@ -363,7 +363,7 @@ void* CrtMfcPatch::crtd_malloc (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._malloc(pcrtxxd_malloc, context, size); + return vld._malloc(pcrtxxd_malloc, context, debug, size); } // crtd_realloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -379,8 +379,8 @@ void* CrtMfcPatch::crtd_malloc (size_t size) // // Returns the value returned from realloc. // -template -void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) +template +void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) { realloc_t pcrtxxd_realloc = (realloc_t)pcrtd_realloc; assert(pcrtxxd_realloc); @@ -388,7 +388,7 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._realloc(pcrtxxd_realloc, context, mem, size); + return vld._realloc(pcrtxxd_realloc, context, debug, mem, size); } // crtd__recalloc - Calls to _recalloc from msvcrXXd.dll are patched through to @@ -404,8 +404,8 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) // // Returns the value returned from realloc. // -template -void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, size_t size) +template +void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, size_t size) { _recalloc_t pcrtxxd_recalloc = (_recalloc_t)pcrtd_recalloc; assert(pcrtxxd_recalloc); @@ -413,7 +413,7 @@ void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, size_t context_t context; CAPTURE_CONTEXT(context); - return vld.__recalloc(pcrtxxd_recalloc, context, mem, num, size); + return vld.__recalloc(pcrtxxd_recalloc, context, debug, mem, num, size); } // crtd__aligned_malloc_dbg - Calls to _aligned_malloc_dbg from msvcrXXd.dll are patched @@ -432,8 +432,8 @@ void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, size_t // // Returns the value returned by _aligned_malloc_dbg. // -template -void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size, +template +void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size, size_t alignment, int type, char const *file, @@ -445,7 +445,7 @@ void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size, context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_malloc_dbg(pcrtxxd__aligned_malloc_dbg, context, size, alignment, type, file, line); + return vld.__aligned_malloc_dbg(pcrtxxd__aligned_malloc_dbg, context, debug, size, alignment, type, file, line); } // crtd__aligned_offset_malloc_dbg - Calls to _aligned_offset_malloc_dbg from msvcrXXd.dll are patched @@ -464,8 +464,8 @@ void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size, // // Returns the value returned by _aligned_offset_malloc_dbg. // -template -void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t size, +template +void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t size, size_t alignment, size_t offset, int type, @@ -478,7 +478,7 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_malloc_dbg(pcrtxxd__malloc_dbg, context, size, alignment, offset, type, file, line); + return vld.__aligned_offset_malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, alignment, offset, type, file, line); } // crtd__aligned_realloc_dbg - Calls to _aligned_realloc_dbg from msvcrXXd.dll are patched @@ -499,8 +499,8 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t // // Returns the value returned by _aligned_realloc_dbg. // -template -void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem, +template +void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem, size_t size, size_t alignment, int type, @@ -513,7 +513,7 @@ void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem, context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, alignment, type, file, line); + return vld.__aligned_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, type, file, line); } // crtd__aligned_offset_realloc_dbg - Calls to _aligned_offset_realloc_dbg from msvcrXXd.dll are patched @@ -534,8 +534,8 @@ void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem, // // Returns the value returned by _aligned_offset_realloc_dbg. // -template -void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void *mem, +template +void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void *mem, size_t size, size_t alignment, size_t offset, @@ -549,7 +549,7 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_realloc_dbg(pcrtxxd__realloc_dbg, context, mem, size, alignment, offset, type, file, line); + return vld.__aligned_offset_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, offset, type, file, line); } // crtd__aligned_recalloc_dbg - Calls to _aligned_recalloc_dbg from msvcrXXd.dll are patched @@ -572,8 +572,8 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void // // Returns the value returned by _aligned_realloc_dbg. // -template -void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *mem, +template +void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *mem, size_t num, size_t size, size_t alignment, @@ -587,7 +587,7 @@ void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *mem, context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_recalloc_dbg(pcrtxxd__recalloc_dbg, context, mem, num, size, alignment, type, file, line); + return vld.__aligned_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, type, file, line); } // crtd__aligned_offset_recalloc_dbg - Calls to _aligned_offset_realloc_dbg from msvcrXXd.dll are patched @@ -610,8 +610,8 @@ void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *mem, // // Returns the value returned by _aligned_offset_realloc_dbg. // -template -void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void *mem, +template +void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void *mem, size_t num, size_t size, size_t alignment, @@ -626,7 +626,7 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_recalloc_dbg(pcrtxxd__recalloc_dbg, context, mem, num, size, alignment, offset, type, file, line); + return vld.__aligned_offset_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, offset, type, file, line); } // crtd__aligned_malloc - Calls to malloc from msvcrXXd.dll are patched through to @@ -640,8 +640,8 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void // // Returns the valued returned from malloc. // -template -void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t alignment) +template +void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t alignment) { _aligned_malloc_t pcrtxxd_malloc = (_aligned_malloc_t)pcrtd_aligned_malloc; assert(pcrtxxd_malloc); @@ -649,7 +649,7 @@ void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t ali context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_malloc(pcrtxxd_malloc, context, size, alignment); + return vld.__aligned_malloc(pcrtxxd_malloc, context, debug, size, alignment); } // crtd__aligned_offset_malloc - Calls to malloc from msvcrXXd.dll are patched through to @@ -663,8 +663,8 @@ void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t ali // // Returns the valued returned from malloc. // -template -void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset) +template +void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset) { _aligned_offset_malloc_t pcrtxxd_malloc = (_aligned_offset_malloc_t)pcrtd_aligned_offset_malloc; assert(pcrtxxd_malloc); @@ -672,7 +672,7 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, siz context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_malloc(pcrtxxd_malloc, context, size, alignment, offset); + return vld.__aligned_offset_malloc(pcrtxxd_malloc, context, debug, size, alignment, offset); } // crtd__aligned_realloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -688,8 +688,8 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, siz // // Returns the value returned from realloc. // -template -void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t size, size_t alignment) +template +void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t size, size_t alignment) { _aligned_realloc_t pcrtxxd_realloc = (_aligned_realloc_t)pcrtd_aligned_realloc; assert(pcrtxxd_realloc); @@ -697,7 +697,7 @@ void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t size context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_realloc(pcrtxxd_realloc, context, mem, size, alignment); + return vld.__aligned_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment); } // crtd__aligned_offset_realloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -713,8 +713,8 @@ void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t size // // Returns the value returned from realloc. // -template -void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, size_t size, size_t alignment, size_t offset) +template +void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, size_t size, size_t alignment, size_t offset) { _aligned_offset_realloc_t pcrtxxd_realloc = (_aligned_offset_realloc_t)pcrtd_aligned_offset_realloc; assert(pcrtxxd_realloc); @@ -722,7 +722,7 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, size context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_realloc(pcrtxxd_realloc, context, mem, size, alignment, offset); + return vld.__aligned_offset_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment, offset); } // crtd__aligned_recalloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -740,8 +740,8 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, size // // Returns the value returned from realloc. // -template -void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t num, size_t size, size_t alignment) +template +void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t num, size_t size, size_t alignment) { _aligned_recalloc_t pcrtxxd_recalloc = (_aligned_recalloc_t)pcrtd_aligned_recalloc; assert(pcrtxxd_recalloc); @@ -749,7 +749,7 @@ void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t num context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_recalloc(pcrtxxd_recalloc, context, mem, num, size, alignment); + return vld.__aligned_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment); } // crtd__aligned_offset_recalloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -767,8 +767,8 @@ void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t num // // Returns the value returned from realloc. // -template -void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, size_t num, size_t size, size_t alignment, size_t offset) +template +void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, size_t num, size_t size, size_t alignment, size_t offset) { _aligned_offset_recalloc_t pcrtxxd_recalloc = (_aligned_offset_recalloc_t)pcrtd_aligned_offset_recalloc; assert(pcrtxxd_recalloc); @@ -776,7 +776,7 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, siz context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_recalloc(pcrtxxd_recalloc, context, mem, num, size, alignment, offset); + return vld.__aligned_offset_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment, offset); } // crtd_scalar_new - Calls to the CRT's scalar new operator from msvcrXXd.dll @@ -788,8 +788,8 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, siz // // Returns the value returned by the CRT scalar new operator. // -template -void* CrtMfcPatch::crtd_scalar_new (size_t size) +template +void* CrtMfcPatch::crtd_scalar_new (size_t size) { new_t pcrtxxd_scalar_new = (new_t)pcrtd_scalar_new; assert(pcrtxxd_scalar_new); @@ -797,7 +797,7 @@ void* CrtMfcPatch::crtd_scalar_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pcrtxxd_scalar_new, context, size); + return vld._new(pcrtxxd_scalar_new, context, debug, size); } // crtd_vector_new - Calls to the CRT's vector new operator from msvcrXXd.dll @@ -809,8 +809,8 @@ void* CrtMfcPatch::crtd_scalar_new (size_t size) // // Returns the value returned by the CRT vector new operator. // -template -void* CrtMfcPatch::crtd_vector_new (size_t size) +template +void* CrtMfcPatch::crtd_vector_new (size_t size) { new_t pcrtxxd_scalar_new = (new_t)pcrtd_vector_new; assert(pcrtxxd_scalar_new); @@ -818,7 +818,7 @@ void* CrtMfcPatch::crtd_vector_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pcrtxxd_scalar_new, context, size); + return vld._new(pcrtxxd_scalar_new, context, debug, size); } //////////////////////////////////////////////////////////////////////////////// @@ -843,8 +843,8 @@ void* CrtMfcPatch::crtd_vector_new (size_t size) // // Returns the value returned by the MFC debug scalar new operator. // -template -void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size, +template +void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size, int type, char const *file, int line) @@ -872,8 +872,8 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size, // // Returns the value returned by the MFC debug scalar new operator. // -template -void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size, +template +void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size, char const *file, int line) { @@ -902,8 +902,8 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size, // // Returns the value returned by the MFC debug vector new operator. // -template -void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size, +template +void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size, int type, char const *file, int line) @@ -931,8 +931,8 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size, // // Returns the value returned by the MFC debug vector new operator. // -template -void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, +template +void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, char const *file, int line) { @@ -954,8 +954,8 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, // // Returns the value returned by the MFC scalar new operator. // -template -void* CrtMfcPatch::mfcd_scalar_new (size_t size) +template +void* CrtMfcPatch::mfcd_scalar_new (size_t size) { new_t pmfcxxd_new = (new_t)pmfcd_scalar_new; assert(pmfcxxd_new); @@ -963,7 +963,7 @@ void* CrtMfcPatch::mfcd_scalar_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pmfcxxd_new, context, size); + return vld._new(pmfcxxd_new, context, debug, size); } // mfcd_vector_new - Calls to the MFC vector new operator from mfcXXd.dll are @@ -975,8 +975,8 @@ void* CrtMfcPatch::mfcd_scalar_new (size_t size) // // Returns the value returned by the MFC vector new operator. // -template -void* CrtMfcPatch::mfcd_vector_new (size_t size) +template +void* CrtMfcPatch::mfcd_vector_new (size_t size) { new_t pmfcxxd_new = (new_t)pmfcd_vector_new; assert(pmfcxxd_new); @@ -984,7 +984,7 @@ void* CrtMfcPatch::mfcd_vector_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pmfcxxd_new, context, size); + return vld._new(pmfcxxd_new, context, debug, size); } // mfcud__scalar_new_dbg_4p - Calls to the MFC debug scalar new operator from @@ -1003,8 +1003,8 @@ void* CrtMfcPatch::mfcd_vector_new (size_t size) // // Returns the value returned by the MFC debug scalar new operator. // -template -void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size, +template +void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size, int type, char const *file, int line) @@ -1032,8 +1032,8 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size, // // Returns the value returned by the MFC debug scalar new operator. // -template -void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size, +template +void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line) { @@ -1062,8 +1062,8 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size, // // Returns the value returned by the MFC debug vector new operator. // -template -void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size, +template +void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size, int type, char const *file, int line) @@ -1091,8 +1091,8 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size, // // Returns the value returned by the MFC debug vector new operator. // -template -void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size, +template +void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size, char const *file, int line) { @@ -1114,8 +1114,8 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size, // // Returns the value returned by the MFC scalar new operator. // -template -void* CrtMfcPatch::mfcud_scalar_new (size_t size) +template +void* CrtMfcPatch::mfcud_scalar_new (size_t size) { new_t pmfcxxd_new = (new_t)pmfcud_scalar_new; assert(pmfcxxd_new); @@ -1123,7 +1123,7 @@ void* CrtMfcPatch::mfcud_scalar_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pmfcxxd_new, context, size); + return vld._new(pmfcxxd_new, context, debug, size); } // mfcud_vector_new - Calls to the MFC vector new operator from mfcXXud.dll are @@ -1135,8 +1135,8 @@ void* CrtMfcPatch::mfcud_scalar_new (size_t size) // // Returns the value returned by the MFC vector new operator. // -template -void* CrtMfcPatch::mfcud_vector_new (size_t size) +template +void* CrtMfcPatch::mfcud_vector_new (size_t size) { new_t pmfcxxd_new = (new_t)pmfcud_vector_new; assert(pmfcxxd_new); @@ -1144,7 +1144,7 @@ void* CrtMfcPatch::mfcud_vector_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pmfcxxd_new, context, size); + return vld._new(pmfcxxd_new, context, debug, size); } #ifndef WIN64 @@ -1169,22 +1169,34 @@ const extern char vector_new_name[] = "??_U@YAPEAX_K@Z"; // Visual Studio 6.0 typedef CrtMfcPatch<60> - VS60; + VS60; +typedef CrtMfcPatch<60, true> + VS60d; // Visual Studio .NET 2002 typedef CrtMfcPatch<70> - VS70; + VS70; +typedef CrtMfcPatch<70, true> + VS70d; // Visual Studio .NET 2003 typedef CrtMfcPatch<71> - VS71; + VS71; +typedef CrtMfcPatch<71, true> + VS71d; // Visual Studio 2005 typedef CrtMfcPatch<80> - VS80; + VS80; +typedef CrtMfcPatch<80, true> + VS80d; // Visual Studio 2008 typedef CrtMfcPatch<90> - VS90; + VS90; +typedef CrtMfcPatch<90, true> + VS90d; // Visual Studio 2010 typedef CrtMfcPatch<100> - VS100; + VS100; +typedef CrtMfcPatch<100, true> + VS100d; void* VS60::pcrtd__calloc_dbg = NULL; void* VS60::pcrtd__malloc_dbg = NULL; @@ -1223,6 +1235,43 @@ void* VS60::pmfcud__vector_new_dbg_4p = NULL; void* VS60::pmfcud__scalar_new_dbg_3p = NULL; void* VS60::pmfcud__vector_new_dbg_3p = NULL; +void* VS60d::pcrtd__calloc_dbg = NULL; +void* VS60d::pcrtd__malloc_dbg = NULL; +void* VS60d::pcrtd__realloc_dbg = NULL; +void* VS60d::pcrtd__recalloc_dbg = NULL; +void* VS60d::pcrtd_calloc = NULL; +void* VS60d::pcrtd_malloc = NULL; +void* VS60d::pcrtd_realloc = NULL; +void* VS60d::pcrtd_recalloc = NULL; +void* VS60d::pcrtd__aligned_malloc_dbg = NULL; +void* VS60d::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS60d::pcrtd__aligned_realloc_dbg = NULL; +void* VS60d::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS60d::pcrtd__aligned_recalloc_dbg = NULL; +void* VS60d::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS60d::pcrtd_aligned_malloc = NULL; +void* VS60d::pcrtd_aligned_offset_malloc = NULL; +void* VS60d::pcrtd_aligned_realloc = NULL; +void* VS60d::pcrtd_aligned_offset_realloc = NULL; +void* VS60d::pcrtd_aligned_recalloc = NULL; +void* VS60d::pcrtd_aligned_offset_recalloc = NULL; +void* VS60d::pcrtd__scalar_new_dbg = NULL; +void* VS60d::pcrtd__vector_new_dbg = NULL; +void* VS60d::pcrtd_scalar_new = NULL; +void* VS60d::pcrtd_vector_new = NULL; +void* VS60d::pmfcd_scalar_new = NULL; +void* VS60d::pmfcd_vector_new = NULL; +void* VS60d::pmfcd__scalar_new_dbg_4p = NULL; +void* VS60d::pmfcd__vector_new_dbg_4p = NULL; +void* VS60d::pmfcd__scalar_new_dbg_3p = NULL; +void* VS60d::pmfcd__vector_new_dbg_3p = NULL; +void* VS60d::pmfcud_scalar_new = NULL; +void* VS60d::pmfcud_vector_new = NULL; +void* VS60d::pmfcud__scalar_new_dbg_4p = NULL; +void* VS60d::pmfcud__vector_new_dbg_4p = NULL; +void* VS60d::pmfcud__scalar_new_dbg_3p = NULL; +void* VS60d::pmfcud__vector_new_dbg_3p = NULL; + void* VS70::pcrtd__calloc_dbg = NULL; void* VS70::pcrtd__malloc_dbg = NULL; void* VS70::pcrtd__realloc_dbg = NULL; @@ -1260,6 +1309,43 @@ void* VS70::pmfcud__vector_new_dbg_4p = NULL; void* VS70::pmfcud__scalar_new_dbg_3p = NULL; void* VS70::pmfcud__vector_new_dbg_3p = NULL; +void* VS70d::pcrtd__calloc_dbg = NULL; +void* VS70d::pcrtd__malloc_dbg = NULL; +void* VS70d::pcrtd__realloc_dbg = NULL; +void* VS70d::pcrtd__recalloc_dbg = NULL; +void* VS70d::pcrtd_calloc = NULL; +void* VS70d::pcrtd_malloc = NULL; +void* VS70d::pcrtd_realloc = NULL; +void* VS70d::pcrtd_recalloc = NULL; +void* VS70d::pcrtd__aligned_malloc_dbg = NULL; +void* VS70d::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS70d::pcrtd__aligned_realloc_dbg = NULL; +void* VS70d::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS70d::pcrtd__aligned_recalloc_dbg = NULL; +void* VS70d::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS70d::pcrtd_aligned_malloc = NULL; +void* VS70d::pcrtd_aligned_offset_malloc = NULL; +void* VS70d::pcrtd_aligned_realloc = NULL; +void* VS70d::pcrtd_aligned_offset_realloc = NULL; +void* VS70d::pcrtd_aligned_recalloc = NULL; +void* VS70d::pcrtd_aligned_offset_recalloc = NULL; +void* VS70d::pcrtd__scalar_new_dbg = NULL; +void* VS70d::pcrtd__vector_new_dbg = NULL; +void* VS70d::pcrtd_scalar_new = NULL; +void* VS70d::pcrtd_vector_new = NULL; +void* VS70d::pmfcd_scalar_new = NULL; +void* VS70d::pmfcd_vector_new = NULL; +void* VS70d::pmfcd__scalar_new_dbg_4p = NULL; +void* VS70d::pmfcd__vector_new_dbg_4p = NULL; +void* VS70d::pmfcd__scalar_new_dbg_3p = NULL; +void* VS70d::pmfcd__vector_new_dbg_3p = NULL; +void* VS70d::pmfcud_scalar_new = NULL; +void* VS70d::pmfcud_vector_new = NULL; +void* VS70d::pmfcud__scalar_new_dbg_4p = NULL; +void* VS70d::pmfcud__vector_new_dbg_4p = NULL; +void* VS70d::pmfcud__scalar_new_dbg_3p = NULL; +void* VS70d::pmfcud__vector_new_dbg_3p = NULL; + void* VS71::pcrtd__calloc_dbg = NULL; void* VS71::pcrtd__malloc_dbg = NULL; void* VS71::pcrtd__realloc_dbg = NULL; @@ -1297,6 +1383,43 @@ void* VS71::pmfcud__vector_new_dbg_4p = NULL; void* VS71::pmfcud__scalar_new_dbg_3p = NULL; void* VS71::pmfcud__vector_new_dbg_3p = NULL; +void* VS71d::pcrtd__calloc_dbg = NULL; +void* VS71d::pcrtd__malloc_dbg = NULL; +void* VS71d::pcrtd__realloc_dbg = NULL; +void* VS71d::pcrtd__recalloc_dbg = NULL; +void* VS71d::pcrtd_calloc = NULL; +void* VS71d::pcrtd_malloc = NULL; +void* VS71d::pcrtd_realloc = NULL; +void* VS71d::pcrtd_recalloc = NULL; +void* VS71d::pcrtd__aligned_malloc_dbg = NULL; +void* VS71d::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS71d::pcrtd__aligned_realloc_dbg = NULL; +void* VS71d::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS71d::pcrtd__aligned_recalloc_dbg = NULL; +void* VS71d::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS71d::pcrtd_aligned_malloc = NULL; +void* VS71d::pcrtd_aligned_offset_malloc = NULL; +void* VS71d::pcrtd_aligned_realloc = NULL; +void* VS71d::pcrtd_aligned_offset_realloc = NULL; +void* VS71d::pcrtd_aligned_recalloc = NULL; +void* VS71d::pcrtd_aligned_offset_recalloc = NULL; +void* VS71d::pcrtd__scalar_new_dbg = NULL; +void* VS71d::pcrtd__vector_new_dbg = NULL; +void* VS71d::pcrtd_scalar_new = NULL; +void* VS71d::pcrtd_vector_new = NULL; +void* VS71d::pmfcd_scalar_new = NULL; +void* VS71d::pmfcd_vector_new = NULL; +void* VS71d::pmfcd__scalar_new_dbg_4p = NULL; +void* VS71d::pmfcd__vector_new_dbg_4p = NULL; +void* VS71d::pmfcd__scalar_new_dbg_3p = NULL; +void* VS71d::pmfcd__vector_new_dbg_3p = NULL; +void* VS71d::pmfcud_scalar_new = NULL; +void* VS71d::pmfcud_vector_new = NULL; +void* VS71d::pmfcud__scalar_new_dbg_4p = NULL; +void* VS71d::pmfcud__vector_new_dbg_4p = NULL; +void* VS71d::pmfcud__scalar_new_dbg_3p = NULL; +void* VS71d::pmfcud__vector_new_dbg_3p = NULL; + void* VS80::pcrtd__calloc_dbg = NULL; void* VS80::pcrtd__malloc_dbg = NULL; void* VS80::pcrtd__realloc_dbg = NULL; @@ -1334,6 +1457,43 @@ void* VS80::pmfcud__vector_new_dbg_4p = NULL; void* VS80::pmfcud__scalar_new_dbg_3p = NULL; void* VS80::pmfcud__vector_new_dbg_3p = NULL; +void* VS80d::pcrtd__calloc_dbg = NULL; +void* VS80d::pcrtd__malloc_dbg = NULL; +void* VS80d::pcrtd__realloc_dbg = NULL; +void* VS80d::pcrtd__recalloc_dbg = NULL; +void* VS80d::pcrtd_calloc = NULL; +void* VS80d::pcrtd_malloc = NULL; +void* VS80d::pcrtd_realloc = NULL; +void* VS80d::pcrtd_recalloc = NULL; +void* VS80d::pcrtd__aligned_malloc_dbg = NULL; +void* VS80d::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS80d::pcrtd__aligned_realloc_dbg = NULL; +void* VS80d::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS80d::pcrtd__aligned_recalloc_dbg = NULL; +void* VS80d::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS80d::pcrtd_aligned_malloc = NULL; +void* VS80d::pcrtd_aligned_offset_malloc = NULL; +void* VS80d::pcrtd_aligned_realloc = NULL; +void* VS80d::pcrtd_aligned_offset_realloc = NULL; +void* VS80d::pcrtd_aligned_recalloc = NULL; +void* VS80d::pcrtd_aligned_offset_recalloc = NULL; +void* VS80d::pcrtd__scalar_new_dbg = NULL; +void* VS80d::pcrtd__vector_new_dbg = NULL; +void* VS80d::pcrtd_scalar_new = NULL; +void* VS80d::pcrtd_vector_new = NULL; +void* VS80d::pmfcd_scalar_new = NULL; +void* VS80d::pmfcd_vector_new = NULL; +void* VS80d::pmfcd__scalar_new_dbg_4p = NULL; +void* VS80d::pmfcd__vector_new_dbg_4p = NULL; +void* VS80d::pmfcd__scalar_new_dbg_3p = NULL; +void* VS80d::pmfcd__vector_new_dbg_3p = NULL; +void* VS80d::pmfcud_scalar_new = NULL; +void* VS80d::pmfcud_vector_new = NULL; +void* VS80d::pmfcud__scalar_new_dbg_4p = NULL; +void* VS80d::pmfcud__vector_new_dbg_4p = NULL; +void* VS80d::pmfcud__scalar_new_dbg_3p = NULL; +void* VS80d::pmfcud__vector_new_dbg_3p = NULL; + void* VS90::pcrtd__calloc_dbg = NULL; void* VS90::pcrtd__malloc_dbg = NULL; void* VS90::pcrtd__realloc_dbg = NULL; @@ -1371,6 +1531,43 @@ void* VS90::pmfcud__vector_new_dbg_4p = NULL; void* VS90::pmfcud__scalar_new_dbg_3p = NULL; void* VS90::pmfcud__vector_new_dbg_3p = NULL; +void* VS90d::pcrtd__calloc_dbg = NULL; +void* VS90d::pcrtd__malloc_dbg = NULL; +void* VS90d::pcrtd__realloc_dbg = NULL; +void* VS90d::pcrtd__recalloc_dbg = NULL; +void* VS90d::pcrtd_calloc = NULL; +void* VS90d::pcrtd_malloc = NULL; +void* VS90d::pcrtd_realloc = NULL; +void* VS90d::pcrtd_recalloc = NULL; +void* VS90d::pcrtd__aligned_malloc_dbg = NULL; +void* VS90d::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS90d::pcrtd__aligned_realloc_dbg = NULL; +void* VS90d::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS90d::pcrtd__aligned_recalloc_dbg = NULL; +void* VS90d::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS90d::pcrtd_aligned_malloc = NULL; +void* VS90d::pcrtd_aligned_offset_malloc = NULL; +void* VS90d::pcrtd_aligned_realloc = NULL; +void* VS90d::pcrtd_aligned_offset_realloc = NULL; +void* VS90d::pcrtd_aligned_recalloc = NULL; +void* VS90d::pcrtd_aligned_offset_recalloc = NULL; +void* VS90d::pcrtd__scalar_new_dbg = NULL; +void* VS90d::pcrtd__vector_new_dbg = NULL; +void* VS90d::pcrtd_scalar_new = NULL; +void* VS90d::pcrtd_vector_new = NULL; +void* VS90d::pmfcd_scalar_new = NULL; +void* VS90d::pmfcd_vector_new = NULL; +void* VS90d::pmfcd__scalar_new_dbg_4p = NULL; +void* VS90d::pmfcd__vector_new_dbg_4p = NULL; +void* VS90d::pmfcd__scalar_new_dbg_3p = NULL; +void* VS90d::pmfcd__vector_new_dbg_3p = NULL; +void* VS90d::pmfcud_scalar_new = NULL; +void* VS90d::pmfcud_vector_new = NULL; +void* VS90d::pmfcud__scalar_new_dbg_4p = NULL; +void* VS90d::pmfcud__vector_new_dbg_4p = NULL; +void* VS90d::pmfcud__scalar_new_dbg_3p = NULL; +void* VS90d::pmfcud__vector_new_dbg_3p = NULL; + void* VS100::pcrtd__calloc_dbg = NULL; void* VS100::pcrtd__malloc_dbg = NULL; void* VS100::pcrtd__realloc_dbg = NULL; @@ -1407,3 +1604,40 @@ void* VS100::pmfcud__scalar_new_dbg_4p = NULL; void* VS100::pmfcud__vector_new_dbg_4p = NULL; void* VS100::pmfcud__scalar_new_dbg_3p = NULL; void* VS100::pmfcud__vector_new_dbg_3p = NULL; + +void* VS100d::pcrtd__calloc_dbg = NULL; +void* VS100d::pcrtd__malloc_dbg = NULL; +void* VS100d::pcrtd__realloc_dbg = NULL; +void* VS100d::pcrtd__recalloc_dbg = NULL; +void* VS100d::pcrtd_calloc = NULL; +void* VS100d::pcrtd_malloc = NULL; +void* VS100d::pcrtd_realloc = NULL; +void* VS100d::pcrtd_recalloc = NULL; +void* VS100d::pcrtd__aligned_malloc_dbg = NULL; +void* VS100d::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS100d::pcrtd__aligned_realloc_dbg = NULL; +void* VS100d::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS100d::pcrtd__aligned_recalloc_dbg = NULL; +void* VS100d::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS100d::pcrtd_aligned_malloc = NULL; +void* VS100d::pcrtd_aligned_offset_malloc = NULL; +void* VS100d::pcrtd_aligned_realloc = NULL; +void* VS100d::pcrtd_aligned_offset_realloc = NULL; +void* VS100d::pcrtd_aligned_recalloc = NULL; +void* VS100d::pcrtd_aligned_offset_recalloc = NULL; +void* VS100d::pcrtd__scalar_new_dbg = NULL; +void* VS100d::pcrtd__vector_new_dbg = NULL; +void* VS100d::pcrtd_scalar_new = NULL; +void* VS100d::pcrtd_vector_new = NULL; +void* VS100d::pmfcd_scalar_new = NULL; +void* VS100d::pmfcd_vector_new = NULL; +void* VS100d::pmfcd__scalar_new_dbg_4p = NULL; +void* VS100d::pmfcd__vector_new_dbg_4p = NULL; +void* VS100d::pmfcd__scalar_new_dbg_3p = NULL; +void* VS100d::pmfcd__vector_new_dbg_3p = NULL; +void* VS100d::pmfcud_scalar_new = NULL; +void* VS100d::pmfcud_vector_new = NULL; +void* VS100d::pmfcud__scalar_new_dbg_4p = NULL; +void* VS100d::pmfcud__vector_new_dbg_4p = NULL; +void* VS100d::pmfcud__scalar_new_dbg_3p = NULL; +void* VS100d::pmfcud__vector_new_dbg_3p = NULL; diff --git a/mfc_detect/vldmfc.cpp b/mfc_detect/vldmfc.cpp new file mode 100644 index 00000000..17096166 --- /dev/null +++ b/mfc_detect/vldmfc.cpp @@ -0,0 +1,290 @@ +#include "stdafx.h" +#include "vldmfc.h" + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp + +BEGIN_MESSAGE_MAP(CMFCExampleApp, CWinApp) +END_MESSAGE_MAP() + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp construction + +CMFCExampleApp::CMFCExampleApp() +{ + // TODO: add construction code here, + // Place all significant initialization in InitInstance +} + +///////////////////////////////////////////////////////////////////////////// +// The one and only CMFCExampleApp object + +CMFCExampleApp theApp; + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp initialization +/// Efficiently searches a module's name pointer table (NPT) for the named +/// procedure. +/// +/// @param[in] npt Address of the NPT to search. +/// +/// @param[in] size Number of entries in the NPT. +/// +/// @param[in] base Base address of the module containing the NPT. This is +/// used to resolve addresses in the NPT (which are relative +/// to the module's base address). +/// +/// @param[in] proc String containing the name of the procedure to search +/// for. +/// +/// @return Returns the index into the NPT of the entry matching the named +/// procedure. If no such matching entry exists, the function returns +/// -1. +/// +DWORD FindNptProc (PDWORD npt, DWORD size, PBYTE base, void* proc) +{ + for (DWORD i = 0; i < size; i++) + { + void* p = (void*)(npt[i] + base); + if (p == proc) + return i; + } + + return -1; +} + +/// Gets a pointer to a module's export directory table (EDT). +/// +/// @param[in] module Handle to the module (as returned by GetModuleHandle). +/// +/// @return Returns a pointer to the module's EDT. If there is an error (e.g. +/// if the module handle is invalid or the module has no EDT) the +/// function will return NULL. +/// +PIMAGE_EXPORT_DIRECTORY GetExportDirectoryTable (HMODULE module) +{ + PBYTE base; // base address of module + PIMAGE_FILE_HEADER cfh; // COFF file header + PIMAGE_EXPORT_DIRECTORY edt; // export directory table (EDT) + DWORD rva; // relative virtual address of EDT + PIMAGE_DOS_HEADER mds; // MS-DOS stub + PIMAGE_OPTIONAL_HEADER oh; // so-called "optional" header + PDWORD sig; // PE signature + + // Start at the base of the module. The MS-DOS stub begins there. + base = (PBYTE)module; + mds = (PIMAGE_DOS_HEADER)module; + + // Get the PE signature and verify it. + sig = (DWORD *)(base + mds->e_lfanew); + if (IMAGE_NT_SIGNATURE != *sig) { + // Bad signature -- invalid image or module handle + return NULL; + } + + // Get the COFF file header. + cfh = (PIMAGE_FILE_HEADER)(sig + 1); + + // Get the "optional" header (it's not actually optional for executables). + oh = (PIMAGE_OPTIONAL_HEADER)(cfh + 1); + + // Finally, get the export directory table. + if (IMAGE_DIRECTORY_ENTRY_EXPORT >= oh->NumberOfRvaAndSizes) { + // This image doesn't have an export directory table. + return NULL; + } + rva = oh->DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress; + edt = (PIMAGE_EXPORT_DIRECTORY)(base + rva); + + return edt; +} + +/// Gets the o of an exported procedure. +/// +/// @param[in] module Handle (as returned by GetModuleHandle) of the module +/// that exports the procedure. +/// +/// @param[in] proc String containing the name of the procedure. +/// +/// @return Returns the procedure's o. If an o for the procedure +/// could not be located (e.g. if the named procedure is not exported +/// by the specified module) then the function will return -1. +/// +DWORD GetProcOrdinal (HMODULE module, void* proc) +{ + PBYTE base; // module base address + PIMAGE_EXPORT_DIRECTORY edt; // export directory table (EDT) + DWORD i; // index into NPT and/or EOT + PDWORD npt; // name pointer table (NPT) + + base = (PBYTE)module; + + // Get the export directory table, from which we can find the name pointer + // table and export o table. + edt = GetExportDirectoryTable(module); + + // Get the name pointer table and search it for the named procedure. + _ASSERT(edt->NumberOfFunctions); + npt = (DWORD *)(base + edt->AddressOfFunctions); + i = FindNptProc(npt, edt->NumberOfFunctions, base, proc); + if (-1 == i) { + // The procedure was not found in the module's name pointer table. + return -1; + } + + // Actual o is o from EOT plus "o base" from EDT. + return i + edt->Base; +} + +LPVOID FindRealCode(LPVOID pCode) +{ + LPVOID result = pCode; + if (pCode != NULL) + { + if (*(WORD *) pCode == 0x25ff) + { + DWORD addr = *((DWORD *) ((ULONG_PTR) pCode + 2)); +#ifdef _WIN64 + // RIP relative addressing + PBYTE pNextInst = (PBYTE) ((ULONG_PTR) pCode + 6); + pCode = *(LPVOID*) (pNextInst + addr); + return pCode; +#else + pCode = *(LPVOID*) (addr); + return FindRealCode(pCode); +#endif + } + else if (*(BYTE *) pCode == 0xE9) + { + // Relative next instruction + PBYTE pNextInst = (PBYTE) ((ULONG_PTR) pCode + 5); + LONG offset = *((LONG *) ((ULONG_PTR) pCode + 1)); + pCode = (LPVOID*)(pNextInst + offset); + return FindRealCode(pCode); + } + } + return result; +} + +void SetClipboardText(LPCTSTR pszText) +{ + const size_t len = (_tcslen(pszText) + 1) * sizeof(pszText[0]); + HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, len); + memcpy(GlobalLock(hMem), pszText, len); + GlobalUnlock(hMem); + if(OpenClipboard(NULL)) + { + EmptyClipboard(); +#ifndef _UNICODE + HANDLE handle = SetClipboardData(CF_TEXT, hMem); +#else + HANDLE handle = SetClipboardData(CF_UNICODETEXT, hMem); +#endif + CloseClipboard(); + } +} + +#pragma optimize("", off) + +typedef void* (__cdecl *new_t) (size_t); +typedef void* (__cdecl *new_dbg_crt_t) (size_t, int, const char *, int); +typedef void* (__cdecl *new_dbg_mfc_t) (size_t, const char *, int); + +BOOL CMFCExampleApp::InitInstance() +{ + new_t new_array_f = &(::operator new[]); + new_dbg_crt_t new_dbg_crt_array_f = &(::operator new[]); +#ifdef _DEBUG + new_dbg_mfc_t new_dbg_mfc_array_f = &(::operator new[]); +#endif + new_t new_f = &(::operator new); + new_dbg_crt_t new_dbg_crt_f = &(::operator new); +#ifdef _DEBUG + new_dbg_mfc_t new_dbg_mfc_f = &(::operator new); +#endif + + void* p1 = FindRealCode(new_array_f); + void* p2 = FindRealCode(new_dbg_crt_array_f); +#ifdef _DEBUG + void* p3 = FindRealCode(new_dbg_mfc_array_f); +#endif + void* p4 = FindRealCode(new_f); + void* p5 = FindRealCode(new_dbg_crt_f); +#ifdef _DEBUG + void* p6 = FindRealCode(new_dbg_mfc_f); +#endif + +#ifdef _DEBUG +#ifndef _UNICODE +#if _MFC_VER == 0x0700 // VS 2003 +#define MFCDLLNAME _T("mfc70d.dll") +#elif _MFC_VER == 0x0800 // VS 2005 +#define MFCDLLNAME _T("mfc80d.dll") +#elif _MFC_VER == 0x0900 // VS 2008 +#define MFCDLLNAME _T("mfc90d.dll") +#elif _MFC_VER == 0x0A00 // VS 2010 +#define MFCDLLNAME _T("mfc100d.dll") +#endif +#else +#if _MFC_VER == 0x0700 // VS 2003 +#define MFCDLLNAME _T("mfc70ud.dll") +#elif _MFC_VER == 0x0800 // VS 2005 +#define MFCDLLNAME _T("mfc80ud.dll") +#elif _MFC_VER == 0x0900 // VS 2008 +#define MFCDLLNAME _T("mfc90ud.dll") +#elif _MFC_VER == 0x0A00 // VS 2010 +#define MFCDLLNAME _T("mfc100ud.dll") +#endif +#endif +#else +#ifndef _UNICODE +#if _MFC_VER == 0x0700 // VS 2003 +#define MFCDLLNAME _T("mfc70.dll") +#elif _MFC_VER == 0x0800 // VS 2005 +#define MFCDLLNAME _T("mfc80.dll") +#elif _MFC_VER == 0x0900 // VS 2008 +#define MFCDLLNAME _T("mfc90.dll") +#elif _MFC_VER == 0x0A00 // VS 2010 +#define MFCDLLNAME _T("mfc100.dll") +#endif +#else +#if _MFC_VER == 0x0700 // VS 2003 +#define MFCDLLNAME _T("mfc70u.dll") +#elif _MFC_VER == 0x0800 // VS 2005 +#define MFCDLLNAME _T("mfc80u.dll") +#elif _MFC_VER == 0x0900 // VS 2008 +#define MFCDLLNAME _T("mfc90u.dll") +#elif _MFC_VER == 0x0A00 // VS 2010 +#define MFCDLLNAME _T("mfc100u.dll") +#endif +#endif +#endif + + HMODULE module = GetModuleHandle(MFCDLLNAME); + if (NULL == module) + return FALSE; + + int o1 = GetProcOrdinal(module, p1); + int o2 = GetProcOrdinal(module, p2); +#ifdef _DEBUG + int o3 = GetProcOrdinal(module, p3); +#else + int o3 = -2; +#endif + int o4 = GetProcOrdinal(module, p4); + int o5 = GetProcOrdinal(module, p5); +#ifdef _DEBUG + int o6 = GetProcOrdinal(module, p6); +#else + int o6 = -2; +#endif + + TCHAR msg[256]; + _stprintf(msg, _T("%d, %d, %d, %d, %d, %d"), + o1, o2, o3, o4, o5, o6); + SetClipboardText(msg); + MessageBox(NULL, msg, _T("MFC ordinals"), + MB_ICONINFORMATION | MB_OK); + + return FALSE; +} diff --git a/mfc_detect/vldmfc_detect.vcxproj b/mfc_detect/vldmfc_detect.vcxproj new file mode 100644 index 00000000..7ebc05c5 --- /dev/null +++ b/mfc_detect/vldmfc_detect.vcxproj @@ -0,0 +1,611 @@ + + + + + Debug (Unicode) + Win32 + + + Debug (Unicode) + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release (Unicode) + Win32 + + + Release (Unicode) + x64 + + + Release + Win32 + + + Release + x64 + + + + {A231973E-072A-428E-982E-5363ADD1CDE2} + MFCProj + + + + Application + Dynamic + Unicode + + + Application + Dynamic + NotSet + + + Application + Dynamic + NotSet + + + Application + Dynamic + Unicode + + + Application + Dynamic + Unicode + + + Application + Dynamic + NotSet + + + Application + Dynamic + NotSet + + + Application + Dynamic + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(Configuration)\ + $(Configuration)\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + AllRules.ruleset + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Release;%(AdditionalLibraryDirectories) + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX86 + true + + + true + .\Release/vldmfc.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Release;%(AdditionalLibraryDirectories) + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX86 + true + + + true + .\Release/vldmfc.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Release;%(AdditionalLibraryDirectories) + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX64 + true + + + true + .\Release/vldmfc.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Release;%(AdditionalLibraryDirectories) + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX64 + true + + + true + .\Release/vldmfc.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Debug;%(AdditionalLibraryDirectories) + true + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Debug;%(AdditionalLibraryDirectories) + true + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX64 + + + true + .\Debug/vldmfc.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Debug;%(AdditionalLibraryDirectories) + true + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + $(IntDir)$(TargetName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(ProjectName).exe + true + ..\Debug;%(AdditionalLibraryDirectories) + true + $(TargetDir)$(TargetName).pdb + Windows + false + + + MachineX64 + + + true + .\Debug/vldmfc.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + Create + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + Create + Create + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + Create + Create + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mfc_detect/vldmfc_detect_vs08.sln b/mfc_detect/vldmfc_detect_vs08.sln new file mode 100644 index 00000000..2953b5b8 --- /dev/null +++ b/mfc_detect/vldmfc_detect_vs08.sln @@ -0,0 +1,38 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect_vs08", "vldmfc_detect_vs08.vcproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug (Unicode)|Win32 = Debug (Unicode)|Win32 + Debug (Unicode)|x64 = Debug (Unicode)|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release (Unicode)|Win32 = Release (Unicode)|Win32 + Release (Unicode)|x64 = Release (Unicode)|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|Win32.ActiveCfg = Release (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|Win32.Build.0 = Release (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|x64.ActiveCfg = Release (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|x64.Build.0 = Release (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/mfc_detect/vldmfc_detect_vs08.vcproj b/mfc_detect/vldmfc_detect_vs08.vcproj new file mode 100644 index 00000000..18c72dc4 --- /dev/null +++ b/mfc_detect/vldmfc_detect_vs08.vcproj @@ -0,0 +1,1056 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mfc_detect/vldmfc_detect_vs10.sln b/mfc_detect/vldmfc_detect_vs10.sln new file mode 100644 index 00000000..ab163466 --- /dev/null +++ b/mfc_detect/vldmfc_detect_vs10.sln @@ -0,0 +1,38 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect", "vldmfc_detect.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug (Unicode)|Win32 = Debug (Unicode)|Win32 + Debug (Unicode)|x64 = Debug (Unicode)|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release (Unicode)|Win32 = Release (Unicode)|Win32 + Release (Unicode)|x64 = Release (Unicode)|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|Win32.ActiveCfg = Release (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|Win32.Build.0 = Release (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|x64.ActiveCfg = Release (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|x64.Build.0 = Release (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 00581d8b..8c8c89e9 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -26,7 +26,7 @@ !include "MUI.nsh" # Provides the modern user-interface # Version number -!define VLD_VERSION "2.1.1" +!define VLD_VERSION "2.2" # Define build system paths #!define CRT_PATH "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT" diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 7981b87c..483cc03e 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -23,7 +23,7 @@ void LeakMemory(LeakOption type, int repeat, bool bFree) } // VLD internal API -#ifdef _DEBUG +#if defined(_DEBUG) || defined(VLD_FORCE_ENABLE) extern "C" { __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); } diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index c86c0e51..bc805132 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -112,10 +112,12 @@ false $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ false $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ @@ -216,14 +218,21 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Console true true true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + @@ -232,14 +241,21 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Console true true true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + diff --git a/tests/corruption/corruption.vcxproj b/tests/corruption/corruption.vcxproj index aaa4d410..d397241b 100644 --- a/tests/corruption/corruption.vcxproj +++ b/tests/corruption/corruption.vcxproj @@ -127,10 +127,9 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Level3 - MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Console @@ -151,10 +150,9 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ Level3 - MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Console diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index b79ba0b5..d0e5ff92 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -8,94 +8,92 @@ void PrintUsage() { - wprintf(_T("Usage:\n")); - wprintf(_T("\tdynamic [resolve:[true|false]]\n")); - wprintf(_T("\t - [OPTIONAL] Resolves callstacks before unloading the dynamic DLL.\n")); + wprintf(_T("Usage:\n")); + wprintf(_T("\tdynamic [resolve:[true|false]]\n")); + wprintf(_T("\t - [OPTIONAL] Resolves callstacks before unloading the dynamic DLL.\n")); } // Leaks 6 memory allocations void LeakDuplicateLeaks() { - // For testing aggregation - for (int i = 0; i < 3; ++i) - { - int* tmp = new int(0x63); - tmp; - } - for (int i = 0; i < 3; ++i) - { - int* tmp = new int(0x63); - tmp; - } - // Should report 6 memory leaks + // For testing aggregation + for (int i = 0; i < 3; ++i) + { + int* tmp = new int(0x63); + tmp; + } + for (int i = 0; i < 3; ++i) + { + int* tmp = new int(0x63); + tmp; + } + // Should report 6 memory leaks } // VLD internal API -#ifdef _DEBUG +#if defined(_DEBUG) || defined(VLD_FORCE_ENABLE) extern "C" { - __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); + __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); } #else #define VLDGetLeaksCount() 0 #endif - - int _tmain(int argc, _TCHAR* argv[]) { - wprintf(_T("======================================\n")); - wprintf(_T("==\n")); - wprintf(_T("== VLD Tests: Dynamic DLL Loading \n")); - wprintf(_T("==\n")); - wprintf(_T("======================================\n")); - - bool resolve = true; - bool doThreadTests = false; - if (argc == 2) - { - resolve = _tcsicmp(_T("true"), argv[1]) == 0; - } - else if (argc == 3) - { - resolve = _tcsicmp(_T("true"), argv[1]) == 0; - doThreadTests = _tcsicmp(_T("thread"), argv[2]) == 0; - } - - RunLoaderTests(resolve); // leaks 18 - int totalleaks = (int)VLDGetLeaksCount(); - int leaks1 = totalleaks; - int prevleaks = totalleaks; - assert(leaks1 == 18); + wprintf(_T("======================================\n")); + wprintf(_T("==\n")); + wprintf(_T("== VLD Tests: Dynamic DLL Loading \n")); + wprintf(_T("==\n")); + wprintf(_T("======================================\n")); - RunMFCLoaderTests(resolve); // leaks 7 - totalleaks = (int)VLDGetLeaksCount(); - int leaks2 = totalleaks - prevleaks; - prevleaks = totalleaks; - assert(leaks2 == 7); + bool resolve = true; + bool doThreadTests = false; + if (argc == 2) + { + resolve = _tcsicmp(_T("true"), argv[1]) == 0; + } + else if (argc == 3) + { + resolve = _tcsicmp(_T("true"), argv[1]) == 0; + doThreadTests = _tcsicmp(_T("thread"), argv[2]) == 0; + } - LeakDuplicateLeaks(); // leaks 6 - totalleaks = (int)VLDGetLeaksCount(); - int leaks3 = totalleaks - prevleaks; - prevleaks = totalleaks; - assert(leaks3 == 6); + RunLoaderTests(resolve); // leaks 18 + int totalleaks = (int)VLDGetLeaksCount(); + int leaks1 = totalleaks; + int prevleaks = totalleaks; + assert(leaks1 == 18); + + RunMFCLoaderTests(resolve); // leaks 7 + totalleaks = (int)VLDGetLeaksCount(); + int leaks2 = totalleaks - prevleaks; + prevleaks = totalleaks; + assert(leaks2 == 7); + + LeakDuplicateLeaks(); // leaks 6 + totalleaks = (int)VLDGetLeaksCount(); + int leaks3 = totalleaks - prevleaks; + prevleaks = totalleaks; + assert(leaks3 == 6); - if (doThreadTests) - { - // Creates 64 threads that each leaks 7 allocations. This equals 448 - RunLoaderLockTests(resolve); - totalleaks = (int)VLDGetLeaksCount(); - int leaks4 = totalleaks - prevleaks; - assert(leaks4 == 448); + if (doThreadTests) + { + // Creates 64 threads that each leaks 7 allocations. This equals 448 + RunLoaderLockTests(resolve); + totalleaks = (int)VLDGetLeaksCount(); + int leaks4 = totalleaks - prevleaks; + assert(leaks4 == 448); - // ..................Total: 479 leaks total - totalleaks = (int)VLDGetLeaksCount(); - int diff = 479 - totalleaks; - return diff; - } + // ..................Total: 479 leaks total + totalleaks = (int)VLDGetLeaksCount(); + int diff = 479 - totalleaks; + return diff; + } - // ..................Total: 31 leaks total - totalleaks = (int)VLDGetLeaksCount(); - int diff = 31 - totalleaks; - return diff; + // ..................Total: 31 leaks total + totalleaks = (int)VLDGetLeaksCount(); + int diff = 31 - totalleaks; + return diff; } diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index 79e8fa89..504d43c7 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -144,6 +144,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y + Copying over Visual Leak Detector Dependencies @@ -161,6 +162,7 @@ copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir) copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y @@ -224,31 +226,51 @@ copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir) MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Console true true true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y + Copying over Visual Leak Detector Dependencies + Level4 - MaxSpeed - true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Console true true true + $(ProjectDir)..\..\$(Platform)\$(Configuration) + + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y + Copying over Visual Leak Detector Dependencies + diff --git a/tests/mfc/README.txt b/tests/mfc/README.txt deleted file mode 100644 index 06f14dc3..00000000 --- a/tests/mfc/README.txt +++ /dev/null @@ -1,28 +0,0 @@ -Visual Leak Detector MFC Example (Version 1.0.1) - - Example Program Using Visual Leak Detector in an MFC Application - - -About The MFC Example Program: ------------------------------- -This is an example Visual C++ 6.0 MFC project that implements the Visual -Leak Detector. - -To build the example project, simply open the project file and start a build. - -After the project is built, running the program will pop up a simple -dialog box. If you leave the "Leak Some Memory" box checked, the program -will leak a small amount of memory as it exits. If you run the program -under the Visual C++ debugger, you should see a memory leak report in the -debug output window after the program exits. The report will include -detailed stack traces of the calls that allocated the leaked memory blocks. - -Double-clicking on a source file/line number in the stack trace will take you to -that file and line in the editor. This allows you to quickly see where in the -program the memory was allocated and how it got there. - - -Documentation: --------------- - -See the README.html file for the complete Visual Leak Detector documentation. diff --git a/tests/mfc/vldmfc.vcxproj b/tests/mfc/vldmfc.vcxproj index 34c09f3d..a190d94a 100644 --- a/tests/mfc/vldmfc.vcxproj +++ b/tests/mfc/vldmfc.vcxproj @@ -104,18 +104,13 @@ MaxSpeed OnlyExplicitInline ..\..\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL true - Use - stdafx.h - .\Release/vldmfc.pch - .\Release/ - .\Release/ - .\Release/ Level3 true + Use NDEBUG;%(PreprocessorDefinitions) @@ -125,22 +120,22 @@ $(OutDir)\vldmfc.exe true ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) - .\Release/vldmfc.pdb Windows false MachineX86 + true true .\Release/vldmfc.bsc - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y @@ -156,18 +151,13 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ MaxSpeed OnlyExplicitInline ..\..\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL true - Use - stdafx.h - .\Release/vldmfc.pch - .\Release/ - .\Release/ - .\Release/ Level3 true + Use NDEBUG;%(PreprocessorDefinitions) @@ -177,11 +167,11 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ $(OutDir)\vldmfc.exe true ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) - .\Release/vldmfc.pdb Windows false + true true @@ -191,7 +181,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest +copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y @@ -214,9 +204,6 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Use stdafx.h .\Debug/vldmfc.pch - .\Debug/ - .\Debug/ - .\Debug/ Level3 true EditAndContinue @@ -230,7 +217,6 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ true ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) true - .\Debug/vldmfc.pdb Windows false @@ -266,9 +252,6 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Use stdafx.h .\Debug/vldmfc.pch - .\Debug/ - .\Debug/ - .\Debug/ Level3 true ProgramDatabase @@ -282,7 +265,6 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ true ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) true - .\Debug/vldmfc.pdb Windows false @@ -352,8 +334,6 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ - - diff --git a/tests/mfc/vldmfc.vcxproj.filters b/tests/mfc/vldmfc.vcxproj.filters index a1555d96..2aeb011e 100644 --- a/tests/mfc/vldmfc.vcxproj.filters +++ b/tests/mfc/vldmfc.vcxproj.filters @@ -51,7 +51,5 @@ Resource Files - - \ No newline at end of file diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 1d6ec5ba..82197072 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -47,6 +47,7 @@ enum action_e { }; // Name of the debug C Runtime Library DLL on this system +#ifdef _DEBUG #if _MSC_VER == 1400 // VS 2005 #define CRTDLLNAME _T("msvcr80d.dll") #elif _MSC_VER == 1500 // VS 2008 @@ -54,6 +55,15 @@ enum action_e { #elif _MSC_VER == 1600 // VS 2010 #define CRTDLLNAME _T("msvcr100d.dll") #endif +#else +#if _MSC_VER == 1400 // VS 2005 +#define CRTDLLNAME _T("msvcr80.dll") +#elif _MSC_VER == 1500 // VS 2008 +#define CRTDLLNAME _T("msvcr90.dll") +#elif _MSC_VER == 1600 // VS 2010 +#define CRTDLLNAME _T("msvcr100.dll") +#endif +#endif #define MAXALLOC 1000 // Maximum number of allocations of each type to perform, per thread #define MAXBLOCKS (MAXALLOC * numactions) // Total maximum number of allocations, per thread @@ -90,10 +100,10 @@ __declspec(thread) malloc_t pmalloc = NULL; __declspec(thread) HANDLE threadheap; __declspec(thread) ULONG total_allocs = 0; -volatile ULONG leaks_count = 0; +volatile LONG leaks_count = 0; // VLD internal API -#ifdef _DEBUG +#if defined _DEBUG || defined VLD_FORCE_ENABLE extern "C" { __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); } diff --git a/tests/suite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj index 63cb32ef..de85b2ff 100644 --- a/tests/suite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -141,19 +141,16 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ Full $(SolutionDir);%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - false + VLD_FORCE_ENABLE;WIN32;%(PreprocessorDefinitions) MultiThreadedDLL - - true true $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - false true true + true copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y @@ -220,20 +217,17 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Full $(SolutionDir);%(AdditionalIncludeDirectories) - WIN64;%(PreprocessorDefinitions) - false + VLD_FORCE_ENABLE;WIN64;%(PreprocessorDefinitions) MultiThreadedDLL - - true true $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - false true true MachineX64 + true copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y diff --git a/utility.cpp b/utility.cpp index 3bddb34b..8bb58479 100644 --- a/utility.cpp +++ b/utility.cpp @@ -184,7 +184,7 @@ VOID dumpmemoryw (LPCVOID address, SIZE_T size) // FilterFunction - Used in structured exception handling DWORD FilterFunction(long) { - return EXCEPTION_CONTINUE_SEARCH; + return EXCEPTION_CONTINUE_SEARCH; } // findoriginalimportdescriptor - Determines if the specified module imports the named import @@ -202,43 +202,43 @@ DWORD FilterFunction(long) // IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPCSTR exportmodulename) { - IMAGE_IMPORT_DESCRIPTOR* idte = NULL; - IMAGE_SECTION_HEADER* section = NULL; - ULONG size = 0; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - g_imagelock.Enter(); - __try - { - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - } - __except(FilterFunction(GetExceptionCode())) - { - idte = NULL; - } - g_imagelock.Leave(); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return NULL; - } - while (idte->OriginalFirstThunk != 0x0) { - PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); - if (_stricmp(name, exportmodulename) == 0) { - // Found the IDT entry for the exporting module. - break; - } - idte++; - } - if (idte->OriginalFirstThunk == 0x0) { - // The importing module does not import anything from the exporting - // module. - return NULL; - } - return idte; + IMAGE_IMPORT_DESCRIPTOR* idte = NULL; + IMAGE_SECTION_HEADER* section = NULL; + ULONG size = 0; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + g_imagelock.Enter(); + __try + { + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + } + __except(FilterFunction(GetExceptionCode())) + { + idte = NULL; + } + g_imagelock.Leave(); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return NULL; + } + while (idte->OriginalFirstThunk != 0x0) { + PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); + if (_stricmp(name, exportmodulename) == 0) { + // Found the IDT entry for the exporting module. + break; + } + idte++; + } + if (idte->OriginalFirstThunk == 0x0) { + // The importing module does not import anything from the exporting + // module. + return NULL; + } + return idte; } // findimport - Determines if the specified module imports the named import @@ -429,99 +429,99 @@ BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT ta // Returns TRUE if the patch was installed into the import module. If the // import module does not import the specified export, so nothing changed, // then FALSE will be returned. -// +// BOOL patchimport (HMODULE importmodule, moduleentry_t *module) { - HMODULE exportmodule = (HMODULE)module->modulebase; - if (exportmodule == NULL) - return FALSE; - - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - g_imagelock.Enter(); - __try - { - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - } - __except(FilterFunction(GetExceptionCode())) - { - idte = NULL; - } - g_imagelock.Leave(); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return FALSE; - } - - int result = 0; - while (idte->FirstThunk != 0x0) { - PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); - UNREFERENCED_PARAMETER(name); - - patchentry_t *entry = module->patchtable; - int i = 0; - while(entry->importname) - { - LPCSTR importname = entry->importname; - LPCVOID replacement = entry->replacement; - - // Get the *real* address of the import. If we find this address in the IAT, - // then we've found the entry that needs to be patched. - FARPROC import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); - FARPROC import = GetProcAddress(exportmodule, importname); - if ( import2 ) - import = import2; - - if (import == NULL) // Perhaps the named export module does not actually export the named import? - { - entry++; i++; - continue; - } - - // Locate the import's IAT entry. - IMAGE_THUNK_DATA *iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) - { - if (iate->u1.Function != (DWORD_PTR)import) - { - iate++; - continue; - } - - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the address of the replacement. Note that the IAT - // entry may be write-protected, so we must first ensure that it is - // writable. - if ( import != replacement ) - { - if (entry->original != NULL) - *entry->original = (LPVOID)iate->u1.Function; - - DWORD protect; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)replacement; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - } - // The patch has been installed in the import module. - result++; - iate++; - } - entry++; i++; - } - - idte++; - } - - // The import's IAT entry was not found. The importing module does not - // import the specified import. - return result > 0; + HMODULE exportmodule = (HMODULE)module->modulebase; + if (exportmodule == NULL) + return FALSE; + + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + g_imagelock.Enter(); + __try + { + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + } + __except(FilterFunction(GetExceptionCode())) + { + idte = NULL; + } + g_imagelock.Leave(); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return FALSE; + } + + int result = 0; + while (idte->FirstThunk != 0x0) { + PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); + UNREFERENCED_PARAMETER(name); + + patchentry_t *entry = module->patchtable; + int i = 0; + while(entry->importname) + { + LPCSTR importname = entry->importname; + LPCVOID replacement = entry->replacement; + + // Get the *real* address of the import. If we find this address in the IAT, + // then we've found the entry that needs to be patched. + FARPROC import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); + FARPROC import = GetProcAddress(exportmodule, importname); + if ( import2 ) + import = import2; + + if (import == NULL) // Perhaps the named export module does not actually export the named import? + { + entry++; i++; + continue; + } + + // Locate the import's IAT entry. + IMAGE_THUNK_DATA *iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) + { + if (iate->u1.Function != (DWORD_PTR)import) + { + iate++; + continue; + } + + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the address of the replacement. Note that the IAT + // entry may be write-protected, so we must first ensure that it is + // writable. + if ( import != replacement ) + { + if (entry->original != NULL) + *entry->original = (LPVOID)iate->u1.Function; + + DWORD protect; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)replacement; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + } + // The patch has been installed in the import module. + result++; + iate++; + } + entry++; i++; + } + + idte++; + } + + // The import's IAT entry was not found. The importing module does not + // import the specified import. + return result > 0; } // patchmodule - Patches all imports listed in the supplied patch table, and @@ -675,87 +675,87 @@ VOID report (LPCWSTR format, ...) // VOID restoreimport (HMODULE importmodule, moduleentry_t* module) { - HMODULE exportmodule = (HMODULE)module->modulebase; - LPCSTR exportmodulename = module->exportmodulename; - UNREFERENCED_PARAMETER(exportmodulename); - if (exportmodule == NULL) - return; - - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; - - // Locate the importing module's Import Directory Table (IDT) entry for the - // exporting module. The importing module actually can have several IATs -- - // one for each export module that it imports something from. The IDT entry - // gives us the offset of the IAT for the module we are interested in. - g_imagelock.Enter(); - __try - { - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); - } - __except(FilterFunction(GetExceptionCode())) - { - idte = NULL; - } - g_imagelock.Leave(); - if (idte == NULL) { - // This module has no IDT (i.e. it imports nothing). - return; - } - - int result = 0; - while (idte->OriginalFirstThunk != 0x0) - { - PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); - UNREFERENCED_PARAMETER(name); - - int i = 0; - patchentry_t *entry = module->patchtable; - while(entry->importname) - { - LPCSTR importname = entry->importname; - LPCVOID replacement = entry->replacement; - UNREFERENCED_PARAMETER(importname); - - // Get the *real* address of the import. - //LPCVOID original = entry->original; - LPCVOID original = GetProcAddress(exportmodule, importname); - if (original == NULL) // Perhaps the named export module does not actually export the named import? - { - entry++; i++; - continue; - } - - // Locate the import's original IAT entry (it currently has the replacement - // address in it). - IMAGE_THUNK_DATA* iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) - { - if (iate->u1.Function != (DWORD_PTR)replacement) - { - iate++; - continue; - } - - if (iate->u1.Function != (DWORD_PTR)original) - { - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the import's real address. Note that the IAT entry may - // be write-protected, so we must first ensure that it is writable. - DWORD protect; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)original; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); - } - result++; - iate++; - } - entry++; i++; - } - idte++; - } + HMODULE exportmodule = (HMODULE)module->modulebase; + LPCSTR exportmodulename = module->exportmodulename; + UNREFERENCED_PARAMETER(exportmodulename); + if (exportmodule == NULL) + return; + + IMAGE_IMPORT_DESCRIPTOR *idte; + IMAGE_SECTION_HEADER *section; + ULONG size; + + // Locate the importing module's Import Directory Table (IDT) entry for the + // exporting module. The importing module actually can have several IATs -- + // one for each export module that it imports something from. The IDT entry + // gives us the offset of the IAT for the module we are interested in. + g_imagelock.Enter(); + __try + { + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); + } + __except(FilterFunction(GetExceptionCode())) + { + idte = NULL; + } + g_imagelock.Leave(); + if (idte == NULL) { + // This module has no IDT (i.e. it imports nothing). + return; + } + + int result = 0; + while (idte->OriginalFirstThunk != 0x0) + { + PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); + UNREFERENCED_PARAMETER(name); + + int i = 0; + patchentry_t *entry = module->patchtable; + while(entry->importname) + { + LPCSTR importname = entry->importname; + LPCVOID replacement = entry->replacement; + UNREFERENCED_PARAMETER(importname); + + // Get the *real* address of the import. + //LPCVOID original = entry->original; + LPCVOID original = GetProcAddress(exportmodule, importname); + if (original == NULL) // Perhaps the named export module does not actually export the named import? + { + entry++; i++; + continue; + } + + // Locate the import's original IAT entry (it currently has the replacement + // address in it). + IMAGE_THUNK_DATA* iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + while (iate->u1.Function != 0x0) + { + if (iate->u1.Function != (DWORD_PTR)replacement) + { + iate++; + continue; + } + + if (iate->u1.Function != (DWORD_PTR)original) + { + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the import's real address. Note that the IAT entry may + // be write-protected, so we must first ensure that it is writable. + DWORD protect; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); + iate->u1.Function = (DWORD_PTR)original; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + } + result++; + iate++; + } + entry++; i++; + } + idte++; + } } // restoremodule - Restores all imports listed in the supplied patch table, and @@ -897,52 +897,52 @@ BOOL strtobool (LPCWSTR s) { // DWORD _GetProcessIdOfThread (HANDLE thread) { - typedef struct _CLIENT_ID { - HANDLE UniqueProcess; - HANDLE UniqueThread; - } CLIENT_ID, *PCLIENT_ID; - - typedef LONG NTSTATUS; - typedef LONG KPRIORITY; - - typedef struct _THREAD_BASIC_INFORMATION { - NTSTATUS ExitStatus; - PVOID TebBaseAddress; - CLIENT_ID ClientId; - KAFFINITY AffinityMask; - KPRIORITY Priority; - KPRIORITY BasePriority; - } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION; - - const static THREADINFOCLASS ThreadBasicInformation = (THREADINFOCLASS)0; - - typedef NTSTATUS (WINAPI *PNtQueryInformationThread) (HANDLE thread, - THREADINFOCLASS infoclass, PVOID buffer, ULONG buffersize, - PULONG used); - - static PNtQueryInformationThread NtQueryInformationThread = NULL; - - THREAD_BASIC_INFORMATION tbi; - NTSTATUS status; - if (NtQueryInformationThread == NULL) { - HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); - if (ntdll) - { - NtQueryInformationThread = (PNtQueryInformationThread)GetProcAddress(ntdll, "NtQueryInformationThread"); - } - - if (NtQueryInformationThread == NULL) { - return 0; - } - } - - status = NtQueryInformationThread(thread, ThreadBasicInformation, &tbi, sizeof(tbi), NULL); - if(status < 0) { - // Shall we go through all the trouble of setting last error? - return 0; - } - - return (DWORD)tbi.ClientId.UniqueProcess; + typedef struct _CLIENT_ID { + HANDLE UniqueProcess; + HANDLE UniqueThread; + } CLIENT_ID, *PCLIENT_ID; + + typedef LONG NTSTATUS; + typedef LONG KPRIORITY; + + typedef struct _THREAD_BASIC_INFORMATION { + NTSTATUS ExitStatus; + PVOID TebBaseAddress; + CLIENT_ID ClientId; + KAFFINITY AffinityMask; + KPRIORITY Priority; + KPRIORITY BasePriority; + } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION; + + const static THREADINFOCLASS ThreadBasicInformation = (THREADINFOCLASS)0; + + typedef NTSTATUS (WINAPI *PNtQueryInformationThread) (HANDLE thread, + THREADINFOCLASS infoclass, PVOID buffer, ULONG buffersize, + PULONG used); + + static PNtQueryInformationThread NtQueryInformationThread = NULL; + + THREAD_BASIC_INFORMATION tbi; + NTSTATUS status; + if (NtQueryInformationThread == NULL) { + HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); + if (ntdll) + { + NtQueryInformationThread = (PNtQueryInformationThread)GetProcAddress(ntdll, "NtQueryInformationThread"); + } + + if (NtQueryInformationThread == NULL) { + return 0; + } + } + + status = NtQueryInformationThread(thread, ThreadBasicInformation, &tbi, sizeof(tbi), NULL); + if(status < 0) { + // Shall we go through all the trouble of setting last error? + return 0; + } + + return (DWORD)tbi.ClientId.UniqueProcess; } static const DWORD crctab[256] = { diff --git a/vld.cpp b/vld.cpp index d9a2e072..d1888390 100644 --- a/vld.cpp +++ b/vld.cpp @@ -89,179 +89,277 @@ patchentry_t VisualLeakDetector::m_kernel32Patch [] = { VisualLeakDetector::_GetProcAddressType *VisualLeakDetector::m_original_GetProcAddress = NULL; +static patchentry_t mfc42Patch [] = { + // XXX why are the vector new operators missing for mfc42.dll? + //ORDINAL(711), &VS60::pmfcd_scalar_new, VS60::mfcd_scalar_new, + NULL, NULL, NULL +}; + static patchentry_t mfc42dPatch [] = { // XXX why are the vector new operators missing for mfc42d.dll? - ORDINAL(711), &VS60::pmfcd_scalar_new, VS60::mfcd_scalar_new, - ORDINAL(712), &VS60::pmfcd__scalar_new_dbg_4p, VS60::mfcd__scalar_new_dbg_4p, - ORDINAL(714), &VS60::pmfcd__scalar_new_dbg_3p, VS60::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(711), &VS60d::pmfcd_scalar_new, VS60d::mfcd_scalar_new, + ORDINAL(712), &VS60d::pmfcd__scalar_new_dbg_4p, VS60d::mfcd__scalar_new_dbg_4p, + ORDINAL(714), &VS60d::pmfcd__scalar_new_dbg_3p, VS60d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc42uPatch [] = { + // XXX why are the vector new operators missing for mfc42u.dll? + //ORDINAL(711), &VS60::pmfcud_scalar_new, VS60::mfcud_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc42udPatch [] = { // XXX why are the vector new operators missing for mfc42ud.dll? - ORDINAL(711), &VS60::pmfcud_scalar_new, VS60::mfcud_scalar_new, - ORDINAL(712), &VS60::pmfcud__scalar_new_dbg_4p, VS60::mfcud__scalar_new_dbg_4p, - ORDINAL(714), &VS60::pmfcud__scalar_new_dbg_3p, VS60::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(711), &VS60d::pmfcud_scalar_new, VS60d::mfcud_scalar_new, + ORDINAL(712), &VS60d::pmfcud__scalar_new_dbg_4p, VS60d::mfcud__scalar_new_dbg_4p, + ORDINAL(714), &VS60d::pmfcud__scalar_new_dbg_3p, VS60d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; -static patchentry_t mfc70dPatch [] = { - ORDINAL(257), &VS70::pmfcd_vector_new, VS70::mfcd_vector_new, - ORDINAL(258), &VS70::pmfcd__vector_new_dbg_4p, VS70::mfcd__vector_new_dbg_4p, - ORDINAL(259), &VS70::pmfcd__vector_new_dbg_3p, VS70::mfcd__vector_new_dbg_3p, - ORDINAL(832), &VS70::pmfcd_scalar_new, VS70::mfcd_scalar_new, - ORDINAL(833), &VS70::pmfcd__scalar_new_dbg_4p, VS70::mfcd__scalar_new_dbg_4p, - ORDINAL(834), &VS70::pmfcd__scalar_new_dbg_3p, VS70::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL +static patchentry_t mfc70Patch [] = { + //ORDINAL(257), &VS70::pmfcd_vector_new, VS70::mfcd_vector_new, + //ORDINAL(832), &VS70::pmfcd_scalar_new, VS70::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc70dPatch [] = { + ORDINAL(257), &VS70d::pmfcd_vector_new, VS70d::mfcd_vector_new, + ORDINAL(258), &VS70d::pmfcd__vector_new_dbg_4p, VS70d::mfcd__vector_new_dbg_4p, + ORDINAL(259), &VS70d::pmfcd__vector_new_dbg_3p, VS70d::mfcd__vector_new_dbg_3p, + ORDINAL(832), &VS70d::pmfcd_scalar_new, VS70d::mfcd_scalar_new, + ORDINAL(833), &VS70d::pmfcd__scalar_new_dbg_4p, VS70d::mfcd__scalar_new_dbg_4p, + ORDINAL(834), &VS70d::pmfcd__scalar_new_dbg_3p, VS70d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc70uPatch [] = { + //ORDINAL(258), &VS70::pmfcud_vector_new, VS70::mfcud_vector_new, + //ORDINAL(833), &VS70::pmfcud_scalar_new, VS70::mfcud_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc70udPatch [] = { - ORDINAL(258), &VS70::pmfcud_vector_new, VS70::mfcud_vector_new, - ORDINAL(259), &VS70::pmfcud__vector_new_dbg_4p, VS70::mfcud__vector_new_dbg_4p, - ORDINAL(260), &VS70::pmfcud__vector_new_dbg_3p, VS70::mfcud__vector_new_dbg_3p, - ORDINAL(833), &VS70::pmfcud_scalar_new, VS70::mfcud_scalar_new, - ORDINAL(834), &VS70::pmfcud__scalar_new_dbg_4p, VS70::mfcud__scalar_new_dbg_4p, - ORDINAL(835), &VS70::pmfcud__scalar_new_dbg_3p, VS70::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(258), &VS70d::pmfcud_vector_new, VS70d::mfcud_vector_new, + ORDINAL(259), &VS70d::pmfcud__vector_new_dbg_4p, VS70d::mfcud__vector_new_dbg_4p, + ORDINAL(260), &VS70d::pmfcud__vector_new_dbg_3p, VS70d::mfcud__vector_new_dbg_3p, + ORDINAL(833), &VS70d::pmfcud_scalar_new, VS70d::mfcud_scalar_new, + ORDINAL(834), &VS70d::pmfcud__scalar_new_dbg_4p, VS70d::mfcud__scalar_new_dbg_4p, + ORDINAL(835), &VS70d::pmfcud__scalar_new_dbg_3p, VS70d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; -static patchentry_t mfc71dPatch [] = { - ORDINAL(267), &VS71::pmfcd_vector_new, VS71::mfcd_vector_new, - ORDINAL(268), &VS71::pmfcd__vector_new_dbg_4p, VS71::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS71::pmfcd__vector_new_dbg_3p, VS71::mfcd__vector_new_dbg_3p, - ORDINAL(893), &VS71::pmfcd_scalar_new, VS71::mfcd_scalar_new, - ORDINAL(894), &VS71::pmfcd__scalar_new_dbg_4p, VS71::mfcd__scalar_new_dbg_4p, - ORDINAL(895), &VS71::pmfcd__scalar_new_dbg_3p, VS71::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL +static patchentry_t mfc71Patch [] = { + //ORDINAL(267), &VS71::pmfcd_vector_new, VS71::mfcd_vector_new, + //ORDINAL(893), &VS71::pmfcd_scalar_new, VS71::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc71dPatch [] = { + ORDINAL(267), &VS71d::pmfcd_vector_new, VS71d::mfcd_vector_new, + ORDINAL(268), &VS71d::pmfcd__vector_new_dbg_4p, VS71d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS71d::pmfcd__vector_new_dbg_3p, VS71d::mfcd__vector_new_dbg_3p, + ORDINAL(893), &VS71d::pmfcd_scalar_new, VS71d::mfcd_scalar_new, + ORDINAL(894), &VS71d::pmfcd__scalar_new_dbg_4p, VS71d::mfcd__scalar_new_dbg_4p, + ORDINAL(895), &VS71d::pmfcd__scalar_new_dbg_3p, VS71d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc71uPatch [] = { + //ORDINAL(267), &VS71::pmfcud_vector_new, VS71::mfcud_vector_new, + //ORDINAL(893), &VS71::pmfcud_scalar_new, VS71::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc71udPatch [] = { + ORDINAL(267), &VS71d::pmfcud_vector_new, VS71d::mfcud_vector_new, + ORDINAL(268), &VS71d::pmfcud__vector_new_dbg_4p, VS71d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS71d::pmfcud__vector_new_dbg_3p, VS71d::mfcud__vector_new_dbg_3p, + ORDINAL(893), &VS71d::pmfcud_scalar_new, VS71d::mfcud_scalar_new, + ORDINAL(894), &VS71d::pmfcud__scalar_new_dbg_4p, VS71d::mfcud__scalar_new_dbg_4p, + ORDINAL(895), &VS71d::pmfcud__scalar_new_dbg_3p, VS71d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc80Patch [] = { + //ORDINAL(267), &VS80::pmfcd_vector_new, VS80::mfcd_vector_new, + //ORDINAL2(893,907), &VS80::pmfcd_scalar_new, VS80::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc80dPatch [] = { + ORDINAL(267), &VS80d::pmfcd_vector_new, VS80d::mfcd_vector_new, + ORDINAL(268), &VS80d::pmfcd__vector_new_dbg_4p, VS80d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS80d::pmfcd__vector_new_dbg_3p, VS80d::mfcd__vector_new_dbg_3p, + ORDINAL2(893,907), &VS80d::pmfcd_scalar_new, VS80d::mfcd_scalar_new, + ORDINAL2(894,908), &VS80d::pmfcd__scalar_new_dbg_4p, VS80d::mfcd__scalar_new_dbg_4p, + ORDINAL2(895,909), &VS80d::pmfcd__scalar_new_dbg_3p, VS80d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc80uPatch [] = { + //ORDINAL(267), &VS80::pmfcud_vector_new, VS80::mfcud_vector_new, + //ORDINAL2(893,907), &VS80::pmfcud_scalar_new, VS80::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc80udPatch [] = { + ORDINAL(267), &VS80d::pmfcud_vector_new, VS80d::mfcud_vector_new, + ORDINAL(268), &VS80d::pmfcud__vector_new_dbg_4p, VS80d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS80d::pmfcud__vector_new_dbg_3p, VS80d::mfcud__vector_new_dbg_3p, + ORDINAL2(893,907), &VS80d::pmfcud_scalar_new, VS80d::mfcud_scalar_new, + ORDINAL2(894,908), &VS80d::pmfcud__scalar_new_dbg_4p, VS80d::mfcud__scalar_new_dbg_4p, + ORDINAL2(895,909), &VS80d::pmfcud__scalar_new_dbg_3p, VS80d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc90Patch [] = { + ORDINAL(265), &VS90::pmfcd_vector_new, VS90::mfcd_vector_new, + ORDINAL2(798, 776), &VS90::pmfcd_scalar_new, VS90::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc90dPatch [] = { + ORDINAL(267), &VS90d::pmfcd_vector_new, VS90d::mfcd_vector_new, + ORDINAL(268), &VS90d::pmfcd__vector_new_dbg_4p, VS90d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS90d::pmfcd__vector_new_dbg_3p, VS90d::mfcd__vector_new_dbg_3p, + ORDINAL2(931, 909), &VS90d::pmfcd_scalar_new, VS90d::mfcd_scalar_new, + ORDINAL2(932, 910), &VS90d::pmfcd__scalar_new_dbg_4p, VS90d::mfcd__scalar_new_dbg_4p, + ORDINAL2(933, 911), &VS90d::pmfcd__scalar_new_dbg_3p, VS90d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc90uPatch [] = { + ORDINAL(265), &VS90::pmfcud_vector_new, VS90::mfcud_vector_new, + ORDINAL2(798, 776), &VS90::pmfcud_scalar_new, VS90::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc90udPatch [] = { + ORDINAL(267), &VS90d::pmfcud_vector_new, VS90d::mfcud_vector_new, + ORDINAL(268), &VS90d::pmfcud__vector_new_dbg_4p, VS90d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS90d::pmfcud__vector_new_dbg_3p, VS90d::mfcud__vector_new_dbg_3p, + ORDINAL2(935, 913), &VS90d::pmfcud_scalar_new, VS90d::mfcud_scalar_new, + ORDINAL2(936, 914), &VS90d::pmfcud__scalar_new_dbg_4p, VS90d::mfcud__scalar_new_dbg_4p, + ORDINAL2(937, 915), &VS90d::pmfcud__scalar_new_dbg_3p, VS90d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc100Patch [] = { + ORDINAL(265), &VS100::pmfcd_vector_new, VS100::mfcd_vector_new, + ORDINAL2(1294, 1272), &VS100::pmfcd_scalar_new, VS100::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc100dPatch [] = { + ORDINAL(267), &VS100d::pmfcd_vector_new, VS100d::mfcd_vector_new, + ORDINAL(268), &VS100d::pmfcd__vector_new_dbg_4p, VS100d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS100d::pmfcd__vector_new_dbg_3p, VS100d::mfcd__vector_new_dbg_3p, + ORDINAL2(1427, 1405), &VS100d::pmfcd_scalar_new, VS100d::mfcd_scalar_new, + ORDINAL2(1428, 1406), &VS100d::pmfcd__scalar_new_dbg_4p, VS100d::mfcd__scalar_new_dbg_4p, + ORDINAL2(1429, 1407), &VS100d::pmfcd__scalar_new_dbg_3p, VS100d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc100uPatch [] = { + ORDINAL(265), &VS100::pmfcud_vector_new, VS100::mfcud_vector_new, + ORDINAL2(1298, 1276), &VS100::pmfcud_scalar_new, VS100::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc100udPatch [] = { + ORDINAL(267), &VS100d::pmfcud_vector_new, VS100d::mfcud_vector_new, + ORDINAL(268), &VS100d::pmfcud__vector_new_dbg_4p, VS100d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS100d::pmfcud__vector_new_dbg_3p, VS100d::mfcud__vector_new_dbg_3p, + ORDINAL2(1434, 1412), &VS100d::pmfcud_scalar_new, VS100d::mfcud_scalar_new, + ORDINAL2(1435, 1413), &VS100d::pmfcud__scalar_new_dbg_4p, VS100d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1436, 1414), &VS100d::pmfcud__scalar_new_dbg_3p, VS100d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; -static patchentry_t mfc71udPatch [] = { - ORDINAL(267), &VS71::pmfcud_vector_new, VS71::mfcud_vector_new, - ORDINAL(268), &VS71::pmfcud__vector_new_dbg_4p, VS71::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS71::pmfcud__vector_new_dbg_3p, VS71::mfcud__vector_new_dbg_3p, - ORDINAL(893), &VS71::pmfcud_scalar_new, VS71::mfcud_scalar_new, - ORDINAL(894), &VS71::pmfcud__scalar_new_dbg_4p, VS71::mfcud__scalar_new_dbg_4p, - ORDINAL(895), &VS71::pmfcud__scalar_new_dbg_3p, VS71::mfcud__scalar_new_dbg_3p, +static patchentry_t msvcrtPatch [] = { + scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, + //vector_new_dbg_name, &VS60::pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, + "calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, + "malloc", &VS60::pcrtd_malloc, VS60::crtd_malloc, + "realloc", &VS60::pcrtd_realloc, VS60::crtd_realloc, + scalar_new_name, &VS60::pcrtd_scalar_new, VS60::crtd_scalar_new, + //vector_new_name, &VS60::pcrtd_vector_new, VS60::crtd_vector_new, NULL, NULL, NULL }; -static patchentry_t mfc80dPatch [] = { - ORDINAL(267), &VS80::pmfcd_vector_new, VS80::mfcd_vector_new, - ORDINAL(268), &VS80::pmfcd__vector_new_dbg_4p, VS80::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS80::pmfcd__vector_new_dbg_3p, VS80::mfcd__vector_new_dbg_3p, - ORDINAL2(893,907), &VS80::pmfcd_scalar_new, VS80::mfcd_scalar_new, - ORDINAL2(894,908), &VS80::pmfcd__scalar_new_dbg_4p, VS80::mfcd__scalar_new_dbg_4p, - ORDINAL2(895,909), &VS80::pmfcd__scalar_new_dbg_3p, VS80::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc80udPatch [] = { - ORDINAL(267), &VS80::pmfcud_vector_new, VS80::mfcud_vector_new, - ORDINAL(268), &VS80::pmfcud__vector_new_dbg_4p, VS80::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS80::pmfcud__vector_new_dbg_3p, VS80::mfcud__vector_new_dbg_3p, - ORDINAL2(893,907), &VS80::pmfcud_scalar_new, VS80::mfcud_scalar_new, - ORDINAL2(894,908), &VS80::pmfcud__scalar_new_dbg_4p, VS80::mfcud__scalar_new_dbg_4p, - ORDINAL2(895,909), &VS80::pmfcud__scalar_new_dbg_3p, VS80::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc90dPatch [] = { - ORDINAL(267), &VS90::pmfcd_vector_new, VS90::mfcd_vector_new, - ORDINAL(268), &VS90::pmfcd__vector_new_dbg_4p, VS90::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS90::pmfcd__vector_new_dbg_3p, VS90::mfcd__vector_new_dbg_3p, - ORDINAL2(931, 909), &VS90::pmfcd_scalar_new, VS90::mfcd_scalar_new, - ORDINAL2(932, 910), &VS90::pmfcd__scalar_new_dbg_4p, VS90::mfcd__scalar_new_dbg_4p, - ORDINAL2(933, 911), &VS90::pmfcd__scalar_new_dbg_3p, VS90::mfcd__scalar_new_dbg_3p, +static patchentry_t msvcrtdPatch [] = { + "_calloc_dbg", &VS60d::pcrtd__calloc_dbg, VS60d::crtd__calloc_dbg, + "_malloc_dbg", &VS60d::pcrtd__malloc_dbg, VS60d::crtd__malloc_dbg, + "_realloc_dbg", &VS60d::pcrtd__realloc_dbg, VS60d::crtd__realloc_dbg, + scalar_new_dbg_name, &VS60d::pcrtd__scalar_new_dbg, VS60d::crtd__scalar_new_dbg, + //vector_new_dbg_name, &VS60d::pcrtd__vector_new_dbg, VS60d::crtd__vector_new_dbg, + "calloc", &VS60d::pcrtd_calloc, VS60d::crtd_calloc, + "malloc", &VS60d::pcrtd_malloc, VS60d::crtd_malloc, + "realloc", &VS60d::pcrtd_realloc, VS60d::crtd_realloc, + scalar_new_name, &VS60d::pcrtd_scalar_new, VS60d::crtd_scalar_new, + //vector_new_name, &VS60d::pcrtd_vector_new, VS60d::crtd_vector_new, NULL, NULL, NULL }; -static patchentry_t mfc90udPatch [] = { - ORDINAL(267), &VS90::pmfcud_vector_new, VS90::mfcud_vector_new, - ORDINAL(268), &VS90::pmfcud__vector_new_dbg_4p, VS90::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS90::pmfcud__vector_new_dbg_3p, VS90::mfcud__vector_new_dbg_3p, - ORDINAL2(935, 913), &VS90::pmfcud_scalar_new, VS90::mfcud_scalar_new, - ORDINAL2(936, 914), &VS90::pmfcud__scalar_new_dbg_4p, VS90::mfcud__scalar_new_dbg_4p, - ORDINAL2(937, 915), &VS90::pmfcud__scalar_new_dbg_3p, VS90::mfcud__scalar_new_dbg_3p, +static patchentry_t msvcr70Patch [] = { + scalar_new_dbg_name, &VS70::pcrtd__scalar_new_dbg, VS70::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS70::pcrtd__vector_new_dbg, VS70::crtd__vector_new_dbg, + "calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, + "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, + "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, + scalar_new_name, &VS70::pcrtd_scalar_new, VS70::crtd_scalar_new, + vector_new_name, &VS70::pcrtd_vector_new, VS70::crtd_vector_new, NULL, NULL, NULL }; -static patchentry_t mfc100dPatch [] = { - ORDINAL(267), &VS100::pmfcd_vector_new, VS100::mfcd_vector_new, - ORDINAL(268), &VS100::pmfcd__vector_new_dbg_4p, VS100::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS100::pmfcd__vector_new_dbg_3p, VS100::mfcd__vector_new_dbg_3p, - ORDINAL2(1427, 1405), &VS100::pmfcd_scalar_new, VS100::mfcd_scalar_new, - ORDINAL2(1428, 1406), &VS100::pmfcd__scalar_new_dbg_4p, VS100::mfcd__scalar_new_dbg_4p, - ORDINAL2(1429, 1407), &VS100::pmfcd__scalar_new_dbg_3p, VS100::mfcd__scalar_new_dbg_3p, +static patchentry_t msvcr70dPatch [] = { + "_calloc_dbg", &VS70d::pcrtd__calloc_dbg, VS70d::crtd__calloc_dbg, + "_malloc_dbg", &VS70d::pcrtd__malloc_dbg, VS70d::crtd__malloc_dbg, + "_realloc_dbg", &VS70d::pcrtd__realloc_dbg, VS70d::crtd__realloc_dbg, + scalar_new_dbg_name, &VS70d::pcrtd__scalar_new_dbg, VS70d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS70d::pcrtd__vector_new_dbg, VS70d::crtd__vector_new_dbg, + "calloc", &VS70d::pcrtd_calloc, VS70d::crtd_calloc, + "malloc", &VS70d::pcrtd_malloc, VS70d::crtd_malloc, + "realloc", &VS70d::pcrtd_realloc, VS70d::crtd_realloc, + scalar_new_name, &VS70d::pcrtd_scalar_new, VS70d::crtd_scalar_new, + vector_new_name, &VS70d::pcrtd_vector_new, VS70d::crtd_vector_new, NULL, NULL, NULL }; -static patchentry_t mfc100udPatch [] = { - ORDINAL(267), &VS100::pmfcud_vector_new, VS100::mfcud_vector_new, - ORDINAL(268), &VS100::pmfcud__vector_new_dbg_4p,VS100::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS100::pmfcud__vector_new_dbg_3p,VS100::mfcud__vector_new_dbg_3p, - ORDINAL2(1434, 1412), &VS100::pmfcud_scalar_new, VS100::mfcud_scalar_new, - ORDINAL2(1435, 1413), &VS100::pmfcud__scalar_new_dbg_4p,VS100::mfcud__scalar_new_dbg_4p, - ORDINAL2(1436, 1414), &VS100::pmfcud__scalar_new_dbg_3p,VS100::mfcud__scalar_new_dbg_3p, +static patchentry_t msvcr71Patch [] = { + scalar_new_dbg_name, &VS71::pcrtd__scalar_new_dbg, VS71::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS71::pcrtd__vector_new_dbg, VS71::crtd__vector_new_dbg, + "calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, + "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, + "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, + scalar_new_name, &VS71::pcrtd_scalar_new, VS71::crtd_scalar_new, + vector_new_name, &VS71::pcrtd_vector_new, VS71::crtd_vector_new, NULL, NULL, NULL }; -static patchentry_t msvcrtdPatch [] = { - "_calloc_dbg", &VS60::pcrtd__calloc_dbg, VS60::crtd__calloc_dbg, - "_malloc_dbg", &VS60::pcrtd__malloc_dbg, VS60::crtd__malloc_dbg, - "_realloc_dbg", &VS60::pcrtd__realloc_dbg, VS60::crtd__realloc_dbg, - scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, - //vector_new_dbg_name, &VS60::pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, - "calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, - "malloc", &VS60::pcrtd_malloc, VS60::crtd_malloc, - "realloc", &VS60::pcrtd_realloc, VS60::crtd_realloc, - scalar_new_name, &VS60::pcrtd_scalar_new, VS60::crtd_scalar_new, - //vector_new_name, &VS60::pcrtd_vector_new, VS60::crtd_vector_new, - NULL, NULL, NULL -}; - -static patchentry_t msvcr70dPatch [] = { - "_calloc_dbg", &VS70::pcrtd__calloc_dbg, VS70::crtd__calloc_dbg, - "_malloc_dbg", &VS70::pcrtd__malloc_dbg, VS70::crtd__malloc_dbg, - "_realloc_dbg", &VS70::pcrtd__realloc_dbg, VS70::crtd__realloc_dbg, - scalar_new_dbg_name, &VS70::pcrtd__scalar_new_dbg, VS70::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS70::pcrtd__vector_new_dbg, VS70::crtd__vector_new_dbg, - "calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, - "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, - "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, - scalar_new_name, &VS70::pcrtd_scalar_new, VS70::crtd_scalar_new, - vector_new_name, &VS70::pcrtd_vector_new, VS70::crtd_vector_new, - NULL, NULL, NULL -}; - static patchentry_t msvcr71dPatch [] = { - "_calloc_dbg", &VS71::pcrtd__calloc_dbg, VS71::crtd__calloc_dbg, - "_malloc_dbg", &VS71::pcrtd__malloc_dbg, VS71::crtd__malloc_dbg, - "_realloc_dbg", &VS71::pcrtd__realloc_dbg, VS71::crtd__realloc_dbg, - scalar_new_dbg_name, &VS71::pcrtd__scalar_new_dbg, VS71::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS71::pcrtd__vector_new_dbg, VS71::crtd__vector_new_dbg, - "calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, - "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, - "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, - scalar_new_name, &VS71::pcrtd_scalar_new, VS71::crtd_scalar_new, - vector_new_name, &VS71::pcrtd_vector_new, VS71::crtd_vector_new, - NULL, NULL, NULL + "_calloc_dbg", &VS71d::pcrtd__calloc_dbg, VS71d::crtd__calloc_dbg, + "_malloc_dbg", &VS71d::pcrtd__malloc_dbg, VS71d::crtd__malloc_dbg, + "_realloc_dbg", &VS71d::pcrtd__realloc_dbg, VS71d::crtd__realloc_dbg, + scalar_new_dbg_name, &VS71d::pcrtd__scalar_new_dbg, VS71d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS71d::pcrtd__vector_new_dbg, VS71d::crtd__vector_new_dbg, + "calloc", &VS71d::pcrtd_calloc, VS71d::crtd_calloc, + "malloc", &VS71d::pcrtd_malloc, VS71d::crtd_malloc, + "realloc", &VS71d::pcrtd_realloc, VS71d::crtd_realloc, + scalar_new_name, &VS71d::pcrtd_scalar_new, VS71d::crtd_scalar_new, + vector_new_name, &VS71d::pcrtd_vector_new, VS71d::crtd_vector_new, + NULL, NULL, NULL }; -static patchentry_t msvcr80dPatch [] = { - "_calloc_dbg", &VS80::pcrtd__calloc_dbg, VS80::crtd__calloc_dbg, - "_malloc_dbg", &VS80::pcrtd__malloc_dbg, VS80::crtd__malloc_dbg, - "_realloc_dbg", &VS80::pcrtd__realloc_dbg, VS80::crtd__realloc_dbg, - scalar_new_dbg_name, &VS80::pcrtd__scalar_new_dbg, VS80::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS80::pcrtd__vector_new_dbg, VS80::crtd__vector_new_dbg, - "calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, - "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, - "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, - scalar_new_name, &VS80::pcrtd_scalar_new, VS80::crtd_scalar_new, - vector_new_name, &VS80::pcrtd_vector_new, VS80::crtd_vector_new, - "_aligned_malloc_dbg", &VS80::pcrtd__aligned_malloc_dbg, VS80::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS80::pcrtd__aligned_offset_malloc_dbg, VS80::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS80::pcrtd__aligned_realloc_dbg, VS80::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS80::pcrtd__aligned_offset_realloc_dbg, VS80::crtd__aligned_offset_realloc_dbg, +static patchentry_t msvcr80Patch [] = { + scalar_new_dbg_name, &VS80::pcrtd__scalar_new_dbg, VS80::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS80::pcrtd__vector_new_dbg, VS80::crtd__vector_new_dbg, + "calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, + "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, + "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, + scalar_new_name, &VS80::pcrtd_scalar_new, VS80::crtd_scalar_new, + vector_new_name, &VS80::pcrtd_vector_new, VS80::crtd_vector_new, "_aligned_malloc", &VS80::pcrtd_aligned_malloc, VS80::crtd__aligned_malloc, "_aligned_offset_malloc", &VS80::pcrtd_aligned_offset_malloc, VS80::crtd__aligned_offset_malloc, "_aligned_realloc", &VS80::pcrtd_aligned_realloc, VS80::crtd__aligned_realloc, @@ -269,25 +367,37 @@ static patchentry_t msvcr80dPatch [] = { NULL, NULL, NULL }; -static patchentry_t msvcr90dPatch [] = { - "_calloc_dbg", &VS90::pcrtd__calloc_dbg, VS90::crtd__calloc_dbg, - "_malloc_dbg", &VS90::pcrtd__malloc_dbg, VS90::crtd__malloc_dbg, - "_realloc_dbg", &VS90::pcrtd__realloc_dbg, VS90::crtd__realloc_dbg, - "_recalloc_dbg", &VS90::pcrtd__recalloc_dbg, VS90::crtd__recalloc_dbg, - scalar_new_dbg_name, &VS90::pcrtd__scalar_new_dbg, VS90::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS90::pcrtd__vector_new_dbg, VS90::crtd__vector_new_dbg, - "calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, - "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, - "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, - "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, - scalar_new_name, &VS90::pcrtd_scalar_new, VS90::crtd_scalar_new, - vector_new_name, &VS90::pcrtd_vector_new, VS90::crtd_vector_new, - "_aligned_malloc_dbg", &VS90::pcrtd__aligned_malloc_dbg, VS90::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS90::pcrtd__aligned_offset_malloc_dbg, VS90::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS90::pcrtd__aligned_realloc_dbg, VS90::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS90::pcrtd__aligned_offset_realloc_dbg, VS90::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", &VS90::pcrtd__aligned_recalloc_dbg, VS90::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", &VS90::pcrtd__aligned_offset_recalloc_dbg, VS90::crtd__aligned_offset_recalloc_dbg, +static patchentry_t msvcr80dPatch [] = { + "_calloc_dbg", &VS80d::pcrtd__calloc_dbg, VS80d::crtd__calloc_dbg, + "_malloc_dbg", &VS80d::pcrtd__malloc_dbg, VS80d::crtd__malloc_dbg, + "_realloc_dbg", &VS80d::pcrtd__realloc_dbg, VS80d::crtd__realloc_dbg, + scalar_new_dbg_name, &VS80d::pcrtd__scalar_new_dbg, VS80d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS80d::pcrtd__vector_new_dbg, VS80d::crtd__vector_new_dbg, + "calloc", &VS80d::pcrtd_calloc, VS80d::crtd_calloc, + "malloc", &VS80d::pcrtd_malloc, VS80d::crtd_malloc, + "realloc", &VS80d::pcrtd_realloc, VS80d::crtd_realloc, + scalar_new_name, &VS80d::pcrtd_scalar_new, VS80d::crtd_scalar_new, + vector_new_name, &VS80d::pcrtd_vector_new, VS80d::crtd_vector_new, + "_aligned_malloc_dbg", &VS80d::pcrtd__aligned_malloc_dbg, VS80d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS80d::pcrtd__aligned_offset_malloc_dbg, VS80d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS80d::pcrtd__aligned_realloc_dbg, VS80d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS80d::pcrtd__aligned_offset_realloc_dbg, VS80d::crtd__aligned_offset_realloc_dbg, + "_aligned_malloc", &VS80d::pcrtd_aligned_malloc, VS80d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS80d::pcrtd_aligned_offset_malloc, VS80d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS80d::pcrtd_aligned_realloc, VS80d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS80d::pcrtd_aligned_offset_realloc, VS80d::crtd__aligned_offset_realloc, + NULL, NULL, NULL +}; + +static patchentry_t msvcr90Patch [] = { + scalar_new_dbg_name, &VS90::pcrtd__scalar_new_dbg, VS90::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS90::pcrtd__vector_new_dbg, VS90::crtd__vector_new_dbg, + "calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, + "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, + "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, + "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, + scalar_new_name, &VS90::pcrtd_scalar_new, VS90::crtd_scalar_new, + vector_new_name, &VS90::pcrtd_vector_new, VS90::crtd_vector_new, "_aligned_malloc", &VS90::pcrtd_aligned_malloc, VS90::crtd__aligned_malloc, "_aligned_offset_malloc", &VS90::pcrtd_aligned_offset_malloc, VS90::crtd__aligned_offset_malloc, "_aligned_realloc", &VS90::pcrtd_aligned_realloc, VS90::crtd__aligned_realloc, @@ -297,25 +407,43 @@ static patchentry_t msvcr90dPatch [] = { NULL, NULL, NULL }; -static patchentry_t msvcr100dPatch [] = { - "_calloc_dbg", &VS100::pcrtd__calloc_dbg, VS100::crtd__calloc_dbg, - "_malloc_dbg", &VS100::pcrtd__malloc_dbg, VS100::crtd__malloc_dbg, - "_realloc_dbg", &VS100::pcrtd__realloc_dbg, VS100::crtd__realloc_dbg, - "_recalloc_dbg", &VS100::pcrtd__recalloc_dbg, VS100::crtd__recalloc_dbg, - scalar_new_dbg_name, &VS100::pcrtd__scalar_new_dbg, VS100::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS100::pcrtd__vector_new_dbg, VS100::crtd__vector_new_dbg, - "calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, - "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, - "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, - "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, - scalar_new_name, &VS100::pcrtd_scalar_new, VS100::crtd_scalar_new, - vector_new_name, &VS100::pcrtd_vector_new, VS100::crtd_vector_new, - "_aligned_malloc_dbg", &VS100::pcrtd__aligned_malloc_dbg, VS100::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS100::pcrtd__aligned_offset_malloc_dbg, VS100::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS100::pcrtd__aligned_realloc_dbg, VS100::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS100::pcrtd__aligned_offset_realloc_dbg, VS100::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", &VS100::pcrtd__aligned_recalloc_dbg, VS100::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", &VS100::pcrtd__aligned_offset_recalloc_dbg, VS100::crtd__aligned_offset_recalloc_dbg, +static patchentry_t msvcr90dPatch [] = { + "_calloc_dbg", &VS90d::pcrtd__calloc_dbg, VS90d::crtd__calloc_dbg, + "_malloc_dbg", &VS90d::pcrtd__malloc_dbg, VS90d::crtd__malloc_dbg, + "_realloc_dbg", &VS90d::pcrtd__realloc_dbg, VS90d::crtd__realloc_dbg, + "_recalloc_dbg", &VS90d::pcrtd__recalloc_dbg, VS90d::crtd__recalloc_dbg, + scalar_new_dbg_name, &VS90d::pcrtd__scalar_new_dbg, VS90d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS90d::pcrtd__vector_new_dbg, VS90d::crtd__vector_new_dbg, + "calloc", &VS90d::pcrtd_calloc, VS90d::crtd_calloc, + "malloc", &VS90d::pcrtd_malloc, VS90d::crtd_malloc, + "realloc", &VS90d::pcrtd_realloc, VS90d::crtd_realloc, + "_recalloc", &VS90d::pcrtd_recalloc, VS90d::crtd__recalloc, + scalar_new_name, &VS90d::pcrtd_scalar_new, VS90d::crtd_scalar_new, + vector_new_name, &VS90d::pcrtd_vector_new, VS90d::crtd_vector_new, + "_aligned_malloc_dbg", &VS90d::pcrtd__aligned_malloc_dbg, VS90d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS90d::pcrtd__aligned_offset_malloc_dbg, VS90d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS90d::pcrtd__aligned_realloc_dbg, VS90d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS90d::pcrtd__aligned_offset_realloc_dbg, VS90d::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS90d::pcrtd__aligned_recalloc_dbg, VS90d::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS90d::pcrtd__aligned_offset_recalloc_dbg, VS90d::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS90d::pcrtd_aligned_malloc, VS90d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS90d::pcrtd_aligned_offset_malloc, VS90d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS90d::pcrtd_aligned_realloc, VS90d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS90d::pcrtd_aligned_offset_realloc, VS90d::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS90d::pcrtd_aligned_recalloc, VS90d::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS90d::pcrtd_aligned_offset_recalloc, VS90d::crtd__aligned_offset_recalloc, + NULL, NULL, NULL +}; + +static patchentry_t msvcr100Patch [] = { + scalar_new_dbg_name, &VS100::pcrtd__scalar_new_dbg, VS100::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS100::pcrtd__vector_new_dbg, VS100::crtd__vector_new_dbg, + "calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, + "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, + "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, + "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, + scalar_new_name, &VS100::pcrtd_scalar_new, VS100::crtd_scalar_new, + vector_new_name, &VS100::pcrtd_vector_new, VS100::crtd_vector_new, "_aligned_malloc", &VS100::pcrtd_aligned_malloc, VS100::crtd__aligned_malloc, "_aligned_offset_malloc", &VS100::pcrtd_aligned_offset_malloc, VS100::crtd__aligned_offset_malloc, "_aligned_realloc", &VS100::pcrtd_aligned_realloc, VS100::crtd__aligned_realloc, @@ -325,6 +453,34 @@ static patchentry_t msvcr100dPatch [] = { NULL, NULL, NULL, }; +static patchentry_t msvcr100dPatch [] = { + "_calloc_dbg", &VS100d::pcrtd__calloc_dbg, VS100d::crtd__calloc_dbg, + "_malloc_dbg", &VS100d::pcrtd__malloc_dbg, VS100d::crtd__malloc_dbg, + "_realloc_dbg", &VS100d::pcrtd__realloc_dbg, VS100d::crtd__realloc_dbg, + "_recalloc_dbg", &VS100d::pcrtd__recalloc_dbg, VS100d::crtd__recalloc_dbg, + scalar_new_dbg_name, &VS100d::pcrtd__scalar_new_dbg, VS100d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS100d::pcrtd__vector_new_dbg, VS100d::crtd__vector_new_dbg, + "calloc", &VS100d::pcrtd_calloc, VS100d::crtd_calloc, + "malloc", &VS100d::pcrtd_malloc, VS100d::crtd_malloc, + "realloc", &VS100d::pcrtd_realloc, VS100d::crtd_realloc, + "_recalloc", &VS100d::pcrtd_recalloc, VS100d::crtd__recalloc, + scalar_new_name, &VS100d::pcrtd_scalar_new, VS100d::crtd_scalar_new, + vector_new_name, &VS100d::pcrtd_vector_new, VS100d::crtd_vector_new, + "_aligned_malloc_dbg", &VS100d::pcrtd__aligned_malloc_dbg, VS100d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS100d::pcrtd__aligned_offset_malloc_dbg, VS100d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS100d::pcrtd__aligned_realloc_dbg, VS100d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS100d::pcrtd__aligned_offset_realloc_dbg, VS100d::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS100d::pcrtd__aligned_recalloc_dbg, VS100d::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS100d::pcrtd__aligned_offset_recalloc_dbg,VS100d::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS100d::pcrtd_aligned_malloc, VS100d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS100d::pcrtd_aligned_offset_malloc, VS100d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS100d::pcrtd_aligned_realloc, VS100d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS100d::pcrtd_aligned_offset_realloc, VS100d::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS100d::pcrtd_aligned_recalloc, VS100d::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS100d::pcrtd_aligned_offset_recalloc, VS100d::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, +}; + patchentry_t VisualLeakDetector::m_ntdllPatch [] = { "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, "RtlFreeHeap", NULL, VisualLeakDetector::_RtlFreeHeap, @@ -345,25 +501,43 @@ moduleentry_t VisualLeakDetector::m_patchtable [] = { "kernel32.dll", 0x0, m_kernel32Patch, // MFC new operators (exported by ordinal). + "mfc42.dll", 0x0, mfc42Patch, "mfc42d.dll", 0x0, mfc42dPatch, + "mfc42u.dll", 0x0, mfc42uPatch, "mfc42ud.dll", 0x0, mfc42udPatch, + "mfc70.dll", 0x0, mfc70Patch, "mfc70d.dll", 0x0, mfc70dPatch, + "mfc70u.dll", 0x0, mfc70uPatch, "mfc70ud.dll", 0x0, mfc70udPatch, + "mfc71.dll", 0x0, mfc71Patch, "mfc71d.dll", 0x0, mfc71dPatch, + "mfc71u.dll", 0x0, mfc71uPatch, "mfc71ud.dll", 0x0, mfc71udPatch, + "mfc80.dll", 0x0, mfc80Patch, "mfc80d.dll", 0x0, mfc80dPatch, + "mfc80u.dll", 0x0, mfc80uPatch, "mfc80ud.dll", 0x0, mfc80udPatch, + "mfc90.dll", 0x0, mfc90Patch, "mfc90d.dll", 0x0, mfc90dPatch, + "mfc90u.dll", 0x0, mfc90uPatch, "mfc90ud.dll", 0x0, mfc90udPatch, + "mfc100.dll", 0x0, mfc100Patch, "mfc100d.dll", 0x0, mfc100dPatch, + "mfc100u.dll", 0x0, mfc100uPatch, "mfc100ud.dll", 0x0, mfc100udPatch, // CRT new operators and heap APIs. + "msvcrt.dll", 0x0, msvcrtPatch, "msvcrtd.dll", 0x0, msvcrtdPatch, + "msvcr70.dll", 0x0, msvcr70Patch, "msvcr70d.dll", 0x0, msvcr70dPatch, + "msvcr71.dll", 0x0, msvcr71Patch, "msvcr71d.dll", 0x0, msvcr71dPatch, + "msvcr80.dll", 0x0, msvcr80Patch, "msvcr80d.dll", 0x0, msvcr80dPatch, + "msvcr90.dll", 0x0, msvcr90Patch, "msvcr90d.dll", 0x0, msvcr90dPatch, + "msvcr100.dll", 0x0, msvcr100Patch, "msvcr100d.dll",0x0, msvcr100dPatch, // NT APIs. @@ -455,7 +629,7 @@ VisualLeakDetector::VisualLeakDetector () m_leaksfound = 0; m_loadedmodules = NULL; m_loaderlock.Initialize(); - m_maplock.Initialize(); + m_heapmaplock.Initialize(); m_moduleslock.Initialize(); m_selftestfile = __FILE__; m_selftestline = 0; @@ -708,7 +882,7 @@ VisualLeakDetector::~VisualLeakDetector () g_imagelock.Delete(); m_loaderlock.Delete(); - m_maplock.Delete(); + m_heapmaplock.Delete(); m_moduleslock.Delete(); g_stackwalklock.Delete(); g_symbollock.Delete(); @@ -792,18 +966,16 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) } } + vld.m_heapmaplock.Enter(); + g_symbollock.Enter(); if ((refresh == true) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { // Discard the previously loaded symbols, so we can refresh them. - CriticalSectionLocker cs(m_maplock); - g_symbollock.Enter(); if (SymUnloadModule64(g_currentprocess, modulebase) == false) { report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); } - g_symbollock.Leave(); } - g_symbollock.Enter(); // Try to load the module's symbols. This ensures that we have loaded // the symbols for every module that has ever been loaded into the // process, guaranteeing the symbols' availability when generating the @@ -820,6 +992,7 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) if (SymbolsLoaded) moduleflags |= VLD_MODULE_SYMBOLSLOADED; g_symbollock.Leave(); + vld.m_heapmaplock.Leave(); if (_stricmp(VLDDLL, modulename) == 0) { // What happens when a module goes through it's own portal? Bad things. @@ -1243,7 +1416,7 @@ tls_t* VisualLeakDetector::gettls () // // None. // -VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack) +VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack) { static SIZE_T serialnumber = 0; @@ -1256,7 +1429,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c blockinfo->blocks = 1; // Insert the block's information into the block map. - CriticalSectionLocker cs(m_maplock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We haven't mapped this heap to a block map yet. Do it now. @@ -1264,9 +1437,9 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL c heapit = m_heapmap->find(heap); assert(heapit != m_heapmap->end()); } - if (crtalloc == TRUE) { + if (crtalloc) { // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags |= VLD_HEAP_CRT; + (*heapit).second->flags |= VLD_HEAP_CRT_DBG; } BlockMap* blockmap = &(*heapit).second->blockmap; BlockMap::Iterator blockit = blockmap->insert(mem, blockinfo); @@ -1300,7 +1473,7 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) heapinfo_t* heapinfo = new heapinfo_t; heapinfo->blockmap.reserve(BLOCKMAPRESERVE); heapinfo->flags = 0x0; - CriticalSectionLocker cs(m_maplock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->insert(heap, heapinfo); if (heapit == m_heapmap->end()) { // Somehow this heap has been created twice without being destroyed, @@ -1341,7 +1514,7 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) // None. // VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - BOOL crtalloc, CallStack **&ppcallstack, const context_t &context) + bool crtalloc, CallStack **&ppcallstack, const context_t &context) { if (newmem != mem) { // The block was not reallocated in-place. Instead the old block was @@ -1353,7 +1526,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was reallocated in-place. Find the existing blockinfo_t // entry in the block map and update it with the new callstack and size. - CriticalSectionLocker cs(m_maplock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We haven't mapped this heap to a block map yet. Obviously the @@ -1385,7 +1558,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (crtalloc) { // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags |= VLD_HEAP_CRT; + (*heapit).second->flags |= VLD_HEAP_CRT_DBG; } // Update the block's size. @@ -1461,7 +1634,7 @@ SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) assert(heap != NULL); // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(m_maplock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // Nothing is allocated from this heap. No leaks. @@ -1478,10 +1651,8 @@ SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) // potential memory leak. LPCVOID block = (*blockit).first; blockinfo_t* info = (*blockit).second; - LPCVOID address = block; - SIZE_T size = info->size; - if (heapinfo->flags & VLD_HEAP_CRT) { + if (heapinfo->flags & VLD_HEAP_CRT_DBG) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header pretended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; @@ -1490,12 +1661,6 @@ SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) // The CRT will free the block after VLD is destroyed. continue; } - // The CRT header is more or less transparent to the user, so - // the information about the contained block will probably be - // more useful to the user. Accordingly, that's the information - // we'll include in the report. - address = CRTDBGBLOCKDATA(block); - size = crtheader->size; } memoryleaks += info->blocks; @@ -1518,7 +1683,7 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) assert(heap != NULL); // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(m_maplock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // Nothing is allocated from this heap. No leaks. @@ -1539,7 +1704,7 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) LPCVOID address = block; SIZE_T size = info->size; - if (heapinfo->flags & VLD_HEAP_CRT) { + if (heapinfo->flags & VLD_HEAP_CRT_DBG) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header prepended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; @@ -1665,7 +1830,7 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & return; // Find this heap's block map. - CriticalSectionLocker cs(m_maplock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We don't have a block map for this heap. We must not have monitored @@ -1733,7 +1898,7 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & VOID VisualLeakDetector::unmapheap (HANDLE heap) { // Find this heap's block map. - CriticalSectionLocker cs(m_maplock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // This heap hasn't been mapped. We must not have monitored this heap's @@ -1915,14 +2080,16 @@ void VisualLeakDetector::firstalloccall(tls_t * tls) // Returns the value returned from the specified calloc. // void* VisualLeakDetector::_calloc (calloc_t pcalloc, - context_t& context, - size_t num, - size_t size) + context_t& context, + bool debugRuntime, + size_t num, + size_t size) { tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -1955,12 +2122,13 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // // Returns the value returned from the specified malloc. // -void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t size) +void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size) { tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -1993,12 +2161,13 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, size_t // // Returns the value returned by the specified CRT new operator. // -void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) +void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntime, size_t size) { tls_t* tls = vld.gettls(); // The new operator is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2034,14 +2203,16 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, size_t size) // Returns the value returned from the specified realloc. // void* VisualLeakDetector::_realloc (realloc_t prealloc, - context_t& context, - void *mem, - size_t size) + context_t& context, + bool debugRuntime, + void *mem, + size_t size) { tls_t *tls = vld.gettls(); // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2077,15 +2248,17 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // Returns the value returned from the specified realloc. // void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, - context_t& context, - void *mem, - size_t num, - size_t size) + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size) { tls_t *tls = vld.gettls(); // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2118,12 +2291,14 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, // // Returns the value returned from the specified malloc. // -void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, size_t size, size_t alignment) +void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, bool debugRuntime, + size_t size, size_t alignment) { tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2156,12 +2331,14 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t // // Returns the value returned from the specified _aligned_offset_malloc. // -void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, size_t size, size_t alignment, size_t offset) +void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, bool debugRuntime, + size_t size, size_t alignment, size_t offset) { tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2197,15 +2374,17 @@ void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmal // Returns the value returned from the specified _aligned_realloc. // void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, - context_t& context, - void *mem, - size_t size, - size_t alignment) + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + size_t alignment) { tls_t *tls = vld.gettls(); // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2241,16 +2420,18 @@ void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, // Returns the value returned from the specified _aligned_offset_realloc. // void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t prealloc, - context_t& context, - void *mem, - size_t size, - size_t alignment, - size_t offset) + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + size_t alignment, + size_t offset) { tls_t *tls = vld.gettls(); // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2288,16 +2469,18 @@ void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t p // Returns the value returned from the specified _aligned_realloc. // void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, - context_t& context, - void *mem, - size_t num, - size_t size, - size_t alignment) + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size, + size_t alignment) { tls_t *tls = vld.gettls(); // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2336,6 +2519,7 @@ void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, // void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t precalloc, context_t& context, + bool debugRuntime, void *mem, size_t num, size_t size, @@ -2345,7 +2529,8 @@ void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t tls_t *tls = vld.gettls(); // realloc is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2388,6 +2573,7 @@ void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t // void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_dbg, context_t& context, + bool debugRuntime, size_t size, size_t alignment, int type, @@ -2397,7 +2583,8 @@ void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_ tls_t *tls = vld.gettls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2440,6 +2627,7 @@ void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_ // void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_malloc_dbg, context_t& context, + bool debugRuntime, size_t size, size_t alignment, size_t offset, @@ -2450,7 +2638,8 @@ void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_db tls_t *tls = vld.gettls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2495,6 +2684,7 @@ void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_db // void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_realloc_dbg, context_t& context, + bool debugRuntime, void *mem, size_t size, size_t alignment, @@ -2505,7 +2695,8 @@ void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_reall tls_t *tls = vld.gettls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2550,6 +2741,7 @@ void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_reall // void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_realloc_dbg, context_t& context, + bool debugRuntime, void *mem, size_t size, size_t alignment, @@ -2561,7 +2753,8 @@ void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_ tls_t *tls = vld.gettls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2608,6 +2801,7 @@ void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_ // void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_recalloc_dbg, context_t& context, + bool debugRuntime, void *mem, size_t num, size_t size, @@ -2619,7 +2813,8 @@ void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_rec tls_t *tls = vld.gettls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2666,6 +2861,7 @@ void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_rec // void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_recalloc_dbg, context_t& context, + bool debugRuntime, void *mem, size_t num, size_t size, @@ -2678,7 +2874,8 @@ void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recallo tls_t *tls = vld.gettls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2730,17 +2927,19 @@ void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recallo // Returns the value returned by the specified _calloc_dbg. // void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, - context_t& context, - size_t num, - size_t size, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + size_t num, + size_t size, + int type, + char const *file, + int line) { tls_t *tls = vld.gettls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2782,16 +2981,18 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // Returns the value returned by the specified _malloc_dbg. // void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + size_t size, + int type, + char const *file, + int line) { tls_t *tls = vld.gettls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2833,16 +3034,18 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + size_t size, + int type, + char const *file, + int line) { tls_t *tls = vld.gettls(); // The debug new operator is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -2884,11 +3087,11 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t size, + int type, + char const *file, + int line) { tls_t *tls = vld.gettls(); @@ -2930,10 +3133,10 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, // Returns the value returned by the specified MFC debug new operator. // void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, - context_t& context, - size_t size, - char const *file, - int line) + context_t& context, + size_t size, + char const *file, + int line) { tls_t *tls = vld.gettls(); @@ -2980,6 +3183,7 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, // void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, + bool debugRuntime, void *mem, size_t size, int type, @@ -2989,7 +3193,8 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, tls_t *tls = vld.gettls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -3034,6 +3239,7 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, + bool debugRuntime, void *mem, size_t num, size_t size, @@ -3044,7 +3250,8 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, tls_t *tls = vld.gettls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. - tls->flags |= VLD_TLS_CRTALLOC; + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -3109,6 +3316,8 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) // This entry's import name is not a valid pointer to data in // vld.dll. It must be an ordinal value. if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { + if (patchentry->original != NULL) + *patchentry->original = vld._RGetProcAddress(module, procname); return (FARPROC)patchentry->replacement; } } @@ -3116,12 +3325,16 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) __try { if (strcmp(patchentry->importname, procname) == 0) { + if (patchentry->original != NULL) + *patchentry->original = vld._RGetProcAddress(module, procname); return (FARPROC)patchentry->replacement; } } __except(FilterFunction(GetExceptionCode())) { if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { + if (patchentry->original != NULL) + *patchentry->original = vld._RGetProcAddress(module, procname); return (FARPROC)patchentry->replacement; } } @@ -3170,6 +3383,8 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + + CriticalSectionLocker cs(vld.m_heapmaplock); g_symbollock.Enter(); DWORD64 displacement; BOOL symfound = SymFromAddrW(g_currentprocess, ra, &displacement, functioninfo); @@ -3177,10 +3392,9 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m if (symfound == TRUE) { if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { // HeapCreate was called by _heap_init. This is a static CRT heap. - CriticalSectionLocker cs(vld.m_maplock); HeapMap::Iterator heapit = vld.m_heapmap->find(heap); assert(heapit != vld.m_heapmap->end()); - (*heapit).second->flags |= VLD_HEAP_CRT; + (*heapit).second->flags |= VLD_HEAP_CRT_DBG; } } @@ -3412,7 +3626,7 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size) { - BOOL crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; // The module that initiated this allocation is included in leak // detection. Map this block to the specified heap. @@ -3594,16 +3808,12 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context) { - BOOL crtalloc; - crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? TRUE : FALSE; + bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; // Reset thread local flags and variables, in case any libraries called // into while remapping the block allocate some memory. tls->context.fp = 0x0; - if (crtalloc) - tls->flags |= VLD_TLS_CRTALLOC; - else - tls->flags &=~VLD_TLS_CRTALLOC; + tls->flags &= ~VLD_TLS_CRTALLOC; // The module that initiated this allocation is included in leak // detection. Remap the block. @@ -3613,7 +3823,8 @@ void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LP if(tls->context.fp != 0) __debugbreak(); #endif - tls->flags |= crtalloc; + if (crtalloc) + tls->flags |= VLD_TLS_CRTALLOC; tls->context = context; } @@ -3954,6 +4165,75 @@ ULONG VisualLeakDetector::Release () return (m_imalloc) ? m_imalloc->Release() : 0; } +// ReportAlloc - Report memory block allocated +// +// - block (IN): Pointer to the memory block being allocated. +// +// - size (IN): Size, in bytes, of the memory block being allocated. +// +// - heap (IN): Handle to the heap from which the block has been allocated. +// +// Return Value: +// +// Returns pointer to the memory block reported +// +LPVOID VisualLeakDetector::ReportAlloc(LPVOID block, SIZE_T size, HANDLE heap) +{ + if ((block == NULL) || !enabled()) + return block; + + tls_t* tls = gettls(); + tls->blockprocessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; + + if (!firstcall && (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + tls->context = context; + + AllocateHeap(tls, heap, block, size); + + if (firstcall) + firstalloccall(tls); + + return block; +} + +// ReportFree - Report memory block freed +// +// - mem (IN): Pointer to the memory block being freed. +// +// - heap (IN): Handle to the heap to which this block is being freed. +// +// Return Value: +// +// None. +// +void VisualLeakDetector::ReportFree(LPVOID mem, HANDLE heap) +{ + // Record the current frame pointer. + context_t context; + CAPTURE_CONTEXT(context); + + // Unmap the block from the specified heap. + vld.unmapblock(heap, mem, context); +} + SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) { if (m_options & VLD_OPT_VLDOFF) { @@ -3963,6 +4243,7 @@ SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) SIZE_T leaksCount = 0; // Generate a memory leak report for each heap in the process. + CriticalSectionLocker cs(m_heapmaplock); for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { HANDLE heap = (*heapit).first; leaksCount += getleakscount(heap, includingInternal); @@ -3980,6 +4261,7 @@ SIZE_T VisualLeakDetector::ReportLeaks( ) // Generate a memory leak report for each heap in the process. SIZE_T leaksCount = 0; m_leaksfound = 0; + CriticalSectionLocker cs(m_heapmaplock); for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { HANDLE heap = (*heapit).first; leaksCount += reportleaks(heap); @@ -4264,7 +4546,7 @@ void VisualLeakDetector::SetupReporting() void VisualLeakDetector::resolveStacks(HANDLE heap) { // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(m_maplock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapiter = m_heapmap->find(heap); if (heapiter == m_heapmap->end()) { // Nothing is allocated from this heap. No leaks. @@ -4284,13 +4566,8 @@ void VisualLeakDetector::resolveStacks(HANDLE heap) { continue; } - // The actual memory address - const void* address = block; - assert(address != NULL); - - SIZE_T size = info->size; - if (heapinfo->flags & VLD_HEAP_CRT) { + if (heapinfo->flags & VLD_HEAP_CRT_DBG) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header prepended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; @@ -4302,12 +4579,6 @@ void VisualLeakDetector::resolveStacks(HANDLE heap) // The CRT will free the block after VLD is destroyed. continue; } - // The CRT header is more or less transparent to the user, so - // the information about the contained block will probably be - // more useful to the user. Accordingly, that's the information - // we'll include in the report. - address = CRTDBGBLOCKDATA(block); - size = crtheader->size; } // Dump the call stack. @@ -4324,6 +4595,7 @@ void VisualLeakDetector::ResolveCallstacks() return; // Generate the Callstacks early + CriticalSectionLocker cs(m_heapmaplock); for (HeapMap::Iterator heapiter = m_heapmap->begin(); heapiter != m_heapmap->end(); ++heapiter) diff --git a/vld.h b/vld.h index dc1e5e01..b787ae2b 100644 --- a/vld.h +++ b/vld.h @@ -25,7 +25,7 @@ #include "vld_def.h" -#ifdef _DEBUG +#if defined _DEBUG || defined VLD_FORCE_ENABLE #include @@ -248,6 +248,23 @@ __declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR * // __declspec(dllexport) void VLDResolveCallstacks(); +// VLDReportAlloc - Registers allocation for release build memory leak detection +// +// Return Value: +// +// None. +// +__declspec(dllexport) void VLDReportAlloc(LPVOID mem, size_t size, HANDLE heap); + +// VLDReportFree - Registers deallocation for release build memory leak detection +// +// Return Value: +// +// None. +// +__declspec(dllexport) void VLDReportFree(LPVOID mem, HANDLE heap); + + #ifdef __cplusplus } #endif // __cplusplus diff --git a/vld.vcxproj b/vld.vcxproj index a4dc39c2..e991b3f3 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -247,6 +247,7 @@ + diff --git a/vld.vcxproj.filters b/vld.vcxproj.filters index 11df3856..8b7a6cbf 100644 --- a/vld.vcxproj.filters +++ b/vld.vcxproj.filters @@ -80,6 +80,9 @@ Header Files + + Header Files + diff --git a/vld_vs10.sln b/vld_vs10.sln index b61e8310..faf1460c 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -27,12 +27,17 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{E32BE0CE-65C9-4BC2-9528-F6FF3A183A85}" +EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 5 @@ -153,7 +158,8 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -161,10 +167,11 @@ Global GlobalSection(NestedProjects) = preSolution {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {E32BE0CE-65C9-4BC2-9528-F6FF3A183A85} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {E32BE0CE-65C9-4BC2-9528-F6FF3A183A85} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {E32BE0CE-65C9-4BC2-9528-F6FF3A183A85} EndGlobalSection EndGlobal diff --git a/vldapi.cpp b/vldapi.cpp index 15984fc1..ce082be0 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -122,4 +122,14 @@ __declspec(dllexport) void VLDResolveCallstacks() vld.ResolveCallstacks(); } +__declspec(dllexport) void VLDReportAlloc(LPVOID mem, size_t size, HANDLE heap) +{ + vld.ReportAlloc(mem, size, heap); +} + +__declspec(dllexport) void VLDReportFree(LPVOID mem, HANDLE heap) +{ + vld.ReportFree(mem, heap); +} + } diff --git a/vldint.h b/vldint.h index 88b12593..e18b89ca 100644 --- a/vldint.h +++ b/vldint.h @@ -42,7 +42,7 @@ #define SELFTESTTEXTA "Memory Leak Self-Test" #define SELFTESTTEXTW L"Memory Leak Self-Test" #define VLDREGKEYPRODUCT L"Software\\Visual Leak Detector" -#define VLDVERSION L"2.1" +#define VLDVERSION L"2.2" #ifndef WIN64 #define VLDDLL "vld_x86.dll" #else @@ -103,7 +103,7 @@ typedef Map BlockMap; struct heapinfo_t { BlockMap blockmap; // Map of all blocks allocated from this heap. UINT32 flags; // Heap status flags: -#define VLD_HEAP_CRT 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). +#define VLD_HEAP_CRT_DBG 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). }; // HeapMaps map heaps (via their handles) to BlockMaps. @@ -198,33 +198,33 @@ class VisualLeakDetector : public IMalloc // IAT replacement functions. //////////////////////////////////////////////////////////////////////////////// // Standard CRT and MFC common handlers - void* _calloc (calloc_t pcalloc, context_t& context, size_t num, size_t size); - void* _malloc (malloc_t pmalloc, context_t& context, size_t size); - void* _new (new_t pnew, context_t& context, size_t size); - void* _realloc (realloc_t prealloc, context_t& context, void *mem, size_t size); - void* __recalloc (_recalloc_t precalloc, context_t& context, void *mem, size_t num, size_t size); + void* _calloc (calloc_t pcalloc, context_t& context, bool debugRuntime, size_t num, size_t size); + void* _malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size); + void* _new (new_t pnew, context_t& context, bool debugRuntime, size_t size); + void* _realloc (realloc_t prealloc, context_t& context, bool debugRuntime, void *mem, size_t size); + void* __recalloc (_recalloc_t precalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size); // Debug CRT and MFC common handlers - void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, size_t num, size_t size, int type, char const *file, int line); - void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, size_t size, int type, char const *file, int line); - void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, size_t size, int type, char const *file, int line); + void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, bool debugRuntime, size_t num, size_t size, int type, char const *file, int line); + void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); + void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); - void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, void *mem, size_t size, int type, char const *file, int line); - void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, void *mem, size_t num, size_t size, int type, char const *file, int line); - - void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, size_t size, size_t alignment); - void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, size_t size, size_t alignment, size_t offset); - void *__aligned_realloc (_aligned_realloc_t p_aligned_realloc, context_t& context, void *mem, size_t size, size_t alignment); - void *__aligned_offset_realloc (_aligned_offset_realloc_t p_aligned_offset_realloc, context_t& context, void *mem, size_t size, size_t alignment, size_t offset); - void *__aligned_recalloc (_aligned_recalloc_t p_aligned_recalloc, context_t& context, void *mem, size_t num, size_t size, size_t alignment); - void *__aligned_offset_recalloc (_aligned_offset_recalloc_t p_aligned_offset_recalloc, context_t& context, void *mem, size_t num, size_t size, size_t alignment, size_t offset); - void* __aligned_malloc_dbg (_aligned_malloc_dbg_t p_aligned_malloc_dbg, context_t& context, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_aligned_offset_malloc_dbg, context_t& context, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - void* __aligned_realloc_dbg (_aligned_realloc_dbg_t p_aligned_realloc_dbg, context_t& context, void *mem, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_aligned_offset_realloc_dbg, context_t& context, void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - void* __aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_aligned_recalloc_dbg, context_t& context, void *mem, size_t num, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_aligned_offset_recalloc_dbg, context_t& context, void *mem, size_t num, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, int type, char const *file, int line); + void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, int type, char const *file, int line); + + void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment); + void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset); + void *__aligned_realloc (_aligned_realloc_t p_aligned_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment); + void *__aligned_offset_realloc (_aligned_offset_realloc_t p_aligned_offset_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset); + void *__aligned_recalloc (_aligned_recalloc_t p_aligned_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment); + void *__aligned_offset_recalloc (_aligned_offset_recalloc_t p_aligned_offset_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset); + void* __aligned_malloc_dbg (_aligned_malloc_dbg_t p_aligned_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_aligned_offset_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + void* __aligned_realloc_dbg (_aligned_realloc_dbg_t p_aligned_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_aligned_offset_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + void* __aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_aligned_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_aligned_offset_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); //////////////////////////////////////////////////////////////////////////////// // Public IMalloc methods - for support of COM-based memory leak detection. @@ -239,6 +239,9 @@ class VisualLeakDetector : public IMalloc LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); ULONG __stdcall Release (); + LPVOID ReportAlloc(LPVOID block, SIZE_T size, HANDLE heap); + void ReportFree(LPVOID mem, HANDLE heap); + void DisableLeakDetection (); void EnableLeakDetection (); void RestoreLeakDetectionState (); @@ -269,10 +272,10 @@ class VisualLeakDetector : public IMalloc BOOL enabled (); SIZE_T eraseduplicates (const BlockMap::Iterator &element); tls_t* gettls (); - VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, BOOL crtalloc, CallStack **&ppcallstack); + VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack); VOID mapheap (HANDLE heap); VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - BOOL crtalloc, CallStack **&ppcallstack, const context_t &context); + bool crtalloc, CallStack **&ppcallstack, const context_t &context); VOID reportconfig (); SIZE_T getleakscount (HANDLE heap, BOOL includingInternal); SIZE_T reportleaks (HANDLE heap); @@ -330,7 +333,7 @@ class VisualLeakDetector : public IMalloc SIZE_T m_leaksfound; // Total number of leaks found. ModuleSet *m_loadedmodules; // Contains information about all modules loaded in the process. CriticalSection m_loaderlock; // Serializes the attachment of newly loaded modules. - CriticalSection m_maplock; // Serializes access to the heap and block maps. + CriticalSection m_heapmaplock; // Serializes access to the heap and block maps. SIZE_T m_maxdatadump; // Maximum number of user-data bytes to dump for each leaked block. UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. CriticalSection m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. From 6ef35c8224175dd904dda2245049325cfb0e6032 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 1 Jun 2011 22:26:45 +0000 Subject: [PATCH 096/321] Instead g_symbollock we now use m_heapmaplock critical section to avoid deadlocks SymLoadModule64 replaced by SymLoadModuleEx git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67298 --- callstack.cpp | 11 +- vld.cpp | 194 ++++++++++++------------- vldint.h | 396 +++++++++++++++++++++++++------------------------- 3 files changed, 293 insertions(+), 308 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index f197a265..b8799fdb 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -212,6 +212,8 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const L" complete stack trace.\n"); } + CriticalSectionLocker cs(g_symbollock); + IMAGEHLP_LINE64 sourceinfo = { 0 }; sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); @@ -229,7 +231,6 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const // Try to get the source file and line number associated with // this program counter address. SIZE_T programcounter = (*this)[frame]; - g_symbollock.Enter(); BOOL foundline = FALSE; DWORD displacement = 0; foundline = SymGetLineFromAddrW64(g_currentprocess, programcounter, &displacement, &sourceinfo); @@ -237,7 +238,6 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); if (IsInternalModule(sourceinfo.FileName)) { // Don't show frames in files internal to the heap. - g_symbollock.Leave(); continue; } } @@ -263,7 +263,6 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const functionname = L"(Function name unavailable)"; displacement64 = 0; } - g_symbollock.Leave(); HMODULE hCallingModule = GetCallingModule(programcounter); LPWSTR modulename = L"(Module name unavailable)"; @@ -339,6 +338,8 @@ void CallStack::Resolve(BOOL showinternalframes) L" complete stack trace.\n"); } + CriticalSectionLocker cs(g_symbollock); + IMAGEHLP_LINE64 sourceinfo = { 0 }; sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); @@ -354,14 +355,12 @@ void CallStack::Resolve(BOOL showinternalframes) const size_t allocedBytes = m_ResolvedCapacity * sizeof(WCHAR); ZeroMemory(m_Resolved, allocedBytes); - // Iterate through each frame in the call stack. for (UINT32 frame = 0; frame < m_size; frame++) { // Try to get the source file and line number associated with // this program counter address. SIZE_T programcounter = (*this)[frame]; - g_symbollock.Enter(); BOOL foundline = FALSE; DWORD displacement = 0; @@ -375,7 +374,6 @@ void CallStack::Resolve(BOOL showinternalframes) _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); if (IsInternalModule(sourceinfo.FileName)) { // Don't show frames in files internal to the heap. - g_symbollock.Leave(); continue; } } @@ -401,7 +399,6 @@ void CallStack::Resolve(BOOL showinternalframes) functionname = L"(Function name unavailable)"; displacement64 = 0; } - g_symbollock.Leave(); HMODULE hCallingModule = GetCallingModule(programcounter); LPWSTR modulename = L"(Module name unavailable)"; diff --git a/vld.cpp b/vld.cpp index d1888390..5a083dc2 100644 --- a/vld.cpp +++ b/vld.cpp @@ -53,7 +53,8 @@ HANDLE g_currentthread; // Pseudo-handle for the current thread. CriticalSection g_imagelock; // Serializes calls to the Debug Help Library PE image access APIs. HANDLE g_processheap; // Handle to the process's heap (COM allocations come from here). CriticalSection g_stackwalklock; // Serializes calls to StackWalk64 from the Debug Help Library. -CriticalSection g_symbollock; // Serializes calls to the Debug Help Library symbols handling APIs. +CriticalSection g_symbollock; // Serializes calls to the Debug Help Library symbols handling APIs and + // access to the heap and block maps. // The one and only VisualLeakDetector object instance. __declspec(dllexport) VisualLeakDetector vld; @@ -629,7 +630,6 @@ VisualLeakDetector::VisualLeakDetector () m_leaksfound = 0; m_loadedmodules = NULL; m_loaderlock.Initialize(); - m_heapmaplock.Initialize(); m_moduleslock.Initialize(); m_selftestfile = __FILE__; m_selftestline = 0; @@ -882,7 +882,6 @@ VisualLeakDetector::~VisualLeakDetector () g_imagelock.Delete(); m_loaderlock.Delete(); - m_heapmaplock.Delete(); m_moduleslock.Delete(); g_stackwalklock.Delete(); g_symbollock.Delete(); @@ -929,9 +928,6 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { DWORD64 modulebase = (DWORD64)(*newit).addrlow; UINT32 moduleflags = 0x0; - LPCSTR modulename = (*newit).name; - LPCSTR modulepath = (*newit).path; - DWORD modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; bool refresh = false; bool moduleLoaded = false; @@ -966,13 +962,16 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) } } - vld.m_heapmaplock.Enter(); + LPCWSTR modulename = (*newit).name; + LPCWSTR modulepath = (*newit).path; + DWORD modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; + g_symbollock.Enter(); if ((refresh == true) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { // Discard the previously loaded symbols, so we can refresh them. if (SymUnloadModule64(g_currentprocess, modulebase) == false) { report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" - L" numbers shown in the memory leak report for %s may be inaccurate.", modulename, modulename); + L" numbers shown in the memory leak report for %s may be inaccurate.\n", modulename, modulename); } } @@ -985,28 +984,24 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) BOOL SymbolsLoaded = SymGetModuleInfoW64(g_currentprocess, modulebase, &moduleimageinfo); if (!SymbolsLoaded) { - DWORD64 module = SymLoadModule64(g_currentprocess, NULL, modulepath, NULL, modulebase, modulesize); + DWORD64 module = SymLoadModuleEx(g_currentprocess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0); if (module == modulebase) SymbolsLoaded = SymGetModuleInfoW64(g_currentprocess, modulebase, &moduleimageinfo); } if (SymbolsLoaded) moduleflags |= VLD_MODULE_SYMBOLSLOADED; g_symbollock.Leave(); - vld.m_heapmaplock.Leave(); - if (_stricmp(VLDDLL, modulename) == 0) { + if (_wcsicmp(TEXT(VLDDLL), modulename) == 0) { // What happens when a module goes through it's own portal? Bad things. // Like infinite recursion. And ugly bald men wearing dresses. VLD // should not, therefore, attach to itself. continue; } - size_t count; #define MAXMODULENAME (_MAX_FNAME + _MAX_EXT) - WCHAR modulenamew [MAXMODULENAME]; - mbstowcs_s(&count, modulenamew, MAXMODULENAME, modulename, _TRUNCATE); if ((findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A") == FALSE) && - (wcsstr(vld.m_forcedmodulelist, modulenamew) == NULL)) { + (wcsstr(m_forcedmodulelist, modulename) == NULL)) { // This module does not import VLD. This means that none of the module's // sources #included vld.h. Exclude this module from leak detection. moduleflags |= VLD_MODULE_EXCLUDED; @@ -1302,7 +1297,7 @@ BOOL VisualLeakDetector::enabled () return FALSE; } - tls_t* tls = vld.gettls(); + tls_t* tls = gettls(); if (!(tls->flags & VLD_TLS_DISABLED) && !(tls->flags & VLD_TLS_ENABLED)) { // The enabled/disabled state for the current thread has not been // initialized yet. Use the default state. @@ -1429,7 +1424,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool c blockinfo->blocks = 1; // Insert the block's information into the block map. - CriticalSectionLocker cs(m_heapmaplock); + CriticalSectionLocker cs(g_symbollock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We haven't mapped this heap to a block map yet. Do it now. @@ -1473,7 +1468,7 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) heapinfo_t* heapinfo = new heapinfo_t; heapinfo->blockmap.reserve(BLOCKMAPRESERVE); heapinfo->flags = 0x0; - CriticalSectionLocker cs(m_heapmaplock); + CriticalSectionLocker cs(g_symbollock); HeapMap::Iterator heapit = m_heapmap->insert(heap, heapinfo); if (heapit == m_heapmap->end()) { // Somehow this heap has been created twice without being destroyed, @@ -1526,7 +1521,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was reallocated in-place. Find the existing blockinfo_t // entry in the block map and update it with the new callstack and size. - CriticalSectionLocker cs(m_heapmaplock); + CriticalSectionLocker cs(g_symbollock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We haven't mapped this heap to a block map yet. Obviously the @@ -1629,19 +1624,8 @@ VOID VisualLeakDetector::reportconfig () // // None. // -SIZE_T VisualLeakDetector::getleakscount (HANDLE heap, BOOL includingInternal) +SIZE_T VisualLeakDetector::getleakscount (heapinfo_t* heapinfo, BOOL includingInternal) { - assert(heap != NULL); - - // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(m_heapmaplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { - // Nothing is allocated from this heap. No leaks. - return 0; - } - - heapinfo_t* heapinfo = (*heapit).second; BlockMap* blockmap = &heapinfo->blockmap; SIZE_T memoryleaks = 0; @@ -1683,7 +1667,7 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) assert(heap != NULL); // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(m_heapmaplock); + CriticalSectionLocker cs(g_symbollock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // Nothing is allocated from this heap. No leaks. @@ -1691,6 +1675,11 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) } heapinfo_t* heapinfo = (*heapit).second; + return reportleaks(heapinfo); +} + +SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo) +{ BlockMap* blockmap = &heapinfo->blockmap; SIZE_T leaksfound = 0; bool firstleak = (m_leaksfound == 0); @@ -1830,7 +1819,7 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & return; // Find this heap's block map. - CriticalSectionLocker cs(m_heapmaplock); + CriticalSectionLocker cs(g_symbollock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We don't have a block map for this heap. We must not have monitored @@ -1863,7 +1852,7 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & // Now we need a way to print the current callstack at this point: CallStack* stack_here = CallStack::Create(); - stack_here->getstacktrace(vld.m_maxtraceframes, context); + stack_here->getstacktrace(m_maxtraceframes, context); report(L"Deallocation Call stack.\n"); report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); report(L" Call Stack:\n"); @@ -1898,7 +1887,7 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & VOID VisualLeakDetector::unmapheap (HANDLE heap) { // Find this heap's block map. - CriticalSectionLocker cs(m_heapmaplock); + CriticalSectionLocker cs(g_symbollock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // This heap hasn't been mapped. We must not have monitored this heap's @@ -1952,41 +1941,45 @@ VOID VisualLeakDetector::unmapheap (HANDLE heap) // BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context) { - // Convert the module path to ASCII. size_t length = wcslen(modulepath) + 1; - LPSTR modulepatha = new CHAR [length]; - - // wcstombs_s requires locale to be already set up correctly, but it might not be correct on vld init step. So use WideCharToMultiByte instead - CHAR defaultChar = '?'; - BOOL defaultCharUsed = FALSE; - - int count = ::WideCharToMultiByte(CP_ACP, 0/*flags*/, modulepath, (int)length, modulepatha, (int)length, &defaultChar, &defaultCharUsed); - assert(count != 0); - if ( defaultCharUsed ) - { - ::OutputDebugStringW(__FILEW__ L": " __FUNCTIONW__ L" - defaultChar was used while conversion from \""); - ::OutputDebugStringW(modulepath); - ::OutputDebugStringW(L"\" to ANSI \""); - ::OutputDebugStringA(modulepatha); - ::OutputDebugStringW(L"\". Result can be wrong.\n"); - } + LPWSTR modulepathw = new WCHAR [length]; + wcsncpy_s(modulepathw, length, modulepath, _TRUNCATE); // Extract just the filename and extension from the module path. - CHAR filename [_MAX_FNAME]; - CHAR extension [_MAX_EXT]; - _splitpath_s(modulepatha, NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); + WCHAR filename [_MAX_FNAME]; + WCHAR extension [_MAX_EXT]; + _wsplitpath_s(modulepathw, NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); - length = strlen(filename) + strlen(extension) + 1; - LPSTR modulenamea = new CHAR [length]; - strncpy_s(modulenamea, length, filename, _TRUNCATE); - strncat_s(modulenamea, length, extension, _TRUNCATE); - _strlwr_s(modulenamea, length); + length = wcslen(filename) + wcslen(extension) + 1; + LPWSTR modulename = new WCHAR [length]; + wcsncpy_s(modulename, length, filename, _TRUNCATE); + wcsncat_s(modulename, length, extension, _TRUNCATE); + _wcslwr_s(modulename, length); - if (_stricmp(modulenamea, VLDDLL) == 0) { + if (_wcsicmp(modulename, TEXT(VLDDLL)) == 0) { // Record Visual Leak Detector's own base address. vld.m_vldbase = (HMODULE)modulebase; } else { + // Convert the module path to ASCII. + length = wcslen(modulename) + 1; + LPSTR modulenamea = new CHAR [length]; + + // wcstombs_s requires locale to be already set up correctly, but it might not be correct on vld init step. So use WideCharToMultiByte instead + CHAR defaultChar = '?'; + BOOL defaultCharUsed = FALSE; + + int count = ::WideCharToMultiByte(CP_ACP, 0/*flags*/, modulename, (int)length, modulenamea, (int)length, &defaultChar, &defaultCharUsed); + assert(count != 0); + if ( defaultCharUsed ) + { + ::OutputDebugStringW(__FILEW__ L": " __FUNCTIONW__ L" - defaultChar was used while conversion from \""); + ::OutputDebugStringW(modulename); + ::OutputDebugStringW(L"\" to ANSI \""); + ::OutputDebugStringA(modulenamea); + ::OutputDebugStringW(L"\". Result can be wrong.\n"); + } + // See if this is a module listed in the patch table. If it is, update // the corresponding patch table entries' module base address. UINT tablesize = _countof(m_patchtable); @@ -1996,6 +1989,8 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, entry->modulebase = (UINT_PTR)modulebase; } } + + delete [] modulenamea; } // Record the module's information and store it in the set. @@ -2003,8 +1998,8 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, moduleinfo.addrlow = (UINT_PTR)modulebase; moduleinfo.addrhigh = (UINT_PTR)(modulebase + modulesize) - 1; moduleinfo.flags = 0x0; - moduleinfo.name = modulenamea; - moduleinfo.path = modulepatha; + moduleinfo.name = modulename; + moduleinfo.path = modulepathw; ModuleSet* newmodules = (ModuleSet*)context; newmodules->insert(moduleinfo); @@ -2124,7 +2119,7 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2163,7 +2158,7 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool de // void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntime, size_t size) { - tls_t* tls = vld.gettls(); + tls_t *tls = vld.gettls(); // The new operator is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2294,7 +2289,7 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size, size_t alignment) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2334,7 +2329,7 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -3384,11 +3379,9 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; - CriticalSectionLocker cs(vld.m_heapmaplock); - g_symbollock.Enter(); + CriticalSectionLocker cs(g_symbollock); DWORD64 displacement; BOOL symfound = SymFromAddrW(g_currentprocess, ra, &displacement, functioninfo); - g_symbollock.Leave(); if (symfound == TRUE) { if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { // HeapCreate was called by _heap_init. This is a static CRT heap. @@ -3485,10 +3478,10 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod VOID VisualLeakDetector::RefreshModules() { - if (vld.m_options & VLD_OPT_VLDOFF) + if (m_options & VLD_OPT_VLDOFF) return; - CriticalSectionLocker cs(vld.m_loaderlock); + CriticalSectionLocker cs(m_loaderlock); // Duplicate code here in this method. Consider refactoring out to another method. // Create a new set of all loaded modules, including any newly loaded // modules. @@ -3497,13 +3490,13 @@ VOID VisualLeakDetector::RefreshModules() EnumerateLoadedModulesW64(g_currentprocess, addloadedmodule, newmodules); // Attach to all modules included in the set. - vld.attachtoloadedmodules(newmodules); + attachtoloadedmodules(newmodules); // Start using the new set of loaded modules. - vld.m_moduleslock.Enter(); - ModuleSet* oldmodules = vld.m_loadedmodules; - vld.m_loadedmodules = newmodules; - vld.m_moduleslock.Leave(); + m_moduleslock.Enter(); + ModuleSet* oldmodules = m_loadedmodules; + m_loadedmodules = newmodules; + m_moduleslock.Leave(); // Free resources used by the old module list. for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { @@ -4011,7 +4004,7 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) { LPVOID block; context_t context; - tls_t *tls = vld.gettls(); + tls_t *tls = gettls(); bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -4130,7 +4123,7 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) { LPVOID block; context_t context; - tls_t *tls = vld.gettls(); + tls_t *tls = gettls(); bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -4231,7 +4224,7 @@ void VisualLeakDetector::ReportFree(LPVOID mem, HANDLE heap) CAPTURE_CONTEXT(context); // Unmap the block from the specified heap. - vld.unmapblock(heap, mem, context); + unmapblock(heap, mem, context); } SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) @@ -4243,10 +4236,12 @@ SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) SIZE_T leaksCount = 0; // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(m_heapmaplock); + CriticalSectionLocker cs(g_symbollock); for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { HANDLE heap = (*heapit).first; - leaksCount += getleakscount(heap, includingInternal); + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + leaksCount += getleakscount(heapinfo, includingInternal); } return leaksCount; } @@ -4261,10 +4256,12 @@ SIZE_T VisualLeakDetector::ReportLeaks( ) // Generate a memory leak report for each heap in the process. SIZE_T leaksCount = 0; m_leaksfound = 0; - CriticalSectionLocker cs(m_heapmaplock); + CriticalSectionLocker cs(g_symbollock); for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { HANDLE heap = (*heapit).first; - leaksCount += reportleaks(heap); + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + leaksCount += reportleaks(heapinfo); } return leaksCount; } @@ -4273,9 +4270,9 @@ void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) { ModuleSet::Iterator moduleit; - CriticalSectionLocker cs(vld.m_moduleslock); - moduleit = vld.m_loadedmodules->begin(); - while( moduleit != vld.m_loadedmodules->end() ) + CriticalSectionLocker cs(m_moduleslock); + moduleit = m_loadedmodules->begin(); + while( moduleit != m_loadedmodules->end() ) { if ( (*moduleit).addrlow == (UINT_PTR)module) { @@ -4543,17 +4540,8 @@ void VisualLeakDetector::SetupReporting() } } -void VisualLeakDetector::resolveStacks(HANDLE heap) +void VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) { - // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(m_heapmaplock); - HeapMap::Iterator heapiter = m_heapmap->find(heap); - if (heapiter == m_heapmap->end()) { - // Nothing is allocated from this heap. No leaks. - return; - } - - heapinfo_t* heapinfo = (*heapiter).second; BlockMap& blockmap = heapinfo->blockmap; for (BlockMap::Iterator blockit = blockmap.begin(); blockit != blockmap.end(); ++blockit) { @@ -4591,16 +4579,16 @@ void VisualLeakDetector::resolveStacks(HANDLE heap) void VisualLeakDetector::ResolveCallstacks() { - if (vld.m_options & VLD_OPT_VLDOFF) + if (m_options & VLD_OPT_VLDOFF) return; // Generate the Callstacks early - CriticalSectionLocker cs(m_heapmaplock); - for (HeapMap::Iterator heapiter = m_heapmap->begin(); - heapiter != m_heapmap->end(); - ++heapiter) + CriticalSectionLocker cs(g_symbollock); + for (HeapMap::Iterator heapiter = m_heapmap->begin(); heapiter != m_heapmap->end(); ++heapiter) { HANDLE heap = (*heapiter).first; - resolveStacks(heap); + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapiter).second; + resolveStacks(heapinfo); } } diff --git a/vldint.h b/vldint.h index e18b89ca..291a37e6 100644 --- a/vldint.h +++ b/vldint.h @@ -25,8 +25,8 @@ #ifndef VLDBUILD #error \ - "This header should only be included by Visual Leak Detector when building it from source. \ - Applications should never include this header." + "This header should only be included by Visual Leak Detector when building it from source. \ + Applications should never include this header." #endif #include @@ -88,10 +88,10 @@ typedef void* (__cdecl *_aligned_offset_recalloc_dbg_t) (void *, size_t, size_t, // a BlockMap which maps each of these structures to its corresponding memory // block. struct blockinfo_t { - CallStack *callstack; - SIZE_T serialnumber; - SIZE_T size; - SIZE_T blocks; // The number of duplicates for this particular block. + CallStack *callstack; + SIZE_T serialnumber; + SIZE_T size; + SIZE_T blocks; // The number of duplicates for this particular block. }; // BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. @@ -101,8 +101,8 @@ typedef Map BlockMap; // this is used for mapping heaps to all of the blocks allocated from those // heaps. struct heapinfo_t { - BlockMap blockmap; // Map of all blocks allocated from this heap. - UINT32 flags; // Heap status flags: + BlockMap blockmap; // Map of all blocks allocated from this heap. + UINT32 flags; // Heap status flags: #define VLD_HEAP_CRT_DBG 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). }; @@ -113,23 +113,23 @@ typedef Map HeapMap; // a given module and can be used with the Set template because it supports the // '<' operator (sorts by virtual address range). struct moduleinfo_t { - BOOL operator < (const struct moduleinfo_t& other) const - { - if (addrhigh < other.addrlow) { - return TRUE; - } - else { - return FALSE; - } - } - - SIZE_T addrlow; // Lowest address within the module's virtual address space (i.e. base address). - SIZE_T addrhigh; // Highest address within the module's virtual address space (i.e. base + size). - UINT32 flags; // Module flags: + BOOL operator < (const struct moduleinfo_t& other) const + { + if (addrhigh < other.addrlow) { + return TRUE; + } + else { + return FALSE; + } + } + + SIZE_T addrlow; // Lowest address within the module's virtual address space (i.e. base address). + SIZE_T addrhigh; // Highest address within the module's virtual address space (i.e. base + size). + UINT32 flags; // Module flags: #define VLD_MODULE_EXCLUDED 0x1 // If set, this module is excluded from leak detection. #define VLD_MODULE_SYMBOLSLOADED 0x2 // If set, this module's debug symbols have been loaded. - LPCSTR name; // The module's name (e.g. "kernel32.dll"). - LPCSTR path; // The fully qualified path from where the module was loaded. + LPCWSTR name; // The module's name (e.g. "kernel32.dll"). + LPCWSTR path; // The fully qualified path from where the module was loaded. }; // ModuleSets store information about modules loaded in the process. @@ -140,15 +140,15 @@ typedef Set ModuleSet; // detection status (enabled or disabled) and the address that initiated the // current allocation is stored here. struct tls_t { - context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. - UINT32 flags; // Thread-local status flags: + context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. + UINT32 flags; // Thread-local status flags: #define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. #define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. #define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. - UINT32 oldflags; // Thread-local status old flags - BOOL blockprocessed; // Internal diagnostic feature - DWORD threadid; // Thread ID of the thread that owns this TLS structure. - CallStack** ppcallstack; // Memory block callstack pointer. + UINT32 oldflags; // Thread-local status old flags + BOOL blockprocessed; // Internal diagnostic feature + DWORD threadid; // Thread ID of the thread that owns this TLS structure. + CallStack** ppcallstack; // Memory block callstack pointer. }; // The TlsSet allows VLD to keep track of all thread local storage structures @@ -186,182 +186,182 @@ class CallStack; class VisualLeakDetector : public IMalloc { public: - VisualLeakDetector(); - ~VisualLeakDetector(); - - //////////////////////////////////////////////////////////////////////////////// - // Public CRT and MFC Common Handlers - // - // Many heap functions are indirectly rerouted to these handlers. One common - // function exists for each heap function with a given signature. These - // handlers are not direct IAT replacements, but are called by the individual - // IAT replacement functions. - //////////////////////////////////////////////////////////////////////////////// - // Standard CRT and MFC common handlers - void* _calloc (calloc_t pcalloc, context_t& context, bool debugRuntime, size_t num, size_t size); - void* _malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size); - void* _new (new_t pnew, context_t& context, bool debugRuntime, size_t size); - void* _realloc (realloc_t prealloc, context_t& context, bool debugRuntime, void *mem, size_t size); - void* __recalloc (_recalloc_t precalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size); - - // Debug CRT and MFC common handlers - void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, bool debugRuntime, size_t num, size_t size, int type, char const *file, int line); - void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); - void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); - void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); - void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); - void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, int type, char const *file, int line); - void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, int type, char const *file, int line); - - void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment); - void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset); - void *__aligned_realloc (_aligned_realloc_t p_aligned_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment); - void *__aligned_offset_realloc (_aligned_offset_realloc_t p_aligned_offset_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset); - void *__aligned_recalloc (_aligned_recalloc_t p_aligned_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment); - void *__aligned_offset_recalloc (_aligned_offset_recalloc_t p_aligned_offset_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset); - void* __aligned_malloc_dbg (_aligned_malloc_dbg_t p_aligned_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_aligned_offset_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - void* __aligned_realloc_dbg (_aligned_realloc_dbg_t p_aligned_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_aligned_offset_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - void* __aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_aligned_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_aligned_offset_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - - //////////////////////////////////////////////////////////////////////////////// - // Public IMalloc methods - for support of COM-based memory leak detection. - //////////////////////////////////////////////////////////////////////////////// - ULONG __stdcall AddRef (); - LPVOID __stdcall Alloc (SIZE_T size); - INT __stdcall DidAlloc (LPVOID mem); - VOID __stdcall Free (LPVOID mem); - SIZE_T __stdcall GetSize (LPVOID mem); - VOID __stdcall HeapMinimize (); - HRESULT __stdcall QueryInterface (REFIID iid, LPVOID *object); - LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); - ULONG __stdcall Release (); - - LPVOID ReportAlloc(LPVOID block, SIZE_T size, HANDLE heap); - void ReportFree(LPVOID mem, HANDLE heap); - - void DisableLeakDetection (); - void EnableLeakDetection (); - void RestoreLeakDetectionState (); - void GlobalDisableLeakDetection (); - void GlobalEnableLeakDetection (); - - VOID RefreshModules(); - SIZE_T GetLeaksCount(BOOL includingInternal); - SIZE_T ReportLeaks(); - VOID EnableModule(HMODULE module); - VOID DisableModule(HMODULE module); - UINT32 GetOptions(); - VOID GetReportFilename(WCHAR *filename); - VOID SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); - VOID SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); - VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); - bool GetModulesList(WCHAR *modules, UINT size); - VOID ResolveCallstacks(); - - static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); + VisualLeakDetector(); + ~VisualLeakDetector(); + + //////////////////////////////////////////////////////////////////////////////// + // Public CRT and MFC Common Handlers + // + // Many heap functions are indirectly rerouted to these handlers. One common + // function exists for each heap function with a given signature. These + // handlers are not direct IAT replacements, but are called by the individual + // IAT replacement functions. + //////////////////////////////////////////////////////////////////////////////// + // Standard CRT and MFC common handlers + void* _calloc (calloc_t pcalloc, context_t& context, bool debugRuntime, size_t num, size_t size); + void* _malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size); + void* _new (new_t pnew, context_t& context, bool debugRuntime, size_t size); + void* _realloc (realloc_t prealloc, context_t& context, bool debugRuntime, void *mem, size_t size); + void* __recalloc (_recalloc_t precalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size); + + // Debug CRT and MFC common handlers + void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, bool debugRuntime, size_t num, size_t size, int type, char const *file, int line); + void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); + void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); + void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); + void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); + void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, int type, char const *file, int line); + void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, int type, char const *file, int line); + + void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment); + void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset); + void *__aligned_realloc (_aligned_realloc_t p_aligned_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment); + void *__aligned_offset_realloc (_aligned_offset_realloc_t p_aligned_offset_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset); + void *__aligned_recalloc (_aligned_recalloc_t p_aligned_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment); + void *__aligned_offset_recalloc (_aligned_offset_recalloc_t p_aligned_offset_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset); + void* __aligned_malloc_dbg (_aligned_malloc_dbg_t p_aligned_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_aligned_offset_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + void* __aligned_realloc_dbg (_aligned_realloc_dbg_t p_aligned_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_aligned_offset_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + void* __aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_aligned_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_aligned_offset_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + + //////////////////////////////////////////////////////////////////////////////// + // Public IMalloc methods - for support of COM-based memory leak detection. + //////////////////////////////////////////////////////////////////////////////// + ULONG __stdcall AddRef (); + LPVOID __stdcall Alloc (SIZE_T size); + INT __stdcall DidAlloc (LPVOID mem); + VOID __stdcall Free (LPVOID mem); + SIZE_T __stdcall GetSize (LPVOID mem); + VOID __stdcall HeapMinimize (); + HRESULT __stdcall QueryInterface (REFIID iid, LPVOID *object); + LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); + ULONG __stdcall Release (); + + LPVOID ReportAlloc(LPVOID block, SIZE_T size, HANDLE heap); + void ReportFree(LPVOID mem, HANDLE heap); + + void DisableLeakDetection (); + void EnableLeakDetection (); + void RestoreLeakDetectionState (); + void GlobalDisableLeakDetection (); + void GlobalEnableLeakDetection (); + + VOID RefreshModules(); + SIZE_T GetLeaksCount(BOOL includingInternal); + SIZE_T ReportLeaks(); + VOID EnableModule(HMODULE module); + VOID DisableModule(HMODULE module); + UINT32 GetOptions(); + VOID GetReportFilename(WCHAR *filename); + VOID SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); + VOID SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); + VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); + bool GetModulesList(WCHAR *modules, UINT size); + VOID ResolveCallstacks(); + + static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); private: - //////////////////////////////////////////////////////////////////////////////// - // Private leak detection functions - see each function definition for details. - //////////////////////////////////////////////////////////////////////////////// - VOID attachtoloadedmodules (ModuleSet *newmodules); - LPWSTR buildsymbolsearchpath (); - VOID configure (); - BOOL enabled (); - SIZE_T eraseduplicates (const BlockMap::Iterator &element); - tls_t* gettls (); - VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack); - VOID mapheap (HANDLE heap); - VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - bool crtalloc, CallStack **&ppcallstack, const context_t &context); - VOID reportconfig (); - SIZE_T getleakscount (HANDLE heap, BOOL includingInternal); - SIZE_T reportleaks (HANDLE heap); - VOID unmapblock (HANDLE heap, LPCVOID mem, const context_t &context); - VOID unmapheap (HANDLE heap); - void resolveStacks(HANDLE heap); - - // Static functions (callbacks) - static BOOL __stdcall addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - static BOOL __stdcall detachfrommodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - - // Utils - static BOOL IsModuleExcluded (UINT_PTR returnaddress); - blockinfo_t* FindAllocedBlock(LPCVOID, __out HANDLE& heap); - static void getcallstack( CallStack **&ppcallstack, context_t &context ); - static inline void firstalloccall(tls_t * tls); - void SetupReporting(); - - //////////////////////////////////////////////////////////////////////////////// - // IAT replacement functions - see each function definition for details. - // - // Because there are so many virtually identical CRT and MFC replacement - // functions, they are excluded from the class to reduce the amount of noise - // within this class's code. See crtmfcpatch.cpp for those functions. - //////////////////////////////////////////////////////////////////////////////// - // Win32 IAT replacement functions - static FARPROC __stdcall _GetProcAddress (HMODULE module, LPCSTR procname); - static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle); - - static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); - static BOOL __stdcall _HeapDestroy (HANDLE heap); - static LPVOID __stdcall _HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size); - static BOOL __stdcall _HeapFree (HANDLE heap, DWORD flags, LPVOID mem); - static LPVOID __stdcall _HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); - - static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); - static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); - static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); - - // COM IAT replacement functions - static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); - static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); - static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); - - static void AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size); - static void ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context); - - //////////////////////////////////////////////////////////////////////////////// - // Private data - //////////////////////////////////////////////////////////////////////////////// - WCHAR m_forcedmodulelist [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. - HeapMap *m_heapmap; // Map of all active heaps in the process. - IMalloc *m_imalloc; // Pointer to the system implementation of IMalloc. - SIZE_T m_leaksfound; // Total number of leaks found. - ModuleSet *m_loadedmodules; // Contains information about all modules loaded in the process. - CriticalSection m_loaderlock; // Serializes the attachment of newly loaded modules. - CriticalSection m_heapmaplock; // Serializes access to the heap and block maps. - SIZE_T m_maxdatadump; // Maximum number of user-data bytes to dump for each leaked block. - UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. - CriticalSection m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. - UINT32 m_options; // Configuration options: - - static patchentry_t m_kernelbasePatch []; - static patchentry_t m_kernel32Patch []; - static patchentry_t m_ntdllPatch []; - static patchentry_t m_ole32Patch []; - static moduleentry_t m_patchtable []; // Table of imports patched for attaching VLD to other modules. - FILE *m_reportfile; // File where the memory leak report may be sent to. - WCHAR m_reportfilepath [MAX_PATH]; // Full path and name of file to send memory leak report to. - const char *m_selftestfile; // Filename where the memory leak self-test block is leaked. - int m_selftestline; // Line number where the memory leak self-test block is leaked. - UINT32 m_status; // Status flags: + //////////////////////////////////////////////////////////////////////////////// + // Private leak detection functions - see each function definition for details. + //////////////////////////////////////////////////////////////////////////////// + VOID attachtoloadedmodules (ModuleSet *newmodules); + LPWSTR buildsymbolsearchpath (); + VOID configure (); + BOOL enabled (); + SIZE_T eraseduplicates (const BlockMap::Iterator &element); + tls_t* gettls (); + VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack); + VOID mapheap (HANDLE heap); + VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, + bool crtalloc, CallStack **&ppcallstack, const context_t &context); + VOID reportconfig (); + SIZE_T getleakscount (heapinfo_t* heapinfo, BOOL includingInternal); + SIZE_T reportleaks (HANDLE heap); + SIZE_T reportleaks( heapinfo_t* heapinfo ); + VOID unmapblock (HANDLE heap, LPCVOID mem, const context_t &context); + VOID unmapheap (HANDLE heap); + void resolveStacks(heapinfo_t* heapinfo); + + // Static functions (callbacks) + static BOOL __stdcall addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + static BOOL __stdcall detachfrommodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + + // Utils + static BOOL IsModuleExcluded (UINT_PTR returnaddress); + blockinfo_t* FindAllocedBlock(LPCVOID, __out HANDLE& heap); + static void getcallstack( CallStack **&ppcallstack, context_t &context ); + static inline void firstalloccall(tls_t * tls); + void SetupReporting(); + + //////////////////////////////////////////////////////////////////////////////// + // IAT replacement functions - see each function definition for details. + // + // Because there are so many virtually identical CRT and MFC replacement + // functions, they are excluded from the class to reduce the amount of noise + // within this class's code. See crtmfcpatch.cpp for those functions. + //////////////////////////////////////////////////////////////////////////////// + // Win32 IAT replacement functions + static FARPROC __stdcall _GetProcAddress (HMODULE module, LPCSTR procname); + static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, + PHANDLE modulehandle); + + static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); + static BOOL __stdcall _HeapDestroy (HANDLE heap); + static LPVOID __stdcall _HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size); + static BOOL __stdcall _HeapFree (HANDLE heap, DWORD flags, LPVOID mem); + static LPVOID __stdcall _HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); + + static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); + static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); + static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); + + // COM IAT replacement functions + static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); + static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); + static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); + + static void AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size); + static void ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context); + + //////////////////////////////////////////////////////////////////////////////// + // Private data + //////////////////////////////////////////////////////////////////////////////// + WCHAR m_forcedmodulelist [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. + HeapMap *m_heapmap; // Map of all active heaps in the process. + IMalloc *m_imalloc; // Pointer to the system implementation of IMalloc. + SIZE_T m_leaksfound; // Total number of leaks found. + ModuleSet *m_loadedmodules; // Contains information about all modules loaded in the process. + CriticalSection m_loaderlock; // Serializes the attachment of newly loaded modules. + SIZE_T m_maxdatadump; // Maximum number of user-data bytes to dump for each leaked block. + UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. + CriticalSection m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. + UINT32 m_options; // Configuration options: + + static patchentry_t m_kernelbasePatch []; + static patchentry_t m_kernel32Patch []; + static patchentry_t m_ntdllPatch []; + static patchentry_t m_ole32Patch []; + static moduleentry_t m_patchtable []; // Table of imports patched for attaching VLD to other modules. + FILE *m_reportfile; // File where the memory leak report may be sent to. + WCHAR m_reportfilepath [MAX_PATH]; // Full path and name of file to send memory leak report to. + const char *m_selftestfile; // Filename where the memory leak self-test block is leaked. + int m_selftestline; // Line number where the memory leak self-test block is leaked. + UINT32 m_status; // Status flags: #define VLD_STATUS_DBGHELPLINKED 0x1 // If set, the explicit dynamic link to the Debug Help Library succeeded. #define VLD_STATUS_INSTALLED 0x2 // If set, VLD was successfully installed. #define VLD_STATUS_NEVER_ENABLED 0x4 // If set, VLD started disabled, and has not yet been manually enabled. #define VLD_STATUS_FORCE_REPORT_TO_FILE 0x8 // If set, the leak report is being forced to a file. - DWORD m_tlsindex; // Thread-local storage index. - CriticalSection m_tlslock; // Protects accesses to the Set of TLS structures. - TlsMap *m_tlsmap; // Set of all all thread-local storage structres for the process. - HMODULE m_vldbase; // Visual Leak Detector's own module handle (base address). + DWORD m_tlsindex; // Thread-local storage index. + CriticalSection m_tlslock; // Protects accesses to the Set of TLS structures. + TlsMap *m_tlsmap; // Set of all all thread-local storage structres for the process. + HMODULE m_vldbase; // Visual Leak Detector's own module handle (base address). - typedef FARPROC __stdcall _GetProcAddressType(HMODULE module, LPCSTR procname); + typedef FARPROC __stdcall _GetProcAddressType(HMODULE module, LPCSTR procname); - VOID __stdcall ChangeModuleState(HMODULE module,bool on); - static _GetProcAddressType * m_original_GetProcAddress; + VOID __stdcall ChangeModuleState(HMODULE module,bool on); + static _GetProcAddressType * m_original_GetProcAddress; }; // Configuration option default values From 15d41f5ffd4e53d5e28c4783c998c08ec1fb49a3 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 6 Jun 2011 20:53:19 +0000 Subject: [PATCH 097/321] Rewrited code that use critical section g_symbollock from previous commits (reduced thread locking time) ReportAlloc/ReportFree functions removed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67547 --- callstack.cpp | 12 ++- criticalsection.h | 13 +++ tests/basics/Allocs.cpp | 15 +++ tests/basics/LeakOption.h | 1 + tests/basics/basics.cpp | 7 +- tests/suite/testsuite.vcxproj | 4 +- vld.cpp | 166 ++++++++++++---------------------- vld.h | 17 ---- vld.vcxproj | 8 +- vldapi.cpp | 10 -- vldint.h | 6 +- 11 files changed, 109 insertions(+), 150 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index b8799fdb..3817a38a 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -212,8 +212,6 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const L" complete stack trace.\n"); } - CriticalSectionLocker cs(g_symbollock); - IMAGEHLP_LINE64 sourceinfo = { 0 }; sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); @@ -231,6 +229,7 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const // Try to get the source file and line number associated with // this program counter address. SIZE_T programcounter = (*this)[frame]; + g_symbollock.Enter(); BOOL foundline = FALSE; DWORD displacement = 0; foundline = SymGetLineFromAddrW64(g_currentprocess, programcounter, &displacement, &sourceinfo); @@ -238,6 +237,7 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); if (IsInternalModule(sourceinfo.FileName)) { // Don't show frames in files internal to the heap. + g_symbollock.Leave(); continue; } } @@ -263,6 +263,7 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const functionname = L"(Function name unavailable)"; displacement64 = 0; } + g_symbollock.Leave(); HMODULE hCallingModule = GetCallingModule(programcounter); LPWSTR modulename = L"(Module name unavailable)"; @@ -338,8 +339,6 @@ void CallStack::Resolve(BOOL showinternalframes) L" complete stack trace.\n"); } - CriticalSectionLocker cs(g_symbollock); - IMAGEHLP_LINE64 sourceinfo = { 0 }; sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); @@ -361,6 +360,7 @@ void CallStack::Resolve(BOOL showinternalframes) // Try to get the source file and line number associated with // this program counter address. SIZE_T programcounter = (*this)[frame]; + g_symbollock.Enter(); BOOL foundline = FALSE; DWORD displacement = 0; @@ -374,6 +374,7 @@ void CallStack::Resolve(BOOL showinternalframes) _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); if (IsInternalModule(sourceinfo.FileName)) { // Don't show frames in files internal to the heap. + g_symbollock.Leave(); continue; } } @@ -399,7 +400,8 @@ void CallStack::Resolve(BOOL showinternalframes) functionname = L"(Function name unavailable)"; displacement64 = 0; } - + g_symbollock.Leave(); + HMODULE hCallingModule = GetCallingModule(programcounter); LPWSTR modulename = L"(Module name unavailable)"; if (hCallingModule && diff --git a/criticalsection.h b/criticalsection.h index d5d77dab..bcbe9303 100644 --- a/criticalsection.h +++ b/criticalsection.h @@ -20,6 +20,19 @@ class CriticalSection EnterCriticalSection(&m_critRegion); } + bool IsLocked() + { + return (m_critRegion.OwningThread != NULL); + } + + bool IsLockedByCurrentThread() + { + if (m_critRegion.OwningThread == NULL) + return false; + HANDLE ownerThreadId = (HANDLE)GetCurrentThreadId(); + return m_critRegion.OwningThread == ownerThreadId; + } + // try enter the section bool TryEnter() { return (TryEnterCriticalSection(&m_critRegion) != 0); } diff --git a/tests/basics/Allocs.cpp b/tests/basics/Allocs.cpp index f00b7040..fed9e64b 100644 --- a/tests/basics/Allocs.cpp +++ b/tests/basics/Allocs.cpp @@ -77,6 +77,18 @@ void AllocF(LeakOption type, bool bFree) } } else if (type == eAlignedMalloc) + { + void* leaked = _aligned_offset_malloc(64, 16, 1); + leaked_memory = (int*)_aligned_malloc(64, 16); + leaked_memory_dbg = (int*)_aligned_malloc_dbg(32, 16, __FILE__, __LINE__); + if (bFree) + { + _aligned_free(leaked); + _aligned_free(leaked_memory); + _aligned_free_dbg(leaked_memory_dbg); + } + } + else if (type == eAlignedRealloc) { void* leaked = _aligned_offset_malloc(64, 16, 1); leaked_memory = (int*)_aligned_malloc(64, 16); @@ -84,6 +96,9 @@ void AllocF(LeakOption type, bool bFree) leaked = (int*)_aligned_offset_realloc(leaked, 48, 16, 2); leaked_memory = (int*)_aligned_realloc(leaked_memory, 128, 16); leaked_memory_dbg = (int*)_aligned_realloc_dbg(leaked_memory_dbg, 48, 16, __FILE__, __LINE__); + leaked = (int*)_aligned_offset_recalloc(leaked, 1, 52, 16, 2); + leaked_memory = (int*)_aligned_recalloc(leaked_memory, 1, 132, 16); + leaked_memory_dbg = (int*)_aligned_recalloc_dbg(leaked_memory_dbg, 1, 64, 16, __FILE__, __LINE__); if (bFree) { _aligned_free(leaked); diff --git a/tests/basics/LeakOption.h b/tests/basics/LeakOption.h index a59df491..9ebd5230 100644 --- a/tests/basics/LeakOption.h +++ b/tests/basics/LeakOption.h @@ -10,6 +10,7 @@ enum LeakOption eRealloc, // "realloc" eCoTaskMem, // For COM, use "CoTaskMem" eAlignedMalloc, // "_aligned_malloc" + eAlignedRealloc, // "_aligned_realloc" eCount, }; diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 483cc03e..7999b170 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -77,10 +77,15 @@ int _tmain(int argc, _TCHAR* argv[]) leak_type = eAlignedMalloc; multiplayer = 3; } + else if (_tcsicmp(_T("AlignedRealloc"), argv[1]) == 0) + { + leak_type = eAlignedRealloc; + multiplayer = 3; + } else if (_tcsicmp(_T("all"), argv[1]) == 0) { checkAll = true; - multiplayer = 14; + multiplayer = 17; } else { diff --git a/tests/suite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj index de85b2ff..daeb095d 100644 --- a/tests/suite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -141,7 +141,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ Full $(SolutionDir);%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;WIN32;%(PreprocessorDefinitions) + VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) MultiThreadedDLL true true @@ -217,7 +217,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Full $(SolutionDir);%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;WIN64;%(PreprocessorDefinitions) + VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) MultiThreadedDLL true true diff --git a/vld.cpp b/vld.cpp index 5a083dc2..b18d2621 100644 --- a/vld.cpp +++ b/vld.cpp @@ -53,8 +53,7 @@ HANDLE g_currentthread; // Pseudo-handle for the current thread. CriticalSection g_imagelock; // Serializes calls to the Debug Help Library PE image access APIs. HANDLE g_processheap; // Handle to the process's heap (COM allocations come from here). CriticalSection g_stackwalklock; // Serializes calls to StackWalk64 from the Debug Help Library. -CriticalSection g_symbollock; // Serializes calls to the Debug Help Library symbols handling APIs and - // access to the heap and block maps. +CriticalSection g_symbollock; // Serializes calls to the Debug Help Library symbols handling APIs. // The one and only VisualLeakDetector object instance. __declspec(dllexport) VisualLeakDetector vld; @@ -630,6 +629,7 @@ VisualLeakDetector::VisualLeakDetector () m_leaksfound = 0; m_loadedmodules = NULL; m_loaderlock.Initialize(); + m_heapmaplock.Initialize(); m_moduleslock.Initialize(); m_selftestfile = __FILE__; m_selftestline = 0; @@ -882,6 +882,7 @@ VisualLeakDetector::~VisualLeakDetector () g_imagelock.Delete(); m_loaderlock.Delete(); + m_heapmaplock.Delete(); m_moduleslock.Delete(); g_stackwalklock.Delete(); g_symbollock.Delete(); @@ -982,15 +983,19 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) IMAGEHLP_MODULE64 moduleimageinfo; moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); BOOL SymbolsLoaded = SymGetModuleInfoW64(g_currentprocess, modulebase, &moduleimageinfo); + g_symbollock.Leave(); + if (!SymbolsLoaded) { + CriticalSectionLocker cs(vld.m_heapmaplock); // fix GetModuleFileName thread lock + g_symbollock.Enter(); DWORD64 module = SymLoadModuleEx(g_currentprocess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0); if (module == modulebase) SymbolsLoaded = SymGetModuleInfoW64(g_currentprocess, modulebase, &moduleimageinfo); + g_symbollock.Leave(); } if (SymbolsLoaded) moduleflags |= VLD_MODULE_SYMBOLSLOADED; - g_symbollock.Leave(); if (_wcsicmp(TEXT(VLDDLL), modulename) == 0) { // What happens when a module goes through it's own portal? Bad things. @@ -1424,7 +1429,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool c blockinfo->blocks = 1; // Insert the block's information into the block map. - CriticalSectionLocker cs(g_symbollock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We haven't mapped this heap to a block map yet. Do it now. @@ -1468,7 +1473,7 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) heapinfo_t* heapinfo = new heapinfo_t; heapinfo->blockmap.reserve(BLOCKMAPRESERVE); heapinfo->flags = 0x0; - CriticalSectionLocker cs(g_symbollock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->insert(heap, heapinfo); if (heapit == m_heapmap->end()) { // Somehow this heap has been created twice without being destroyed, @@ -1521,7 +1526,7 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was reallocated in-place. Find the existing blockinfo_t // entry in the block map and update it with the new callstack and size. - CriticalSectionLocker cs(g_symbollock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We haven't mapped this heap to a block map yet. Obviously the @@ -1667,7 +1672,7 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) assert(heap != NULL); // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(g_symbollock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // Nothing is allocated from this heap. No leaks. @@ -1717,6 +1722,7 @@ SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo) } leaksfound++; report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialnumber, address, size); + assert(info->callstack); if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { // Aggregate all other leaks which are duplicates of this one // under this same heading, to cut down on clutter. @@ -1726,16 +1732,15 @@ SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo) // is already recorded as a leak leaksfound += erased; - DWORD callstackCRC = CalculateCRC32(info->size, info->callstack->getHashValue()); + DWORD callstackCRC = 0; + if (info->callstack) + callstackCRC = CalculateCRC32(info->size, info->callstack->getHashValue()); report(L"Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, erased + 1); } // Dump the call stack. report(L" Call Stack:\n"); - assert(info->callstack); if (info->callstack) - { info->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); - } // Dump the data in the user data section of the memory block. if (m_maxdatadump != 0) { @@ -1819,7 +1824,7 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & return; // Find this heap's block map. - CriticalSectionLocker cs(g_symbollock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // We don't have a block map for this heap. We must not have monitored @@ -1887,7 +1892,7 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & VOID VisualLeakDetector::unmapheap (HANDLE heap) { // Find this heap's block map. - CriticalSectionLocker cs(g_symbollock); + CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); if (heapit == m_heapmap->end()) { // This heap hasn't been mapped. We must not have monitored this heap's @@ -2119,7 +2124,7 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2158,7 +2163,7 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool de // void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntime, size_t size) { - tls_t *tls = vld.gettls(); + tls_t* tls = vld.gettls(); // The new operator is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2289,7 +2294,7 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size, size_t alignment) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2329,7 +2334,7 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset) { - tls_t *tls = vld.gettls(); + tls_t *tls = vld.gettls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -3379,15 +3384,24 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; - CriticalSectionLocker cs(g_symbollock); + g_symbollock.Enter(); DWORD64 displacement; BOOL symfound = SymFromAddrW(g_currentprocess, ra, &displacement, functioninfo); + g_symbollock.Leave(); if (symfound == TRUE) { if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { - // HeapCreate was called by _heap_init. This is a static CRT heap. + // HeapCreate was called by _heap_init. This is a static CRT heap (msvcr*.dll). + CriticalSectionLocker cs(vld.m_heapmaplock); HeapMap::Iterator heapit = vld.m_heapmap->find(heap); assert(heapit != vld.m_heapmap->end()); - (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + HMODULE hCallingModule = (HMODULE)functioninfo->ModBase; + WCHAR callingmodulename [MAX_PATH] = L""; + if (hCallingModule && GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) + { + _wcslwr_s(callingmodulename); + if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime + (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + } } } @@ -3645,12 +3659,15 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) { BOOL status; - context_t context; - // Record the current frame pointer. - CAPTURE_CONTEXT(context); + if (!g_symbollock.IsLockedByCurrentThread()) // skip dbghelp.dll calls + { + context_t context; + // Record the current frame pointer. + CAPTURE_CONTEXT(context); - // Unmap the block from the specified heap. - vld.unmapblock(heap, mem, context); + // Unmap the block from the specified heap. + vld.unmapblock(heap, mem, context); + } status = RtlFreeHeap(heap, flags, mem); @@ -3662,12 +3679,15 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) { BOOL status; - context_t context; - // Record the current frame pointer. - CAPTURE_CONTEXT(context); + if (!g_symbollock.IsLockedByCurrentThread()) // skip dbghelp.dll calls + { + context_t context; + // Record the current frame pointer. + CAPTURE_CONTEXT(context); - // Unmap the block from the specified heap. - vld.unmapblock(heap, mem, context); + // Unmap the block from the specified heap. + vld.unmapblock(heap, mem, context); + } status = RtlFreeHeap(heap, flags, mem); @@ -3675,9 +3695,9 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) } // Find the information for the module that initiated this reallocation. -BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) +bool VisualLeakDetector::IsModuleExcluded(UINT_PTR address) { - BOOL excluded = FALSE; + bool excluded = false; moduleinfo_t moduleinfo; ModuleSet::Iterator moduleit; moduleinfo.addrlow = address; @@ -3687,13 +3707,11 @@ BOOL VisualLeakDetector::IsModuleExcluded(UINT_PTR address) CriticalSectionLocker cs(vld.m_moduleslock); moduleit = vld.m_loadedmodules->find(moduleinfo); if (moduleit != vld.m_loadedmodules->end()) { - excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? TRUE : FALSE; + excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? true : false; } return excluded; } - - // _RtlReAllocateHeap - Calls to RtlReAllocateHeap are patched through to this // function. This function invokes the real RtlReAllocateHeap and then calls // VLD's reallocation tracking function. All arguments passed to this function @@ -4158,75 +4176,6 @@ ULONG VisualLeakDetector::Release () return (m_imalloc) ? m_imalloc->Release() : 0; } -// ReportAlloc - Report memory block allocated -// -// - block (IN): Pointer to the memory block being allocated. -// -// - size (IN): Size, in bytes, of the memory block being allocated. -// -// - heap (IN): Handle to the heap from which the block has been allocated. -// -// Return Value: -// -// Returns pointer to the memory block reported -// -LPVOID VisualLeakDetector::ReportAlloc(LPVOID block, SIZE_T size, HANDLE heap) -{ - if ((block == NULL) || !enabled()) - return block; - - tls_t* tls = gettls(); - tls->blockprocessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) - return block; - - if (!firstcall && (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - tls->context = context; - - AllocateHeap(tls, heap, block, size); - - if (firstcall) - firstalloccall(tls); - - return block; -} - -// ReportFree - Report memory block freed -// -// - mem (IN): Pointer to the memory block being freed. -// -// - heap (IN): Handle to the heap to which this block is being freed. -// -// Return Value: -// -// None. -// -void VisualLeakDetector::ReportFree(LPVOID mem, HANDLE heap) -{ - // Record the current frame pointer. - context_t context; - CAPTURE_CONTEXT(context); - - // Unmap the block from the specified heap. - unmapblock(heap, mem, context); -} - SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) { if (m_options & VLD_OPT_VLDOFF) { @@ -4236,7 +4185,7 @@ SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) SIZE_T leaksCount = 0; // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(g_symbollock); + CriticalSectionLocker cs(m_heapmaplock); for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); @@ -4256,7 +4205,7 @@ SIZE_T VisualLeakDetector::ReportLeaks( ) // Generate a memory leak report for each heap in the process. SIZE_T leaksCount = 0; m_leaksfound = 0; - CriticalSectionLocker cs(g_symbollock); + CriticalSectionLocker cs(m_heapmaplock); for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); @@ -4554,6 +4503,9 @@ void VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) { continue; } + // The actual memory address + const void* address = block; + assert(address != NULL); if (heapinfo->flags & VLD_HEAP_CRT_DBG) { // This block is allocated to a CRT heap, so the block has a CRT @@ -4583,7 +4535,7 @@ void VisualLeakDetector::ResolveCallstacks() return; // Generate the Callstacks early - CriticalSectionLocker cs(g_symbollock); + CriticalSectionLocker cs(m_heapmaplock); for (HeapMap::Iterator heapiter = m_heapmap->begin(); heapiter != m_heapmap->end(); ++heapiter) { HANDLE heap = (*heapiter).first; diff --git a/vld.h b/vld.h index b787ae2b..5b3a7a70 100644 --- a/vld.h +++ b/vld.h @@ -248,23 +248,6 @@ __declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR * // __declspec(dllexport) void VLDResolveCallstacks(); -// VLDReportAlloc - Registers allocation for release build memory leak detection -// -// Return Value: -// -// None. -// -__declspec(dllexport) void VLDReportAlloc(LPVOID mem, size_t size, HANDLE heap); - -// VLDReportFree - Registers deallocation for release build memory leak detection -// -// Return Value: -// -// None. -// -__declspec(dllexport) void VLDReportFree(LPVOID mem, HANDLE heap); - - #ifdef __cplusplus } #endif // __cplusplus diff --git a/vld.vcxproj b/vld.vcxproj index e991b3f3..f9b0bb9a 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -92,7 +92,7 @@ Disabled %(AdditionalIncludeDirectories) - WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -124,7 +124,7 @@ Disabled %(AdditionalIncludeDirectories) - WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + _DEBUG;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -158,7 +158,7 @@ Speed true %(AdditionalIncludeDirectories) - WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + NDEBUG;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) true MultiThreaded false @@ -194,7 +194,7 @@ Speed true %(AdditionalIncludeDirectories) - WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + NDEBUG;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) true MultiThreaded false diff --git a/vldapi.cpp b/vldapi.cpp index ce082be0..15984fc1 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -122,14 +122,4 @@ __declspec(dllexport) void VLDResolveCallstacks() vld.ResolveCallstacks(); } -__declspec(dllexport) void VLDReportAlloc(LPVOID mem, size_t size, HANDLE heap) -{ - vld.ReportAlloc(mem, size, heap); -} - -__declspec(dllexport) void VLDReportFree(LPVOID mem, HANDLE heap) -{ - vld.ReportFree(mem, heap); -} - } diff --git a/vldint.h b/vldint.h index 291a37e6..a9719de4 100644 --- a/vldint.h +++ b/vldint.h @@ -239,9 +239,6 @@ class VisualLeakDetector : public IMalloc LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); ULONG __stdcall Release (); - LPVOID ReportAlloc(LPVOID block, SIZE_T size, HANDLE heap); - void ReportFree(LPVOID mem, HANDLE heap); - void DisableLeakDetection (); void EnableLeakDetection (); void RestoreLeakDetectionState (); @@ -289,7 +286,7 @@ class VisualLeakDetector : public IMalloc static BOOL __stdcall detachfrommodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); // Utils - static BOOL IsModuleExcluded (UINT_PTR returnaddress); + static bool IsModuleExcluded (UINT_PTR returnaddress); blockinfo_t* FindAllocedBlock(LPCVOID, __out HANDLE& heap); static void getcallstack( CallStack **&ppcallstack, context_t &context ); static inline void firstalloccall(tls_t * tls); @@ -334,6 +331,7 @@ class VisualLeakDetector : public IMalloc SIZE_T m_leaksfound; // Total number of leaks found. ModuleSet *m_loadedmodules; // Contains information about all modules loaded in the process. CriticalSection m_loaderlock; // Serializes the attachment of newly loaded modules. + CriticalSection m_heapmaplock; // Serializes access to the heap and block maps. SIZE_T m_maxdatadump; // Maximum number of user-data bytes to dump for each leaked block. UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. CriticalSection m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. From 75ecb2461ffaaef0b95430a1f7c1397f5eceb7fa Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 6 Jun 2011 21:00:25 +0000 Subject: [PATCH 098/321] _HeapAlloc now use HeapAlloc etc. git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67549 --- vld.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vld.cpp b/vld.cpp index b18d2621..51065a0c 100644 --- a/vld.cpp +++ b/vld.cpp @@ -3594,7 +3594,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) { // Allocate the block. - LPVOID block = RtlAllocateHeap(heap, flags, size); + LPVOID block = HeapAlloc(heap, flags, size); if ((block == NULL) || !vld.enabled()) return block; @@ -3689,7 +3689,7 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) vld.unmapblock(heap, mem, context); } - status = RtlFreeHeap(heap, flags, mem); + status = HeapFree(heap, flags, mem); return status; } @@ -3780,7 +3780,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S LPVOID newmem; // Reallocate the block. - newmem = RtlReAllocateHeap(heap, flags, mem, size); + newmem = HeapReAlloc(heap, flags, mem, size); if (newmem == NULL) return newmem; From 80dc5fb08c594d478efd6ca7105dcfd245114b09 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 6 Jun 2011 23:55:30 +0000 Subject: [PATCH 099/321] Added new API function VLDMarkAllLeaksAsReported() ReportLeaks fixed with aggregated leaks git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67557 --- vld.cpp | 70 +++++++++++++++++++++++++++++++++++++++++------------- vld.h | 9 +++++++ vldapi.cpp | 5 ++++ vldint.h | 10 ++++---- 4 files changed, 73 insertions(+), 21 deletions(-) diff --git a/vld.cpp b/vld.cpp index 51065a0c..922b2b71 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1327,12 +1327,12 @@ BOOL VisualLeakDetector::enabled () // // Returns the number of duplicate blocks erased from the block map. // -SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) +SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element, Set &aggregatedLeaks) { blockinfo_t *elementinfo = (*element).second; if (elementinfo->callstack == NULL) - return elementinfo->blocks - 1; + return 0; SIZE_T erased = 0; // Iterate through all block maps, looking for blocks with the same size @@ -1348,21 +1348,18 @@ SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element) blockinfo_t *info = (*blockit).second; if (info->callstack == NULL) continue; + Set::Iterator it = aggregatedLeaks.find(info); + if (it != aggregatedLeaks.end()) + continue; if ((info->size == elementinfo->size) && (*(info->callstack) == *(elementinfo->callstack))) { - // Found a duplicate. Erase it. - delete info->callstack; - delete info; - BlockMap::Iterator previt = blockit - 1; - blockmap->erase(blockit); - blockit = previt; + // Found a duplicate. Mark it. + aggregatedLeaks.insert(info); erased++; } } } - elementinfo->blocks += erased; - - return elementinfo->blocks - 1; + return erased; } // gettls - Obtains the thread local storage structure for the calling thread. @@ -1426,7 +1423,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool c ppcallstack = &blockinfo->callstack; blockinfo->serialnumber = serialnumber++; blockinfo->size = size; - blockinfo->blocks = 1; + blockinfo->reported = false; // Insert the block's information into the block map. CriticalSectionLocker cs(m_heapmaplock); @@ -1640,6 +1637,8 @@ SIZE_T VisualLeakDetector::getleakscount (heapinfo_t* heapinfo, BOOL includingIn // potential memory leak. LPCVOID block = (*blockit).first; blockinfo_t* info = (*blockit).second; + if (info->reported) + continue; if (heapinfo->flags & VLD_HEAP_CRT_DBG) { // This block is allocated to a CRT heap, so the block has a CRT @@ -1652,7 +1651,7 @@ SIZE_T VisualLeakDetector::getleakscount (heapinfo_t* heapinfo, BOOL includingIn } } - memoryleaks += info->blocks; + memoryleaks ++; } return memoryleaks; @@ -1679,11 +1678,12 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) return 0; } + Set aggregatedLeaks; heapinfo_t* heapinfo = (*heapit).second; - return reportleaks(heapinfo); + return reportleaks(heapinfo, aggregatedLeaks); } -SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo) +SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo, Set &aggregatedLeaks) { BlockMap* blockmap = &heapinfo->blockmap; SIZE_T leaksfound = 0; @@ -1695,6 +1695,13 @@ SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo) // potential memory leak. LPCVOID block = (*blockit).first; blockinfo_t* info = (*blockit).second; + if (info->reported) + continue; + + Set::Iterator it = aggregatedLeaks.find(info); + if (it != aggregatedLeaks.end()) + continue; + LPCVOID address = block; SIZE_T size = info->size; @@ -1726,7 +1733,7 @@ SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo) if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { // Aggregate all other leaks which are duplicates of this one // under this same heading, to cut down on clutter. - SIZE_T erased = eraseduplicates(blockit); + SIZE_T erased = eraseduplicates(blockit, aggregatedLeaks); // add only the number that were erased, since the 'one left over' // is already recorded as a leak @@ -1759,6 +1766,17 @@ SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo) return leaksfound; } +VOID VisualLeakDetector::markallleaksasreported (heapinfo_t* heapinfo) +{ + BlockMap* blockmap = &heapinfo->blockmap; + + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) + { + blockinfo_t* info = (*blockit).second; + info->reported = true; + } +} + // FindAllocedBlock - Find if a particular memory allocation is tracked inside of VLD. // This is a really good example of how to iterate through the data structures // that represent heaps and their associated memory blocks. @@ -4206,15 +4224,33 @@ SIZE_T VisualLeakDetector::ReportLeaks( ) SIZE_T leaksCount = 0; m_leaksfound = 0; CriticalSectionLocker cs(m_heapmaplock); + Set aggregatedLeaks; for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); heapinfo_t* heapinfo = (*heapit).second; - leaksCount += reportleaks(heapinfo); + leaksCount += reportleaks(heapinfo, aggregatedLeaks); } return leaksCount; } +VOID VisualLeakDetector::MarkAllLeaksAsReported( ) +{ + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Generate a memory leak report for each heap in the process. + CriticalSectionLocker cs(m_heapmaplock); + for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + markallleaksasreported(heapinfo); + } +} + void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) { ModuleSet::Iterator moduleit; diff --git a/vld.h b/vld.h index 5b3a7a70..ffc76ddc 100644 --- a/vld.h +++ b/vld.h @@ -125,6 +125,14 @@ __declspec(dllimport) void VLDGlobalEnable (); // __declspec(dllimport) UINT VLDReportLeaks (); +// VLDMarkAllLeaksAsReported - Mark all leaks as reported. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDMarkAllLeaksAsReported (); + // VLDRefreshModules - Look for recently loaded DLLs and patch them if necessary. // @@ -258,6 +266,7 @@ __declspec(dllexport) void VLDResolveCallstacks(); #define VLDDisable() #define VLDRestore() #define VLDReportLeaks() 0 +#define VLDMarkAllLeaksAsReported() #define VLDRefreshModules() #define VLDEnableModule(a) #define VLDDisableModule(b) diff --git a/vldapi.cpp b/vldapi.cpp index 15984fc1..97ab5bfb 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -72,6 +72,11 @@ __declspec(dllexport) SIZE_T VLDGetLeaksCount (BOOL includingInternal) return vld.GetLeaksCount(includingInternal); } +__declspec(dllexport) void VLDMarkAllLeaksAsReported () +{ + vld.MarkAllLeaksAsReported(); +} + __declspec(dllexport) void VLDRefreshModules() { vld.RefreshModules(); diff --git a/vldint.h b/vldint.h index a9719de4..96f97b46 100644 --- a/vldint.h +++ b/vldint.h @@ -91,7 +91,7 @@ struct blockinfo_t { CallStack *callstack; SIZE_T serialnumber; SIZE_T size; - SIZE_T blocks; // The number of duplicates for this particular block. + bool reported; }; // BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. @@ -248,6 +248,7 @@ class VisualLeakDetector : public IMalloc VOID RefreshModules(); SIZE_T GetLeaksCount(BOOL includingInternal); SIZE_T ReportLeaks(); + VOID MarkAllLeaksAsReported(); VOID EnableModule(HMODULE module); VOID DisableModule(HMODULE module); UINT32 GetOptions(); @@ -267,7 +268,7 @@ class VisualLeakDetector : public IMalloc LPWSTR buildsymbolsearchpath (); VOID configure (); BOOL enabled (); - SIZE_T eraseduplicates (const BlockMap::Iterator &element); + SIZE_T eraseduplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); tls_t* gettls (); VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack); VOID mapheap (HANDLE heap); @@ -276,7 +277,8 @@ class VisualLeakDetector : public IMalloc VOID reportconfig (); SIZE_T getleakscount (heapinfo_t* heapinfo, BOOL includingInternal); SIZE_T reportleaks (HANDLE heap); - SIZE_T reportleaks( heapinfo_t* heapinfo ); + SIZE_T reportleaks( heapinfo_t* heapinfo, Set &aggregatedLeaks ); + VOID markallleaksasreported (heapinfo_t* heapinfo); VOID unmapblock (HANDLE heap, LPCVOID mem, const context_t &context); VOID unmapheap (HANDLE heap); void resolveStacks(heapinfo_t* heapinfo); @@ -358,7 +360,7 @@ class VisualLeakDetector : public IMalloc typedef FARPROC __stdcall _GetProcAddressType(HMODULE module, LPCSTR procname); - VOID __stdcall ChangeModuleState(HMODULE module,bool on); + VOID __stdcall ChangeModuleState(HMODULE module, bool on); static _GetProcAddressType * m_original_GetProcAddress; }; From bbaa6251e501559662be6e07cc956d6274e7fefe Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 7 Jun 2011 22:42:39 +0000 Subject: [PATCH 100/321] LoadLibrary crash fixed with some applications like regsrv32 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67608 --- vld.cpp | 202 +++++++++++++++++++++++++++++++------------------------ vldint.h | 6 +- 2 files changed, 117 insertions(+), 91 deletions(-) diff --git a/vld.cpp b/vld.cpp index 922b2b71..3fa4fa43 100644 --- a/vld.cpp +++ b/vld.cpp @@ -547,6 +547,16 @@ moduleentry_t VisualLeakDetector::m_patchtable [] = { "ole32.dll", 0x0, m_ole32Patch }; +// Patch only this entries in Kernel32.dll and KernelBase.dll +patchentry_t ldrLoadDllPatch [] = { + "LdrLoadDll", NULL, VisualLeakDetector::_LdrLoadDll, + NULL, NULL, NULL +}; +moduleentry_t ntdllPatch [] = { + "ntdll.dll", NULL, ldrLoadDllPatch, +}; + + BOOL IsWin7OrBetter() { OSVERSIONINFOEX info = { sizeof(OSVERSIONINFOEX) }; @@ -586,23 +596,18 @@ VisualLeakDetector::VisualLeakDetector () HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); HMODULE kernelBase = GetModuleHandleW(L"KernelBase.dll"); - HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); if (!IsWin7OrBetter()) // kernel32.dll { if (kernel32) - { m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); - } } else { assert(m_patchtable[0].patchtable == m_kernelbasePatch); m_patchtable[0].exportmodulename = "kernelbase.dll"; if (kernelBase) - { m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernelBase,"GetProcAddress"); - } } // Initialize global variables. @@ -610,6 +615,7 @@ VisualLeakDetector::VisualLeakDetector () g_currentthread = GetCurrentThread(); g_imagelock.Initialize(); g_processheap = GetProcessHeap(); + HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); if (ntdll) { LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); @@ -694,16 +700,10 @@ VisualLeakDetector::VisualLeakDetector () } delete [] symbolpath; - patchentry_t ntdllPatch [] = { - "LdrLoadDll", NULL, _LdrLoadDll, - NULL, NULL, NULL - }; - moduleentry_t ldrLoadDllPatch [] = { - "ntdll.dll", (UINT_PTR)ntdll, ntdllPatch, - }; - patchimport(kernel32, ldrLoadDllPatch); + ntdllPatch->modulebase = (UINT_PTR)ntdll; + patchimport(kernel32, ntdllPatch); if (kernelBase != NULL) - patchimport(kernelBase, ldrLoadDllPatch); + patchimport(kernelBase, ntdllPatch); // Attach Visual Leak Detector to every module loaded in the process. ModuleSet* newmodules = new ModuleSet(); @@ -725,6 +725,96 @@ VisualLeakDetector::VisualLeakDetector () reportconfig(); } +bool VisualLeakDetector::WaitForAllVLDThreads() +{ + bool threadsactive = false; + DWORD dwCurProcessID = GetCurrentProcessId(); + int waitcount = 0; + + // See if any threads that have ever entered VLD's code are still active. + CriticalSectionLocker cs(m_tlslock); + for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + if ((*tlsit).second->threadid == GetCurrentThreadId()) { + // Don't wait for the current thread to exit. + continue; + } + + HANDLE thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit).second->threadid); + if (thread == NULL) { + // Couldn't query this thread. We'll assume that it exited. + continue; // XXX should we check GetLastError()? + } + if (GetProcessIdOfThread(thread) != dwCurProcessID) { + //The thread ID has been recycled. + CloseHandle(thread); + continue; + } + if (WaitForSingleObject(thread, 10000) == WAIT_TIMEOUT) { // 10 seconds + // There is still at least one other thread running. The CRT + // will stomp it dead when it cleans up, which is not a + // graceful way for a thread to go down. Warn about this, + // and wait until the thread has exited so that we know it + // can't still be off running somewhere in VLD's code. + // + // Since we've been waiting a while, let the human know we are + // still here and alive. + waitcount++; + threadsactive = true; + if (waitcount >= 9) // 90 sec. + { + CloseHandle(thread); + return threadsactive; + } + report(L"Visual Leak Detector: Waiting for threads to terminate...\n"); + } + CloseHandle(thread); + } + return threadsactive; +} + +void VisualLeakDetector::CheckInternalMemoryLeaks() +{ + const char* leakfile = NULL; + size_t count; + WCHAR leakfilew [MAX_PATH]; + int leakline = 0; + + // Do a memory leak self-check. + SIZE_T internalleaks = 0; + vldblockheader_t *header = g_vldblocklist; + while (header) { + // Doh! VLD still has an internally allocated block! + // This won't ever actually happen, right guys?... guys? + internalleaks++; + leakfile = header->file; + leakline = header->line; + mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); + report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); + report(L"---------- Block %Iu at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, VLDBLOCKDATA(header), header->size); + report(L" Call Stack:\n"); + report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); + if (m_maxdatadump != 0) { + report(L" Data:\n"); + if (m_options & VLD_OPT_UNICODE_REPORT) { + dumpmemoryw(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); + } + else { + dumpmemorya(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); + } + } + report(L"\n"); + header = header->next; + } + if (m_options & VLD_OPT_SELF_TEST) { + if ((internalleaks == 1) && (strcmp(leakfile, m_selftestfile) == 0) && (leakline == m_selftestline)) { + report(L"Visual Leak Detector passed the memory leak self-test.\n"); + } + else { + report(L"ERROR: Visual Leak Detector: Failed the memory leak self-test.\n"); + } + } +} + // Destructor - Detaches Visual Leak Detector from all modules loaded in the // process, frees internally allocated resources, and generates the memory // leak report. @@ -736,49 +826,17 @@ VisualLeakDetector::~VisualLeakDetector () return; } - size_t count; - SIZE_T internalleaks = 0; - WCHAR leakfilew [MAX_PATH]; - BOOL threadsactive = FALSE; if (m_status & VLD_STATUS_INSTALLED) { // Detach Visual Leak Detector from all previously attached modules. EnumerateLoadedModulesW64(g_currentprocess, detachfrommodule, NULL); - DWORD dwCurProcessID = GetCurrentProcessId(); - - // See if any threads that have ever entered VLD's code are still active. - m_tlslock.Enter(); - for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - if ((*tlsit).second->threadid == GetCurrentThreadId()) { - // Don't wait for the current thread to exit. - continue; - } + HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); + HMODULE kernelBase = GetModuleHandleW(L"KernelBase.dll"); + restoreimport(kernel32, ntdllPatch); + if (kernelBase != NULL) + restoreimport(kernelBase, ntdllPatch); - HANDLE thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit).second->threadid); - if (thread == NULL) { - // Couldn't query this thread. We'll assume that it exited. - continue; // XXX should we check GetLastError()? - } - if (GetProcessIdOfThread(thread) != dwCurProcessID) { - //The thread ID has been recycled. - CloseHandle(thread); - continue; - } - while (WaitForSingleObject(thread, 10000) == WAIT_TIMEOUT) { // 10 seconds - // There is still at least one other thread running. The CRT - // will stomp it dead when it cleans up, which is not a - // graceful way for a thread to go down. Warn about this, - // and wait until the thread has exited so that we know it - // can't still be off running somewhere in VLD's code. - // - // Since we've been waiting a while, let the human know we are - // still here and alive. - threadsactive = TRUE; - report(L"Visual Leak Detector: Waiting for threads to terminate...\n"); - } - CloseHandle(thread); - } - m_tlslock.Leave(); + BOOL threadsactive = WaitForAllVLDThreads(); if (m_status & VLD_STATUS_NEVER_ENABLED) { // Visual Leak Detector started with leak detection disabled and @@ -830,42 +888,7 @@ VisualLeakDetector::~VisualLeakDetector () } delete m_tlsmap; - const char* leakfile = NULL; - int leakline = 0; - - // Do a memory leak self-check. - vldblockheader_t *header = g_vldblocklist; - while (header) { - // Doh! VLD still has an internally allocated block! - // This won't ever actually happen, right guys?... guys? - internalleaks++; - leakfile = header->file; - leakline = header->line; - mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); - report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); - report(L"---------- Block %Iu at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, VLDBLOCKDATA(header), header->size); - report(L" Call Stack:\n"); - report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); - if (m_maxdatadump != 0) { - report(L" Data:\n"); - if (m_options & VLD_OPT_UNICODE_REPORT) { - dumpmemoryw(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); - } - else { - dumpmemorya(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); - } - } - report(L"\n"); - header = header->next; - } - if (m_options & VLD_OPT_SELF_TEST) { - if ((internalleaks == 1) && (strcmp(leakfile, m_selftestfile) == 0) && (leakline == m_selftestline)) { - report(L"Visual Leak Detector passed the memory leak self-test.\n"); - } - else { - report(L"ERROR: Visual Leak Detector: Failed the memory leak self-test.\n"); - } - } + CheckInternalMemoryLeaks(); if (threadsactive == TRUE) { report(L"WARNING: Visual Leak Detector: Some threads appear to have not terminated normally.\n" @@ -880,10 +903,11 @@ VisualLeakDetector::~VisualLeakDetector () } HeapDestroy(g_vldheap); - g_imagelock.Delete(); m_loaderlock.Delete(); m_heapmaplock.Delete(); m_moduleslock.Delete(); + m_tlslock.Delete(); + g_imagelock.Delete(); g_stackwalklock.Delete(); g_symbollock.Delete(); g_vldheaplock.Delete(); diff --git a/vldint.h b/vldint.h index 96f97b46..164143d8 100644 --- a/vldint.h +++ b/vldint.h @@ -259,6 +259,8 @@ class VisualLeakDetector : public IMalloc bool GetModulesList(WCHAR *modules, UINT size); VOID ResolveCallstacks(); + static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, + PHANDLE modulehandle); static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); private: //////////////////////////////////////////////////////////////////////////////// @@ -293,6 +295,8 @@ class VisualLeakDetector : public IMalloc static void getcallstack( CallStack **&ppcallstack, context_t &context ); static inline void firstalloccall(tls_t * tls); void SetupReporting(); + void CheckInternalMemoryLeaks(); + bool WaitForAllVLDThreads(); //////////////////////////////////////////////////////////////////////////////// // IAT replacement functions - see each function definition for details. @@ -303,8 +307,6 @@ class VisualLeakDetector : public IMalloc //////////////////////////////////////////////////////////////////////////////// // Win32 IAT replacement functions static FARPROC __stdcall _GetProcAddress (HMODULE module, LPCSTR procname); - static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle); static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); static BOOL __stdcall _HeapDestroy (HANDLE heap); From 79b0d9dd37b03a7c94d8dbababd102f96cb0bfe9 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 8 Jun 2011 12:17:45 +0000 Subject: [PATCH 101/321] Use WideCharToMultiByte fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67637 --- vld.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vld.cpp b/vld.cpp index 3fa4fa43..efe7d586 100644 --- a/vld.cpp +++ b/vld.cpp @@ -2008,15 +2008,15 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, vld.m_vldbase = (HMODULE)modulebase; } else { - // Convert the module path to ASCII. - length = wcslen(modulename) + 1; - LPSTR modulenamea = new CHAR [length]; + // Convert the module path to ASCII. + length = ::WideCharToMultiByte(CP_ACP, 0, modulename, -1, 0, 0, 0, 0); + LPSTR modulenamea = new CHAR [length]; // wcstombs_s requires locale to be already set up correctly, but it might not be correct on vld init step. So use WideCharToMultiByte instead CHAR defaultChar = '?'; BOOL defaultCharUsed = FALSE; - int count = ::WideCharToMultiByte(CP_ACP, 0/*flags*/, modulename, (int)length, modulenamea, (int)length, &defaultChar, &defaultCharUsed); + int count = ::WideCharToMultiByte(CP_ACP, 0/*flags*/, modulename, (int)-1, modulenamea, (int)length, &defaultChar, &defaultCharUsed); assert(count != 0); if ( defaultCharUsed ) { From 4d8d6e3a77e98352d5ee1cb6509b9663fd8a5d09 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 11 Jun 2011 22:50:02 +0000 Subject: [PATCH 102/321] Tests now use tut-framework git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67761 --- lib/tut-framework/include/tut.h | 2 + lib/tut-framework/include/tut/tut.hpp | 572 ++++++++++++++++++ lib/tut-framework/include/tut/tut_assert.hpp | 283 +++++++++ lib/tut-framework/include/tut/tut_config.hpp | 6 + .../include/tut/tut_console_reporter.hpp | 305 ++++++++++ .../include/tut/tut_cppunit_reporter.hpp | 218 +++++++ .../include/tut/tut_exception.hpp | 237 ++++++++ lib/tut-framework/include/tut/tut_fpt.hpp | 185 ++++++ lib/tut-framework/include/tut/tut_macros.hpp | 63 ++ lib/tut-framework/include/tut/tut_main.hpp | 111 ++++ lib/tut-framework/include/tut/tut_posix.hpp | 485 +++++++++++++++ .../include/tut/tut_reporter.hpp | 11 + .../include/tut/tut_restartable.hpp | 410 +++++++++++++ lib/tut-framework/include/tut/tut_result.hpp | 174 ++++++ lib/tut-framework/include/tut/tut_runner.hpp | 388 ++++++++++++ .../include/tut/tut_xml_reporter.hpp | 305 ++++++++++ lib/tut-framework/include/tut_reporter.h | 5 + lib/tut-framework/include/tut_restartable.h | 2 + tests/basics/basics.cpp | 164 ++++- tests/basics/basics.vcxproj | 19 +- tests/corruption/corruption.vcxproj | 4 + tests/dynamic_app/dynamic_app.cpp | 249 +++++--- tests/dynamic_app/dynamic_app.vcxproj | 21 +- tests/mfc/vldmfc.vcxproj | 8 +- tests/suite/testsuite.cpp | 101 +++- tests/suite/testsuite.vcxproj | 23 +- 26 files changed, 4241 insertions(+), 110 deletions(-) create mode 100644 lib/tut-framework/include/tut.h create mode 100644 lib/tut-framework/include/tut/tut.hpp create mode 100644 lib/tut-framework/include/tut/tut_assert.hpp create mode 100644 lib/tut-framework/include/tut/tut_config.hpp create mode 100644 lib/tut-framework/include/tut/tut_console_reporter.hpp create mode 100644 lib/tut-framework/include/tut/tut_cppunit_reporter.hpp create mode 100644 lib/tut-framework/include/tut/tut_exception.hpp create mode 100644 lib/tut-framework/include/tut/tut_fpt.hpp create mode 100644 lib/tut-framework/include/tut/tut_macros.hpp create mode 100644 lib/tut-framework/include/tut/tut_main.hpp create mode 100644 lib/tut-framework/include/tut/tut_posix.hpp create mode 100644 lib/tut-framework/include/tut/tut_reporter.hpp create mode 100644 lib/tut-framework/include/tut/tut_restartable.hpp create mode 100644 lib/tut-framework/include/tut/tut_result.hpp create mode 100644 lib/tut-framework/include/tut/tut_runner.hpp create mode 100644 lib/tut-framework/include/tut/tut_xml_reporter.hpp create mode 100644 lib/tut-framework/include/tut_reporter.h create mode 100644 lib/tut-framework/include/tut_restartable.h diff --git a/lib/tut-framework/include/tut.h b/lib/tut-framework/include/tut.h new file mode 100644 index 00000000..4cb37a59 --- /dev/null +++ b/lib/tut-framework/include/tut.h @@ -0,0 +1,2 @@ +#warning This header is deprecated and will be removed in next versions. Please #include instead +#include diff --git a/lib/tut-framework/include/tut/tut.hpp b/lib/tut-framework/include/tut/tut.hpp new file mode 100644 index 00000000..55796d69 --- /dev/null +++ b/lib/tut-framework/include/tut/tut.hpp @@ -0,0 +1,572 @@ +#ifndef TUT_H_GUARD +#define TUT_H_GUARD +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "tut_exception.hpp" +#include "tut_result.hpp" +#include "tut_posix.hpp" +#include "tut_assert.hpp" +#include "tut_runner.hpp" + +#if defined(TUT_USE_SEH) +#include +#include +#endif + +/** + * Template Unit Tests Framework for C++. + * http://tut.dozen.ru + * + * @author Vladimir Dyuzhev, Vladimir.Dyuzhev@gmail.com + */ +namespace tut +{ + +template +class test_group; + +/** + * Test object. Contains data test run upon and default test method + * implementation. Inherited from Data to allow tests to + * access test data as members. + */ +template +class test_object : public Data, public test_object_posix +{ + template + friend class test_group; + + void set_test_group(const char *group) + { + current_test_group_ = group; + } + + void set_test_id(int current_test_id) + { + current_test_id_ = current_test_id; + } + +public: + + /** + * Default constructor + */ + test_object() + : called_method_was_a_dummy_test_(false), + current_test_id_(0), + current_test_name_(), + current_test_group_() + { + } + + void set_test_name(const std::string& current_test_name) + { + current_test_name_ = current_test_name; + } + + const std::string& get_test_name() const + { + return current_test_name_; + } + + const std::string& get_test_group() const + { + return current_test_group_; + } + + int get_test_id() const + { + return current_test_id_; + } + + /** + * Default do-nothing test. + */ + template + void test() + { + called_method_was_a_dummy_test_ = true; + } + + /** + * The flag is set to true by default (dummy) test. + * Used to detect usused test numbers and avoid unnecessary + * test object creation which may be time-consuming depending + * on operations described in Data::Data() and Data::~Data(). + */ + bool called_method_was_a_dummy_test_; + + virtual ~test_object() + { + } + +private: + int current_test_id_; + std::string current_test_name_; + std::string current_test_group_; +}; + + +/** + * Walks through test tree and stores address of each + * test method in group. Instantiation stops at 0. + */ +template +struct tests_registerer +{ + static void reg(Group& group) + { + group.reg(n, &Test::template test); + tests_registerer::reg(group); + } +}; + +template +struct tests_registerer +{ + static void reg(Group&) + { + } +}; + +/** + * Test group; used to recreate test object instance for + * each new test since we have to have reinitialized + * Data base class. + */ +template +class test_group : public group_base, public test_group_posix +{ + test_group(const test_group&); + void operator=(const test_group&); + + const char* name_; + + typedef void (test_object::*testmethod)(); + typedef std::map tests; + typedef typename tests::iterator tests_iterator; + typedef typename tests::const_iterator tests_const_iterator; + typedef typename tests::const_reverse_iterator + tests_const_reverse_iterator; + typedef typename tests::size_type size_type; + + tests tests_; + tests_iterator current_test_; + + enum seh_result + { + SEH_OK, +#if defined(TUT_USE_SEH) + SEH_CTOR, + SEH_TEST, +#endif + SEH_DUMMY + }; + + /** + * Exception-in-destructor-safe smart-pointer class. + */ + template + class safe_holder + { + T* p_; + bool permit_throw_in_dtor; + + safe_holder(const safe_holder&); + safe_holder& operator=(const safe_holder&); + + public: + safe_holder() + : p_(0), + permit_throw_in_dtor(false) + { + } + + ~safe_holder() + { + release(); + } + + T* operator->() const + { + return p_; + } + + T* get() const + { + return p_; + } + + /** + * Tell ptr it can throw from destructor. Right way is to + * use std::uncaught_exception(), but some compilers lack + * correct implementation of the function. + */ + void permit_throw() + { + permit_throw_in_dtor = true; + } + + /** + * Specially treats exceptions in test object destructor; + * if test itself failed, exceptions in destructor + * are ignored; if test was successful and destructor failed, + * warning exception throwed. + */ + void release() + { + try + { +#if defined(TUT_USE_SEH) + if (delete_obj() == false) + { + throw warning("destructor of test object raised" + " an SEH exception"); + } +#else + bool d = delete_obj(); + assert(d && "delete failed with SEH disabled: runtime bug?"); +#endif + } + catch (const std::exception& ex) + { + if (permit_throw_in_dtor) + { + std::string msg = "destructor of test object raised" + " exception: "; + msg += ex.what(); + throw warning(msg); + } + } + catch( ... ) + { + if (permit_throw_in_dtor) + { + throw warning("destructor of test object raised an" + " exception"); + } + } + } + + /** + * Re-init holder to get brand new object. + */ + void reset() + { + release(); + permit_throw_in_dtor = false; + p_ = new T(); + } + + bool delete_obj() + { +#if defined(TUT_USE_SEH) + __try + { +#endif + T* p = p_; + p_ = 0; + delete p; +#if defined(TUT_USE_SEH) + } + __except(handle_seh_(::GetExceptionCode())) + { + if (permit_throw_in_dtor) + { + return false; + } + } +#endif + return true; + } + }; + +public: + + typedef test_object object; + + /** + * Creates and registers test group with specified name. + */ + test_group(const char* name) + : name_(name), + tests_(), + current_test_() + { + // register itself + runner.get().register_group(name_,this); + + // register all tests + tests_registerer::reg(*this); + } + + /** + * This constructor is used in self-test run only. + */ + test_group(const char* name, test_runner& another_runner) + : name_(name), + tests_(), + current_test_() + { + // register itself + another_runner.register_group(name_, this); + + // register all tests + tests_registerer, test_group, + MaxTestsInGroup>::reg(*this); + }; + + /** + * Registers test method under given number. + */ + void reg(int n, testmethod tm) + { + tests_[n] = tm; + } + + /** + * Reset test position before first test. + */ + void rewind() + { + current_test_ = tests_.begin(); + } + + /** + * Runs next test. + */ + bool run_next(test_result &tr) + { + if (current_test_ == tests_.end()) + { + return false; + } + + // find next user-specialized test + safe_holder obj; + while (current_test_ != tests_.end()) + { + tests_iterator current_test = current_test_++; + + if(run_test_(current_test, obj, tr) && tr.result != test_result::dummy) + { + return true; + } + } + + return false; + } + + /** + * Runs one test by position. + */ + bool run_test(int n, test_result &tr) + { + if (tests_.rbegin() == tests_.rend() || + tests_.rbegin()->first < n) + { + return false; + } + + // withing scope; check if given test exists + tests_iterator ti = tests_.find(n); + if (ti == tests_.end()) + { + return false; + } + + safe_holder obj; + return run_test_(ti, obj, tr); + } + + /** + * VC allows only one exception handling type per function, + * so I have to split the method. + */ + bool run_test_(const tests_iterator& ti, safe_holder& obj, test_result &tr) + { + std::string current_test_name; + + tr = test_result(name_, ti->first, current_test_name, test_result::ok); + + try + { + switch (run_test_seh_(ti->second, obj, current_test_name, ti->first, tr)) + { +#if defined(TUT_USE_SEH) + case SEH_CTOR: + throw bad_ctor("seh"); + break; + + case SEH_TEST: + throw seh("seh"); + break; +#endif + case SEH_DUMMY: + tr.result = test_result::dummy; + break; + + case SEH_OK: + // ok + break; + } + } + catch (const rethrown& ex) + { + tr = ex.tr; + tr.result = test_result::rethrown; + } + catch (const tut_error& ex) + { + tr.result = ex.result(); + tr.exception_typeid = ex.type(); + tr.message = ex.what(); + } + catch (const std::exception& ex) + { + tr.result = test_result::ex; + tr.exception_typeid = type_name(ex); + tr.message = ex.what(); + } + catch (...) + { + // test failed with unknown exception + tr.result = test_result::ex; + } + + if (obj.get()) + { + tr.name = obj->get_test_name(); + + // try to report to parent, if exists + send_result_(obj.get(), tr); + } + else + { + tr.name = current_test_name; + } + + return true; + } + + /** + * Runs one under SEH if platform supports it. + */ + seh_result run_test_seh_(testmethod tm, safe_holder& obj, + std::string& current_test_name, int current_test_id, test_result tr) + { +#if defined(TUT_USE_SEH) + __try + { +#endif + if (obj.get() == 0) + { + reset_holder_(obj); + } + + obj->called_method_was_a_dummy_test_ = false; + +#if defined(TUT_USE_SEH) + + __try + { +#endif + obj.get()->set_test_id(current_test_id); + obj.get()->set_test_group(name_); + (obj.get()->*tm)(); + +#if defined(TUT_USE_SEH) + } + __except(handle_seh_(::GetExceptionCode())) + { + current_test_name = obj->get_test_name(); + return SEH_TEST; + } +#endif + + if (obj->called_method_was_a_dummy_test_) + { + // do not call obj.release(); reuse object + return SEH_DUMMY; + } + + current_test_name = obj->get_test_name(); + obj.permit_throw(); + obj.release(); +#if defined(TUT_USE_SEH) + } + __except(handle_seh_(::GetExceptionCode())) + { + return SEH_CTOR; + } +#endif + return SEH_OK; + } + + void reset_holder_(safe_holder& obj) + { + try + { + obj.reset(); + } + catch (const std::exception& ex) + { + throw bad_ctor(ex.what()); + } + catch (...) + { + throw bad_ctor("test constructor has generated an exception;" + " group execution is terminated"); + } + } +}; + +#if defined(TUT_USE_SEH) +/** + * Decides should we execute handler or ignore SE. + */ +inline int handle_seh_(DWORD excode) +{ + switch(excode) + { + case EXCEPTION_ACCESS_VIOLATION: + case EXCEPTION_DATATYPE_MISALIGNMENT: + case EXCEPTION_BREAKPOINT: + case EXCEPTION_SINGLE_STEP: + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: + case EXCEPTION_FLT_DENORMAL_OPERAND: + case EXCEPTION_FLT_DIVIDE_BY_ZERO: + case EXCEPTION_FLT_INEXACT_RESULT: + case EXCEPTION_FLT_INVALID_OPERATION: + case EXCEPTION_FLT_OVERFLOW: + case EXCEPTION_FLT_STACK_CHECK: + case EXCEPTION_FLT_UNDERFLOW: + case EXCEPTION_INT_DIVIDE_BY_ZERO: + case EXCEPTION_INT_OVERFLOW: + case EXCEPTION_PRIV_INSTRUCTION: + case EXCEPTION_IN_PAGE_ERROR: + case EXCEPTION_ILLEGAL_INSTRUCTION: + case EXCEPTION_NONCONTINUABLE_EXCEPTION: + case EXCEPTION_STACK_OVERFLOW: + case EXCEPTION_INVALID_DISPOSITION: + case EXCEPTION_GUARD_PAGE: + case EXCEPTION_INVALID_HANDLE: + return EXCEPTION_EXECUTE_HANDLER; + }; + + return EXCEPTION_CONTINUE_SEARCH; +} +#endif +} + +#endif // TUT_H_GUARD + diff --git a/lib/tut-framework/include/tut/tut_assert.hpp b/lib/tut-framework/include/tut/tut_assert.hpp new file mode 100644 index 00000000..0e7a9e0f --- /dev/null +++ b/lib/tut-framework/include/tut/tut_assert.hpp @@ -0,0 +1,283 @@ +#ifndef TUT_ASSERT_H_GUARD +#define TUT_ASSERT_H_GUARD +#include + +#include +#include +#include +#include +#include + +#if defined(TUT_USE_POSIX) +#include +#include +#endif + +#include "tut_exception.hpp" + +namespace tut +{ + + namespace detail + { + template + std::ostream &msg_prefix(std::ostream &str, const M &msg) + { + std::stringstream ss; + ss << msg; + + if(!ss.str().empty()) + { + str << ss.rdbuf() << ": "; + } + + return str; + } + } + + +namespace +{ + +/** + * Tests provided condition. + * Throws if false. + */ +void ensure(bool cond) +{ + if (!cond) + { + // TODO: default ctor? + throw failure(""); + } +} + +/** + * Tests provided condition. + * Throws if true. + */ +void ensure_not(bool cond) +{ + ensure(!cond); +} + +/** + * Tests provided condition. + * Throws if false. + */ +template +void ensure(const M& msg, bool cond) +{ + if (!cond) + { + throw failure(msg); + } +} + +/** + * Tests provided condition. + * Throws if true. + */ +template +void ensure_not(const M& msg, bool cond) +{ + ensure(msg, !cond); +} + +/** + * Tests two objects for being equal. + * Throws if false. + * + * NB: both T and Q must have operator << defined somewhere, or + * client code will not compile at all! + */ +template +void ensure_equals(const M& msg, const LHS& actual, const RHS& expected) +{ + if (expected != actual) + { + std::stringstream ss; + detail::msg_prefix(ss,msg) + << "expected `" + << expected + << "` actual `" + << actual + << "`"; + throw failure(ss.str()); + } +} + +template +void ensure_equals(const M& msg, const double& actual, const double& expected, const double& epsilon) +{ + const double diff = actual - expected; + + if ( (actual != expected) && !((diff <= epsilon) && (diff >= -epsilon )) ) + { + std::stringstream ss; + detail::msg_prefix(ss,msg) + << std::scientific + << std::showpoint + << std::setprecision(16) + << "expected `" << expected + << "` actual `" << actual + << "` with precision `" << epsilon << "`"; + throw failure(ss.str()); + } +} + +template +void ensure_equals(const M& msg, const double& actual, const double& expected) +{ + ensure_equals(msg, actual, expected, std::numeric_limits::epsilon()); +} + +template +void ensure_equals(const LHS& actual, const RHS& expected) +{ + ensure_equals("Values are not equal", actual, expected); +} + + +template +void ensure_equals(const std::string &msg, + const LhsIterator &lhs_begin, const LhsIterator &lhs_end, + const RhsIterator &rhs_begin, const RhsIterator &rhs_end) +{ + typename std::iterator_traits::difference_type lhs_size = std::distance(lhs_begin, lhs_end); + typename std::iterator_traits::difference_type rhs_size = std::distance(rhs_begin, rhs_end); + + if(lhs_size < rhs_size) + { + ensure_equals(msg + ": range is too short", lhs_size, rhs_size); + } + + if(lhs_size > rhs_size) + { + ensure_equals(msg + ": range is too long", lhs_size, rhs_size); + } + + assert(lhs_size == rhs_size); + + LhsIterator lhs_i = lhs_begin; + RhsIterator rhs_i = rhs_begin; + while( (lhs_i != lhs_end) && (rhs_i != rhs_end) ) + { + if(*lhs_i != *rhs_i) + { + std::stringstream ss; + detail::msg_prefix(ss,msg) + << "expected `" << *rhs_i + << "` actual `" << *lhs_i + << "` at offset " << std::distance(lhs_begin, lhs_i); + throw failure(ss.str()); + } + + lhs_i++; + rhs_i++; + } + + assert(lhs_i == lhs_end); + assert(rhs_i == rhs_end); +} + +template +void ensure_equals(const LhsIterator &lhs_begin, const LhsIterator &lhs_end, + const RhsIterator &rhs_begin, const RhsIterator &rhs_end) +{ + ensure_equals("Ranges are not equal", lhs_begin, lhs_end, rhs_begin, rhs_end); +} + +template +void ensure_equals(const LhsType *lhs_begin, const LhsType *lhs_end, + const RhsType *rhs_begin, const RhsType *rhs_end) +{ + ensure_equals("Ranges are not equal", lhs_begin, lhs_end, rhs_begin, rhs_end); +} + +/** + * Tests two objects for being at most in given distance one from another. + * Borders are excluded. + * Throws if false. + * + * NB: T must have operator << defined somewhere, or + * client code will not compile at all! Also, T shall have + * operators + and -, and be comparable. + * + * TODO: domains are wrong, T - T might not yield T, but Q + */ +template +void ensure_distance(const M& msg, const T& actual, const T& expected, const T& distance) +{ + if (expected-distance >= actual || expected+distance <= actual) + { + std::stringstream ss; + detail::msg_prefix(ss,msg) + << " expected `" + << expected-distance + << "` - `" + << expected+distance + << "` actual `" + << actual + << "`"; + throw failure(ss.str()); + } +} + +template +void ensure_distance(const T& actual, const T& expected, const T& distance) +{ + ensure_distance<>("Distance is wrong", actual, expected, distance); +} + +template +void ensure_errno(const M& msg, bool cond) +{ + if(!cond) + { +#if defined(TUT_USE_POSIX) + char e[512]; + std::stringstream ss; + detail::msg_prefix(ss,msg) + << strerror_r(errno, e, sizeof(e)); + throw failure(ss.str()); +#else + throw failure(msg); +#endif + } +} + +/** + * Unconditionally fails with message. + */ +void fail(const char* msg = "") +{ + throw failure(msg); +} + +template +void fail(const M& msg) +{ + throw failure(msg); +} + +/** + * Mark test case as known failure and skip execution. + */ +void skip(const char* msg = "") +{ + throw skipped(msg); +} + +template +void skip(const M& msg) +{ + throw skipped(msg); +} + +} // end of namespace + +} + +#endif + diff --git a/lib/tut-framework/include/tut/tut_config.hpp b/lib/tut-framework/include/tut/tut_config.hpp new file mode 100644 index 00000000..d698c1c8 --- /dev/null +++ b/lib/tut-framework/include/tut/tut_config.hpp @@ -0,0 +1,6 @@ +#ifndef TUT_CONFIG_H_GUARD +#define TUT_CONFIG_H_GUARD + +#define TUT_USE_RTTI 1 + +#endif diff --git a/lib/tut-framework/include/tut/tut_console_reporter.hpp b/lib/tut-framework/include/tut/tut_console_reporter.hpp new file mode 100644 index 00000000..9570e7d7 --- /dev/null +++ b/lib/tut-framework/include/tut/tut_console_reporter.hpp @@ -0,0 +1,305 @@ +#ifndef TUT_CONSOLE_REPORTER +#define TUT_CONSOLE_REPORTER +#include +#include + +/** + * Template Unit Tests Framework for C++. + * http://tut.dozen.ru + * + * @author Vladimir Dyuzhev, Vladimir.Dyuzhev@gmail.com + */ +namespace +{ + +std::ostream& operator<<(std::ostream& os, const tut::test_result& tr) +{ + switch(tr.result) + { + case tut::test_result::ok: + os << '.'; + break; + case tut::test_result::fail: + os << '[' << tr.test << "=F]"; + break; + case tut::test_result::ex_ctor: + os << '[' << tr.test << "=C]"; + break; + case tut::test_result::ex: + os << '[' << tr.test << "=X]"; + break; + case tut::test_result::warn: + os << '[' << tr.test << "=W]"; + break; + case tut::test_result::term: + os << '[' << tr.test << "=T]"; + break; + case tut::test_result::rethrown: + os << '[' << tr.test << "=P]"; + break; + case tut::test_result::skipped: + os << '[' << tr.test << "=S]"; + break; + case tut::test_result::dummy: + throw tut::tut_error("console reporter called for dummy test result"); + } + + return os; +} + +} // end of namespace + +namespace tut +{ + +/** + * Default TUT callback handler. + */ +class console_reporter : public tut::callback +{ + std::string current_group; + typedef std::vector not_passed_list; + not_passed_list not_passed; + std::ostream& os; + std::string suitename; + + console_reporter(const console_reporter &); + console_reporter &operator=(const console_reporter &); +public: + + int ok_count; + int exceptions_count; + int failures_count; + int terminations_count; + int warnings_count; + int skipped_count; + + console_reporter() + : current_group(), + not_passed(), + os(std::cout), + ok_count(0), + exceptions_count(0), + failures_count(0), + terminations_count(0), + warnings_count(0), + skipped_count(0), + suitename("default") + { + init(); + } + + console_reporter(const std::string name = "default") + : current_group(), + not_passed(), + os(std::cout), + ok_count(0), + exceptions_count(0), + failures_count(0), + terminations_count(0), + warnings_count(0), + skipped_count(0), + suitename(name) + { + init(); + } + console_reporter(std::ostream& out) + : current_group(), + not_passed(), + os(out), + ok_count(0), + exceptions_count(0), + failures_count(0), + terminations_count(0), + warnings_count(0), + skipped_count(0), + suitename("default") + + { + init(); + } + + void run_started() + { + init(); + std::cout << "\n##teamcity[testSuiteStarted name='" << "suite." << suitename << "']\n" << std::flush; + } + + void test_completed(const tut::test_result& tr) + { + if (tr.group != current_group) + { + os << std::endl << tr.group << ": " << std::flush; + current_group = tr.group; + } + + os << tr << std::flush; + + // update global statistics + switch (tr.result) { + case test_result::ok: + ok_count++; + std::cout << "\n##teamcity[testStarted name='" << tr.group << "." << tr.test << "']\n" << std::flush; + std::cout << "\n##teamcity[testFinished name='" << tr.group << "." << tr.test << "']\n" << std::flush; + break; + case test_result::fail: + case test_result::rethrown: + failures_count++; + std::cout << "\n##teamcity[testStarted name='" << tr.group << "." << tr.test << "']\n" << std::flush; + std::cout << "\n##teamcity[testFailed name='" << tr.group << "." << tr.test << "']\n" << std::flush; + std::cout << "\n##teamcity[testFinished name='" << tr.group << "." << tr.test << "']\n" << std::flush; + break; + case test_result::ex: + case test_result::ex_ctor: + exceptions_count++; + std::cout << "\n##teamcity[testStarted name='" << tr.group << "." << tr.test << "']\n" << std::flush; + std::cout << "\n##teamcity[testFailed name='" << tr.group << "." << tr.test << "']\n" << std::flush; + std::cout << "\n##teamcity[testFinished name='" << tr.group << "." << tr.test << "']\n" << std::flush; + break; + case test_result::warn: + warnings_count++; + break; + case test_result::term: + terminations_count++; + break; + case test_result::skipped: + skipped_count++; + std::cout << "\n##teamcity[testStarted name='" << tr.group << "." << tr.test << "']\n" << std::flush; + std::cout << "\n##teamcity[testIgnored name='" << tr.group << "." << tr.test << "']\n" << std::flush; + std::cout << "\n##teamcity[testFinished name='" << tr.group << "." << tr.test << "']\n" << std::flush; + break; + case tut::test_result::dummy: + assert( (tr.result != tut::test_result::dummy) && "Should never be called"); + } // switch + + if ( (tr.result != tut::test_result::ok) && + (tr.result != tut::test_result::skipped) ) + { + not_passed.push_back(tr); + } + } + + void run_completed() + { + os << std::endl; + + if (not_passed.size() > 0) + { + not_passed_list::const_iterator i = not_passed.begin(); + while (i != not_passed.end()) + { + tut::test_result tr = *i; + + os << std::endl; + + os << "---> " << "group: " << tr.group + << ", test: test<" << tr.test << ">" + << (!tr.name.empty() ? (std::string(" : ") + tr.name) : std::string()) + << std::endl; + +#if defined(TUT_USE_POSIX) + if(tr.pid != getpid()) + { + os << " child pid: " << tr.pid << std::endl; + } +#endif + os << " problem: "; + switch(tr.result) + { + case test_result::rethrown: + os << "assertion failed in child" << std::endl; + break; + case test_result::fail: + os << "assertion failed" << std::endl; + break; + case test_result::ex: + case test_result::ex_ctor: + os << "unexpected exception" << std::endl; + if( tr.exception_typeid != "" ) + { + os << " exception typeid: " + << tr.exception_typeid << std::endl; + } + break; + case test_result::term: + os << "would be terminated" << std::endl; + break; + case test_result::warn: + os << "test passed, but cleanup code (destructor) raised" + " an exception" << std::endl; + break; + default: + break; + } + + + if (!tr.message.empty()) + { + if (tr.result == test_result::fail) + { + os << " failed assertion: `" << tr.message << "`" + << std::endl; + } + else + { + os << " message: `" << tr.message << "`" + << std::endl; + } + } + + ++i; + } + } + + os << std::endl; + + os << "tests summary:"; + if (terminations_count > 0) + { + os << " terminations:" << terminations_count; + } + if (exceptions_count > 0) + { + os << " exceptions:" << exceptions_count; + } + if (failures_count > 0) + { + os << " failures:" << failures_count; + } + if (warnings_count > 0) + { + os << " warnings:" << warnings_count; + } + + os << " ok:" << ok_count; + + if(skipped_count > 0) + { + os << " skipped:" << skipped_count; + } + std::cout << "\n##teamcity[testSuiteFinished name='" << "suite." << suitename << "']\n" << std::flush; + os << std::endl; + } + + virtual bool all_ok() const + { + return not_passed.empty(); + } + +private: + + void init() + { + ok_count = 0; + exceptions_count = 0; + failures_count = 0; + terminations_count = 0; + warnings_count = 0; + skipped_count = 0; + not_passed.clear(); + } +}; + +} + +#endif diff --git a/lib/tut-framework/include/tut/tut_cppunit_reporter.hpp b/lib/tut-framework/include/tut/tut_cppunit_reporter.hpp new file mode 100644 index 00000000..8d0d50af --- /dev/null +++ b/lib/tut-framework/include/tut/tut_cppunit_reporter.hpp @@ -0,0 +1,218 @@ + +#ifndef TUT_CPPUNIT_REPORTER +#define TUT_CPPUNIT_REPORTER + +#include +#include +#include +#include +#include +#include + +namespace tut +{ + +/** + * CppUnit TUT reporter + */ +class cppunit_reporter : public tut::callback +{ + std::vector failed_tests_; + std::vector passed_tests_; + const std::string filename_; + std::auto_ptr stream_; + + + cppunit_reporter(const cppunit_reporter &); + cppunit_reporter &operator=(const cppunit_reporter &); + +public: + explicit cppunit_reporter(const std::string &filename = "testResult.xml") + : failed_tests_(), + passed_tests_(), + filename_(filename), + stream_(new std::ofstream(filename_.c_str())) + { + if (!stream_->good()) { + throw tut_error("Cannot open output file `" + filename_ + "`"); + } + } + + explicit cppunit_reporter(std::ostream &stream) + : failed_tests_(), + passed_tests_(), + filename_(), + stream_(&stream) + { + } + + ~cppunit_reporter() + { + if(filename_.empty()) + { + stream_.release(); + } + } + + void run_started() + { + failed_tests_.clear(); + passed_tests_.clear(); + } + + void test_completed(const tut::test_result& tr) + { + assert(tr.result != test_result::dummy ); + if ( (tr.result == test_result::ok) || + (tr.result == test_result::skipped) ) + { + passed_tests_.push_back(tr); + } + else + { + failed_tests_.push_back(tr); + } + } + + void run_completed() + { + int errors = 0; + int failures = 0; + std::string failure_type; + std::string failure_msg; + + *stream_ << "" << std::endl + << "" << std::endl; + + if (failed_tests_.size() > 0) + { + *stream_ << " " << std::endl; + + for (unsigned int i=0; i" << std::endl + << " " << encode(failed_tests_[i].group) + "::" + encode(failed_tests_[i].name) << "" << std::endl + << " " << failure_type << "" << std::endl + << " " << std::endl + << " Unknown" << std::endl + << " Unknown" << std::endl + << " " << std::endl + << " " << encode(failure_msg + failed_tests_[i].message) << "" << std::endl + << " " << std::endl; + } + + *stream_ << " " << std::endl; + } + + /* *********************** passed tests ***************************** */ + if (passed_tests_.size() > 0) { + *stream_ << " " << std::endl; + + for (unsigned int i=0; i" << std::endl + << " " << encode(passed_tests_[i].group) + "::" + encode(passed_tests_[i].name) << "" << std::endl + << " " << std::endl; + } + + *stream_ << " " << std::endl; + } + + /* *********************** statistics ***************************** */ + *stream_ << " " << std::endl + << " " << (failed_tests_.size() + passed_tests_.size()) << "" << std::endl + << " " << failed_tests_.size() << "" << std::endl + << " " << errors << "" << std::endl + << " " << failures << "" << std::endl + << " " << std::endl; + + /* *********************** footer ***************************** */ + *stream_ << "" << std::endl; + } + + virtual bool all_ok() const + { + return failed_tests_.empty(); + } + + /** + * \brief Encodes text to XML + * XML-reserved characters (e.g. "<") are encoded according to specification + * @param text text to be encoded + * @return encoded string + */ + static std::string encode(const std::string & text) + { + std::string out; + + for (unsigned int i=0; i': + out += ">"; + break; + case '&': + out += "&"; + break; + case '\'': + out += "'"; + break; + case '"': + out += """; + break; + default: + out += c; + } + } + + return out; + } +}; + +} + +#endif + diff --git a/lib/tut-framework/include/tut/tut_exception.hpp b/lib/tut-framework/include/tut/tut_exception.hpp new file mode 100644 index 00000000..1ebea341 --- /dev/null +++ b/lib/tut-framework/include/tut/tut_exception.hpp @@ -0,0 +1,237 @@ +#ifndef TUT_EXCEPTION_H_GUARD +#define TUT_EXCEPTION_H_GUARD + +#include +#include "tut_result.hpp" + +namespace tut +{ + +/** + * The base for all TUT exceptions. + */ +struct tut_error : public std::exception +{ + explicit tut_error(const std::string& msg) + : err_msg(msg) + { + } + + virtual test_result::result_type result() const + { + return test_result::ex; + } + + virtual std::string type() const + { + return "tut::tut_error"; + } + + const char* what() const throw() + { + return err_msg.c_str(); + } + + ~tut_error() throw() + { + } + +private: + void operator=(const tut_error &); + + const std::string err_msg; +}; + +/** + * Group not found exception. + */ +struct no_such_group : public tut_error +{ + explicit no_such_group(const std::string& grp) + : tut_error(grp) + { + } + + virtual std::string type() const + { + return "tut::no_such_group"; + } + + ~no_such_group() throw() + { + } +}; + +/** + * Test not found exception. + */ +struct no_such_test : public tut_error +{ + explicit no_such_test(const std::string& grp) + : tut_error(grp) + { + } + + virtual std::string type() const + { + return "tut::no_such_test"; + } + + ~no_such_test() throw() + { + } +}; + +/** + * Internal exception to be throwed when + * test constructor has failed. + */ +struct bad_ctor : public tut_error +{ + explicit bad_ctor(const std::string& msg) + : tut_error(msg) + { + } + + test_result::result_type result() const + { + return test_result::ex_ctor; + } + + virtual std::string type() const + { + return "tut::bad_ctor"; + } + + ~bad_ctor() throw() + { + } +}; + +/** + * Exception to be throwed when ensure() fails or fail() called. + */ +struct failure : public tut_error +{ + explicit failure(const std::string& msg) + : tut_error(msg) + { + } + + test_result::result_type result() const + { + return test_result::fail; + } + + virtual std::string type() const + { + return "tut::failure"; + } + + ~failure() throw() + { + } +}; + +/** + * Exception to be throwed when test desctructor throwed an exception. + */ +struct warning : public tut_error +{ + explicit warning(const std::string& msg) + : tut_error(msg) + { + } + + test_result::result_type result() const + { + return test_result::warn; + } + + virtual std::string type() const + { + return "tut::warning"; + } + + ~warning() throw() + { + } +}; + +/** + * Exception to be throwed when test issued SEH (Win32) + */ +struct seh : public tut_error +{ + explicit seh(const std::string& msg) + : tut_error(msg) + { + } + + virtual test_result::result_type result() const + { + return test_result::term; + } + + virtual std::string type() const + { + return "tut::seh"; + } + + ~seh() throw() + { + } +}; + +/** + * Exception to be throwed when child processes fail. + */ +struct rethrown : public failure +{ + explicit rethrown(const test_result &result) + : failure(result.message), tr(result) + { + } + + virtual test_result::result_type result() const + { + return test_result::rethrown; + } + + virtual std::string type() const + { + return "tut::rethrown"; + } + + ~rethrown() throw() + { + } + + const test_result tr; +}; + +struct skipped : public tut_error +{ + explicit skipped(const std::string& msg) + : tut_error(msg) + { + } + + virtual test_result::result_type result() const + { + return test_result::skipped; + } + + virtual std::string type() const + { + return "tut::skipped"; + } + + ~skipped() throw() + { + } +}; + +} + +#endif diff --git a/lib/tut-framework/include/tut/tut_fpt.hpp b/lib/tut-framework/include/tut/tut_fpt.hpp new file mode 100644 index 00000000..380c92b4 --- /dev/null +++ b/lib/tut-framework/include/tut/tut_fpt.hpp @@ -0,0 +1,185 @@ +/** + * @brief Additional ensures for scientific/engineering applications. + * @author Joerg + * @date 07/04/2008 + */ +#ifndef TUT_Float_H_GUARD +#define TUT_Float_H_GUARD + +#include +#include + +namespace tut +{ + namespace detail + { + template + struct If + { + typedef Else type; + }; + + template + struct If + { + typedef Then type; + }; + + template + struct fpt_traits + { + struct StdNumericLimitsNotAvailable {}; + static const StdNumericLimitsNotAvailable static_check[ std::numeric_limits::is_specialized ]; + + static const T zero; + + typedef typename If::is_integer, + double, + T>::type Result; + + static T abs(const T &arg) + { + if(arg < zero) + return zero - arg; + else + return arg; + } + + static T sig(const T &arg) + { + if(arg < zero) + return -1; + else + return 1; + } + + static inline Result div(const Result &number, const T &divisor) + { + static_cast(static_check); + + if(number == zero && divisor == zero) + return std::numeric_limits::quiet_NaN(); + + if(number == zero) + return zero; + + if(divisor == zero) + return sig(number) * std::numeric_limits::infinity(); + + assert(zero < number); + assert(zero < divisor); + + // Avoid underflow + if(static_cast(1) < abs(divisor)) + { + // number / divisor < min <=> number < min * divisor + if( abs(number) < abs(divisor) * std::numeric_limits::min()) + { + return sig(divisor) * sig(number) * std::numeric_limits::min(); + } + } + + // Avoid overflow + if( abs(divisor) < static_cast(1)) + { + // number / divisor > max <=> number > max * divisor + if( abs(divisor) * std::numeric_limits::max() < abs(number)) + { + return sig(divisor) * sig(number) * std::numeric_limits::max(); + } + } + + return number / divisor; + } + }; + + template + const typename fpt_traits::StdNumericLimitsNotAvailable + fpt_traits::static_check[ std::numeric_limits::is_specialized ] = { {} }; + + template + const T fpt_traits::zero = static_cast(0); + + template + bool check_tolerance(T actual, T expected, U fraction) + { + typename fpt_traits::Result diff = fpt_traits::div( fpt_traits::abs( expected - actual ), + fpt_traits::abs( expected ) ); + + return (diff == fraction) || (diff < fraction); + } + + } // namespace detail + + template + void ensure_close(const char* msg, const T& actual, const T& expected, const U& tolerance ) + { + typedef detail::fpt_traits Traits; + + typename Traits::Result fraction = Traits::div( Traits::abs(static_cast(tolerance)), + static_cast(100) ); + if( !detail::check_tolerance(actual, expected, fraction) ) + { + std::stringstream ss; + ss << ( msg ? msg : "" ) + << ( msg ? ": " : "" ) + << "expected `" + << expected + << "` and actual `" + << actual + << "` differ more than " + << tolerance + << "%"; + throw failure( ss.str().c_str() ); + } + } + + template + void ensure_close(const T& actual, const T& expected, const Tolerance& tolerance ) + { + ensure_close( 0, actual, expected, tolerance ); + } + + template + void ensure_close_fraction(const char* msg, const T& actual, const T& expected, const U& fraction) + { + typedef char StdNumericLimitsNotAvailable; + const StdNumericLimitsNotAvailable static_check[ std::numeric_limits::is_specialized ] = { 0 }; + static_cast(static_check); + + typedef typename detail::If::is_integer, + double, + U>::type Tolerance; + + if( !detail::check_tolerance(actual, expected, fraction) ) + { + std::stringstream ss; + ss << ( msg ? msg : "" ) + << ( msg ? ": " : "" ) + << "expected `" + << expected + << "` and actual `" + << actual + << "` differ more than fraction `" + << fraction + << "`"; + throw failure( ss.str().c_str() ); + } + } + + template + void ensure_close_fraction( const char* msg, const T& actual, const T& expected, const int& tolerance ) + { + ensure_close(msg, actual, expected, double(tolerance)); + } + + template< typename T, typename Tolerance> + void ensure_close_fraction(const T& actual, const T& expected, const Tolerance& fraction) + { + ensure_close_fraction( 0, actual, expected, fraction ); + } + +} // namespace tut + +#endif + diff --git a/lib/tut-framework/include/tut/tut_macros.hpp b/lib/tut-framework/include/tut/tut_macros.hpp new file mode 100644 index 00000000..ed517d66 --- /dev/null +++ b/lib/tut-framework/include/tut/tut_macros.hpp @@ -0,0 +1,63 @@ +#ifndef TUT_MACROS_HPP +#define TUT_MACROS_HPP + +#include + +#ifdef ensure_THROW +#error ensure_THROW macro is already defined +#endif + +/** Helper macros to ensure that a call throws exception. + * \code + * #include + * ensure_THROW( this_function_should_throw_bad_alloc(), std::bad_alloc ); + * \endcode + */ +#define ensure_THROW( x, e ) \ +try \ +{ \ + x; \ + fail(#x " has not thrown expected exception " #e); \ +} \ +catch(const e &) \ +{ \ +} \ +catch(const std::exception &ex) \ +{ \ + fail( std::string(#x " has thrown unexpected exception ")+tut::type_name(ex)+": "+ex.what()); \ +} \ +catch(...) \ +{ \ + fail(#x " has thrown unexpected unknown exception"); \ +} + +#ifdef ensure_NO_THROW +#error ensure_NO_THROW macro is already defined +#endif + +/** Helper macro to ensure a call does not throw any exceptions. + * \code + * #include + * ensure_NO_THROW( this_function_should_never_throw() ); + * \endcode + */ +#define ensure_NO_THROW( x ) \ +try \ +{ \ + x; \ +} \ +catch(const std::exception &ex) \ +{ \ + fail( std::string(#x " has thrown unexpected exception ")+tut::type_name(ex)+": "+ex.what()); \ +} \ +catch(...) \ +{ \ + fail(#x " has thrown unexpected unknown exception"); \ +} + +#ifdef __COUNTER__ +#define TUT_TESTCASE(object) template<> template<> void object::test<__COUNTER__>() +#endif + +#endif + diff --git a/lib/tut-framework/include/tut/tut_main.hpp b/lib/tut-framework/include/tut/tut_main.hpp new file mode 100644 index 00000000..0866c091 --- /dev/null +++ b/lib/tut-framework/include/tut/tut_main.hpp @@ -0,0 +1,111 @@ +#ifndef TUT_MAIN_H +#define TUT_MAIN_H + +#include +#include +#include +#include +#include + +namespace tut +{ + +/** Helper function to make test binaries simpler. + * + * Example of basic usage follows. + * + * @code + * namespace tut { test_runner_singleton runner; } + * + * int main(int argc, char **argv) + * { + * if( tut_main(argc, argv) ) + * return 0; + * else + * return -1; + * } + * @endcode + * + * It is also possible to do some generic initialization before + * running any tests and cleanup before exiting application. + * Note that tut_main can throw tut::no_such_group or tut::no_such_test. + * + * @code + * namespace tut { test_runner_singleton runner; } + * + * int main(int argc, char **argv) + * { + * tut::xml_reporter reporter; + * tut::runner.get().insert_callback(&reporter); + * + * MyInit(); + * try + * { + * tut_main(argc, argv); + * } + * catch(const tut::tut_error &ex) + * { + * std::cerr << "TUT error: " << ex.what() << std::endl; + * } + * MyCleanup(); + * } + * @endcode + */ +inline bool tut_main(int argc, const char **argv, std::ostream &os = std::cerr) +{ + std::stringstream usage; + usage << "Usage: " << argv[0] << " [group] [testcase]" << std::endl; + groupnames gr = runner.get().list_groups(); + usage << "Available test groups:" << std::endl; + for(groupnames::const_iterator i = gr.begin(); i != gr.end(); ++i) + { + usage << " " << *i << std::endl; + } + + if(argc>1) + { + if(std::string(argv[1]) == "-h" || + std::string(argv[1]) == "--help" || + std::string(argv[1]) == "/?" || + argc > 3) + { + os << usage.rdbuf(); + return false; + } + } + + // Check command line options. + switch(argc) + { + case 1: + runner.get().run_tests(); + break; + + case 2: + runner.get().run_tests(argv[1]); + break; + + case 3: + { + char *end; + int t = strtol(argv[2], &end, 10); + if(end != argv[2] + strlen(argv[2])) + { + throw no_such_test("`" + std::string(argv[2]) + "` should be a number"); + } + + test_result tr; + if(!runner.get().run_test(argv[1], t, tr) || tr.result == test_result::dummy) + { + throw no_such_test("No testcase `" + std::string(argv[2]) + "` in group `" + argv[1] + "`"); + } + } + break; + } + + return true; +} // tut_main() + +} + +#endif diff --git a/lib/tut-framework/include/tut/tut_posix.hpp b/lib/tut-framework/include/tut/tut_posix.hpp new file mode 100644 index 00000000..1cb17be4 --- /dev/null +++ b/lib/tut-framework/include/tut/tut_posix.hpp @@ -0,0 +1,485 @@ +#ifndef TUT_FORK_H_GUARD +#define TUT_FORK_H_GUARD +#include + +#if defined(TUT_USE_POSIX) +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "tut_result.hpp" +#include "tut_assert.hpp" +#include "tut_runner.hpp" + +namespace tut +{ + +template +class test_group; + +template +class test_object; + +class test_group_posix +{ +private: + template + friend class test_group; + + template + void send_result_(const T *obj, const test_result &tr) + { + if(obj->get_pipe_() == -1) + { + return; + } + + if(tr.result != test_result::ok) + { + std::stringstream ss; + ss << int(tr.result) << "\n" + << tr.group << "\n" + << tr.test << "\n" + << tr.name << "\n" + << tr.exception_typeid << "\n"; + std::copy( tr.message.begin(), tr.message.end(), std::ostreambuf_iterator(ss.rdbuf()) ); + + int size = ss.str().length(); + int w = write(obj->get_pipe_(), ss.str().c_str(), size); + ensure_errno("write() failed", w == size); + } + } + + virtual ~test_group_posix() + { + } +}; + +template +struct tut_posix +{ + pid_t fork() + { + test_object *self = dynamic_cast< tut::test_object* >(this); + ensure("trying to call 'tut_fork' in ctor of test object", self != NULL); + + return self->fork_(); + } + + pid_t waitpid(pid_t pid, int *status, int flags = 0) + { + test_object *self = dynamic_cast< tut::test_object* >(this); + ensure("trying to call 'tut_waitpid' in ctor of test object", self != NULL); + + return self->waitpid_(pid, status, flags); + } + + void ensure_child_exit(pid_t pid, int exit_status = 0) + { + test_object *self = dynamic_cast< tut::test_object* >(this); + ensure("trying to call 'ensure_child_exit' in ctor of test object", self != NULL); + + int status; + self->waitpid_(pid, &status); + + self->ensure_child_exit_(status, exit_status); + } + + + void ensure_child_signal(pid_t pid, int signal = SIGTERM) + { + test_object *self = dynamic_cast< tut::test_object* >(this); + ensure("trying to call 'ensure_child_signal' in ctor of test object", self != NULL); + + int status; + self->waitpid_(pid, &status); + + self->ensure_child_signal_(status, signal); + } + + std::set get_pids() const + { + using namespace std; + + const test_object *self = dynamic_cast< const tut::test_object* >(this); + ensure("trying to call 'get_pids' in ctor of test object", self != NULL); + + return self->get_pids_(); + } + + virtual ~tut_posix() + { + } + +}; + +class test_object_posix +{ +public: + typedef std::map pid_map; + + /** + * Default constructor + */ + test_object_posix() + : pids_(), + pipe_(-1) + { + } + + + virtual ~test_object_posix() + { + // we have forked + if(pipe_ != -1) + { + // in child, force exit + std::exit(0); + } + + if(!pids_.empty()) + { + std::stringstream ss; + + // in parent, reap children + for(std::map::iterator i = pids_.begin(); i != pids_.end(); ++i) + { + try { + kill_child_(i->first); + } catch(const rethrown &ex) { + ss << std::endl << "child " << ex.tr.pid << " has thrown an exception: " << ex.what(); + } catch(const failure &ex) { + ss << std::endl << ex.what(); + } + } + + if(!ss.str().empty()) + { + fail(ss.str().c_str()); + } + } + } + +private: + template + friend class tut_posix; + + friend class test_group_posix; + + int get_pipe_() const + { + return pipe_; + } + + + pid_t fork_() + { + // create pipe + int fds[2]; + ensure_errno("pipe() failed", ::pipe(fds) == 0); + + pid_t pid = ::fork(); + + ensure_errno("fork() failed", pid >= 0); + + if(pid != 0) + { + // in parent, register pid + ensure("duplicated child", pids_.insert( std::make_pair(pid, fds[0]) ).second); + + // close writing side + close(fds[1]); + } + else + { + // in child, shutdown reporter + tut::runner.get().clear_callbacks(); + + // close reading side + close(fds[0]); + pipe_ = fds[1]; + } + + return pid; + } + + void kill_child_(pid_t pid) + { + int status; + + if(waitpid_(pid, &status, WNOHANG) == pid) + { + ensure_child_exit_(status, 0); + return; + } + + if(::kill(pid, SIGTERM) != 0) + { + if(errno == ESRCH) + { + // no such process + return; + } + else + { + // cannot kill, we are in trouble + std::stringstream ss; + char e[1024]; + ss << "child " << pid << " could not be killed with SIGTERM, " << strerror_r(errno, e, sizeof(e)) << std::endl; + fail(ss.str()); + } + } + + if(waitpid_(pid, &status, WNOHANG) == pid) + { + // child killed, check signal + ensure_child_signal_(status, SIGTERM); + + ensure_equals("child process exists after SIGTERM", ::kill(pid, 0), -1); + return; + } + + // child seems to be still exiting, give it some time + sleep(2); + + if(waitpid_(pid, &status, WNOHANG) != pid) + { + // child is still running, kill it + if(::kill(pid, SIGKILL) != 0) + { + if(errno == ESRCH) + { + // no such process + return; + } + else + { + std::stringstream ss; + char e[1024]; + ss << "child " << pid << " could not be killed with SIGKILL, " << strerror_r(errno, e, sizeof(e)) << std::endl; + fail(ss.str()); + } + } + + ensure_equals("wait after SIGKILL", waitpid_(pid, &status), pid); + ensure_child_signal_(status, SIGKILL); + + ensure_equals("child process exists after SIGKILL", ::kill(pid, 0), -1); + + std::stringstream ss; + ss << "child " << pid << " had to be killed with SIGKILL"; + fail(ss.str()); + } + } + + test_result receive_result_(std::istream &ss, pid_t pid) + { + test_result tr; + + int type; + ss >> type; + tr.result = test_result::result_type(type); + ss.ignore(1024, '\n'); + + std::getline(ss, tr.group); + ss >> tr.test; + ss.ignore(1024, '\n'); + std::getline(ss, tr.name); + std::getline(ss, tr.exception_typeid); + std::copy( std::istreambuf_iterator(ss.rdbuf()), + std::istreambuf_iterator(), + std::back_inserter(tr.message) ); + + tr.pid = pid; + + return tr; + } + + struct fdclose + { + fdclose(int fd): fd_(fd) { } + ~fdclose() + { + close(fd_); + } + private: + int fd_; + }; + + pid_t waitpid_(pid_t pid, int *status, int flags = 0) + { + + ensure("trying to wait for unknown pid", pids_.count(pid) > 0); + + pid_t p = ::waitpid(pid, status, flags); + if( (flags & WNOHANG) && (p != pid) ) + { + return p; + } + + // read child result from pipe + fd_set fdset; + timeval tv; + tv.tv_sec = 0; + tv.tv_usec = 0; + + FD_ZERO(&fdset); + + int pipe = pids_[pid]; + fdclose guard(pipe); + + FD_SET(pipe, &fdset); + + int result = select(pipe+1, &fdset, NULL, NULL, &tv); + ensure_errno("sanity check on select() failed", result >= 0); + + if(result > 0) + { + ensure("sanity check on FD_ISSET() failed", FD_ISSET(pipe, &fdset) ); + + std::stringstream ss; + + //TODO: max failure length + char buffer[1024]; + int r = read(pipe, buffer, sizeof(buffer)); + ensure_errno("sanity check on read() failed", r >= 0); + + if(r > 0) + { + ss.write(buffer, r); + throw rethrown( receive_result_(ss, pid) ); + } + } + + return pid; + } + + void ensure_child_exit_(int status, int exit_status) + { + if(WIFSIGNALED(status)) + { + std::stringstream ss; + ss << "child killed by signal " << WTERMSIG(status) + << ": expected exit with code " << exit_status; + + throw failure(ss.str().c_str()); + } + + if(WIFEXITED(status)) + { + if(WEXITSTATUS(status) != exit_status) + { + std::stringstream ss; + ss << "child exited, expected '" + << exit_status + << "' actual '" + << WEXITSTATUS(status) + << '\''; + + throw failure(ss.str().c_str()); + } + } + + if(WIFSTOPPED(status)) + { + std::stringstream ss; + ss << "child stopped by signal " << WTERMSIG(status) + << ": expected exit with code " << exit_status; + throw failure(ss.str().c_str()); + } + } + + void ensure_child_signal_(int status, int signal) + { + if(WIFSIGNALED(status)) + { + if(WTERMSIG(status) != signal) + { + std::stringstream ss; + ss << "child killed by signal, expected '" + << signal + << "' actual '" + << WTERMSIG(status) + << '\''; + throw failure(ss.str().c_str()); + } + } + + if(WIFEXITED(status)) + { + std::stringstream ss; + ss << "child exited with code " << WEXITSTATUS(status) + << ": expected signal " << signal; + + throw failure(ss.str().c_str()); + } + + if(WIFSTOPPED(status)) + { + std::stringstream ss; + ss << "child stopped by signal " << WTERMSIG(status) + << ": expected kill by signal " << signal; + + throw failure(ss.str().c_str()); + } + } + + std::set get_pids_() const + { + using namespace std; + + set pids; + for(pid_map::const_iterator i = pids_.begin(); i != pids_.end(); ++i) + { + pids.insert( i->first ); + } + + return pids; + } + + pid_map pids_; + int pipe_; +}; + +} // namespace tut + +#else + +namespace tut +{ + +struct test_object_posix +{ + virtual ~test_object_posix() + { + } +}; + +struct test_group_posix +{ + template + void send_result_(const T*, const test_result &) + { + } + + virtual ~test_group_posix() + { + } +}; + +} // namespace tut + +#endif + + +#endif + diff --git a/lib/tut-framework/include/tut/tut_reporter.hpp b/lib/tut-framework/include/tut/tut_reporter.hpp new file mode 100644 index 00000000..56731d8b --- /dev/null +++ b/lib/tut-framework/include/tut/tut_reporter.hpp @@ -0,0 +1,11 @@ +#ifndef TUT_REPORTER +#define TUT_REPORTER + +#include + +namespace tut +{ + typedef console_reporter reporter; +} + +#endif diff --git a/lib/tut-framework/include/tut/tut_restartable.hpp b/lib/tut-framework/include/tut/tut_restartable.hpp new file mode 100644 index 00000000..9f929234 --- /dev/null +++ b/lib/tut-framework/include/tut/tut_restartable.hpp @@ -0,0 +1,410 @@ +#ifndef TUT_RESTARTABLE_H_GUARD +#define TUT_RESTARTABLE_H_GUARD + +#include +#include +#include +#include +#include + +/** + * Optional restartable wrapper for test_runner. + * + * Allows to restart test runs finished due to abnormal + * test application termination (such as segmentation + * fault or math error). + * + * @author Vladimir Dyuzhev, Vladimir.Dyuzhev@gmail.com + */ + +namespace tut +{ + +namespace util +{ + +/** + * Escapes non-alphabetical characters in string. + */ +std::string escape(const std::string& orig) +{ + std::string rc; + std::string::const_iterator i,e; + i = orig.begin(); + e = orig.end(); + + while (i != e) + { + if ((*i >= 'a' && *i <= 'z') || + (*i >= 'A' && *i <= 'Z') || + (*i >= '0' && *i <= '9') ) + { + rc += *i; + } + else + { + rc += '\\'; + rc += ('a'+(((unsigned int)*i) >> 4)); + rc += ('a'+(((unsigned int)*i) & 0xF)); + } + + ++i; + } + return rc; +} + +/** + * Un-escapes string. + */ +std::string unescape(const std::string& orig) +{ + std::string rc; + std::string::const_iterator i,e; + i = orig.begin(); + e = orig.end(); + + while (i != e) + { + if (*i != '\\') + { + rc += *i; + } + else + { + ++i; + if (i == e) + { + throw std::invalid_argument("unexpected end of string"); + } + unsigned int c1 = *i; + ++i; + if (i == e) + { + throw std::invalid_argument("unexpected end of string"); + } + unsigned int c2 = *i; + rc += (((c1 - 'a') << 4) + (c2 - 'a')); + } + + ++i; + } + return rc; +} + +/** + * Serialize test_result avoiding interfering with operator <<. + */ +void serialize(std::ostream& os, const tut::test_result& tr) +{ + os << escape(tr.group) << std::endl; + os << tr.test << ' '; + switch(tr.result) + { + case test_result::ok: + os << 0; + break; + case test_result::fail: + os << 1; + break; + case test_result::ex: + os << 2; + break; + case test_result::warn: + os << 3; + break; + case test_result::term: + os << 4; + break; + case test_result::rethrown: + os << 5; + break; + case test_result::ex_ctor: + os << 6; + break; + case test_result::dummy: + assert(!"Should never be called"); + default: + throw std::logic_error("operator << : bad result_type"); + } + os << ' ' << escape(tr.message) << std::endl; +} + +/** + * deserialization for test_result + */ +bool deserialize(std::istream& is, tut::test_result& tr) +{ + std::getline(is,tr.group); + if (is.eof()) + { + return false; + } + tr.group = unescape(tr.group); + + tr.test = -1; + is >> tr.test; + if (tr.test < 0) + { + throw std::logic_error("operator >> : bad test number"); + } + + int n = -1; + is >> n; + switch(n) + { + case 0: + tr.result = test_result::ok; + break; + case 1: + tr.result = test_result::fail; + break; + case 2: + tr.result = test_result::ex; + break; + case 3: + tr.result = test_result::warn; + break; + case 4: + tr.result = test_result::term; + break; + case 5: + tr.result = test_result::rethrown; + break; + case 6: + tr.result = test_result::ex_ctor; + break; + default: + throw std::logic_error("operator >> : bad result_type"); + } + + is.ignore(1); // space + std::getline(is,tr.message); + tr.message = unescape(tr.message); + if (!is.good()) + { + throw std::logic_error("malformed test result"); + } + return true; +} +} + +/** + * Restartable test runner wrapper. + */ +class restartable_wrapper +{ + test_runner& runner_; + callbacks callbacks_; + + std::string dir_; + std::string log_; // log file: last test being executed + std::string jrn_; // journal file: results of all executed tests + +public: + /** + * Default constructor. + * @param dir Directory where to search/put log and journal files + */ + restartable_wrapper(const std::string& dir = ".") + : runner_(runner.get()), + callbacks_(), + dir_(dir), + log_( dir + '/' + "log.tut" ), + jrn_( dir + '/' + "journal.tut" ) + { + // dozen: it works, but it would be better to use system path separator + } + + /** + * Stores another group for getting by name. + */ + void register_group(const std::string& name, group_base* gr) + { + runner_.register_group(name,gr); + } + + /** + * Stores callback object. + */ + void set_callback(callback* cb) + { + callbacks_.clear(); + callbacks_.insert(cb); + } + + void insert_callback(callback* cb) + { + callbacks_.insert(cb); + } + + void erase_callback(callback* cb) + { + callbacks_.erase(cb); + } + + void set_callbacks(const callbacks& cb) + { + callbacks_ = cb; + } + + const callbacks& get_callbacks() const + { + return runner_.get_callbacks(); + } + + /** + * Returns list of known test groups. + */ + groupnames list_groups() const + { + return runner_.list_groups(); + } + + /** + * Runs all tests in all groups. + */ + void run_tests() const + { + // where last run was failed + std::string fail_group; + int fail_test; + read_log_(fail_group,fail_test); + bool fail_group_reached = (fail_group == ""); + + // iterate over groups + tut::groupnames gn = list_groups(); + tut::groupnames::const_iterator gni,gne; + gni = gn.begin(); + gne = gn.end(); + while (gni != gne) + { + // skip all groups before one that failed + if (!fail_group_reached) + { + if (*gni != fail_group) + { + ++gni; + continue; + } + fail_group_reached = true; + } + + // first or restarted run + int test = (*gni == fail_group && fail_test >= 0) ? fail_test + 1 : 1; + while(true) + { + // last executed test pos + register_execution_(*gni,test); + + tut::test_result tr; + if( !runner_.run_test(*gni,test, tr) || tr.result == test_result::dummy ) + { + break; + } + register_test_(tr); + + ++test; + } + + ++gni; + } + + // show final results to user + invoke_callback_(); + + // truncate files as mark of successful finish + truncate_(); + } + +private: + /** + * Shows results from journal file. + */ + void invoke_callback_() const + { + runner_.set_callbacks(callbacks_); + runner_.cb_run_started_(); + + std::string current_group; + std::ifstream ijournal(jrn_.c_str()); + while (ijournal.good()) + { + tut::test_result tr; + if( !util::deserialize(ijournal,tr) ) + { + break; + } + runner_.cb_test_completed_(tr); + } + + runner_.cb_run_completed_(); + } + + /** + * Register test into journal. + */ + void register_test_(const test_result& tr) const + { + std::ofstream ojournal(jrn_.c_str(), std::ios::app); + util::serialize(ojournal, tr); + ojournal << std::flush; + if (!ojournal.good()) + { + throw std::runtime_error("unable to register test result in file " + + jrn_); + } + } + + /** + * Mark the fact test going to be executed + */ + void register_execution_(const std::string& grp, int test) const + { + // last executed test pos + std::ofstream olog(log_.c_str()); + olog << util::escape(grp) << std::endl << test << std::endl << std::flush; + if (!olog.good()) + { + throw std::runtime_error("unable to register execution in file " + + log_); + } + } + + /** + * Truncate tests. + */ + void truncate_() const + { + std::ofstream olog(log_.c_str()); + std::ofstream ojournal(jrn_.c_str()); + } + + /** + * Read log file + */ + void read_log_(std::string& fail_group, int& fail_test) const + { + // read failure point, if any + std::ifstream ilog(log_.c_str()); + std::getline(ilog,fail_group); + fail_group = util::unescape(fail_group); + ilog >> fail_test; + if (!ilog.good()) + { + fail_group = ""; + fail_test = -1; + truncate_(); + } + else + { + // test was terminated... + tut::test_result tr(fail_group, fail_test, "", tut::test_result::term); + register_test_(tr); + } + } +}; + +} + +#endif + diff --git a/lib/tut-framework/include/tut/tut_result.hpp b/lib/tut-framework/include/tut/tut_result.hpp new file mode 100644 index 00000000..e9607859 --- /dev/null +++ b/lib/tut-framework/include/tut/tut_result.hpp @@ -0,0 +1,174 @@ +#ifndef TUT_RESULT_H_GUARD +#define TUT_RESULT_H_GUARD +#include + +#include + +#if defined(TUT_USE_RTTI) +#if (defined(_MSC_VER) && !defined(_CPPRTTI)) || (defined(__GNUC__) && !defined(__GXX_RTTI)) +#undef TUT_USE_RTTI +#endif +#endif + +#if defined(TUT_USE_RTTI) +#include +#endif + +namespace tut +{ + +#if defined(TUT_USE_RTTI) +template +inline std::string type_name(const T& t) +{ + return typeid(t).name(); +} +#else +template +inline std::string type_name(const T& t) +{ + return "Unknown type, RTTI disabled"; +} + +inline std::string type_name(const std::exception&) +{ + return "Unknown std::exception, RTTI disabled"; +} +#endif + + +#if defined(TUT_USE_POSIX) +struct test_result_posix +{ + test_result_posix() + : pid(getpid()) + { + } + + virtual ~test_result_posix() + { + } + + pid_t pid; +}; +#else +struct test_result_posix +{ + virtual ~test_result_posix() + { + } +}; +#endif + +/** + * Return type of runned test/test group. + * + * For test: contains result of test and, possible, message + * for failure or exception. + */ +struct test_result : public test_result_posix +{ + /** + * Test group name. + */ + std::string group; + + /** + * Test number in group. + */ + int test; + + /** + * Test name (optional) + */ + std::string name; + + /** + * result of a test + */ + enum result_type + { + ok, ///< test finished successfully + fail, ///< test failed with ensure() or fail() methods + ex, ///< test throwed an exceptions + warn, ///< test finished successfully, but test destructor throwed + term, ///< test forced test application to terminate abnormally + ex_ctor, ///< + rethrown, ///< + skipped, ///< + dummy ///< + }; + + result_type result; + + /** + * Exception message for failed test. + */ + std::string message; + std::string exception_typeid; + + /** + * Default constructor. + */ + test_result() + : group(), + test(0), + name(), + result(ok), + message(), + exception_typeid() + { + } + + /** + * Constructor. + */ + test_result(const std::string& grp, int pos, + const std::string& test_name, result_type res) + : group(grp), + test(pos), + name(test_name), + result(res), + message(), + exception_typeid() + { + } + + /** + * Constructor with exception. + */ + test_result(const std::string& grp,int pos, + const std::string& test_name, result_type res, + const std::exception& ex) + : group(grp), + test(pos), + name(test_name), + result(res), + message(ex.what()), + exception_typeid(type_name(ex)) + { + } + + /** Constructor with typeid. + */ + test_result(const std::string& grp,int pos, + const std::string& test_name, result_type res, + const std::string& ex_typeid, + const std::string& msg) + : group(grp), + test(pos), + name(test_name), + result(res), + message(msg), + exception_typeid(ex_typeid) + { + } + + virtual ~test_result() + { + } +}; + +} + +#endif diff --git a/lib/tut-framework/include/tut/tut_runner.hpp b/lib/tut-framework/include/tut/tut_runner.hpp new file mode 100644 index 00000000..3803046e --- /dev/null +++ b/lib/tut-framework/include/tut/tut_runner.hpp @@ -0,0 +1,388 @@ +#ifndef TUT_RUNNER_H_GUARD +#define TUT_RUNNER_H_GUARD + +#include +#include +#include +#include "tut_exception.hpp" + +namespace tut +{ + +/** + * Interface. + * Test group operations. + */ +struct group_base +{ + virtual ~group_base() + { + } + + // execute tests iteratively + virtual void rewind() = 0; + virtual bool run_next(test_result &) = 0; + + // execute one test + virtual bool run_test(int n, test_result &tr) = 0; +}; + + +/** + * Test runner callback interface. + * Can be implemented by caller to update + * tests results in real-time. User can implement + * any of callback methods, and leave unused + * in default implementation. + */ +struct callback +{ + /** + * Default constructor. + */ + callback() + { + } + + /** + * Virtual destructor is a must for subclassed types. + */ + virtual ~callback() + { + } + + /** + * Called when new test run started. + */ + virtual void run_started() + { + } + + /** + * Called when a group started + * @param name Name of the group + */ + virtual void group_started(const std::string& name) + { + (void)name; + } + + /** + * Called when a test finished. + * @param tr Test results. + */ + virtual void test_completed(const test_result& tr) + { + (void)tr; + } + + /** + * Called when a group is completed + * @param name Name of the group + */ + virtual void group_completed(const std::string& name) + { + (void)name; + } + + /** + * Called when all tests in run completed. + */ + virtual void run_completed() + { + } + + virtual bool all_ok() const + { + return true; + } +private: + callback(const callback &); + void operator=(const callback&); +}; + +/** + * Typedef for runner::list_groups() + */ +typedef std::vector groupnames; +typedef std::set callbacks; + +/** + * Test runner. + */ +class test_runner +{ + +public: + + /** + * Constructor + */ + test_runner() + : groups_(), + callbacks_() + { + } + + /** + * Stores another group for getting by name. + * @param name new group object + * @param gr new callback object + */ + void register_group(const std::string& name, group_base* gr) + { + if (gr == 0) + { + throw tut_error("group shall be non-null"); + } + + if (groups_.find(name) != groups_.end()) + { + std::string msg("attempt to add already existent group " + name); + throw tut_error(msg); + } + + groups_.insert( std::make_pair(name, gr) ); + } + + /** + * Stores one callback object. + * @param cb new callback object + */ + void set_callback(callback *cb) + { + clear_callbacks(); + insert_callback(cb); + } + + /** + * Add callback object. + * @param cb new callback object + */ + void insert_callback(callback* cb) + { + if(cb != NULL) + { + callbacks_.insert(cb); + } + } + + /** + * Remove callback object. + * @param cb callback to remove + */ + void erase_callback(callback* cb) + { + callbacks_.erase(cb); + } + + /** + * Remove all callback objects. + */ + void clear_callbacks() + { + callbacks_.clear(); + } + + /** + * Returns callback list. + * @return callback list + */ + const callbacks &get_callbacks() const + { + return callbacks_; + } + + /** + * Set callback list. + * @param cb new callback list + */ + void set_callbacks(const callbacks &cb) + { + callbacks_ = cb; + } + + /** + * Returns list of known test groups. + * @return groups list + */ + const groupnames list_groups() const + { + groupnames ret; + for(const_iterator i = groups_.begin(); i != groups_.end(); ++i) + { + ret.push_back(i->first); + } + return ret; + } + + /** + * Runs all tests in all groups. + */ + void run_tests() const + { + cb_run_started_(); + + const_iterator i = groups_.begin(); + const_iterator e = groups_.end(); + while (i != e) + { + cb_group_started_(i->first); + run_all_tests_in_group_(i); + cb_group_completed_(i->first); + + ++i; + } + + cb_run_completed_(); + } + + /** + * Runs all tests in specified group. + * @param group_name group to test + */ + void run_tests(const std::string& group_name) const + { + cb_run_started_(); + + const_iterator i = groups_.find(group_name); + if (i == groups_.end()) + { + cb_run_completed_(); + throw no_such_group(group_name); + } + + cb_group_started_(group_name); + run_all_tests_in_group_(i); + cb_group_completed_(group_name); + cb_run_completed_(); + } + + /** + * Runs one test in specified group. + * @param group_name group to test + * @param n run case in test + * @param tr result of this case + * @return true if test is ok, otherwise false + */ + bool run_test(const std::string& group_name, int n, test_result &tr) const + { + cb_run_started_(); + + const_iterator i = groups_.find(group_name); + if (i == groups_.end()) + { + cb_run_completed_(); + throw no_such_group(group_name); + } + + cb_group_started_(group_name); + + bool t = i->second->run_test(n, tr); + + if(t && tr.result != test_result::dummy) + { + cb_test_completed_(tr); + } + + cb_group_completed_(group_name); + cb_run_completed_(); + + return t; + } + +protected: + + typedef std::map groups; + typedef groups::iterator iterator; + typedef groups::const_iterator const_iterator; + groups groups_; + + callbacks callbacks_; + +private: + friend class restartable_wrapper; + + void cb_run_started_() const + { + for(callbacks::const_iterator i = callbacks_.begin(); i != callbacks_.end(); ++i) + { + (*i)->run_started(); + } + } + + void cb_run_completed_() const + { + for(callbacks::const_iterator i = callbacks_.begin(); i != callbacks_.end(); ++i) + { + (*i)->run_completed(); + } + } + + void cb_group_started_(const std::string &group_name) const + { + for(callbacks::const_iterator i = callbacks_.begin(); i != callbacks_.end(); ++i) + { + (*i)->group_started(group_name); + } + } + + void cb_group_completed_(const std::string &group_name) const + { + for(callbacks::const_iterator i = callbacks_.begin(); i != callbacks_.end(); ++i) + { + (*i)->group_completed(group_name); + } + } + + void cb_test_completed_(const test_result &tr) const + { + for(callbacks::const_iterator i = callbacks_.begin(); i != callbacks_.end(); ++i) + { + (*i)->test_completed(tr); + } + } + + void run_all_tests_in_group_(const_iterator i) const + { + i->second->rewind(); + + test_result tr; + while(i->second->run_next(tr)) + { + if(tr.result != test_result::dummy) + { + cb_test_completed_(tr); + } + + if (tr.result == test_result::ex_ctor) + { + // test object ctor failed, skip whole group + break; + } + } + } +}; + +/** + * Singleton for test_runner implementation. + * Instance with name runner_singleton shall be implemented + * by user. + */ +class test_runner_singleton +{ +public: + + static test_runner& get() + { + static test_runner tr; + return tr; + } +}; + +extern test_runner_singleton runner; + +} + +#endif // TUT_RUNNER_H_GUARD + diff --git a/lib/tut-framework/include/tut/tut_xml_reporter.hpp b/lib/tut-framework/include/tut/tut_xml_reporter.hpp new file mode 100644 index 00000000..d0c301dd --- /dev/null +++ b/lib/tut-framework/include/tut/tut_xml_reporter.hpp @@ -0,0 +1,305 @@ +#ifndef TUT_XML_REPORTER +#define TUT_XML_REPORTER +#include +#include +#include +#include +#include +#include +#include +#include + +namespace tut +{ + +/** + * \brief JUnit XML TUT reporter + * @author Lukasz Maszczynski, NSN + * @date 11/07/2008 + */ +class xml_reporter : public tut::callback +{ + typedef std::vector TestResults; + typedef std::map TestGroups; + + TestGroups all_tests_; /// holds all test results + const std::string filename_; /// filename base + std::auto_ptr stream_; + + /** + * \brief Builds "testcase" XML entity with given parameters + * Builds \ entity according to given parameters. \-s are part of \. + * @param tr test result to be used as source data + * @param failure_type type of failure to be reported ("Assertion" or "Error", empty if test passed) + * @param failure_msg failure message to be reported (empty, if test passed) + * @return string with \ entity + */ + std::string xml_build_testcase(const tut::test_result & tr, const std::string & failure_type, + const std::string & failure_msg, int pid = 0) + { + using std::endl; + using std::string; + + std::ostringstream out; + + if ( (tr.result == test_result::ok) || + (tr.result == test_result::skipped) ) + { + out << " "; + } + else + { + string err_msg = cppunit_reporter::encode(failure_msg + tr.message); + + string tag; // determines tag name: "failure" or "error" + if ( tr.result == test_result::fail || tr.result == test_result::warn || + tr.result == test_result::ex || tr.result == test_result::ex_ctor || tr.result == test_result::rethrown ) + { + tag = "failure"; + } + else + { + tag = "error"; + } + + out << " " << endl; + out << " <" << tag << " message=\"" << err_msg << "\"" << " type=\"" << failure_type << "\""; +#if defined(TUT_USE_POSIX) + if(pid != getpid()) + { + out << " child=\"" << pid << "\""; + } +#else + (void)pid; +#endif + out << ">" << err_msg << "" << endl; + out << " "; + } + + return out.str(); + } + + /** + * \brief Builds "testsuite" XML entity + * Builds \ XML entity according to given parameters. + * @param errors number of errors to be reported + * @param failures number of failures to be reported + * @param total total number of tests to be reported + * @param name test suite name + * @param testcases cppunit_reporter::encoded XML string containing testcases + * @return string with \ entity + */ + std::string xml_build_testsuite(int errors, int failures, int total, + const std::string & name, const std::string & testcases) + { + std::ostringstream out; + + out << " " << std::endl; + out << testcases; + out << " "; + + return out.str(); + } + +public: + int ok_count; /// number of passed tests + int exceptions_count; /// number of tests that threw exceptions + int failures_count; /// number of tests that failed + int terminations_count; /// number of tests that would terminate + int warnings_count; /// number of tests where destructors threw an exception + + /** + * \brief Default constructor + * @param filename base filename + */ + xml_reporter(const std::string & filename) + : all_tests_(), + filename_(filename), + stream_(new std::ofstream(filename_.c_str())), + ok_count(0), + exceptions_count(0), + failures_count(0), + terminations_count(0), + warnings_count(0) + { + if (!stream_->good()) { + throw tut_error("Cannot open output file `" + filename_ + "`"); + } + } + + xml_reporter(std::ostream & stream) + : all_tests_(), + filename_(), + stream_(&stream), + ok_count(0), + exceptions_count(0), + failures_count(0), + terminations_count(0), + warnings_count(0) + { + } + + ~xml_reporter() + { + if(filename_.empty()) + { + stream_.release(); + } + } + + /** + * \brief Callback function + * This function is called before the first test is executed. It initializes counters. + */ + virtual void run_started() + { + ok_count = 0; + exceptions_count = 0; + failures_count = 0; + terminations_count = 0; + warnings_count = 0; + all_tests_.clear(); + } + + /** + * \brief Callback function + * This function is called when test completes. Counters are updated here, and test results stored. + */ + virtual void test_completed(const tut::test_result& tr) + { + // update global statistics + switch (tr.result) { + case test_result::ok: + case test_result::skipped: + ok_count++; + break; + case test_result::fail: + case test_result::rethrown: + failures_count++; + break; + case test_result::ex: + case test_result::ex_ctor: + exceptions_count++; + break; + case test_result::warn: + warnings_count++; + break; + case test_result::term: + terminations_count++; + break; + case tut::test_result::dummy: + assert(!"Should never be called"); + } // switch + + // add test result to results table + all_tests_[tr.group].push_back(tr); + } + + /** + * \brief Callback function + * This function is called when all tests are completed. It generates XML output + * to file(s). File name base can be set with constructor. + */ + virtual void run_completed() + { + /* *********************** header ***************************** */ + *stream_ << "" << std::endl; + *stream_ << "" << std::endl; + + // iterate over all test groups + for (TestGroups::const_iterator tgi = all_tests_.begin(); tgi != all_tests_.end(); ++tgi) + { + /* per-group statistics */ + int passed = 0; // passed in single group + int exceptions = 0; // exceptions in single group + int failures = 0; // failures in single group + int terminations = 0; // terminations in single group + int warnings = 0; // warnings in single group + int errors = 0; // errors in single group + + + // output is written to string stream buffer, because JUnit format tag + // contains statistics, which aren't known yet + std::ostringstream out; + + // iterate over all test cases in the current test group + const TestResults &results = tgi->second; + for (TestResults::const_iterator tri = results.begin(); tri != results.end(); ++tri) + { + std::string failure_type; // string describing the failure type + std::string failure_msg; // a string with failure message + + switch (tri->result) + { + case test_result::ok: + case test_result::skipped: + passed++; + break; + case test_result::fail: + failure_type = "Assertion"; + failure_msg = ""; + failures++; + break; + case test_result::ex: + failure_type = "Assertion"; + failure_msg = "Thrown exception: " + tri->exception_typeid + '\n'; + exceptions++; + break; + case test_result::warn: + failure_type = "Assertion"; + failure_msg = "Destructor failed.\n"; + warnings++; + break; + case test_result::term: + failure_type = "Error"; + failure_msg = "Test application terminated abnormally.\n"; + terminations++; + break; + case test_result::ex_ctor: + failure_type = "Assertion"; + failure_msg = "Constructor has thrown an exception: " + tri->exception_typeid + ".\n"; + exceptions++; + break; + case test_result::rethrown: + failure_type = "Assertion"; + failure_msg = "Child failed.\n"; + failures++; + break; + default: + failure_type = "Error"; + failure_msg = "Unknown test status, this should have never happened. " + "You may just have found a bug in TUT, please report it immediately.\n"; + errors++; + break; + } // switch + +#if defined(TUT_USE_POSIX) + out << xml_build_testcase(*tri, failure_type, failure_msg, tri->pid) << std::endl; +#else + out << xml_build_testcase(*tri, failure_type, failure_msg) << std::endl; +#endif + } // iterate over all test cases + + // calculate per-group statistics + int stat_errors = terminations + errors; + int stat_failures = failures + warnings + exceptions; + int stat_all = stat_errors + stat_failures + passed; + + *stream_ << xml_build_testsuite(stat_errors, stat_failures, stat_all, (*tgi).first/* name */, out.str()/* testcases */) << std::endl; + } // iterate over all test groups + + *stream_ << "" << std::endl; + } + + /** + * \brief Returns true, if all tests passed + */ + virtual bool all_ok() const + { + return ( (terminations_count + failures_count + warnings_count + exceptions_count) == 0); + }; +}; + +} + +#endif diff --git a/lib/tut-framework/include/tut_reporter.h b/lib/tut-framework/include/tut_reporter.h new file mode 100644 index 00000000..ed11aec3 --- /dev/null +++ b/lib/tut-framework/include/tut_reporter.h @@ -0,0 +1,5 @@ +#warning This header is deprecated and will be removed in next versions. Please #include instead +#include +#include +#include +#include diff --git a/lib/tut-framework/include/tut_restartable.h b/lib/tut-framework/include/tut_restartable.h new file mode 100644 index 00000000..47e087d8 --- /dev/null +++ b/lib/tut-framework/include/tut_restartable.h @@ -0,0 +1,2 @@ +#warning This header is deprecated and will be removed in next versions. Please #include instead +#include diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 7999b170..ba1c64ce 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -2,17 +2,12 @@ // #include "stdafx.h" -#include "../../vld.h" +#include "vld.h" #include "Allocs.h" -void PrintUsage() -{ - wprintf(_T("Usage:\n")); - wprintf(_T("\ttest_basics \n")); - wprintf(_T("\t - The type of memory allocation to test with. This can be one of the following:\n")); - wprintf(_T("\t [malloc,new,new_array,calloc,realloc]\n")); - wprintf(_T("\t - The number of times to repeat each unique memory leak.\n\n")); -} +#include +#include +#include void LeakMemory(LeakOption type, int repeat, bool bFree) { @@ -31,8 +26,159 @@ extern "C" { #define VLDGetLeaksCount() 0 #endif +namespace tut +{ + struct test + { + virtual ~test() + { + } + }; + + typedef test_group tg; + typedef tg::object object; + tg basic_group("basic"); + + static const int repeat = 10; + + template<> + template<> + void object::test<1>() + { + set_test_name("Malloc"); + int prev = (int)VLDGetLeaksCount(false); + LeakMemory(eMalloc,repeat,false); + int leaks = (int)VLDGetLeaksCount(false) - prev; + ensure("leaks", leaks == (repeat * 2)); + } + + template<> + template<> + void object::test<2>() + { + set_test_name("New"); + int prev = (int)VLDGetLeaksCount(false); + LeakMemory(eNew,repeat,false); + int leaks = (int)VLDGetLeaksCount(false) - prev; + ensure("leaks", leaks == (repeat * 2)); + } + + template<> + template<> + void object::test<3>() + { + set_test_name("NewArray"); + int prev = (int)VLDGetLeaksCount(false); + LeakMemory(eNewArray,repeat,false); + int leaks = (int)VLDGetLeaksCount(false) - prev; + ensure("leaks", leaks == (repeat * 2)); + } + + template<> + template<> + void object::test<4>() + { + set_test_name("Calloc"); + int prev = (int)VLDGetLeaksCount(false); + LeakMemory(eCalloc,repeat,false); + int leaks = (int)VLDGetLeaksCount(false) - prev; + ensure("leaks", leaks == (repeat * 2)); + } + + template<> + template<> + void object::test<5>() + { + set_test_name("Realloc"); + int prev = (int)VLDGetLeaksCount(false); + LeakMemory(eRealloc,repeat,false); + int leaks = (int)VLDGetLeaksCount(false) - prev; + ensure("leaks", leaks == (repeat * 2)); + } + + template<> + template<> + void object::test<6>() + { + set_test_name("CoTaskMem"); + int prev = (int)VLDGetLeaksCount(false); + LeakMemory(eCoTaskMem,repeat,false); + int leaks = (int)VLDGetLeaksCount(false) - prev; + ensure("leaks", leaks == (repeat * 1)); + } + + template<> + template<> + void object::test<7>() + { + set_test_name("AlignedMalloc"); + int prev = (int)VLDGetLeaksCount(false); + LeakMemory(eAlignedMalloc,repeat,false); + int leaks = (int)VLDGetLeaksCount(false) - prev; + ensure("leaks", leaks == (repeat * 3)); + } + + template<> + template<> + void object::test<8>() + { + set_test_name("AlignedRealloc"); + int prev = (int)VLDGetLeaksCount(false); + LeakMemory(eAlignedRealloc,repeat,false); + int leaks = (int)VLDGetLeaksCount(false) - prev; + ensure("leaks", leaks == (repeat * 3)); + } + + test_runner_singleton runner; +} + +int RunAllTest() +{ + using namespace std; + tut::console_reporter reporter(std::cout); + tut::runner.get().set_callback(&reporter); + + try + { + tut::runner.get().run_tests(); + if(reporter.all_ok()) + { + return 0; + } + else + { + std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; + } + } + catch(const tut::no_such_group &ex) + { + std::cerr << "No such group: " << ex.what() << std::endl; + } + catch(const tut::no_such_test &ex) + { + std::cerr << "No such test: " << ex.what() << std::endl; + } + catch(const tut::tut_error &ex) + { + std::cout << "General error: " << ex.what() << std::endl; + } + return 1; +} + +void PrintUsage() +{ + wprintf(_T("Usage:\n")); + wprintf(_T("\ttest_basics \n")); + wprintf(_T("\t - The type of memory allocation to test with. This can be one of the following:\n")); + wprintf(_T("\t [malloc,new,new_array,calloc,realloc]\n")); + wprintf(_T("\t - The number of times to repeat each unique memory leak.\n\n")); +} + int _tmain(int argc, _TCHAR* argv[]) { + if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) + return RunAllTest(); + wprintf(_T("======================================\n")); wprintf(_T("==\n")); wprintf(_T("== VLD Tests: basics\n")); diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index bc805132..38503b15 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -126,6 +126,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -139,7 +140,9 @@ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +"$(TargetPath)" test + Copying over Visual Leak Detector Dependencies @@ -149,6 +152,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -161,7 +165,8 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +"$(TargetPath)" test Copying over Visual Leak Detector Dependencies @@ -172,6 +177,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -186,6 +192,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + Copying over Visual Leak Detector Dependencies @@ -195,6 +202,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -219,6 +227,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -231,7 +240,9 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +"$(TargetPath)" test + Copying over Visual Leak Detector Dependencies @@ -242,6 +253,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -255,6 +267,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + Copying over Visual Leak Detector Dependencies diff --git a/tests/corruption/corruption.vcxproj b/tests/corruption/corruption.vcxproj index d397241b..7a05c7f4 100644 --- a/tests/corruption/corruption.vcxproj +++ b/tests/corruption/corruption.vcxproj @@ -89,6 +89,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -109,6 +110,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -130,6 +132,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -153,6 +156,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index d0e5ff92..79592e6f 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -6,94 +6,201 @@ #include "LoadTests.h" #include "ThreadTests.h" -void PrintUsage() -{ - wprintf(_T("Usage:\n")); - wprintf(_T("\tdynamic [resolve:[true|false]]\n")); - wprintf(_T("\t - [OPTIONAL] Resolves callstacks before unloading the dynamic DLL.\n")); -} +#include +#include +#include // Leaks 6 memory allocations void LeakDuplicateLeaks() { - // For testing aggregation - for (int i = 0; i < 3; ++i) - { - int* tmp = new int(0x63); - tmp; - } - for (int i = 0; i < 3; ++i) - { - int* tmp = new int(0x63); - tmp; - } - // Should report 6 memory leaks + // For testing aggregation + for (int i = 0; i < 3; ++i) + { + int* tmp = new int(0x63); + tmp; + } + for (int i = 0; i < 3; ++i) + { + int* tmp = new int(0x63); + tmp; + } + // Should report 6 memory leaks } // VLD internal API #if defined(_DEBUG) || defined(VLD_FORCE_ENABLE) extern "C" { - __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); + __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); } #else #define VLDGetLeaksCount() 0 #endif +namespace tut +{ + struct test + { + virtual ~test() + { + } + }; + + typedef test_group tg; + typedef tg::object object; + tg dynamic_group("dynamic"); + + static const bool resolve = false; + + template<> + template<> + void object::test<1>() + { + set_test_name("LoaderTests"); + int prevleaks = (int)VLDGetLeaksCount(); + RunLoaderTests(resolve); // leaks 18 + int totalleaks = (int)VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ensure("leaks", leaks == 18); + } + + template<> + template<> + void object::test<2>() + { + set_test_name("MFCLoaderTests"); + int prevleaks = (int)VLDGetLeaksCount(); + RunMFCLoaderTests(resolve); // leaks 7 + int totalleaks = (int)VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ensure("leaks", leaks == 7); + } + + template<> + template<> + void object::test<3>() + { + set_test_name("DuplicateLeaks"); + int prevleaks = (int)VLDGetLeaksCount(); + LeakDuplicateLeaks(); // leaks 6 + int totalleaks = (int)VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ensure("leaks", leaks == 6); + } + + template<> + template<> + void object::test<4>() + { + // Creates 64 threads that each leaks 7 allocations. This equals 448 + set_test_name("thread"); + int prevleaks = (int)VLDGetLeaksCount(); + RunLoaderLockTests(resolve); + int totalleaks = (int)VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ensure("leaks", leaks == 448); + } + + test_runner_singleton runner; +} + +int RunAllTest() +{ + using namespace std; + tut::console_reporter reporter(std::cout); + tut::runner.get().set_callback(&reporter); + + try + { + tut::runner.get().run_tests(); + if(reporter.all_ok()) + { + return 0; + } + else + { + std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; + } + } + catch(const tut::no_such_group &ex) + { + std::cerr << "No such group: " << ex.what() << std::endl; + } + catch(const tut::no_such_test &ex) + { + std::cerr << "No such test: " << ex.what() << std::endl; + } + catch(const tut::tut_error &ex) + { + std::cout << "General error: " << ex.what() << std::endl; + } + return 1; +} + +void PrintUsage() +{ + wprintf(_T("Usage:\n")); + wprintf(_T("\tdynamic [resolve:[true|false]]\n")); + wprintf(_T("\t - [OPTIONAL] Resolves callstacks before unloading the dynamic DLL.\n")); +} + int _tmain(int argc, _TCHAR* argv[]) { - wprintf(_T("======================================\n")); - wprintf(_T("==\n")); - wprintf(_T("== VLD Tests: Dynamic DLL Loading \n")); - wprintf(_T("==\n")); - wprintf(_T("======================================\n")); - - bool resolve = true; - bool doThreadTests = false; - if (argc == 2) - { - resolve = _tcsicmp(_T("true"), argv[1]) == 0; - } - else if (argc == 3) - { - resolve = _tcsicmp(_T("true"), argv[1]) == 0; - doThreadTests = _tcsicmp(_T("thread"), argv[2]) == 0; - } - - RunLoaderTests(resolve); // leaks 18 - int totalleaks = (int)VLDGetLeaksCount(); - int leaks1 = totalleaks; - int prevleaks = totalleaks; - assert(leaks1 == 18); + if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) + return RunAllTest(); + + wprintf(_T("======================================\n")); + wprintf(_T("==\n")); + wprintf(_T("== VLD Tests: Dynamic DLL Loading \n")); + wprintf(_T("==\n")); + wprintf(_T("======================================\n")); + + bool resolve = true; + bool doThreadTests = false; + if (argc == 2) + { + resolve = _tcsicmp(_T("true"), argv[1]) == 0; + } + else if (argc == 3) + { + resolve = _tcsicmp(_T("true"), argv[1]) == 0; + doThreadTests = _tcsicmp(_T("thread"), argv[2]) == 0; + } + + RunLoaderTests(resolve); // leaks 18 + int totalleaks = (int)VLDGetLeaksCount(); + int leaks1 = totalleaks; + int prevleaks = totalleaks; + assert(leaks1 == 18); - RunMFCLoaderTests(resolve); // leaks 7 - totalleaks = (int)VLDGetLeaksCount(); - int leaks2 = totalleaks - prevleaks; - prevleaks = totalleaks; - assert(leaks2 == 7); + RunMFCLoaderTests(resolve); // leaks 7 + totalleaks = (int)VLDGetLeaksCount(); + int leaks2 = totalleaks - prevleaks; + prevleaks = totalleaks; + assert(leaks2 == 7); - LeakDuplicateLeaks(); // leaks 6 - totalleaks = (int)VLDGetLeaksCount(); - int leaks3 = totalleaks - prevleaks; - prevleaks = totalleaks; - assert(leaks3 == 6); - - if (doThreadTests) - { - // Creates 64 threads that each leaks 7 allocations. This equals 448 - RunLoaderLockTests(resolve); - totalleaks = (int)VLDGetLeaksCount(); - int leaks4 = totalleaks - prevleaks; - assert(leaks4 == 448); - - // ..................Total: 479 leaks total - totalleaks = (int)VLDGetLeaksCount(); - int diff = 479 - totalleaks; - return diff; - } - - // ..................Total: 31 leaks total - totalleaks = (int)VLDGetLeaksCount(); - int diff = 31 - totalleaks; - return diff; + LeakDuplicateLeaks(); // leaks 6 + totalleaks = (int)VLDGetLeaksCount(); + int leaks3 = totalleaks - prevleaks; + prevleaks = totalleaks; + assert(leaks3 == 6); + + if (doThreadTests) + { + // Creates 64 threads that each leaks 7 allocations. This equals 448 + RunLoaderLockTests(resolve); + totalleaks = (int)VLDGetLeaksCount(); + int leaks4 = totalleaks - prevleaks; + assert(leaks4 == 448); + + // ..................Total: 479 leaks total + totalleaks = (int)VLDGetLeaksCount(); + int diff = 479 - totalleaks; + return diff; + } + + // ..................Total: 31 leaks total + totalleaks = (int)VLDGetLeaksCount(); + int diff = 31 - totalleaks; + return diff; } diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index 504d43c7..9805c208 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -91,6 +91,8 @@ $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ dynamic + + true @@ -130,6 +132,7 @@ Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -143,9 +146,14 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test Copying over Visual Leak Detector Dependencies + + + + @@ -154,6 +162,7 @@ copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir) Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -167,7 +176,8 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test Copying over Visual Leak Detector Dependencies @@ -178,6 +188,7 @@ copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir) Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -202,6 +213,7 @@ copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir) Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -227,6 +239,7 @@ copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir) true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console @@ -242,7 +255,8 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test Copying over Visual Leak Detector Dependencies @@ -253,6 +267,7 @@ copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir) true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) Console diff --git a/tests/mfc/vldmfc.vcxproj b/tests/mfc/vldmfc.vcxproj index a190d94a..d89df987 100644 --- a/tests/mfc/vldmfc.vcxproj +++ b/tests/mfc/vldmfc.vcxproj @@ -103,7 +103,7 @@ MaxSpeed OnlyExplicitInline - ..\..\;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -150,7 +150,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ MaxSpeed OnlyExplicitInline - ..\..\;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -196,7 +196,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Disabled - ..\..\;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -245,7 +245,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Disabled - ..\..\;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 82197072..59de5837 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -34,6 +34,11 @@ #include +#include +#include +#include + + enum action_e { a_calloc, a_comalloc, @@ -367,19 +372,9 @@ DWORD __stdcall threadproc_test (LPVOID param) return 0; } -int main (int argc, char *argv []) +void RunTestSuite() { - _tprintf(_T("======================================\n")); - _tprintf(_T("==\n")); - _tprintf(_T("== VLD Tests: thread suite\n")); - _tprintf(_T("==\n")); - _tprintf(_T("======================================\n")); - threadcontext_t contexts [NUMTHREADS]; - //VLDDisable(); - - DWORD start = GetTickCount(); - srand(start); // Select a random thread to be the leaker. UINT leakythread = random(NUMTHREADS - 1); @@ -395,7 +390,7 @@ int main (int argc, char *argv []) HANDLE hthread = CreateThread(NULL, 0, threadproc_test, &contexts[index], 0, &contexts[index].threadid); threads[index] = hthread; } - + // Wait for all threads to terminate. BOOL wait_for_all = TRUE; DWORD result = WaitForMultipleObjects(NUMTHREADS, threads, wait_for_all, INFINITE); @@ -423,7 +418,7 @@ int main (int argc, char *argv []) lpMsgBuf, MAX_PATH, NULL ); - + _tprintf(_T("%s"), lpMsgBuf); } @@ -432,6 +427,86 @@ int main (int argc, char *argv []) _tprintf(_T("Some other return value\n")); break; } +} + +namespace tut +{ + struct test + { + virtual ~test() + { + } + }; + + typedef test_group tg; + typedef tg::object object; + tg dynamic_group("TestSuite"); + + static const bool resolve = false; + + template<> + template<> + void object::test<1>() + { + set_test_name("MultiThread"); + int prevleaks = (int)VLDGetLeaksCount(); + RunTestSuite(); + int leaks = (int)VLDGetLeaksCount() - prevleaks; + ensure("leaks", leaks == leaks_count); + } + + test_runner_singleton runner; +} + +int RunAllTest() +{ + using namespace std; + tut::console_reporter reporter(std::cout); + tut::runner.get().set_callback(&reporter); + + try + { + tut::runner.get().run_tests(); + if(reporter.all_ok()) + { + return 0; + } + else + { + std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; + } + } + catch(const tut::no_such_group &ex) + { + std::cerr << "No such group: " << ex.what() << std::endl; + } + catch(const tut::no_such_test &ex) + { + std::cerr << "No such test: " << ex.what() << std::endl; + } + catch(const tut::tut_error &ex) + { + std::cout << "General error: " << ex.what() << std::endl; + } + return 1; +} + +int main (int argc, char *argv []) +{ + if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) + return RunAllTest(); + + _tprintf(_T("======================================\n")); + _tprintf(_T("==\n")); + _tprintf(_T("== VLD Tests: thread suite\n")); + _tprintf(_T("==\n")); + _tprintf(_T("======================================\n")); + + + DWORD start = GetTickCount(); + srand(start); + + RunTestSuite(); DWORD end = GetTickCount(); static const int MESSAGESIZE = 512; diff --git a/tests/suite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj index daeb095d..82aa0e57 100644 --- a/tests/suite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -117,7 +117,7 @@ Disabled - $(SolutionDir);%(AdditionalIncludeDirectories) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -134,13 +134,15 @@ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +"$(TargetPath)" test + Copying over Visual Leak Detector Dependencies Full - $(SolutionDir);%(AdditionalIncludeDirectories) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -156,7 +158,9 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +"$(TargetPath)" test + Copying over Visual Leak Detector Dependencies @@ -179,7 +183,9 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y +"$(TargetPath)" test + Copying over Visual Leak Detector Dependencies @@ -188,7 +194,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ Disabled - $(SolutionDir);%(AdditionalIncludeDirectories) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) WIN64;%(PreprocessorDefinitions) true EnableFastChecks @@ -208,6 +214,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + Copying over Visual Leak Detector Dependencies @@ -216,7 +223,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Full - $(SolutionDir);%(AdditionalIncludeDirectories) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -234,6 +241,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + Copying over Visual Leak Detector Dependencies @@ -262,6 +270,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.pdb $(Outdir)\vld_x64.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + Copying over Visual Leak Detector Dependencies From 18549282572680e8f3a4a3d3a3b5407524f1e3ac Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 11 Jun 2011 23:13:18 +0000 Subject: [PATCH 103/321] TestSuite project fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67762 --- tests/suite/testsuite.vcxproj | 13 +++++-------- vld.cpp | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/suite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj index 82aa0e57..e74170f7 100644 --- a/tests/suite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -134,8 +134,7 @@ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y -"$(TargetPath)" test +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y Copying over Visual Leak Detector Dependencies @@ -158,15 +157,14 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y -"$(TargetPath)" test +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y Copying over Visual Leak Detector Dependencies Disabled - $(SolutionDir);%(AdditionalIncludeDirectories) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -183,8 +181,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y -"$(TargetPath)" test +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y Copying over Visual Leak Detector Dependencies @@ -250,7 +247,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Disabled - $(SolutionDir);%(AdditionalIncludeDirectories) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) WIN64;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/vld.cpp b/vld.cpp index efe7d586..1fc1df05 100644 --- a/vld.cpp +++ b/vld.cpp @@ -2008,9 +2008,9 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, vld.m_vldbase = (HMODULE)modulebase; } else { - // Convert the module path to ASCII. - length = ::WideCharToMultiByte(CP_ACP, 0, modulename, -1, 0, 0, 0, 0); - LPSTR modulenamea = new CHAR [length]; + // Convert the module path to ASCII. + length = ::WideCharToMultiByte(CP_ACP, 0, modulename, -1, 0, 0, 0, 0); + LPSTR modulenamea = new CHAR [length]; // wcstombs_s requires locale to be already set up correctly, but it might not be correct on vld init step. So use WideCharToMultiByte instead CHAR defaultChar = '?'; From d34c56a67b7fbbc6824744e89870d87fef82ccfd Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 12 Jun 2011 23:52:29 +0000 Subject: [PATCH 104/321] Callstack hash fixed with ASLR Undecorating symbols changed VLDGetLeaksCount now API function Memory leaks additional statistic added git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67800 --- callstack.cpp | 27 +++-------- callstack.h | 1 + tests/basics/basics.cpp | 46 ++++++++----------- tests/dynamic_app/dynamic_app.cpp | 20 +++------ tests/suite/testsuite.cpp | 9 ---- vld.cpp | 75 ++++++++++++++++++++++--------- vld.h | 9 ++++ vldapi.cpp | 4 +- vldint.h | 12 +++-- 9 files changed, 107 insertions(+), 96 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 3817a38a..90401912 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -51,6 +51,7 @@ CallStack::CallStack () m_Resolved = NULL; m_ResolvedCapacity = 0; m_ResolvedLength = 0; + m_hashcode = 0xD202EF8D; } // Destructor - Frees all memory allocated to the CallStack. @@ -218,7 +219,6 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const const UINT32 symbolBufSize = sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1; BYTE symbolbuffer [symbolBufSize] = { 0 }; - WCHAR undecoratedname [MAXSYMBOLNAMELENGTH]; WCHAR callingmodulename [MAX_PATH]; const size_t max_size = MAXREPORTLENGTH + 1; @@ -252,11 +252,7 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const DWORD64 displacement64 = 0; LPWSTR functionname; if (SymFromAddrW(g_currentprocess, programcounter, &displacement64, functioninfo)) { - // Undecorate function name. - if (UnDecorateSymbolName(functioninfo->Name, undecoratedname, MAXSYMBOLNAMELENGTH, UNDNAME_NAME_ONLY) > 0) - functionname = undecoratedname; - else - functionname = functioninfo->Name; + functionname = functioninfo->Name; } else { // GetFormattedMessage( GetLastError() ); @@ -345,7 +341,6 @@ void CallStack::Resolve(BOOL showinternalframes) const UINT32 symbolBufSize = sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1; BYTE symbolbuffer [symbolBufSize] = { 0 }; - WCHAR undecoratedname [MAXSYMBOLNAMELENGTH] = L""; WCHAR callingmodulename [MAX_PATH] = L""; const size_t max_line_length = MAXREPORTLENGTH + 1; @@ -389,11 +384,7 @@ void CallStack::Resolve(BOOL showinternalframes) DWORD64 displacement64 = 0; LPWSTR functionname; if (SymFromAddrW(g_currentprocess, programcounter, &displacement64, functioninfo)) { - // Undecorate function name. - if (UnDecorateSymbolName(functioninfo->Name, undecoratedname, MAXSYMBOLNAMELENGTH, UNDNAME_NAME_ONLY) > 0) - functionname = undecoratedname; - else - functionname = functioninfo->Name; + functionname = functioninfo->Name; } else { // GetFormattedMessage( GetLastError() ); @@ -473,14 +464,7 @@ void CallStack::DumpResolved() const // DWORD CallStack::getHashValue () const { - DWORD hashcode = 0xD202EF8D; - - // Iterate through each frame in the call stack. - for (UINT32 frame = 0; frame < m_size; frame++) { - UINT_PTR programcounter = (*this)[frame]; - hashcode = CalculateCRC32(programcounter, hashcode); - } - return hashcode; + return m_hashcode; } // push_back - Pushes a frame's program counter onto the CallStack. Pushes are @@ -516,6 +500,9 @@ VOID CallStack::push_back (const UINT_PTR programcounter) m_topindex = 0; } + UINT_PTR BaseAddress = (UINT_PTR)GetCallingModule(programcounter); + m_hashcode = CalculateCRC32(programcounter - BaseAddress, m_hashcode); + m_topchunk->frames[m_topindex++] = programcounter; m_size++; } diff --git a/callstack.h b/callstack.h index 73eba3b4..172888d3 100644 --- a/callstack.h +++ b/callstack.h @@ -116,6 +116,7 @@ class CallStack CallStack::chunk_t m_store; // Pointer to the underlying data store (i.e. head of the chunk list) CallStack::chunk_t* m_topchunk; // Pointer to the chunk at the top of the stack UINT32 m_topindex; // Index, within the top chunk, of the top of the stack + UINT32 m_hashcode; // Callstack hash code // The string that contains the stack converted into a human readable format. // This is always NULL if the callstack has not been 'converted'. diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index ba1c64ce..a4109767 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -17,15 +17,6 @@ void LeakMemory(LeakOption type, int repeat, bool bFree) } } -// VLD internal API -#if defined(_DEBUG) || defined(VLD_FORCE_ENABLE) -extern "C" { - __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); -} -#else -#define VLDGetLeaksCount() 0 -#endif - namespace tut { struct test @@ -46,9 +37,9 @@ namespace tut void object::test<1>() { set_test_name("Malloc"); - int prev = (int)VLDGetLeaksCount(false); + int prev = (int)VLDGetLeaksCount(); LeakMemory(eMalloc,repeat,false); - int leaks = (int)VLDGetLeaksCount(false) - prev; + int leaks = (int)VLDGetLeaksCount() - prev; ensure("leaks", leaks == (repeat * 2)); } @@ -57,9 +48,9 @@ namespace tut void object::test<2>() { set_test_name("New"); - int prev = (int)VLDGetLeaksCount(false); + int prev = (int)VLDGetLeaksCount(); LeakMemory(eNew,repeat,false); - int leaks = (int)VLDGetLeaksCount(false) - prev; + int leaks = (int)VLDGetLeaksCount() - prev; ensure("leaks", leaks == (repeat * 2)); } @@ -68,9 +59,9 @@ namespace tut void object::test<3>() { set_test_name("NewArray"); - int prev = (int)VLDGetLeaksCount(false); + int prev = (int)VLDGetLeaksCount(); LeakMemory(eNewArray,repeat,false); - int leaks = (int)VLDGetLeaksCount(false) - prev; + int leaks = (int)VLDGetLeaksCount() - prev; ensure("leaks", leaks == (repeat * 2)); } @@ -79,9 +70,9 @@ namespace tut void object::test<4>() { set_test_name("Calloc"); - int prev = (int)VLDGetLeaksCount(false); + int prev = (int)VLDGetLeaksCount(); LeakMemory(eCalloc,repeat,false); - int leaks = (int)VLDGetLeaksCount(false) - prev; + int leaks = (int)VLDGetLeaksCount() - prev; ensure("leaks", leaks == (repeat * 2)); } @@ -90,9 +81,9 @@ namespace tut void object::test<5>() { set_test_name("Realloc"); - int prev = (int)VLDGetLeaksCount(false); + int prev = (int)VLDGetLeaksCount(); LeakMemory(eRealloc,repeat,false); - int leaks = (int)VLDGetLeaksCount(false) - prev; + int leaks = (int)VLDGetLeaksCount() - prev; ensure("leaks", leaks == (repeat * 2)); } @@ -101,9 +92,9 @@ namespace tut void object::test<6>() { set_test_name("CoTaskMem"); - int prev = (int)VLDGetLeaksCount(false); + int prev = (int)VLDGetLeaksCount(); LeakMemory(eCoTaskMem,repeat,false); - int leaks = (int)VLDGetLeaksCount(false) - prev; + int leaks = (int)VLDGetLeaksCount() - prev; ensure("leaks", leaks == (repeat * 1)); } @@ -112,9 +103,9 @@ namespace tut void object::test<7>() { set_test_name("AlignedMalloc"); - int prev = (int)VLDGetLeaksCount(false); + int prev = (int)VLDGetLeaksCount(); LeakMemory(eAlignedMalloc,repeat,false); - int leaks = (int)VLDGetLeaksCount(false) - prev; + int leaks = (int)VLDGetLeaksCount() - prev; ensure("leaks", leaks == (repeat * 3)); } @@ -123,9 +114,9 @@ namespace tut void object::test<8>() { set_test_name("AlignedRealloc"); - int prev = (int)VLDGetLeaksCount(false); + int prev = (int)VLDGetLeaksCount(); LeakMemory(eAlignedRealloc,repeat,false); - int leaks = (int)VLDGetLeaksCount(false) - prev; + int leaks = (int)VLDGetLeaksCount() - prev; ensure("leaks", leaks == (repeat * 3)); } @@ -175,7 +166,7 @@ void PrintUsage() } int _tmain(int argc, _TCHAR* argv[]) -{ +{ if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) return RunAllTest(); @@ -245,6 +236,7 @@ int _tmain(int argc, _TCHAR* argv[]) wprintf(_T("Options: %s \nNumber of Leaks: %s\n"), argv[1], argv[2]); // Convert the string into it's integer equivalent + int prevleaks = (int)VLDGetLeaksCount(); int repeat = _tstoi(argv[2]); if (!checkAll) LeakMemory(leak_type,repeat,bFree); @@ -253,7 +245,7 @@ int _tmain(int argc, _TCHAR* argv[]) for (int leak_type = 0; leak_type < eCount; leak_type++) LeakMemory((LeakOption)leak_type,repeat,bFree); } - int leaks = (int)VLDGetLeaksCount(false); + int leaks = (int)VLDGetLeaksCount() - prevleaks; wprintf(_T("End of test app...\n\n")); int diff = repeat * multiplayer - leaks; return bFree ? leaks : diff; diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 79592e6f..4040eb89 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -5,6 +5,7 @@ #include #include "LoadTests.h" #include "ThreadTests.h" +#include "vld.h" #include #include @@ -27,15 +28,6 @@ void LeakDuplicateLeaks() // Should report 6 memory leaks } -// VLD internal API -#if defined(_DEBUG) || defined(VLD_FORCE_ENABLE) -extern "C" { - __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); -} -#else -#define VLDGetLeaksCount() 0 -#endif - namespace tut { struct test @@ -166,10 +158,12 @@ int _tmain(int argc, _TCHAR* argv[]) doThreadTests = _tcsicmp(_T("thread"), argv[2]) == 0; } + int tutleaks = (int)VLDGetLeaksCount(); + int prevleaks = tutleaks; RunLoaderTests(resolve); // leaks 18 int totalleaks = (int)VLDGetLeaksCount(); - int leaks1 = totalleaks; - int prevleaks = totalleaks; + int leaks1 = totalleaks - prevleaks; + prevleaks = totalleaks; assert(leaks1 == 18); RunMFCLoaderTests(resolve); // leaks 7 @@ -193,13 +187,13 @@ int _tmain(int argc, _TCHAR* argv[]) assert(leaks4 == 448); // ..................Total: 479 leaks total - totalleaks = (int)VLDGetLeaksCount(); + totalleaks = (int)VLDGetLeaksCount() - tutleaks; int diff = 479 - totalleaks; return diff; } // ..................Total: 31 leaks total - totalleaks = (int)VLDGetLeaksCount(); + totalleaks = (int)VLDGetLeaksCount() - tutleaks; int diff = 31 - totalleaks; return diff; } diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 59de5837..78958ae8 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -107,15 +107,6 @@ __declspec(thread) ULONG total_allocs = 0; volatile LONG leaks_count = 0; -// VLD internal API -#if defined _DEBUG || defined VLD_FORCE_ENABLE -extern "C" { - __declspec(dllimport) SIZE_T VLDGetLeaksCount (BOOL includingInternal = FALSE); -} -#else -#define VLDGetLeaksCount() 0 -#endif - ULONG random (ULONG max) { FLOAT d; diff --git a/vld.cpp b/vld.cpp index 1fc1df05..d8f5bf60 100644 --- a/vld.cpp +++ b/vld.cpp @@ -632,7 +632,10 @@ VisualLeakDetector::VisualLeakDetector () m_heapmap = new HeapMap; m_heapmap->reserve(HEAPMAPRESERVE); m_imalloc = NULL; - m_leaksfound = 0; + m_requestcurr = 1; + m_totalalloc = 0; + m_curalloc = 0; + m_maxalloc = 0; m_loadedmodules = NULL; m_loaderlock.Initialize(); m_heapmaplock.Initialize(); @@ -690,9 +693,9 @@ VisualLeakDetector::VisualLeakDetector () set the DBGHELP_DBGOUT environment variable to a non-NULL value before calling the SymInitialize function. To log the information to a file, set the DBGHELP_LOG environment variable to the name of the log file to be used. */ - SymSetOptions(SYMOPT_DEBUG | SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); + SymSetOptions(SYMOPT_DEBUG | SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS | SYMOPT_LOAD_LINES); #else - SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS); + SymSetOptions(SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS | SYMOPT_LOAD_LINES); #endif if (!SymInitializeW(g_currentprocess, symbolpath, FALSE)) { report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" @@ -848,13 +851,14 @@ VisualLeakDetector::~VisualLeakDetector () SIZE_T leaks_count = ReportLeaks(); // Show a summary. - if (m_leaksfound == 0) { + if (leaks_count == 0) { report(L"No memory leaks detected.\n"); } else { - assert(m_leaksfound == leaks_count); - report(L"Visual Leak Detector detected %Iu memory leak", m_leaksfound); - report((m_leaksfound > 1) ? L"s.\n" : L".\n"); + report(L"Visual Leak Detector detected %Iu memory leak", leaks_count); + report((leaks_count > 1) ? L"s (%Iu bytes).\n" : L" (%Iu bytes).\n", m_curalloc); + report(L"Largest number used: %Iu bytes.\n", m_maxalloc); + report(L"Total allocations: %Iu bytes.\n", m_totalalloc); } } @@ -952,10 +956,9 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // Iterate through the supplied set, until all modules have been attached. for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { DWORD64 modulebase = (DWORD64)(*newit).addrlow; - UINT32 moduleflags = 0x0; - bool refresh = false; bool moduleLoaded = false; + UINT32 moduleflags = 0x0; m_moduleslock.Enter(); ModuleSet* oldmodules = m_loadedmodules; if (oldmodules != NULL) { @@ -969,6 +972,7 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) } m_moduleslock.Leave(); + bool refresh = false; if (moduleLoaded) // We've seen this "new" module loaded in the process before. { if (moduleispatched((HMODULE)modulebase, m_patchtable, _countof(m_patchtable))) @@ -1439,16 +1443,23 @@ tls_t* VisualLeakDetector::gettls () // VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack) { - static SIZE_T serialnumber = 0; - // Record the block's information. blockinfo_t* blockinfo = new blockinfo_t; blockinfo->callstack = NULL; ppcallstack = &blockinfo->callstack; - blockinfo->serialnumber = serialnumber++; + blockinfo->serialnumber = m_requestcurr++; blockinfo->size = size; blockinfo->reported = false; + if (SIZE_MAX - m_totalalloc > size) + m_totalalloc += size; + else + m_totalalloc = SIZE_MAX; + m_curalloc += size; + + if (m_curalloc > m_maxalloc) + m_maxalloc = m_curalloc; + // Insert the block's information into the block map. CriticalSectionLocker cs(m_heapmaplock); HeapMap::Iterator heapit = m_heapmap->find(heap); @@ -1582,6 +1593,21 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S (*heapit).second->flags |= VLD_HEAP_CRT_DBG; } + if (m_totalalloc < SIZE_MAX) + { + m_totalalloc -= info->size; + if (SIZE_MAX - m_totalalloc > size) + m_totalalloc += size; + else + m_totalalloc = SIZE_MAX; + } + + m_curalloc -= info->size; + m_curalloc += size; + + if (m_curalloc > m_maxalloc) + m_maxalloc = m_curalloc; + // Update the block's size. info->size = size; ppcallstack = &info->callstack; @@ -1650,7 +1676,7 @@ VOID VisualLeakDetector::reportconfig () // // None. // -SIZE_T VisualLeakDetector::getleakscount (heapinfo_t* heapinfo, BOOL includingInternal) +SIZE_T VisualLeakDetector::getleakscount (heapinfo_t* heapinfo) { BlockMap* blockmap = &heapinfo->blockmap; SIZE_T memoryleaks = 0; @@ -1668,7 +1694,9 @@ SIZE_T VisualLeakDetector::getleakscount (heapinfo_t* heapinfo, BOOL includingIn // This block is allocated to a CRT heap, so the block has a CRT // memory block header pretended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL && !includingInternal) { + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_IGNORE || + CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || + CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. continue; @@ -1711,7 +1739,7 @@ SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo, Set { BlockMap* blockmap = &heapinfo->blockmap; SIZE_T leaksfound = 0; - bool firstleak = (m_leaksfound == 0); + bool firstleak = true; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { @@ -1733,7 +1761,10 @@ SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo, Set // This block is allocated to a CRT heap, so the block has a CRT // memory block header prepended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_IGNORE || + CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || + CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) + { // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. continue; @@ -1785,7 +1816,6 @@ SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo, Set } report(L"\n\n"); } - m_leaksfound += leaksfound; return leaksfound; } @@ -1916,6 +1946,7 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & // Free the blockinfo_t structure and erase it from the block map. blockinfo_t *info = (*blockit).second; + m_curalloc -= info->size; delete info->callstack; delete info; blockmap->erase(blockit); @@ -4218,7 +4249,7 @@ ULONG VisualLeakDetector::Release () return (m_imalloc) ? m_imalloc->Release() : 0; } -SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) +SIZE_T VisualLeakDetector::GetLeaksCount() { if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. @@ -4232,7 +4263,7 @@ SIZE_T VisualLeakDetector::GetLeaksCount( BOOL includingInternal ) HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); heapinfo_t* heapinfo = (*heapit).second; - leaksCount += getleakscount(heapinfo, includingInternal); + leaksCount += getleakscount(heapinfo); } return leaksCount; } @@ -4246,7 +4277,6 @@ SIZE_T VisualLeakDetector::ReportLeaks( ) // Generate a memory leak report for each heap in the process. SIZE_T leaksCount = 0; - m_leaksfound = 0; CriticalSectionLocker cs(m_heapmaplock); Set aggregatedLeaks; for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { @@ -4574,7 +4604,10 @@ void VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) if (!crtheader) continue; - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_IGNORE || + CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || + CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) + { // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. continue; diff --git a/vld.h b/vld.h index ffc76ddc..255e9f32 100644 --- a/vld.h +++ b/vld.h @@ -125,6 +125,14 @@ __declspec(dllimport) void VLDGlobalEnable (); // __declspec(dllimport) UINT VLDReportLeaks (); +// VLDGetLeaksCount - Return memory leaks count to the execution point. +// +// Return Value: +// +// None. +// +__declspec(dllimport) UINT VLDGetLeaksCount (); + // VLDMarkAllLeaksAsReported - Mark all leaks as reported. // // Return Value: @@ -266,6 +274,7 @@ __declspec(dllexport) void VLDResolveCallstacks(); #define VLDDisable() #define VLDRestore() #define VLDReportLeaks() 0 +#define VLDGetLeaksCount() 0 #define VLDMarkAllLeaksAsReported() #define VLDRefreshModules() #define VLDEnableModule(a) diff --git a/vldapi.cpp b/vldapi.cpp index 97ab5bfb..ee640da3 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -67,9 +67,9 @@ __declspec(dllexport) UINT VLDReportLeaks () return (UINT)vld.ReportLeaks(); } -__declspec(dllexport) SIZE_T VLDGetLeaksCount (BOOL includingInternal) +__declspec(dllexport) UINT VLDGetLeaksCount () { - return vld.GetLeaksCount(includingInternal); + return vld.GetLeaksCount(); } __declspec(dllexport) void VLDMarkAllLeaksAsReported () diff --git a/vldint.h b/vldint.h index 164143d8..1f8bb2f4 100644 --- a/vldint.h +++ b/vldint.h @@ -246,7 +246,7 @@ class VisualLeakDetector : public IMalloc void GlobalEnableLeakDetection (); VOID RefreshModules(); - SIZE_T GetLeaksCount(BOOL includingInternal); + SIZE_T GetLeaksCount(); SIZE_T ReportLeaks(); VOID MarkAllLeaksAsReported(); VOID EnableModule(HMODULE module); @@ -277,7 +277,7 @@ class VisualLeakDetector : public IMalloc VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack, const context_t &context); VOID reportconfig (); - SIZE_T getleakscount (heapinfo_t* heapinfo, BOOL includingInternal); + SIZE_T getleakscount (heapinfo_t* heapinfo); SIZE_T reportleaks (HANDLE heap); SIZE_T reportleaks( heapinfo_t* heapinfo, Set &aggregatedLeaks ); VOID markallleaksasreported (heapinfo_t* heapinfo); @@ -332,14 +332,18 @@ class VisualLeakDetector : public IMalloc WCHAR m_forcedmodulelist [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. HeapMap *m_heapmap; // Map of all active heaps in the process. IMalloc *m_imalloc; // Pointer to the system implementation of IMalloc. - SIZE_T m_leaksfound; // Total number of leaks found. + + LONG m_requestcurr; // Current request number. + SIZE_T m_totalalloc; // Grand total - sum of all allocations. + SIZE_T m_curalloc; // Total amount currently allocated. + SIZE_T m_maxalloc; // Largest ever allocated at once. ModuleSet *m_loadedmodules; // Contains information about all modules loaded in the process. CriticalSection m_loaderlock; // Serializes the attachment of newly loaded modules. CriticalSection m_heapmaplock; // Serializes access to the heap and block maps. SIZE_T m_maxdatadump; // Maximum number of user-data bytes to dump for each leaked block. UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. CriticalSection m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. - UINT32 m_options; // Configuration options: + UINT32 m_options; // Configuration options. static patchentry_t m_kernelbasePatch []; static patchentry_t m_kernel32Patch []; From 2b0c8f38bee4ecd75f17c64d7f5065b5adc29f06 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 17 Jun 2011 22:26:03 +0000 Subject: [PATCH 105/321] VLDGlobalEnable and VLDGlobalDisable fixed This commit fixes 8808 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67942 --- vld.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vld.cpp b/vld.cpp index d8f5bf60..fb3d5d03 100644 --- a/vld.cpp +++ b/vld.cpp @@ -4405,6 +4405,8 @@ void VisualLeakDetector::GlobalDisableLeakDetection () return; } + m_options |= VLD_OPT_START_DISABLED; + // Disable memory leak detection for all threads. CriticalSectionLocker cs(m_tlslock); TlsMap::Iterator tlsit; @@ -4422,6 +4424,9 @@ void VisualLeakDetector::GlobalEnableLeakDetection () return; } + m_options &= ~VLD_OPT_START_DISABLED; + m_status &= ~VLD_STATUS_NEVER_ENABLED; + // Enable memory leak detection for all threads. CriticalSectionLocker cs(m_tlslock); TlsMap::Iterator tlsit; @@ -4430,7 +4435,6 @@ void VisualLeakDetector::GlobalEnableLeakDetection () (*tlsit).second->flags &= ~VLD_TLS_DISABLED; (*tlsit).second->flags |= VLD_TLS_ENABLED; } - m_status &= ~VLD_STATUS_NEVER_ENABLED; } CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_INCLUDE | From ef5b4a989b09c332fac60cf5a58bcac437b989b5 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 17 Jun 2011 22:35:04 +0000 Subject: [PATCH 106/321] Added option to include all modules (useful for debugging) git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67943 --- vld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vld.cpp b/vld.cpp index fb3d5d03..d78134f4 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1034,7 +1034,7 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) #define MAXMODULENAME (_MAX_FNAME + _MAX_EXT) if ((findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A") == FALSE) && - (wcsstr(m_forcedmodulelist, modulename) == NULL)) { + (wcscmp(m_forcedmodulelist, L"*") != 0) && (wcsstr(m_forcedmodulelist, modulename) == NULL)) { // This module does not import VLD. This means that none of the module's // sources #included vld.h. Exclude this module from leak detection. moduleflags |= VLD_MODULE_EXCLUDED; From 27454dcc6c389a18d865b13ee1995e29ed15c857 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 17 Jun 2011 22:57:17 +0000 Subject: [PATCH 107/321] Message with leaks count added after destroying heap git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67944 --- vld.cpp | 14 +++++++++++--- vldint.h | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/vld.cpp b/vld.cpp index d78134f4..e6725e39 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1718,7 +1718,7 @@ SIZE_T VisualLeakDetector::getleakscount (heapinfo_t* heapinfo) // // None. // -SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) +SIZE_T VisualLeakDetector::reportheapleaks (HANDLE heap) { assert(heap != NULL); @@ -1732,7 +1732,15 @@ SIZE_T VisualLeakDetector::reportleaks (HANDLE heap) Set aggregatedLeaks; heapinfo_t* heapinfo = (*heapit).second; - return reportleaks(heapinfo, aggregatedLeaks); + // Generate a memory leak report for heap. + SIZE_T leaks_count = reportleaks(heapinfo, aggregatedLeaks); + + // Show a summary. + if (leaks_count != 0) { + report(L"Visual Leak Detector detected %Iu memory leak%s in heap " ADDRESSFORMAT L"\n", + leaks_count, (leaks_count > 1) ? L"s" : L"", heap); + } + return leaks_count; } SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo, Set &aggregatedLeaks) @@ -3498,7 +3506,7 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) // for this heap now, while we can still read from the memory blocks // allocated to it. if (!(vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) - vld.reportleaks(heap); + vld.reportheapleaks(heap); vld.unmapheap(heap); diff --git a/vldint.h b/vldint.h index 1f8bb2f4..455a094d 100644 --- a/vldint.h +++ b/vldint.h @@ -278,7 +278,7 @@ class VisualLeakDetector : public IMalloc bool crtalloc, CallStack **&ppcallstack, const context_t &context); VOID reportconfig (); SIZE_T getleakscount (heapinfo_t* heapinfo); - SIZE_T reportleaks (HANDLE heap); + SIZE_T reportheapleaks (HANDLE heap); SIZE_T reportleaks( heapinfo_t* heapinfo, Set &aggregatedLeaks ); VOID markallleaksasreported (heapinfo_t* heapinfo); VOID unmapblock (HANDLE heap, LPCVOID mem, const context_t &context); From 8b19536204672b8ac5ea5651c3497e0096fa26c9 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 18 Jun 2011 16:26:15 +0000 Subject: [PATCH 108/321] Option VLD_OPT_MODULE_LIST_INCLUDE fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67950 --- tests/basics/basics.vcxproj | 6 ++-- tests/dynamic_app/dynamic_app.vcxproj | 9 ++++-- vld.cpp | 40 +++++++++++++++++++++------ vld.vcxproj | 8 +++--- 4 files changed, 45 insertions(+), 18 deletions(-) diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index 38503b15..766b622f 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -141,7 +141,8 @@ copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y -"$(TargetPath)" test +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -166,7 +167,8 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y -"$(TargetPath)" test +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index 9805c208..be19774e 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -147,7 +147,8 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -177,7 +178,8 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -256,7 +258,8 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies diff --git a/vld.cpp b/vld.cpp index e6725e39..3359cbb5 100644 --- a/vld.cpp +++ b/vld.cpp @@ -716,6 +716,10 @@ VisualLeakDetector::VisualLeakDetector () m_loadedmodules = newmodules; m_status |= VLD_STATUS_INSTALLED; + HMODULE dbghelp = GetModuleHandleW(L"dbghelp.dll"); + if (dbghelp) + ChangeModuleState(dbghelp, false); + report(L"Visual Leak Detector Version " VLDVERSION L" installed.\n"); if (m_status & VLD_STATUS_FORCE_REPORT_TO_FILE) { // The report is being forced to a file. Let the human know why. @@ -1032,14 +1036,27 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) continue; } -#define MAXMODULENAME (_MAX_FNAME + _MAX_EXT) - if ((findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A") == FALSE) && - (wcscmp(m_forcedmodulelist, L"*") != 0) && (wcsstr(m_forcedmodulelist, modulename) == NULL)) { - // This module does not import VLD. This means that none of the module's - // sources #included vld.h. Exclude this module from leak detection. - moduleflags |= VLD_MODULE_EXCLUDED; + if (!findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A")) + { + // This module does not import VLD. This means that none of the module's + // sources #included vld.h. + if ((m_options & VLD_OPT_MODULE_LIST_INCLUDE) != 0) + { + if (wcsstr(m_forcedmodulelist, modulename) == NULL) { + // Exclude this module from leak detection. + moduleflags |= VLD_MODULE_EXCLUDED; + } + } + else + { + if (wcsstr(m_forcedmodulelist, modulename) != NULL) { + // Exclude this module from leak detection. + moduleflags |= VLD_MODULE_EXCLUDED; + } + } } - else if (!(moduleflags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { + if ((moduleflags & VLD_MODULE_EXCLUDED) == 0 && + !(moduleflags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { // This module is going to be included in leak detection, but complete // symbols for this module couldn't be loaded. This means that any stack // traces through this module may lack information, like line numbers @@ -1265,7 +1282,11 @@ VOID VisualLeakDetector::configure () // Read the force-include module list. GetPrivateProfileString(L"Options", L"ForceIncludeModules", L"", m_forcedmodulelist, MAXMODULELISTLENGTH, inipath); _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); - + if (wcscmp(m_forcedmodulelist, L"*") == 0) + m_forcedmodulelist[0] = '\0'; + else + m_options |= VLD_OPT_MODULE_LIST_INCLUDE; + // Read the report destination (debugger, file, or both). WCHAR filename [MAX_PATH] = {0}; GetPrivateProfileString(L"Options", L"ReportFile", L"", filename, MAX_PATH, inipath); @@ -1626,7 +1647,8 @@ VOID VisualLeakDetector::reportconfig () report(L" Aggregating duplicate leaks.\n"); } if (wcslen(m_forcedmodulelist) != 0) { - report(L" Forcing inclusion of these modules in leak detection: %s\n", m_forcedmodulelist); + report(L" Forcing %s of these modules in leak detection: %s\n", + (m_options & VLD_OPT_MODULE_LIST_INCLUDE) ? L"inclusion" : L"exclusion", m_forcedmodulelist); } if (m_maxdatadump != VLD_DEFAULT_MAX_DATA_DUMP) { if (m_maxdatadump == 0) { diff --git a/vld.vcxproj b/vld.vcxproj index f9b0bb9a..0276d66c 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -92,7 +92,7 @@ Disabled %(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -124,7 +124,7 @@ Disabled %(AdditionalIncludeDirectories) - _DEBUG;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -158,7 +158,7 @@ Speed true %(AdditionalIncludeDirectories) - NDEBUG;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) true MultiThreaded false @@ -194,7 +194,7 @@ Speed true %(AdditionalIncludeDirectories) - NDEBUG;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) true MultiThreaded false From a1701172f0142571440e76514ed85dc32aa04be9 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 18 Jun 2011 16:26:40 +0000 Subject: [PATCH 109/321] Removed VS2008 projects git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67951 --- tests/console/vldconsole.vcproj | 493 ----------- tests/mfc/vldmfc.vcproj | 624 -------------- tests/mfc_detect/StdAfx.cpp | 8 - tests/mfc_detect/StdAfx.h | 27 - tests/mfc_detect/res/vldmfc.ico | Bin 67777 -> 0 bytes tests/mfc_detect/res/vldmfc.rc2 | 13 - tests/mfc_detect/resource.h | 18 - tests/mfc_detect/vldmfc.cpp | 247 ------ tests/mfc_detect/vldmfc.h | 46 - tests/mfc_detect/vldmfc.rc | 144 ---- tests/mfc_detect/vldmfc_detect.sln | 26 - tests/mfc_detect/vldmfc_detect.vcproj | 811 ------------------ tests/mfc_detect/vldmfc_detect.vcxproj | 469 ---------- .../mfc_detect/vldmfc_detect.vcxproj.filters | 49 -- tests/mfc_detect/vldmfc_detect_vs08.sln | 26 - tests/mfc_detect/vldmfc_detect_vs08.vcproj | 811 ------------------ tests/mfc_detect/vldmfc_detect_vs10.sln | 26 - tests/suite/testsuite.vcproj | 488 ----------- 18 files changed, 4326 deletions(-) delete mode 100644 tests/console/vldconsole.vcproj delete mode 100644 tests/mfc/vldmfc.vcproj delete mode 100644 tests/mfc_detect/StdAfx.cpp delete mode 100644 tests/mfc_detect/StdAfx.h delete mode 100644 tests/mfc_detect/res/vldmfc.ico delete mode 100644 tests/mfc_detect/res/vldmfc.rc2 delete mode 100644 tests/mfc_detect/resource.h delete mode 100644 tests/mfc_detect/vldmfc.cpp delete mode 100644 tests/mfc_detect/vldmfc.h delete mode 100644 tests/mfc_detect/vldmfc.rc delete mode 100644 tests/mfc_detect/vldmfc_detect.sln delete mode 100644 tests/mfc_detect/vldmfc_detect.vcproj delete mode 100644 tests/mfc_detect/vldmfc_detect.vcxproj delete mode 100644 tests/mfc_detect/vldmfc_detect.vcxproj.filters delete mode 100644 tests/mfc_detect/vldmfc_detect_vs08.sln delete mode 100644 tests/mfc_detect/vldmfc_detect_vs08.vcproj delete mode 100644 tests/mfc_detect/vldmfc_detect_vs10.sln delete mode 100644 tests/suite/testsuite.vcproj diff --git a/tests/console/vldconsole.vcproj b/tests/console/vldconsole.vcproj deleted file mode 100644 index 8c40826b..00000000 --- a/tests/console/vldconsole.vcproj +++ /dev/null @@ -1,493 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/mfc/vldmfc.vcproj b/tests/mfc/vldmfc.vcproj deleted file mode 100644 index 405a18ad..00000000 --- a/tests/mfc/vldmfc.vcproj +++ /dev/null @@ -1,624 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/mfc_detect/StdAfx.cpp b/tests/mfc_detect/StdAfx.cpp deleted file mode 100644 index 52f38aae..00000000 --- a/tests/mfc_detect/StdAfx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// source file that includes just the standard includes -// vldmfc.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - - - diff --git a/tests/mfc_detect/StdAfx.h b/tests/mfc_detect/StdAfx.h deleted file mode 100644 index 33d88926..00000000 --- a/tests/mfc_detect/StdAfx.h +++ /dev/null @@ -1,27 +0,0 @@ -// include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_) -#define AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers - -#include // MFC core and standard components -#include // MFC extensions -#include // MFC support for Internet Explorer 4 Common Controls -#ifndef _AFX_NO_AFXCMN_SUPPORT -#include // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT - - - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_) diff --git a/tests/mfc_detect/res/vldmfc.ico b/tests/mfc_detect/res/vldmfc.ico deleted file mode 100644 index d56fbcdfdf6eac0f4727c34770c26689271d96af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 67777 zcmeFYc|4U}`!{@SGetCs%!DQx%1~mPDN~e)khut%$88(;HqRkMBs9@rPAH+2l%z67 zGG~a|g#E0oy6)?`?(6>jp5NzvKkxhe@vJ)cI@em?<5=T)Oy>yz1I!>U&WdsxaG(Qt z3jln4Kg*+301ET~+qV5GV*rGi09aXnmPJvSWj!EzK=cey!~!7AOrif(W&r5hPNDx< zZbAGbgedes%MP>vy1P+_C}DsPT9X0F5wD;8_@HP9Kyc%4eyEJ-c8>q%#|K14fLBYu z`SF1R4S)#^21F4*#0D(a_@YXb@ISM)`@jC+Q6s9s<9}x87u})@5B2r+sDZrpAIN0N z9lFpzN)_ej?};A&_Zmu>-cH@_-|Ok^oNR0Y?ElulU~d=T<<(@TZuyr6db@xCdnX%@ zfB+lUKR3|DjEp$h+d0|U8L9tjpqG?EyW(x{L?p%7+apd`3IV;8prxP)(2q>U$HzxF zdD*Ksp?Z25DQjyfYXfomW?VceF2c(xz|P1LWKgw?Mm$)yXh9<>ZA@GZx{=QSKD{4pGE@ zWHQ2Oq{-gS61*$oL){BSWJDx+h{W#^5jX^IYSM>_LUJh4T}DuHt882lIe-`w5Hn(L zR}X{=5;;E9T1HyZdz6S4p6Kiq;N)cq(V=8A$z4W7%372-5>Fn8s-cDZ42p>fzR!I5D$Ot+RM~R~&gg6{w1dWGSK_(ChGBWw@vZI7i zR2x9RnFqK6k$^gj_H%a^LHq-70WopTE#57NPc#}sl)t;XyR2v8$p9SA+k0dbN5K<) zD*U}=3MGzlaL8@-@@{K!3W#upXks)W+DBF<86^&138NzkbR7km(zm>y3^t3oY*;tvdU z^fWY{KgLh#p1~(FI+EZU85!y8>q@Ekl^BSX1Y&x6dIeghzwoa_wUw1s-iY9Dcw!~u z66yc9eu=0$+B-cngW!w*%^c-uQ3;j4kyVkAY2JV4Pgzv&%5+~}@65D6|CMj})jt|PC2jbX^P(J&%9MQISB^%%R$l&< zQ=pV~^1%PgIqGPQFY0J5Cj*8|>4#j;`!oNDRvy;$3?CW;7F`tmxt5U5{O5%KIUziL zZC;dLbo)QmGk?`E41duq3|@B4PJhxU5yQj?buV=+WjOSbt`OlvBsh6FAzei8F6rjx z8bgW;K-xwfkc@U0bmxmBQ3SW05y<9;ib%Rj`;hEEH%|uGfxjX_%GzDfhd9z~=Vk8% zGDTnAq}<$aWa9Uj7_TOX4kCSbbC>oBB1epj*m(g_mK2JFEYc@25iv3LNdA5GlgW1@ z5=Y~Rao$cqEFqEHL#2I22_v}XIB(QW3Pr-yJ5?hfB4Q*Ch@qjx3K@w+jsx~~IP;UJ z9TkzB;_%&K-)uh$@x)4hByN0?lM^@lpvjRcqY1L<1R{Fk*(j6UK&QcGndy=LYOkzJFY`^0{EcTIrdJ{1mHxX747C&~ z@kbFLvT9A}qZ%@KHHb_eP(+XQ2J$k{uW|wP01Z&1rvJ&MNMVKl`M6Ld14T;wJkI}= z<5AlHHJLo4NT%3R+t4MBuHWaJ57~bIobc#SqZV|y*D~~rZvRK;{I@7V2i3;L9`T~2 z2s;< z3<(W~0d!xHM$BPPq#O{2O84*aL1{nLW^^4IXLpR>wK!~vqb(0byHhI~&&520IdBu2#l4NA!zeU)Ge)kp`@g}wr ziJ{)!an8i(Xz%2V&E5_qV!BUSB3e}>Kz=@n@j2;hPhg#FdLo58!6$m{2_&M233Y>Z zE)6|m{Rm13C7RkbPbXGF=rQ*FhNa zoOZ#r3wt5gNgN8?_Cv9!1Qhy8!%e^aQ0O6x%5qTXCl5FM4?>QM8r%+4hMl3Na3Iti z_C#BQbd(*4B{+a&iX%v0as!!sUpP*11l0^Luu1g?m4YBB2|fsSLk~e2Q4wwhD?@3B zGL%OtL1nBm+zr=)vZ$lzUK<`Hs=_4G zRZBs`?HagTxB=W^4Zth@2zE%fz#fHm*n@ouvYOA}z=`J|ru-TXXubtG{XS5z?1#ff z1Ax_g1}ev1fX2x#IA+lWdJcVHXw?lmu03Gn@d3`b^n;B@4=9@rg1X%>7@ZviZMRW4 z;XMkrKErSUHv)1uL*VdT0%+a{hhsO1png9FG#?~`QB@i^6~%%>NfJ0zW`Ji^HW+8! z23*w@IQb|GOq;KO?bB=E`urxGYrhRHuS&u9O&RzQ-huzc9yk>`0d|pN;2kv%4vCZC znf?VF(`Udldj|ZjeTA&VR0u80ftcz7NO*W1it>t~xsU*D_v7GgO(?WiCO}%#JqUgO z0P-8}LuqR*^gIrSw~Z`v}d5zPGaxnm%+u zM|T$tysU?huO7i*UpIUl=z~YCW6;zw0Xy@xM=}9{l&1-w3mvyj+|+f5l6FSN@0moUEvj06#A;*KU6P zlm7wpyV_CzfVjB0s1SvKOC0?O{BHTDT=$5U)&VJm7u_Mm&(AACq1t}%pO8Q640Lt0 zG${mPs0V(2Ng+WrtnEDJf2C00KtsEAt;)baR|^r?J#B4$ih7U~rS!5L^GlpkAi0Ox z*jQ+3X*biVqLKw7IAS_6i&EVwix0=C0! zEX=etPEJm>D=Q8*0-wbt6yQuh$r2JN-26BOV__(FtV zT$)tLtIwnKph%eoU1Ot@!|Lj)!?Dv(C-meF7#)yATP-R`ITJUFu4ONww761FSyeR( zo}~#9%pd}kCJglt8Ed0Xe&cTz<*iWCw*oY0tm0t`K@%ddpQga4&lw%lw>qXRyGDTc zH#FS5wz~2yKTAbLNePQpqpT}S3x&YR>72u9TT@HpV^&7T4p9hp{KV(2u1;Oc$zI#H zH9T9(F9Iif+p}lwZSAd%C_U_^*s$FV4HSG{_2WmGXrnc-Sk%E!d}HH7CntNGGZvOM zj>blMhomGBzNedlr=+RuObs;+MJ$>@OH0d>3KLUP<1=S$&YZD8$@VlNkX^%f|HMxg zy*=IeQ;+NOi;Ax08x40~lYb#!$N3@mhXbd9Y}Q1FNV&EaNIaZ%p2tA0LSI9yLq$A#bk59BbqFw!FmJqHSwk_J%f>qP^)em#jm zAwUUtdurIjgGiYMA~?_S6Z!M^`&d7kLBq`(*9()A2`S-WZ)acOUe6+YWB`T0)z#(C zaDeZ9y=cBS*6{O-NimDF^Y~Yb!vO)2fxkNVD;`bZC;P&Z)WyY!_T}Zp#Mg^+2#@By z*1_NL=+ND~URZdotYm2^Vt#Rc>FukfIb1*#TG+KI|2rPK*YKq)D{(6;@hi)(R_1WH zD9XZ8I`{`XK+(0L4urqG`YCCC<=ZL+kG5j1gMY-M%8t_2)laK067HbGHy0EXy@p2} z{3rYygkN1PO-rEQ!-8VNesukNOoq@<)I zMMb4Wg$1u2zW>DkG3H~G1!kdmY{7?3Ta7seX%zu$Oe~u;<4TV4;{MXo@Y)aQgpOk#( zzu@|prkAM~+x}AV=K`{U{%?E|nStbi{}bYqzx-5W0{xLFM$a!p33r$tRQE~&r>XQG zKB};#0+=evLy(~;>=ZZ-3I|RDJ5M0+*kOU!L3zzj75L?&?(o(}eyRb8;!c9ByCEF% zGl896b|7)qXU#W_R9^=%+N{VY-2zF5=sLjxsmLeIIL!m;<^pTJXqKZGWIM`3?%ALI zX94m*ueeCTRhL6>)k6}By`BoF zD$WyBuLgkrl_0o{mqY&PVW^BzM7}B(`KX$3CrtGZAN5YSHrz)(YE_&bJV-tQN^qLKH+;>KPsRy)NLq00PJ<1P+=ePXf=L{L^OGtMCeB)S5tA z;|<6i?}o!CJ_1(vDX5%y0h%Y@fR0r!oUnNd76E-=iTqIO!1v%5)DOz0gP>_Y49Cw7 zt@)ycKBHhCi2TqScsN`d4jP$J;1!+)TE$^tcr6T0T@450Vj?J)$ACsnBAlqX2<~}N zU{{_2ZnZfOSd#~O4Hb^s9<)<}&HMO@9YTiDFy7z5R_q-S42AUvks1>qC+aZ6f1FDeEn%08+(-)Ia z)-()-t&4CAz2v_CZW*ePull(2IXwCB3i^9{;p3Zn80hbVHv{jX`{Oh`Ul@fa!z<7? zI15O9!KaZ)m>3^N{^=L^Iy(&$Ulw3`ZUz<>767ULH8JpC_^BqR{ty)Zc2g_C#mOPc z_iy!-ibp4R3-j@8=i=PM!zuXh2nTJAo%#>!M7DE@BY$?=zW`aAX||w}gNF8t>FMc{ z+&mJzJlnVZlutQWNwy8lwDPnn;H3F-q3xuu2=YCVze-_{nRrlozvL#i4J?P5Y3NL? zNndvE78Vxf*A?RD*^VsGjHH9I+57jiv29RbSx;^Dc)3nkLw&cfkghO4FApch?>pEt zElU9?ZeXE3{dlGE=+Ps4b_*K_Qy3tJ^U|T-1=;!uz2cXV{qoA z^%+BZJuMMoK7bE5u1>C8RK-e3U)(Rr_Tbsm78j@bdZ+VF=M1%WBS)vdxuADtX61>T zT)H%BZ+-ggQN4qWm6he0^QVsNMRs`qwaMk48pRB?beRKNQ+&PLnD%KOvpi<0bIifs z7*GtO`0~}fg2IAib{}s~4-a<_+&X#@2@M^Tj-lwl;K#v%?(XZQVL`~+5Abkz^9b>9 zV`LE6siC2*cOGD9XmGIm=Cxb+Ak^#^`pOfvd$_q$37-AAd2{1~{msP%xA1X6xBCdM zrae7EQ73K}{@B{Nfe$x}uHGViBYa+X|9ZhQAk5Fh-ThzfXbQzw^Y7dzmHk-$_G%fm zBU9A zw({-Us;c;ovapaq@4xr|X=HTdU3K}r_?VcOvhWbx-`l^Ab#+mi<6@$tqsyYg{@xCw zUDcK4@rXP+7^QzQE`O5;$8`J~^;*T-dvP%dl#hJ=l>X0pzx2~i!T$L@>YwbCBl`~m zm&HL8Lzf5f-R5hy2)Ba@h*)8P&*@(=^S$nRu)|9qcK8{>&cKr(;e+052AqbyR?ZM$ zZw{6x10h(65rUObyj*Pq5H*;AfMVwat&I??vk{_nwm^(NJH!}mUyGq99p8##=-VN~ zoCgw5@xet4en>VKL2-0ZNVDFtX1}D_?t*MvQOI@@gBa@raLMT)Tumpd(DQ~8)XFtVjVys&IuG#FM#AFS2%FR z8`ROeD$Tg_U>Ir-hVkxjG{pmSGX20h*%#EW1RxuQ5=&Qr61)oB4mk>ULX_YhQ5o4J zs&Fq{2kKHa;by2l6os5bwv92AM<0W7WUrLR8ADCtaTGg04iyO|DAsO@V(q7)_M$D+ zWm+S<#eL0Yxl!Z-B_&>Pw;Trzmvm5k-2h(Pv_p2vd1%VNfNT{nXu9RLX0N=s<$-Jz zZ+LYd2b;Es0|Q$cFl@~P7LKdHyuBFMxQo}~>TG-^uu0%Pu!~d!2a2zA?s@=xa;31- zFcl7IJ_OTKNx;3k9{432VfUeDps3RVl4_lB=x7JX>GXoE!!wXSJ^%{FgP>~g0#prO z!BMj}pmFv&V7;Ehu?sK2#PcPnTEBxMc70%A(+)cR?O=}UfwNw{plmS&sy3ex{xckP z9$B+#j=O#a3)f*d<~a(-1INME^Anu+8$|K;K~PI3fZi` zDF{fN0;dcVm(QI89Ey>r#^*rJjW{T;4Tr8;B6QZ}K-k-Ai0rI^50B!Yza&I+mckdl?=eyQOAu6`HzV z!(hjwHJjx_{}jCMn}zPtkI+9j3QcpLU~pgn#y_KLY!qfDhGAxE6z0CpqVJnX{~S*@ z{F4y-eQO}Jed|^!+26&V`8h4&eaB69a!B*A|87vHUk7kbOQMrRGUAfq+fIo-UzcNM zqNT!8DWBc@X7RKTpU6>u3V{N%Jl%RmS|vs*3!UW`+>(3u>51?myFjscj+vR6QI(0- zQuoK~u02BH$M;e6{k7ty;tkA9YRrshY|W8@wMYBZUNL@v(wnO@ta2>*a!gjQtdAN< zNu0FP-X{WZ?*_S0g-Nd9Aam>6j@Rwa&pVyB*OmZiyG34EU^#sCkleGUfg4X4+gR(L zb1*~7@^*2a#-S^0{(in5E&(*V51=@qt|`*f{cRsVCWVCr;oRdc1baARL?txs(X_sN z|NQBGctXhg-sm}ZBBI&!YY{&6m)(h3O8&MKyW|n+>*4u(ZQ%3WlFHSZ)vu$gK2brw z|EdRgS&nL}S66*gf^dIPa1~_ohe$FRpNkLr;m>%0iRQWo>1h!WnO%Ra z2WY(Xu=`JS|KGkp|K)E}bl2}hx&Ku@E+-0`kRID;DF@rF6k)rq64GT#z;RX;xIOiN zGe94Na7G~Ic^uBWt3&irR-}hE0YwjGm{Z>6^1x-g9gyj;8?w&HBON0I`7WYR=!Se} z*S&Dva~I^DmxTiN15n^93;D=rzUg}i`Ok`Q>8vu+L#l8arwYY>=p8e9mns}<34Spq zpb~BiD$&R{j&g*Pg!7=6a28BrFMv_17o5%tf_q_yke<;+KCm8CCmey&FhjUcG)DIp zfX}dn+Dm7UziSIo#jfxuLkk*nPQvROCh#Q35?Tt~;Mom-=tDm1Y_hKY z4=C5e0o7KJQ*D96TCYLQ1nGiPgP>>j7}QVofWCPr=$(H8Cv7^wz_uUE&b|XH*IrOJ z{Rm1{!=T~t8T7oy;3SgsM-zfU^LiMVT?qrzvScu;O@}iDL@;}i4bDy1z^$zWeBYLX zfA?K5Pn`v;*eUP}{|vs-6M%~u2k+QD11_htmpmh8l+@0!%s7EVM`)C>pn@LdfW)W(T+u(G@ei%aMm=hgqM z_m{s<_W#ZQH&@{A{Pa|w(YXKZ2X}+$O-El8Kkk~d@h{CCc$|7YYsd23dt$SAC?Wn^Pmt| zR&L^MyCd4Z0S6Br!Ud){pARuJ(LAB5qm1F$CrQY=lHz(S&h(urJm;Ra%{m#b0c>H-QVTZ3vMxyQI^MlmoH_cx!G8G5Tk!rqZ))=cX`7+VUDr41&DHR<~Cg6pQ9yd#%2nlAIQ z`8UV4$dB~wI-SsXm_NHZF(WZCF=ICHNB1ECso)Eog}?rP@O>)Z#k{TXRzY$_?Sj$f z*zRK&qgC(6+%>y~b6Fg4L9ZHLdUiLBg=aR=%*g8%;>ONvv}|pTz0(!S;7Vf2$1`W88H3_gp#POu)sN6(7=6dWaFk3mElQkQ5HPz?n{AuB}HN?=DfvU*M_dqGsc>>=MEz(kOGtQUzB~yIy7`I&g&9 zR=O?D%*Mwtp2-r5WgPHLxx891eY$>fa7z4}vr3k$n!vxpBBZccRlLSpp zzCHO@H}Rbkc56)|uV#>9m52I9JR@E&=Df9!>13Tt!}FH*laV*GI9j6tY*f6uo@=#2GHJnb4o>iAMq#O2F%+h8ru1uTxt`3k>iI7v6Csw1Sj@(yWFnFA!a%IOgC);YHo?5ZG+5A zGaQUz5gKl?7|VYR3iA99G@SSIN}aqH9GTMU$nB<7Sji`Z{}?`tY+aRQO@Rp!quz{131cPD*1v zE)OP7N!5CAmCMqx^i&xvE~jjSs_VN4vgotoHt6eazDk8VW5Y*XoudJ2RBbXzke2dw z_YQ@GDh50&w&x33foWKhYcV-Kp7EpaC3G@8b?t+uK8IV44V)LfR6#8q_u^~iLoW;w zpOo?>t}#Jlbtns5KISiT%mBMu0tcN7JGu(AvuQ_Zc z04*Kq;I*&QE5#Gf8z(Ppj?LH4jo;e8laKH|(3X$pFnz8hS5a@UHZ4uK{`ScZCFP6X z3n4BZSh7zxeV4qjKlza6C(y~h9GI-u#sJ8J0}v1a6{bdyry4$ua|a~u%VJY zJw6i6`;u>DtoGCvnj5DL_Uv9&X!RLZu)!!A_|AUa6s=brU4J#<2Jn3;nPWdn6}2wq z$PAN`IwyWOKWH`bNBLJ=Ovk`}Vf=YrcHGE_i{!1bp=%C%3^I-^M==$#;tlAk-q_nF z7~`h4hK*pdE-rFOwF_Z)R&Kfr_X~KBP;oKzh;3}22;RbdTz)B7f0IRPYnn0z;!y#dz&44mWak(Il;u8EBrsD)=RwT2)=5SLQ3S<(9D=puQsp z2YFbZ@@GA0v(D7SCrvWpZS|P$FXwH*xoI)&GM}AVsq?v!Vg7*IW^37wc&O8y zP;``*)9-~ZCwk^Ng8L1aF`+VQ33zTFosYN)9`7?c#o@Fh5HGHBu5@Oc);!a2u)rwdS! zFWT|YXr2C6^JJxWr#0(`@wfPc4`N4z5?aW6lkvKdtuuLb+crHiLd?Y^&M!Z$^OF%~ zca|x|#9$_e88)``U@+BlvxWwi?Hke=QnbjL>p2IsInSBgtTChk%^uL~rQ*9sB8DYm zeh5U+J8I(3J$t+5sb=mYMn?V^-e8`DCK}hovqO5g#e-6{KPq>g(&!-8ej9TqKb*(z z9GWpt1*^-gpC1OMkeTL>Y{4^#9ivsvMstdGI8Yy&#+ zS^M?DG2y|~Ce%X=HZlEOB!#gF3H(=I{3FQ*sbgd`8pa?$#=Cig3P~7bTGHF1Y)&7cq0q- z!S20k3(|>rs_#ac_1Zf5J%Jnti3EVcN#hnU<+Lmt%E# ze3hAw1vTjM*e1`>3B%!I-NJ&wMO&^5=_k%v&~I!(k(;d-+cQkC?kIN^2yz|?7rRY#?&y3BpACohMbremJCU@jA6dWmB?k>b}x0LdXIbtULaDm)W4PY zML8?|<_pH8z^q7o`PQbY(ireTQM?*fy3Ko}1}~`iZVNX!A)KVTYr)ahUs*e&F5YiHzsvx30UZ%6e@*6r#|2lcBG7@OjnWtVu%bF-Bh#t(RI&u2Gt*6$ohe)*$f zVb^Y#SmQIi+wlVQ3)FebBh@Cf_+akwyG`_CRHK7;u?G#gV^|)GRf{mDJq@rZ5?CB2 zZSEzEJ`u%+o}jB>R^m7&#Mb!uO%t`pbwSMWiK0)K+*jZ=rDSi#dApyzeWG8svrqz4 z^rmK{zizwX4`;$1h1X(pheNtHpQ)OEt4LdZ@sm29BQRi7sNY+f8{Flla|;JI-EtXp z4pYB-qoF~AubS!YZVVg==PS<%47~GYrr8s(o+`qkR4c-+x{ydiE5~!?(fl(}jSfX3 z&AIyzjuCY8h9CmI`Y=;*%xN$=Yk1BSPKKfWK4qrnPKFy@KcYzGb#eQeBK^RwrLnfPwA<98S2P8i)a zA6qBN$@sQ5g65r*)T>Xk_~>mMny=wxy|#9U*OW@L^uWQ>`udKzU7m8n_`TP-bzr4# zv6$9mKnU#arLX6>ncmKEH$N8*%~I9I_KmWT43MB zU(F=Z-u&R|7Gl5duBQ4!^!Tqce3JDy+#dE~NPCphJ;pV$Rx~d!)6g|h@3HirQgJ!Q zvSQBr#`>v6gx2wb?<-oHu;(jXvr0o5bC-MS>R6-*@tIBY$MPiOCfr4|ZE6KDi55FTQFeY++T)zV2}^-@PU{C3`K&T%SunGUDg)wl>r$OYBm&k&>ImJYIy7?g2y5Ji zuy0859XU)qu|6bSJC`a%o9|4)-FJ^8=!Z$BLYPB`sVgekGuu?F_F3*5R=OU>+Qek( z@Zkc@z?bC=S}vcC3))|5GjiU2y{H?UB}%vO?9HXen2qa1Qy*uVOjnbXX!e@oj#O-? zS?7F)*vsluR{uB@Z$P_egkOF*(3?h}9iv)y_|6j6gALGM#-x;u1O_tpJKxr?;=gi} zg~_?K1%F4pW}iwBS`6JnqrnZ!uhJo+fLjATKbiJf@8uV4wjuX6{-h>W?fVm}dt1_q za8OK|q`v9@MY;6E<|hd(81)LQ$+1>R1@)2qUAe3-d<7ei*Rx_bVpB5kHx)vjr}-#j zd26I*Y*Xms7pRKj))%qS?3{N}r`t1$p1ttHqx0OQRldh^*(VgeFm%^Y&!7C(l?LWY zFyH?iyn2nCdOCNqAzug|lkz}sPg&%E;N_;wDkkZ7M-S}QpR;VW1LJLm!pV^jrd=$# zHXCnI0xfeZR(TD+^-9;2RKnbe9Z4U@sc{l^Kx-+u@WX1e7M51%@q7Lz>V#dyTTRrQ zI`2-WUFphVGE!8qmtdNi9lnm^l`#V9jyOSZx=h<6bw^5O1pC4y_rN;qOS!9b?T-G+ zxjgbS_fxtq=G>Ci>p8Q(}dlaO#z->>;p<0qE>4dx1OS>+MBoCDsLUzX=+gB z#M98aTkssKZQINQ+ zB5^$yN#YbQ9?VR%I0K(-?mepeFENwxXgs$#(m%^Tx1kA^1gw!of&Q}uO%{kjCqd)3A4Ms}YQGhaF{B;m7YsD}z>`C{fyLu;54QG&kl zS)S*Jd%+StK|OZ;{Y&+Ik4NRA-K1z1mGRQtecM@l%wMWhThofmPRUcT&TN_=Dw%Vb zxF$kF#syICw-0{1UfU6q?gYKe`YzO?-ts$V0`T$)qDBf17^bhwXC9fsf!;J;PNs{e z;fDQ6#!MLBBVw?&U>sj6mTyyn@VaC4EywZI`-NLIg)T>i>&t61*2;huIn9&2Zo)a!>Ps%OT+tK zy)(mn*nMHEnd8=L2dJgwsEyan%P3_Z$n9FVTHg`&q(A;#FfVPJHRG%BT-M~64YWJL zum?wpq?XceSA2uG$Jo8GrVC(a{YHO#!NA3OksV)x@`f|C=Uag9YC;0Ao~GT(Y1mPJ zn|kycDYlN;<1MzArF{apRK&T=R8ziQ6xqB}Yu`QcySaOJu{0;!dp2tB zCt8!GC$Hmq?b+ts^hL2wo7RWaT@e<$<2Tc#(#$60nrUFr0vcmy>I+9 zJZ6R2P{rh@oK2;9vql&&I3bLTFh2NfGaKL;oJ4a~>ckvbN%W1(LetpH8?IBGSTQ;W z-ACGO_1b&u+c@;Sso$AVFMI&cp~s3F-xwzKlPVZ7VjM5K_HATa=Lp-@S!Y*#W|?ge z6nm5yD7^mSj}P`EACx z7Jd${q8dF9nKyFH=|}JLOHi+*@ab_5o>7UE;9KY}i@zNi{6ajQli>_atIK}ldw7e% z$GaI>BiQr}#^$I@^-oS$Z3zALq< zSQ=AT^)EiNT0Yr;o_|wjBwn~v-ARH$0lXRU7}%X@7`01%3!y%V|&X* z!d3b8tyXSGv0-@Kv4dplXW0ps+=DTSwC4M|-dkM@R$%N2E);HVJ?LOlzu#2czXV(2 zIAGKrSyEyfq_#xwSQ42#CvoEZ)ICq#XS4!5g&*!yGXi6gA+~VqgNn#7*~z{IbKNQqn2&Vd2oAu6n0t75beRblus{1LhRf) z?PkT7GFgVh4~!DLcfB>I{W=Fcbc>{FGr9l)rddqV5_M**p$^i{GdBfR%@m>q^{LL; zOq@He{#iiC^W4d+9=Ux7mnIy~WCx$ssn>m3ue(dxp@b@1x~OK1*Rh=6jQu#q<{MAa z*n^J+j}sUk9>W|Kbfv4oQ0H(AT+w#a-@~K&K3$Ehy#03n4d@>`Q+-fTk(}g~Jrj|6ddy!T+-Xk)htM5Ja>j-9V*Uh-MyU>!JRsSgA8jDnz zEumT2%t3NQ%K7o@I6?f8#{M${9s@@j>)Hss+h$Kr=v&wyk=BQ<<{MuOk8MrzM#}ox zg6F&*ZFHYQ!}GS>^s4n<*BC3M+f8Z9x?MBR@|?^8hf|tcInD}6n*ShqZdKS<68y4t=y;|V7v`!F4|cEYfg-+%`@TCpqBJ!7BQF(Qkgz#DHsH5CH`a4Lo0`qiG+ErRL)7m3qc6^n zQqJdApv}Nf_$d!`5hJ-EZ#R|(J%;W-UQL(lU#@~@=1*b|Dq7q;taUu6&RUjX{;X^K z39Rr`wo0*ia*Y-&(B7#R1Qkc`B{gt4F$& zGDjR6PBVY8-D*brWBgX_^&7g3;ti}U5}%Ks2@qX!KirZZ9LZ( z!>vKAqK{&UQmiOM|d6<|O&33!YdMa7Gqr+j(7v($q z8Hc3LJY%kGqkG#PJ}vxGVi;6xmyz|x z(D`QQ+pc#14;EWGF5$B?A2&V{YnS4#G^fA7v~NdlSHlC3Hiex*K~U*fan`kPBFoJB z@_c?k(2&yrwpUHzSoTs6$>UJ)R*bsn4C3a<~Y%C`K`uy&wZD@ zmQE!4{>5kK zPBu^O?v`xbr+`zK7a6%aZfK;KRI;g+6U8W&DwprC5=n7S=rGHo( zm(IZUa-wR~eqX|ULB@e3!Bx&>s`aX+U8LnQPrIlqr|iA7)wbpfuHvwxAOE2JlAqcsG{7-vUmj%&wYaN@jET`@1oGo!&i}y z>bA^?DAY~M*DmPXl>fF_XfP*qS4E55JE^A%tSx1q!1hVmv)r)F=WgL}Swdc{)V9T) z8s%BT+3UXkSaGaAc0C>cY~AQl?mfrvgjT=9x_zn2%q?6PpWx~~`g(Pq3o9h}fU+Lf zsEY8lOgPpv!>>ew)B1_Y>_)ENq`awL%170nNIaj*`7eH$U#17D=FFeCE9RgNKdOwN>#S$ zZIH(YUmE@0_Y#jd(6KPk_jypCS{Ge8r-9oD?Fyb7?Wf6HZGqo5886Oj-0^Ug*~(%O zu}JN|NsWyWW7%Kl=2RG$u}Oo)#)M$cJL@e*wWBB`{X3r^wlmU?9K<)XWhXJ~WyIIb z#j1-Iv=0RXvklHpCs$wQ`e2ikEMUD6IVDI2Dk<93$9G4H;*?Aaid(-8wP(6CUXkf% z08ts43m-r38+=YJ;<_XlgsJ(q->Z%!{`vc~n!A-i@=eWylDri>qbF=HJY@@_s}Z15 zX4!M~Y7teq#K1}QGQNhI=Xo_fb$Xr9I4F2$e$1<`ZHFp%FFTVZyKU|s+!2~HbuQRC zzbh1H@x!yDgzcMW`$L9Bg+=bnU$-{)>y$8Cd|ZLPvDC|HtoorhkVu|)nSH(eVIa2A zB3N;3xd`|xCbd}i(FgJH7Tx<|QoEkCAByTXeCs9X^l?Cd4pT;I*Fed}{JSW&y*YzZ zU|MQGg9G?OC=XKt==Z<6zc5^v=0hwF{2{T>+aK-zJ&4YAM3PVCQxyx-H5L4`C@KC< z<3-JFn%(9YpL1HC@404JkDA`AEB{P2bIEs!gHiLa9El!sZq>bMXxDuMC*o5t+EpZB>wfi z{QCxFz7O7T9lx^g@a`^DN#y zmzh6);8lJ6c@?W!TVs8(-fsyc8GnlK-#+{D;Aw%b95u=uSL3aqltuQ*o- z55`~p^2uzQ6Z@uFz0U*g{?E3}^3nxhybsKzH8M%w^|;DA_li$9IA=6)F~1kDFEf3I z`TK0997QJ9hp|Z87`Mk1o!dRut~0ItWBJ_VyR^---|O0z4z^8JQB9QiaPuhoV^BP} zwQ}ZphQ3kj=_7O7*k<*X=O@`iLldslJ&UPZKiM}vF?7dNpBDGz1GSskF%lEWY2|GC z!iXpFM~q?MhhU}p>reFXi7r7G&whDw^5d(0iczg4ix)q#k$coMZwi5i?AK4pJ_|vl zlF}DjXZAT$r|ytmJ62zwWW+CTc{^RlF7-nAn!VjCCmqolJI~=w=RF!NOoDb6+OJ5+ zp6RpCnrkGn$7esOzi6yu{YqT^ptb=fvwZ)JD5`{Wf-?onvYnKNsgc-r=%^Y;3y)wbHprSgb}S>fdqdy6*gX03_g4=4 z8!t_WtZtm+V4by448mvxjiqUn7swqVobGzKwdQunxV#FE7V> zTVFWq&4goaySt%l>d`{AQr~W@@?jbw)r_{GlIzU09tH|Hy9VxAN$SHDq*)^vyQM|@ zQ26}A+t%!s#viUo!1>g3ZzZ52{h+-rbMM26cN4SEtu1by@>NrAsn2iFi<_CxD7-_8 za@@D%5xZC1eKFc~;6;DDZpo&U*t_$#yu+XAmK@pjZ{KS0Jj6({6~Yrlec$ORR^Jfe z9y|N+2qu9FC)BrRrg?|WqQK2MGj*N5M{Gm;`KDxP6HYDe8r`MhzO6UtnX|nEM~72h zkN5st{kF|FBS{lpQ`NKdmpv6ffB#YAEMvUH(~^qOe>N^at!S0`daP#rU?(OgDC0>< z4|SvU@y+C3~ZKR)Xm(#5QgB2CaA*-!E;w{OuMEvYZLC1$aGMw0Kb&yft( z+zspIpE#yh(-JM%MON%@)OSs>;0bLS6E8<3bvy45F~If5Z>|G7zP{Fdoptbb3x6A% zi~`4p%rE6PKldmXsm)Z2lTcMHUPf}0!!CSmek0A51@yS%I+rW=%E&=`B z^@ZnfR~PhB@B-9Hg7Fk*iz&BlZr$iTEhST(O;R1kzB7G^!{2&HZ62>*;>YSYZs2@yq;w47(wlA}GzTEx3)uyHv>rGGeg1fXhjp>np{~P1NLD zBsI&&Rv6#=vR8u7 z-bdM@gk#E7sty%h7iO}_PK~qNPWL44#=_!;fKT|&#Zv~Br6(J5b`gD8*xdJY^4EI~ zeEn>cc&aaCVPs{IwQ7MNrdLgp?YzpZ1)gj{Q!J&!;+lI$b1m-N-*A+k#cJ3+XPb%F z_gF>I$ANyLdvkzBAgliY{(ag5H;2I9d-iy%N@XHbz0k!?mf{3?0iWGlvtHYZ)omI0 z>UNx7ZpN46x_KuHmJMV7_~HIa`LW>(*LC(eQ29)2Je+RvR}2_RjD9atQO<|$qt8_w zWV=T7<9kRf2?bFlA`4eZim`iY=9eZee4HGk(f2Hwcbk&lS~v1JapBhLV|$H?_#kzR zM(9CmA5MBK-K0DZYw-49G4iO>RH+3^pC6wiSuu(DCLvL?lgw*apF1DIMN0}&Sh`5- z$XUT&?zvr#(7!yY6MxXHwP0c|we0NI{*{y8nR`r3e823m5~y;w-^cLYfaWrTVXaQe zl;^vrW5G`*->jF;q_s=kcxJ}1ZbL;m)47TZXTDOI&j%{*pLMP9aT^s!i@Vo^13J+f|8@~p&`XIB1 zi`9>$<4wC|kErrFTDI`)#a3)C_l(Y0==N`VZzz+|zkQpk)>&VW=Aau*Z1~~F z@l!{#RvP=AYC}z_$4>?>U+*kz0K1v|2+ecfzqY0woRoRDM6e#OPA~~-{K`?dG#|o` zC;N<;vNLt~>75aAmJoM!#l^9h9uU}OZF#KTxW*yUnQqihgN6LjrOqXsc+thU)-6%G zjJ9>}DIuEcl@OXN0bEz!XEkQT_x>*c$Ury0fyLKdKeYV(u{YrKpZp%0Jp!$-DObS% z?YR zTK{U>#wkxP2m<)6yWf6OvoU?#qFCgYL>e+61DMb;jLdX5GJB7RV2y>bW|4?)UMadb zl1cA09+3WY5O8QRM(VMTe+jPNhbabM+QzQ^Sl?X5LPr5b{oOPj9D3~yBaeIL|NCuB zz3N-HtN?rvFjoK?d>L@H#nt68%=!Zf;xrJ2bP~Rh`f>%3$auu-BP~dPPf|XTkk$s{ zRF|IDLBQX-`{pD6@5g`eqf@PgKWo_LqA>=>dZ-&lxiK)tMBMACyGAV-fK5dj@z;b9 zitr?zkZ8nz#z5SMnT6fh`11WD_gQ-9KaX;mO>J0izUc;_(HOdaxxRwl=O2VA%*bPj zWwl1gLIYM?eFlsMzsPFdmsCCj{-s*~xOc28-hiA$NRgga1M2u0iHuWydfpPi@lU?< z*6E3*6BDhu>y5D<%*OaXHsk{p$S&CXf`IW za_66q+-Lr^H=u`psGj6+&-AhHtv^0;{|le_C|dnO)W?>7!3P)}@mGM0j8OsWAm9s> zHHjp^uhu1(Is-1Lb|~I~sxCc#O@5pPr{|pu@H-!W$F;5I?D1wXc}&=wr?3GC!aVx_ zgy5$e-N*fq7c309WcW+uE5)UMmYBr;}!f$4dr0Dk||Kl<*O$-O5g8nefYvB8=L>unIEez5LVOgjvsM~wjBKGr{e$-^hWP8@CRd1uAD>fsjs3ua|)BrqW$RSNA9=uuAfO>K0-v8|Nb8w zxnKX8C((GO4S-;*-MRp<7OB-oq5uG@N_IKP2>dNsf3Am%OQ65;ki6hI`7 zye(q|Fg!h{1n|3m|IUSpV(#`t7`uthkTza~^THFOYy=2ngT^AOU3jM?E?G zM?pn!8aVt{lQ$-Iv|-6u6P}J0vx)v^?gsrtAF##1{Th1@qdQq*V%=MD`_e06=az5m3 zK0RkHz#rWE<2TK;c0W4Z+I5>X%^196*>6mg_5ie?=U^aUe5Y1Hz`9@{Cj+WP{F6s= za}^L$d>E$w$7Nz*5t!^Z(fR5ZhVJJGnEw8E003Nru<*7YA9<|ym+pmKCjkg6fUW$D zQUKb=&m;b6UIR{{PFs9UK+0mLz)$zDRRA@>kGqVr{;{Fj`X@~ur%L*U6TpAD_gzQ+ z_`aY0)A`8*e>TyWUrc>_mhgIr5B1S~O&B&%fZ9LC1LD3SSGl9P*r}>209*d)_yX5u zN`tkJePHCiv#|U-s5@DH%_s_9b=O)ICc`NNxf2=z+9%oNCiIlmPzdzMsBze(KPPnbw}0ttm1q zZ=!XF0S5t-Af8eKV)sor4XgL}DGmiH4MC_p2F!moLAY)g?!ws!fME*2Al*MGf&QoN z0+s!t`!+9o5z1+xc-fVp#>DXBv{%tN@j$fT;iR^z0A#`v7)S#m{tEn>Kn4LHHNd?z z>mLsn3f3-HiHFoVgc3sNifG2ElD;7^fd6*lM~}?3_8o5(v)B9KItReOkP&cFF88^^ za!^ksEYJBfGW_m`{tU<}q~On=!4I9uwKw2a&%>==0GWO)Gb|Ye1_mbq zjgCR@$uFXD=oJHZElmOJnZ^9~{Mg9jY<}Srzy*%}g==E%==O0ltx;BANBnE#Kh(K^ zAm0>3yjF?DXBoR|TY<13;1z-h`NBkAIl05s?@%;4ZYBk_jQrwm) z2_clEP7Qp-b3@uTRjIP@sywS4WXpWKF$)Y#UpE5yqX&NCy19vi@0lp(kNKP7K*qpO z=(WLW8xx23AXK0x_$ZYCvfge5a$w)vgWZGGSP#PZtU#y&h`?6hr(PHRGf#oq8wq&5 zvRCqXNHXeK0O`o#Z~xPGfo}dqzziM@m_GJq(8TOeb7j{~gPyoh0jLQt`rJygQ3Pd{ zo*_#q_*Gu)|3z84YZ`FGPwVrnJr3A~D7_B;QH=0|EMQz*C)Pf?1Qgb>m6xy~69zF?c-7!t0l$(u zZS=l&5-7_A{JL|A^>NaTMgz3qA8F%9EW4R@JVH2?Fwq zOX>le0yG>1I$ogcvmk3bzV4$fIA6SYN-3cb(z^8d08H2^ag0e|aC+7R@S%r){?_@{ z6}L|mvx@`=M=tf}gVhJrc)4sRwcUs>Z;gRVrU2`h0TAUm`PqU*GS2U(55qgW&Vq~! zghQasjTHP0T5a`R?CX3eHOBrcE?Hd-k%7j?!NhAgW`52Kz#uP9(T`~dO z@$kjL{N|Q*MC#Qp+zEhyTi3gVhT(h9nQHydDMCHHY${kHLJ~yDs`V7u3hb zJ)ezW$$a&T8U{30fj# zkmne{mL>vmydbNilGo=Q^3gQ=b=w*E3l~d7m{gsU2<2^KOCL!@$U?VkoCc=W1x#U>8`goA-oJCR>vJ8^rt;wUgK1ownPAb_t-BiOcuLupKo4%TfFAKi~6Ag+KAg#}EB2!198 z?;5bbo^A(3$D2qJ>0^F8BuEnM5=S9CttY*%CgQJ2LDqE~`oDcEimQ*Ic-eQLTsVTV zIaeRzvDWQn#}H@o)*kW4o#fK(~d@K>m*LKQN6XfR8=#?(1e7`;SjG_8w*6 zC*VX>0CDOri*xm(IKEG00XPA_pCANZP6Z7)7$}4gVg~Y{kEj7sBLJZ;RtNAMz}RR( zBH%;5;tm9I*mQ6YokjV@kD&KwABJ6M0J8;(t6zb}%f1z~|5Yfbc7t3mcFGD^qZ;Uc z;%`CMykpBZ$Nl4-=%4E*om|%!7{JG0wvbGi36xv?I>4q1APxgEK~{mU>P6i#P_h20 z?C0Z3LAiH{#aASvt$#{r@%Y-U7^i9)NC3-U`yUsk82b}4l|H!@Qe&}A92@AWs1v8}saaFK#zVq-I%(S0IcXIFO8)FSt|MdNtg{w+j z!;^cql0-d43z~qm0$7&dke8$;!+tsNYsp1j-x?C(o1lGm;pWWx3kj%w6ZZtF9Mby6 zsXo;bz^6|Bo0}F|FFrm|EG-f_I4V8F6!7DWzI0jp?^*>|GANlWh#-Etni$0EDzgKV zslOcMr$|5m^5TU*k~gF~7DWI4-IwndJ?S*-xn zwPtv0uxrxF_T_7>L|vNS($(3SDItK5o&4n^bB)W7FSK5KJy1aA?`xTlFqB7>MCGHz z&y+zHBZwAW#pn}vLO&NkieLy#Ch^#ia`Kne0hFr{)&od^o?CeZ^dwMNGh!eS|6mg9 z{PQFq%xnLXe}~qK|2uT-%+MR-?tVX9$0bA}_DusTJo~Vfe$F1|Nm)zd6bBj)VeQk}kKTi>` z6xR!IbwE&!5?JE{f>I{{z|a1ZQ3Uqe5lMnnTtJQ!EIiLFBreUoK+!dj*Mf0pNFx5# zb($ceixA5uf0gwanh(`pxa%>r9{y>x4o;!@vR9%wb{)#OE6{1~Lf`pwY*~lZyFOh7 zYo;hDD1a@y0Q@wNssll_FtF?MVG>dW_?k$n`2_fiSbVl>{Y7y=fm?4^B%*_Wkm~_e zf2?E-|G}wo&*^`4?PBv~$7dRcj~U~wek#ccVF1~KlC5|0;7%IwOGg3_%SfHk!fUs| zmk$9#M3RUBMpDOMmjFRs1k#}39`M+F2nzC^VnO6DCF=y(iHney9To9s@Jk0&`xAi8 zC)ct0#2V=DKMMNYkD#@C0(3BgFA2>dGQBk+Yp)OD>6`{}w;(8uzseTr1ZshS!Gr*AmXG;<*8 zLn8c{{|+$7_@Nao8#1O0ib%-V4|pWQUUv5unGXc)%$uoXEw2Ux($5(Ea;Ah2GmDMeNwG8 z{$;9LNczam0zNlpS;{e!JPUqDrt+9wu|DkY!shio}NCstl# z{0~lzo?C-K2bMe$Skr<*fdc-sQzbfZ)PsPXC+;wSg(z4(AOIeb9I`nBmcry9SbwVw zPY`lSJ&+IvOy&mUBLm@B!C~-cCXWJBTnE3LJo1~o7!+bX^xu>)(#|LyE(2~Pf;=x9 zEBWeh-(VsEyk1-V=qIr_F$MdQ*P%0W6djsEudKh>F$h>ww*q^DQ{lfF;L|AJXM_U2 zKEtg)=Vh~M52-dKM8MZj4yP5sm;wf+M(KJ0y57*k0H%OJ0gDDabSw;-Fos|aP`WOh z=|#Y)AR&2yFY5%5wf;YEH3C+S9f+SFRE5kPAhljSEeJjiDE_iSwZ4$3Xx2E)!+_vlS5=aC85|La${-#6 zdjbglEkQ24Er|2gZ6w<{@4%l7b0DYkL}7pO>-Ar9z8%4VzxI?X{R-d#PgY%l)v{g+3MJQ&bv9ML6_gyIbe0>*)@Sy|WiHDC|2U}R!qJXg$wy-eP zz!vs|EsAAR*kx;r<%fUo)*VL(jltkY=m}2UY==H|K(q-e2|yqOQ^2AbhVmv*pao+} zkSPJ`!l5TpUym?wOd+}fRzi8XMVI&f$*e=plPCmvF^7rjfZY@p0&#X<3IG8-pZHMl z`&Q}eq&vP?zsz!7GWhvcsQRjPUkv!wHQ?6PfuFaA^|5R`f8G!+ZcUph-B;J05C}|$cyzHO7_k=0T zvbA>E7`y!7Z~lvKdO~POpA9MY;gkq!iGm#Z)K{P}Fs6aRG+<2=Ad3Q%urvXO9>|n1 z=modI178Ay9MnS`>f>QNjvWv|1tDYJD}E1pKiSAH`}zp-PyiD}-8%s4BK~;?+!9zb z;A-*!R6c?g>N*RQBp=D6@(~a2^$aL=ulRr(n01n0TjvV+8C0Mc8-Y3&(qqZ_hkCf3 z3iWDP6M^n{HNe;HQ`apeDF5GSJApe6eJ372{OvH-q9`n^Eno@@Q&?DQ{IVwi|A16s zJu#R-2o|>)YjMrb|IUe`**HN&%huTC&;DOO_E-&uUeKu_7E3xWb9JQD2!5yzo0TC? z2%tXt(&+;spb2Z5Fs23LEE;AK4qX`Z;7lJ5T>*0H>aQq*?6ch|SaX05$_s*OR7C8=0|{3u9Q@gCzC#hi-)E%Y@!f(iWPOW%q!dtVM)c&l%0p@45- zm=H9;dD(vFb2lhqsHJCW6Uka8hrcz{D+SkW0qmevN3k~6Su$p1xE-C z0W)7xZS_gr-~i~v$|R)0Ozxx}F6#t1C3>z8LL2O>TX;ffm=>C7p`?Czt8f=3bz#vD zq`=P%5aNSI6ebYqNkEjk4hU_RAuxnau0T->em)0(p=#y7BE4woRUR2YN8|-|3arCF z+dZhhc#Z-f$>-qIz^oyKq-|BQNrA813RRy1vI2f${rMWpwv>45tbd1q5AJ;(9z1eA zFfolrp}}qf0Tc@K;aB+A&RJs;ix0yDU;+ssyhX_fDR{dS`kygJjWM^t;1&S*C;#i8 zJ!%Y=jWNrBS-$&UzwLQX2o334l@2aFKazoT95Af8NK^spCVT6}9mvT#Q5DXiBt;1D zgiu(o5SnHZ4m~(mqNFZL>cAQYXM7BShx_=w032A1F9bo{&JCA{e`s#@@J~Vzh}Q$j zwc$Jign?VlhmvB_B0%f&x{lEie^oc>d}@u8Jn4J})CBw)80F4Gor_*hfu9nK27a}E zeZA{QLD$8%<#WXxKK#;~u)6C?FY|4b`X&bX1oYN=D<9WI>&~DDFB=Vb6Gp0)8bG>E zmSK*1GBCHm0N?p*AM}JkScb7D?)+D8xew2?6z2gjNR|Fd0Gk8CXH`c}t^Tlj2IWB| z`skroZiqrCjE^4_riH>zp>$msB9ycV3WQLi>utS^5&)hY_&Wn?K9B->B5f}s;vcV> zKu`#9FjzD4P<2pJp8}E23%1kx5-??XvGgiG5d3xERA3asL|%V-3~4h|o4L2eE+PBq z{V8i>+&^BsGer2SL*I#iJbD9cVbNfj&sJY60B!Yy)Hg*0x0d+g1_-dN+76koqCaI1 zBx(TSf*R>>M*|t$0szazvKl zAs#*jd}8VA!CC<>lL}ukr2ujjA^D`fNFH1LY&S8a27pOheW|Yw{8D{dpU;PR7};?L zkxK-6UT-87sN>{h7fC|b1$=z=3Vis=??Jh6Fhutw@J(3uWDtgwZ3Mh!i>@rbv3}TD z6oAzLkAHn0aTY7P0ij(&05Xw{*F(ztoLK~LbNJ!9fA^Ow04)Pp2C#hRuYBVbLPKt) z?yL-04fa9cuLCnt27Z|Iq5uFO07*naRQ??Jy0c{4$YmWj-R96kw;w=b;0eLB(6Ccz z**WxG2hNq~Q5(*6VN4$|{)3`ElCHpC_YsewVCBoC@(Nt3a>()w8V#U$A>#GG;NiX$ ztW?P-#3a|S4wz8+!SzXAKRH?9)R>X5x z`FLG3u&Vsvi2oMyd3{0{IeFBr*XI?_p8yn-lUUrl2eh_YbBvs%(qlQ*E@>mhVNIeq zt50tuB5XRshi9(9JuiPd+{`ZT#lr!4{*-IzY;!?`#RXCTmZK4@B{%9L7w~h z3CLwXUK8h}NGU}EngG&OG-&(Roe<0y&ipP#@I!UVJmSxvrcyU6%$U&t7SLuSP|Zi+ zR!PF8;IF9z1~@KHoD24@lk1X9@nA`uKn`&sP+q!5?ao%b4c@==;uf@NU)PRj)xj4)>K< zH%QgbdAV+WhYODI!9CaDi&wuzhW7L%9vf!vvBkH>0utD>{+$OZ!VeDcDZq0XASeMK zl@Zwzh`cOcY0Q-q3(79Hd&|G zx@xTzIZ#qd3dEW`a?obP!1c=Ug>X_rk#0@O`h)z}fb!#$L#NyTbps(7pkXIa*a^_? zMYQ+q!^*4M_;T5SJ-dpTubjiu<83TGzJbZ}eQ;Ny*h<|u-Zvux0G}-8apx=FfwetXrgC4C zfR_FS$q=6bD}pSL7bo&W3tkECMF|hX);{&|dA%>|{~3487WX1{VCOJCc-uE*ObR(fb!|D3&mm9JbxTqJ_z zdZpySQxPJl#B?fvXTYrikOpq*LO|uy`uGH5o~rfnD+l?Uxc6uhlXl5QzC{C$6Wjf@ zlJKD`uE$r8z5z5bjYd(ZC-&-w^pFni*&O7lpYPGERR9Fg;@gK-8)M}Cvqp{Qg%wc+ z$g)4@_&U1`m;&Z!M*xdUf_(`8j>s-^Azdc?7d(3Hwj4;qWtE9NHkv@RxeIz0pJpSYuv;pRY|0+|+s|M4(9})ThDD z^#Qz3eSP%`FV@EuXz3n_ijS3%fL@l>im*byLxhh{T!y<|{SNe(4#|WbqyHK$`GYTC zWRZL!04q{m&)Q4<`YgB?thai7Z4C)%$YiS9P=ypKz#e4Lw?G1gF_>>yEHny~{Stj5 zIOn#J04g^*f+m&NNVkX1QWx=u?nnSY*(^Y@)`-W_WWyF)I`uH%^ROX2z`;O5cFeT> zQ3WV6$bOCp{r);OX-(oA&0-48Vj5;{0w-x5Uz=~>-j_Df=sWB=+sEZAB@Ul0abVS9 z(hPY87Y04xlYy1bs6qr;eL@(T2#~Dj`k?BAl#7HB2{^qTIpIW-$&L%Y-a>ck*gpRy zwD5sL-+{9)`)*ik(JZ{Qx60qogM0#dJ&P|HzqbPVWWtV~sFMf%z{7X`t0{@!A5!`j zYqee#irw8nUPB$%1QMuWf+50Ss<7DGY5+v&^-BT1qis|G{$_1`j=u(vQ{^;ih#V$D z-Ed!}o&@-@V@Dux8&e`8-9DGAi3n;J_UGdY9Z6XYz^ub3KcL-R12uugnMIsGe;!36 zbhbu;XAU)R_Aqdt0UABRo-kN5sB4x2AL(&x+It}k?S1Z5KLDEB?d87A+vkUM3N^$RBKk!b(yIl& z3i^S4b>lxd0RWbt6jg)(D4*U$l(Im8r-Q`cQx^Oq=#mP@14tmt4N3)oJyT6g!=Ud< zlqDs==lpi0M%n=&zyVUQ>5jvo<((oJ>+-Ra38X6^g|cXr95W90MM6mkBtK?ePh<_X z%~i`fO)&mgA&w|*6c>UBrZ58jXkem0Ns|Vr4^QIs;Yobn07chf>FEv*p6+4)=^pm1 zlxP_f+lL6;Bu_d&0IXR)R+AG!3eH@K4XzvE6YG%>xXsYVi7i*akH`8PHSyuA--7d3 zyv{$hXDw_a0^b&1!drecS5MnjLwsW4WnR8f(|9eQfXnxXRG^Ltg7F)DeSd+pLqHnH zfiSAj^MFq=UoE+npx{iyV((-FR62CaG6B5gx7P(wjF0q&rPex-1Bky9Da*CMQ~7}K z8o=@e*+RrW(uuO_VV#cnXW-9|=}1tWZHEwB;xdTxQ0pDyymMpN^^}_|eL`JmH(~J1 z<&!vb`6TWKq0x2Nb*hW~Py65Qb0r#l7Z}7sgf(F0inRr<%h%PBS!JrJFReQ~PeJk6 zmE%cWfLa3(aJnSiv3NDU^6Ga2lQU=*{8A1-ZPzAp-&Ev2jCTzrq7MsW2ng$}miY{H z6};nVyCl(mL=s38zlpg3Rv`gI$#3|24YHOHY(yjEVx(!zWTY^d^%Z$ z>$3(Z3X@oVzOC^)hLqlC1L+X`34>FYPvF$$Eu09~boWV52A7@cV*jb0w?hMgn-W(& z5eQSKdG3^|4yf~u_g!|5_c4@})zU6yLc%dRMEHcA!`;W;iT=Kq_?L79z{h#}*|Yf} zk0i*4WGp`h^$_!b%;IC~4M05`rag9c6;d!nH=Wc9z#1#pA6!?31ZwVgD4UZ&zR%)B z6N}-aE!}>ZfV^}ufF1MB3$krUG76x!7I`Ai?0St=xYv3o~ z7f_~P7d25A@#p%7kboRR1Kz3i;pZi*skith?FI7Ya$?t!LSBIkz?uC`oW87q`(HT) za=_lFJGks*5BpDbaoN+J5b7*F__`wZk=6pDRlN>7}9R^4^_7i=F z4<3F4PQLt~!c5NiXZ2-Vp8;QE`SWSJHv01t15m?vB*T1B$}_e^<|C2-5i5cC^~nUU zL?K>4vJbdi?hXtffePm96u$u`tij%iCR)~@*YDT+`W4^bZL5iWtliwsf0`z))O?hKPfkL$3z$9>zMFGEwfYcy@Aw0dWg_C=l zxbKxya75TA3ZaJsr+V>T@iobbRRk`0Lg_Jn-t9 z(BJ>k@RANImY;!dlX?3wu;;Bm;v>4++A|rb;k+2lM+Cj70EE}d`6WUK5fA`a*^Tsx zz{m?_W!s=zyJZr{eFI?kL<38$0{wo8PPg1L=(l|oK!e$X3D6OLw&a%@@vnd|CmYp? zV_8KA$$nwE67i4qx~%lz(w5uTIW61SHyk~OknCJcY zJXm#^nlhSjPIMfWU;JG-_sZ`@Q50wt#y`1N6fhRqlY2&FzWDbBo&YRF1;B()%L~}G ze2>;YBAx?v;l@zVO$kq!nQ(CwAz zmmb_iae|L?t`hNgj>HY%KDZsJ5iMtp)nxGJRzm+x@~Jh}3gO}-{=mRF{yF$FAg5M8 z9M`F`7ZdSEYW?|U`RB?Zy~@9eEWNmbb)skiOtj7lis7%Ga+i@Fmsb}2$$brc?Fat{ zOj?Vji2_p(J%HB352AedAFy%H-RPZq68&~Nv_&0Jkz6$&J3ik}1M;yJT?VnKr%S>| zW{=>Z>wXxR+l`if5ohw~t{T(NAInwKcl{^Kf(n3@x%p|34|4JI>+anw3yojZ-0&JX zKA%7bQePxX6SO)LNG%EEdS8=(8X2(0VE04=i%pAO-(j;~1$pV55B${(`K1bA8%F_v z*zr?l=g!YXYhLM9140nti6>6u;KAKB)?3x1iGmbRRsD6~hjUrIH7b}_=U#OD*>enxlOz+f}O7c-xqPid`|`u(C#~I z^d0E%)v%Xejfw9zSiH4?=_ejR^NSClyzkRkzvpAl3Mw)&9mz6Bu`K%^u;#eMiv zs++^-ss&hx9?JQ}x&0(0KqTlNNCHtEWyt`u4U7GgO%Mp1Js#KR$UZ6)eCqNX_}lgv zKqAKzKqKjZ3Gi#cFLeM|dEx+e+pF*okKTi)E<8*aq>FBF(~{41Dy_(9P9pGNzhyU}^-DU|K? zNGJ?!eIBx28wcQtKH)>VUWSw3{v$9`GiX{Hqx|~)d~)~8TfdDHfnuji!41lTezDWlfnNjfpS=1_c-<@Ch_~Vg008GMoW)n4dIa}8 z@KJp6@lRrY7h(TpyRd)%BD8xDJ6Q()aMG6=@z-_M62XXwzjKh|`|`>#1;5_k^JulT z9H3A}pl%|Vq>Lt^gwT-vOj4fvDRDiJ%P1Coy+>HHgiH48@A0tNmb;oDGB57xu-=2uSD3qWA#3}}< z$iY1?^Vv3$n79v(8kalyOB>gXfUondUvR_{U==V#sdnIV;5bU=d zMC0{0V*Xzin0ew6%zfzr;KZlV{?wi5o;r!%#+ne*Lmh_?AAKWMuYC*5)QtH0$?%?u z!+bK4N57y$1^0~20k493P~UW5OAZD;&)GNX%7s5Buz`)&%~u;g8>g=ggBFM&PgFnv zctQdyRFJ1e;pP5x0d#ua>X)Iv4JLpL_!{(jIoWr6CIZN7!NvL_1;2Dg1%3fn0{qyK zN2O+?h0FIJ#pU~t;>I_=9e`H}kDq)5pZUUFc;Jy`OwE zRbH9I+%K3|^RLjXMl_y#tN?MGi)?q~kKuub@5PCS?!u|{FW~UuCG6QVhi0=#)Jm=V zhhE1;8PsYSNY0}!;xBop&o=-)Tq?i9FGP#$*Rg`}MOfQtvW3Jqc$xSO#+vvtM91sS zZP4J4>LZ?Gby?kN-yR3_DJX>20?fC(5sg=VCw5H~cxO>yb7K={o>{|Fr_bYSPn|{A zQS!XLRd3^(MTcIBw_X230DzU%v-rYS?!!NR^*(&^!9U01t|qR! zYF}u3j3cD&g(5aeBL19r;wmU&$idG9$)v(v(8O_mg~SkyLU`e*ZWjOnI?2aL<$XI+ zJX-pM2$c1YWg&G7c_Sw{AQA+{ma1zc_f*yAh|nj(X20~Y4*<=@SzNVe0k6L1DB2qx zoIAgP(<>V|y|Rj4Ny#g@lDG1(|E>rj0^Nq|mXd((Mj`YHLU?#LSZ}!)WIYKmQh7f@ zWC{gzo-x435a)nNzywz=>&i?5)&RRF3M@?&DEkiUopOM$?`r+{TK~Rg9jR?X4%7{J!fpz7~rAUA+q{X>ic*C_f;0@Q_fLq>r8~*t3eh+8yS4o?ONBmP@G0+)A z{vuQr1G8?w?4e)wKxEOdlaS#(5TJuW0%S#yvN`~rkE^dYD-##@Nr4?|=eDWZHTaY5 zvSYp;RW(4;`h;u%l30r)pdTde8S=h(b7l%hmuB(u=0WtkU97HkaOOfAE9;x+^aE=s z0`N#H_;ZcmDY`n~$JW=V%V_}rCF#&mW5Q$A;Mscs!YAb9o(e&SV-v-B032kL11QE( z@<6P=)(_2}o#0|P$IS-e%LGSO#q2B{Gx+Mr5 zSQs>m2KMh=z>5y=g6lb~b$VFY=wM}|i~qm9FORb9D(n57TeqsZyQ;gZx;p93Kn9W! zAefFAG$@!xoWS?uywv4W`?;3$6cBhKEbT0wpyCkLdQasc(?WfyU=lz;7h(b=gcp${ zBoN48I^7w1uCDQp=X-ygv-kde-`?jARn?iiyVvcy=j?sH{Y}5$-e;e4&uMk?68PmJ zo|)>~g*~rhxluzggK##gyZr^l;$L1vhP*s|4@g$)dIWYpkN5W$!08CpF3W)3o9ozG zA48{;W2M>dyTadV%CATN975Oni#jBU!9B`;y`>J3XvN1qW| zgl!Q7*)(dWz^_Jk63qShcJ_GJJOO@7UZGE*D>*t{V5QZ8ESEEcu?#cQn{oEsG^CSb zx!uJ=vx9|33(ZbRpvb(Q;SAh6*S{HB8C{@M%^CnH7ZPj8BsZhHpY)d(8r+tX?-a<) z<-uaTXY2SF&YY;DRuil?+vRorYS2e3|B4850<{A@%AB*a0F=a_2d#}L_0)>L12kuW z20kUY`SA~rI;Xp2$mo$?2>tgUg2LIsks^X_-a)I~M7!HcfS$q6318ZmIiDf;%Z{W@ zr}D-hKZ57w>b@ZlJwl5IDqwY>5RnQ%Od#+?5c;p`!?(>v%OJUYdJvAWWDMlU(QN~( ztqzVY6?mGc)v$GZ3}XiSWN=;u?)K=#xXr!L#xxl%4#> z6aZN5bg?yjA3rPxaWJh*+!=v^}EUQcz3&QVl6=8_9?Kd zX}8yLX<4`dEEn<%{dX zPG1M8kci=OU!iBG+eWM1K)c&Qx7$r7u0CJ33C=(a`?9P&jq=mw^5bvyEfb9OftKM1 zQ{Q*s6u{`{t6MJeRh{3bZ}D{lQq|pj5$Mf=U;%!8Lz}-{eFKVmEO^y- zq+a5o0<5pUXYO3BU&(-NyOyxJ`BvQY@1MjIhfe~XX;OvzSSQ9ZOxA1I zJy}P6^Eg(zIhMP{?aj?j7buqefElO!?lwhIUJ(P(Qm)r2 zlEpD}vKfqYY>yTH2>h;1iZq}>AAz6q$mI^=_POL(=?a#cg5yi8$WX&XJ;Ubu7|xm) z$N1(+EO!N~-5iUp9F2CT$RYO&L6LGHu(&c%SebbrxO0XKz@}OaXHM2JSx3)eqtB&wl_%k1nE)?RehVFU7-;K7hINi{pxgyat+`Rdl)? zeeRzaX@uA{MGUFq7*#&)RRWVg9H?oAz@SqgHejh7eSLeDAAGIq!3_fu0HMDylPSLs zx#ACRhqfj3hYJ0j-(2n_NKFw*h((SZD^0<2qYcO^1cFWVIyTkEuxql8iLDb@=?GTx z97~-XjaE0DB+$(Td=pR&8RjNxn5ox`QGd0GPB*N^Cs+D=f!<8xQ|I++nxC5X6WIN> zZ_9+gzT$5M_EGEkNUylAh@gI?7v*H{QeK$#AW*>;ohT4&-8zZs>2Zh%mgRO#o!LaI z-9e+Xigu?}0p2QL2g2)nT%M{6r0Id57dG*)6XE*^J_#U20Fd*UAUZ|?o^=;3-wRbh zBM=%}RsXq>p>)vTX7EO%xFrwv83_Em&Y078Ns0jRCtR$1w(Awbd#|{TS?(*YRzeUQ>VCpPc%a zF;JKL%Jl_L1nh$iD0QDiQg)<9_K;8{=^PkwEAN=^iDAn0Utaj~&8p(IHt zVb)(Z_A!vX9U$N)`tjR&XzSAtVfIOng$y$|&cj@=(rja?A&|ue0AR9S!=`!-vy*k~ z-ZF_sSI`77E`rTjacASHW~+EmM+InmUh;Eo2VL2BVD>o=KggtSP%G*^d2A>FIA<%c zgbWM73%AI^wI^b5TDo(SffN*kOL2rL0bgbxN?EQw6OXYo42KBLeUQFBt>;TLT4K&KqA>j43K>o4?UAm=`)P9k7ZawsR$G=7*a3vAUP8Omh(<&e@BtU`G^+To-ZzM>(6>u^QOEj3R*6^vF48FmCkPOlBtm@;@GC-z z^#=$P9&~iPA{K6=fzI_#A8T`HPq~At_Wi-{^vp@`0CZ7x(M-X`s|2gPwx9fEo)~cV zTjZnf(P*!}^J#$Sd@j%Zi~XP(FZp2uO5OFS!Cw8??V{i6*LFkr=dpc?i)AiocN=K5 zm(c306xZv4IMM9i$~J2w3$0XdvVihWZyf;I2E05Y&VbwyLy87=X~mD*ys&s8jue^raR5 zKnXFpT}2F1+n@E7+wBqPd(n1jq6vOVulTEeh)DR{+WVJt+K^pXyvzOTw!-KiZtT$` zJYuk0Qb^S41wE*CcE1{M%^HA+-sc0i&Qj+NoQItf{-G7(!xaTL_1bPY5cDaVCZ_R= z-}lE5$+6s6z{7{Xg0CL@Jnnz|vyl1{CMJQgx<{2taG&Tp57$o?G>TTr^2tlUM$n6~ zOuNest&1GPliCIAPD4&=OP^|32p4ZRr&&$hwj7OhC z?*ENp0RLhTFk`OcwcR2^oC5fgVQSNMTz39TaoPDV1@Kz5yG+Dll}_>)PVSyh}0;nbl1cafTv|DGN@Sb46~;2yIa2ohEi0%)JFvR%_Qb`p~I_A}OJOA_#&=cOwmopmd9* zAkwWMNS7!L5(<*i9fBeupp-O7rx_$?svMRd^c4o+RM*EpG1Y44Ac?ipSm(Yiax4YJ4d2PJn76zj)! zFZLyE&x;^+1fl1~{fxIwFEMJL1zQnfNbR6mnCfsn)ZJ1LsvO~oeRU~F!`t2XZ0;59 ztJJ7w&KC`#8n}~na|-8#UjC9YSGPN~<5ExN3|FM<9*!jzYvp@YqG)bT=xIy$JfCnq z+clYdNdHsUm1llQ^X26#%B?Rk8SQKFab?l=8nW za@+8d2BU%(wz>5HA&Q+I7r(*Q&v$lUh`%=2>;axa$CDhRbXXS34#c&uZNL;c1`zrZXz9kHVm z{_GV|2_1~?MOvh)n?k6-Ob5-H^XgFLY>+oz!tm)h~hO@o| zMG~94!6$zvD{`kZ*EG^iEjZMMuU%jc^z~h-Um|V9Q*GV6xBmDMnG=pNZdvde}NPN%b8&wK#DJ zTk1pLX5PlB1cN++)=qTH&2{~^n-96d zyBXe(ElNC$(PJz`Z%a8$Xj_onh!H+|aU*y4jKM9p{&!tLUi5z5bZHNcd?=PGs_#z! ztgNima>6^mFt*#?+Eyjh=P>GAXWzN*v&cGg0Vy}{$azoV@GFEEW39Dg;yq)y`)i}T zfdd1dR=b>xh~t1YydRCSwe;hN^AUf3Gk8LPb2WsV~s$1r;u35J*rp zlhord5h$Bn5a}*FZAwUcYqMSaeG1mc?RUyUhV}aICpqrcLXx1H>prH8S@y+51txNp zJcEfoe9U@n^Hp3CYNHm>cf1S0+Q{?{!;_#rWJ>FPBK}f~%)>|rt{B&u9)0nh;17*IcrdLK zEQA8@(K!=`bM~pWYVkZH=sGZ~9$&I;{l4ikz{MXx`2Lf$m;!F?TJ2Ui*5@%=IwBi? z>(`Zz3^|NSD99ppt~_i@Fd)5w)B(pL)r?vc_D4Doc(!ueuBAa zYqmVvCd*;e7=I*bx9`{k!8t-P)K0=^%or4Ej0m0lshyB=6$WqYWYeAt(*MB zWk>ZQ&rEK4JBt;`En>XBjArfN4ED%4sKxjqWzOyK?c>$w$|Ib4ygmVosyUV`4& zI|qH@2XmYaIK5Am2EH_6EqLaS^Km-Oht=1KSGIVhF+u(ST{)Sh(3)=C?uo%mABfI`K*C%s?*fl&=_ zt9ZBCdsK4JJ>oX5b~UWha5Oqn(qVHNKXVAuW{fQyRqy(FI`-bB!X7@Kca9he6`q&d zA2pWyU+=s;eEK227=Lb9mVbXrHp*)3o;Pn2TX;`==#G{09*(HGS0_pAWwzb3Boe zdXj?`eUH;ws!iWJ^Oz=rXeU^wC{QC;#K#tEn08N@Z|kj15l3ch75F;r;A^(ssuu=0M*< zEAP!1v&XoK8!608eC2WlMscGS<0Wj<`@Ah*NOg(ZmeoI|MqOc&jCvAcO)2?pu+47& zUIQ?2Erj*+{MFhNhJ5A1OU!rz99(z)CbVLo5xCqU?xGs-{ z`caYcbvf)f6tBMtAg{ zvBaH@9#gv$`)ZT7?k~|VJP~Z@gk_UNb9B1})_CZK@d0&CxL*4|R$HA%4zZ^;y^`Fv z32n+(0_@i6)l9RzxNKZFywXQnCN0;oCud}`P<36Dl7S-qEv@{*%UzP4FKE`N&BV|S zA4QOoy$|>jjBgrnU&Uh)6VKy9k8a;%at7-MzR%^h6CZyM z3xm!b2S5ZjnWP zRDB1{`+#z>;jlMQO3OD+oO(vTaTc{pmC;wT@#$GK#kkblsqar`d_^_t71+>E3Y_gz2~|y3t~W*e3RR z;P38UE5Oq)XnpXRpSn^1lJntfT7mIty!xFWy9=&7{*Rx2@;qBcxWgJ5lZEnQo8+&G z5>qP4$FxuOyn=cmz>Z~ftL@glAGOjo$%huIk+cSs32>wpq0`Fm%#;R?p(v58okns4|qFVqg2+=r(`xLR5Aru!S$=Ys0)$Y8Yl zDxIIz*U6A?@Eyu}bMr#@LD7Si&HJwBxM_FPhndL}LKG>h z<}%%eK6;cYXxHj9HBjO37H-gEz7T!yTmAI|ZxU}n^3gl;iBAfTcNqOYiyD0RSm1fd z3$Kj89^XDgh}5A4sr(nTV>kHw{lt}>xf;~yGrOA+?a`RYVNTy7t2`5aMpf=Uj{8G_ z=NCz|@axBkFmv!maHW)UF|DuyH69s^yct4b_mL=7-sTwD;YX>Kh08FnAG^B>Ds<5*LFeA>*-#cy zQ;}(tnx_eNwx8+*oMcpPtGrm}B(cVs3fg=>U67>Si>F}rkn5Mw!|_?E(>GmbCBqd) zcP%&FTM~x;?$#;(RMXw<(@SX`H|Nd@C3Q39RAsLU zlva*1l%QS7z4evI^Ul)y2n3Br?6t?0{O9i6Tjr5(%{-w3+w!n9qR$KMq$Z+PxDxFeIRA&_X`>9fNoQHA!LfH(FXWY+; zG+Glf5gWO4--y8U!f|0%;mguFc$zu0piY3Nj(@IZImQs@mq1pcau0{l(P^56BaF&d zr|Dm5VUN=mW{9?=9$4h7AEnfdYqa$$YwRZ!yM0<13BxHQFpk#34rKUoWulxTFZpzN zPidCi}$rGkl$?PinIh(-uY?rtu@57$WJMjv zMc2HAFe9k16H6XSi49O9JUHPteaFBsa^dDNhl6^!*A z$XjSLqOe|v;cdkgJv+1#w?6o0`?TTF%@5>?+dj`Z@)JDWEXZAr)ig7TX|LYbXKR} z%(9LBozaKI8oOJU zretA=_aetesGUW$ZX1-eZp{r3WP$6?E9WrtKI?q-Yk5NR^`Y)$lpbdzqY$-9?mM=w zg%3qJ4g><&Au8%Y4}S6U*FB$IO4uk|zJuJ`LDvw>Tx-rD^CGI{RsPl1;=Rv!URci0 zbJ#pfv1;v$6Xuvj%Dj`Nvc)3zX`Tm_r#wD*L=al0bLvpQK@iZ5Lw6NcC{Op{otz-^7fQ7^PDbz$;`qf7_ub zBx>X>RiN8N{oxR{CX*VG%SY?+Zgj1Y`z?vrUmV`#kHHMG#revvM2dEE$xWL6dq7A; z$Kv=G;(NWCi=WmrDcrc}t)gmZ9F=J7kJjgiuxl699P<}h9@$p;({t|L=5m`^w)jS% zGcT~3iXXmSYbYi}p}i^a&Pz1H^8F@!YAWcfa*Xru{&3>01ig9gk!hMIa zr2WftYKgxZ0_jeXK3mxGw|I2MMI~)J~^Uut|tG9LW>oqWM@WM`4x`Y{+}}=Ti;zeNdIaP4#x|*}5QZo@%{) ze)%U)p`+T}{I`9#H`H(#;^q0dQmDi*ycIt3e!R!@z?%$+<<4(<8Z6}Kzd1d>U9gc- zc6gf3!$FaonVx%GIKnCj?_H@LrI=8%Ur?*Lj-Nwtjq*<Wsq;zg@PRPC%4@MSIp2*S@jUs)LDNM?!OnYF zRCiR^FP)MkWHGxRey7=w#HzGj#I%b48HKt3McY&R_c3ldUngerEsl-)prWBF;QB&Z zXfylbML#;8r)-fK&B@}L2T{%G`pJ3%EvS#JicH2uqTTk}#$wqXOtt&r8B_zR^$+cp z_8+8vX`HmAz7+RTOUv5O@?pUxFwy>%;2qu+{s+_~41 z`1p0`kvKKR+1kY6`>FdxuGjC|3lf|y#WRV+%H0ULpVh!D!#wNWEi2u+W9*n;bTtj{ z(nvZJ@ssr^W-iW+kLNUPFoNoc=x;J=VzPK|;p8g2z8ZLjNjG`UAWws%Xil2z>*3}_ zg5+jqZGHoivJ6L6Bdi5GC;dU~Y+j!F1-hLksqU2@d=)*-M(H6oE0g*(ycPFpc7#3g zXO{=KR7rKOm0`8M)J>MWcIbDgvB&xCIz?_~MUFskC#>%GE{ln*amhQ88D?u~&<4D~ zJtSICc;3m_^n;>A?`BaG(;1xhF>m#s^BJTpCeBnA=S*@iS0gsD3#d#Q?AP@LwjFbK zcdUuV%Dj@(f)fi~3Q)ec&h)tQC3+;y^q$wPP{t3nT=p*$*-vx4o18eK!1sPgqMs>V z@ZGJS^@XNhigjIO!nS2MEw|4{QD3r)WOT2*w2+&ht;-}IF60wC<(0J5WK`A&wMml~ zKZ;1Y*C>}X?R&eWHX9|odfCwybg)^Rf1TMt!*vyvMxKq0ii^zOa23<`i;#Zpi2-_I za%D#*6Jo})Z^!F`L_CbBRxxoeTu8{H|H|`dieDpE^k%y|cMOd%SNba= zj2hP`VPY~8-Owa?{yI(G9_}qQ%V|fA4SCv~)fj!R9R5ZA`_A}Sgt$hS7_R8nwMBR7{?}}8{6qK0BK#5(!^<(6I5@L$_I93we#yhT*648< zqL>tPbWMk?vDmKfB%ji7RGGx7SYQWG8M4eURO&O!oVpb|wHdms)WO9@j8U(X>%N^W zMC4(4h#ww*k4zN6qL|j6n|xk4Dou_dd)u^ z^$efFrvs~narot4Ax}9fr&(@LJ5|q}&w~J+jO6U$sD*6h3}TxK`_%YH)7;WZfsYB? ziN%=VsL;Z@r|9ZtpZVMNB3MIY>TNx6yj5#3yPx_2rxmXMqC8-V$fH)XOf}BJofk&YpKYsFHXFN(ru?k; zXE_?}yy>D5W{-%eS(>$)-7RdwE>zE7P28)V< zP*>n_7sg$S^gm`et9v(>GKn!il3j2nx4J{;`(xz6!z=-E3p<7j>CJa{f~hQtmjcFr zq!^IdsZU?qor}kgAB@BAra$B}CvwxFOSCq6k}@-MeYzJ-VNZ^Uz_(L?4)@mdB@sP4 z4{RO#E+ttTw4lY^0CH;QwcQJv_pJN*y!}YK@qQXiXQ<=dDaq;Q`hHMf=rg*(=n~pr zJDE25I*A+AoL&~5?C3@MzPMCy*s9h-3_n6%ic~L@`8DI^#JU5s-Lau;ZxyG9%2gBv zQsg*6PrJzVZ3BJGG~aJT8HSjooZhRUu3NSw8DycF}a*rrIz_QgmW%bPSmFKFmg z&xd6Pq6fK_qS<=2)?u}7b2s>FDIEmM3}5q))p7!Pp2dO+~Qr zw*J^5|9q^9f#$_pg*40pm*KLksR~c`v{0ghW?rN2ICNphBA>C{adL)4cC_d9xEOb_ z`W&n1FWFpTTH7o2TUmWxaerw*C) z+@$=Rjqb($QqzxM-Tf*Gb;d|uO8k~Sro|1x-OoNQIvz*cKBNnc@$%K{b?z9WdtW#( zmP0qf7F&Hq=ZuCK=9*C^$=m3n5;TKdn=MNi=ffOpmS4%(tZGK#Hk=N6yWe@Sj_z<| z)UG;iexZnpcx`wK|Lk~Id8^*~!mrw_Ls8d#UDOKt+G&(?ufEq$TC{C^ll&A$e?2jQ zQ~ArZ+f1}ET>XmYTJ(2hRtAudac^QP9r1Nvkw`oGPKbB}?54#YMQ_U8T1xY%R>~MR z$GwJUI~0sN`tw(S{nv^(WB2;UF7EC8z0OlN;-+>)w@n?Xu5L)nd2$N4ULF)+##m81;&PG{wFib&>EYxI$3?OWOG*(u7EAI?#1X8PS@IX>uhgu7>VN0#U% zjm!$(N&E9wuYM9%|4g|3!-b4N4(@wy3S^3;(Aa(9Smo_d`Sd1SzKFS%*Vx8}RdYBC zyZ6!~OH$$V@T~|J)PCLOPQcg~4($9r(PaDhH{PkG9x}`e6bA{<31v)nx7#}#^Q)(q zQa7fYueUz1-Q`lI(G?pFF;_gtmow;t+@q@K5@#H#)NIn9Zd=#!22;#2@zTqpg!(I7(e^&0_F_c8 z@7P*CU3>YshEK$l0#iq?7)@r9LGxfsm310@C?Lqwb%}M=vaeq9)z%T=eJ0)>YCm2hT8fkG zY)89V`)kpHEjRo?WPHc7aJl4YRI!KBXww{3<;0(Te!u;_Lv4txmt2CrA+_r(#=-1) zo=G>OhwB?2-#_h5)^n0}&_BM8#%o@jg{#-wyH`7_e>iq$DZ+@ekltU1{W6OCbKvK( z-ir^54(o%1-;FJ7SA4NGazEp=@;ylAL7^=iSmrn;if$X?zB`;86Y=c5hI~Vhpe>1T z&qY)`S_&%CM#D;7(1JL`I=)%|pxgAtJECMBelGWUEex-t!2r9-UDCVlr>18lQn5w0 zctxIeT<>iY)Mca9?Pg33G(>T6J~Ce!2pSx``i#>1r~KEsr0hEwaoE>5HU{f#rUS~y zV!Lrwwp_8p(0_r<}JETVhu9EmwZOis8xhmOMg?1n*OAlg??B(wRIOeH~Krdymn}x5tiFr^<4> zipj=h2i_sAYQJxCR+aMTvr9kLhrC=-UI!!OhFsLUmQh!X+w9kGJq^w(MGg2S*BP0= z)^#Zh&UKemBij{s`X%T5%4p4vTA00>TvDiGed*%B(c${!7N&&FFKaR)Y%d`{xuMy~ zrI-ea%|^OU%T(y&y1L|IZx41iGDy9zuDTow2N8QN?C3eymiJ;s)KpyZM-y|W`gj4I zKfIi(p@KA$nK5j@X@7P1RcmD2_R}kbxTDPKxF414Wxk8N#0$i9voI0bp2MqN(V#pU zk0Cd3V2-#+ty^?AWQkB@hSlu*HPI#|v(@#w2@!|wpQUuY&ZXnlsxRzx=MzrTxwv7GUnA!*216IR(=VG=b~QPd z^fcS;)~i(?Md?- z^$hG%Z7ad?w)EEZ4`DoOQ5;_EdM-cwz51tQ$e~-!){HQGuCHEv$oo!9l*b)YTd6Zt zovzBnW-n>HlxXlGNw3C~1@mzl`VUudk8M}|U0*xt8>T^fz}ViF2Fm7& zX!(yVa$E8SJr z(U(W3mn@_4ON+gF(h~}%bEmo^Tf48x|qn8>jSlK6TqYq2O9E34QGuJG6RZ ztwme3r1_aM{h}GT6M|m9e2t#g`-?p@LQDEtTl<(~NNtQ$NN4FCP63qeoTu9B8C8`I zu~hv?aGC4MZ~*4!l#69_M&%~=tEl(k6%QZc>F<8`DBn+F(Q%%L-z{wKYL-63|6yaR z1OGdf7-r|VFQ(liq;%alm5sgNC7egDt1=x)b0{B&8lsP%`_$}j>MvE)JZo~{fU4jb z`mW^cP;n5->Q`T~a4zn|Lb6~NNh2Al8NQlWLoUH(85|sHL$AO@A*7nfTNN(pRB-bn zyK$jny0Bh`9%lmcLKTMUr|oBqcRp&B5sL=gelkFM1m?U?h=k8zj+@uYt z-QtPu&5s_T0@S>{l-TxjnNjy_T>396;`XD}mmPiPzY||1VZ{gu@_Ki=G6T)q{NzWcqyHxDUf zU1xc89KZ4Cl)ABY#?!V|O!;!+mi9deSH_uh3Rkj`NPm@nmGboa>)dy!lxG41qdTSC zjh4*9=OZ-FU=UAdlqR?f(_4`CWl$&$H}O2VNHgcExVY-TvC59VD-d)akoVPGL6?ge z9);{Zyv-O<`&b75aAy(hm3VIk=EoPBYP*hR8ctP|@ZL&QllK{0E*v+%Ac=pO-mct9 zb-9O8{8=!!4;u~t6O90siEd%vdpBL~nPsZdEIEdb@PpptS?O?r&ILw z&u_SPv5e8~8nd+zT-Oe-CTj%^YwM;(kQp*=wiPuSm^~0`+&d!O&L+`MK35@}iWQY; zepC3ahQ9b}3PCxC8Q}#?j`U#{n&sEYF>a%W9}RzIym^kBqEfLa89>IMvwdi;qnjUA zSEPx2Z?(A1}$$jv(UJ1N}F#365#X|su# ziLrB5?=9Z0C@|l{^H|s16=hBh`Z5;&^scB~Et(B>kw+rO!O?xu8XA)N>(z78!WL@| z>P_fkVUbOV!LK&6)Oamrn{V9+`jAB-Y(}Xj*zA1+b58EkeL-KLZp{>iJe5z6N#@rH zeb;Cw87t%L4urfP442g{A4*j(sX-oS2@G+iKxy=znW{;ar$qdUAie4YdoY|7alL{!m%XmV9-9 zi4>~qz$hx&J9AMoGT^>Q8m3YtW+0<$epkD7Zhn(tzmv;|l?;q93RTA!|%&NHzo%?i^6E7~o>^kaV z3jG&$EI#x+w4hCkS;OXxm&ZIqjcr7G(@}JwlGdNdns!GQTSl|J%sO+=?+O|p_L~RhxR}C2IT7WvY#8F^ z3;KSiY9nYPsB>*U>UF(u`(h(Qgv|MtvRB344%mkU?#dQQ z2FVrFBz9jE|ejg%z7~-u{b--ckc{gNFM+S2( zxw?8pp7Sz)j36>2P`+B`x~Yxj`J!wKpMIkNwSNxg%aS$}+?t|E(4K!% zoq1Asgrqj(aK_eo zgAS`q+*AscUX(hMmh9HGeN7Pey8jL2adjt*a49-2``*LR>)y^EQe{Br2ij6H>@Ft9 zB5eZ;BGWOwciDGWSBKd5K4jE5apseHn{}Yn1d}Fr_*gdKT;X~3uBaC=ix`uy1RXiMtDWEtiSLN9#rOwC3}AER5CO(qatAK5SIlP zwC%)$Ia`rsB=?&!H8hQT=(2Pe@B597fnv_%bDxmb^_t$jRs~|#e$gy9!^xjtR46g zBw}mVF!w{frf+m*|7B)x?Na#wjT`TM+2wo)}L3Wn&+KdK9}{C-n!;X z1_O?p65|T)me{BYN?#9InBYw!`*TH)oVtUnZuG8CuL%lt1H@hP2eKp~5~w6fGY z2?O8D$o4g47$5@;`HP(6#hdA5^?%%tXEFqIPbF~m{e&@-)2w)3L~4)`{U2xK-wcY^ zJx>>_O{E`s>s)e}3hCJMo2MaA8XumBVMCHB8$_y;jUmTX{`Oz~f8ES>mfU&TVH{c`^=DNasgiIA7h|KFpxvI+F1xuB!)C=u0Obrj|D3b!&7NO@D|0ba~H&> z`|m(Op~=ZXt;cUmXDET|U@*P_ z@p`lndzbozGvNqlGVHj2AJe7+Bt8&sks>}g4So{%;4Xx{X2XRM`2Q5c#fJ(U3|2C> zw5DSDH2MOol-k@tV;}&W4r*)Xjf8Cf*Xz|r%Rp7Q6qG-gfcJr-P;`vJix2WWd7vfJ z7QVH_zv3hM4#kOI{_=sBC@whjVS*7Gx*+m9k*_EE zua~PKrW~w+2DU6d+WE|Gw^kV+DZ>Rjd7!tH0$LLhK<55r&E=#4=aGE`Qyta48-ILT zA14PjQ8G{&E{R|ehxY*@Q1?<7zJG0k@zK$LjPE^F@XCk*Ug(}b;eECv-yd$pYEvUV zAV+*~1_I?zgD>I(Hz91W;KUF>ET={W-Z29Hx89;W87{WmiH`Z4aW<+1V3h`PsZ4{7U(VyhtASaXwP>CM3er^`J2arkZi_;>?4?T&ON25UfZ7Ph<$;*ayeIROMejki`Fo{o?O~ zL8veQ_;V2qneK2S^)c|KIDy*RKwu9uM=%(|6@MML?5PP%&T0q-MPRU&feZFGfyYZ1 z!Grh&@x^%~VW8IG1&Z68&{ysZUy2=|J;w~1Q}keMb@gP7biDtqNj`sR5~8b!CS}>5PKhlV0a3WCC{OLup9aY z`=RDr2V9GO0PLY=!1l}#Sp4q6B@YC{V^u)n8IEIu*H8aso8C$q@qyTJ9KdmG_gA?? zZ`ot`Qse;L$h9|r{yZ5UG9CVCQo-Lf>EXXMDc?&RUfZ%ks^w)QPawQ9pg+;msM{2X z56&WSK=cp$Wve1VvOE+-OM*bAEDR>b$4*AwKo@Yu+rhOcOF-fokaz|b-@9yrL#0P_Q-teu`4SGwRV4xudc6WA8#>X6IsC%IaPzce-m(bI4Z#0N-D`-}U>YlXU4IKfaB0NoN`kAx4t6UH2NU`h7k+{HJ;F#`4A2c4o=3_`Z9cY?FMDf zm7p=v2Jy`snCNama)dmRAB2${&5fK>fjl=p1P>QvAUsMz>W#l*IR??wV;}r|{#|;C z;eLA#s5iVs><|7EYk$SuU+dVGA~@Dnw&35IbnFYENbBGJIMG)`o2(ISLiBX}Q!tFS zJcZ!~-xCfkjP}6M(b0c7#=GjFB2483LxGP3)Wm2b91=tFHG;vB6Uo)ANGu~fI?fS@ zo{=0i}F?YNknVkgBid483V+HKt$C_kx;tP=&```NN zdFOXrBbr2SDGieyp)me22u2VLL-jt;{>Ba_dz#^YT_(RYA-Ta8s-tfsF`<0IoyG(c zq;`@=Fo;90D?d{AaUptyU_f%hOC*+$een1B_Z_H)V+@bK6oFCIOW4`oJ{e>4)8Jf@ z1ZsKD5M6bH8;GWIy|hO#Aet0rc9I{&;vIi$6B5_QF>#Wo5j~ymj)ck2p)hugq4~)P zhGR`?f9njjaSsqpb%6SK187Y*fuyT!}hUgI!Qftut!~THbdhi{n0{6aBFs*zEd%u32jP{W}(5ZU`>J`x-Q}7G~ko?A- z{OGqPA-c*LZ3PmE&cJ@GO~*0er3FkbNPa-H^+#_kf*}II5CUUu&)|EL|35UTyYL}& zZsUh>11`9&LiB zL$z=png7GX!~b%89PR<-q7aZrFi5`k0+EErAeV&jDiZMp;)AQl+UkvHE0Px$1``kr zFJPu88oo70LqbFhBn4VQb(|qo#oR?|Ic;c4z6&jBci}^t7JNuOwp|^X5|p7K9;uyT z<)Ai39zLWa`8(AH%0q8M(Gvxv?huD8q`vz*|6``xA$+10f<_wQLB*^8n?|htT!+^F zPVjr53>xK8pj7xAfm|PHC=R*_oZ}@9SL1n1qNgs4v zgV)4pAUVSlN&?mYVSmzm55)iIgy^YH5IXh&o_%iszrlZNl6^-WSbod~la@5lt51YG zrHP=G@D5}jW&(@!YhdQBMaD=^c)3Ki)12LiR&s zki4z)5Bt-WzCz;s7kKfb1EMBBLdaMP1b+XwCb{*#2bZ1_@a!vt+mDCfrp^TL$PdGH z>3-ml=mR#9ZeS7U0HzZREkMiB2-GJSDo^H{guWQTkPo7YAAy49H!c!}A_PMokWl)9 z8V@go>o7yS1yZxwBR#SU59E6CBXtFW<*5jQMf9YXM*8Vhq#w;k#y|SKtknTXTkM0x zxo(J?`3&*XpW($+JG`3u4ADqz2OwD72P(j#I}b$fO@ffdIPfcu0*~Afa2;b1?*&%j zF1Rf48JKw5fPw26LjzE;*1(P1pW*DqQXr-;0x^|OC&$PyAwIbH9*F4*fRO49;F2W( z4V4bqNHRd!Jw|w8#tJF6*C6xpjj?y$0{Mmh!nP#=q8xvZ*}rcWZ;V0d`WO_geut8k z?~u9B2k|o<@N}#ZJcg>k@#}lA`jQVO9XTLwI1M7&2nO|W;8Prd8^;)=z5%;fFK{aK z0=sNCFy3ebkE9X!{B;DXyT{?Ty`>I zL!d6`Hobn7;bpqN+xWlRuHBp-tJ;`=qLpDtL3nhmN5SLG;Pbr}T>8twuD1{@kOz7U zKV^cH`412`Krm=c!mWpsz^^(AH)IFlP2TY#`S0f(W*UidmixnABlG?WiQ{7}eL7MP z9)p$O*jEBp-S5EUb2jLi8)&S~(&o+q#0sn!tCc2Asc@ zg6)?Au;_RL1|MI8_J>$3>bcGG`qY!QPoc$PZ(XaBgzHF6t*sNC_BV-4Lu{-sHE zAgkE}7rB3H)W75VJ&+)AaEdwy@j>eUC;R`x;WJ$0<eyQh54v)}q&*9CTGK$Y zDG?sUuY%r_AAf4>WBWV4Eu8HCwa%%WhKQ{3lVc5?vxu&?03D)9@>+d=;`=;165m&9 z5MGrddV1`GTts7E|F_tGjKjP;m(IHDU7h*o9586h0PSWZ_agm)OY%Ax1^)O`V=LKx z|FeC^e&}R-c3}+?5dIw3-Hjb{e{5E``}HI?E^@a5{k5hOUY+PEV=0i(BR-(X`ERrT zFJB;>x7BG$S-stu04jBHU7oKuz$9oIc6N{&8yT*VLnrIf##xZjnS}0d%P0HaCs$9_ zji2Y?GJpGtCMoF*0E^(?^TcnBCBO79AJFFhx7&Y=1L=>6kpA-IKBsT)CYU1j@9iNq zHZn?TXHM2W(W9XA@CSH=e*bgs_KW`HyprALo($&#ViXbH@G7Qn!H4oYigVP$m} znm;arqt926P#*vRg+9=?LUNw`R|LZs1VaZ>Gact@L{Hi4kyx&Rb4;cGar;AScflfT z@*g#JNWv)CMXZ2j;1Za6FTgFt&fE7V;FjqWDCv!X?49o*t~LM`PE#PRJ_rIg`+!Tb z8{twrF!TK8(eIkC;y-SGWYaIOjF^HC?Thf@^*Fdije%R@GC00i1>3M?utc7RG4Y%S zy+^a4Z8ZZL#*?6^I|eeE!(i?>4T?G=Aa!d11QmPXx>Of};S=JA4~QN$05xm%f874q zwmpbw`~@LZI}lj14Sso>;F-ArE=gzXP$=+Yny14W4f|!8&mrOd?l7 zH)sVkk$OYTbpaF++vSkjN!ok{l&yY%fx{G-J{$ujoqmv1??Gas131Oo{^Rz)9z24Q z?}v~-Z~%E<_aUWy4?=2o!KY{&oO3q84$05vv1?!uvI5%vOQ7Mt0LqW%;ikEv7Sd(nAPqPJlGh51Boh z0u%dTxT)RqAGiNF7bJG=tE6`9jm0(pjsf3-ZE(r_33do?ETUGyAZQu1eUZ6Gc%$qv z2l7@3Z_Ivx1k(G6>Hgbxp<5FteUP9kQiB^zf`#MA|A_s^7+$sR5k=PSh8=5==Nn}1 zQ#QaV4w-vIe{`QLfhNKm)kkxnU^5G{$GkB@c%z5#=I$hj+?fF3zu7LJG6n)lV<2&B zyzcng|C7t(tW8mujGtY0uaLP%a+m>^!}tl#6EGw*xma?p$!<1S_}W{k-Qp-3(zH0k1!bkl{#B}z%?iLP`NF_k1l7o$Xs zlqaHOQsgdOB+50KVR9M2^II!V?b*XYalKzu)(7S(DD+ zyh7Lf>c4!vuR4cmirbo&KDU(So}7Evx&|Yc8|h;muDg!1t^HrMgIBflrpJUP@5eib zRnxyU*S=~B@wrJ&jWZ={uAb4v&vd-u>m`69wI;O=vMXP;cYbriRgU<-s^)mb_7=}W zY$~N))OjyH-+xi_Y~(_38oN%lc_)Plv@?Kgq!TW`ssknKYR*{dMKHoQZdw^8)hhm&y_ME_VT zei5AMZ3(tP__%%Oe+u79cyHsv=1Rt-o1>m&VzzIdjWfA1ctl^aG%Es$!XpnHE_o!u zkO-bCk^G48Mg(^u*tQt!Zse&t$T?8;ZQTsxnmE?tk=ZjHQQGvnq(Zm=8r}NqJ z$ z9pBSm%!_wyiTTgxCF4rbKKXfXh!yV(eU3p3*=wfBS}=YI&OH%h%Q<+-tM;V7Yg4cV zBQgSTxcn3v8t$RsN|~%JxB8)9h=aTq-)!`5z8>UD#P1;^!wYBj&PNWtUe)%?PYo#9 z8%ytJ92qN9&b=XhTW7L*BgifYul5Vcwyn47(sKU3^f!gaY&&L4mi=b(`Ni|aWtH4tOAErWjSB7C;W7GKk! zH{b5hxtJ;M3-O!G%3g_UC6TBWJ}{XG;bWKW^}xC805Uc!x$lG0-JaxymeSw$rblFo zj1{9f25pX^Z_D|I)1M10KZH4C9mIJHpY&|?C0WPi?}pAs59n@MjA<#s7$DfIKwJ8` z^u(1x^rPwJo{T_ENj%OS48fTn0@>Fb6sJ0HPUwGbHluGlk^ZMS{pV%$JQvbCH{=+G zw)8K21>sFCq>ocbHm9NSKJv~KAs{0TMzLPfTQ*Gch1K>TXs?-r0jnMHxu-Kc12)3m zF%7-?r%|U)#E3!G*yPUVF`178QO5Kxjiq;~TyG?qyPPOP6s5SKFljLkedp5B|3>;t z!sA;^PrxlV0ZxTmVSP9rZUsBw_2VuqIJzB%ajWsQix>J%j=`t8ne_5K53-!@OW}xuvM$v1e-$-^;aEsZI<2g2)mi~oL7gt}3ZFObX zR8x%gl?7OLC0}}TGdAZzkFm7yQu@=A6Pl&)6oudL(I>m{VUOKt)nS|TMMq31kp5Mh zE<5n~Cl*kc_o0XQmGG-Tzv_kOHd1(Q(r;7!{`NOk;{biC9kJ@a>+AqDQk>3=dJ$+2!0k-Otf;Jzo z#F&0s2%r9G)uwrx2`S#%wizpRG*tbn>Y_*WRfigD=rNUH4f|e6f60U1mNs5lL5YwWA?RG6seao#g5i#@_S5+RtQhJK>Pp4xh{RxXr$6%|d!cD&4Y?o9btKhoa zPd<1Jk=rWeez(B~rDkkkQ6k47Jgl~24(Ofy$4BwM+rMf&{*`%pD=+7i3V%d+JJ$3@ zoYM>78eT)s;~o~hsKtJ5-5o@3t&+#P4#=SnUx;z^afEg){LOaMOy3uC&|&Lq_pchq zw%#ymTeieFq?A?iZJnfY(Dm> zmQw21lO4;co0iCHA-wXA^bf=wsM`7?b%e4>5wP_}i!MD&aT)fCn=oNtlO0b(pE}{- zv1QZ@%V9_DaIj$+$54!(1CL1`sXgc5kMyhh4mC|hz|OnyU0aU1t1Ibq-G|%SdvKwi zEPRP+)RIl?sWOJ3 zPq6Jcby4Lna8GQ6!L2LA%(>|5gpW7b0 z{wwxU*Ni&c1V7G!$F`r~LQULe)m>ODrv~fRtYHcrO>hwU-S) zt~P9y&N$fh&o;~aAx*|ut|6A)mElvmG_E#o2fwlESTU+KlH7)iyeDOlLF?DP7K|VM zT{R{V*Nfbe4Gz5+OMc1tdJ^_WS|Z-54}y%^Ld5eTw~AVVh@%y%@4Z};H`QZ|qF}t9 z&fJ3r#%v8;>~-XME29nB{s?Sw)54Y02T@a9Ez7>}Y19nbW9Kph$>oO`x5Wzmcf~c8 z8yQ^%V$*OTsRB=cf~9udU6DpmUfVi%wX8OIUfbJ4|RjLb=p{5#|SapChISbhdxk$Eu`#NgQ96>y}&bWEHWXbxF^VF2_tjGZn%&^cCRP77? zarX8Q@-4UFyd@Z4driS-%&idYuW_8W%ykhQc6z!exmai9#<;hu?ku7jbi{hH+XB03_8?ww=GSY%=owU_g<`9U!GWYpNHa9PZOr*at zcKS^s$H&}}1p{$#jRj+%xzq^sIA5B~0r<3~{l&$*;JzagPoF-8Q(_>@Bi!+cn=!s* zp3CIqK*`dIzV_t?kU`x-hBg+J$JdgZ4abGtVDjWXjP(}dRHhI4(uKUvquIxRmiGP6 zXJcu~I(g3be|~`S`m6Y2*;MF}^|ne1!oYCGcK+5#NDD`FL;|d)M`7748|;r@zD$e- z^5aD;$CxU59Ex`?VqEKq-1SZ^?XRgk2KVeun3=p9Cf^6aAaNPA!)9ab+933sIUk>! zN2B}D47oNG?BF|Go9m1_g#LYP5b7`pX^fZl1`C$4na#|OFl78@-O_%1T`9sV@)3Og zAd)IiU{ggQjF+CmP~!@+5Er=KC`31Ma36F{fu%<&+H~9oJ>%mtCi<{*0LBj-h7C?% zP#YPD^c6aSrBsqRRH&|R4q3N?##&_Exr}YsOEJGJ14Cw?z<6iIKZa)!yrmlPd-z^+ zDV920+peh?HK|y}fr1%)=i@kh+1*STW!qa%)#l4}(w*}ru{TaOh#13@@r^SXqLH4( zxOKB0Ha=HSRZ}nbO&6Y&bvwp)29rxAb19fO!D7AK-mCT_uNJ5)E@nrNQGyNQ2g|5a zXl#6drRy)r`f}A>WF5UO_dAl28b9rfWR3)H^g;LZ-)&#jr_+fYdQ*y^N3$t!pEsU(swQw+f z$+|3Dew8tCvE)TMk`;N~c2)mp5pevLD*s}P!$nvuxB)Xq#uB#Y$rYc)EDy4bU*zSd!$vL_l~;;yYQPZ6xZx%nREdDDOUri{G8o39n= zdn@;qKf|umPmoy9gs2}L!FgQ+rgCj2)`enCx**^t*Tpp$V}AOL=jY_D=O)Q#o;F0$ zkM^M#EqrL3sCYuH}Wl zD!f&Cd#d$hDgDTZ*PZuQ{omZ^20i+SRi^Y1=^vKrTVIQy?dvBChmHIjKm5UsIpA%=#;aR} zO;itH-ui2uW5Jryx*02mB(JyY-WX%kiR+vXnYTQIxu)$9IHr~F%R^z#Vvink#?I|z zrJc<@%bfRT4EeGo#=vWpv;Qp4{}ow6tOGF#?k>dAapztQiV(Aw%%+-cb) z)ctf1ZS97l^GrQhZ&aWo*DT(lmiXyfA&&2G!xrYLCAklx*5@R16TYMN9%9_K$WfV4 z)H}>hO2+#y6hX_w0`^J4=*oOQ-xw!UQqTSM*<(DsSBtHSbWuWGdf#dj=DYR6+Nm9i zmX+=)8kg#i#>c;4MxsB)t)7D^(VqC!Z#q_|EWm?P3Y4W;GVj94KO-H2nUe#noRz`T)h zIGQk(TCP9Wa<1nSZkGM%R+5hS1>3Qb{I$uvV=$RP-KUolL&qG)yPfu--Dib(uYEWy zhW0_K#}~}?))Bb^jd^i4!3B@%b{^w=5@?lLJoPx$#^Ud`x%$2p5XBl;MBQ?7&IymGh8lG zmpROL3iXfoQN9c#|d8B(L4=t0R2xWc}0cuRiiCY@!*{hTcJR`p*bR zXh29}1IIvyeaw&4lk)!Q_j9j3e|(V7;2nicn91jtiRVq|&!i3zavK4WH(+31;{U2~ zzkF;})}yHT-`&Sl#`A(J89|<8m}zx`u4#3$h12yBFaIy{)zqHTr_X!&;6Lv3@#IUd NK9A-8OQnhX{{?OVn?wKr diff --git a/tests/mfc_detect/res/vldmfc.rc2 b/tests/mfc_detect/res/vldmfc.rc2 deleted file mode 100644 index 99777388..00000000 --- a/tests/mfc_detect/res/vldmfc.rc2 +++ /dev/null @@ -1,13 +0,0 @@ -// -// VLDMFC.RC2 - resources Microsoft Visual C++ does not edit directly -// - -#ifdef APSTUDIO_INVOKED - #error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// Add manually edited resources here... - -///////////////////////////////////////////////////////////////////////////// diff --git a/tests/mfc_detect/resource.h b/tests/mfc_detect/resource.h deleted file mode 100644 index acd9140f..00000000 --- a/tests/mfc_detect/resource.h +++ /dev/null @@ -1,18 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by vldmfc.rc -// -#define IDM_ABOUTBOX 0x0010 -#define IDS_ABOUTBOX 101 -#define IDR_MAINFRAME 128 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 129 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1003 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/tests/mfc_detect/vldmfc.cpp b/tests/mfc_detect/vldmfc.cpp deleted file mode 100644 index b147c194..00000000 --- a/tests/mfc_detect/vldmfc.cpp +++ /dev/null @@ -1,247 +0,0 @@ -#include "stdafx.h" -#include "vldmfc.h" - -///////////////////////////////////////////////////////////////////////////// -// CMFCExampleApp - -BEGIN_MESSAGE_MAP(CMFCExampleApp, CWinApp) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CMFCExampleApp construction - -CMFCExampleApp::CMFCExampleApp() -{ - // TODO: add construction code here, - // Place all significant initialization in InitInstance -} - -///////////////////////////////////////////////////////////////////////////// -// The one and only CMFCExampleApp object - -CMFCExampleApp theApp; - -///////////////////////////////////////////////////////////////////////////// -// CMFCExampleApp initialization -/// Efficiently searches a module's name pointer table (NPT) for the named -/// procedure. -/// -/// @param[in] npt Address of the NPT to search. -/// -/// @param[in] size Number of entries in the NPT. -/// -/// @param[in] base Base address of the module containing the NPT. This is -/// used to resolve addresses in the NPT (which are relative -/// to the module's base address). -/// -/// @param[in] proc String containing the name of the procedure to search -/// for. -/// -/// @return Returns the index into the NPT of the entry matching the named -/// procedure. If no such matching entry exists, the function returns -/// -1. -/// -DWORD FindNptProc (PDWORD npt, DWORD size, PBYTE base, void* proc) -{ - for (DWORD i = 0; i < size; i++) - { - void* p = (void*)(npt[i] + base); - if (p == proc) - return i; - } - - return -1; -} - -/// Gets a pointer to a module's export directory table (EDT). -/// -/// @param[in] module Handle to the module (as returned by GetModuleHandle). -/// -/// @return Returns a pointer to the module's EDT. If there is an error (e.g. -/// if the module handle is invalid or the module has no EDT) the -/// function will return NULL. -/// -PIMAGE_EXPORT_DIRECTORY GetExportDirectoryTable (HMODULE module) -{ - PBYTE base; // base address of module - PIMAGE_FILE_HEADER cfh; // COFF file header - PIMAGE_EXPORT_DIRECTORY edt; // export directory table (EDT) - DWORD rva; // relative virtual address of EDT - PIMAGE_DOS_HEADER mds; // MS-DOS stub - PIMAGE_OPTIONAL_HEADER oh; // so-called "optional" header - PDWORD sig; // PE signature - - // Start at the base of the module. The MS-DOS stub begins there. - base = (PBYTE)module; - mds = (PIMAGE_DOS_HEADER)module; - - // Get the PE signature and verify it. - sig = (DWORD *)(base + mds->e_lfanew); - if (IMAGE_NT_SIGNATURE != *sig) { - // Bad signature -- invalid image or module handle - return NULL; - } - - // Get the COFF file header. - cfh = (PIMAGE_FILE_HEADER)(sig + 1); - - // Get the "optional" header (it's not actually optional for executables). - oh = (PIMAGE_OPTIONAL_HEADER)(cfh + 1); - - // Finally, get the export directory table. - if (IMAGE_DIRECTORY_ENTRY_EXPORT >= oh->NumberOfRvaAndSizes) { - // This image doesn't have an export directory table. - return NULL; - } - rva = oh->DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress; - edt = (PIMAGE_EXPORT_DIRECTORY)(base + rva); - - return edt; -} - -/// Gets the o of an exported procedure. -/// -/// @param[in] module Handle (as returned by GetModuleHandle) of the module -/// that exports the procedure. -/// -/// @param[in] proc String containing the name of the procedure. -/// -/// @return Returns the procedure's o. If an o for the procedure -/// could not be located (e.g. if the named procedure is not exported -/// by the specified module) then the function will return -1. -/// -DWORD GetProcOrdinal (HMODULE module, void* proc) -{ - PBYTE base; // module base address - PIMAGE_EXPORT_DIRECTORY edt; // export directory table (EDT) - DWORD i; // index into NPT and/or EOT - PDWORD npt; // name pointer table (NPT) - - base = (PBYTE)module; - - // Get the export directory table, from which we can find the name pointer - // table and export o table. - edt = GetExportDirectoryTable(module); - - // Get the name pointer table and search it for the named procedure. - _ASSERT(edt->NumberOfFunctions); - npt = (DWORD *)(base + edt->AddressOfFunctions); - i = FindNptProc(npt, edt->NumberOfFunctions, base, proc); - if (-1 == i) { - // The procedure was not found in the module's name pointer table. - return -1; - } - - // Actual o is o from EOT plus "o base" from EDT. - return i + edt->Base; -} - -LPVOID FindRealCode(LPVOID pCode) -{ - LPVOID result = pCode; - if (pCode != NULL) - { - if (*(WORD *) pCode == 0x25ff) - { - DWORD addr = *((DWORD *) ((ULONG_PTR) pCode + 2)); -#ifdef _WIN64 - // RIP relative addressing - PBYTE pNextInst = (PBYTE) ((ULONG_PTR) pCode + 6); - pCode = *(LPVOID*) (pNextInst + addr); -#else - pCode = *(LPVOID*) (addr); -#endif - return FindRealCode(pCode); - } - else if (*(BYTE *) pCode == 0xE9) - { - // Relative next instruction - PBYTE pNextInst = (PBYTE) ((ULONG_PTR) pCode + 5); - LONG offset = *((LONG *) ((ULONG_PTR) pCode + 1)); - pCode = (LPVOID*)(pNextInst + offset); - return FindRealCode(pCode); - } - } - return result; -} - -void SetClipboardText(LPCTSTR pszText) -{ - const size_t len = (_tcslen(pszText) + 1) * sizeof(pszText[0]); - HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, len); - memcpy(GlobalLock(hMem), pszText, len); - GlobalUnlock(hMem); - if(OpenClipboard(NULL)) - { - EmptyClipboard(); -#ifndef _UNICODE - HANDLE handle = SetClipboardData(CF_TEXT, hMem); -#else - HANDLE handle = SetClipboardData(CF_UNICODETEXT, hMem); -#endif - CloseClipboard(); - } -} - -typedef void* (__cdecl *new_t) (size_t); -typedef void* (__cdecl *new_dbg_crt_t) (size_t, int, const char *, int); -typedef void* (__cdecl *new_dbg_mfc_t) (size_t, const char *, int); - -BOOL CMFCExampleApp::InitInstance() -{ - new_t new_f = &(::operator new); - new_dbg_crt_t new_dbg_crt_f = &(::operator new); - new_dbg_mfc_t new_dbg_mfc_f = &(::operator new); - new_t new_array_f = &(::operator new[]); - new_dbg_crt_t new_dbg_crt_array_f = &(::operator new[]); - new_dbg_mfc_t new_dbg_mfc_array_f = &(::operator new[]); - - void* p1 = FindRealCode(new_array_f); - void* p2 = FindRealCode(new_dbg_crt_array_f); - void* p3 = FindRealCode(new_dbg_mfc_array_f); - void* p4 = FindRealCode(new_f); - void* p5 = FindRealCode(new_dbg_crt_f); - void* p6 = FindRealCode(new_dbg_mfc_f); - -#ifndef _UNICODE -#if _MFC_VER == 0x0700 // VS 2003 -#define MFCDLLNAME _T("mfc70d.dll") -#elif _MFC_VER == 0x0800 // VS 2005 -#define MFCDLLNAME _T("mfc80d.dll") -#elif _MFC_VER == 0x0900 // VS 2008 -#define MFCDLLNAME _T("mfc90d.dll") -#elif _MFC_VER == 0x0A00 // VS 2010 -#define MFCDLLNAME _T("mfc100d.dll") -#endif -#else -#if _MFC_VER == 0x0700 // VS 2003 -#define MFCDLLNAME _T("mfc70ud.dll") -#elif _MFC_VER == 0x0800 // VS 2005 -#define MFCDLLNAME _T("mfc80ud.dll") -#elif _MFC_VER == 0x0900 // VS 2008 -#define MFCDLLNAME _T("mfc90ud.dll") -#elif _MFC_VER == 0x0A00 // VS 2010 -#define MFCDLLNAME _T("mfc100ud.dll") -#endif -#endif - - HMODULE module = GetModuleHandle(MFCDLLNAME); - if (NULL == module) - return FALSE; - - int o1 = GetProcOrdinal(module, p1); - int o2 = GetProcOrdinal(module, p2); - int o3 = GetProcOrdinal(module, p3); - int o4 = GetProcOrdinal(module, p4); - int o5 = GetProcOrdinal(module, p5); - int o6 = GetProcOrdinal(module, p6); - - TCHAR msg[256]; - _stprintf(msg, _T("%d, %d, %d, %d, %d, %d"), - o1, o2, o3, o4, o5, o6); - SetClipboardText(msg); - MessageBox(NULL, msg, _T("MFC ordinals"), - MB_ICONINFORMATION | MB_OK); - - return FALSE; -} diff --git a/tests/mfc_detect/vldmfc.h b/tests/mfc_detect/vldmfc.h deleted file mode 100644 index 9edfd2aa..00000000 --- a/tests/mfc_detect/vldmfc.h +++ /dev/null @@ -1,46 +0,0 @@ -#if !defined(AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_) -#define AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#ifndef __AFXWIN_H__ - #error include 'stdafx.h' before including this file for PCH -#endif - -#include "resource.h" // main symbols - -///////////////////////////////////////////////////////////////////////////// -// CMFCExampleApp: -// See vldmfc.cpp for the implementation of this class -// - -class CMFCExampleApp : public CWinApp -{ -public: - CMFCExampleApp(); - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CMFCExampleApp) - public: - virtual BOOL InitInstance(); - //}}AFX_VIRTUAL - -// Implementation - - //{{AFX_MSG(CMFCExampleApp) - // NOTE - the ClassWizard will add and remove member functions here. - // DO NOT EDIT what you see in these blocks of generated code ! - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_) diff --git a/tests/mfc_detect/vldmfc.rc b/tests/mfc_detect/vldmfc.rc deleted file mode 100644 index a5cc45ce..00000000 --- a/tests/mfc_detect/vldmfc.rc +++ /dev/null @@ -1,144 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "#define _AFX_NO_SPLITTER_RESOURCES\r\n" - "#define _AFX_NO_OLE_RESOURCES\r\n" - "#define _AFX_NO_TRACKER_RESOURCES\r\n" - "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#endif //_WIN32\r\n" - "#include ""res\\vldmfc.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#endif\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDR_MAINFRAME ICON "res\\vldmfc.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,1,1 - PRODUCTVERSION 1,0,1,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "This software is copyright (c) 2005 Dan Moulding and is distributed under the terms of the GNU Lesser Public License" - VALUE "FileDescription", "Visual Leak Detector MFC Example" - VALUE "FileVersion", "1, 0, 1, 1" - VALUE "InternalName", "vldmfc" - VALUE "LegalCopyright", "Copyright (C) 2005" - VALUE "OriginalFilename", "vldmfc.exe" - VALUE "ProductName", "Visual Leak Detector MFC Example" - VALUE "ProductVersion", "1, 0, 1, 1" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDS_ABOUTBOX "&About Visual Leak Detector MFC Example..." -END - -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#define _AFX_NO_SPLITTER_RESOURCES -#define _AFX_NO_OLE_RESOURCES -#define _AFX_NO_TRACKER_RESOURCES -#define _AFX_NO_PROPERTY_RESOURCES - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE 9, 1 -#pragma code_page(1252) -#endif //_WIN32 -#include "res\vldmfc.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components -#endif - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/tests/mfc_detect/vldmfc_detect.sln b/tests/mfc_detect/vldmfc_detect.sln deleted file mode 100644 index 482d5ced..00000000 --- a/tests/mfc_detect/vldmfc_detect.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect", "vldmfc_detect.vcproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug (Unicode)|Win32 = Debug (Unicode)|Win32 - Debug (Unicode)|x64 = Debug (Unicode)|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tests/mfc_detect/vldmfc_detect.vcproj b/tests/mfc_detect/vldmfc_detect.vcproj deleted file mode 100644 index 7e79ee35..00000000 --- a/tests/mfc_detect/vldmfc_detect.vcproj +++ /dev/null @@ -1,811 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/mfc_detect/vldmfc_detect.vcxproj b/tests/mfc_detect/vldmfc_detect.vcxproj deleted file mode 100644 index e04b267b..00000000 --- a/tests/mfc_detect/vldmfc_detect.vcxproj +++ /dev/null @@ -1,469 +0,0 @@ - - - - - Debug (Unicode) - Win32 - - - Debug (Unicode) - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {A231973E-072A-428E-982E-5363ADD1CDE2} - MFCProj - - - - Application - Dynamic - Unicode - - - Application - Dynamic - NotSet - - - Application - Dynamic - NotSet - - - Application - Dynamic - Unicode - - - Application - Dynamic - NotSet - - - Application - Dynamic - NotSet - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(Configuration)\ - $(Configuration)\ - true - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/vldmfc.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - stdafx.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(ProjectName).exe - true - ..\Debug;%(AdditionalLibraryDirectories) - $(TargetDir)$(TargetName).pdb - Windows - false - - - MachineX86 - - - true - .\Release/vldmfc.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/vldmfc.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Use - stdafx.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(ProjectName).exe - true - ..\Debug;%(AdditionalLibraryDirectories) - $(TargetDir)$(TargetName).pdb - Windows - false - - - MachineX64 - - - true - .\Release/vldmfc.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/vldmfc.tlb - - - - - Disabled - ..\;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - stdafx.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(ProjectName).exe - true - ..\Debug;%(AdditionalLibraryDirectories) - true - $(TargetDir)$(TargetName).pdb - Windows - false - - - MachineX86 - - - true - .\Debug/vldmfc.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/vldmfc.tlb - - - - - Disabled - ..\;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - stdafx.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(ProjectName).exe - true - ..\Debug;%(AdditionalLibraryDirectories) - true - $(TargetDir)$(TargetName).pdb - Windows - false - - - MachineX64 - - - true - .\Debug/vldmfc.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/vldmfc.tlb - - - - - Disabled - ..\;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - stdafx.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(ProjectName).exe - true - ..\Debug;%(AdditionalLibraryDirectories) - true - $(TargetDir)$(TargetName).pdb - Windows - false - - - MachineX86 - - - true - .\Debug/vldmfc.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/vldmfc.tlb - - - - - Disabled - ..\;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - stdafx.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(ProjectName).exe - true - ..\Debug;%(AdditionalLibraryDirectories) - true - $(TargetDir)$(TargetName).pdb - Windows - false - - - MachineX64 - - - true - .\Debug/vldmfc.bsc - - - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Create - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Create - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Create - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Create - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Create - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - Create - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tests/mfc_detect/vldmfc_detect.vcxproj.filters b/tests/mfc_detect/vldmfc_detect.vcxproj.filters deleted file mode 100644 index a065821f..00000000 --- a/tests/mfc_detect/vldmfc_detect.vcxproj.filters +++ /dev/null @@ -1,49 +0,0 @@ - - - - - {ee1a072e-69ee-4e6d-b044-911ae029bbeb} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {ab9a8a11-b14d-470f-a7c5-88b379d3e731} - h;hpp;hxx;hm;inl - - - {65ba1fde-89d1-4036-9a69-3cfddfdc7de5} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/tests/mfc_detect/vldmfc_detect_vs08.sln b/tests/mfc_detect/vldmfc_detect_vs08.sln deleted file mode 100644 index bc784b86..00000000 --- a/tests/mfc_detect/vldmfc_detect_vs08.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect", "vldmfc_detect_vs08.vcproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug (Unicode)|Win32 = Debug (Unicode)|Win32 - Debug (Unicode)|x64 = Debug (Unicode)|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Debug (Unicode)|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Debug (Unicode)|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tests/mfc_detect/vldmfc_detect_vs08.vcproj b/tests/mfc_detect/vldmfc_detect_vs08.vcproj deleted file mode 100644 index ae9147e5..00000000 --- a/tests/mfc_detect/vldmfc_detect_vs08.vcproj +++ /dev/null @@ -1,811 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/mfc_detect/vldmfc_detect_vs10.sln b/tests/mfc_detect/vldmfc_detect_vs10.sln deleted file mode 100644 index 14131b34..00000000 --- a/tests/mfc_detect/vldmfc_detect_vs10.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect", "vldmfc_detect.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug (Unicode)|Win32 = Debug (Unicode)|Win32 - Debug (Unicode)|x64 = Debug (Unicode)|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Debug (Unicode)|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Debug (Unicode)|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tests/suite/testsuite.vcproj b/tests/suite/testsuite.vcproj deleted file mode 100644 index e46c7373..00000000 --- a/tests/suite/testsuite.vcproj +++ /dev/null @@ -1,488 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From ec119a267eeb9a531c09e8fed4fd16232ce9f437 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 18 Jun 2011 16:27:33 +0000 Subject: [PATCH 110/321] Removed VS2008 projects git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67952 --- mfc_detect/vldmfc_detect_vs08.sln | 38 - mfc_detect/vldmfc_detect_vs08.vcproj | 1056 -------------------------- vld.sln | 39 - vld.vcproj | 472 ------------ vld.vcxproj.vspscc | 10 - 5 files changed, 1615 deletions(-) delete mode 100644 mfc_detect/vldmfc_detect_vs08.sln delete mode 100644 mfc_detect/vldmfc_detect_vs08.vcproj delete mode 100644 vld.sln delete mode 100644 vld.vcproj delete mode 100644 vld.vcxproj.vspscc diff --git a/mfc_detect/vldmfc_detect_vs08.sln b/mfc_detect/vldmfc_detect_vs08.sln deleted file mode 100644 index 2953b5b8..00000000 --- a/mfc_detect/vldmfc_detect_vs08.sln +++ /dev/null @@ -1,38 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect_vs08", "vldmfc_detect_vs08.vcproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug (Unicode)|Win32 = Debug (Unicode)|Win32 - Debug (Unicode)|x64 = Debug (Unicode)|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release (Unicode)|Win32 = Release (Unicode)|Win32 - Release (Unicode)|x64 = Release (Unicode)|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Debug (Unicode)|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Debug (Unicode)|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|Win32.ActiveCfg = Release (Unicode)|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|Win32.Build.0 = Release (Unicode)|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|x64.ActiveCfg = Release (Unicode)|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|x64.Build.0 = Release (Unicode)|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/mfc_detect/vldmfc_detect_vs08.vcproj b/mfc_detect/vldmfc_detect_vs08.vcproj deleted file mode 100644 index 18c72dc4..00000000 --- a/mfc_detect/vldmfc_detect_vs08.vcproj +++ /dev/null @@ -1,1056 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vld.sln b/vld.sln deleted file mode 100644 index ad49e481..00000000 --- a/vld.sln +++ /dev/null @@ -1,39 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "vld.vcproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "testsuite\testsuite.vcproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Debug(Release)|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/vld.vcproj b/vld.vcproj deleted file mode 100644 index 9440bddd..00000000 --- a/vld.vcproj +++ /dev/null @@ -1,472 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vld.vcxproj.vspscc b/vld.vcxproj.vspscc deleted file mode 100644 index b6d32892..00000000 --- a/vld.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} From 1caa3267558fc8cb97a63c5ba26c078da8af623a Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 18 Jun 2011 16:51:44 +0000 Subject: [PATCH 111/321] mfc_detect fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67953 --- mfc_detect/StdAfx.cpp | 8 ++ mfc_detect/StdAfx.h | 27 +++++ mfc_detect/res/vldmfc.ico | Bin 0 -> 67777 bytes mfc_detect/res/vldmfc.rc2 | 13 ++ mfc_detect/resource.h | 18 +++ mfc_detect/vldmfc.h | 46 ++++++++ mfc_detect/vldmfc.rc | 144 +++++++++++++++++++++++ mfc_detect/vldmfc_detect.sln | 26 ++++ mfc_detect/vldmfc_detect.vcxproj.filters | 49 ++++++++ 9 files changed, 331 insertions(+) create mode 100644 mfc_detect/StdAfx.cpp create mode 100644 mfc_detect/StdAfx.h create mode 100644 mfc_detect/res/vldmfc.ico create mode 100644 mfc_detect/res/vldmfc.rc2 create mode 100644 mfc_detect/resource.h create mode 100644 mfc_detect/vldmfc.h create mode 100644 mfc_detect/vldmfc.rc create mode 100644 mfc_detect/vldmfc_detect.sln create mode 100644 mfc_detect/vldmfc_detect.vcxproj.filters diff --git a/mfc_detect/StdAfx.cpp b/mfc_detect/StdAfx.cpp new file mode 100644 index 00000000..52f38aae --- /dev/null +++ b/mfc_detect/StdAfx.cpp @@ -0,0 +1,8 @@ +// source file that includes just the standard includes +// vldmfc.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + + + diff --git a/mfc_detect/StdAfx.h b/mfc_detect/StdAfx.h new file mode 100644 index 00000000..33d88926 --- /dev/null +++ b/mfc_detect/StdAfx.h @@ -0,0 +1,27 @@ +// include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#if !defined(AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_) +#define AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers + +#include // MFC core and standard components +#include // MFC extensions +#include // MFC support for Internet Explorer 4 Common Controls +#ifndef _AFX_NO_AFXCMN_SUPPORT +#include // MFC support for Windows Common Controls +#endif // _AFX_NO_AFXCMN_SUPPORT + + + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_STDAFX_H__9884638E_0AE1_42F8_BFF0_840BD090BD42__INCLUDED_) diff --git a/mfc_detect/res/vldmfc.ico b/mfc_detect/res/vldmfc.ico new file mode 100644 index 0000000000000000000000000000000000000000..d56fbcdfdf6eac0f4727c34770c26689271d96af GIT binary patch literal 67777 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 NK9A-8OQnhX{{?OVn?wKr literal 0 HcmV?d00001 diff --git a/mfc_detect/res/vldmfc.rc2 b/mfc_detect/res/vldmfc.rc2 new file mode 100644 index 00000000..99777388 --- /dev/null +++ b/mfc_detect/res/vldmfc.rc2 @@ -0,0 +1,13 @@ +// +// VLDMFC.RC2 - resources Microsoft Visual C++ does not edit directly +// + +#ifdef APSTUDIO_INVOKED + #error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// Add manually edited resources here... + +///////////////////////////////////////////////////////////////////////////// diff --git a/mfc_detect/resource.h b/mfc_detect/resource.h new file mode 100644 index 00000000..acd9140f --- /dev/null +++ b/mfc_detect/resource.h @@ -0,0 +1,18 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by vldmfc.rc +// +#define IDM_ABOUTBOX 0x0010 +#define IDS_ABOUTBOX 101 +#define IDR_MAINFRAME 128 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 129 +#define _APS_NEXT_COMMAND_VALUE 32771 +#define _APS_NEXT_CONTROL_VALUE 1003 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/mfc_detect/vldmfc.h b/mfc_detect/vldmfc.h new file mode 100644 index 00000000..9edfd2aa --- /dev/null +++ b/mfc_detect/vldmfc.h @@ -0,0 +1,46 @@ +#if !defined(AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_) +#define AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_ + +#if _MSC_VER > 1000 +#pragma once +#endif // _MSC_VER > 1000 + +#ifndef __AFXWIN_H__ + #error include 'stdafx.h' before including this file for PCH +#endif + +#include "resource.h" // main symbols + +///////////////////////////////////////////////////////////////////////////// +// CMFCExampleApp: +// See vldmfc.cpp for the implementation of this class +// + +class CMFCExampleApp : public CWinApp +{ +public: + CMFCExampleApp(); + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CMFCExampleApp) + public: + virtual BOOL InitInstance(); + //}}AFX_VIRTUAL + +// Implementation + + //{{AFX_MSG(CMFCExampleApp) + // NOTE - the ClassWizard will add and remove member functions here. + // DO NOT EDIT what you see in these blocks of generated code ! + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + + +///////////////////////////////////////////////////////////////////////////// + +//{{AFX_INSERT_LOCATION}} +// Microsoft Visual C++ will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_VLDMFC_H__9B6C7B98_B322_4E4F_9969_823D500649E9__INCLUDED_) diff --git a/mfc_detect/vldmfc.rc b/mfc_detect/vldmfc.rc new file mode 100644 index 00000000..a5cc45ce --- /dev/null +++ b/mfc_detect/vldmfc.rc @@ -0,0 +1,144 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "#define _AFX_NO_SPLITTER_RESOURCES\r\n" + "#define _AFX_NO_OLE_RESOURCES\r\n" + "#define _AFX_NO_TRACKER_RESOURCES\r\n" + "#define _AFX_NO_PROPERTY_RESOURCES\r\n" + "\r\n" + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" + "#ifdef _WIN32\r\n" + "LANGUAGE 9, 1\r\n" + "#pragma code_page(1252)\r\n" + "#endif //_WIN32\r\n" + "#include ""res\\vldmfc.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""afxres.rc"" // Standard components\r\n" + "#endif\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDR_MAINFRAME ICON "res\\vldmfc.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,1,1 + PRODUCTVERSION 1,0,1,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "This software is copyright (c) 2005 Dan Moulding and is distributed under the terms of the GNU Lesser Public License" + VALUE "FileDescription", "Visual Leak Detector MFC Example" + VALUE "FileVersion", "1, 0, 1, 1" + VALUE "InternalName", "vldmfc" + VALUE "LegalCopyright", "Copyright (C) 2005" + VALUE "OriginalFilename", "vldmfc.exe" + VALUE "ProductName", "Visual Leak Detector MFC Example" + VALUE "ProductVersion", "1, 0, 1, 1" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_ABOUTBOX "&About Visual Leak Detector MFC Example..." +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#define _AFX_NO_SPLITTER_RESOURCES +#define _AFX_NO_OLE_RESOURCES +#define _AFX_NO_TRACKER_RESOURCES +#define _AFX_NO_PROPERTY_RESOURCES + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE 9, 1 +#pragma code_page(1252) +#endif //_WIN32 +#include "res\vldmfc.rc2" // non-Microsoft Visual C++ edited resources +#include "afxres.rc" // Standard components +#endif + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/mfc_detect/vldmfc_detect.sln b/mfc_detect/vldmfc_detect.sln new file mode 100644 index 00000000..482d5ced --- /dev/null +++ b/mfc_detect/vldmfc_detect.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect", "vldmfc_detect.vcproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug (Unicode)|Win32 = Debug (Unicode)|Win32 + Debug (Unicode)|x64 = Debug (Unicode)|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/mfc_detect/vldmfc_detect.vcxproj.filters b/mfc_detect/vldmfc_detect.vcxproj.filters new file mode 100644 index 00000000..a065821f --- /dev/null +++ b/mfc_detect/vldmfc_detect.vcxproj.filters @@ -0,0 +1,49 @@ + + + + + {ee1a072e-69ee-4e6d-b044-911ae029bbeb} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {ab9a8a11-b14d-470f-a7c5-88b379d3e731} + h;hpp;hxx;hm;inl + + + {65ba1fde-89d1-4036-9a69-3cfddfdc7de5} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + \ No newline at end of file From 8d18e9cfa68e6dace9a0d3df946c042138c7707f Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 19 Jun 2011 22:16:05 +0000 Subject: [PATCH 112/321] Updated CHANGES.txt Added AUTHORS.txt Authors in code replace by VLD Team git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C67976 --- AUTHORS.txt | 13 ++ CHANGES.txt | 20 ++- callstack.cpp | 2 +- callstack.h | 2 +- crtmfcpatch.h | 2 +- map.h | 2 +- ntapi.cpp | 2 +- ntapi.h | 2 +- set.h | 2 +- setup/COPYING.txt | 339 -------------------------------------- setup/vld-setup.nsi | 12 +- tests/suite/testsuite.cpp | 2 +- tree.h | 2 +- utility.cpp | 2 +- utility.h | 2 +- vld.cpp | 2 +- vld.h | 2 +- vld.ini | 2 +- vld_def.h | 2 +- vldapi.cpp | 2 +- vldheap.cpp | 2 +- vldheap.h | 2 +- vldint.h | 2 +- 23 files changed, 56 insertions(+), 366 deletions(-) create mode 100644 AUTHORS.txt delete mode 100644 setup/COPYING.txt diff --git a/AUTHORS.txt b/AUTHORS.txt new file mode 100644 index 00000000..ec5acdce --- /dev/null +++ b/AUTHORS.txt @@ -0,0 +1,13 @@ +------------------------------------------------ +KindDragon http://www.codeplex.com/site/users/view/KindDragon +chrisJohnson http://www.codeplex.com/site/users/view/chrisJohnson + +Contributors: (listed alphabetically) +------------------------------------------------ +geordi, jerker_back, Laurent Lessieux (llessieux), snakefoot, VictorKharkov + +Many thanks to everyone who supported development without having +svn write access. + +Based on the original version (C) 2005-2009 by Dan Moulding (e-mail dmoulding@gmail.com) +http://sites.google.com/site/dmoulding/vld diff --git a/CHANGES.txt b/CHANGES.txt index e3ca9950..b211749f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,12 +1,28 @@ -Visual Leak Detector (VLD) Version 2.1 +Visual Leak Detector (VLD) Version 2.2 Change Log / Release Notes -2.1.1 (5 April 2011) +2.2 (20 June 2011) ---------------------------- + Enhancements: + + New functions added: VLDGetLeaksCount, VLDMarkAllLeaksAsReported (see vld.h). + + Introduced define called VLD_FORCE_ENABLE that allows one to active VLD even if not running in DEBUG. + + Adding Heap Validation. + + _aligned... functions and _recalloc support added. + + Memory leaks additional statistic added. + Bugs Fixed: + Issue fixed with loading wrong version of dbghelp.dll on Windows XP and bellow. + + VLDReportLeaks with aggregate duplicate links fixed. + + CoTaskMemAlloc memory leak detection fixed. + + Rare crash at exit on some platforms fixed. + + Asserts in release build disabled. + + LoaderLock fixed. + + LoadLibrary crash fixed with some applications like regsrv32. + + Callstack hash fixed with ASLR. + + VLDGlobalEnable fixed with new threads. + + Option VLD_OPT_MODULE_LIST_INCLUDE fixed. 2.1 (26 March 2011) ---------------------------- diff --git a/callstack.cpp b/callstack.cpp index 90401912..84ed8da5 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Implementations -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/callstack.h b/callstack.h index 172888d3..715d471c 100644 --- a/callstack.h +++ b/callstack.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Definitions -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 81ad8b51..f3dabba8 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CRT and MFC IAT Patch Functions Header -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/map.h b/map.h index df76d13d..35336347 100644 --- a/map.h +++ b/map.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Lightweight STL-like Map Template -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/ntapi.cpp b/ntapi.cpp index c3110457..a982fe71 100644 --- a/ntapi.cpp +++ b/ntapi.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Global NT API Function Pointers -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/ntapi.h b/ntapi.h index 834bacd7..17b52824 100644 --- a/ntapi.h +++ b/ntapi.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - NT API Definitions -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/set.h b/set.h index 1afeb510..adc54fdd 100644 --- a/set.h +++ b/set.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Lightweight STL-like Set Template -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/setup/COPYING.txt b/setup/COPYING.txt deleted file mode 100644 index d511905c..00000000 --- a/setup/COPYING.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 8c8c89e9..3c602658 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -1,7 +1,7 @@ ################################################################################ # # Visual Leak Detector - NSIS Installation Script -# Copyright (c) 2006-2011 Dan Moulding, Arkadiy Shapkin +# Copyright (c) 2005-2011 VLD Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -184,7 +184,6 @@ Section "Source Code" SetOutPath "${SRC_PATH}" File "..\*.cpp" File "..\*.h" - File "..\vld.vcproj" File "..\vld.vcxproj" File "..\vld.vcxproj.filters" File "..\*.manifest" @@ -193,9 +192,9 @@ SectionEnd Section "Documentation" SetOutPath "$INSTDIR" + File "..\AUTHORS.txt" File "..\CHANGES.txt" File "..\COPYING.txt" - File "..\README.html" SectionEnd Section "Start Menu Shortcuts" @@ -204,7 +203,8 @@ Section "Start Menu Shortcuts" SetShellVarContext all CreateDirectory "${LNK_PATH}" CreateShortcut "${LNK_PATH}\Configure.lnk" "$INSTDIR\vld.ini" - CreateShortcut "${LNK_PATH}\Documentation.lnk" "$INSTDIR\README.html" + CreateShortcut "${LNK_PATH}\Documentation.lnk" "http://vld.codeplex.com/documentation" + CreateShortcut "${LNK_PATH}\Authors.lnk" "$INSTDIR\AUTHORS.txt" CreateShortcut "${LNK_PATH}\License.lnk" "$INSTDIR\COPYING.txt" CreateShortcut "${LNK_PATH}\Uninstall.lnk" "$INSTDIR\uninstall.exe" !insertmacro MUI_STARTMENU_WRITE_END @@ -256,7 +256,6 @@ SectionEnd Section "un.Source Code" Delete "${SRC_PATH}\*.cpp" Delete "${SRC_PATH}\*.h" - Delete "${SRC_PATH}\vld.vcproj" Delete "${SRC_PATH}\vld.vcxproj" Delete "${SRC_PATH}\vld.vcxproj.filters" Delete "${SRC_PATH}\*.manifest" @@ -265,15 +264,16 @@ Section "un.Source Code" SectionEnd Section "un.Documentation" + Delete "$INSTDIR\AUTHORS.txt" Delete "$INSTDIR\CHANGES.txt" Delete "$INSTDIR\COPYING.txt" - Delete "$INSTDIR\README.html" SectionEnd Section "un.Start Menu Shortcuts" !insertmacro MUI_STARTMENU_GETFOLDER "Shortcuts" $SM_PATH SetShellVarContext all Delete "${LNK_PATH}\Configure.lnk" + Delete "${LNK_PATH}\Authors.lnk" Delete "${LNK_PATH}\Documentation.lnk" Delete "${LNK_PATH}\License.lnk" Delete "${LNK_PATH}\Uninstall.lnk" diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 78958ae8..2357de7e 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Test Suite -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/tree.h b/tree.h index dd2c44ef..57c615bd 100644 --- a/tree.h +++ b/tree.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Red-black Tree Template -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/utility.cpp b/utility.cpp index 8bb58479..6fdb447e 100644 --- a/utility.cpp +++ b/utility.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Various Utility Functions -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/utility.h b/utility.h index 301e42f3..dcdcefce 100644 --- a/utility.h +++ b/utility.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Various Utility Definitions -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.cpp b/vld.cpp index 3359cbb5..86576339 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.h b/vld.h index 255e9f32..b576df38 100644 --- a/vld.h +++ b/vld.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Import Library Header -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.ini b/vld.ini index d565b30f..a8827665 100644 --- a/vld.ini +++ b/vld.ini @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Visual Leak Detector - Initialization/Configuration File -;; Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +;; Copyright (c) 2005-2011 VLD Team ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public diff --git a/vld_def.h b/vld_def.h index 02a560b7..e4250858 100644 --- a/vld_def.h +++ b/vld_def.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Import Library Header -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldapi.cpp b/vldapi.cpp index ee640da3..3d4bbcc4 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Exported APIs -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldheap.cpp b/vldheap.cpp index e817e4f8..8e1de876 100644 --- a/vldheap.cpp +++ b/vldheap.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Internal C++ Heap Management -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldheap.h b/vldheap.h index cfec56e9..ed5ba0db 100644 --- a/vldheap.h +++ b/vldheap.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Internal C++ Heap Management Definitions -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldint.h b/vldint.h index 455a094d..fb3f656b 100644 --- a/vldint.h +++ b/vldint.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Definition -// Copyright (c) 2005-2011 Dan Moulding, Arkadiy Shapkin, Laurent Lessieux +// Copyright (c) 2005-2011 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public From 78236343fb12ec4a4b2726cce82d3bc9875db772 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 20 Jul 2011 21:38:16 +0000 Subject: [PATCH 113/321] VLDSetReportHook added Information about version moved to version.h Variables renamed to camel naming convention git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C69024 --- CHANGES.txt | 10 +- callstack.cpp | 318 ++++---- callstack.h | 30 +- criticalsection.h | 8 +- crtmfcpatch.h | 74 +- ntapi.h | 4 +- setup/version.h | 9 + setup/vld-setup.nsi | 3 +- tests/dynamic_app/dynamic_app.cpp | 10 + tree.h | 22 +- utility.cpp | 287 +++---- utility.h | 52 +- vld.cpp | 1163 +++++++++++++++-------------- vld.h | 13 + vld.rc | 11 +- vld.vcxproj | 18 +- vld.vcxproj.filters | 2 +- vld_def.h | 6 +- vldapi.cpp | 43 +- vldheap.cpp | 172 ++--- vldheap.h | 22 +- vldint.h | 118 +-- 22 files changed, 1250 insertions(+), 1145 deletions(-) create mode 100644 setup/version.h diff --git a/CHANGES.txt b/CHANGES.txt index b211749f..de4b935b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,7 +3,15 @@ Visual Leak Detector (VLD) Version 2.2 Change Log / Release Notes -2.2 (20 June 2011) +2.2 (21 Jule 2011) +---------------------------- + Enhancements: + + New functions added: VLDSetReportHook. + + Bugs Fixed: + + Resolved call stack printing fixed. + +2.2b (8 Jule 2011) ---------------------------- Enhancements: + New functions added: VLDGetLeaksCount, VLDMarkAllLeaksAsReported (see vld.h). diff --git a/callstack.cpp b/callstack.cpp index 84ed8da5..0b21339d 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -31,11 +31,11 @@ #define MAXSYMBOLNAMELENGTH 256 // Imported global variables. -extern HANDLE g_currentprocess; -extern HANDLE g_currentthread; -extern CriticalSection g_stackwalklock; -extern CriticalSection g_symbollock; -extern VisualLeakDetector vld; +extern HANDLE g_currentProcess; +extern HANDLE g_currentThread; +extern CriticalSection g_stackWalkLock; +extern CriticalSection g_symbolLock; +extern VisualLeakDetector g_vld; // Constructor - Initializes the CallStack with an initial size of zero and one // Chunk of capacity. @@ -46,12 +46,12 @@ CallStack::CallStack () m_size = 0; m_status = 0x0; m_store.next = NULL; - m_topchunk = &m_store; - m_topindex = 0; - m_Resolved = NULL; - m_ResolvedCapacity = 0; - m_ResolvedLength = 0; - m_hashcode = 0xD202EF8D; + m_topChunk = &m_store; + m_topIndex = 0; + m_resolved = NULL; + m_resolvedCapacity = 0; + m_resolvedLength = 0; + m_hashCode = 0xD202EF8D; } // Destructor - Frees all memory allocated to the CallStack. @@ -67,20 +67,20 @@ CallStack::~CallStack () delete temp; } - if (m_Resolved) + if (m_resolved) { - delete [] m_Resolved; + delete [] m_resolved; } - m_Resolved = NULL; - m_ResolvedCapacity = 0; - m_ResolvedLength = 0; + m_resolved = NULL; + m_resolvedCapacity = 0; + m_resolvedLength = 0; } CallStack* CallStack::Create() { CallStack* result = NULL; - if (vld.GetOptions() & VLD_OPT_SAFE_STACK_WALK) { + if (g_vld.GetOptions() & VLD_OPT_SAFE_STACK_WALK) { result = new SafeCallStack(); } else { @@ -109,19 +109,19 @@ BOOL CallStack::operator == (const CallStack &other) const // Walk the chunk list and within each chunk walk the frames array until we // either find a mismatch, or until we reach the end of the call stacks. - const CallStack::chunk_t *prevchunk = NULL; + const CallStack::chunk_t *prevChunk = NULL; const CallStack::chunk_t *chunk = &m_store; - const CallStack::chunk_t *otherchunk = &other.m_store; - while (prevchunk != m_topchunk) { - for (UINT32 index = 0; index < ((chunk == m_topchunk) ? m_topindex : CALLSTACKCHUNKSIZE); index++) { - if (chunk->frames[index] != otherchunk->frames[index]) { + const CallStack::chunk_t *otherChunk = &other.m_store; + while (prevChunk != m_topChunk) { + for (UINT32 index = 0; index < ((chunk == m_topChunk) ? m_topIndex : CALLSTACKCHUNKSIZE); index++) { + if (chunk->frames[index] != otherChunk->frames[index]) { // Found a mismatch. They are not equal. return FALSE; } } - prevchunk = chunk; + prevChunk = chunk; chunk = chunk->next; - otherchunk = otherchunk->next; + otherChunk = otherChunk->next; } // Reached the end of the call stacks. They are equal. @@ -171,15 +171,15 @@ UINT_PTR CallStack::operator [] (UINT32 index) const VOID CallStack::clear () { m_size = 0; - m_topchunk = &m_store; - m_topindex = 0; - if (m_Resolved) + m_topChunk = &m_store; + m_topIndex = 0; + if (m_resolved) { - delete [] m_Resolved; - m_Resolved = NULL; + delete [] m_resolved; + m_resolved = NULL; } - m_ResolvedCapacity = 0; - m_ResolvedLength = 0; + m_resolvedCapacity = 0; + m_resolvedLength = 0; } @@ -196,30 +196,30 @@ VOID CallStack::clear () // // None. // -void CallStack::dump(BOOL showinternalframes, UINT start_frame) const +void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const { // The stack was dumped already - if (m_Resolved) + if (m_resolved) { - DumpResolved(); + dumpResolved(); return; } if (m_status & CALLSTACK_STATUS_INCOMPLETE) { // This call stack appears to be incomplete. Using StackWalk64 may be // more reliable. - report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" + Report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" L" complete stack trace.\n"); } - IMAGEHLP_LINE64 sourceinfo = { 0 }; - sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + IMAGEHLP_LINE64 sourceInfo = { 0 }; + sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); const UINT32 symbolBufSize = sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1; - BYTE symbolbuffer [symbolBufSize] = { 0 }; + BYTE symbolBuffer [symbolBufSize] = { 0 }; - WCHAR callingmodulename [MAX_PATH]; + WCHAR callingModuleName [MAX_PATH]; const size_t max_size = MAXREPORTLENGTH + 1; @@ -228,51 +228,51 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const { // Try to get the source file and line number associated with // this program counter address. - SIZE_T programcounter = (*this)[frame]; - g_symbollock.Enter(); + SIZE_T programCounter = (*this)[frame]; + g_symbolLock.Enter(); BOOL foundline = FALSE; DWORD displacement = 0; - foundline = SymGetLineFromAddrW64(g_currentprocess, programcounter, &displacement, &sourceinfo); - if (foundline && !showinternalframes) { - _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); - if (IsInternalModule(sourceinfo.FileName)) { + foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + if (foundline && !showInternalFrames) { + _wcslwr_s(sourceInfo.FileName, wcslen(sourceInfo.FileName) + 1); + if (isInternalModule(sourceInfo.FileName)) { // Don't show frames in files internal to the heap. - g_symbollock.Leave(); + g_symbolLock.Leave(); continue; } } // Initialize structures passed to the symbol handler. - SYMBOL_INFO* functioninfo = (SYMBOL_INFO*)&symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + SYMBOL_INFO* functionInfo = (SYMBOL_INFO*)&symbolBuffer; + functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functionInfo->MaxNameLen = MAXSYMBOLNAMELENGTH; // Try to get the name of the function containing this program // counter address. DWORD64 displacement64 = 0; - LPWSTR functionname; - if (SymFromAddrW(g_currentprocess, programcounter, &displacement64, functioninfo)) { - functionname = functioninfo->Name; + LPWSTR functionName; + if (SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { + functionName = functionInfo->Name; } else { // GetFormattedMessage( GetLastError() ); - functionname = L"(Function name unavailable)"; + functionName = L"(Function name unavailable)"; displacement64 = 0; } - g_symbollock.Leave(); + g_symbolLock.Leave(); - HMODULE hCallingModule = GetCallingModule(programcounter); - LPWSTR modulename = L"(Module name unavailable)"; + HMODULE hCallingModule = GetCallingModule(programCounter); + LPWSTR moduleName = L"(Module name unavailable)"; if (hCallingModule && - GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) + GetModuleFileName(hCallingModule, callingModuleName, _countof(callingModuleName)) > 0) { - modulename = wcsrchr(callingmodulename, L'\\'); - if (modulename == NULL) - modulename = wcsrchr(callingmodulename, L'/'); - if (modulename != NULL) - modulename++; + moduleName = wcsrchr(callingModuleName, L'\\'); + if (moduleName == NULL) + moduleName = wcsrchr(callingModuleName, L'/'); + if (moduleName != NULL) + moduleName++; else - modulename = callingmodulename; + moduleName = callingModuleName; } // Use static here to increase performance, and avoid heap allocs. Hopefully this won't @@ -283,21 +283,21 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const if (foundline) { if (displacement == 0) NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s\n", - sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname); + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); else NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", - sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname, displacement); + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); } else { if (displacement64 == 0) NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", - programcounter, modulename, functionname); + programCounter, moduleName, functionName); else NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", - programcounter, modulename, functionname, (DWORD)displacement64); + programCounter, moduleName, functionName, (DWORD)displacement64); } - print(stack_line); + Print(stack_line); } } @@ -308,19 +308,16 @@ void CallStack::dump(BOOL showinternalframes, UINT start_frame) const // Note: The symbol handler must be initialized prior to calling this // function. // -// - showinternalframes (IN): If true, then all frames in the CallStack will be +// - showInternalFrames (IN): If true, then all frames in the CallStack will be // dumped. Otherwise, frames internal to the heap will not be dumped. // -// - ResolveOnly (IN): If true, it does not print the results out to the standard -// outputs, but saves the formatted rendition for later retrieval. -// // Return Value: // // None. // -void CallStack::Resolve(BOOL showinternalframes) +void CallStack::resolve(BOOL showInternalFrames) { - if (m_Resolved) + if (m_resolved) { // already resolved, no need to do it again // resolving twice may report an incorrect module for the stack frames @@ -330,81 +327,81 @@ void CallStack::Resolve(BOOL showinternalframes) if (m_status & CALLSTACK_STATUS_INCOMPLETE) { // This call stack appears to be incomplete. Using StackWalk64 may be // more reliable. - report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" + Report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" L" complete stack trace.\n"); } - IMAGEHLP_LINE64 sourceinfo = { 0 }; - sourceinfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + IMAGEHLP_LINE64 sourceInfo = { 0 }; + sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); const UINT32 symbolBufSize = sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1; - BYTE symbolbuffer [symbolBufSize] = { 0 }; + BYTE symbolBuffer [symbolBufSize] = { 0 }; - WCHAR callingmodulename [MAX_PATH] = L""; + WCHAR callingModuleName [MAX_PATH] = L""; const size_t max_line_length = MAXREPORTLENGTH + 1; - m_ResolvedCapacity = m_size * max_line_length; - m_Resolved = new WCHAR[m_ResolvedCapacity]; - const size_t allocedBytes = m_ResolvedCapacity * sizeof(WCHAR); - ZeroMemory(m_Resolved, allocedBytes); + m_resolvedCapacity = m_size * max_line_length; + m_resolved = new WCHAR[m_resolvedCapacity]; + const size_t allocedBytes = m_resolvedCapacity * sizeof(WCHAR); + ZeroMemory(m_resolved, allocedBytes); // Iterate through each frame in the call stack. for (UINT32 frame = 0; frame < m_size; frame++) { // Try to get the source file and line number associated with // this program counter address. - SIZE_T programcounter = (*this)[frame]; - g_symbollock.Enter(); + SIZE_T programCounter = (*this)[frame]; + g_symbolLock.Enter(); BOOL foundline = FALSE; DWORD displacement = 0; // It turns out that calls to SymGetLineFromAddrW64 may free the very memory we are scrutinizing here // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. // When that happens there is nothing we can do except crash. - foundline = SymGetLineFromAddrW64(g_currentprocess, programcounter, &displacement, &sourceinfo); - assert(m_Resolved != NULL); + foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + assert(m_resolved != NULL); - if (foundline && !showinternalframes) { - _wcslwr_s(sourceinfo.FileName, wcslen(sourceinfo.FileName) + 1); - if (IsInternalModule(sourceinfo.FileName)) { + if (foundline && !showInternalFrames) { + _wcslwr_s(sourceInfo.FileName, wcslen(sourceInfo.FileName) + 1); + if (isInternalModule(sourceInfo.FileName)) { // Don't show frames in files internal to the heap. - g_symbollock.Leave(); + g_symbolLock.Leave(); continue; } } // Initialize structures passed to the symbol handler. - SYMBOL_INFO* functioninfo = (SYMBOL_INFO*)&symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + SYMBOL_INFO* functionInfo = (SYMBOL_INFO*)&symbolBuffer; + functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functionInfo->MaxNameLen = MAXSYMBOLNAMELENGTH; // Try to get the name of the function containing this program // counter address. DWORD64 displacement64 = 0; - LPWSTR functionname; - if (SymFromAddrW(g_currentprocess, programcounter, &displacement64, functioninfo)) { - functionname = functioninfo->Name; + LPWSTR functionName; + if (SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { + functionName = functionInfo->Name; } else { // GetFormattedMessage( GetLastError() ); - functionname = L"(Function name unavailable)"; + functionName = L"(Function name unavailable)"; displacement64 = 0; } - g_symbollock.Leave(); + g_symbolLock.Leave(); - HMODULE hCallingModule = GetCallingModule(programcounter); - LPWSTR modulename = L"(Module name unavailable)"; + HMODULE hCallingModule = GetCallingModule(programCounter); + LPWSTR moduleName = L"(Module name unavailable)"; if (hCallingModule && - GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) + GetModuleFileName(hCallingModule, callingModuleName, _countof(callingModuleName)) > 0) { - modulename = wcsrchr(callingmodulename, L'\\'); - if (modulename == NULL) - modulename = wcsrchr(callingmodulename, L'/'); - if (modulename != NULL) - modulename++; + moduleName = wcsrchr(callingModuleName, L'\\'); + if (moduleName == NULL) + moduleName = wcsrchr(callingModuleName, L'/'); + if (moduleName != NULL) + moduleName++; else - modulename = callingmodulename; + moduleName = callingModuleName; } // Use static here to increase performance, and avoid heap allocs. Hopefully this won't @@ -416,42 +413,33 @@ void CallStack::Resolve(BOOL showinternalframes) // Just truncate anything that is too long. if (displacement == 0) NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s\n", - sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname); + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); else NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", - sourceinfo.FileName, sourceinfo.LineNumber, modulename, functionname, displacement); + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); } else { if (displacement64 == 0) NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", - programcounter, modulename, functionname); + programCounter, moduleName, functionName); else NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", - programcounter, modulename, functionname, (DWORD)displacement64); + programCounter, moduleName, functionName, (DWORD)displacement64); } if (NumChars >= 0) { - assert(m_Resolved != NULL); - m_ResolvedLength += NumChars; - wcsncat_s(m_Resolved, m_ResolvedCapacity, stack_line, NumChars); + assert(m_resolved != NULL); + m_resolvedLength += NumChars; + wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); } } // end for loop } // DumpResolve -void CallStack::DumpResolved() const +void CallStack::dumpResolved() const { - if (m_Resolved) - { - int index = 0; - WCHAR* resolved_stack = m_Resolved; - while(index < m_ResolvedLength) - { - print(resolved_stack); - resolved_stack += MAXREPORTLENGTH; - index += MAXREPORTLENGTH; - } - } + if (m_resolved) + Print(m_resolved); } @@ -464,7 +452,7 @@ void CallStack::DumpResolved() const // DWORD CallStack::getHashValue () const { - return m_hashcode; + return m_hashCode; } // push_back - Pushes a frame's program counter onto the CallStack. Pushes are @@ -486,28 +474,28 @@ VOID CallStack::push_back (const UINT_PTR programcounter) // At current capacity. Allocate additional storage. CallStack::chunk_t *chunk = new CallStack::chunk_t; chunk->next = NULL; - m_topchunk->next = chunk; - m_topchunk = chunk; - m_topindex = 0; + m_topChunk->next = chunk; + m_topChunk = chunk; + m_topIndex = 0; m_capacity += CALLSTACKCHUNKSIZE; } - else if (m_topindex >= CALLSTACKCHUNKSIZE) { + else if (m_topIndex >= CALLSTACKCHUNKSIZE) { // There is more capacity, but not in this chunk. Go to the next chunk. // Note that this only happens if this CallStack has previously been // cleared (clearing resets the data, but doesn't give up any allocated // space). - m_topchunk = m_topchunk->next; - m_topindex = 0; + m_topChunk = m_topChunk->next; + m_topIndex = 0; } UINT_PTR BaseAddress = (UINT_PTR)GetCallingModule(programcounter); - m_hashcode = CalculateCRC32(programcounter - BaseAddress, m_hashcode); + m_hashCode = CalculateCRC32(programcounter - BaseAddress, m_hashCode); - m_topchunk->frames[m_topindex++] = programcounter; + m_topChunk->frames[m_topIndex++] = programcounter; m_size++; } -bool CallStack::IsInternalModule( const PWSTR filename ) const +bool CallStack::isInternalModule( const PWSTR filename ) const { return wcsstr(filename, L"afxmem.cpp") || wcsstr(filename, L"dbgheap.c") || @@ -520,7 +508,7 @@ bool CallStack::IsInternalModule( const PWSTR filename ) const wcsstr(filename, L"free.c"); } -// getstacktrace - Traces the stack as far back as possible, or until 'maxdepth' +// getStackTrace - Traces the stack as far back as possible, or until 'maxdepth' // frames have been traced. Populates the CallStack with one entry for each // stack frame traced. // @@ -539,15 +527,15 @@ bool CallStack::IsInternalModule( const PWSTR filename ) const // // None. // -VOID FastCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) +VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) { UINT32 count = 0; - UINT_PTR* framepointer = context.fp; + UINT_PTR* framePointer = context.fp; #if defined(_M_IX86) while (count < maxdepth) { - if (*framepointer < (UINT_PTR)framepointer) { - if (*framepointer == NULL) { + if (*framePointer < (UINT_PTR)framePointer) { + if (*framePointer == NULL) { // Looks like we reached the end of the stack. break; } @@ -558,7 +546,7 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) break; } } - if (*framepointer & (sizeof(UINT_PTR*) - 1)) { + if (*framePointer & (sizeof(UINT_PTR*) - 1)) { // Invalid frame pointer. Frame pointer addresses should always // be aligned to the size of a pointer. This probably means that // we've encountered a frame that was created by a module built with @@ -566,15 +554,15 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) m_status |= CALLSTACK_STATUS_INCOMPLETE; break; } - if (IsBadReadPtr((UINT*)*framepointer, sizeof(UINT_PTR*))) { + if (IsBadReadPtr((UINT*)*framePointer, sizeof(UINT_PTR*))) { // Bogus frame pointer. Again, this probably means that we've // encountered a frame built with FPO optimization. m_status |= CALLSTACK_STATUS_INCOMPLETE; break; } count++; - push_back(*(framepointer + 1)); - framepointer = (UINT_PTR*)*framepointer; + push_back(*(framePointer + 1)); + framePointer = (UINT_PTR*)*framePointer; } #elif defined(_M_X64) UINT32 maxframes = min(62, maxdepth + 10); @@ -594,7 +582,7 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) while (count < maxframes) { if (myFrames[count] == 0) break; - if (myFrames[count] == *(framepointer + 1)) + if (myFrames[count] == *(framePointer + 1)) startIndex = count; count++; } @@ -609,7 +597,7 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) #endif } -// getstacktrace - Traces the stack as far back as possible, or until 'maxdepth' +// getStackTrace - Traces the stack as far back as possible, or until 'maxdepth' // frames have been traced. Populates the CallStack with one entry for each // stack frame traced. // @@ -628,25 +616,25 @@ VOID FastCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) // // None. // -VOID SafeCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) +VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) { - UINT_PTR* framepointer = context.fp; + UINT_PTR* framePointer = context.fp; DWORD architecture = X86X64ARCHITECTURE; - CONTEXT currentcontext; - memset(¤tcontext, 0, sizeof(currentcontext)); + CONTEXT currentContext; + memset(¤tContext, 0, sizeof(currentContext)); // Get the required values for initialization of the STACKFRAME64 structure // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame. #if defined(_M_IX86) - UINT_PTR programcounter = *(framepointer + 1); - UINT_PTR stackpointer = (*framepointer) - maxdepth * 10 * sizeof(void*); // An approximation. - currentcontext.SPREG = stackpointer; - currentcontext.BPREG = (DWORD64)framepointer; - currentcontext.IPREG = programcounter; + UINT_PTR programcounter = *(framePointer + 1); + UINT_PTR stackpointer = (*framePointer) - maxdepth * 10 * sizeof(void*); // An approximation. + currentContext.SPREG = stackpointer; + currentContext.BPREG = (DWORD64)framePointer; + currentContext.IPREG = programcounter; #elif defined(_M_X64) - currentcontext.SPREG = context.Rsp; - currentcontext.BPREG = (DWORD64)framepointer; - currentcontext.IPREG = context.Rip; + currentContext.SPREG = context.Rsp; + currentContext.BPREG = (DWORD64)framePointer; + currentContext.IPREG = context.Rip; #else // If you want to retarget Visual Leak Detector to another processor // architecture then you'll need to provide architecture-specific code to @@ -657,20 +645,20 @@ VOID SafeCallStack::getstacktrace (UINT32 maxdepth, const context_t& context) // Initialize the STACKFRAME64 structure. STACKFRAME64 frame; memset(&frame, 0x0, sizeof(frame)); - frame.AddrPC.Offset = currentcontext.IPREG; + frame.AddrPC.Offset = currentContext.IPREG; frame.AddrPC.Mode = AddrModeFlat; - frame.AddrStack.Offset = currentcontext.SPREG; + frame.AddrStack.Offset = currentContext.SPREG; frame.AddrStack.Mode = AddrModeFlat; - frame.AddrFrame.Offset = currentcontext.BPREG; + frame.AddrFrame.Offset = currentContext.BPREG; frame.AddrFrame.Mode = AddrModeFlat; frame.Virtual = TRUE; // Walk the stack. - CriticalSectionLocker cs(g_stackwalklock); + CriticalSectionLocker cs(g_stackWalkLock); UINT32 count = 0; while (count < maxdepth) { count++; - if (!StackWalk64(architecture, g_currentprocess, g_currentthread, &frame, ¤tcontext, NULL, + if (!StackWalk64(architecture, g_currentProcess, g_currentThread, &frame, ¤tContext, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { // Couldn't trace back through any more frames. break; diff --git a/callstack.h b/callstack.h index 715d471c..b0217564 100644 --- a/callstack.h +++ b/callstack.h @@ -81,13 +81,13 @@ class CallStack static CallStack* Create(); // Public APIs - see each function definition for details. VOID clear (); - // Prints the Callstack to one of either / or the debug output window and or + // Prints the call stack to one of either / or the debug output window and or // a log file. VOID dump (BOOL showinternalframes, UINT start_frame = 0) const; // Formats the stack frame into a human readable format, and saves it for later retrieval. - VOID Resolve(BOOL showinternalframes); + VOID resolve(BOOL showinternalframes); DWORD getHashValue () const; - virtual VOID getstacktrace (UINT32 maxdepth, const context_t& context) = 0; + virtual VOID getStackTrace (UINT32 maxdepth, const context_t& context) = 0; BOOL operator == (const CallStack &other) const; UINT_PTR operator [] (UINT32 index) const; @@ -106,27 +106,27 @@ class CallStack // The chunk list is made of a linked list of Chunks. struct chunk_t { - chunk_t* next; // Pointer to the next chunk in the chunk list. - UINT_PTR frames[CALLSTACKCHUNKSIZE]; // Pushed frames (program counter addresses) are stored in this array. + chunk_t* next; // Pointer to the next chunk in the chunk list. + UINT_PTR frames[CALLSTACKCHUNKSIZE]; // Pushed frames (program counter addresses) are stored in this array. }; // Private data. UINT32 m_capacity; // Current capacity limit (in frames) UINT32 m_size; // Current size (in frames) CallStack::chunk_t m_store; // Pointer to the underlying data store (i.e. head of the chunk list) - CallStack::chunk_t* m_topchunk; // Pointer to the chunk at the top of the stack - UINT32 m_topindex; // Index, within the top chunk, of the top of the stack - UINT32 m_hashcode; // Callstack hash code + CallStack::chunk_t* m_topChunk; // Pointer to the chunk at the top of the stack + UINT32 m_topIndex; // Index, within the top chunk, of the top of the stack + UINT32 m_hashCode; // Call stack hash code // The string that contains the stack converted into a human readable format. // This is always NULL if the callstack has not been 'converted'. - WCHAR* m_Resolved; - int m_ResolvedCapacity; - int m_ResolvedLength; + WCHAR* m_resolved; + int m_resolvedCapacity; + int m_resolvedLength; // Prints out the strings in m_Resolved when the time comes to report the callstack in // human readable form. Currently this is only called by the dump method. - void DumpResolved() const; - bool IsInternalModule( const PWSTR filename ) const; + void dumpResolved() const; + bool isInternalModule( const PWSTR filename ) const; }; @@ -140,7 +140,7 @@ class CallStack class FastCallStack : public CallStack { public: - VOID getstacktrace (UINT32 maxdepth, const context_t& context); + VOID getStackTrace (UINT32 maxdepth, const context_t& context); }; //////////////////////////////////////////////////////////////////////////////// @@ -153,5 +153,5 @@ class FastCallStack : public CallStack class SafeCallStack : public CallStack { public: - VOID getstacktrace (UINT32 maxdepth, const context_t& context); + VOID getStackTrace (UINT32 maxdepth, const context_t& context); }; diff --git a/criticalsection.h b/criticalsection.h index bcbe9303..53c4f775 100644 --- a/criticalsection.h +++ b/criticalsection.h @@ -48,9 +48,9 @@ class CriticalSectionLocker public: CriticalSectionLocker(CriticalSection& cs) : m_leave(false) - , m_critsect(cs) + , m_critSect(cs) { - m_critsect.Enter(); + m_critSect.Enter(); } ~CriticalSectionLocker() @@ -69,12 +69,12 @@ class CriticalSectionLocker { if (!m_leave) { - m_critsect.Leave(); + m_critSect.Leave(); m_leave = true; } } CriticalSectionLocker(); // not allowed CriticalSectionLocker & operator=( const CriticalSectionLocker & ); // not allowed bool m_leave; - CriticalSection& m_critsect; + CriticalSection& m_critSect; }; diff --git a/crtmfcpatch.h b/crtmfcpatch.h index f3dabba8..f081eca0 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -30,7 +30,7 @@ Applications should never include this header." #endif #include "vldint.h" -extern __declspec(dllexport) VisualLeakDetector vld; +extern __declspec(dllexport) VisualLeakDetector g_vld; template class CrtMfcPatch @@ -153,7 +153,7 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, context_t context; CAPTURE_CONTEXT(context); - return vld.__calloc_dbg(pcrtxxd__calloc_dbg, context, debug, num, size, type, file, line); + return g_vld.__calloc_dbg(pcrtxxd__calloc_dbg, context, debug, num, size, type, file, line); } // crtd__malloc_dbg - Calls to _malloc_dbg from msvcrXXd.dll are patched @@ -184,7 +184,7 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, context_t context; CAPTURE_CONTEXT(context); - return vld.__malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, type, file, line); + return g_vld.__malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, type, file, line); } // crtd__realloc_dbg - Calls to _realloc_dbg from msvcrXXd.dll are patched @@ -218,7 +218,7 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, context_t context; CAPTURE_CONTEXT(context); - return vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, type, file, line); + return g_vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, type, file, line); } // crtd__recalloc_dbg - Calls to _recalloc_dbg from msvcrXXd.dll are patched @@ -253,7 +253,7 @@ void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, context_t context; CAPTURE_CONTEXT(context); - return vld.__recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, type, file, line); + return g_vld.__recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, type, file, line); } // crtd__scalar_new_dbg - Calls to the CRT's debug scalar new operator from @@ -284,7 +284,7 @@ void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); + return g_vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); } // crtd__vector_new_dbg - Calls to the CRT's debug vector new operator from @@ -315,7 +315,7 @@ void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); + return g_vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); } // crtd_calloc - Calls to calloc from msvcrXXd.dll are patched through to @@ -340,7 +340,7 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._calloc(pcrtxxd_calloc, context, debug, num, size); + return g_vld._calloc(pcrtxxd_calloc, context, debug, num, size); } // crtd_malloc - Calls to malloc from msvcrXXd.dll are patched through to @@ -363,7 +363,7 @@ void* CrtMfcPatch::crtd_malloc (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._malloc(pcrtxxd_malloc, context, debug, size); + return g_vld._malloc(pcrtxxd_malloc, context, debug, size); } // crtd_realloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -388,7 +388,7 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._realloc(pcrtxxd_realloc, context, debug, mem, size); + return g_vld._realloc(pcrtxxd_realloc, context, debug, mem, size); } // crtd__recalloc - Calls to _recalloc from msvcrXXd.dll are patched through to @@ -413,7 +413,7 @@ void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, siz context_t context; CAPTURE_CONTEXT(context); - return vld.__recalloc(pcrtxxd_recalloc, context, debug, mem, num, size); + return g_vld.__recalloc(pcrtxxd_recalloc, context, debug, mem, num, size); } // crtd__aligned_malloc_dbg - Calls to _aligned_malloc_dbg from msvcrXXd.dll are patched @@ -445,7 +445,7 @@ void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_malloc_dbg(pcrtxxd__aligned_malloc_dbg, context, debug, size, alignment, type, file, line); + return g_vld.__aligned_malloc_dbg(pcrtxxd__aligned_malloc_dbg, context, debug, size, alignment, type, file, line); } // crtd__aligned_offset_malloc_dbg - Calls to _aligned_offset_malloc_dbg from msvcrXXd.dll are patched @@ -478,7 +478,7 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, alignment, offset, type, file, line); + return g_vld.__aligned_offset_malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, alignment, offset, type, file, line); } // crtd__aligned_realloc_dbg - Calls to _aligned_realloc_dbg from msvcrXXd.dll are patched @@ -513,7 +513,7 @@ void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, type, file, line); + return g_vld.__aligned_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, type, file, line); } // crtd__aligned_offset_realloc_dbg - Calls to _aligned_offset_realloc_dbg from msvcrXXd.dll are patched @@ -549,7 +549,7 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, offset, type, file, line); + return g_vld.__aligned_offset_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, offset, type, file, line); } // crtd__aligned_recalloc_dbg - Calls to _aligned_recalloc_dbg from msvcrXXd.dll are patched @@ -587,7 +587,7 @@ void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *me context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, type, file, line); + return g_vld.__aligned_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, type, file, line); } // crtd__aligned_offset_recalloc_dbg - Calls to _aligned_offset_realloc_dbg from msvcrXXd.dll are patched @@ -626,7 +626,7 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, offset, type, file, line); + return g_vld.__aligned_offset_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, offset, type, file, line); } // crtd__aligned_malloc - Calls to malloc from msvcrXXd.dll are patched through to @@ -649,7 +649,7 @@ void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_malloc(pcrtxxd_malloc, context, debug, size, alignment); + return g_vld.__aligned_malloc(pcrtxxd_malloc, context, debug, size, alignment); } // crtd__aligned_offset_malloc - Calls to malloc from msvcrXXd.dll are patched through to @@ -672,7 +672,7 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_malloc(pcrtxxd_malloc, context, debug, size, alignment, offset); + return g_vld.__aligned_offset_malloc(pcrtxxd_malloc, context, debug, size, alignment, offset); } // crtd__aligned_realloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -697,7 +697,7 @@ void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t s context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment); + return g_vld.__aligned_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment); } // crtd__aligned_offset_realloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -722,7 +722,7 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, s context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment, offset); + return g_vld.__aligned_offset_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment, offset); } // crtd__aligned_recalloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -749,7 +749,7 @@ void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment); + return g_vld.__aligned_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment); } // crtd__aligned_offset_recalloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -776,7 +776,7 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, context_t context; CAPTURE_CONTEXT(context); - return vld.__aligned_offset_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment, offset); + return g_vld.__aligned_offset_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment, offset); } // crtd_scalar_new - Calls to the CRT's scalar new operator from msvcrXXd.dll @@ -797,7 +797,7 @@ void* CrtMfcPatch::crtd_scalar_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pcrtxxd_scalar_new, context, debug, size); + return g_vld._new(pcrtxxd_scalar_new, context, debug, size); } // crtd_vector_new - Calls to the CRT's vector new operator from msvcrXXd.dll @@ -818,7 +818,7 @@ void* CrtMfcPatch::crtd_vector_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pcrtxxd_scalar_new, context, debug, size); + return g_vld._new(pcrtxxd_scalar_new, context, debug, size); } //////////////////////////////////////////////////////////////////////////////// @@ -855,7 +855,7 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); + return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } // mfcd__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from @@ -883,7 +883,7 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); + return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } // mfcd__vector_new_dbg_4p - Calls to the MFC debug vector new operator from @@ -914,7 +914,7 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); + return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } // mfcd__vector_new_dbg_3p - Calls to the MFC debug vector new operator from @@ -942,7 +942,7 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); + return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } // mfcd_scalar_new - Calls to the MFC scalar new operator from mfcXXd.dll are @@ -963,7 +963,7 @@ void* CrtMfcPatch::mfcd_scalar_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pmfcxxd_new, context, debug, size); + return g_vld._new(pmfcxxd_new, context, debug, size); } // mfcd_vector_new - Calls to the MFC vector new operator from mfcXXd.dll are @@ -984,7 +984,7 @@ void* CrtMfcPatch::mfcd_vector_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pmfcxxd_new, context, debug, size); + return g_vld._new(pmfcxxd_new, context, debug, size); } // mfcud__scalar_new_dbg_4p - Calls to the MFC debug scalar new operator from @@ -1015,7 +1015,7 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); + return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } // mfcud__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from @@ -1043,7 +1043,7 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); + return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } // mfcud__vector_new_dbg_4p - Calls to the MFC debug vector new operator from @@ -1074,7 +1074,7 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); + return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } // mfcud__vector_new_dbg_3p - Calls to the MFC debug vector new operator from @@ -1102,7 +1102,7 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size context_t context; CAPTURE_CONTEXT(context); - return vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); + return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } // mfcud_scalar_new - Calls to the MFC scalar new operator from mfcXXud.dll are @@ -1123,7 +1123,7 @@ void* CrtMfcPatch::mfcud_scalar_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pmfcxxd_new, context, debug, size); + return g_vld._new(pmfcxxd_new, context, debug, size); } // mfcud_vector_new - Calls to the MFC vector new operator from mfcXXud.dll are @@ -1144,7 +1144,7 @@ void* CrtMfcPatch::mfcud_vector_new (size_t size) context_t context; CAPTURE_CONTEXT(context); - return vld._new(pmfcxxd_new, context, debug, size); + return g_vld._new(pmfcxxd_new, context, debug, size); } #ifndef WIN64 diff --git a/ntapi.h b/ntapi.h index 17b52824..017368ad 100644 --- a/ntapi.h +++ b/ntapi.h @@ -36,11 +36,11 @@ typedef LONG NTSTATUS; #define STATUS_SUCCESS 0 // Unicode string structure used by NT APIs. -typedef struct unicodestring_s { +struct unicodestring_t { USHORT length; // Length of the string. USHORT maxlength; // Length of the buffer. PWSTR buffer; // The buffer containing the string. -} unicodestring_t; +}; // Function pointer types for explicit dynamic linking with functions that can't // be load-time linked (no import library is available for these). diff --git a/setup/version.h b/setup/version.h new file mode 100644 index 00000000..f4aba6d2 --- /dev/null +++ b/setup/version.h @@ -0,0 +1,9 @@ + +#define VLDVERSION L"2.2" +#define VERSION_NUMBER 2,2,0,0 +#define VERSION_STRING "2.2.0.0" +#define VERSION_COPYRIGHT "Copyright (C) 2005-2011" + +#ifndef __FILE__ +!define VLD_VERSION "2.2" // NSIS Script +#endif diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 3c602658..015c3955 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -25,8 +25,7 @@ !include "LogicLib.nsh" # Provides useable conditional script syntax !include "MUI.nsh" # Provides the modern user-interface -# Version number -!define VLD_VERSION "2.2" +!include "version.h" # Version number # Define build system paths #!define CRT_PATH "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT" diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 4040eb89..24c2caf1 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -135,11 +135,18 @@ void PrintUsage() wprintf(_T("\t - [OPTIONAL] Resolves callstacks before unloading the dynamic DLL.\n")); } +int __cdecl ReportHook(int /*reportHook*/, const wchar_t *message, int* /*returnValue*/) +{ + OutputDebugString(message); + return 1; +} + int _tmain(int argc, _TCHAR* argv[]) { if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) return RunAllTest(); + VLDSetReportHook(VLD_RPTHOOK_INSTALL, ReportHook); wprintf(_T("======================================\n")); wprintf(_T("==\n")); wprintf(_T("== VLD Tests: Dynamic DLL Loading \n")); @@ -194,6 +201,9 @@ int _tmain(int argc, _TCHAR* argv[]) // ..................Total: 31 leaks total totalleaks = (int)VLDGetLeaksCount() - tutleaks; + VLDReportLeaks(); + VLDMarkAllLeaksAsReported(); + VLDSetReportHook(VLD_RPTHOOK_REMOVE, ReportHook); int diff = 31 - totalleaks; return diff; } diff --git a/tree.h b/tree.h index 57c615bd..03e143bd 100644 --- a/tree.h +++ b/tree.h @@ -62,23 +62,23 @@ class Tree }; // The node is the basic data structure which the tree is built from. - typedef struct node_s { + struct node_t { color_e color; // The node's color. T key; // The node's value, by which nodes are sorted. union { - struct node_s *left; // For nodes in the tree, the node's left child. - struct node_s *next; // For nodes in the free list, the next node on the free list. + struct node_t *left; // For nodes in the tree, the node's left child. + struct node_t *next; // For nodes in the free list, the next node on the free list. }; - struct node_s *parent; // The node's parent. - struct node_s *right; // The node's right child. - } node_t; + struct node_t *parent; // The node's parent. + struct node_t *right; // The node's right child. + }; // Reserve capacity for the tree is allocated in large chunks with room for // many nodes. - typedef struct chunk_s { - struct chunk_s *next; // Pointer to the next node in the chunk list. + struct chunk_t { + struct chunk_t *next; // Pointer to the next node in the chunk list. node_t *nodes; // Pointer to an array (of variable size) where nodes are stored. - } chunk_t; + }; // Constructor Tree () @@ -317,7 +317,7 @@ class Tree node_t *node; // Find the node to erase. - CriticalSectionLocker cs(&m_lock); + CriticalSectionLocker cs(m_lock); node = m_root; while (node != &m_nil) { if (node->key < key) { @@ -647,7 +647,7 @@ class Tree // Allocate additional storage. // Link a new chunk into the chunk list. chunk = new Tree::chunk_t; - chunk->nodes = new Tree::node_s [m_reserve]; + chunk->nodes = new Tree::node_t [m_reserve]; chunk->next = NULL; if (m_store == NULL) { m_store = chunk; diff --git a/utility.cpp b/utility.cpp index 6fdb447e..7ec4bb97 100644 --- a/utility.cpp +++ b/utility.cpp @@ -28,16 +28,17 @@ #include "vldint.h" // Imported Global Variables -extern CriticalSection g_imagelock; +extern CriticalSection g_imageLock; +extern ReportHookSet* g_pReportHooks; // Global variables. -static BOOL reportdelay = FALSE; // If TRUE, we sleep for a bit after calling OutputDebugString to give the debugger time to catch up. -static FILE *reportfile = NULL; // Pointer to the file, if any, to send the memory leak report to. -static BOOL reporttodebugger = TRUE; // If TRUE, a copy of the memory leak report will be sent to the debugger for display. -static BOOL reporttostdout = TRUE; // If TRUE, a copy of the memory leak report will be sent to standart output. -static encoding_e reportencoding = ascii; // Output encoding of the memory leak report. +static BOOL s_reportDelay = FALSE; // If TRUE, we sleep for a bit after calling OutputDebugString to give the debugger time to catch up. +static FILE *s_reportFile = NULL; // Pointer to the file, if any, to send the memory leak report to. +static BOOL s_reportToDebugger = TRUE; // If TRUE, a copy of the memory leak report will be sent to the debugger for display. +static BOOL s_reportToStdOut = TRUE; // If TRUE, a copy of the memory leak report will be sent to standard output. +static encoding_e s_reportEncoding = ascii; // Output encoding of the memory leak report. -// dumpmemorya - Dumps a nicely formatted rendition of a region of memory. +// DumpMemoryA - Dumps a nicely formatted rendition of a region of memory. // Includes both the hex value of each byte and its ASCII equivalent (if // printable). // @@ -49,66 +50,66 @@ static encoding_e reportencoding = ascii; // Output encoding of the memory lea // // None. // -VOID dumpmemorya (LPCVOID address, SIZE_T size) +VOID DumpMemoryA (LPCVOID address, SIZE_T size) { // Each line of output is 16 bytes. - SIZE_T dumplen; + SIZE_T dumpLen; if ((size % 16) == 0) { // No padding needed. - dumplen = size; + dumpLen = size; } else { // We'll need to pad the last line out to 16 bytes. - dumplen = size + (16 - (size % 16)); + dumpLen = size + (16 - (size % 16)); } // For each byte of data, get both the ASCII equivalent (if it is a // printable character) and the hex representation. - SIZE_T bytesdone = 0; - WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; - WCHAR ascdump [18] = {0}; - WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; - for (SIZE_T byteindex = 0; byteindex < dumplen; byteindex++) { - SIZE_T wordIndex = byteindex % 16; - SIZE_T hexindex = 3 * (wordIndex + (wordIndex / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. - SIZE_T ascindex = wordIndex + wordIndex / 8; // 1 character per byte, plus a 1-character space after every 8 bytes. - if (byteindex < size) { - BYTE byte = ((PBYTE)address)[byteindex]; - _snwprintf_s(formatbuf, BYTEFORMATBUFFERLENGTH, _TRUNCATE, L"%.2X ", byte); - formatbuf[3] = '\0'; - wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, formatbuf, 4); + SIZE_T bytesDone = 0; + WCHAR hexDump [HEXDUMPLINELENGTH] = {0}; + WCHAR ascDump [18] = {0}; + WCHAR formatBuf [BYTEFORMATBUFFERLENGTH]; + for (SIZE_T byteIndex = 0; byteIndex < dumpLen; byteIndex++) { + SIZE_T wordIndex = byteIndex % 16; + SIZE_T hexIndex = 3 * (wordIndex + (wordIndex / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. + SIZE_T ascIndex = wordIndex + wordIndex / 8; // 1 character per byte, plus a 1-character space after every 8 bytes. + if (byteIndex < size) { + BYTE byte = ((PBYTE)address)[byteIndex]; + _snwprintf_s(formatBuf, BYTEFORMATBUFFERLENGTH, _TRUNCATE, L"%.2X ", byte); + formatBuf[3] = '\0'; + wcsncpy_s(hexDump + hexIndex, HEXDUMPLINELENGTH - hexIndex, formatBuf, 4); if (isgraph(byte)) { - ascdump[ascindex] = (WCHAR)byte; + ascDump[ascIndex] = (WCHAR)byte; } else { - ascdump[ascindex] = L'.'; + ascDump[ascIndex] = L'.'; } } else { // Add padding to fill out the last line to 16 bytes. - wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, L" ", 4); - ascdump[ascindex] = L'.'; + wcsncpy_s(hexDump + hexIndex, HEXDUMPLINELENGTH - hexIndex, L" ", 4); + ascDump[ascIndex] = L'.'; } - bytesdone++; - if ((bytesdone % 16) == 0) { + bytesDone++; + if ((bytesDone % 16) == 0) { // Print one line of data for every 16 bytes. Include the // ASCII dump and the hex dump side-by-side. - report(L" %s %s\n", hexdump, ascdump); + Report(L" %s %s\n", hexDump, ascDump); } else { - if ((bytesdone % 8) == 0) { + if ((bytesDone % 8) == 0) { // Add a spacer in the ASCII dump after every 8 bytes. - ascdump[ascindex + 1] = L' '; + ascDump[ascIndex + 1] = L' '; } - if ((bytesdone % 4) == 0) { + if ((bytesDone % 4) == 0) { // Add a spacer in the hex dump after every 4 bytes. - wcsncpy_s(hexdump + hexindex + 3, HEXDUMPLINELENGTH - hexindex - 3, L" ", 4); + wcsncpy_s(hexDump + hexIndex + 3, HEXDUMPLINELENGTH - hexIndex - 3, L" ", 4); } } } } -// dumpmemoryw - Dumps a nicely formatted rendition of a region of memory. +// DumpMemoryW - Dumps a nicely formatted rendition of a region of memory. // Includes both the hex value of each byte and its Unicode equivalent. // // - address (IN): Pointer to the beginning of the memory region to dump. @@ -119,63 +120,63 @@ VOID dumpmemorya (LPCVOID address, SIZE_T size) // // None. // -VOID dumpmemoryw (LPCVOID address, SIZE_T size) +VOID DumpMemoryW (LPCVOID address, SIZE_T size) { // Each line of output is 16 bytes. - SIZE_T dumplen; + SIZE_T dumpLen; if ((size % 16) == 0) { // No padding needed. - dumplen = size; + dumpLen = size; } else { // We'll need to pad the last line out to 16 bytes. - dumplen = size + (16 - (size % 16)); + dumpLen = size + (16 - (size % 16)); } // For each word of data, get both the Unicode equivalent and the hex // representation. - WCHAR formatbuf [BYTEFORMATBUFFERLENGTH]; - WCHAR hexdump [HEXDUMPLINELENGTH] = {0}; + WCHAR formatBuf [BYTEFORMATBUFFERLENGTH]; + WCHAR hexDump [HEXDUMPLINELENGTH] = {0}; WCHAR unidump [18] = {0}; - SIZE_T bytesdone = 0; - for (SIZE_T byteindex = 0; byteindex < dumplen; byteindex++) { - SIZE_T hexindex = 3 * ((byteindex % 16) + ((byteindex % 16) / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. - SIZE_T uniindex = ((byteindex / 2) % 8) + ((byteindex / 2) % 8) / 8; // 1 character every other byte, plus a 1-character space after every 8 bytes. - if (byteindex < size) { - BYTE byte = ((PBYTE)address)[byteindex]; - _snwprintf_s(formatbuf, BYTEFORMATBUFFERLENGTH, _TRUNCATE, L"%.2X ", byte); - formatbuf[BYTEFORMATBUFFERLENGTH - 1] = '\0'; - wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, formatbuf, 4); - if (((byteindex % 2) == 0) && ((byteindex + 1) < dumplen)) { + SIZE_T bytesDone = 0; + for (SIZE_T byteIndex = 0; byteIndex < dumpLen; byteIndex++) { + SIZE_T hexIndex = 3 * ((byteIndex % 16) + ((byteIndex % 16) / 4)); // 3 characters per byte, plus a 3-character space after every 4 bytes. + SIZE_T uniIndex = ((byteIndex / 2) % 8) + ((byteIndex / 2) % 8) / 8; // 1 character every other byte, plus a 1-character space after every 8 bytes. + if (byteIndex < size) { + BYTE byte = ((PBYTE)address)[byteIndex]; + _snwprintf_s(formatBuf, BYTEFORMATBUFFERLENGTH, _TRUNCATE, L"%.2X ", byte); + formatBuf[BYTEFORMATBUFFERLENGTH - 1] = '\0'; + wcsncpy_s(hexDump + hexIndex, HEXDUMPLINELENGTH - hexIndex, formatBuf, 4); + if (((byteIndex % 2) == 0) && ((byteIndex + 1) < dumpLen)) { // On every even byte, print one character. - WORD word = ((PWORD)address)[byteindex / 2]; + WORD word = ((PWORD)address)[byteIndex / 2]; if ((word == 0x0000) || (word == 0x0020)) { - unidump[uniindex] = L'.'; + unidump[uniIndex] = L'.'; } else { - unidump[uniindex] = word; + unidump[uniIndex] = word; } } } else { // Add padding to fill out the last line to 16 bytes. - wcsncpy_s(hexdump + hexindex, HEXDUMPLINELENGTH - hexindex, L" ", 4); - unidump[uniindex] = L'.'; + wcsncpy_s(hexDump + hexIndex, HEXDUMPLINELENGTH - hexIndex, L" ", 4); + unidump[uniIndex] = L'.'; } - bytesdone++; - if ((bytesdone % 16) == 0) { + bytesDone++; + if ((bytesDone % 16) == 0) { // Print one line of data for every 16 bytes. Include the // ASCII dump and the hex dump side-by-side. - report(L" %s %s\n", hexdump, unidump); + Report(L" %s %s\n", hexDump, unidump); } else { - if ((bytesdone % 8) == 0) { + if ((bytesDone % 8) == 0) { // Add a spacer in the ASCII dump after every 8 bytes. - unidump[uniindex + 1] = L' '; + unidump[uniIndex + 1] = L' '; } - if ((bytesdone % 4) == 0) { + if ((bytesDone % 4) == 0) { // Add a spacer in the hex dump after every 4 bytes. - wcsncpy_s(hexdump + hexindex + 3, HEXDUMPLINELENGTH - hexindex - 3, L" ", 4); + wcsncpy_s(hexDump + hexIndex + 3, HEXDUMPLINELENGTH - hexIndex - 3, L" ", 4); } } } @@ -210,7 +211,7 @@ IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPC // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. - g_imagelock.Enter(); + g_imageLock.Enter(); __try { idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, @@ -220,7 +221,7 @@ IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPC { idte = NULL; } - g_imagelock.Leave(); + g_imageLock.Leave(); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return NULL; @@ -262,7 +263,7 @@ IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPC // Returns TRUE if the module imports to the specified import. Otherwise // returns FALSE. // -BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname) +BOOL FindImport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname) { IMAGE_IMPORT_DESCRIPTOR *idte; IMAGE_THUNK_DATA *iate; @@ -319,17 +320,17 @@ BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodule // Returns TRUE if the module has been patched to use the specified // replacement export. // -BOOL findpatch (HMODULE importmodule, moduleentry_t *module) +BOOL FindPatch (HMODULE importmodule, moduleentry_t *module) { IMAGE_IMPORT_DESCRIPTOR *idte; - idte = findoriginalimportdescriptor(importmodule, module->exportmodulename); + idte = findoriginalimportdescriptor(importmodule, module->exportModuleName); if (idte == NULL) return FALSE; int i = 0; - patchentry_t *entry = module->patchtable; - while(entry->importname) + patchentry_t *entry = module->patchTable; + while(entry->importName) { LPCVOID replacement = entry->replacement; @@ -360,9 +361,9 @@ BOOL findpatch (HMODULE importmodule, moduleentry_t *module) // // None. // -VOID insertreportdelay () +VOID InsertReportDelay () { - reportdelay = TRUE; + s_reportDelay = TRUE; } // moduleispatched - Checks to see if any of the imports listed in the specified @@ -381,7 +382,7 @@ VOID insertreportdelay () // Returns TRUE if at least one of the patches listed in the patch table is // installed in the importmodule. Otherwise returns FALSE. // -BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize) +BOOL IsModulePatched (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize) { // Loop through the import patch table, individually checking each patch // entry to see if it is installed in the import module. If any patch entry @@ -389,7 +390,7 @@ BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT ta BOOL found = FALSE; for (UINT index = 0; index < tablesize; index++) { moduleentry_t *entry = &patchtable[index]; - found = findpatch(importmodule, entry); + found = FindPatch(importmodule, entry); if (found == TRUE) { // Found one of the listed patches installed in the import module. return TRUE; @@ -430,9 +431,9 @@ BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT ta // import module does not import the specified export, so nothing changed, // then FALSE will be returned. // -BOOL patchimport (HMODULE importmodule, moduleentry_t *module) +BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) { - HMODULE exportmodule = (HMODULE)module->modulebase; + HMODULE exportmodule = (HMODULE)module->moduleBase; if (exportmodule == NULL) return FALSE; @@ -444,7 +445,7 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. - g_imagelock.Enter(); + g_imageLock.Enter(); __try { idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, @@ -454,7 +455,7 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) { idte = NULL; } - g_imagelock.Leave(); + g_imageLock.Leave(); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return FALSE; @@ -465,11 +466,11 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); UNREFERENCED_PARAMETER(name); - patchentry_t *entry = module->patchtable; + patchentry_t *entry = module->patchTable; int i = 0; - while(entry->importname) + while(entry->importName) { - LPCSTR importname = entry->importname; + LPCSTR importname = entry->importName; LPCVOID replacement = entry->replacement; // Get the *real* address of the import. If we find this address in the IAT, @@ -544,7 +545,7 @@ BOOL patchimport (HMODULE importmodule, moduleentry_t *module) // Returns TRUE if at least one of the patches listed in the patch table was // installed in the importmodule. Otherwise returns FALSE. // -BOOL patchmodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize) +BOOL PatchModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize) { moduleentry_t *entry; UINT index; @@ -554,7 +555,7 @@ BOOL patchmodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tables // listed in the table. for (index = 0; index < tablesize; index++) { entry = &patchtable[index]; - if (patchimport(importmodule, entry) == TRUE) { + if (PatchImport(importmodule, entry) == TRUE) { patched = TRUE; } } @@ -562,6 +563,19 @@ BOOL patchmodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tables return patched; } +int CallReportHook(int reportType, LPCWSTR message, int* hook_retval) +{ + if (g_pReportHooks == NULL) + return 0; + for (ReportHookSet::Iterator it = g_pReportHooks->begin(); it != g_pReportHooks->end(); it++) + { + int result = (*it)(reportType, message, hook_retval); + if (result) // handled + return result; + } + return 0; +} + // print - Sends a message to the debugger for display // and/or to a file. // @@ -574,49 +588,52 @@ BOOL patchmodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tables // // None. // -VOID print (LPCWSTR messagew) +VOID Print (LPCWSTR messagew) { if (NULL == messagew) - { return; - } - size_t count = 0; + int hook_retval=0; + if (!CallReportHook(0, messagew, &hook_retval)) + { + if (s_reportEncoding == unicode) { + if (s_reportFile != NULL) { + // Send the report to the previously specified file. + fwrite(messagew, sizeof(WCHAR), wcslen(messagew), s_reportFile); + } - if (reportencoding == unicode) { - if (reportfile != NULL) { - // Send the report to the previously specified file. - fwrite(messagew, sizeof(WCHAR), wcslen(messagew), reportfile); - } - if ( reporttostdout ) - fwprintf(stdout,messagew); + if ( s_reportToStdOut ) + fwprintf(stdout,messagew); - if (reporttodebugger) { - OutputDebugStringW(messagew); - } - } - else { - CHAR messagea [MAXREPORTLENGTH + 1]; - if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) == -1) { - // Failed to convert the Unicode message to ASCII. - assert(FALSE); - return; - } - messagea[MAXREPORTLENGTH] = '\0'; - if (reportfile != NULL) { - // Send the report to the previously specified file. - fwrite(messagea, sizeof(CHAR), strlen(messagea), reportfile); + if (s_reportToDebugger) + OutputDebugStringW(messagew); } + else { + size_t count = 0; + CHAR messagea [MAXREPORTLENGTH + 1]; + if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) == -1) { + // Failed to convert the Unicode message to ASCII. + assert(FALSE); + return; + } + messagea[MAXREPORTLENGTH] = '\0'; + + if (s_reportFile != NULL) { + // Send the report to the previously specified file. + fwrite(messagea, sizeof(CHAR), strlen(messagea), s_reportFile); + } - if ( reporttostdout ) - printf(messagea); + if ( s_reportToStdOut ) + printf(messagea); - if (reporttodebugger) { - OutputDebugStringA(messagea); + if (s_reportToDebugger) + OutputDebugStringA(messagea); } } + else if (hook_retval == 1) + __debugbreak(); - if (reporttodebugger && (reportdelay == TRUE)) { + if (s_reportToDebugger && (s_reportDelay == TRUE)) { Sleep(10); // Workaround the Visual Studio 6 bug where debug strings are sometimes lost if they're sent too fast. } } @@ -636,7 +653,7 @@ VOID print (LPCWSTR messagew) // // None. // -VOID report (LPCWSTR format, ...) +VOID Report (LPCWSTR format, ...) { va_list args; WCHAR messagew [MAXREPORTLENGTH + 1]; @@ -647,7 +664,7 @@ VOID report (LPCWSTR format, ...) messagew[MAXREPORTLENGTH] = L'\0'; if (result >= 0) - print(messagew); + Print(messagew); } // restoreimport - Restores the IAT entry for an import previously patched via @@ -673,10 +690,10 @@ VOID report (LPCWSTR format, ...) // // None. // -VOID restoreimport (HMODULE importmodule, moduleentry_t* module) +VOID RestoreImport (HMODULE importmodule, moduleentry_t* module) { - HMODULE exportmodule = (HMODULE)module->modulebase; - LPCSTR exportmodulename = module->exportmodulename; + HMODULE exportmodule = (HMODULE)module->moduleBase; + LPCSTR exportmodulename = module->exportModuleName; UNREFERENCED_PARAMETER(exportmodulename); if (exportmodule == NULL) return; @@ -689,7 +706,7 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. - g_imagelock.Enter(); + g_imageLock.Enter(); __try { idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, @@ -699,7 +716,7 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) { idte = NULL; } - g_imagelock.Leave(); + g_imageLock.Leave(); if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return; @@ -712,10 +729,10 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) UNREFERENCED_PARAMETER(name); int i = 0; - patchentry_t *entry = module->patchtable; - while(entry->importname) + patchentry_t *entry = module->patchTable; + while(entry->importName) { - LPCSTR importname = entry->importname; + LPCSTR importname = entry->importName; LPCVOID replacement = entry->replacement; UNREFERENCED_PARAMETER(importname); @@ -776,7 +793,7 @@ VOID restoreimport (HMODULE importmodule, moduleentry_t* module) // // None. // -VOID restoremodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize) +VOID RestoreModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize) { moduleentry_t *entry; UINT index; @@ -785,7 +802,7 @@ VOID restoremodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tabl // listed in the table. for (index = 0; index < tablesize; index++) { entry = &patchtable[index]; - restoreimport(importmodule, entry); + RestoreImport(importmodule, entry); } } @@ -798,12 +815,12 @@ VOID restoremodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tabl // // None. // -VOID setreportencoding (encoding_e encoding) +VOID SetReportEncoding (encoding_e encoding) { switch (encoding) { case ascii: case unicode: - reportencoding = encoding; + s_reportEncoding = encoding; break; default: @@ -826,11 +843,11 @@ VOID setreportencoding (encoding_e encoding) // // None. // -VOID setreportfile (FILE *file, BOOL copydebugger, BOOL tostdout) +VOID SetReportFile (FILE *file, BOOL copydebugger, BOOL tostdout) { - reportfile = file; - reporttodebugger = copydebugger; - reporttostdout = tostdout; + s_reportFile = file; + s_reportToDebugger = copydebugger; + s_reportToStdOut = tostdout; } // AppendString - Appends the specified source string to the specified destination @@ -873,7 +890,7 @@ LPWSTR AppendString (LPWSTR dest, LPCWSTR source) // Returns TRUE if the string is recognized as a "true" string. Otherwise // returns FALSE. // -BOOL strtobool (LPCWSTR s) { +BOOL StrToBool (LPCWSTR s) { WCHAR *end; if ((_wcsicmp(s, L"true") == 0) || @@ -1025,7 +1042,7 @@ void GetFormattedMessage(DWORD last_error) NULL ); // Display the error message. - report(L"%s", lpMsgBuf); + Report(L"%s", lpMsgBuf); } // GetCallingModule - Return calling module by address. diff --git a/utility.h b/utility.h index dcdcefce..8c0acfac 100644 --- a/utility.h +++ b/utility.h @@ -58,14 +58,14 @@ Applications should never include this header." #define SPREG Rsp #endif // _M_IX86 -typedef struct context_s +struct context_t { UINT_PTR* fp; #if defined(_M_X64) DWORD64 Rsp; DWORD64 Rip; #endif // _M_IX86 -} context_t; +}; #if defined(_M_IX86) // Copies the current frame pointer to the supplied variable. @@ -87,7 +87,7 @@ typedef struct context_s #endif // _M_IX86 || _M_X64 // Miscellaneous definitions -#define R2VA(modulebase, rva) (((PBYTE)modulebase) + rva) // Relative Virtual Address to Virtual Address conversion. +#define R2VA(moduleBase, rva) (((PBYTE)moduleBase) + rva) // Relative Virtual Address to Virtual Address conversion. #define BYTEFORMATBUFFERLENGTH 4 #define HEXDUMPLINELENGTH 58 @@ -99,37 +99,37 @@ enum encoding_e { // This structure allows us to build a table of APIs which should be patched // through to replacement functions provided by VLD. -typedef struct patchentry_s +struct patchentry_t { - LPCSTR importname; // The name (or ordinal) of the imported API being patched. + LPCSTR importName; // The name (or ordinal) of the imported API being patched. LPVOID* original; // Pointer to the original function. LPCVOID replacement; // Pointer to the function to which the imported API should be patched through to. -} patchentry_t; +}; -typedef struct moduleentry_s +struct moduleentry_t { - LPCSTR exportmodulename; // The name of the module exporting the patched API. - UINT_PTR modulebase; // The base address of the exporting module (filled in at runtime when the modules are loaded). - patchentry_t* patchtable; -} moduleentry_t; + LPCSTR exportModuleName; // The name of the module exporting the patched API. + UINT_PTR moduleBase; // The base address of the exporting module (filled in at runtime when the modules are loaded). + patchentry_t* patchTable; +}; // Utility functions. See function definitions for details. -VOID dumpmemorya (LPCVOID address, SIZE_T length); -VOID dumpmemoryw (LPCVOID address, SIZE_T length); -BOOL findimport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname); -BOOL findpatch (HMODULE importmodule, LPCSTR exportmodulename, LPCVOID replacement); -VOID insertreportdelay (); -BOOL moduleispatched (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); -BOOL patchimport (HMODULE importmodule, moduleentry_t *module); -BOOL patchmodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); -VOID print (LPCWSTR message); -VOID report (LPCWSTR format, ...); -VOID restoreimport (HMODULE importmodule, moduleentry_t* module); -VOID restoremodule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); -VOID setreportencoding (encoding_e encoding); -VOID setreportfile (FILE *file, BOOL copydebugger, BOOL copytostdout); +VOID DumpMemoryA (LPCVOID address, SIZE_T length); +VOID DumpMemoryW (LPCVOID address, SIZE_T length); +BOOL FindImport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodulename, LPCSTR importname); +BOOL FindPatch (HMODULE importmodule, LPCSTR exportmodulename, LPCVOID replacement); +VOID InsertReportDelay (); +BOOL IsModulePatched (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); +BOOL PatchImport (HMODULE importmodule, moduleentry_t *module); +BOOL PatchModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); +VOID Print (LPCWSTR message); +VOID Report (LPCWSTR format, ...); +VOID RestoreImport (HMODULE importmodule, moduleentry_t* module); +VOID RestoreModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); +VOID SetReportEncoding (encoding_e encoding); +VOID SetReportFile (FILE *file, BOOL copydebugger, BOOL copytostdout); LPWSTR AppendString (LPWSTR dest, LPCWSTR source); -BOOL strtobool (LPCWSTR s); +BOOL StrToBool (LPCWSTR s); #if _WIN32_WINNT < 0x0600 // Windows XP or earlier, no GetProcessIdOfThread() DWORD _GetProcessIdOfThread (HANDLE thread); #define GetProcessIdOfThread _GetProcessIdOfThread diff --git a/vld.cpp b/vld.cpp index 86576339..735f508c 100644 --- a/vld.cpp +++ b/vld.cpp @@ -43,20 +43,21 @@ #define MODULESETRESERVE 16 // There are likely to be several modules loaded in the process. // Imported global variables. -extern vldblockheader_t *g_vldblocklist; -extern HANDLE g_vldheap; -extern CriticalSection g_vldheaplock; +extern vldblockheader_t *g_vldBlockList; +extern HANDLE g_vldHeap; +extern CriticalSection g_vldHeapLock; // Global variables. -HANDLE g_currentprocess; // Pseudo-handle for the current process. -HANDLE g_currentthread; // Pseudo-handle for the current thread. -CriticalSection g_imagelock; // Serializes calls to the Debug Help Library PE image access APIs. -HANDLE g_processheap; // Handle to the process's heap (COM allocations come from here). -CriticalSection g_stackwalklock; // Serializes calls to StackWalk64 from the Debug Help Library. -CriticalSection g_symbollock; // Serializes calls to the Debug Help Library symbols handling APIs. +HANDLE g_currentProcess; // Pseudo-handle for the current process. +HANDLE g_currentThread; // Pseudo-handle for the current thread. +CriticalSection g_imageLock; // Serializes calls to the Debug Help Library PE image access APIs. +HANDLE g_processHeap; // Handle to the process's heap (COM allocations come from here). +CriticalSection g_stackWalkLock; // Serializes calls to StackWalk64 from the Debug Help Library. +CriticalSection g_symbolLock; // Serializes calls to the Debug Help Library symbols handling APIs. +ReportHookSet* g_pReportHooks; // The one and only VisualLeakDetector object instance. -__declspec(dllexport) VisualLeakDetector vld; +__declspec(dllexport) VisualLeakDetector g_vld; // Global function pointers for explicit dynamic linking with functions listed // in the import patch table. Using explicit dynamic linking minimizes VLD's @@ -495,7 +496,7 @@ patchentry_t VisualLeakDetector::m_ole32Patch [] = { NULL, NULL, NULL }; -moduleentry_t VisualLeakDetector::m_patchtable [] = { +moduleentry_t VisualLeakDetector::m_patchTable [] = { // Win32 heap APIs. "kernel32.dll", 0x0, m_kernelbasePatch, // we patch this record on Win7 "kernel32.dll", 0x0, m_kernel32Patch, @@ -579,18 +580,18 @@ VisualLeakDetector::VisualLeakDetector () _set_error_mode(_OUT_TO_STDERR); // Initialize configuration options and related private data. - _wcsnset_s(m_forcedmodulelist, MAXMODULELISTLENGTH, '\0', _TRUNCATE); - m_maxdatadump = 0xffffffff; - m_maxtraceframes = 0xffffffff; + _wcsnset_s(m_forcedModuleList, MAXMODULELISTLENGTH, '\0', _TRUNCATE); + m_maxDataDump = 0xffffffff; + m_maxTraceFrames = 0xffffffff; m_options = 0x0; - m_reportfile = NULL; - wcsncpy_s(m_reportfilepath, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); + m_reportFile = NULL; + wcsncpy_s(m_reportFilePath, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); m_status = 0x0; // Load configuration options. configure(); if (m_options & VLD_OPT_VLDOFF) { - report(L"Visual Leak Detector is turned off.\n"); + Report(L"Visual Leak Detector is turned off.\n"); return; } @@ -604,17 +605,17 @@ VisualLeakDetector::VisualLeakDetector () } else { - assert(m_patchtable[0].patchtable == m_kernelbasePatch); - m_patchtable[0].exportmodulename = "kernelbase.dll"; + assert(m_patchTable[0].patchTable == m_kernelbasePatch); + m_patchTable[0].exportModuleName = "kernelbase.dll"; if (kernelBase) m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernelBase,"GetProcAddress"); } // Initialize global variables. - g_currentprocess = GetCurrentProcess(); - g_currentthread = GetCurrentThread(); - g_imagelock.Initialize(); - g_processheap = GetProcessHeap(); + g_currentProcess = GetCurrentProcess(); + g_currentThread = GetCurrentThread(); + g_imageLock.Initialize(); + g_processHeap = GetProcessHeap(); HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); if (ntdll) { @@ -623,39 +624,41 @@ VisualLeakDetector::VisualLeakDetector () RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); } - g_stackwalklock.Initialize(); - g_symbollock.Initialize(); - g_vldheap = HeapCreate(0x0, 0, 0); - g_vldheaplock.Initialize(); + g_stackWalkLock.Initialize(); + g_symbolLock.Initialize(); + g_vldHeap = HeapCreate(0x0, 0, 0); + g_vldHeapLock.Initialize(); + g_pReportHooks = new ReportHookSet; // Initialize remaining private data. - m_heapmap = new HeapMap; - m_heapmap->reserve(HEAPMAPRESERVE); - m_imalloc = NULL; - m_requestcurr = 1; - m_totalalloc = 0; - m_curalloc = 0; - m_maxalloc = 0; - m_loadedmodules = NULL; - m_loaderlock.Initialize(); - m_heapmaplock.Initialize(); - m_moduleslock.Initialize(); - m_selftestfile = __FILE__; - m_selftestline = 0; - m_tlsindex = TlsAlloc(); - m_tlslock.Initialize(); - m_tlsmap = new TlsMap; + m_heapMap = new HeapMap; + m_heapMap->reserve(HEAPMAPRESERVE); + m_iMalloc = NULL; + m_requestCurr = 1; + m_totalAlloc = 0; + m_curAlloc = 0; + m_maxAlloc = 0; + m_loadedModules = NULL; + m_optionsLock.Initialize(); + m_loaderLock.Initialize(); + m_heapMapLock.Initialize(); + m_modulesLock.Initialize(); + m_selfTestFile = __FILE__; + m_selfTestLine = 0; + m_tlsIndex = TlsAlloc(); + m_tlsLock.Initialize(); + m_tlsMap = new TlsMap; if (m_options & VLD_OPT_SELF_TEST) { // Self-test mode has been enabled. Intentionally leak a small amount of // memory so that memory leak self-checking can be verified. if (m_options & VLD_OPT_UNICODE_REPORT) { wcsncpy_s(new WCHAR [wcslen(SELFTESTTEXTW) + 1], wcslen(SELFTESTTEXTW) + 1, SELFTESTTEXTW, _TRUNCATE); - m_selftestline = __LINE__ - 1; + m_selfTestLine = __LINE__ - 1; } else { strncpy_s(new CHAR [strlen(SELFTESTTEXTA) + 1], strlen(SELFTESTTEXTA) + 1, SELFTESTTEXTA, _TRUNCATE); - m_selftestline = __LINE__ - 1; + m_selfTestLine = __LINE__ - 1; } } if (m_options & VLD_OPT_START_DISABLED) { @@ -663,26 +666,26 @@ VisualLeakDetector::VisualLeakDetector () m_status |= VLD_STATUS_NEVER_ENABLED; } if (m_options & VLD_OPT_REPORT_TO_FILE) { - SetupReporting(); + setupReporting(); } if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { // Insert a slight delay between messages sent to the debugger for // output. (For working around a bug in VC6 where data sent to the // debugger gets lost if it's sent too fast). - insertreportdelay(); + InsertReportDelay(); } // This is highly unlikely to happen, but just in case, check to be sure // we got a valid TLS index. - if (m_tlsindex == TLS_OUT_OF_INDEXES) { - report(L"ERROR: Visual Leak Detector could not be installed because thread local" + if (m_tlsIndex == TLS_OUT_OF_INDEXES) { + Report(L"ERROR: Visual Leak Detector could not be installed because thread local" L" storage could not be allocated."); return; } // Initialize the symbol handler. We use it for obtaining source file/line // number information and function names for the memory leak report. - LPWSTR symbolpath = buildsymbolsearchpath(); + LPWSTR symbolpath = buildSymbolSearchPath(); #ifdef NOISY_DBGHELP_DIAGOSTICS // From MSDN docs about SYMOPT_DEBUG: /* To view all attempts to load symbols, call SymSetOptions with SYMOPT_DEBUG. @@ -697,56 +700,56 @@ VisualLeakDetector::VisualLeakDetector () #else SymSetOptions(SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS | SYMOPT_LOAD_LINES); #endif - if (!SymInitializeW(g_currentprocess, symbolpath, FALSE)) { - report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" + if (!SymInitializeW(g_currentProcess, symbolpath, FALSE)) { + Report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" L" File and function names will probably not be available in call stacks.\n", GetLastError()); } delete [] symbolpath; - ntdllPatch->modulebase = (UINT_PTR)ntdll; - patchimport(kernel32, ntdllPatch); + ntdllPatch->moduleBase = (UINT_PTR)ntdll; + PatchImport(kernel32, ntdllPatch); if (kernelBase != NULL) - patchimport(kernelBase, ntdllPatch); + PatchImport(kernelBase, ntdllPatch); // Attach Visual Leak Detector to every module loaded in the process. ModuleSet* newmodules = new ModuleSet(); newmodules->reserve(MODULESETRESERVE); - EnumerateLoadedModulesW64(g_currentprocess, addloadedmodule, newmodules); - attachtoloadedmodules(newmodules); - m_loadedmodules = newmodules; + EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); + attachToLoadedModules(newmodules); + m_loadedModules = newmodules; m_status |= VLD_STATUS_INSTALLED; HMODULE dbghelp = GetModuleHandleW(L"dbghelp.dll"); if (dbghelp) ChangeModuleState(dbghelp, false); - report(L"Visual Leak Detector Version " VLDVERSION L" installed.\n"); + Report(L"Visual Leak Detector Version " VLDVERSION L" installed.\n"); if (m_status & VLD_STATUS_FORCE_REPORT_TO_FILE) { // The report is being forced to a file. Let the human know why. - report(L"NOTE: Visual Leak Detector: Unicode-encoded reporting has been enabled, but the\n" + Report(L"NOTE: Visual Leak Detector: Unicode-encoded reporting has been enabled, but the\n" L" debugger is the only selected report destination. The debugger cannot display\n" L" Unicode characters, so the report will also be sent to a file. If no file has\n" L" been specified, the default file name is \"" VLD_DEFAULT_REPORT_FILE_NAME L"\".\n"); } - reportconfig(); + reportConfig(); } -bool VisualLeakDetector::WaitForAllVLDThreads() +bool VisualLeakDetector::waitForAllVLDThreads() { bool threadsactive = false; DWORD dwCurProcessID = GetCurrentProcessId(); int waitcount = 0; // See if any threads that have ever entered VLD's code are still active. - CriticalSectionLocker cs(m_tlslock); - for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - if ((*tlsit).second->threadid == GetCurrentThreadId()) { + CriticalSectionLocker cs(m_tlsLock); + for (TlsMap::Iterator tlsit = m_tlsMap->begin(); tlsit != m_tlsMap->end(); ++tlsit) { + if ((*tlsit).second->threadId == GetCurrentThreadId()) { // Don't wait for the current thread to exit. continue; } - HANDLE thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit).second->threadid); + HANDLE thread = OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, FALSE, (*tlsit).second->threadId); if (thread == NULL) { // Couldn't query this thread. We'll assume that it exited. continue; // XXX should we check GetLastError()? @@ -772,14 +775,14 @@ bool VisualLeakDetector::WaitForAllVLDThreads() CloseHandle(thread); return threadsactive; } - report(L"Visual Leak Detector: Waiting for threads to terminate...\n"); + Report(L"Visual Leak Detector: Waiting for threads to terminate...\n"); } CloseHandle(thread); } return threadsactive; } -void VisualLeakDetector::CheckInternalMemoryLeaks() +void VisualLeakDetector::checkInternalMemoryLeaks() { const char* leakfile = NULL; size_t count; @@ -788,7 +791,7 @@ void VisualLeakDetector::CheckInternalMemoryLeaks() // Do a memory leak self-check. SIZE_T internalleaks = 0; - vldblockheader_t *header = g_vldblocklist; + vldblockheader_t *header = g_vldBlockList; while (header) { // Doh! VLD still has an internally allocated block! // This won't ever actually happen, right guys?... guys? @@ -796,28 +799,28 @@ void VisualLeakDetector::CheckInternalMemoryLeaks() leakfile = header->file; leakline = header->line; mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); - report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); - report(L"---------- Block %Iu at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialnumber, VLDBLOCKDATA(header), header->size); - report(L" Call Stack:\n"); - report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); - if (m_maxdatadump != 0) { - report(L" Data:\n"); + Report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); + Report(L"---------- Block %Iu at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialNumber, VLDBLOCKDATA(header), header->size); + Report(L" Call Stack:\n"); + Report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); + if (m_maxDataDump != 0) { + Report(L" Data:\n"); if (m_options & VLD_OPT_UNICODE_REPORT) { - dumpmemoryw(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); + DumpMemoryW(VLDBLOCKDATA(header), (m_maxDataDump < header->size) ? m_maxDataDump : header->size); } else { - dumpmemorya(VLDBLOCKDATA(header), (m_maxdatadump < header->size) ? m_maxdatadump : header->size); + DumpMemoryA(VLDBLOCKDATA(header), (m_maxDataDump < header->size) ? m_maxDataDump : header->size); } } - report(L"\n"); + Report(L"\n"); header = header->next; } if (m_options & VLD_OPT_SELF_TEST) { - if ((internalleaks == 1) && (strcmp(leakfile, m_selftestfile) == 0) && (leakline == m_selftestline)) { - report(L"Visual Leak Detector passed the memory leak self-test.\n"); + if ((internalleaks == 1) && (strcmp(leakfile, m_selfTestFile) == 0) && (leakline == m_selfTestLine)) { + Report(L"Visual Leak Detector passed the memory leak self-test.\n"); } else { - report(L"ERROR: Visual Leak Detector: Failed the memory leak self-test.\n"); + Report(L"ERROR: Visual Leak Detector: Failed the memory leak self-test.\n"); } } } @@ -835,20 +838,20 @@ VisualLeakDetector::~VisualLeakDetector () if (m_status & VLD_STATUS_INSTALLED) { // Detach Visual Leak Detector from all previously attached modules. - EnumerateLoadedModulesW64(g_currentprocess, detachfrommodule, NULL); + EnumerateLoadedModulesW64(g_currentProcess, detachFromModule, NULL); HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); HMODULE kernelBase = GetModuleHandleW(L"KernelBase.dll"); - restoreimport(kernel32, ntdllPatch); + RestoreImport(kernel32, ntdllPatch); if (kernelBase != NULL) - restoreimport(kernelBase, ntdllPatch); + RestoreImport(kernelBase, ntdllPatch); - BOOL threadsactive = WaitForAllVLDThreads(); + BOOL threadsactive = waitForAllVLDThreads(); if (m_status & VLD_STATUS_NEVER_ENABLED) { // Visual Leak Detector started with leak detection disabled and // it was never enabled at runtime. A lot of good that does. - report(L"WARNING: Visual Leak Detector: Memory leak detection was never enabled.\n"); + Report(L"WARNING: Visual Leak Detector: Memory leak detection was never enabled.\n"); } else { // Generate a memory leak report for each heap in the process. @@ -856,76 +859,82 @@ VisualLeakDetector::~VisualLeakDetector () // Show a summary. if (leaks_count == 0) { - report(L"No memory leaks detected.\n"); + Report(L"No memory leaks detected.\n"); } else { - report(L"Visual Leak Detector detected %Iu memory leak", leaks_count); - report((leaks_count > 1) ? L"s (%Iu bytes).\n" : L" (%Iu bytes).\n", m_curalloc); - report(L"Largest number used: %Iu bytes.\n", m_maxalloc); - report(L"Total allocations: %Iu bytes.\n", m_totalalloc); + Report(L"Visual Leak Detector detected %Iu memory leak", leaks_count); + Report((leaks_count > 1) ? L"s (%Iu bytes).\n" : L" (%Iu bytes).\n", m_curAlloc); + Report(L"Largest number used: %Iu bytes.\n", m_maxAlloc); + Report(L"Total allocations: %Iu bytes.\n", m_totalAlloc); } } // Free resources used by the symbol handler. - if (!SymCleanup(g_currentprocess)) { - report(L"WARNING: Visual Leak Detector: The symbol handler failed to deallocate resources (error=%lu).\n", + if (!SymCleanup(g_currentProcess)) { + Report(L"WARNING: Visual Leak Detector: The symbol handler failed to deallocate resources (error=%lu).\n", GetLastError()); } // Free internally allocated resources used by the heapmap and blockmap. - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - BlockMap *blockmap = &(*heapit).second->blockmap; + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + BlockMap *blockmap = &(*heapit).second->blockMap; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callstack; + delete (*blockit).second->callStack; delete (*blockit).second; } delete blockmap; } - delete m_heapmap; + delete m_heapMap; // Free internally allocated resources used by the loaded module set. - for (ModuleSet::Iterator moduleit = m_loadedmodules->begin(); moduleit != m_loadedmodules->end(); ++moduleit) { + for (ModuleSet::Iterator moduleit = m_loadedModules->begin(); moduleit != m_loadedModules->end(); ++moduleit) { delete [] (*moduleit).name; delete [] (*moduleit).path; } - delete m_loadedmodules; + delete m_loadedModules; // Free internally allocated resources used for thread local storage. - for (TlsMap::Iterator tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { + for (TlsMap::Iterator tlsit = m_tlsMap->begin(); tlsit != m_tlsMap->end(); ++tlsit) { delete (*tlsit).second; } - delete m_tlsmap; - - CheckInternalMemoryLeaks(); + delete m_tlsMap; if (threadsactive == TRUE) { - report(L"WARNING: Visual Leak Detector: Some threads appear to have not terminated normally.\n" + Report(L"WARNING: Visual Leak Detector: Some threads appear to have not terminated normally.\n" L" This could cause inaccurate leak detection results, including false positives.\n"); } - report(L"Visual Leak Detector is now exiting.\n"); + Report(L"Visual Leak Detector is now exiting.\n"); + + delete g_pReportHooks; + g_pReportHooks = NULL; + + checkInternalMemoryLeaks(); } else { // VLD failed to load properly. - delete m_heapmap; - delete m_tlsmap; + delete m_heapMap; + delete m_tlsMap; + delete g_pReportHooks; + g_pReportHooks = NULL; } - HeapDestroy(g_vldheap); + HeapDestroy(g_vldHeap); - m_loaderlock.Delete(); - m_heapmaplock.Delete(); - m_moduleslock.Delete(); - m_tlslock.Delete(); - g_imagelock.Delete(); - g_stackwalklock.Delete(); - g_symbollock.Delete(); - g_vldheaplock.Delete(); + m_optionsLock.Delete(); + m_loaderLock.Delete(); + m_heapMapLock.Delete(); + m_modulesLock.Delete(); + m_tlsLock.Delete(); + g_imageLock.Delete(); + g_stackWalkLock.Delete(); + g_symbolLock.Delete(); + g_vldHeapLock.Delete(); - if (m_tlsindex != TLS_OUT_OF_INDEXES) { - TlsFree(m_tlsindex); + if (m_tlsIndex != TLS_OUT_OF_INDEXES) { + TlsFree(m_tlsIndex); } - if (m_reportfile != NULL) { - fclose(m_reportfile); + if (m_reportFile != NULL) { + fclose(m_reportFile); } } @@ -953,18 +962,18 @@ VisualLeakDetector::~VisualLeakDetector () // // None. // -VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) +VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) { ModuleSet::Muterator updateit; // Iterate through the supplied set, until all modules have been attached. for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { - DWORD64 modulebase = (DWORD64)(*newit).addrlow; + DWORD64 modulebase = (DWORD64)(*newit).addrLow; bool moduleLoaded = false; UINT32 moduleflags = 0x0; - m_moduleslock.Enter(); - ModuleSet* oldmodules = m_loadedmodules; + m_modulesLock.Enter(); + ModuleSet* oldmodules = m_loadedModules; if (oldmodules != NULL) { // This is not the first time we have been called to attach to the // currently loaded modules. @@ -974,12 +983,12 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) moduleflags = (*oldit).flags; } } - m_moduleslock.Leave(); + m_modulesLock.Leave(); bool refresh = false; if (moduleLoaded) // We've seen this "new" module loaded in the process before. { - if (moduleispatched((HMODULE)modulebase, m_patchtable, _countof(m_patchtable))) + if (IsModulePatched((HMODULE)modulebase, m_patchTable, _countof(m_patchTable))) { // This module is already attached. Just update the module's // flags, nothing more. @@ -997,13 +1006,13 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) LPCWSTR modulename = (*newit).name; LPCWSTR modulepath = (*newit).path; - DWORD modulesize = (DWORD)((*newit).addrhigh - (*newit).addrlow) + 1; + DWORD modulesize = (DWORD)((*newit).addrHigh - (*newit).addrLow) + 1; - g_symbollock.Enter(); + g_symbolLock.Enter(); if ((refresh == true) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { // Discard the previously loaded symbols, so we can refresh them. - if (SymUnloadModule64(g_currentprocess, modulebase) == false) { - report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" + if (SymUnloadModule64(g_currentProcess, modulebase) == false) { + Report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" L" numbers shown in the memory leak report for %s may be inaccurate.\n", modulename, modulename); } } @@ -1014,17 +1023,17 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // leak report. IMAGEHLP_MODULE64 moduleimageinfo; moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); - BOOL SymbolsLoaded = SymGetModuleInfoW64(g_currentprocess, modulebase, &moduleimageinfo); - g_symbollock.Leave(); + BOOL SymbolsLoaded = SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo); + g_symbolLock.Leave(); if (!SymbolsLoaded) { - CriticalSectionLocker cs(vld.m_heapmaplock); // fix GetModuleFileName thread lock - g_symbollock.Enter(); - DWORD64 module = SymLoadModuleEx(g_currentprocess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0); + CriticalSectionLocker cs(g_vld.m_heapMapLock); // fix GetModuleFileName thread lock + g_symbolLock.Enter(); + DWORD64 module = SymLoadModuleEx(g_currentProcess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0); if (module == modulebase) - SymbolsLoaded = SymGetModuleInfoW64(g_currentprocess, modulebase, &moduleimageinfo); - g_symbollock.Leave(); + SymbolsLoaded = SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo); + g_symbolLock.Leave(); } if (SymbolsLoaded) moduleflags |= VLD_MODULE_SYMBOLSLOADED; @@ -1036,20 +1045,20 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) continue; } - if (!findimport((HMODULE)modulebase, m_vldbase, VLDDLL, "?vld@@3VVisualLeakDetector@@A")) + if (!FindImport((HMODULE)modulebase, m_vldBase, VLDDLL, "?vld@@3VVisualLeakDetector@@A")) { // This module does not import VLD. This means that none of the module's // sources #included vld.h. if ((m_options & VLD_OPT_MODULE_LIST_INCLUDE) != 0) { - if (wcsstr(m_forcedmodulelist, modulename) == NULL) { + if (wcsstr(m_forcedModuleList, modulename) == NULL) { // Exclude this module from leak detection. moduleflags |= VLD_MODULE_EXCLUDED; } } else { - if (wcsstr(m_forcedmodulelist, modulename) != NULL) { + if (wcsstr(m_forcedModuleList, modulename) != NULL) { // Exclude this module from leak detection. moduleflags |= VLD_MODULE_EXCLUDED; } @@ -1061,7 +1070,7 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // symbols for this module couldn't be loaded. This means that any stack // traces through this module may lack information, like line numbers // and function names. - report(L"WARNING: Visual Leak Detector: A module, %s, included in memory leak detection\n" + Report(L"WARNING: Visual Leak Detector: A module, %s, included in memory leak detection\n" L" does not have any debugging symbols available, or they could not be located.\n" L" Function names and/or line numbers for this module may not be available.\n", modulename); } @@ -1071,7 +1080,7 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) (*updateit).flags = moduleflags; // Attach to the module. - patchmodule((HMODULE)modulebase, m_patchtable, _countof(m_patchtable)); + PatchModule((HMODULE)modulebase, m_patchTable, _countof(m_patchTable)); } } @@ -1084,7 +1093,7 @@ VOID VisualLeakDetector::attachtoloadedmodules (ModuleSet *newmodules) // Returns a string containing the search path. The caller is responsible for // freeing the string. // -LPWSTR VisualLeakDetector::buildsymbolsearchpath () +LPWSTR VisualLeakDetector::buildSymbolSearchPath () { // Oddly, the symbol handler ignores the link to the PDB embedded in the // executable image. So, we'll manually add the location of the executable @@ -1237,53 +1246,53 @@ VOID VisualLeakDetector::configure () WCHAR buffer [BSIZE] = {0}; // Read the boolean options. GetPrivateProfileString(L"Options", L"VLD", L"on", buffer, BSIZE, inipath); - if (strtobool(buffer) == FALSE) { + if (StrToBool(buffer) == FALSE) { m_options |= VLD_OPT_VLDOFF; return; } GetPrivateProfileString(L"Options", L"AggregateDuplicates", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { + if (StrToBool(buffer) == TRUE) { m_options |= VLD_OPT_AGGREGATE_DUPLICATES; } GetPrivateProfileString(L"Options", L"SelfTest", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { + if (StrToBool(buffer) == TRUE) { m_options |= VLD_OPT_SELF_TEST; } GetPrivateProfileString(L"Options", L"SlowDebuggerDump", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { + if (StrToBool(buffer) == TRUE) { m_options |= VLD_OPT_SLOW_DEBUGGER_DUMP; } GetPrivateProfileString(L"Options", L"StartDisabled", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { + if (StrToBool(buffer) == TRUE) { m_options |= VLD_OPT_START_DISABLED; } GetPrivateProfileString(L"Options", L"TraceInternalFrames", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { + if (StrToBool(buffer) == TRUE) { m_options |= VLD_OPT_TRACE_INTERNAL_FRAMES; } GetPrivateProfileString(L"Options", L"SkipHeapFreeLeaks", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { + if (StrToBool(buffer) == TRUE) { m_options |= VLD_OPT_SKIP_HEAPFREE_LEAKS; } // Read the integer configuration options. - m_maxdatadump = GetPrivateProfileInt(L"Options", L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); - m_maxtraceframes = GetPrivateProfileInt(L"Options", L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); - if (m_maxtraceframes < 1) { - m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; + m_maxDataDump = GetPrivateProfileInt(L"Options", L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); + m_maxTraceFrames = GetPrivateProfileInt(L"Options", L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); + if (m_maxTraceFrames < 1) { + m_maxTraceFrames = VLD_DEFAULT_MAX_TRACE_FRAMES; } // Read the force-include module list. - GetPrivateProfileString(L"Options", L"ForceIncludeModules", L"", m_forcedmodulelist, MAXMODULELISTLENGTH, inipath); - _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); - if (wcscmp(m_forcedmodulelist, L"*") == 0) - m_forcedmodulelist[0] = '\0'; + GetPrivateProfileString(L"Options", L"ForceIncludeModules", L"", m_forcedModuleList, MAXMODULELISTLENGTH, inipath); + _wcslwr_s(m_forcedModuleList, MAXMODULELISTLENGTH); + if (wcscmp(m_forcedModuleList, L"*") == 0) + m_forcedModuleList[0] = '\0'; else m_options |= VLD_OPT_MODULE_LIST_INCLUDE; @@ -1293,7 +1302,7 @@ VOID VisualLeakDetector::configure () if (wcslen(filename) == 0) { wcsncpy_s(filename, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); } - WCHAR* path = _wfullpath(m_reportfilepath, filename, MAX_PATH); + WCHAR* path = _wfullpath(m_reportFilePath, filename, MAX_PATH); assert(path); GetPrivateProfileString(L"Options", L"ReportTo", L"", buffer, BSIZE, inipath); @@ -1330,7 +1339,7 @@ VOID VisualLeakDetector::configure () } GetPrivateProfileString(L"Options", L"ValidateHeapAllocs", L"", buffer, BSIZE, inipath); - if (strtobool(buffer) == TRUE) { + if (StrToBool(buffer) == TRUE) { m_options |= VLD_OPT_VALIDATE_HEAPFREE; } } @@ -1351,7 +1360,7 @@ BOOL VisualLeakDetector::enabled () return FALSE; } - tls_t* tls = gettls(); + tls_t* tls = getTls(); if (!(tls->flags & VLD_TLS_DISABLED) && !(tls->flags & VLD_TLS_ENABLED)) { // The enabled/disabled state for the current thread has not been // initialized yet. Use the default state. @@ -1376,18 +1385,18 @@ BOOL VisualLeakDetector::enabled () // // Returns the number of duplicate blocks erased from the block map. // -SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element, Set &aggregatedLeaks) +SIZE_T VisualLeakDetector::eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeaks) { blockinfo_t *elementinfo = (*element).second; - if (elementinfo->callstack == NULL) + if (elementinfo->callStack == NULL) return 0; SIZE_T erased = 0; // Iterate through all block maps, looking for blocks with the same size // and callstack as the specified element. - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { - BlockMap *blockmap = &(*heapit).second->blockmap; + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + BlockMap *blockmap = &(*heapit).second->blockMap; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { if (blockit == element) { // Don't delete the element of which we are searching for @@ -1395,12 +1404,12 @@ SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element, S continue; } blockinfo_t *info = (*blockit).second; - if (info->callstack == NULL) + if (info->callStack == NULL) continue; Set::Iterator it = aggregatedLeaks.find(info); if (it != aggregatedLeaks.end()) continue; - if ((info->size == elementinfo->size) && (*(info->callstack) == *(elementinfo->callstack))) { + if ((info->size == elementinfo->size) && (*(info->callStack) == *(elementinfo->callStack))) { // Found a duplicate. Mark it. aggregatedLeaks.insert(info); erased++; @@ -1418,25 +1427,25 @@ SIZE_T VisualLeakDetector::eraseduplicates (const BlockMap::Iterator &element, S // Returns a pointer to the thread local storage structure. (This function // always succeeds). // -tls_t* VisualLeakDetector::gettls () +tls_t* VisualLeakDetector::getTls () { // Get the pointer to this thread's thread local storage structure. - tls_t* tls = (tls_t*)TlsGetValue(m_tlsindex); + tls_t* tls = (tls_t*)TlsGetValue(m_tlsIndex); assert(GetLastError() == ERROR_SUCCESS); if (tls == NULL) { // This thread's thread local storage structure has not been allocated. tls = new tls_t; - TlsSetValue(m_tlsindex, tls); + TlsSetValue(m_tlsIndex, tls); ZeroMemory(&tls->context, sizeof(tls->context)); tls->flags = 0x0; - tls->oldflags = 0x0; - tls->threadid = GetCurrentThreadId(); - tls->ppcallstack = NULL; + tls->oldFlags = 0x0; + tls->threadId = GetCurrentThreadId(); + tls->ppCallStack = NULL; // Add this thread's TLS to the TlsSet. - CriticalSectionLocker cs(m_tlslock); - m_tlsmap->insert(tls->threadid,tls); + CriticalSectionLocker cs(m_tlsLock); + m_tlsMap->insert(tls->threadId,tls); } return tls; @@ -1462,39 +1471,39 @@ tls_t* VisualLeakDetector::gettls () // // None. // -VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack) +VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack) { // Record the block's information. blockinfo_t* blockinfo = new blockinfo_t; - blockinfo->callstack = NULL; - ppcallstack = &blockinfo->callstack; - blockinfo->serialnumber = m_requestcurr++; + blockinfo->callStack = NULL; + ppcallstack = &blockinfo->callStack; + blockinfo->serialNumber = m_requestCurr++; blockinfo->size = size; blockinfo->reported = false; - if (SIZE_MAX - m_totalalloc > size) - m_totalalloc += size; + if (SIZE_MAX - m_totalAlloc > size) + m_totalAlloc += size; else - m_totalalloc = SIZE_MAX; - m_curalloc += size; + m_totalAlloc = SIZE_MAX; + m_curAlloc += size; - if (m_curalloc > m_maxalloc) - m_maxalloc = m_curalloc; + if (m_curAlloc > m_maxAlloc) + m_maxAlloc = m_curAlloc; // Insert the block's information into the block map. - CriticalSectionLocker cs(m_heapmaplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { + CriticalSectionLocker cs(m_heapMapLock); + HeapMap::Iterator heapit = m_heapMap->find(heap); + if (heapit == m_heapMap->end()) { // We haven't mapped this heap to a block map yet. Do it now. - mapheap(heap); - heapit = m_heapmap->find(heap); - assert(heapit != m_heapmap->end()); + mapHeap(heap); + heapit = m_heapMap->find(heap); + assert(heapit != m_heapMap->end()); } if (crtalloc) { // The heap that this block was allocated from is a CRT heap. (*heapit).second->flags |= VLD_HEAP_CRT_DBG; } - BlockMap* blockmap = &(*heapit).second->blockmap; + BlockMap* blockmap = &(*heapit).second->blockMap; BlockMap::Iterator blockit = blockmap->insert(mem, blockinfo); if (blockit == blockmap->end()) { // A block with this address has already been allocated. The @@ -1502,7 +1511,7 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool c // mechanism unknown to VLD), or the heap wouldn't have allocated it // again. Replace the previously allocated info with the new info. blockit = blockmap->find(mem); - delete (*blockit).second->callstack; + delete (*blockit).second->callStack; delete (*blockit).second; blockmap->erase(blockit); blockmap->insert(mem, blockinfo); @@ -1520,22 +1529,22 @@ VOID VisualLeakDetector::mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool c // // None. // -VOID VisualLeakDetector::mapheap (HANDLE heap) +VOID VisualLeakDetector::mapHeap (HANDLE heap) { // Create a new block map for this heap and insert it into the heap map. heapinfo_t* heapinfo = new heapinfo_t; - heapinfo->blockmap.reserve(BLOCKMAPRESERVE); + heapinfo->blockMap.reserve(BLOCKMAPRESERVE); heapinfo->flags = 0x0; - CriticalSectionLocker cs(m_heapmaplock); - HeapMap::Iterator heapit = m_heapmap->insert(heap, heapinfo); - if (heapit == m_heapmap->end()) { + CriticalSectionLocker cs(m_heapMapLock); + HeapMap::Iterator heapit = m_heapMap->insert(heap, heapinfo); + if (heapit == m_heapMap->end()) { // Somehow this heap has been created twice without being destroyed, // or at least it was destroyed without VLD's knowledge. Unmap the heap // from the existing heapinfo, and remap it to the new one. - report(L"WARNING: Visual Leak Detector detected a duplicate heap (" ADDRESSFORMAT L").\n", heap); - heapit = m_heapmap->find(heap); - unmapheap((*heapit).first); - m_heapmap->insert(heap, heapinfo); + Report(L"WARNING: Visual Leak Detector detected a duplicate heap (" ADDRESSFORMAT L").\n", heap); + heapit = m_heapMap->find(heap); + unmapHeap((*heapit).first); + m_heapMap->insert(heap, heapinfo); } } @@ -1566,47 +1575,47 @@ VOID VisualLeakDetector::mapheap (HANDLE heap) // // None. // -VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, +VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack, const context_t &context) { if (newmem != mem) { // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. - unmapblock(heap, mem, context); - mapblock(heap, newmem, size, crtalloc, ppcallstack); + unmapBlock(heap, mem, context); + mapBlock(heap, newmem, size, crtalloc, ppcallstack); return; } // The block was reallocated in-place. Find the existing blockinfo_t // entry in the block map and update it with the new callstack and size. - CriticalSectionLocker cs(m_heapmaplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { + CriticalSectionLocker cs(m_heapMapLock); + HeapMap::Iterator heapit = m_heapMap->find(heap); + if (heapit == m_heapMap->end()) { // We haven't mapped this heap to a block map yet. Obviously the // block has also not been mapped to a blockinfo_t entry yet either, // so treat this reallocation as a brand-new allocation (this will // also map the heap to a new block map). - mapblock(heap, newmem, size, crtalloc, ppcallstack); + mapBlock(heap, newmem, size, crtalloc, ppcallstack); return; } // Find the block's blockinfo_t structure so that we can update it. - BlockMap *blockmap = &(*heapit).second->blockmap; + BlockMap *blockmap = &(*heapit).second->blockMap; BlockMap::Iterator blockit = blockmap->find(mem); if (blockit == blockmap->end()) { // The block hasn't been mapped to a blockinfo_t entry yet. // Treat this reallocation as a new allocation. - mapblock(heap, newmem, size, crtalloc, ppcallstack); + mapBlock(heap, newmem, size, crtalloc, ppcallstack); return; } // Found the blockinfo_t entry for this block. Update it with // a new callstack and new size. blockinfo_t* info = (*blockit).second; - if (info->callstack) + if (info->callStack) { - delete info->callstack; - info->callstack = NULL; + delete info->callStack; + info->callStack = NULL; } if (crtalloc) { @@ -1614,24 +1623,24 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S (*heapit).second->flags |= VLD_HEAP_CRT_DBG; } - if (m_totalalloc < SIZE_MAX) + if (m_totalAlloc < SIZE_MAX) { - m_totalalloc -= info->size; - if (SIZE_MAX - m_totalalloc > size) - m_totalalloc += size; + m_totalAlloc -= info->size; + if (SIZE_MAX - m_totalAlloc > size) + m_totalAlloc += size; else - m_totalalloc = SIZE_MAX; + m_totalAlloc = SIZE_MAX; } - m_curalloc -= info->size; - m_curalloc += size; + m_curAlloc -= info->size; + m_curAlloc += size; - if (m_curalloc > m_maxalloc) - m_maxalloc = m_curalloc; + if (m_curAlloc > m_maxAlloc) + m_maxAlloc = m_curAlloc; // Update the block's size. info->size = size; - ppcallstack = &info->callstack; + ppcallstack = &info->callStack; } // reportconfig - Generates a brief report summarizing Visual Leak Detector's @@ -1641,51 +1650,51 @@ VOID VisualLeakDetector::remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // // None. // -VOID VisualLeakDetector::reportconfig () +VOID VisualLeakDetector::reportConfig () { if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { - report(L" Aggregating duplicate leaks.\n"); + Report(L" Aggregating duplicate leaks.\n"); } - if (wcslen(m_forcedmodulelist) != 0) { - report(L" Forcing %s of these modules in leak detection: %s\n", - (m_options & VLD_OPT_MODULE_LIST_INCLUDE) ? L"inclusion" : L"exclusion", m_forcedmodulelist); + if (wcslen(m_forcedModuleList) != 0) { + Report(L" Forcing %s of these modules in leak detection: %s\n", + (m_options & VLD_OPT_MODULE_LIST_INCLUDE) ? L"inclusion" : L"exclusion", m_forcedModuleList); } - if (m_maxdatadump != VLD_DEFAULT_MAX_DATA_DUMP) { - if (m_maxdatadump == 0) { - report(L" Suppressing data dumps.\n"); + if (m_maxDataDump != VLD_DEFAULT_MAX_DATA_DUMP) { + if (m_maxDataDump == 0) { + Report(L" Suppressing data dumps.\n"); } else { - report(L" Limiting data dumps to %Iu bytes.\n", m_maxdatadump); + Report(L" Limiting data dumps to %Iu bytes.\n", m_maxDataDump); } } - if (m_maxtraceframes != VLD_DEFAULT_MAX_TRACE_FRAMES) { - report(L" Limiting stack traces to %u frames.\n", m_maxtraceframes); + if (m_maxTraceFrames != VLD_DEFAULT_MAX_TRACE_FRAMES) { + Report(L" Limiting stack traces to %u frames.\n", m_maxTraceFrames); } if (m_options & VLD_OPT_UNICODE_REPORT) { - report(L" Generating a Unicode (UTF-16) encoded report.\n"); + Report(L" Generating a Unicode (UTF-16) encoded report.\n"); } if (m_options & VLD_OPT_REPORT_TO_FILE) { if (m_options & VLD_OPT_REPORT_TO_DEBUGGER) { - report(L" Outputting the report to the debugger and to %s\n", m_reportfilepath); + Report(L" Outputting the report to the debugger and to %s\n", m_reportFilePath); } else { - report(L" Outputting the report to %s\n", m_reportfilepath); + Report(L" Outputting the report to %s\n", m_reportFilePath); } } if (m_options & VLD_OPT_SLOW_DEBUGGER_DUMP) { - report(L" Outputting the report to the debugger at a slower rate.\n"); + Report(L" Outputting the report to the debugger at a slower rate.\n"); } if (m_options & VLD_OPT_SAFE_STACK_WALK) { - report(L" Using the \"safe\" (but slow) stack walking method.\n"); + Report(L" Using the \"safe\" (but slow) stack walking method.\n"); } if (m_options & VLD_OPT_SELF_TEST) { - report(L" Performing a memory leak self-test.\n"); + Report(L" Performing a memory leak self-test.\n"); } if (m_options & VLD_OPT_START_DISABLED) { - report(L" Starting with memory leak detection disabled.\n"); + Report(L" Starting with memory leak detection disabled.\n"); } if (m_options & VLD_OPT_TRACE_INTERNAL_FRAMES) { - report(L" Including heap and VLD internal frames in stack traces.\n"); + Report(L" Including heap and VLD internal frames in stack traces.\n"); } } @@ -1698,9 +1707,9 @@ VOID VisualLeakDetector::reportconfig () // // None. // -SIZE_T VisualLeakDetector::getleakscount (heapinfo_t* heapinfo) +SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo) { - BlockMap* blockmap = &heapinfo->blockmap; + BlockMap* blockmap = &heapinfo->blockMap; SIZE_T memoryleaks = 0; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) @@ -1740,14 +1749,14 @@ SIZE_T VisualLeakDetector::getleakscount (heapinfo_t* heapinfo) // // None. // -SIZE_T VisualLeakDetector::reportheapleaks (HANDLE heap) +SIZE_T VisualLeakDetector::reportHeapLeaks (HANDLE heap) { assert(heap != NULL); // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(m_heapmaplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { + CriticalSectionLocker cs(m_heapMapLock); + HeapMap::Iterator heapit = m_heapMap->find(heap); + if (heapit == m_heapMap->end()) { // Nothing is allocated from this heap. No leaks. return 0; } @@ -1755,21 +1764,21 @@ SIZE_T VisualLeakDetector::reportheapleaks (HANDLE heap) Set aggregatedLeaks; heapinfo_t* heapinfo = (*heapit).second; // Generate a memory leak report for heap. - SIZE_T leaks_count = reportleaks(heapinfo, aggregatedLeaks); + SIZE_T leaks_count = reportLeaks(heapinfo, aggregatedLeaks); // Show a summary. if (leaks_count != 0) { - report(L"Visual Leak Detector detected %Iu memory leak%s in heap " ADDRESSFORMAT L"\n", + Report(L"Visual Leak Detector detected %Iu memory leak%s in heap " ADDRESSFORMAT L"\n", leaks_count, (leaks_count > 1) ? L"s" : L"", heap); } return leaks_count; } -SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo, Set &aggregatedLeaks) +SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, Set &aggregatedLeaks) { - BlockMap* blockmap = &heapinfo->blockmap; - SIZE_T leaksfound = 0; - bool firstleak = true; + BlockMap* blockmap = &heapinfo->blockMap; + SIZE_T leaksFound = 0; + bool firstLeak = true; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { @@ -1789,7 +1798,7 @@ SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo, Set if (heapinfo->flags & VLD_HEAP_CRT_DBG) { // This block is allocated to a CRT heap, so the block has a CRT - // memory block header prepended to it. + // memory block header pretended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; if (CRT_USE_TYPE(crtheader->use) == CRT_USE_IGNORE || CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || @@ -1808,51 +1817,51 @@ SIZE_T VisualLeakDetector::reportleaks (heapinfo_t* heapinfo, Set } // It looks like a real memory leak. - if (firstleak) { // A confusing way to only display this message once - report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); - firstleak = false; + if (firstLeak) { // A confusing way to only display this message once + Report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); + firstLeak = false; } - leaksfound++; - report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialnumber, address, size); - assert(info->callstack); + leaksFound++; + Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialNumber, address, size); + assert(info->callStack); if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { // Aggregate all other leaks which are duplicates of this one // under this same heading, to cut down on clutter. - SIZE_T erased = eraseduplicates(blockit, aggregatedLeaks); + SIZE_T erased = eraseDuplicates(blockit, aggregatedLeaks); // add only the number that were erased, since the 'one left over' // is already recorded as a leak - leaksfound += erased; + leaksFound += erased; DWORD callstackCRC = 0; - if (info->callstack) - callstackCRC = CalculateCRC32(info->size, info->callstack->getHashValue()); - report(L"Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, erased + 1); + if (info->callStack) + callstackCRC = CalculateCRC32(info->size, info->callStack->getHashValue()); + Report(L"Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, erased + 1); } // Dump the call stack. - report(L" Call Stack:\n"); - if (info->callstack) - info->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + Report(L" Call Stack:\n"); + if (info->callStack) + info->callStack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); // Dump the data in the user data section of the memory block. - if (m_maxdatadump != 0) { - report(L" Data:\n"); + if (m_maxDataDump != 0) { + Report(L" Data:\n"); if (m_options & VLD_OPT_UNICODE_REPORT) { - dumpmemoryw(address, (m_maxdatadump < size) ? m_maxdatadump : size); + DumpMemoryW(address, (m_maxDataDump < size) ? m_maxDataDump : size); } else { - dumpmemorya(address, (m_maxdatadump < size) ? m_maxdatadump : size); + DumpMemoryA(address, (m_maxDataDump < size) ? m_maxDataDump : size); } } - report(L"\n\n"); + Report(L"\n\n"); } - return leaksfound; + return leaksFound; } -VOID VisualLeakDetector::markallleaksasreported (heapinfo_t* heapinfo) +VOID VisualLeakDetector::markAllLeaksAsReported (heapinfo_t* heapinfo) { - BlockMap* blockmap = &heapinfo->blockmap; + BlockMap* blockmap = &heapinfo->blockMap; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { @@ -1872,12 +1881,12 @@ VOID VisualLeakDetector::markallleaksasreported (heapinfo_t* heapinfo) // Return Value: // If mem is found, it will return the blockinfo_t pointer, otherwise NULL // -blockinfo_t* VisualLeakDetector::FindAllocedBlock(LPCVOID mem, __out HANDLE& heap) +blockinfo_t* VisualLeakDetector::findAllocedBlock(LPCVOID mem, __out HANDLE& heap) { blockinfo_t* result = NULL; // Iterate through all heaps - for (HeapMap::Iterator it = m_heapmap->begin(); - it != m_heapmap->end(); + for (HeapMap::Iterator it = m_heapMap->begin(); + it != m_heapMap->end(); it++) { HANDLE heap_handle = (*it).first; @@ -1885,7 +1894,7 @@ blockinfo_t* VisualLeakDetector::FindAllocedBlock(LPCVOID mem, __out HANDLE& hea heapinfo_t* heapPtr = (*it).second; // Iterate through all memory blocks in each heap - BlockMap& p_block_map = heapPtr->blockmap; + BlockMap& p_block_map = heapPtr->blockMap; for (BlockMap::Iterator iter = p_block_map.begin(); iter != p_block_map.end(); iter++) @@ -1920,22 +1929,22 @@ blockinfo_t* VisualLeakDetector::FindAllocedBlock(LPCVOID mem, __out HANDLE& hea // // None. // -VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t &context) +VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context) { if (NULL == mem) return; // Find this heap's block map. - CriticalSectionLocker cs(m_heapmaplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { + CriticalSectionLocker cs(m_heapMapLock); + HeapMap::Iterator heapit = m_heapMap->find(heap); + if (heapit == m_heapMap->end()) { // We don't have a block map for this heap. We must not have monitored // this allocation (probably happened before VLD was initialized). return; } // Find this block in the block map. - BlockMap *blockmap = &(*heapit).second->blockmap; + BlockMap *blockmap = &(*heapit).second->blockMap; BlockMap::Iterator blockit = blockmap->find(mem); if (blockit == blockmap->end()) { // This memory block is not in the block map. We must not have monitored this @@ -1948,21 +1957,21 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & if (m_options & VLD_OPT_VALIDATE_HEAPFREE) { HANDLE other_heap = NULL; - blockinfo_t* alloc_block = FindAllocedBlock(mem, other_heap); // other_heap is an out parameter + blockinfo_t* alloc_block = findAllocedBlock(mem, other_heap); // other_heap is an out parameter bool diff = other_heap != heap; // Check indeed if the other heap is different - if (alloc_block && alloc_block->callstack && diff) + if (alloc_block && alloc_block->callStack && diff) { - report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); - report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); - report(L" Call Stack:\n"); - alloc_block->callstack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + Report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); + Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); + Report(L" Call Stack:\n"); + alloc_block->callStack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); // Now we need a way to print the current callstack at this point: CallStack* stack_here = CallStack::Create(); - stack_here->getstacktrace(m_maxtraceframes, context); - report(L"Deallocation Call stack.\n"); - report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialnumber, mem, alloc_block->size); - report(L" Call Stack:\n"); + stack_here->getStackTrace(m_maxTraceFrames, context); + Report(L"Deallocation Call stack.\n"); + Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); + Report(L" Call Stack:\n"); stack_here->dump(FALSE); // Now it should be safe to delete our temporary callstack delete stack_here; @@ -1976,8 +1985,8 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & // Free the blockinfo_t structure and erase it from the block map. blockinfo_t *info = (*blockit).second; - m_curalloc -= info->size; - delete info->callstack; + m_curAlloc -= info->size; + delete info->callStack; delete info; blockmap->erase(blockit); } @@ -1992,12 +2001,12 @@ VOID VisualLeakDetector::unmapblock (HANDLE heap, LPCVOID mem, const context_t & // // None. // -VOID VisualLeakDetector::unmapheap (HANDLE heap) +VOID VisualLeakDetector::unmapHeap (HANDLE heap) { // Find this heap's block map. - CriticalSectionLocker cs(m_heapmaplock); - HeapMap::Iterator heapit = m_heapmap->find(heap); - if (heapit == m_heapmap->end()) { + CriticalSectionLocker cs(m_heapMapLock); + HeapMap::Iterator heapit = m_heapMap->find(heap); + if (heapit == m_heapMap->end()) { // This heap hasn't been mapped. We must not have monitored this heap's // creation (probably happened before VLD was initialized). return; @@ -2005,15 +2014,15 @@ VOID VisualLeakDetector::unmapheap (HANDLE heap) // Free all of the blockinfo_t structures stored in the block map. heapinfo_t *heapinfo = (*heapit).second; - BlockMap *blockmap = &heapinfo->blockmap; + BlockMap *blockmap = &heapinfo->blockMap; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callstack; + delete (*blockit).second->callStack; delete (*blockit).second; } delete heapinfo; // Remove this heap's block map from the heap map. - m_heapmap->erase(heapit); + m_heapMap->erase(heapit); } @@ -2047,7 +2056,7 @@ VOID VisualLeakDetector::unmapheap (HANDLE heap) // Always returns TRUE, which tells EnumerateLoadedModules64 to continue // enumerating. // -BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context) +BOOL VisualLeakDetector::addLoadedModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context) { size_t length = wcslen(modulepath) + 1; LPWSTR modulepathw = new WCHAR [length]; @@ -2066,7 +2075,7 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, if (_wcsicmp(modulename, TEXT(VLDDLL)) == 0) { // Record Visual Leak Detector's own base address. - vld.m_vldbase = (HMODULE)modulebase; + g_vld.m_vldBase = (HMODULE)modulebase; } else { // Convert the module path to ASCII. @@ -2090,11 +2099,11 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, // See if this is a module listed in the patch table. If it is, update // the corresponding patch table entries' module base address. - UINT tablesize = _countof(m_patchtable); + UINT tablesize = _countof(m_patchTable); for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &m_patchtable[index]; - if (_stricmp(entry->exportmodulename, modulenamea) == 0) { - entry->modulebase = (UINT_PTR)modulebase; + moduleentry_t *entry = &m_patchTable[index]; + if (_stricmp(entry->exportModuleName, modulenamea) == 0) { + entry->moduleBase = (UINT_PTR)modulebase; } } @@ -2103,8 +2112,8 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, // Record the module's information and store it in the set. moduleinfo_t moduleinfo; - moduleinfo.addrlow = (UINT_PTR)modulebase; - moduleinfo.addrhigh = (UINT_PTR)(modulebase + modulesize) - 1; + moduleinfo.addrLow = (UINT_PTR)modulebase; + moduleinfo.addrHigh = (UINT_PTR)(modulebase + modulesize) - 1; moduleinfo.flags = 0x0; moduleinfo.name = modulename; moduleinfo.path = modulepathw; @@ -2133,22 +2142,22 @@ BOOL VisualLeakDetector::addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, // // Always returns TRUE. // -BOOL VisualLeakDetector::detachfrommodule (PCWSTR /*modulepath*/, DWORD64 modulebase, ULONG /*modulesize*/, +BOOL VisualLeakDetector::detachFromModule (PCWSTR /*modulepath*/, DWORD64 modulebase, ULONG /*modulesize*/, PVOID /*context*/) { - UINT tablesize = _countof(m_patchtable); + UINT tablesize = _countof(m_patchTable); - restoremodule((HMODULE)modulebase, m_patchtable, tablesize); + RestoreModule((HMODULE)modulebase, m_patchTable, tablesize); return TRUE; } -void VisualLeakDetector::firstalloccall(tls_t * tls) +void VisualLeakDetector::firstAllocCall(tls_t * tls) { - if (tls->ppcallstack) + if (tls->ppCallStack) { tls->flags &= ~VLD_TLS_CRTALLOC; - getcallstack(tls->ppcallstack, tls->context); + getCallStack(tls->ppCallStack, tls->context); } // Reset thread local flags and variables for the next allocation. @@ -2188,7 +2197,7 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, size_t num, size_t size) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2199,14 +2208,14 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = pcalloc(num, size); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2227,7 +2236,7 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2238,14 +2247,14 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool de // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = pmalloc(size); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2266,7 +2275,7 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool de // void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntime, size_t size) { - tls_t* tls = vld.gettls(); + tls_t* tls = g_vld.getTls(); // The new operator is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2277,14 +2286,14 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntim // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = pnew(size); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2311,7 +2320,7 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, void *mem, size_t size) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2322,14 +2331,14 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = prealloc(mem, size); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2357,7 +2366,7 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, size_t num, size_t size) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2368,14 +2377,14 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = precalloc(mem, num, size); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2397,7 +2406,7 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size, size_t alignment) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2408,14 +2417,14 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = pmalloc(size, alignment); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2437,7 +2446,7 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2448,14 +2457,14 @@ void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmal // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = pmalloc(size, alignment, offset); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2483,7 +2492,7 @@ void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, size_t size, size_t alignment) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2494,14 +2503,14 @@ void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = prealloc(mem, size, alignment); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2530,7 +2539,7 @@ void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t p size_t alignment, size_t offset) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2541,14 +2550,14 @@ void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t p // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = prealloc(mem, size, alignment, offset); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2579,7 +2588,7 @@ void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, size_t size, size_t alignment) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2590,14 +2599,14 @@ void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = precalloc(mem, num, size, alignment); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2629,7 +2638,7 @@ void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t size_t alignment, size_t offset) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2640,14 +2649,14 @@ void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = precalloc(mem, num, size, alignment, offset); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2683,7 +2692,7 @@ void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_ char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2694,14 +2703,14 @@ void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_ // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = p_malloc_dbg(size, alignment, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2738,7 +2747,7 @@ void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_db char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2749,14 +2758,14 @@ void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_db // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = p_malloc_dbg(size, alignment, offset, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2795,7 +2804,7 @@ void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_reall char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2806,14 +2815,14 @@ void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_reall // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = p_realloc_dbg(mem, size, alignment, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2853,7 +2862,7 @@ void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_ char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2864,14 +2873,14 @@ void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_ // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = p_realloc_dbg(mem, size, alignment, offset, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2913,7 +2922,7 @@ void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_rec char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2924,14 +2933,14 @@ void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_rec // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = p_recalloc_dbg(mem, num, size, alignment, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -2974,7 +2983,7 @@ void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recallo char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -2985,14 +2994,14 @@ void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recallo // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = p_recalloc_dbg(mem, num, size, alignment, offset, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -3038,7 +3047,7 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -3049,14 +3058,14 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = p_calloc_dbg(num, size, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -3091,7 +3100,7 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -3102,14 +3111,14 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = p_malloc_dbg(size, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -3144,7 +3153,7 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // The debug new operator is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -3155,14 +3164,14 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = pnew_dbg_crt(size, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -3196,21 +3205,21 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = pnew_dbg(size, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -3241,21 +3250,21 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. void* block = pnew_dbg_mfc(size, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -3293,7 +3302,7 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -3304,14 +3313,14 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = p_realloc_dbg(mem, size, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -3350,7 +3359,7 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, char const *file, int line) { - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) @@ -3361,14 +3370,14 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. void* block = p_recalloc_dbg(mem, num, size, type, file, line); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -3400,44 +3409,44 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) { // See if there is an entry in the patch table that matches the requested // function. - UINT tablesize = _countof(vld.m_patchtable); + UINT tablesize = _countof(g_vld.m_patchTable); for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &vld.m_patchtable[index]; - if ((entry->modulebase == 0x0) || ((HMODULE)entry->modulebase != module)) { + moduleentry_t *entry = &g_vld.m_patchTable[index]; + if ((entry->moduleBase == 0x0) || ((HMODULE)entry->moduleBase != module)) { // This patch table entry is for a different module. continue; } - patchentry_t *patchentry = entry->patchtable; - while(patchentry->importname) + patchentry_t *patchentry = entry->patchTable; + while(patchentry->importName) { // This patch table entry is for the specified module. If the requested // imports name matches the entry's import name (or ordinal), then // return the address of the replacement instead of the address of the // actual import. - if ((SIZE_T)patchentry->importname < (SIZE_T)vld.m_vldbase) { + if ((SIZE_T)patchentry->importName < (SIZE_T)g_vld.m_vldBase) { // This entry's import name is not a valid pointer to data in // vld.dll. It must be an ordinal value. - if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { + if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { if (patchentry->original != NULL) - *patchentry->original = vld._RGetProcAddress(module, procname); + *patchentry->original = g_vld._RGetProcAddress(module, procname); return (FARPROC)patchentry->replacement; } } else { __try { - if (strcmp(patchentry->importname, procname) == 0) { + if (strcmp(patchentry->importName, procname) == 0) { if (patchentry->original != NULL) - *patchentry->original = vld._RGetProcAddress(module, procname); + *patchentry->original = g_vld._RGetProcAddress(module, procname); return (FARPROC)patchentry->replacement; } } __except(FilterFunction(GetExceptionCode())) { - if ((UINT_PTR)patchentry->importname == (UINT_PTR)procname) { + if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { if (patchentry->original != NULL) - *patchentry->original = vld._RGetProcAddress(module, procname); + *patchentry->original = g_vld._RGetProcAddress(module, procname); return (FARPROC)patchentry->replacement; } } @@ -3448,7 +3457,7 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) // The requested function is not a patched function. Just return the real // address of the requested function. - return vld._RGetProcAddress(module, procname); + return g_vld._RGetProcAddress(module, procname); } FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) @@ -3479,7 +3488,7 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m HANDLE heap = HeapCreate(options, initsize, maxsize); // Map the created heap handle to a new block map. - vld.mapheap(heap); + g_vld.mapHeap(heap); // Try to get the name of the function containing the return address. BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; @@ -3487,16 +3496,16 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; - g_symbollock.Enter(); + g_symbolLock.Enter(); DWORD64 displacement; - BOOL symfound = SymFromAddrW(g_currentprocess, ra, &displacement, functioninfo); - g_symbollock.Leave(); + BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); + g_symbolLock.Leave(); if (symfound == TRUE) { if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { // HeapCreate was called by _heap_init. This is a static CRT heap (msvcr*.dll). - CriticalSectionLocker cs(vld.m_heapmaplock); - HeapMap::Iterator heapit = vld.m_heapmap->find(heap); - assert(heapit != vld.m_heapmap->end()); + CriticalSectionLocker cs(g_vld.m_heapMapLock); + HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); + assert(heapit != g_vld.m_heapMap->end()); HMODULE hCallingModule = (HMODULE)functioninfo->ModBase; WCHAR callingmodulename [MAX_PATH] = L""; if (hCallingModule && GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) @@ -3527,10 +3536,10 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) // from the process's address space. So, we'd better generate a leak report // for this heap now, while we can still read from the memory blocks // allocated to it. - if (!(vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) - vld.reportheapleaks(heap); + if (!(g_vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) + g_vld.reportHeapLeaks(heap); - vld.unmapheap(heap); + g_vld.unmapHeap(heap); return HeapDestroy(heap); } @@ -3560,7 +3569,7 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, PHANDLE modulehandle) { - CriticalSectionLocker cs(vld.m_loaderlock); + CriticalSectionLocker cs(g_vld.m_loaderLock); // Load the DLL. NTSTATUS status = LdrLoadDll(searchpath, flags, modulename, modulehandle); @@ -3571,16 +3580,16 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod // modules. ModuleSet *newmodules = new ModuleSet; newmodules->reserve(MODULESETRESERVE); - EnumerateLoadedModulesW64(g_currentprocess, addloadedmodule, newmodules); + EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); // Attach to all modules included in the set. - vld.attachtoloadedmodules(newmodules); + g_vld.attachToLoadedModules(newmodules); // Start using the new set of loaded modules. - vld.m_moduleslock.Enter(); - ModuleSet *oldmodules = vld.m_loadedmodules; - vld.m_loadedmodules = newmodules; - vld.m_moduleslock.Leave(); + g_vld.m_modulesLock.Enter(); + ModuleSet *oldmodules = g_vld.m_loadedModules; + g_vld.m_loadedModules = newmodules; + g_vld.m_modulesLock.Leave(); // Free resources used by the old module list. for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { @@ -3598,22 +3607,22 @@ VOID VisualLeakDetector::RefreshModules() if (m_options & VLD_OPT_VLDOFF) return; - CriticalSectionLocker cs(m_loaderlock); + CriticalSectionLocker cs(m_loaderLock); // Duplicate code here in this method. Consider refactoring out to another method. // Create a new set of all loaded modules, including any newly loaded // modules. ModuleSet* newmodules = new ModuleSet(); newmodules->reserve(MODULESETRESERVE); - EnumerateLoadedModulesW64(g_currentprocess, addloadedmodule, newmodules); + EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); // Attach to all modules included in the set. - attachtoloadedmodules(newmodules); + attachToLoadedModules(newmodules); // Start using the new set of loaded modules. - m_moduleslock.Enter(); - ModuleSet* oldmodules = m_loadedmodules; - m_loadedmodules = newmodules; - m_moduleslock.Leave(); + m_modulesLock.Enter(); + ModuleSet* oldmodules = m_loadedModules; + m_loadedModules = newmodules; + m_modulesLock.Leave(); // Free resources used by the old module list. for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { @@ -3623,7 +3632,7 @@ VOID VisualLeakDetector::RefreshModules() delete oldmodules; } -void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &context_ ) +void VisualLeakDetector::getCallStack( CallStack **&ppcallstack, context_t &context_ ) { CallStack* callstack = CallStack::Create(); @@ -3634,7 +3643,7 @@ void VisualLeakDetector::getcallstack( CallStack **&ppcallstack, context_t &cont context_.fp = 0x0; ppcallstack = NULL; - callstack->getstacktrace(vld.m_maxtraceframes, context); + callstack->getStackTrace(g_vld.m_maxTraceFrames, context); } // _RtlAllocateHeap - Calls to RtlAllocateHeap are patched through to this @@ -3658,11 +3667,11 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si // Allocate the block. LPVOID block = RtlAllocateHeap(heap, flags, size); - if ((block == NULL) || !vld.enabled()) + if ((block == NULL) || !g_vld.enabled()) return block; - tls_t* tls = vld.gettls(); - tls->blockprocessed = TRUE; + tls_t* tls = g_vld.getTls(); + tls->blockProcessed = TRUE; bool firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { @@ -3673,10 +3682,10 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si else context = tls->context; - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) return block; - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { // Begin the stack trace with the current frame. Obtain the current // frame pointer. firstcall = true; @@ -3688,7 +3697,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si AllocateHeap(tls, heap, block, size); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -3699,11 +3708,11 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) // Allocate the block. LPVOID block = HeapAlloc(heap, flags, size); - if ((block == NULL) || !vld.enabled()) + if ((block == NULL) || !g_vld.enabled()) return block; - tls_t* tls = vld.gettls(); - tls->blockprocessed = TRUE; + tls_t* tls = g_vld.getTls(); + tls->blockProcessed = TRUE; bool firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { @@ -3714,10 +3723,10 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) else context = tls->context; - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) return block; - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { // Begin the stack trace with the current frame. Obtain the current // frame pointer. firstcall = true; @@ -3729,7 +3738,7 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) AllocateHeap(tls, heap, block, size); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -3740,7 +3749,7 @@ void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SI // The module that initiated this allocation is included in leak // detection. Map this block to the specified heap. - vld.mapblock(heap, block, size, crtalloc, tls->ppcallstack); + g_vld.mapBlock(heap, block, size, crtalloc, tls->ppCallStack); } // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. @@ -3762,14 +3771,14 @@ BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) { BOOL status; - if (!g_symbollock.IsLockedByCurrentThread()) // skip dbghelp.dll calls + if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls { context_t context; // Record the current frame pointer. CAPTURE_CONTEXT(context); // Unmap the block from the specified heap. - vld.unmapblock(heap, mem, context); + g_vld.unmapBlock(heap, mem, context); } status = RtlFreeHeap(heap, flags, mem); @@ -3782,14 +3791,14 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) { BOOL status; - if (!g_symbollock.IsLockedByCurrentThread()) // skip dbghelp.dll calls + if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls { context_t context; // Record the current frame pointer. CAPTURE_CONTEXT(context); // Unmap the block from the specified heap. - vld.unmapblock(heap, mem, context); + g_vld.unmapBlock(heap, mem, context); } status = HeapFree(heap, flags, mem); @@ -3798,18 +3807,18 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) } // Find the information for the module that initiated this reallocation. -bool VisualLeakDetector::IsModuleExcluded(UINT_PTR address) +bool VisualLeakDetector::isModuleExcluded(UINT_PTR address) { bool excluded = false; moduleinfo_t moduleinfo; ModuleSet::Iterator moduleit; - moduleinfo.addrlow = address; - moduleinfo.addrhigh = address + 1024; + moduleinfo.addrLow = address; + moduleinfo.addrHigh = address + 1024; moduleinfo.flags = 0; - CriticalSectionLocker cs(vld.m_moduleslock); - moduleit = vld.m_loadedmodules->find(moduleinfo); - if (moduleit != vld.m_loadedmodules->end()) { + CriticalSectionLocker cs(g_vld.m_modulesLock); + moduleit = g_vld.m_loadedModules->find(moduleinfo); + if (moduleit != g_vld.m_loadedModules->end()) { excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? true : false; } return excluded; @@ -3844,8 +3853,8 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID if (newmem == NULL) return newmem; - tls_t *tls = vld.gettls(); - tls->blockprocessed = TRUE; + tls_t *tls = g_vld.getTls(); + tls->blockProcessed = TRUE; bool firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { @@ -3856,10 +3865,10 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID else context = tls->context; - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) return newmem; - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { // Begin the stack trace with the current frame. Obtain the current // frame pointer. firstcall = true; @@ -3870,8 +3879,8 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID if (firstcall) { - firstalloccall(tls); - tls->ppcallstack = NULL; + firstAllocCall(tls); + tls->ppCallStack = NULL; } return newmem; @@ -3887,8 +3896,8 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S if (newmem == NULL) return newmem; - tls_t *tls = vld.gettls(); - tls->blockprocessed = TRUE; + tls_t *tls = g_vld.getTls(); + tls->blockProcessed = TRUE; bool firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { @@ -3899,10 +3908,10 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S else context = tls->context; - if (IsModuleExcluded(GET_RETURN_ADDRESS(context))) + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) return newmem; - if (!firstcall && (vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { // Begin the stack trace with the current frame. Obtain the current // frame pointer. firstcall = true; @@ -3913,8 +3922,8 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S if (firstcall) { - firstalloccall(tls); - tls->ppcallstack = NULL; + firstAllocCall(tls); + tls->ppCallStack = NULL; } return newmem; @@ -3931,7 +3940,7 @@ void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LP // The module that initiated this allocation is included in leak // detection. Remap the block. - vld.remapblock(heap, mem, newmem, size, crtalloc, tls->ppcallstack, context); + g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->ppCallStack, context); #ifdef _DEBUG if(tls->context.fp != 0) @@ -3973,26 +3982,26 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) HMODULE ole32; - *imalloc = (LPMALLOC)&vld; + *imalloc = (LPMALLOC)&g_vld; if (pCoGetMalloc == NULL) { // This is the first call to this function. Link to the real // CoGetMalloc and get a pointer to the system implementation of the // IMalloc interface. ole32 = GetModuleHandleW(L"ole32.dll"); - pCoGetMalloc = (CoGetMalloc_t)vld._RGetProcAddress(ole32, "CoGetMalloc"); - hr = pCoGetMalloc(context, &vld.m_imalloc); + pCoGetMalloc = (CoGetMalloc_t)g_vld._RGetProcAddress(ole32, "CoGetMalloc"); + hr = pCoGetMalloc(context, &g_vld.m_iMalloc); } else { // wait for different thread initialization int c = 0; - while(vld.m_imalloc == NULL && c < 10) + while(g_vld.m_iMalloc == NULL && c < 10) { Sleep(1); c++; } - if (vld.m_imalloc == NULL) + if (g_vld.m_iMalloc == NULL) hr = E_INVALIDARG; } @@ -4017,7 +4026,7 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) LPVOID block; context_t context; HMODULE ole32; - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -4025,21 +4034,21 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) // Record the current frame pointer. CAPTURE_CONTEXT(context); tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } if (pCoTaskMemAlloc == NULL) { // This is the first call to this function. Link to the real // CoTaskMemAlloc. ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemAlloc = (CoTaskMemAlloc_t)vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); + pCoTaskMemAlloc = (CoTaskMemAlloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); } // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pCoTaskMemAlloc(size); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -4064,7 +4073,7 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) LPVOID block; context_t context; HMODULE ole32; - tls_t *tls = vld.gettls(); + tls_t *tls = g_vld.getTls(); bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -4072,21 +4081,21 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) // Record the current frame pointer. CAPTURE_CONTEXT(context); tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } if (pCoTaskMemRealloc == NULL) { // This is the first call to this function. Link to the real // CoTaskMemRealloc. ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemRealloc = (CoTaskMemRealloc_t)vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); + pCoTaskMemRealloc = (CoTaskMemRealloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. block = pCoTaskMemRealloc(mem, size); if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -4107,8 +4116,8 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) // ULONG VisualLeakDetector::AddRef () { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->AddRef() : 0; + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->AddRef() : 0; } // Alloc - Calls to IMalloc::Alloc end up here. This function is just a wrapper @@ -4125,7 +4134,7 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) { LPVOID block; context_t context; - tls_t *tls = gettls(); + tls_t *tls = getTls(); bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -4133,15 +4142,15 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) // Record the current frame pointer. CAPTURE_CONTEXT(context); tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. - assert(m_imalloc != NULL); - block = (m_imalloc) ? m_imalloc->Alloc(size) : NULL; + assert(m_iMalloc != NULL); + block = (m_iMalloc) ? m_iMalloc->Alloc(size) : NULL; if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -4158,8 +4167,8 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) // INT VisualLeakDetector::DidAlloc (LPVOID mem) { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->DidAlloc(mem) : 0; + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->DidAlloc(mem) : 0; } // Free - Calls to IMalloc::Free will end up here. This function is just a @@ -4173,8 +4182,8 @@ INT VisualLeakDetector::DidAlloc (LPVOID mem) // VOID VisualLeakDetector::Free (LPVOID mem) { - assert(m_imalloc != NULL); - if (m_imalloc) m_imalloc->Free(mem); + assert(m_iMalloc != NULL); + if (m_iMalloc) m_iMalloc->Free(mem); } // GetSize - Calls to IMalloc::GetSize will end up here. This function is just a @@ -4189,8 +4198,8 @@ VOID VisualLeakDetector::Free (LPVOID mem) // SIZE_T VisualLeakDetector::GetSize (LPVOID mem) { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->GetSize(mem) : 0; + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->GetSize(mem) : 0; } // HeapMinimize - Calls to IMalloc::HeapMinimize will end up here. This function @@ -4202,8 +4211,8 @@ SIZE_T VisualLeakDetector::GetSize (LPVOID mem) // VOID VisualLeakDetector::HeapMinimize () { - assert(m_imalloc != NULL); - if (m_imalloc) m_imalloc->HeapMinimize(); + assert(m_iMalloc != NULL); + if (m_iMalloc) m_iMalloc->HeapMinimize(); } // QueryInterface - Calls to IMalloc::QueryInterface will end up here. This @@ -4222,8 +4231,8 @@ VOID VisualLeakDetector::HeapMinimize () // HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->QueryInterface(iid, object) : E_UNEXPECTED; + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->QueryInterface(iid, object) : E_UNEXPECTED; } // Realloc - Calls to IMalloc::Realloc will end up here. This function is just a @@ -4244,7 +4253,7 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) { LPVOID block; context_t context; - tls_t *tls = gettls(); + tls_t *tls = getTls(); bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -4252,15 +4261,15 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) // Record the current frame pointer. CAPTURE_CONTEXT(context); tls->context = context; - tls->blockprocessed = FALSE; + tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - assert(m_imalloc != NULL); - block = (m_imalloc) ? m_imalloc->Realloc(mem, size) : NULL; + assert(m_iMalloc != NULL); + block = (m_iMalloc) ? m_iMalloc->Realloc(mem, size) : NULL; if (firstcall) - firstalloccall(tls); + firstAllocCall(tls); return block; } @@ -4275,8 +4284,8 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) // ULONG VisualLeakDetector::Release () { - assert(m_imalloc != NULL); - return (m_imalloc) ? m_imalloc->Release() : 0; + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->Release() : 0; } SIZE_T VisualLeakDetector::GetLeaksCount() @@ -4288,12 +4297,12 @@ SIZE_T VisualLeakDetector::GetLeaksCount() SIZE_T leaksCount = 0; // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(m_heapmaplock); - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + CriticalSectionLocker cs(m_heapMapLock); + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); heapinfo_t* heapinfo = (*heapit).second; - leaksCount += getleakscount(heapinfo); + leaksCount += getLeaksCount(heapinfo); } return leaksCount; } @@ -4307,13 +4316,13 @@ SIZE_T VisualLeakDetector::ReportLeaks( ) // Generate a memory leak report for each heap in the process. SIZE_T leaksCount = 0; - CriticalSectionLocker cs(m_heapmaplock); + CriticalSectionLocker cs(m_heapMapLock); Set aggregatedLeaks; - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); heapinfo_t* heapinfo = (*heapit).second; - leaksCount += reportleaks(heapinfo, aggregatedLeaks); + leaksCount += reportLeaks(heapinfo, aggregatedLeaks); } return leaksCount; } @@ -4326,12 +4335,12 @@ VOID VisualLeakDetector::MarkAllLeaksAsReported( ) } // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(m_heapmaplock); - for (HeapMap::Iterator heapit = m_heapmap->begin(); heapit != m_heapmap->end(); ++heapit) { + CriticalSectionLocker cs(m_heapMapLock); + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); heapinfo_t* heapinfo = (*heapit).second; - markallleaksasreported(heapinfo); + markAllLeaksAsReported(heapinfo); } } @@ -4339,11 +4348,11 @@ void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) { ModuleSet::Iterator moduleit; - CriticalSectionLocker cs(m_moduleslock); - moduleit = m_loadedmodules->begin(); - while( moduleit != m_loadedmodules->end() ) + CriticalSectionLocker cs(m_modulesLock); + moduleit = m_loadedModules->begin(); + while( moduleit != m_loadedModules->end() ) { - if ( (*moduleit).addrlow == (UINT_PTR)module) + if ( (*moduleit).addrLow == (UINT_PTR)module) { moduleinfo_t *mod = (moduleinfo_t *)&(*moduleit); if ( on ) @@ -4390,8 +4399,8 @@ void VisualLeakDetector::DisableLeakDetection () // because if neither flag is set, it means that we are in the default or // "starting" state, which could be either enabled or disabled depending on // the configuration. - tls = gettls(); - tls->oldflags = tls->flags; + tls = getTls(); + tls->oldFlags = tls->flags; tls->flags &= ~VLD_TLS_ENABLED; tls->flags |= VLD_TLS_DISABLED; } @@ -4406,8 +4415,8 @@ void VisualLeakDetector::EnableLeakDetection () tls_t *tls; // Enable memory leak detection for the current thread. - tls = gettls(); - tls->oldflags = tls->flags; + tls = getTls(); + tls->oldFlags = tls->flags; tls->flags &= ~VLD_TLS_DISABLED; tls->flags |= VLD_TLS_ENABLED; m_status &= ~VLD_STATUS_NEVER_ENABLED; @@ -4423,9 +4432,9 @@ void VisualLeakDetector::RestoreLeakDetectionState () } // Restore state memory leak detection for the current thread. - tls = gettls(); + tls = getTls(); tls->flags &= ~(VLD_TLS_DISABLED | VLD_TLS_ENABLED); - tls->flags |= tls->oldflags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); + tls->flags |= tls->oldFlags & (VLD_TLS_DISABLED | VLD_TLS_ENABLED); } void VisualLeakDetector::GlobalDisableLeakDetection () @@ -4435,13 +4444,15 @@ void VisualLeakDetector::GlobalDisableLeakDetection () return; } + m_optionsLock.Enter(); m_options |= VLD_OPT_START_DISABLED; + m_optionsLock.Leave(); // Disable memory leak detection for all threads. - CriticalSectionLocker cs(m_tlslock); + CriticalSectionLocker cstls(m_tlsLock); TlsMap::Iterator tlsit; - for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - (*tlsit).second->oldflags = (*tlsit).second->flags; + for (tlsit = m_tlsMap->begin(); tlsit != m_tlsMap->end(); ++tlsit) { + (*tlsit).second->oldFlags = (*tlsit).second->flags; (*tlsit).second->flags &= ~VLD_TLS_ENABLED; (*tlsit).second->flags |= VLD_TLS_DISABLED; } @@ -4454,14 +4465,16 @@ void VisualLeakDetector::GlobalEnableLeakDetection () return; } + m_optionsLock.Enter(); m_options &= ~VLD_OPT_START_DISABLED; m_status &= ~VLD_STATUS_NEVER_ENABLED; + m_optionsLock.Leave(); // Enable memory leak detection for all threads. - CriticalSectionLocker cs(m_tlslock); + CriticalSectionLocker cstls(m_tlsLock); TlsMap::Iterator tlsit; - for (tlsit = m_tlsmap->begin(); tlsit != m_tlsmap->end(); ++tlsit) { - (*tlsit).second->oldflags = (*tlsit).second->flags; + for (tlsit = m_tlsMap->begin(); tlsit != m_tlsMap->end(); ++tlsit) { + (*tlsit).second->oldFlags = (*tlsit).second->flags; (*tlsit).second->flags &= ~VLD_TLS_DISABLED; (*tlsit).second->flags |= VLD_TLS_ENABLED; } @@ -4473,6 +4486,7 @@ CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_IN UINT32 VisualLeakDetector::GetOptions() { + CriticalSectionLocker cs(m_optionsLock); return m_options & OptionsMask; } @@ -4483,13 +4497,14 @@ void VisualLeakDetector::SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT return; } + CriticalSectionLocker cs(m_optionsLock); m_options &= ~OptionsMask; // clear used bits m_options |= option_mask & OptionsMask; - m_maxdatadump = maxDataDump; - m_maxtraceframes = maxTraceFrames; - if (m_maxtraceframes < 1) { - m_maxtraceframes = VLD_DEFAULT_MAX_TRACE_FRAMES; + m_maxDataDump = maxDataDump; + m_maxTraceFrames = maxTraceFrames; + if (m_maxTraceFrames < 1) { + m_maxTraceFrames = VLD_DEFAULT_MAX_TRACE_FRAMES; } m_options |= option_mask & VLD_OPT_START_DISABLED; @@ -4504,8 +4519,9 @@ void VisualLeakDetector::SetModulesList(CONST WCHAR *modules, BOOL includeModule return; } - wcsncpy_s(m_forcedmodulelist, MAXMODULELISTLENGTH, modules, _TRUNCATE); - _wcslwr_s(m_forcedmodulelist, MAXMODULELISTLENGTH); + CriticalSectionLocker cs(m_optionsLock); + wcsncpy_s(m_forcedModuleList, MAXMODULELISTLENGTH, modules, _TRUNCATE); + _wcslwr_s(m_forcedModuleList, MAXMODULELISTLENGTH); if (includeModules) m_options |= VLD_OPT_MODULE_LIST_INCLUDE; else @@ -4520,7 +4536,8 @@ bool VisualLeakDetector::GetModulesList(WCHAR *modules, UINT size) return true; } - wcsncpy_s(modules, size, m_forcedmodulelist, _TRUNCATE); + CriticalSectionLocker cs(m_optionsLock); + wcsncpy_s(modules, size, m_forcedModuleList, _TRUNCATE); return (m_options & VLD_OPT_MODULE_LIST_INCLUDE) > 0; } @@ -4528,11 +4545,12 @@ void VisualLeakDetector::GetReportFilename(WCHAR *filename) { if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. - m_reportfilepath[0] = '\0'; + m_reportFilePath[0] = '\0'; return; } - wcsncpy_s(filename, MAX_PATH, m_reportfilepath, _TRUNCATE); + CriticalSectionLocker cs(m_optionsLock); + wcsncpy_s(filename, MAX_PATH, m_reportFilePath, _TRUNCATE); } void VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filename) @@ -4542,13 +4560,14 @@ void VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filen return; } + CriticalSectionLocker cs(m_optionsLock); m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits m_options |= option_mask & VLD_OPT_REPORT_TO_DEBUGGER; if ( (option_mask & VLD_OPT_REPORT_TO_FILE) && ( filename != NULL )) { - wcsncpy_s(m_reportfilepath, MAX_PATH, filename, _TRUNCATE); + wcsncpy_s(m_reportFilePath, MAX_PATH, filename, _TRUNCATE); m_options |= option_mask & VLD_OPT_REPORT_TO_FILE; } m_options |= option_mask & VLD_OPT_REPORT_TO_STDOUT; @@ -4563,59 +4582,79 @@ void VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filen } if (m_options & VLD_OPT_REPORT_TO_FILE) { - SetupReporting(); + setupReporting(); + } + else if ( m_reportFile ) { //Close the previous report file if needed. + fclose(m_reportFile); + m_reportFile = NULL; + } +} + +int VisualLeakDetector::SetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook) +{ + if (m_options & VLD_OPT_VLDOFF || pfnNewHook == NULL) { + // VLD has been turned off. + return -1; } - else if ( m_reportfile ) { //Close the previous report file if needed. - fclose(m_reportfile); - m_reportfile = NULL; + CriticalSectionLocker cs(m_optionsLock); + if (mode == VLD_RPTHOOK_INSTALL) + { + ReportHookSet::Iterator it = g_pReportHooks->insert(pfnNewHook); + return (it != g_pReportHooks->end()) ? 0 : -1; + } + else if (mode == VLD_RPTHOOK_REMOVE) + { + g_pReportHooks->erase(pfnNewHook); + return 0; } + return -1; } -void VisualLeakDetector::SetupReporting() +void VisualLeakDetector::setupReporting() { WCHAR bom = BOM; // Unicode byte-order mark. //Close the previous report file if needed. - if ( m_reportfile ) - fclose(m_reportfile); + if ( m_reportFile ) + fclose(m_reportFile); // Reporting to file enabled. if (m_options & VLD_OPT_UNICODE_REPORT) { // Unicode data encoding has been enabled. Write the byte-order // mark before anything else gets written to the file. Open the // file for binary writing. - if (_wfopen_s(&m_reportfile, m_reportfilepath, L"wb") == EINVAL) { + if (_wfopen_s(&m_reportFile, m_reportFilePath, L"wb") == EINVAL) { // Couldn't open the file. - m_reportfile = NULL; + m_reportFile = NULL; } else { - fwrite(&bom, sizeof(WCHAR), 1, m_reportfile); - setreportencoding(unicode); + fwrite(&bom, sizeof(WCHAR), 1, m_reportFile); + SetReportEncoding(unicode); } } else { // Open the file in text mode for ASCII output. - if (_wfopen_s(&m_reportfile, m_reportfilepath, L"w") == EINVAL) { + if (_wfopen_s(&m_reportFile, m_reportFilePath, L"w") == EINVAL) { // Couldn't open the file. - m_reportfile = NULL; + m_reportFile = NULL; } else { - setreportencoding(ascii); + SetReportEncoding(ascii); } } - if (m_reportfile == NULL) { - report(L"WARNING: Visual Leak Detector: Couldn't open report file for writing: %s\n" - L" The report will be sent to the debugger instead.\n", m_reportfilepath); + if (m_reportFile == NULL) { + Report(L"WARNING: Visual Leak Detector: Couldn't open report file for writing: %s\n" + L" The report will be sent to the debugger instead.\n", m_reportFilePath); } else { // Set the "report" function to write to the file. - setreportfile(m_reportfile, m_options & VLD_OPT_REPORT_TO_DEBUGGER, m_options & VLD_OPT_REPORT_TO_STDOUT); + SetReportFile(m_reportFile, m_options & VLD_OPT_REPORT_TO_DEBUGGER, m_options & VLD_OPT_REPORT_TO_STDOUT); } } void VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) { - BlockMap& blockmap = heapinfo->blockmap; + BlockMap& blockmap = heapinfo->blockMap; for (BlockMap::Iterator blockit = blockmap.begin(); blockit != blockmap.end(); ++blockit) { // Found a block which is still in the BlockMap. We've identified a @@ -4649,9 +4688,9 @@ void VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) } // Dump the call stack. - if (info->callstack) + if (info->callStack) { - info->callstack->Resolve(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + info->callStack->resolve(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); } } } @@ -4662,8 +4701,8 @@ void VisualLeakDetector::ResolveCallstacks() return; // Generate the Callstacks early - CriticalSectionLocker cs(m_heapmaplock); - for (HeapMap::Iterator heapiter = m_heapmap->begin(); heapiter != m_heapmap->end(); ++heapiter) + CriticalSectionLocker cs(m_heapMapLock); + for (HeapMap::Iterator heapiter = m_heapMap->begin(); heapiter != m_heapMap->end(); ++heapiter) { HANDLE heap = (*heapiter).first; UNREFERENCED_PARAMETER(heap); diff --git a/vld.h b/vld.h index b576df38..1c368a08 100644 --- a/vld.h +++ b/vld.h @@ -251,6 +251,18 @@ __declspec(dllimport) BOOL VLDGetModulesList(WCHAR *modules, UINT size); // __declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR *filename); +// VLDSetReportHook - Update the report options via function call rather than INI file. +// +// mode: Only the following flags are checked +// +// pfnNewHook: maximum number of user-data bytes to dump for each leaked block. +// +// Return Value: +// +// None. +// +__declspec(dllimport) int VLDSetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook); + // VLDResolveCallstacks - Performs symbol resolution for all saved extent CallStack's that have // been tracked by Visual Leak Detector. This function is necessary for applications that // dynamically load and unload modules, and through which memory leaks might be included. @@ -282,6 +294,7 @@ __declspec(dllexport) void VLDResolveCallstacks(); #define VLDGetOptions() 0 #define VLDGetReportFilename(a) #define VLDSetOptions(a, b, c) +#define VLDSetReportHook(a, b) #define VLDSetModulesList(a) #define VLDGetModulesList(a, b) FALSE #define VLDSetReportOptions(a, b) diff --git a/vld.rc b/vld.rc index 25f28461..857fdb0f 100755 --- a/vld.rc +++ b/vld.rc @@ -1,6 +1,7 @@ // Microsoft Visual C++ generated resource script. // #include "resource.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -53,8 +54,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,1,0 - PRODUCTVERSION 2,1,1,0 + FILEVERSION VERSION_NUMBER + PRODUCTVERSION VERSION_NUMBER FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x3L @@ -70,16 +71,16 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Visual Leak Detector DLL" - VALUE "FileVersion", "2.1.1.0" + VALUE "FileVersion", VERSION_STRING VALUE "InternalName", "vld" - VALUE "LegalCopyright", "Copyright (C) 2005-2011" + VALUE "LegalCopyright", VERSION_COPYRIGHT #ifndef WIN64 VALUE "OriginalFilename", "vld_x86.dll" #else VALUE "OriginalFilename", "vld_x64.dll" #endif VALUE "ProductName", "Visual Leak Detector" - VALUE "ProductVersion", "2.1.1.0" + VALUE "ProductVersion", VERSION_STRING END END BLOCK "VarFileInfo" diff --git a/vld.vcxproj b/vld.vcxproj index 0276d66c..d5ade2ac 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -91,7 +91,7 @@ Disabled - %(AdditionalIncludeDirectories) + setup;%(AdditionalIncludeDirectories) _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -116,6 +116,9 @@ copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + + setup + @@ -123,7 +126,7 @@ Disabled - %(AdditionalIncludeDirectories) + setup;%(AdditionalIncludeDirectories) _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -150,6 +153,7 @@ _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + setup @@ -157,7 +161,7 @@ Full Speed true - %(AdditionalIncludeDirectories) + setup;%(AdditionalIncludeDirectories) NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) true MultiThreaded @@ -184,6 +188,9 @@ copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + + setup + @@ -193,7 +200,7 @@ Full Speed true - %(AdditionalIncludeDirectories) + setup;%(AdditionalIncludeDirectories) NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) true MultiThreaded @@ -225,6 +232,7 @@ _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + setup @@ -247,9 +255,9 @@ - + diff --git a/vld.vcxproj.filters b/vld.vcxproj.filters index 8b7a6cbf..50636a22 100644 --- a/vld.vcxproj.filters +++ b/vld.vcxproj.filters @@ -80,7 +80,7 @@ Header Files - + Header Files diff --git a/vld_def.h b/vld_def.h index e4250858..af36a717 100644 --- a/vld_def.h +++ b/vld_def.h @@ -36,5 +36,9 @@ #define VLD_OPT_VLDOFF 0x0400 // If set, VLD will be completely deactivated. It will not attach to any modules. #define VLD_OPT_REPORT_TO_STDOUT 0x0800 // If set, the memory leak report is sent to stdout. #define VLD_OPT_SKIP_HEAPFREE_LEAKS 0x1000 // If set, VLD skip HeapFree memory leaks. -#define VLD_OPT_VALIDATE_HEAPFREE 0x2000 // If set, VLD verfies and reports heap consistency for HeapFree calls. +#define VLD_OPT_VALIDATE_HEAPFREE 0x2000 // If set, VLD verifies and reports heap consistency for HeapFree calls. +#define VLD_RPTHOOK_INSTALL 0 +#define VLD_RPTHOOK_REMOVE 1 + +typedef int (__cdecl * VLD_REPORT_HOOK)(int reportType, const wchar_t *message, int *returnValue); diff --git a/vldapi.cpp b/vldapi.cpp index 3d4bbcc4..23ee3063 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -28,7 +28,7 @@ #include "vldheap.h" // Provides internal new and delete operators. // Imported global variables. -extern VisualLeakDetector vld; +extern VisualLeakDetector g_vld; //////////////////////////////////////////////////////////////////////////////// // @@ -39,92 +39,97 @@ extern "C" { __declspec(dllexport) void VLDDisable () { - vld.DisableLeakDetection(); + g_vld.DisableLeakDetection(); } __declspec(dllexport) void VLDEnable () { - vld.EnableLeakDetection(); + g_vld.EnableLeakDetection(); } __declspec(dllexport) void VLDRestore () { - vld.RestoreLeakDetectionState(); + g_vld.RestoreLeakDetectionState(); } __declspec(dllexport) void VLDGlobalDisable () { - vld.GlobalDisableLeakDetection(); + g_vld.GlobalDisableLeakDetection(); } __declspec(dllexport) void VLDGlobalEnable () { - vld.GlobalEnableLeakDetection(); + g_vld.GlobalEnableLeakDetection(); } __declspec(dllexport) UINT VLDReportLeaks () { - return (UINT)vld.ReportLeaks(); + return (UINT)g_vld.ReportLeaks(); } __declspec(dllexport) UINT VLDGetLeaksCount () { - return vld.GetLeaksCount(); + return g_vld.GetLeaksCount(); } __declspec(dllexport) void VLDMarkAllLeaksAsReported () { - vld.MarkAllLeaksAsReported(); + g_vld.MarkAllLeaksAsReported(); } __declspec(dllexport) void VLDRefreshModules() { - vld.RefreshModules(); + g_vld.RefreshModules(); } __declspec(dllexport) void VLDEnableModule(HMODULE module) { - vld.EnableModule(module); + g_vld.EnableModule(module); } __declspec(dllexport) void VLDDisableModule(HMODULE module) { - vld.DisableModule(module); + g_vld.DisableModule(module); } __declspec(dllexport) UINT32 VLDGetOptions() { - return vld.GetOptions(); + return g_vld.GetOptions(); } __declspec(dllexport) void VLDGetReportFilename(WCHAR *filename) { - vld.GetReportFilename(filename); + g_vld.GetReportFilename(filename); } __declspec(dllexport) void VLDSetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames) { - vld.SetOptions(option_mask, maxDataDump, maxTraceFrames); + g_vld.SetOptions(option_mask, maxDataDump, maxTraceFrames); +} + +__declspec(dllexport) int VLDSetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook) +{ + return g_vld.SetReportHook(mode, pfnNewHook); } __declspec(dllexport) void VLDSetModulesList(CONST WCHAR *modules, BOOL includeModules) { - vld.SetModulesList(modules, includeModules); + g_vld.SetModulesList(modules, includeModules); } __declspec(dllexport) BOOL VLDGetModulesList(WCHAR *modules, UINT size) { - return vld.GetModulesList(modules, size); + return g_vld.GetModulesList(modules, size); } __declspec(dllexport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR *filename) { - vld.SetReportOptions(option_mask,filename); + g_vld.SetReportOptions(option_mask,filename); } __declspec(dllexport) void VLDResolveCallstacks() { - vld.ResolveCallstacks(); + g_vld.ResolveCallstacks(); } } diff --git a/vldheap.cpp b/vldheap.cpp index 8e1de876..bda2d0ea 100644 --- a/vldheap.cpp +++ b/vldheap.cpp @@ -30,65 +30,13 @@ #undef new // Do not map "new" to VLD's new operator in this file // Global variables. -vldblockheader_t *g_vldblocklist = NULL; // List of internally allocated blocks on VLD's private heap. -HANDLE g_vldheap; // VLD's private heap. -CriticalSection g_vldheaplock; // Serializes access to VLD's private heap. +vldblockheader_t *g_vldBlockList = NULL; // List of internally allocated blocks on VLD's private heap. +HANDLE g_vldHeap; // VLD's private heap. +CriticalSection g_vldHeapLock; // Serializes access to VLD's private heap. // Local helper functions. -static inline void vlddelete (void *block); static inline void* vldnew (size_t size, const char *file, int line); - -// scalar delete operator - Delete operator used to free internally used memory -// back to VLD's private heap. -// -// - block (IN): Pointer to the scalar memory block to free. -// -// Return Value: -// -// None. -// -void operator delete (void *block) -{ - vlddelete(block); -} - -// vector delete operator - Delete operator used to free internally used memory -// back to VLD's private heap. -// -// - block (IN): Pointer to the vector memory block to free. -// -// Return Value: -// -// None. -// -void operator delete [] (void *block) -{ - vlddelete(block); -} - -// scalar delete operator - Delete operator used to free memory partially -// allocated by new in the event that the corresponding new operator throws -// an exception. -// -// Note: This version of the delete operator should never be called directly. -// The compiler automatically generates calls to this function as needed. -// -void operator delete (void *block, const char *, int) -{ - vlddelete(block); -} - -// vector delete operator - Delete operator used to free memory partially -// allocated by new in the event that the corresponding new operator throws -// an exception. -// -// Note: This version of the delete operator should never be called directly. -// The compiler automatically generates calls to this function as needed. -// -void operator delete [] (void *block, const char *, int) -{ - vlddelete(block); -} +static inline void vlddelete (void *block); // scalar new operator - New operator used to allocate a scalar memory block // from VLD's private heap. @@ -132,40 +80,56 @@ void* operator new [] (size_t size, const char *file, int line) return vldnew(size, file, line); } -// vlddelete - Local helper function that actually frees memory back to VLD's -// private heap. +// scalar delete operator - Delete operator used to free internally used memory +// back to VLD's private heap. // -// - block (IN): Pointer to a memory block being freed. +// - block (IN): Pointer to the scalar memory block to free. // // Return Value: // // None. // -void vlddelete (void *block) +void operator delete (void *block) { - if (block == NULL) - return; - - BOOL freed; - vldblockheader_t *header = VLDBLOCKHEADER((LPVOID)block); + vlddelete(block); +} - // Unlink the block from the block list. - g_vldheaplock.Enter(); - if (header->prev) { - header->prev->next = header->next; - } - else { - g_vldblocklist = header->next; - } +// vector delete operator - Delete operator used to free internally used memory +// back to VLD's private heap. +// +// - block (IN): Pointer to the vector memory block to free. +// +// Return Value: +// +// None. +// +void operator delete [] (void *block) +{ + vlddelete(block); +} - if (header->next) { - header->next->prev = header->prev; - } - g_vldheaplock.Leave(); +// scalar delete operator - Delete operator used to free memory partially +// allocated by new in the event that the corresponding new operator throws +// an exception. +// +// Note: This version of the delete operator should never be called directly. +// The compiler automatically generates calls to this function as needed. +// +void operator delete (void *block, const char *, int) +{ + vlddelete(block); +} - // Free the block. - freed = RtlFreeHeap(g_vldheap, 0x0, header); - assert(freed != FALSE); +// vector delete operator - Delete operator used to free memory partially +// allocated by new in the event that the corresponding new operator throws +// an exception. +// +// Note: This version of the delete operator should never be called directly. +// The compiler automatically generates calls to this function as needed. +// +void operator delete [] (void *block, const char *, int) +{ + vlddelete(block); } // vldnew - Local helper function that actually allocates memory from VLD's @@ -188,7 +152,7 @@ void vlddelete (void *block) // void* vldnew (size_t size, const char *file, int line) { - vldblockheader_t *header = (vldblockheader_t*)RtlAllocateHeap(g_vldheap, 0x0, size + sizeof(vldblockheader_t)); + vldblockheader_t *header = (vldblockheader_t*)RtlAllocateHeap(g_vldHeap, 0x0, size + sizeof(vldblockheader_t)); static SIZE_T serialnumber = 0; if (header == NULL) { @@ -199,19 +163,55 @@ void* vldnew (size_t size, const char *file, int line) // Fill in the block's header information. header->file = file; header->line = line; - header->serialnumber = serialnumber++; + header->serialNumber = serialnumber++; header->size = size; // Link the block into the block list. - g_vldheaplock.Enter(); - header->next = g_vldblocklist; + g_vldHeapLock.Enter(); + header->next = g_vldBlockList; if (header->next != NULL) { header->next->prev = header; } header->prev = NULL; - g_vldblocklist = header; - g_vldheaplock.Leave(); + g_vldBlockList = header; + g_vldHeapLock.Leave(); // Return a pointer to the beginning of the data section of the block. return (void*)VLDBLOCKDATA(header); } + +// vlddelete - Local helper function that actually frees memory back to VLD's +// private heap. +// +// - block (IN): Pointer to a memory block being freed. +// +// Return Value: +// +// None. +// +void vlddelete (void *block) +{ + if (block == NULL) + return; + + BOOL freed; + vldblockheader_t *header = VLDBLOCKHEADER((LPVOID)block); + + // Unlink the block from the block list. + g_vldHeapLock.Enter(); + if (header->prev) { + header->prev->next = header->next; + } + else { + g_vldBlockList = header->next; + } + + if (header->next) { + header->next->prev = header->prev; + } + g_vldHeapLock.Leave(); + + // Free the block. + freed = RtlFreeHeap(g_vldHeap, 0x0, header); + assert(freed != FALSE); +} diff --git a/vldheap.h b/vldheap.h index ed5ba0db..1df165b6 100644 --- a/vldheap.h +++ b/vldheap.h @@ -35,12 +35,12 @@ Applications should never include this header." // Memory block header structure used internally by the debug CRT. All blocks // allocated by the CRT are allocated from the CRT heap and, in debug mode, they -// have this header prepended to them (there's also a trailer appended at the +// have this header pretended to them (there's also a trailer appended at the // end, but we're not interested in that). -typedef struct crtdbgblockheader_s +struct crtdbgblockheader_t { - struct crtblockheader_s *next; // Pointer to the next block in the list of blocks allocated from the CRT heap. - struct crtblockheader_s *prev; // Pointer to the previous block in the list of blocks allocated from the CRT heap. + struct crtdbgblockheader_t *next; // Pointer to the next block in the list of blocks allocated from the CRT heap. + struct crtdbgblockheader_t *prev; // Pointer to the previous block in the list of blocks allocated from the CRT heap. char *file; // Source file where this block was allocated. int line; // Line of code, within the above file, where this block was allocated. #ifdef _WIN64 @@ -57,23 +57,23 @@ typedef struct crtdbgblockheader_s #define CRT_USE_CLIENT 4 // This block is a specially tagged block with special use defined by the user application. long request; // This block's "request" number. Basically a serial number. unsigned char gap [GAPSIZE]; // No-man's land buffer zone, for buffer overrun/underrun checking. -} crtdbgblockheader_t; +}; // Macro to strip off any sub-type information stored in a block's "use type". #define CRT_USE_TYPE(use) (use & 0xFFFF) // Memory block header structure used internally by VLD. All internally // allocated blocks are allocated from VLD's private heap and have this header -// prepended to them. -typedef struct vldblockheader_s +// pretended to them. +struct vldblockheader_t { - struct vldblockheader_s *next; // Pointer to the next block in the list of internally allocated blocks. - struct vldblockheader_s *prev; // Pointer to the preceding block in the list of internally allocated blocks. + struct vldblockheader_t *next; // Pointer to the next block in the list of internally allocated blocks. + struct vldblockheader_t *prev; // Pointer to the preceding block in the list of internally allocated blocks. const char *file; // Name of the file where this block was allocated. int line; // Line number within the above file where this block was allocated. size_t size; // The size of this memory block, not including this header. - size_t serialnumber; // Each block is assigned a unique serial number, starting from zero. -} vldblockheader_t; + size_t serialNumber; // Each block is assigned a unique serial number, starting from zero. +}; // Data-to-Header and Header-to-Data conversion #define CRTDBGBLOCKHEADER(d) (crtdbgblockheader_t*)(((PBYTE)d) - sizeof(crtdbgblockheader_t)) diff --git a/vldint.h b/vldint.h index fb3f656b..675a5635 100644 --- a/vldint.h +++ b/vldint.h @@ -32,6 +32,7 @@ #include #include #include "vld_def.h" +#include "version.h" #include "callstack.h" // Provides a custom class for handling call stacks. #include "map.h" // Provides a custom STL-like map template. #include "ntapi.h" // Provides access to NT APIs. @@ -42,7 +43,6 @@ #define SELFTESTTEXTA "Memory Leak Self-Test" #define SELFTESTTEXTW L"Memory Leak Self-Test" #define VLDREGKEYPRODUCT L"Software\\Visual Leak Detector" -#define VLDVERSION L"2.2" #ifndef WIN64 #define VLDDLL "vld_x86.dll" #else @@ -88,8 +88,8 @@ typedef void* (__cdecl *_aligned_offset_recalloc_dbg_t) (void *, size_t, size_t, // a BlockMap which maps each of these structures to its corresponding memory // block. struct blockinfo_t { - CallStack *callstack; - SIZE_T serialnumber; + CallStack *callStack; + SIZE_T serialNumber; SIZE_T size; bool reported; }; @@ -101,7 +101,7 @@ typedef Map BlockMap; // this is used for mapping heaps to all of the blocks allocated from those // heaps. struct heapinfo_t { - BlockMap blockmap; // Map of all blocks allocated from this heap. + BlockMap blockMap; // Map of all blocks allocated from this heap. UINT32 flags; // Heap status flags: #define VLD_HEAP_CRT_DBG 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). }; @@ -115,7 +115,7 @@ typedef Map HeapMap; struct moduleinfo_t { BOOL operator < (const struct moduleinfo_t& other) const { - if (addrhigh < other.addrlow) { + if (addrHigh < other.addrLow) { return TRUE; } else { @@ -123,8 +123,8 @@ struct moduleinfo_t { } } - SIZE_T addrlow; // Lowest address within the module's virtual address space (i.e. base address). - SIZE_T addrhigh; // Highest address within the module's virtual address space (i.e. base + size). + SIZE_T addrLow; // Lowest address within the module's virtual address space (i.e. base address). + SIZE_T addrHigh; // Highest address within the module's virtual address space (i.e. base + size). UINT32 flags; // Module flags: #define VLD_MODULE_EXCLUDED 0x1 // If set, this module is excluded from leak detection. #define VLD_MODULE_SYMBOLSLOADED 0x2 // If set, this module's debug symbols have been loaded. @@ -135,6 +135,8 @@ struct moduleinfo_t { // ModuleSets store information about modules loaded in the process. typedef Set ModuleSet; +typedef Set ReportHookSet; + // Thread local storage structure. Every thread in the process gets its own copy // of this structure. Thread specific information, such as the current leak // detection status (enabled or disabled) and the address that initiated the @@ -145,10 +147,10 @@ struct tls_t { #define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. #define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. #define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. - UINT32 oldflags; // Thread-local status old flags - BOOL blockprocessed; // Internal diagnostic feature - DWORD threadid; // Thread ID of the thread that owns this TLS structure. - CallStack** ppcallstack; // Memory block callstack pointer. + UINT32 oldFlags; // Thread-local status old flags + BOOL blockProcessed; // Internal diagnostic feature + DWORD threadId; // Thread ID of the thread that owns this TLS structure. + CallStack** ppCallStack; // Memory block callstack pointer. }; // The TlsSet allows VLD to keep track of all thread local storage structures @@ -255,6 +257,7 @@ class VisualLeakDetector : public IMalloc VOID GetReportFilename(WCHAR *filename); VOID SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); VOID SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); + int SetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook); VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); bool GetModulesList(WCHAR *modules, UINT size); VOID ResolveCallstacks(); @@ -266,37 +269,37 @@ class VisualLeakDetector : public IMalloc //////////////////////////////////////////////////////////////////////////////// // Private leak detection functions - see each function definition for details. //////////////////////////////////////////////////////////////////////////////// - VOID attachtoloadedmodules (ModuleSet *newmodules); - LPWSTR buildsymbolsearchpath (); + VOID attachToLoadedModules (ModuleSet *newmodules); + LPWSTR buildSymbolSearchPath (); VOID configure (); BOOL enabled (); - SIZE_T eraseduplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); - tls_t* gettls (); - VOID mapblock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack); - VOID mapheap (HANDLE heap); - VOID remapblock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, + SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); + tls_t* getTls (); + VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack); + VOID mapHeap (HANDLE heap); + VOID remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack, const context_t &context); - VOID reportconfig (); - SIZE_T getleakscount (heapinfo_t* heapinfo); - SIZE_T reportheapleaks (HANDLE heap); - SIZE_T reportleaks( heapinfo_t* heapinfo, Set &aggregatedLeaks ); - VOID markallleaksasreported (heapinfo_t* heapinfo); - VOID unmapblock (HANDLE heap, LPCVOID mem, const context_t &context); - VOID unmapheap (HANDLE heap); + VOID reportConfig (); + SIZE_T reportHeapLeaks (HANDLE heap); + SIZE_T getLeaksCount (heapinfo_t* heapinfo); + SIZE_T reportLeaks( heapinfo_t* heapinfo, Set &aggregatedLeaks ); + VOID markAllLeaksAsReported (heapinfo_t* heapinfo); + VOID unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context); + VOID unmapHeap (HANDLE heap); void resolveStacks(heapinfo_t* heapinfo); // Static functions (callbacks) - static BOOL __stdcall addloadedmodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - static BOOL __stdcall detachfrommodule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + static BOOL __stdcall addLoadedModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + static BOOL __stdcall detachFromModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); // Utils - static bool IsModuleExcluded (UINT_PTR returnaddress); - blockinfo_t* FindAllocedBlock(LPCVOID, __out HANDLE& heap); - static void getcallstack( CallStack **&ppcallstack, context_t &context ); - static inline void firstalloccall(tls_t * tls); - void SetupReporting(); - void CheckInternalMemoryLeaks(); - bool WaitForAllVLDThreads(); + static bool isModuleExcluded (UINT_PTR returnaddress); + blockinfo_t* findAllocedBlock(LPCVOID, __out HANDLE& heap); + static void getCallStack( CallStack **&ppcallstack, context_t &context ); + static inline void firstAllocCall(tls_t * tls); + void setupReporting(); + void checkInternalMemoryLeaks(); + bool waitForAllVLDThreads(); //////////////////////////////////////////////////////////////////////////////// // IAT replacement functions - see each function definition for details. @@ -329,40 +332,41 @@ class VisualLeakDetector : public IMalloc //////////////////////////////////////////////////////////////////////////////// // Private data //////////////////////////////////////////////////////////////////////////////// - WCHAR m_forcedmodulelist [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. - HeapMap *m_heapmap; // Map of all active heaps in the process. - IMalloc *m_imalloc; // Pointer to the system implementation of IMalloc. - - LONG m_requestcurr; // Current request number. - SIZE_T m_totalalloc; // Grand total - sum of all allocations. - SIZE_T m_curalloc; // Total amount currently allocated. - SIZE_T m_maxalloc; // Largest ever allocated at once. - ModuleSet *m_loadedmodules; // Contains information about all modules loaded in the process. - CriticalSection m_loaderlock; // Serializes the attachment of newly loaded modules. - CriticalSection m_heapmaplock; // Serializes access to the heap and block maps. - SIZE_T m_maxdatadump; // Maximum number of user-data bytes to dump for each leaked block. - UINT32 m_maxtraceframes; // Maximum number of frames per stack trace for each leaked block. - CriticalSection m_moduleslock; // Protects accesses to the "loaded modules" ModuleSet. + WCHAR m_forcedModuleList [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. + HeapMap *m_heapMap; // Map of all active heaps in the process. + IMalloc *m_iMalloc; // Pointer to the system implementation of IMalloc. + + LONG m_requestCurr; // Current request number. + SIZE_T m_totalAlloc; // Grand total - sum of all allocations. + SIZE_T m_curAlloc; // Total amount currently allocated. + SIZE_T m_maxAlloc; // Largest ever allocated at once. + ModuleSet *m_loadedModules; // Contains information about all modules loaded in the process. + CriticalSection m_loaderLock; // Serializes the attachment of newly loaded modules. + CriticalSection m_heapMapLock; // Serializes access to the heap and block maps. + SIZE_T m_maxDataDump; // Maximum number of user-data bytes to dump for each leaked block. + UINT32 m_maxTraceFrames; // Maximum number of frames per stack trace for each leaked block. + CriticalSection m_modulesLock; // Protects accesses to the "loaded modules" ModuleSet. + CriticalSection m_optionsLock; // Serializes access to the heap and block maps. UINT32 m_options; // Configuration options. static patchentry_t m_kernelbasePatch []; static patchentry_t m_kernel32Patch []; static patchentry_t m_ntdllPatch []; static patchentry_t m_ole32Patch []; - static moduleentry_t m_patchtable []; // Table of imports patched for attaching VLD to other modules. - FILE *m_reportfile; // File where the memory leak report may be sent to. - WCHAR m_reportfilepath [MAX_PATH]; // Full path and name of file to send memory leak report to. - const char *m_selftestfile; // Filename where the memory leak self-test block is leaked. - int m_selftestline; // Line number where the memory leak self-test block is leaked. + static moduleentry_t m_patchTable []; // Table of imports patched for attaching VLD to other modules. + FILE *m_reportFile; // File where the memory leak report may be sent to. + WCHAR m_reportFilePath [MAX_PATH]; // Full path and name of file to send memory leak report to. + const char *m_selfTestFile; // Filename where the memory leak self-test block is leaked. + int m_selfTestLine; // Line number where the memory leak self-test block is leaked. UINT32 m_status; // Status flags: #define VLD_STATUS_DBGHELPLINKED 0x1 // If set, the explicit dynamic link to the Debug Help Library succeeded. #define VLD_STATUS_INSTALLED 0x2 // If set, VLD was successfully installed. #define VLD_STATUS_NEVER_ENABLED 0x4 // If set, VLD started disabled, and has not yet been manually enabled. #define VLD_STATUS_FORCE_REPORT_TO_FILE 0x8 // If set, the leak report is being forced to a file. - DWORD m_tlsindex; // Thread-local storage index. - CriticalSection m_tlslock; // Protects accesses to the Set of TLS structures. - TlsMap *m_tlsmap; // Set of all all thread-local storage structres for the process. - HMODULE m_vldbase; // Visual Leak Detector's own module handle (base address). + DWORD m_tlsIndex; // Thread-local storage index. + CriticalSection m_tlsLock; // Protects accesses to the Set of TLS structures. + TlsMap *m_tlsMap; // Set of all thread-local storage structures for the process. + HMODULE m_vldBase; // Visual Leak Detector's own module handle (base address). typedef FARPROC __stdcall _GetProcAddressType(HMODULE module, LPCSTR procname); From fda1427e8f5549ddbbd99488835641ea763762aa Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 20 Jul 2011 21:50:52 +0000 Subject: [PATCH 114/321] Minor comment changes git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C69025 --- vld.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/vld.h b/vld.h index 1c368a08..d676374c 100644 --- a/vld.h +++ b/vld.h @@ -153,21 +153,25 @@ __declspec(dllimport) void VLDRefreshModules(); // VLDEnableModule - Enable Memory leak checking on the specified module. // +// module: module handle. +// // Return Value: // // None. // -__declspec(dllimport) void VLDEnableModule(HMODULE); +__declspec(dllimport) void VLDEnableModule(HMODULE module); // VLDDisableModule - Disable Memory leak checking on the specified module. // +// module: module handle. +// // Return Value: // // None. // -__declspec(dllimport) void VLDDisableModule(HMODULE); +__declspec(dllimport) void VLDDisableModule(HMODULE module); // VLDGetOptions - Return all current options. // @@ -251,15 +255,16 @@ __declspec(dllimport) BOOL VLDGetModulesList(WCHAR *modules, UINT size); // __declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR *filename); -// VLDSetReportHook - Update the report options via function call rather than INI file. +// VLDSetReportHook - Installs or uninstalls a client-defined reporting function by hooking it +// into the C run-time debug reporting process (debug version only). // -// mode: Only the following flags are checked +// mode: The action to take: VLD_RPTHOOK_INSTALL or VLD_RPTHOOK_REMOVE. // -// pfnNewHook: maximum number of user-data bytes to dump for each leaked block. +// pfnNewHook: Report hook to install or remove. // // Return Value: // -// None. +// int: 0 if success. // __declspec(dllimport) int VLDSetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook); From c6a20bbad1b923863cbf1fa957dcf5aa527bf2ba Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 20 Jul 2011 22:18:38 +0000 Subject: [PATCH 115/321] vld variable name in header fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C69026 --- vld.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vld.h b/vld.h index d676374c..ffd7826e 100644 --- a/vld.h +++ b/vld.h @@ -34,7 +34,7 @@ // Force a symbolic reference to the global VisualLeakDetector class object from // the DLL. This ensures that the DLL is loaded and linked with the program, // even if no code otherwise imports any of the DLL's exports. -#pragma comment(linker, "/include:__imp_?vld@@3VVisualLeakDetector@@A") +#pragma comment(linker, "/include:__imp_?g_vld@@3VVisualLeakDetector@@A") //////////////////////////////////////////////////////////////////////////////// // From 709db4bde6e359ef71c345eabd73564fcb2be2c0 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 20 Jul 2011 23:58:28 +0000 Subject: [PATCH 116/321] vld variable name fixed again git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C69028 --- vld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vld.cpp b/vld.cpp index 735f508c..db5d2838 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1045,7 +1045,7 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) continue; } - if (!FindImport((HMODULE)modulebase, m_vldBase, VLDDLL, "?vld@@3VVisualLeakDetector@@A")) + if (!FindImport((HMODULE)modulebase, m_vldBase, VLDDLL, "?g_vld@@3VVisualLeakDetector@@A")) { // This module does not import VLD. This means that none of the module's // sources #included vld.h. From 668e98b32e32023f0820cd36996e6d158b83be01 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Thu, 21 Jul 2011 21:48:56 +0000 Subject: [PATCH 117/321] Removed const specifier from VLD_REPORT_HOOK git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C69080 --- tests/dynamic_app/dynamic_app.cpp | 2 +- utility.cpp | 4 ++-- utility.h | 2 +- vld.h | 6 +++--- vld_def.h | 2 +- vldapi.cpp | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 24c2caf1..936b8448 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -135,7 +135,7 @@ void PrintUsage() wprintf(_T("\t - [OPTIONAL] Resolves callstacks before unloading the dynamic DLL.\n")); } -int __cdecl ReportHook(int /*reportHook*/, const wchar_t *message, int* /*returnValue*/) +int __cdecl ReportHook(int /*reportHook*/, wchar_t *message, int* /*returnValue*/) { OutputDebugString(message); return 1; diff --git a/utility.cpp b/utility.cpp index 7ec4bb97..0a482770 100644 --- a/utility.cpp +++ b/utility.cpp @@ -563,7 +563,7 @@ BOOL PatchModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tables return patched; } -int CallReportHook(int reportType, LPCWSTR message, int* hook_retval) +int CallReportHook(int reportType, LPWSTR message, int* hook_retval) { if (g_pReportHooks == NULL) return 0; @@ -588,7 +588,7 @@ int CallReportHook(int reportType, LPCWSTR message, int* hook_retval) // // None. // -VOID Print (LPCWSTR messagew) +VOID Print (LPWSTR messagew) { if (NULL == messagew) return; diff --git a/utility.h b/utility.h index 8c0acfac..a58fc791 100644 --- a/utility.h +++ b/utility.h @@ -122,7 +122,7 @@ VOID InsertReportDelay (); BOOL IsModulePatched (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); BOOL PatchImport (HMODULE importmodule, moduleentry_t *module); BOOL PatchModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); -VOID Print (LPCWSTR message); +VOID Print (LPWSTR message); VOID Report (LPCWSTR format, ...); VOID RestoreImport (HMODULE importmodule, moduleentry_t* module); VOID RestoreModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); diff --git a/vld.h b/vld.h index ffd7826e..653b41fb 100644 --- a/vld.h +++ b/vld.h @@ -179,7 +179,7 @@ __declspec(dllimport) void VLDDisableModule(HMODULE module); // // Mask of current options. // -__declspec(dllimport) UINT32 VLDGetOptions(); +__declspec(dllimport) UINT VLDGetOptions(); // VLDGetReportFilename - Return current report filename. // @@ -211,7 +211,7 @@ __declspec(dllimport) void VLDGetReportFilename(WCHAR *filename); // // None. // -__declspec(dllimport) void VLDSetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); +__declspec(dllimport) void VLDSetOptions(UINT option_mask, SIZE_T maxDataDump, UINT maxTraceFrames); // VLDSetModulesList - Set list of modules included/excluded in leak detection // depending on parameter "includeModules". @@ -253,7 +253,7 @@ __declspec(dllimport) BOOL VLDGetModulesList(WCHAR *modules, UINT size); // // None. // -__declspec(dllimport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR *filename); +__declspec(dllimport) void VLDSetReportOptions(UINT option_mask, CONST WCHAR *filename); // VLDSetReportHook - Installs or uninstalls a client-defined reporting function by hooking it // into the C run-time debug reporting process (debug version only). diff --git a/vld_def.h b/vld_def.h index af36a717..1fc828bf 100644 --- a/vld_def.h +++ b/vld_def.h @@ -41,4 +41,4 @@ #define VLD_RPTHOOK_INSTALL 0 #define VLD_RPTHOOK_REMOVE 1 -typedef int (__cdecl * VLD_REPORT_HOOK)(int reportType, const wchar_t *message, int *returnValue); +typedef int (__cdecl * VLD_REPORT_HOOK)(int reportType, wchar_t *message, int *returnValue); diff --git a/vldapi.cpp b/vldapi.cpp index 23ee3063..283dcfd5 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -69,7 +69,7 @@ __declspec(dllexport) UINT VLDReportLeaks () __declspec(dllexport) UINT VLDGetLeaksCount () { - return g_vld.GetLeaksCount(); + return (UINT)g_vld.GetLeaksCount(); } __declspec(dllexport) void VLDMarkAllLeaksAsReported () @@ -92,7 +92,7 @@ __declspec(dllexport) void VLDDisableModule(HMODULE module) g_vld.DisableModule(module); } -__declspec(dllexport) UINT32 VLDGetOptions() +__declspec(dllexport) UINT VLDGetOptions() { return g_vld.GetOptions(); } @@ -102,7 +102,7 @@ __declspec(dllexport) void VLDGetReportFilename(WCHAR *filename) g_vld.GetReportFilename(filename); } -__declspec(dllexport) void VLDSetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames) +__declspec(dllexport) void VLDSetOptions(UINT option_mask, SIZE_T maxDataDump, UINT maxTraceFrames) { g_vld.SetOptions(option_mask, maxDataDump, maxTraceFrames); } @@ -122,7 +122,7 @@ __declspec(dllexport) BOOL VLDGetModulesList(WCHAR *modules, UINT size) return g_vld.GetModulesList(modules, size); } -__declspec(dllexport) void VLDSetReportOptions(UINT32 option_mask, CONST WCHAR *filename) +__declspec(dllexport) void VLDSetReportOptions(UINT option_mask, CONST WCHAR *filename) { g_vld.SetReportOptions(option_mask,filename); } From 7536cdcb98db2a7c3ed31ef0748dd6f28dcc04a0 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Thu, 21 Jul 2011 23:58:21 +0000 Subject: [PATCH 118/321] Comments in utility.cpp updated git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C69082 --- utility.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/utility.cpp b/utility.cpp index 0a482770..301fabc6 100644 --- a/utility.cpp +++ b/utility.cpp @@ -188,7 +188,7 @@ DWORD FilterFunction(long) return EXCEPTION_CONTINUE_SEARCH; } -// findoriginalimportdescriptor - Determines if the specified module imports the named import +// FindOriginalImportDescriptor - Determines if the specified module imports the named import // from the named exporting module. // // - importmodule (IN): Handle (base address) of the module to be searched to @@ -201,7 +201,7 @@ DWORD FilterFunction(long) // // Returns pointer to descriptor. // -IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPCSTR exportmodulename) +IMAGE_IMPORT_DESCRIPTOR* FindOriginalImportDescriptor (HMODULE importmodule, LPCSTR exportmodulename) { IMAGE_IMPORT_DESCRIPTOR* idte = NULL; IMAGE_SECTION_HEADER* section = NULL; @@ -242,7 +242,7 @@ IMAGE_IMPORT_DESCRIPTOR* findoriginalimportdescriptor (HMODULE importmodule, LPC return idte; } -// findimport - Determines if the specified module imports the named import +// FindImport - Determines if the specified module imports the named import // from the named exporting module. // // - importmodule (IN): Handle (base address) of the module to be searched to @@ -269,7 +269,7 @@ BOOL FindImport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodule IMAGE_THUNK_DATA *iate; FARPROC import; - idte = findoriginalimportdescriptor(importmodule, exportmodulename); + idte = FindOriginalImportDescriptor(importmodule, exportmodulename); if (idte == NULL) return FALSE; @@ -302,7 +302,7 @@ BOOL FindImport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodule return FALSE; } -// findpatch - Determines if the specified module has been patched to use the +// FindPatch - Determines if the specified module has been patched to use the // specified replacement. // // - importmodule (IN): Handle (base address) of the module to be searched to @@ -324,7 +324,7 @@ BOOL FindPatch (HMODULE importmodule, moduleentry_t *module) { IMAGE_IMPORT_DESCRIPTOR *idte; - idte = findoriginalimportdescriptor(importmodule, module->exportModuleName); + idte = FindOriginalImportDescriptor(importmodule, module->exportModuleName); if (idte == NULL) return FALSE; @@ -354,7 +354,7 @@ BOOL FindPatch (HMODULE importmodule, moduleentry_t *module) return FALSE; } -// insertreportdelay - Sets the report function to sleep for a bit after each +// InsertReportDelay - Sets the report function to sleep for a bit after each // call to OutputDebugString, in order to allow the debugger to catch up. // // Return Value: @@ -366,7 +366,7 @@ VOID InsertReportDelay () s_reportDelay = TRUE; } -// moduleispatched - Checks to see if any of the imports listed in the specified +// IsModulePatched - Checks to see if any of the imports listed in the specified // patch table have been patched into the specified importmodule. // // - importmodule (IN): Handle (base address) of the module to be queried to @@ -401,7 +401,7 @@ BOOL IsModulePatched (HMODULE importmodule, moduleentry_t patchtable [], UINT ta return FALSE; } -// patchimport - Patches all future calls to an imported function, or references +// PatchImport - Patches all future calls to an imported function, or references // to an imported variable, through to a replacement function or variable. // Patching is done by replacing the import's address in the specified target // module's Import Address Table (IAT) with the address of the replacement @@ -525,7 +525,7 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) return result > 0; } -// patchmodule - Patches all imports listed in the supplied patch table, and +// PatchModule - Patches all imports listed in the supplied patch table, and // which are imported by the specified module, through to their respective // replacement functions. // @@ -576,7 +576,7 @@ int CallReportHook(int reportType, LPWSTR message, int* hook_retval) return 0; } -// print - Sends a message to the debugger for display +// Print - Sends a message to the debugger for display // and/or to a file. // // Note: A message longer than MAXREPORTLENGTH characters will be truncated @@ -638,7 +638,7 @@ VOID Print (LPWSTR messagew) } } -// report - Sends a printf-style formatted message to the debugger for display +// Report - Sends a printf-style formatted message to the debugger for display // and/or to a file. // // Note: A message longer than MAXREPORTLENGTH characters will be truncated @@ -667,8 +667,8 @@ VOID Report (LPCWSTR format, ...) Print(messagew); } -// restoreimport - Restores the IAT entry for an import previously patched via -// a call to "patchimport" to the original address of the import. +// RestoreImport - Restores the IAT entry for an import previously patched via +// a call to "PatchImport" to the original address of the import. // // - importmodule (IN): Handle (base address) of the target module for which // calls or references to the import should be restored. @@ -684,7 +684,7 @@ VOID Report (LPCWSTR format, ...) // import is exported by ordinal. // // - replacement (IN): Address of the function or variable which the import was -// previously patched through to via a call to "patchimport". +// previously patched through to via a call to "PatchImport". // // Return Value: // @@ -775,7 +775,7 @@ VOID RestoreImport (HMODULE importmodule, moduleentry_t* module) } } -// restoremodule - Restores all imports listed in the supplied patch table, and +// RestoreModule - Restores all imports listed in the supplied patch table, and // which are imported by the specified module, to their original functions. // // Note: If the specified module does not import any of the functions listed @@ -806,7 +806,7 @@ VOID RestoreModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tabl } } -// setreportencoding - Sets the output encoding of report messages to either +// SetReportEncoding - Sets the output encoding of report messages to either // ASCII (the default) or Unicode. // // - encoding (IN): Specifies either "ascii" or "unicode". @@ -828,7 +828,7 @@ VOID SetReportEncoding (encoding_e encoding) } } -// setreportfile - Sets a destination file to which all report messages should +// SetReportFile - Sets a destination file to which all report messages should // be sent. If this function is not called to set a destination file, then // report messages will be sent to the debugger instead of to a file. // @@ -868,7 +868,7 @@ VOID SetReportFile (FILE *file, BOOL copydebugger, BOOL tostdout) // LPWSTR AppendString (LPWSTR dest, LPCWSTR source) { - if ((source == NULL) || (wcslen(source) == 0)) + if ((source == NULL) || (source[0] == '\0')) { return dest; } @@ -880,7 +880,7 @@ LPWSTR AppendString (LPWSTR dest, LPCWSTR source) return new_str; } -// strtobool - Converts string values (e.g. "yes", "no", "on", "off") to boolean +// StrToBool - Converts string values (e.g. "yes", "no", "on", "off") to boolean // values. // // - s (IN): String value to convert. From 398f48bf65b6844dca8cfb4aa5028c29ea359387 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 22 Jul 2011 19:16:53 +0000 Subject: [PATCH 119/321] Macros names improved CreateThread replaced by _beginthreadex and other warnings (thanks to PVS-Strudio for warnings) git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C69128 --- callstack.cpp | 25 +++++++-------- callstack.h | 6 ++-- .../include/tut/tut_console_reporter.hpp | 2 +- map.h | 10 +++--- set.h | 12 +++---- tests/dynamic_app/ThreadTest.cpp | 7 +++-- tests/suite/testsuite.cpp | 11 ++++--- utility.cpp | 2 +- vld.cpp | 31 +++++++++---------- vldint.h | 2 +- 10 files changed, 52 insertions(+), 56 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 0b21339d..e67682d6 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -28,8 +28,6 @@ #include "vldheap.h" // Provides internal new and delete operators. #include "vldint.h" // Provides access to VLD internals. -#define MAXSYMBOLNAMELENGTH 256 - // Imported global variables. extern HANDLE g_currentProcess; extern HANDLE g_currentThread; @@ -42,7 +40,7 @@ extern VisualLeakDetector g_vld; // CallStack::CallStack () { - m_capacity = CALLSTACKCHUNKSIZE; + m_capacity = CALLSTACK_CHUNK_SIZE; m_size = 0; m_status = 0x0; m_store.next = NULL; @@ -113,7 +111,8 @@ BOOL CallStack::operator == (const CallStack &other) const const CallStack::chunk_t *chunk = &m_store; const CallStack::chunk_t *otherChunk = &other.m_store; while (prevChunk != m_topChunk) { - for (UINT32 index = 0; index < ((chunk == m_topChunk) ? m_topIndex : CALLSTACKCHUNKSIZE); index++) { + UINT32 size = (chunk == m_topChunk) ? m_topIndex : CALLSTACK_CHUNK_SIZE; + for (UINT32 index = 0; index < size; index++) { if (chunk->frames[index] != otherChunk->frames[index]) { // Found a mismatch. They are not equal. return FALSE; @@ -147,14 +146,14 @@ BOOL CallStack::operator == (const CallStack &other) const // UINT_PTR CallStack::operator [] (UINT32 index) const { - UINT32 chunknumber = index / CALLSTACKCHUNKSIZE; + UINT32 chunknumber = index / CALLSTACK_CHUNK_SIZE; const CallStack::chunk_t *chunk = &m_store; for (UINT32 count = 0; count < chunknumber; count++) { chunk = chunk->next; } - return chunk->frames[index % CALLSTACKCHUNKSIZE]; + return chunk->frames[index % CALLSTACK_CHUNK_SIZE]; } // clear - Resets the CallStack, returning it to a state where no frames have @@ -216,8 +215,7 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const IMAGEHLP_LINE64 sourceInfo = { 0 }; sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - const UINT32 symbolBufSize = sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1; - BYTE symbolBuffer [symbolBufSize] = { 0 }; + BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; WCHAR callingModuleName [MAX_PATH]; @@ -245,7 +243,7 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const // Initialize structures passed to the symbol handler. SYMBOL_INFO* functionInfo = (SYMBOL_INFO*)&symbolBuffer; functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functionInfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + functionInfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; // Try to get the name of the function containing this program // counter address. @@ -335,8 +333,7 @@ void CallStack::resolve(BOOL showInternalFrames) IMAGEHLP_LINE64 sourceInfo = { 0 }; sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - const UINT32 symbolBufSize = sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1; - BYTE symbolBuffer [symbolBufSize] = { 0 }; + BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; WCHAR callingModuleName [MAX_PATH] = L""; @@ -374,7 +371,7 @@ void CallStack::resolve(BOOL showInternalFrames) // Initialize structures passed to the symbol handler. SYMBOL_INFO* functionInfo = (SYMBOL_INFO*)&symbolBuffer; functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functionInfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + functionInfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; // Try to get the name of the function containing this program // counter address. @@ -477,9 +474,9 @@ VOID CallStack::push_back (const UINT_PTR programcounter) m_topChunk->next = chunk; m_topChunk = chunk; m_topIndex = 0; - m_capacity += CALLSTACKCHUNKSIZE; + m_capacity += CALLSTACK_CHUNK_SIZE; } - else if (m_topIndex >= CALLSTACKCHUNKSIZE) { + else if (m_topIndex >= CALLSTACK_CHUNK_SIZE) { // There is more capacity, but not in this chunk. Go to the next chunk. // Note that this only happens if this CallStack has previously been // cleared (clearing resets the data, but doesn't give up any allocated diff --git a/callstack.h b/callstack.h index b0217564..7f829317 100644 --- a/callstack.h +++ b/callstack.h @@ -32,7 +32,9 @@ #include #include "utility.h" -#define CALLSTACKCHUNKSIZE 32 // Number of frame slots in each CallStack chunk. +#define CALLSTACK_CHUNK_SIZE 32 // Number of frame slots in each CallStack chunk. +#define MAX_SYMBOL_NAME_LENGTH 256 // Maximum symbol name length that we will allow. Longer names will be truncated. +#define MAX_SYMBOL_NAME_SIZE ((MAX_SYMBOL_NAME_LENGTH * sizeof(WCHAR)) - 1) //////////////////////////////////////////////////////////////////////////////// // @@ -107,7 +109,7 @@ class CallStack // The chunk list is made of a linked list of Chunks. struct chunk_t { chunk_t* next; // Pointer to the next chunk in the chunk list. - UINT_PTR frames[CALLSTACKCHUNKSIZE]; // Pushed frames (program counter addresses) are stored in this array. + UINT_PTR frames[CALLSTACK_CHUNK_SIZE]; // Pushed frames (program counter addresses) are stored in this array. }; // Private data. diff --git a/lib/tut-framework/include/tut/tut_console_reporter.hpp b/lib/tut-framework/include/tut/tut_console_reporter.hpp index 9570e7d7..be6f9304 100644 --- a/lib/tut-framework/include/tut/tut_console_reporter.hpp +++ b/lib/tut-framework/include/tut/tut_console_reporter.hpp @@ -89,7 +89,7 @@ class console_reporter : public tut::callback init(); } - console_reporter(const std::string name = "default") + console_reporter(const std::string &name = "default") : current_group(), not_passed(), os(std::cout), diff --git a/map.h b/map.h index 35336347..1dd0a599 100644 --- a/map.h +++ b/map.h @@ -188,7 +188,7 @@ class Map { // operator - - Subtraction operator for Map Iterators. Causes the // the Iterator to reference a key/value pair that is an in-order - // predecessor of the currently refereced key/value pair. + // predecessor of the currently referenced key/value pair. // // - num (IN): Number indicating the number of preceding key/value // pairs to decrement the iterator. @@ -200,12 +200,10 @@ class Map { // Iterator operator - (SIZE_T num) const { - SIZE_T count; typename Tree >::node_t *cur = m_node; - cur = m_tree->prev(m_node); - for (count = 0; count < num; count++) { - cur = m_tree->prev(m_node); + for (SIZE_T count = 0; count < num; count++) { + cur = m_tree->prev(cur); if (cur == NULL) { return Iterator(m_tree, NULL); } @@ -214,7 +212,7 @@ class Map { } // operator == - Equality operator for Map Iterators. Map Iterators are - // considered equal if and only if they both refernce the same + // considered equal if and only if they both reference the same // key/value pair in the same Map. // // - other (IN): The other Map Iterator to compare against. diff --git a/set.h b/set.h index adc54fdd..6d2a9d20 100644 --- a/set.h +++ b/set.h @@ -138,7 +138,7 @@ class Set { // operator - - Subtraction operator for Set Iterators. Causes the // the Iterator to reference a key that is an in-order predecessor of - // the currently refereced key. + // the currently referenced key. // // - num (IN): Number indicating the number of preceding keys to // decrement the iterator. @@ -150,12 +150,10 @@ class Set { // Iterator operator - (SIZE_T num) const { - SIZE_T count; typename Tree::node_t *cur = m_node; - cur = m_tree->prev(m_node); - for (count = 0; count < num; count++) { - cur = m_tree->prev(m_node); + for (SIZE_T count = 0; count < num; count++) { + cur = m_tree->prev(cur); if (cur == NULL) { return Iterator(m_tree, NULL); } @@ -201,7 +199,7 @@ class Set { // Iterators are const Iterators). By dereferencing a Muterator, you get // a modifiable element. // - // Caution: Modifing an element in a way that changes its sorting value + // Caution: Modifying an element in a way that changes its sorting value // will corrupt the Set container. Muterators should only be used when // you are absolutely certain you will not be using it to make a // modification that changes the sort order of the referenced element. @@ -240,7 +238,7 @@ class Set { // Return Value: // // Returns an Iterator referencing the first key in the Set. If no keys - // are currenly stored in the Set, returns the "NULL" Iterator. + // are currently stored in the Set, returns the "NULL" Iterator. // Iterator begin () const { diff --git a/tests/dynamic_app/ThreadTest.cpp b/tests/dynamic_app/ThreadTest.cpp index d8b051a0..44abaaba 100644 --- a/tests/dynamic_app/ThreadTest.cpp +++ b/tests/dynamic_app/ThreadTest.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "ThreadTests.h" #include "LoadTests.h" +#include void Call_LoaderLocks(bool resolve) { @@ -28,7 +29,7 @@ void Call_One(bool resolve) Call_Two(resolve); } -DWORD __stdcall Dynamic_Thread_Procedure(LPVOID foo) +unsigned __stdcall Dynamic_Thread_Procedure(LPVOID foo) { bool* resolve = (bool*)(foo); Call_One(*resolve); @@ -39,11 +40,11 @@ void RunLoaderLockTests(bool resolve) { static const int NUMTHREADS = 64; HANDLE threads[NUMTHREADS] = {0}; - ULONG thread_id = NULL; + unsigned thread_id = NULL; for (UINT i = 0; i < NUMTHREADS; ++i) { - threads[i] = CreateThread(NULL, // security attribute + threads[i] = (HANDLE)_beginthreadex(NULL, // security attribute 0, // stack size Dynamic_Thread_Procedure, // start function &resolve, // thread parameters diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 2357de7e..76610281 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -81,9 +82,9 @@ static const int NUMTHREADS = 63; // Number of threads to run simulta #define ONCEINAWHILE 10 // Free a random block approx. once every... struct blockholder_t { - action_e action; PVOID block; - BOOL leak; + action_e action; + bool leak; }; typedef void* (__cdecl *free_t) (void* mem); @@ -93,7 +94,7 @@ struct threadcontext_t { UINT index; BOOL leaky; DWORD seed; - DWORD threadid; + unsigned threadid; }; __declspec(thread) blockholder_t blocks [MAXBLOCKS]; @@ -277,7 +278,7 @@ VOID recursivelyallocate (UINT depth, action_e action, SIZE_T size) } } -DWORD __stdcall threadproc_test (LPVOID param) +unsigned __stdcall threadproc_test (LPVOID param) { threadcontext_t* context = (threadcontext_t*)param; assert(context); @@ -378,7 +379,7 @@ void RunTestSuite() else contexts[index].leaky = FALSE; contexts[index].seed = random(RAND_MAX); - HANDLE hthread = CreateThread(NULL, 0, threadproc_test, &contexts[index], 0, &contexts[index].threadid); + HANDLE hthread = (HANDLE)_beginthreadex(NULL, 0, threadproc_test, &contexts[index], 0, &contexts[index].threadid); threads[index] = hthread; } diff --git a/utility.cpp b/utility.cpp index 301fabc6..b716ffc4 100644 --- a/utility.cpp +++ b/utility.cpp @@ -567,7 +567,7 @@ int CallReportHook(int reportType, LPWSTR message, int* hook_retval) { if (g_pReportHooks == NULL) return 0; - for (ReportHookSet::Iterator it = g_pReportHooks->begin(); it != g_pReportHooks->end(); it++) + for (ReportHookSet::Iterator it = g_pReportHooks->begin(); it != g_pReportHooks->end(); ++it) { int result = (*it)(reportType, message, hook_retval); if (result) // handled diff --git a/vld.cpp b/vld.cpp index db5d2838..a8a07bcd 100644 --- a/vld.cpp +++ b/vld.cpp @@ -37,10 +37,9 @@ #include "vldheap.h" // Provides internal new and delete operators. #include "vldint.h" // Provides access to the Visual Leak Detector internals. -#define BLOCKMAPRESERVE 64 // This should strike a balance between memory use and a desire to minimize heap hits. -#define HEAPMAPRESERVE 2 // Usually there won't be more than a few heaps in the process, so this should be small. -#define MAXSYMBOLNAMELENGTH 256 // Maximum symbol name length that we will allow. Longer names will be truncated. -#define MODULESETRESERVE 16 // There are likely to be several modules loaded in the process. +#define BLOCK_MAP_RESERVE 64 // This should strike a balance between memory use and a desire to minimize heap hits. +#define HEAP_MAP_RESERVE 2 // Usually there won't be more than a few heaps in the process, so this should be small. +#define MODULE_SET_RESERVE 16 // There are likely to be several modules loaded in the process. // Imported global variables. extern vldblockheader_t *g_vldBlockList; @@ -632,7 +631,7 @@ VisualLeakDetector::VisualLeakDetector () // Initialize remaining private data. m_heapMap = new HeapMap; - m_heapMap->reserve(HEAPMAPRESERVE); + m_heapMap->reserve(HEAP_MAP_RESERVE); m_iMalloc = NULL; m_requestCurr = 1; m_totalAlloc = 0; @@ -713,7 +712,7 @@ VisualLeakDetector::VisualLeakDetector () // Attach Visual Leak Detector to every module loaded in the process. ModuleSet* newmodules = new ModuleSet(); - newmodules->reserve(MODULESETRESERVE); + newmodules->reserve(MODULE_SET_RESERVE); EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); attachToLoadedModules(newmodules); m_loadedModules = newmodules; @@ -1299,7 +1298,7 @@ VOID VisualLeakDetector::configure () // Read the report destination (debugger, file, or both). WCHAR filename [MAX_PATH] = {0}; GetPrivateProfileString(L"Options", L"ReportFile", L"", filename, MAX_PATH, inipath); - if (wcslen(filename) == 0) { + if (filename[0] == '\0') { wcsncpy_s(filename, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); } WCHAR* path = _wfullpath(m_reportFilePath, filename, MAX_PATH); @@ -1533,7 +1532,7 @@ VOID VisualLeakDetector::mapHeap (HANDLE heap) { // Create a new block map for this heap and insert it into the heap map. heapinfo_t* heapinfo = new heapinfo_t; - heapinfo->blockMap.reserve(BLOCKMAPRESERVE); + heapinfo->blockMap.reserve(BLOCK_MAP_RESERVE); heapinfo->flags = 0x0; CriticalSectionLocker cs(m_heapMapLock); HeapMap::Iterator heapit = m_heapMap->insert(heap, heapinfo); @@ -1655,7 +1654,7 @@ VOID VisualLeakDetector::reportConfig () if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { Report(L" Aggregating duplicate leaks.\n"); } - if (wcslen(m_forcedModuleList) != 0) { + if (m_forcedModuleList[0] != '\0') { Report(L" Forcing %s of these modules in leak detection: %s\n", (m_options & VLD_OPT_MODULE_LIST_INCLUDE) ? L"inclusion" : L"exclusion", m_forcedModuleList); } @@ -1887,7 +1886,7 @@ blockinfo_t* VisualLeakDetector::findAllocedBlock(LPCVOID mem, __out HANDLE& hea // Iterate through all heaps for (HeapMap::Iterator it = m_heapMap->begin(); it != m_heapMap->end(); - it++) + ++it) { HANDLE heap_handle = (*it).first; (heap_handle); // unused @@ -1897,7 +1896,7 @@ blockinfo_t* VisualLeakDetector::findAllocedBlock(LPCVOID mem, __out HANDLE& hea BlockMap& p_block_map = heapPtr->blockMap; for (BlockMap::Iterator iter = p_block_map.begin(); iter != p_block_map.end(); - iter++) + ++iter) { if ((*iter).first == mem) { @@ -3491,10 +3490,10 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m g_vld.mapHeap(heap); // Try to get the name of the function containing the return address. - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; + BYTE symbolbuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; g_symbolLock.Enter(); DWORD64 displacement; @@ -3579,7 +3578,7 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod // Create a new set of all loaded modules, including any newly loaded // modules. ModuleSet *newmodules = new ModuleSet; - newmodules->reserve(MODULESETRESERVE); + newmodules->reserve(MODULE_SET_RESERVE); EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); // Attach to all modules included in the set. @@ -3612,7 +3611,7 @@ VOID VisualLeakDetector::RefreshModules() // Create a new set of all loaded modules, including any newly loaded // modules. ModuleSet* newmodules = new ModuleSet(); - newmodules->reserve(MODULESETRESERVE); + newmodules->reserve(MODULE_SET_RESERVE); EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); // Attach to all modules included in the set. @@ -4362,7 +4361,7 @@ void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) break; } - moduleit++; + ++moduleit; } } diff --git a/vldint.h b/vldint.h index 675a5635..05e3d301 100644 --- a/vldint.h +++ b/vldint.h @@ -336,7 +336,7 @@ class VisualLeakDetector : public IMalloc HeapMap *m_heapMap; // Map of all active heaps in the process. IMalloc *m_iMalloc; // Pointer to the system implementation of IMalloc. - LONG m_requestCurr; // Current request number. + SIZE_T m_requestCurr; // Current request number. SIZE_T m_totalAlloc; // Grand total - sum of all allocations. SIZE_T m_curAlloc; // Total amount currently allocated. SIZE_T m_maxAlloc; // Largest ever allocated at once. From 26e1e7c55736b9ac5aeae5f33129b63ecd9ab152 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 1 Oct 2011 21:13:14 +0000 Subject: [PATCH 120/321] Performance issue fixed This commit fixes 9266 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C70963 --- callstack.cpp | 13 ++++++++----- callstack.h | 1 - 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index e67682d6..59af9e90 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -49,7 +49,6 @@ CallStack::CallStack () m_resolved = NULL; m_resolvedCapacity = 0; m_resolvedLength = 0; - m_hashCode = 0xD202EF8D; } // Destructor - Frees all memory allocated to the CallStack. @@ -449,7 +448,14 @@ void CallStack::dumpResolved() const // DWORD CallStack::getHashValue () const { - return m_hashCode; + DWORD hashcode = 0xD202EF8D; + + // Iterate through each frame in the call stack. + for (UINT32 frame = 0; frame < m_size; frame++) { + UINT_PTR programcounter = (*this)[frame]; + hashcode = CalculateCRC32(programcounter, hashcode); + } + return hashcode; } // push_back - Pushes a frame's program counter onto the CallStack. Pushes are @@ -485,9 +491,6 @@ VOID CallStack::push_back (const UINT_PTR programcounter) m_topIndex = 0; } - UINT_PTR BaseAddress = (UINT_PTR)GetCallingModule(programcounter); - m_hashCode = CalculateCRC32(programcounter - BaseAddress, m_hashCode); - m_topChunk->frames[m_topIndex++] = programcounter; m_size++; } diff --git a/callstack.h b/callstack.h index 7f829317..de685aa4 100644 --- a/callstack.h +++ b/callstack.h @@ -118,7 +118,6 @@ class CallStack CallStack::chunk_t m_store; // Pointer to the underlying data store (i.e. head of the chunk list) CallStack::chunk_t* m_topChunk; // Pointer to the chunk at the top of the stack UINT32 m_topIndex; // Index, within the top chunk, of the top of the stack - UINT32 m_hashCode; // Call stack hash code // The string that contains the stack converted into a human readable format. // This is always NULL if the callstack has not been 'converted'. From 0eba7c682bddfdcdae76f9ad9bb85a8f018efd0c Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 1 Oct 2011 22:15:29 +0000 Subject: [PATCH 121/321] VldMfc project fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C70964 --- tests/mfc/vldmfc.vcxproj | 8 ++++---- tests/suite/testsuite.cpp | 3 ++- vld_vs10.sln | 11 +++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/mfc/vldmfc.vcxproj b/tests/mfc/vldmfc.vcxproj index d89df987..a997f636 100644 --- a/tests/mfc/vldmfc.vcxproj +++ b/tests/mfc/vldmfc.vcxproj @@ -228,10 +228,10 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ .\Debug/vldmfc.bsc - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest + copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y +copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y +copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 76610281..c7905eca 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -495,6 +495,7 @@ int main (int argc, char *argv []) _tprintf(_T("======================================\n")); + int prevleaks = (int)VLDGetLeaksCount(); DWORD start = GetTickCount(); srand(start); @@ -506,7 +507,7 @@ int main (int argc, char *argv []) _snprintf_s(message, MESSAGESIZE, _TRUNCATE, "Elapsed Time = %ums\n", end - start); OutputDebugString(message); - int totalleaks = (int)VLDGetLeaksCount(); + int totalleaks = (int)VLDGetLeaksCount() - prevleaks; int diff = leaks_count - totalleaks; assert(diff == 0); diff --git a/vld_vs10.sln b/vld_vs10.sln index faf1460c..3f2da38e 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -36,7 +36,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "tests\corrupt {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{E32BE0CE-65C9-4BC2-9528-F6FF3A183A85}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution @@ -158,8 +158,7 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -170,8 +169,8 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {E32BE0CE-65C9-4BC2-9528-F6FF3A183A85} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {E32BE0CE-65C9-4BC2-9528-F6FF3A183A85} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {E32BE0CE-65C9-4BC2-9528-F6FF3A183A85} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} EndGlobalSection EndGlobal From 1e41cb8da12739fccf00c3f9199c62c133b5ba92 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 1 Oct 2011 23:50:24 +0000 Subject: [PATCH 122/321] Preliminary support for VS 11 added git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C70967 --- crtmfcpatch.h | 80 ++++++++++++++++++++++++++++++++++ mfc_detect/vldmfc.cpp | 40 ++++++++++------- tests/suite/testsuite.cpp | 16 ++++--- vld.cpp | 90 +++++++++++++++++++++++++++++++++++++-- 4 files changed, 201 insertions(+), 25 deletions(-) diff --git a/crtmfcpatch.h b/crtmfcpatch.h index f081eca0..5d95bd7b 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1197,6 +1197,11 @@ typedef CrtMfcPatch<100> VS100; typedef CrtMfcPatch<100, true> VS100d; +// Visual Studio 2011 +typedef CrtMfcPatch<110> + VS110; +typedef CrtMfcPatch<110, true> + VS110d; void* VS60::pcrtd__calloc_dbg = NULL; void* VS60::pcrtd__malloc_dbg = NULL; @@ -1641,3 +1646,78 @@ void* VS100d::pmfcud__scalar_new_dbg_4p = NULL; void* VS100d::pmfcud__vector_new_dbg_4p = NULL; void* VS100d::pmfcud__scalar_new_dbg_3p = NULL; void* VS100d::pmfcud__vector_new_dbg_3p = NULL; + +void* VS110::pcrtd__calloc_dbg = NULL; +void* VS110::pcrtd__malloc_dbg = NULL; +void* VS110::pcrtd__realloc_dbg = NULL; +void* VS110::pcrtd__recalloc_dbg = NULL; +void* VS110::pcrtd_calloc = NULL; +void* VS110::pcrtd_malloc = NULL; +void* VS110::pcrtd_realloc = NULL; +void* VS110::pcrtd_recalloc = NULL; +void* VS110::pcrtd__aligned_malloc_dbg = NULL; +void* VS110::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS110::pcrtd__aligned_realloc_dbg = NULL; +void* VS110::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS110::pcrtd__aligned_recalloc_dbg = NULL; +void* VS110::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS110::pcrtd_aligned_malloc = NULL; +void* VS110::pcrtd_aligned_offset_malloc = NULL; +void* VS110::pcrtd_aligned_realloc = NULL; +void* VS110::pcrtd_aligned_offset_realloc = NULL; +void* VS110::pcrtd_aligned_recalloc = NULL; +void* VS110::pcrtd_aligned_offset_recalloc = NULL; +void* VS110::pcrtd__scalar_new_dbg = NULL; +void* VS110::pcrtd__vector_new_dbg = NULL; +void* VS110::pcrtd_scalar_new = NULL; +void* VS110::pcrtd_vector_new = NULL; +void* VS110::pmfcd_scalar_new = NULL; +void* VS110::pmfcd_vector_new = NULL; +void* VS110::pmfcd__scalar_new_dbg_4p = NULL; +void* VS110::pmfcd__vector_new_dbg_4p = NULL; +void* VS110::pmfcd__scalar_new_dbg_3p = NULL; +void* VS110::pmfcd__vector_new_dbg_3p = NULL; +void* VS110::pmfcud_scalar_new = NULL; +void* VS110::pmfcud_vector_new = NULL; +void* VS110::pmfcud__scalar_new_dbg_4p = NULL; +void* VS110::pmfcud__vector_new_dbg_4p = NULL; +void* VS110::pmfcud__scalar_new_dbg_3p = NULL; +void* VS110::pmfcud__vector_new_dbg_3p = NULL; + +void* VS110d::pcrtd__calloc_dbg = NULL; +void* VS110d::pcrtd__malloc_dbg = NULL; +void* VS110d::pcrtd__realloc_dbg = NULL; +void* VS110d::pcrtd__recalloc_dbg = NULL; +void* VS110d::pcrtd_calloc = NULL; +void* VS110d::pcrtd_malloc = NULL; +void* VS110d::pcrtd_realloc = NULL; +void* VS110d::pcrtd_recalloc = NULL; +void* VS110d::pcrtd__aligned_malloc_dbg = NULL; +void* VS110d::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS110d::pcrtd__aligned_realloc_dbg = NULL; +void* VS110d::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS110d::pcrtd__aligned_recalloc_dbg = NULL; +void* VS110d::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS110d::pcrtd_aligned_malloc = NULL; +void* VS110d::pcrtd_aligned_offset_malloc = NULL; +void* VS110d::pcrtd_aligned_realloc = NULL; +void* VS110d::pcrtd_aligned_offset_realloc = NULL; +void* VS110d::pcrtd_aligned_recalloc = NULL; +void* VS110d::pcrtd_aligned_offset_recalloc = NULL; +void* VS110d::pcrtd__scalar_new_dbg = NULL; +void* VS110d::pcrtd__vector_new_dbg = NULL; +void* VS110d::pcrtd_scalar_new = NULL; +void* VS110d::pcrtd_vector_new = NULL; +void* VS110d::pmfcd_scalar_new = NULL; +void* VS110d::pmfcd_vector_new = NULL; +void* VS110d::pmfcd__scalar_new_dbg_4p = NULL; +void* VS110d::pmfcd__vector_new_dbg_4p = NULL; +void* VS110d::pmfcd__scalar_new_dbg_3p = NULL; +void* VS110d::pmfcd__vector_new_dbg_3p = NULL; +void* VS110d::pmfcud_scalar_new = NULL; +void* VS110d::pmfcud_vector_new = NULL; +void* VS110d::pmfcud__scalar_new_dbg_4p = NULL; +void* VS110d::pmfcud__vector_new_dbg_4p = NULL; +void* VS110d::pmfcud__scalar_new_dbg_3p = NULL; +void* VS110d::pmfcud__vector_new_dbg_3p = NULL; + diff --git a/mfc_detect/vldmfc.cpp b/mfc_detect/vldmfc.cpp index 17096166..eceda658 100644 --- a/mfc_detect/vldmfc.cpp +++ b/mfc_detect/vldmfc.cpp @@ -217,45 +217,53 @@ BOOL CMFCExampleApp::InitInstance() #ifdef _DEBUG #ifndef _UNICODE #if _MFC_VER == 0x0700 // VS 2003 -#define MFCDLLNAME _T("mfc70d.dll") +#define MFCDLLNAME _T("mfc70d.dll") #elif _MFC_VER == 0x0800 // VS 2005 -#define MFCDLLNAME _T("mfc80d.dll") +#define MFCDLLNAME _T("mfc80d.dll") #elif _MFC_VER == 0x0900 // VS 2008 -#define MFCDLLNAME _T("mfc90d.dll") +#define MFCDLLNAME _T("mfc90d.dll") #elif _MFC_VER == 0x0A00 // VS 2010 -#define MFCDLLNAME _T("mfc100d.dll") +#define MFCDLLNAME _T("mfc100d.dll") +#elif _MFC_VER == 0x0B00 // VS 2011 +#define MFCDLLNAME _T("mfc110d.dll") #endif #else #if _MFC_VER == 0x0700 // VS 2003 -#define MFCDLLNAME _T("mfc70ud.dll") +#define MFCDLLNAME _T("mfc70ud.dll") #elif _MFC_VER == 0x0800 // VS 2005 -#define MFCDLLNAME _T("mfc80ud.dll") +#define MFCDLLNAME _T("mfc80ud.dll") #elif _MFC_VER == 0x0900 // VS 2008 -#define MFCDLLNAME _T("mfc90ud.dll") +#define MFCDLLNAME _T("mfc90ud.dll") #elif _MFC_VER == 0x0A00 // VS 2010 -#define MFCDLLNAME _T("mfc100ud.dll") +#define MFCDLLNAME _T("mfc100ud.dll") +#elif _MFC_VER == 0x0B00 // VS 2011 +#define MFCDLLNAME _T("mfc110ud.dll") #endif #endif #else #ifndef _UNICODE #if _MFC_VER == 0x0700 // VS 2003 -#define MFCDLLNAME _T("mfc70.dll") +#define MFCDLLNAME _T("mfc70.dll") #elif _MFC_VER == 0x0800 // VS 2005 -#define MFCDLLNAME _T("mfc80.dll") +#define MFCDLLNAME _T("mfc80.dll") #elif _MFC_VER == 0x0900 // VS 2008 -#define MFCDLLNAME _T("mfc90.dll") +#define MFCDLLNAME _T("mfc90.dll") #elif _MFC_VER == 0x0A00 // VS 2010 -#define MFCDLLNAME _T("mfc100.dll") +#define MFCDLLNAME _T("mfc100.dll") +#elif _MFC_VER == 0x0B00 // VS 2010 +#define MFCDLLNAME _T("mfc110.dll") #endif #else #if _MFC_VER == 0x0700 // VS 2003 -#define MFCDLLNAME _T("mfc70u.dll") +#define MFCDLLNAME _T("mfc70u.dll") #elif _MFC_VER == 0x0800 // VS 2005 -#define MFCDLLNAME _T("mfc80u.dll") +#define MFCDLLNAME _T("mfc80u.dll") #elif _MFC_VER == 0x0900 // VS 2008 -#define MFCDLLNAME _T("mfc90u.dll") +#define MFCDLLNAME _T("mfc90u.dll") #elif _MFC_VER == 0x0A00 // VS 2010 -#define MFCDLLNAME _T("mfc100u.dll") +#define MFCDLLNAME _T("mfc100u.dll") +#elif _MFC_VER == 0x0B00 // VS 2011 +#define MFCDLLNAME _T("mfc110u.dll") #endif #endif #endif diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index c7905eca..21fe5b3b 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -55,19 +55,23 @@ enum action_e { // Name of the debug C Runtime Library DLL on this system #ifdef _DEBUG #if _MSC_VER == 1400 // VS 2005 -#define CRTDLLNAME _T("msvcr80d.dll") +#define CRTDLLNAME _T("msvcr80d.dll") #elif _MSC_VER == 1500 // VS 2008 -#define CRTDLLNAME _T("msvcr90d.dll") +#define CRTDLLNAME _T("msvcr90d.dll") #elif _MSC_VER == 1600 // VS 2010 -#define CRTDLLNAME _T("msvcr100d.dll") +#define CRTDLLNAME _T("msvcr100d.dll") +#elif _MSC_VER == 1700 // VS 2011 +#define CRTDLLNAME _T("msvcr110d.dll") #endif #else #if _MSC_VER == 1400 // VS 2005 -#define CRTDLLNAME _T("msvcr80.dll") +#define CRTDLLNAME _T("msvcr80.dll") #elif _MSC_VER == 1500 // VS 2008 -#define CRTDLLNAME _T("msvcr90.dll") +#define CRTDLLNAME _T("msvcr90.dll") #elif _MSC_VER == 1600 // VS 2010 -#define CRTDLLNAME _T("msvcr100.dll") +#define CRTDLLNAME _T("msvcr100.dll") +#elif _MSC_VER == 1700 // VS 2011 +#define CRTDLLNAME _T("msvcr110.dll") #endif #endif diff --git a/vld.cpp b/vld.cpp index a8a07bcd..a4a0da6f 100644 --- a/vld.cpp +++ b/vld.cpp @@ -243,13 +243,13 @@ static patchentry_t mfc90udPatch [] = { ORDINAL2(936, 914), &VS90d::pmfcud__scalar_new_dbg_4p, VS90d::mfcud__scalar_new_dbg_4p, ORDINAL2(937, 915), &VS90d::pmfcud__scalar_new_dbg_3p, VS90d::mfcud__scalar_new_dbg_3p, NULL, NULL, NULL -}; +}; static patchentry_t mfc100Patch [] = { ORDINAL(265), &VS100::pmfcd_vector_new, VS100::mfcd_vector_new, ORDINAL2(1294, 1272), &VS100::pmfcd_scalar_new, VS100::mfcd_scalar_new, NULL, NULL, NULL -}; +}; static patchentry_t mfc100dPatch [] = { ORDINAL(267), &VS100d::pmfcd_vector_new, VS100d::mfcd_vector_new, @@ -259,7 +259,7 @@ static patchentry_t mfc100dPatch [] = { ORDINAL2(1428, 1406), &VS100d::pmfcd__scalar_new_dbg_4p, VS100d::mfcd__scalar_new_dbg_4p, ORDINAL2(1429, 1407), &VS100d::pmfcd__scalar_new_dbg_3p, VS100d::mfcd__scalar_new_dbg_3p, NULL, NULL, NULL -}; +}; static patchentry_t mfc100uPatch [] = { ORDINAL(265), &VS100::pmfcud_vector_new, VS100::mfcud_vector_new, @@ -276,6 +276,38 @@ static patchentry_t mfc100udPatch [] = { ORDINAL2(1436, 1414), &VS100d::pmfcud__scalar_new_dbg_3p, VS100d::mfcud__scalar_new_dbg_3p, NULL, NULL, NULL }; + +static patchentry_t mfc110Patch [] = { + ORDINAL(265), &VS110::pmfcd_vector_new, VS110::mfcd_vector_new, + ORDINAL2(1498, 1476), &VS110::pmfcd_scalar_new, VS110::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc110dPatch [] = { + ORDINAL(267), &VS110d::pmfcd_vector_new, VS110d::mfcd_vector_new, + ORDINAL(268), &VS110d::pmfcd__vector_new_dbg_4p, VS110d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS110d::pmfcd__vector_new_dbg_3p, VS110d::mfcd__vector_new_dbg_3p, + ORDINAL2(1629, 1607), &VS110d::pmfcd_scalar_new, VS110d::mfcd_scalar_new, + ORDINAL2(1630, 1608), &VS110d::pmfcd__scalar_new_dbg_4p, VS110d::mfcd__scalar_new_dbg_4p, + ORDINAL2(1631, 1609), &VS110d::pmfcd__scalar_new_dbg_3p, VS110d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc110uPatch [] = { + ORDINAL(265), &VS110::pmfcud_vector_new, VS110::mfcud_vector_new, + ORDINAL2(1502, 1480), &VS110::pmfcud_scalar_new, VS110::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc110udPatch [] = { + ORDINAL(267), &VS110d::pmfcud_vector_new, VS110d::mfcud_vector_new, + ORDINAL(268), &VS110d::pmfcud__vector_new_dbg_4p, VS110d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS110d::pmfcud__vector_new_dbg_3p, VS110d::mfcud__vector_new_dbg_3p, + ORDINAL2(1636, 1614), &VS110d::pmfcud_scalar_new, VS110d::mfcud_scalar_new, + ORDINAL2(1637, 1615), &VS110d::pmfcud__scalar_new_dbg_4p, VS110d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1638, 1616), &VS110d::pmfcud__scalar_new_dbg_3p, VS110d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; static patchentry_t msvcrtPatch [] = { scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, @@ -481,6 +513,52 @@ static patchentry_t msvcr100dPatch [] = { NULL, NULL, NULL, }; +static patchentry_t msvcr110Patch [] = { + scalar_new_dbg_name, &VS110::pcrtd__scalar_new_dbg, VS110::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS110::pcrtd__vector_new_dbg, VS110::crtd__vector_new_dbg, + "calloc", &VS110::pcrtd_calloc, VS110::crtd_calloc, + "malloc", &VS110::pcrtd_malloc, VS110::crtd_malloc, + "realloc", &VS110::pcrtd_realloc, VS110::crtd_realloc, + "_recalloc", &VS110::pcrtd_recalloc, VS110::crtd__recalloc, + scalar_new_name, &VS110::pcrtd_scalar_new, VS110::crtd_scalar_new, + vector_new_name, &VS110::pcrtd_vector_new, VS110::crtd_vector_new, + "_aligned_malloc", &VS110::pcrtd_aligned_malloc, VS110::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS110::pcrtd_aligned_offset_malloc, VS110::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS110::pcrtd_aligned_realloc, VS110::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS110::pcrtd_aligned_offset_realloc, VS110::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS110::pcrtd_aligned_recalloc, VS110::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS110::pcrtd_aligned_offset_recalloc, VS110::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, +}; + +static patchentry_t msvcr110dPatch [] = { + "_calloc_dbg", &VS110d::pcrtd__calloc_dbg, VS110d::crtd__calloc_dbg, + "_malloc_dbg", &VS110d::pcrtd__malloc_dbg, VS110d::crtd__malloc_dbg, + "_realloc_dbg", &VS110d::pcrtd__realloc_dbg, VS110d::crtd__realloc_dbg, + "_recalloc_dbg", &VS110d::pcrtd__recalloc_dbg, VS110d::crtd__recalloc_dbg, + scalar_new_dbg_name, &VS110d::pcrtd__scalar_new_dbg, VS110d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS110d::pcrtd__vector_new_dbg, VS110d::crtd__vector_new_dbg, + "calloc", &VS110d::pcrtd_calloc, VS110d::crtd_calloc, + "malloc", &VS110d::pcrtd_malloc, VS110d::crtd_malloc, + "realloc", &VS110d::pcrtd_realloc, VS110d::crtd_realloc, + "_recalloc", &VS110d::pcrtd_recalloc, VS110d::crtd__recalloc, + scalar_new_name, &VS110d::pcrtd_scalar_new, VS110d::crtd_scalar_new, + vector_new_name, &VS110d::pcrtd_vector_new, VS110d::crtd_vector_new, + "_aligned_malloc_dbg", &VS110d::pcrtd__aligned_malloc_dbg, VS110d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS110d::pcrtd__aligned_offset_malloc_dbg, VS110d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS110d::pcrtd__aligned_realloc_dbg, VS110d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS110d::pcrtd__aligned_offset_realloc_dbg, VS110d::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS110d::pcrtd__aligned_recalloc_dbg, VS110d::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS110d::pcrtd__aligned_offset_recalloc_dbg,VS110d::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS110d::pcrtd_aligned_malloc, VS110d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS110d::pcrtd_aligned_offset_malloc, VS110d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS110d::pcrtd_aligned_realloc, VS110d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS110d::pcrtd_aligned_offset_realloc, VS110d::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS110d::pcrtd_aligned_recalloc, VS110d::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS110d::pcrtd_aligned_offset_recalloc, VS110d::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, +}; + patchentry_t VisualLeakDetector::m_ntdllPatch [] = { "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, "RtlFreeHeap", NULL, VisualLeakDetector::_RtlFreeHeap, @@ -525,6 +603,10 @@ moduleentry_t VisualLeakDetector::m_patchTable [] = { "mfc100d.dll", 0x0, mfc100dPatch, "mfc100u.dll", 0x0, mfc100uPatch, "mfc100ud.dll", 0x0, mfc100udPatch, + "mfc110.dll", 0x0, mfc110Patch, + "mfc110d.dll", 0x0, mfc110dPatch, + "mfc110u.dll", 0x0, mfc110uPatch, + "mfc110ud.dll", 0x0, mfc110udPatch, // CRT new operators and heap APIs. "msvcrt.dll", 0x0, msvcrtPatch, @@ -539,6 +621,8 @@ moduleentry_t VisualLeakDetector::m_patchTable [] = { "msvcr90d.dll", 0x0, msvcr90dPatch, "msvcr100.dll", 0x0, msvcr100Patch, "msvcr100d.dll",0x0, msvcr100dPatch, + "msvcr110.dll", 0x0, msvcr110Patch, + "msvcr110d.dll",0x0, msvcr110dPatch, // NT APIs. "ntdll.dll", 0x0, m_ntdllPatch, From 3fd72fd72dc9b810c0ecfcb7abf41b37952ba9e8 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 2 Oct 2011 23:22:21 +0000 Subject: [PATCH 123/321] vld.cpp divided to several files git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C70983 --- callstack.cpp | 35 +- crtmfcpatch.h | 20 - dllspatches.cpp | 621 ++++++++++ ntapi.h | 2 +- vld.cpp | 2885 +++---------------------------------------- vld.vcxproj | 2 + vld.vcxproj.filters | 6 + vld_hooks.cpp | 1974 +++++++++++++++++++++++++++++ vldint.h | 4 +- 9 files changed, 2816 insertions(+), 2733 deletions(-) create mode 100644 dllspatches.cpp create mode 100644 vld_hooks.cpp diff --git a/callstack.cpp b/callstack.cpp index 59af9e90..b4f0daba 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -215,7 +215,8 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; - + + WCHAR lowerCaseName [MAX_PATH]; WCHAR callingModuleName [MAX_PATH]; const size_t max_size = MAXREPORTLENGTH + 1; @@ -231,8 +232,9 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const DWORD displacement = 0; foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); if (foundline && !showInternalFrames) { - _wcslwr_s(sourceInfo.FileName, wcslen(sourceInfo.FileName) + 1); - if (isInternalModule(sourceInfo.FileName)) { + wcscpy_s(lowerCaseName, sourceInfo.FileName); + _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); + if (isInternalModule(lowerCaseName)) { // Don't show frames in files internal to the heap. g_symbolLock.Leave(); continue; @@ -335,6 +337,7 @@ void CallStack::resolve(BOOL showInternalFrames) BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; WCHAR callingModuleName [MAX_PATH] = L""; + WCHAR lowerCaseName [MAX_PATH]; const size_t max_line_length = MAXREPORTLENGTH + 1; m_resolvedCapacity = m_size * max_line_length; @@ -359,8 +362,9 @@ void CallStack::resolve(BOOL showInternalFrames) assert(m_resolved != NULL); if (foundline && !showInternalFrames) { - _wcslwr_s(sourceInfo.FileName, wcslen(sourceInfo.FileName) + 1); - if (isInternalModule(sourceInfo.FileName)) { + wcscpy_s(lowerCaseName, sourceInfo.FileName); + _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); + if (isInternalModule(lowerCaseName)) { // Don't show frames in files internal to the heap. g_symbolLock.Leave(); continue; @@ -497,15 +501,18 @@ VOID CallStack::push_back (const UINT_PTR programcounter) bool CallStack::isInternalModule( const PWSTR filename ) const { - return wcsstr(filename, L"afxmem.cpp") || - wcsstr(filename, L"dbgheap.c") || - wcsstr(filename, L"malloc.c") || - wcsstr(filename, L"new.cpp") || - wcsstr(filename, L"newaop.cpp") || - wcsstr(filename, L"dbgcalloc.c") || - wcsstr(filename, L"realloc.c") || - wcsstr(filename, L"dbgrealloc.c") || - wcsstr(filename, L"free.c"); + return wcsstr(filename, L"\\crt\\src\\afxmem.cpp") || + wcsstr(filename, L"\\crt\\src\\dbgheap.c") || + wcsstr(filename, L"\\crt\\src\\malloc.c") || + wcsstr(filename, L"\\crt\\src\\dbgmalloc.c") || + wcsstr(filename, L"\\crt\\src\\new.cpp") || + wcsstr(filename, L"\\crt\\src\\newaop.cpp") || + wcsstr(filename, L"\\crt\\src\\dbgcalloc.c") || + wcsstr(filename, L"\\crt\\src\\realloc.c") || + wcsstr(filename, L"\\crt\\src\\dbgrealloc.c") || + wcsstr(filename, L"\\crt\\src\\dbgdel.cp") || + wcsstr(filename, L"\\crt\\src\\free.c") || + wcsstr(filename, L"\\vc\\include\\xmemory0"); } // getStackTrace - Traces the stack as far back as possible, or until 'maxdepth' diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 5d95bd7b..76962a03 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1147,26 +1147,6 @@ void* CrtMfcPatch::mfcud_vector_new (size_t size) return g_vld._new(pmfcxxd_new, context, debug, size); } -#ifndef WIN64 -//void * __cdecl operator new(unsigned int,int,char const *,int) -const extern char scalar_new_dbg_name[] = "??2@YAPAXIHPBDH@Z"; -//void * __cdecl operator new[](unsigned int,int,char const *,int) -const extern char vector_new_dbg_name[] = "??_U@YAPAXIHPBDH@Z"; -//void * __cdecl operator new(unsigned int) -const extern char scalar_new_name[] = "??2@YAPAXI@Z"; -//void * __cdecl operator new[](unsigned int) -const extern char vector_new_name[] = "??_U@YAPAXI@Z"; -#else -//void * __ptr64 __cdecl operator new(unsigned __int64,int,char const * __ptr64,int) -const extern char scalar_new_dbg_name[] = "??2@YAPEAX_KHPEBDH@Z"; -//void * __ptr64 __cdecl operator new[](unsigned __int64,int,char const * __ptr64,int) -const extern char vector_new_dbg_name[] = "??_U@YAPEAX_KHPEBDH@Z"; -//void * __ptr64 __cdecl operator new(unsigned __int64) -const extern char scalar_new_name[] = "??2@YAPEAX_K@Z"; -//void * __ptr64 __cdecl operator new[](unsigned __int64) -const extern char vector_new_name[] = "??_U@YAPEAX_K@Z"; -#endif - // Visual Studio 6.0 typedef CrtMfcPatch<60> VS60; diff --git a/dllspatches.cpp b/dllspatches.cpp new file mode 100644 index 00000000..6ede89a1 --- /dev/null +++ b/dllspatches.cpp @@ -0,0 +1,621 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - VisualLeakDetector Class Implementation +// Copyright (c) 2005-2011 VLD Team +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#include "stdafx.h" + +#define VLDBUILD // Declares that we are building Visual Leak Detector. +#include "crtmfcpatch.h" // Provides CRT and MFC patch functions. +#include "vldint.h" // Provides access to the Visual Leak Detector internals. + +#ifndef WIN64 +//void * __cdecl operator new(unsigned int,int,char const *,int) +const char scalar_new_dbg_name[] = "??2@YAPAXIHPBDH@Z"; +//void * __cdecl operator new[](unsigned int,int,char const *,int) +const char vector_new_dbg_name[] = "??_U@YAPAXIHPBDH@Z"; +//void * __cdecl operator new(unsigned int) +const char scalar_new_name[] = "??2@YAPAXI@Z"; +//void * __cdecl operator new[](unsigned int) +const char vector_new_name[] = "??_U@YAPAXI@Z"; +#else +//void * __ptr64 __cdecl operator new(unsigned __int64,int,char const * __ptr64,int) +const char scalar_new_dbg_name[] = "??2@YAPEAX_KHPEBDH@Z"; +//void * __ptr64 __cdecl operator new[](unsigned __int64,int,char const * __ptr64,int) +const char vector_new_dbg_name[] = "??_U@YAPEAX_KHPEBDH@Z"; +//void * __ptr64 __cdecl operator new(unsigned __int64) +const char scalar_new_name[] = "??2@YAPEAX_K@Z"; +//void * __ptr64 __cdecl operator new[](unsigned __int64) +const char vector_new_name[] = "??_U@YAPEAX_K@Z"; +#endif + +// Global function pointers for explicit dynamic linking with functions listed +// in the import patch table. Using explicit dynamic linking minimizes VLD's +// footprint by loading only modules that are actually used. These pointers will +// be linked to the real functions the first time they are used. + +// The import patch table: lists the heap-related API imports that VLD patches +// through to replacement functions provided by VLD. Having this table simply +// makes it more convenient to add additional IAT patches. +patchentry_t VisualLeakDetector::m_kernelbasePatch [] = { + "GetProcAddress", NULL, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. + NULL, NULL, NULL +}; + +patchentry_t VisualLeakDetector::m_kernel32Patch [] = { + "HeapAlloc", NULL, _HeapAlloc, + "HeapCreate", NULL, _HeapCreate, + "HeapDestroy", NULL, _HeapDestroy, + "HeapFree", NULL, _HeapFree, + "HeapReAlloc", NULL, _HeapReAlloc, + NULL, NULL, NULL +}; + +#define ORDINAL(x) (LPCSTR)x +#if !defined(_M_X64) +#define ORDINAL2(x86, x64) (LPCSTR)x86 +#else +#define ORDINAL2(x86, x64) (LPCSTR)x64 +#endif + +VisualLeakDetector::_GetProcAddressType *VisualLeakDetector::m_original_GetProcAddress = NULL; + +static patchentry_t mfc42Patch [] = { + // XXX why are the vector new operators missing for mfc42.dll? + //ORDINAL(711), &VS60::pmfcd_scalar_new, VS60::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc42dPatch [] = { + // XXX why are the vector new operators missing for mfc42d.dll? + ORDINAL(711), &VS60d::pmfcd_scalar_new, VS60d::mfcd_scalar_new, + ORDINAL(712), &VS60d::pmfcd__scalar_new_dbg_4p, VS60d::mfcd__scalar_new_dbg_4p, + ORDINAL(714), &VS60d::pmfcd__scalar_new_dbg_3p, VS60d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc42uPatch [] = { + // XXX why are the vector new operators missing for mfc42u.dll? + //ORDINAL(711), &VS60::pmfcud_scalar_new, VS60::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc42udPatch [] = { + // XXX why are the vector new operators missing for mfc42ud.dll? + ORDINAL(711), &VS60d::pmfcud_scalar_new, VS60d::mfcud_scalar_new, + ORDINAL(712), &VS60d::pmfcud__scalar_new_dbg_4p, VS60d::mfcud__scalar_new_dbg_4p, + ORDINAL(714), &VS60d::pmfcud__scalar_new_dbg_3p, VS60d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc70Patch [] = { + //ORDINAL(257), &VS70::pmfcd_vector_new, VS70::mfcd_vector_new, + //ORDINAL(832), &VS70::pmfcd_scalar_new, VS70::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc70dPatch [] = { + ORDINAL(257), &VS70d::pmfcd_vector_new, VS70d::mfcd_vector_new, + ORDINAL(258), &VS70d::pmfcd__vector_new_dbg_4p, VS70d::mfcd__vector_new_dbg_4p, + ORDINAL(259), &VS70d::pmfcd__vector_new_dbg_3p, VS70d::mfcd__vector_new_dbg_3p, + ORDINAL(832), &VS70d::pmfcd_scalar_new, VS70d::mfcd_scalar_new, + ORDINAL(833), &VS70d::pmfcd__scalar_new_dbg_4p, VS70d::mfcd__scalar_new_dbg_4p, + ORDINAL(834), &VS70d::pmfcd__scalar_new_dbg_3p, VS70d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc70uPatch [] = { + //ORDINAL(258), &VS70::pmfcud_vector_new, VS70::mfcud_vector_new, + //ORDINAL(833), &VS70::pmfcud_scalar_new, VS70::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc70udPatch [] = { + ORDINAL(258), &VS70d::pmfcud_vector_new, VS70d::mfcud_vector_new, + ORDINAL(259), &VS70d::pmfcud__vector_new_dbg_4p, VS70d::mfcud__vector_new_dbg_4p, + ORDINAL(260), &VS70d::pmfcud__vector_new_dbg_3p, VS70d::mfcud__vector_new_dbg_3p, + ORDINAL(833), &VS70d::pmfcud_scalar_new, VS70d::mfcud_scalar_new, + ORDINAL(834), &VS70d::pmfcud__scalar_new_dbg_4p, VS70d::mfcud__scalar_new_dbg_4p, + ORDINAL(835), &VS70d::pmfcud__scalar_new_dbg_3p, VS70d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc71Patch [] = { + //ORDINAL(267), &VS71::pmfcd_vector_new, VS71::mfcd_vector_new, + //ORDINAL(893), &VS71::pmfcd_scalar_new, VS71::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc71dPatch [] = { + ORDINAL(267), &VS71d::pmfcd_vector_new, VS71d::mfcd_vector_new, + ORDINAL(268), &VS71d::pmfcd__vector_new_dbg_4p, VS71d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS71d::pmfcd__vector_new_dbg_3p, VS71d::mfcd__vector_new_dbg_3p, + ORDINAL(893), &VS71d::pmfcd_scalar_new, VS71d::mfcd_scalar_new, + ORDINAL(894), &VS71d::pmfcd__scalar_new_dbg_4p, VS71d::mfcd__scalar_new_dbg_4p, + ORDINAL(895), &VS71d::pmfcd__scalar_new_dbg_3p, VS71d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc71uPatch [] = { + //ORDINAL(267), &VS71::pmfcud_vector_new, VS71::mfcud_vector_new, + //ORDINAL(893), &VS71::pmfcud_scalar_new, VS71::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc71udPatch [] = { + ORDINAL(267), &VS71d::pmfcud_vector_new, VS71d::mfcud_vector_new, + ORDINAL(268), &VS71d::pmfcud__vector_new_dbg_4p, VS71d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS71d::pmfcud__vector_new_dbg_3p, VS71d::mfcud__vector_new_dbg_3p, + ORDINAL(893), &VS71d::pmfcud_scalar_new, VS71d::mfcud_scalar_new, + ORDINAL(894), &VS71d::pmfcud__scalar_new_dbg_4p, VS71d::mfcud__scalar_new_dbg_4p, + ORDINAL(895), &VS71d::pmfcud__scalar_new_dbg_3p, VS71d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc80Patch [] = { + //ORDINAL(267), &VS80::pmfcd_vector_new, VS80::mfcd_vector_new, + //ORDINAL2(893,907), &VS80::pmfcd_scalar_new, VS80::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc80dPatch [] = { + ORDINAL(267), &VS80d::pmfcd_vector_new, VS80d::mfcd_vector_new, + ORDINAL(268), &VS80d::pmfcd__vector_new_dbg_4p, VS80d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS80d::pmfcd__vector_new_dbg_3p, VS80d::mfcd__vector_new_dbg_3p, + ORDINAL2(893,907), &VS80d::pmfcd_scalar_new, VS80d::mfcd_scalar_new, + ORDINAL2(894,908), &VS80d::pmfcd__scalar_new_dbg_4p, VS80d::mfcd__scalar_new_dbg_4p, + ORDINAL2(895,909), &VS80d::pmfcd__scalar_new_dbg_3p, VS80d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc80uPatch [] = { + //ORDINAL(267), &VS80::pmfcud_vector_new, VS80::mfcud_vector_new, + //ORDINAL2(893,907), &VS80::pmfcud_scalar_new, VS80::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc80udPatch [] = { + ORDINAL(267), &VS80d::pmfcud_vector_new, VS80d::mfcud_vector_new, + ORDINAL(268), &VS80d::pmfcud__vector_new_dbg_4p, VS80d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS80d::pmfcud__vector_new_dbg_3p, VS80d::mfcud__vector_new_dbg_3p, + ORDINAL2(893,907), &VS80d::pmfcud_scalar_new, VS80d::mfcud_scalar_new, + ORDINAL2(894,908), &VS80d::pmfcud__scalar_new_dbg_4p, VS80d::mfcud__scalar_new_dbg_4p, + ORDINAL2(895,909), &VS80d::pmfcud__scalar_new_dbg_3p, VS80d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc90Patch [] = { + ORDINAL(265), &VS90::pmfcd_vector_new, VS90::mfcd_vector_new, + ORDINAL2(798, 776), &VS90::pmfcd_scalar_new, VS90::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc90dPatch [] = { + ORDINAL(267), &VS90d::pmfcd_vector_new, VS90d::mfcd_vector_new, + ORDINAL(268), &VS90d::pmfcd__vector_new_dbg_4p, VS90d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS90d::pmfcd__vector_new_dbg_3p, VS90d::mfcd__vector_new_dbg_3p, + ORDINAL2(931, 909), &VS90d::pmfcd_scalar_new, VS90d::mfcd_scalar_new, + ORDINAL2(932, 910), &VS90d::pmfcd__scalar_new_dbg_4p, VS90d::mfcd__scalar_new_dbg_4p, + ORDINAL2(933, 911), &VS90d::pmfcd__scalar_new_dbg_3p, VS90d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc90uPatch [] = { + ORDINAL(265), &VS90::pmfcud_vector_new, VS90::mfcud_vector_new, + ORDINAL2(798, 776), &VS90::pmfcud_scalar_new, VS90::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc90udPatch [] = { + ORDINAL(267), &VS90d::pmfcud_vector_new, VS90d::mfcud_vector_new, + ORDINAL(268), &VS90d::pmfcud__vector_new_dbg_4p, VS90d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS90d::pmfcud__vector_new_dbg_3p, VS90d::mfcud__vector_new_dbg_3p, + ORDINAL2(935, 913), &VS90d::pmfcud_scalar_new, VS90d::mfcud_scalar_new, + ORDINAL2(936, 914), &VS90d::pmfcud__scalar_new_dbg_4p, VS90d::mfcud__scalar_new_dbg_4p, + ORDINAL2(937, 915), &VS90d::pmfcud__scalar_new_dbg_3p, VS90d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc100Patch [] = { + ORDINAL(265), &VS100::pmfcd_vector_new, VS100::mfcd_vector_new, + ORDINAL2(1294, 1272), &VS100::pmfcd_scalar_new, VS100::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc100dPatch [] = { + ORDINAL(267), &VS100d::pmfcd_vector_new, VS100d::mfcd_vector_new, + ORDINAL(268), &VS100d::pmfcd__vector_new_dbg_4p, VS100d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS100d::pmfcd__vector_new_dbg_3p, VS100d::mfcd__vector_new_dbg_3p, + ORDINAL2(1427, 1405), &VS100d::pmfcd_scalar_new, VS100d::mfcd_scalar_new, + ORDINAL2(1428, 1406), &VS100d::pmfcd__scalar_new_dbg_4p, VS100d::mfcd__scalar_new_dbg_4p, + ORDINAL2(1429, 1407), &VS100d::pmfcd__scalar_new_dbg_3p, VS100d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc100uPatch [] = { + ORDINAL(265), &VS100::pmfcud_vector_new, VS100::mfcud_vector_new, + ORDINAL2(1298, 1276), &VS100::pmfcud_scalar_new, VS100::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc100udPatch [] = { + ORDINAL(267), &VS100d::pmfcud_vector_new, VS100d::mfcud_vector_new, + ORDINAL(268), &VS100d::pmfcud__vector_new_dbg_4p, VS100d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS100d::pmfcud__vector_new_dbg_3p, VS100d::mfcud__vector_new_dbg_3p, + ORDINAL2(1434, 1412), &VS100d::pmfcud_scalar_new, VS100d::mfcud_scalar_new, + ORDINAL2(1435, 1413), &VS100d::pmfcud__scalar_new_dbg_4p, VS100d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1436, 1414), &VS100d::pmfcud__scalar_new_dbg_3p, VS100d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc110Patch [] = { + ORDINAL(265), &VS110::pmfcd_vector_new, VS110::mfcd_vector_new, + ORDINAL2(1498, 1476), &VS110::pmfcd_scalar_new, VS110::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc110dPatch [] = { + ORDINAL(267), &VS110d::pmfcd_vector_new, VS110d::mfcd_vector_new, + ORDINAL(268), &VS110d::pmfcd__vector_new_dbg_4p, VS110d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS110d::pmfcd__vector_new_dbg_3p, VS110d::mfcd__vector_new_dbg_3p, + ORDINAL2(1629, 1607), &VS110d::pmfcd_scalar_new, VS110d::mfcd_scalar_new, + ORDINAL2(1630, 1608), &VS110d::pmfcd__scalar_new_dbg_4p, VS110d::mfcd__scalar_new_dbg_4p, + ORDINAL2(1631, 1609), &VS110d::pmfcd__scalar_new_dbg_3p, VS110d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc110uPatch [] = { + ORDINAL(265), &VS110::pmfcud_vector_new, VS110::mfcud_vector_new, + ORDINAL2(1502, 1480), &VS110::pmfcud_scalar_new, VS110::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc110udPatch [] = { + ORDINAL(267), &VS110d::pmfcud_vector_new, VS110d::mfcud_vector_new, + ORDINAL(268), &VS110d::pmfcud__vector_new_dbg_4p, VS110d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS110d::pmfcud__vector_new_dbg_3p, VS110d::mfcud__vector_new_dbg_3p, + ORDINAL2(1636, 1614), &VS110d::pmfcud_scalar_new, VS110d::mfcud_scalar_new, + ORDINAL2(1637, 1615), &VS110d::pmfcud__scalar_new_dbg_4p, VS110d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1638, 1616), &VS110d::pmfcud__scalar_new_dbg_3p, VS110d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t msvcrtPatch [] = { + scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, + //vector_new_dbg_name, &VS60::pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, + "calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, + "malloc", &VS60::pcrtd_malloc, VS60::crtd_malloc, + "realloc", &VS60::pcrtd_realloc, VS60::crtd_realloc, + scalar_new_name, &VS60::pcrtd_scalar_new, VS60::crtd_scalar_new, + //vector_new_name, &VS60::pcrtd_vector_new, VS60::crtd_vector_new, + NULL, NULL, NULL +}; + +static patchentry_t msvcrtdPatch [] = { + "_calloc_dbg", &VS60d::pcrtd__calloc_dbg, VS60d::crtd__calloc_dbg, + "_malloc_dbg", &VS60d::pcrtd__malloc_dbg, VS60d::crtd__malloc_dbg, + "_realloc_dbg", &VS60d::pcrtd__realloc_dbg, VS60d::crtd__realloc_dbg, + scalar_new_dbg_name, &VS60d::pcrtd__scalar_new_dbg, VS60d::crtd__scalar_new_dbg, + //vector_new_dbg_name, &VS60d::pcrtd__vector_new_dbg, VS60d::crtd__vector_new_dbg, + "calloc", &VS60d::pcrtd_calloc, VS60d::crtd_calloc, + "malloc", &VS60d::pcrtd_malloc, VS60d::crtd_malloc, + "realloc", &VS60d::pcrtd_realloc, VS60d::crtd_realloc, + scalar_new_name, &VS60d::pcrtd_scalar_new, VS60d::crtd_scalar_new, + //vector_new_name, &VS60d::pcrtd_vector_new, VS60d::crtd_vector_new, + NULL, NULL, NULL +}; + +static patchentry_t msvcr70Patch [] = { + scalar_new_dbg_name, &VS70::pcrtd__scalar_new_dbg, VS70::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS70::pcrtd__vector_new_dbg, VS70::crtd__vector_new_dbg, + "calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, + "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, + "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, + scalar_new_name, &VS70::pcrtd_scalar_new, VS70::crtd_scalar_new, + vector_new_name, &VS70::pcrtd_vector_new, VS70::crtd_vector_new, + NULL, NULL, NULL +}; + +static patchentry_t msvcr70dPatch [] = { + "_calloc_dbg", &VS70d::pcrtd__calloc_dbg, VS70d::crtd__calloc_dbg, + "_malloc_dbg", &VS70d::pcrtd__malloc_dbg, VS70d::crtd__malloc_dbg, + "_realloc_dbg", &VS70d::pcrtd__realloc_dbg, VS70d::crtd__realloc_dbg, + scalar_new_dbg_name, &VS70d::pcrtd__scalar_new_dbg, VS70d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS70d::pcrtd__vector_new_dbg, VS70d::crtd__vector_new_dbg, + "calloc", &VS70d::pcrtd_calloc, VS70d::crtd_calloc, + "malloc", &VS70d::pcrtd_malloc, VS70d::crtd_malloc, + "realloc", &VS70d::pcrtd_realloc, VS70d::crtd_realloc, + scalar_new_name, &VS70d::pcrtd_scalar_new, VS70d::crtd_scalar_new, + vector_new_name, &VS70d::pcrtd_vector_new, VS70d::crtd_vector_new, + NULL, NULL, NULL +}; + +static patchentry_t msvcr71Patch [] = { + scalar_new_dbg_name, &VS71::pcrtd__scalar_new_dbg, VS71::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS71::pcrtd__vector_new_dbg, VS71::crtd__vector_new_dbg, + "calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, + "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, + "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, + scalar_new_name, &VS71::pcrtd_scalar_new, VS71::crtd_scalar_new, + vector_new_name, &VS71::pcrtd_vector_new, VS71::crtd_vector_new, + NULL, NULL, NULL +}; + +static patchentry_t msvcr71dPatch [] = { + "_calloc_dbg", &VS71d::pcrtd__calloc_dbg, VS71d::crtd__calloc_dbg, + "_malloc_dbg", &VS71d::pcrtd__malloc_dbg, VS71d::crtd__malloc_dbg, + "_realloc_dbg", &VS71d::pcrtd__realloc_dbg, VS71d::crtd__realloc_dbg, + scalar_new_dbg_name, &VS71d::pcrtd__scalar_new_dbg, VS71d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS71d::pcrtd__vector_new_dbg, VS71d::crtd__vector_new_dbg, + "calloc", &VS71d::pcrtd_calloc, VS71d::crtd_calloc, + "malloc", &VS71d::pcrtd_malloc, VS71d::crtd_malloc, + "realloc", &VS71d::pcrtd_realloc, VS71d::crtd_realloc, + scalar_new_name, &VS71d::pcrtd_scalar_new, VS71d::crtd_scalar_new, + vector_new_name, &VS71d::pcrtd_vector_new, VS71d::crtd_vector_new, + NULL, NULL, NULL +}; + +static patchentry_t msvcr80Patch [] = { + scalar_new_dbg_name, &VS80::pcrtd__scalar_new_dbg, VS80::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS80::pcrtd__vector_new_dbg, VS80::crtd__vector_new_dbg, + "calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, + "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, + "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, + scalar_new_name, &VS80::pcrtd_scalar_new, VS80::crtd_scalar_new, + vector_new_name, &VS80::pcrtd_vector_new, VS80::crtd_vector_new, + "_aligned_malloc", &VS80::pcrtd_aligned_malloc, VS80::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS80::pcrtd_aligned_offset_malloc, VS80::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS80::pcrtd_aligned_realloc, VS80::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS80::pcrtd_aligned_offset_realloc, VS80::crtd__aligned_offset_realloc, + NULL, NULL, NULL +}; + +static patchentry_t msvcr80dPatch [] = { + "_calloc_dbg", &VS80d::pcrtd__calloc_dbg, VS80d::crtd__calloc_dbg, + "_malloc_dbg", &VS80d::pcrtd__malloc_dbg, VS80d::crtd__malloc_dbg, + "_realloc_dbg", &VS80d::pcrtd__realloc_dbg, VS80d::crtd__realloc_dbg, + scalar_new_dbg_name, &VS80d::pcrtd__scalar_new_dbg, VS80d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS80d::pcrtd__vector_new_dbg, VS80d::crtd__vector_new_dbg, + "calloc", &VS80d::pcrtd_calloc, VS80d::crtd_calloc, + "malloc", &VS80d::pcrtd_malloc, VS80d::crtd_malloc, + "realloc", &VS80d::pcrtd_realloc, VS80d::crtd_realloc, + scalar_new_name, &VS80d::pcrtd_scalar_new, VS80d::crtd_scalar_new, + vector_new_name, &VS80d::pcrtd_vector_new, VS80d::crtd_vector_new, + "_aligned_malloc_dbg", &VS80d::pcrtd__aligned_malloc_dbg, VS80d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS80d::pcrtd__aligned_offset_malloc_dbg, VS80d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS80d::pcrtd__aligned_realloc_dbg, VS80d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS80d::pcrtd__aligned_offset_realloc_dbg, VS80d::crtd__aligned_offset_realloc_dbg, + "_aligned_malloc", &VS80d::pcrtd_aligned_malloc, VS80d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS80d::pcrtd_aligned_offset_malloc, VS80d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS80d::pcrtd_aligned_realloc, VS80d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS80d::pcrtd_aligned_offset_realloc, VS80d::crtd__aligned_offset_realloc, + NULL, NULL, NULL +}; + +static patchentry_t msvcr90Patch [] = { + scalar_new_dbg_name, &VS90::pcrtd__scalar_new_dbg, VS90::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS90::pcrtd__vector_new_dbg, VS90::crtd__vector_new_dbg, + "calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, + "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, + "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, + "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, + scalar_new_name, &VS90::pcrtd_scalar_new, VS90::crtd_scalar_new, + vector_new_name, &VS90::pcrtd_vector_new, VS90::crtd_vector_new, + "_aligned_malloc", &VS90::pcrtd_aligned_malloc, VS90::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS90::pcrtd_aligned_offset_malloc, VS90::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS90::pcrtd_aligned_realloc, VS90::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS90::pcrtd_aligned_offset_realloc, VS90::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS90::pcrtd_aligned_recalloc, VS90::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS90::pcrtd_aligned_offset_recalloc, VS90::crtd__aligned_offset_recalloc, + NULL, NULL, NULL +}; + +static patchentry_t msvcr90dPatch [] = { + "_calloc_dbg", &VS90d::pcrtd__calloc_dbg, VS90d::crtd__calloc_dbg, + "_malloc_dbg", &VS90d::pcrtd__malloc_dbg, VS90d::crtd__malloc_dbg, + "_realloc_dbg", &VS90d::pcrtd__realloc_dbg, VS90d::crtd__realloc_dbg, + "_recalloc_dbg", &VS90d::pcrtd__recalloc_dbg, VS90d::crtd__recalloc_dbg, + scalar_new_dbg_name, &VS90d::pcrtd__scalar_new_dbg, VS90d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS90d::pcrtd__vector_new_dbg, VS90d::crtd__vector_new_dbg, + "calloc", &VS90d::pcrtd_calloc, VS90d::crtd_calloc, + "malloc", &VS90d::pcrtd_malloc, VS90d::crtd_malloc, + "realloc", &VS90d::pcrtd_realloc, VS90d::crtd_realloc, + "_recalloc", &VS90d::pcrtd_recalloc, VS90d::crtd__recalloc, + scalar_new_name, &VS90d::pcrtd_scalar_new, VS90d::crtd_scalar_new, + vector_new_name, &VS90d::pcrtd_vector_new, VS90d::crtd_vector_new, + "_aligned_malloc_dbg", &VS90d::pcrtd__aligned_malloc_dbg, VS90d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS90d::pcrtd__aligned_offset_malloc_dbg, VS90d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS90d::pcrtd__aligned_realloc_dbg, VS90d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS90d::pcrtd__aligned_offset_realloc_dbg, VS90d::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS90d::pcrtd__aligned_recalloc_dbg, VS90d::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS90d::pcrtd__aligned_offset_recalloc_dbg, VS90d::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS90d::pcrtd_aligned_malloc, VS90d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS90d::pcrtd_aligned_offset_malloc, VS90d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS90d::pcrtd_aligned_realloc, VS90d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS90d::pcrtd_aligned_offset_realloc, VS90d::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS90d::pcrtd_aligned_recalloc, VS90d::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS90d::pcrtd_aligned_offset_recalloc, VS90d::crtd__aligned_offset_recalloc, + NULL, NULL, NULL +}; + +static patchentry_t msvcr100Patch [] = { + scalar_new_dbg_name, &VS100::pcrtd__scalar_new_dbg, VS100::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS100::pcrtd__vector_new_dbg, VS100::crtd__vector_new_dbg, + "calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, + "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, + "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, + "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, + scalar_new_name, &VS100::pcrtd_scalar_new, VS100::crtd_scalar_new, + vector_new_name, &VS100::pcrtd_vector_new, VS100::crtd_vector_new, + "_aligned_malloc", &VS100::pcrtd_aligned_malloc, VS100::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS100::pcrtd_aligned_offset_malloc, VS100::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS100::pcrtd_aligned_realloc, VS100::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS100::pcrtd_aligned_offset_realloc, VS100::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS100::pcrtd_aligned_recalloc, VS100::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS100::pcrtd_aligned_offset_recalloc, VS100::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, +}; + +static patchentry_t msvcr100dPatch [] = { + "_calloc_dbg", &VS100d::pcrtd__calloc_dbg, VS100d::crtd__calloc_dbg, + "_malloc_dbg", &VS100d::pcrtd__malloc_dbg, VS100d::crtd__malloc_dbg, + "_realloc_dbg", &VS100d::pcrtd__realloc_dbg, VS100d::crtd__realloc_dbg, + "_recalloc_dbg", &VS100d::pcrtd__recalloc_dbg, VS100d::crtd__recalloc_dbg, + scalar_new_dbg_name, &VS100d::pcrtd__scalar_new_dbg, VS100d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS100d::pcrtd__vector_new_dbg, VS100d::crtd__vector_new_dbg, + "calloc", &VS100d::pcrtd_calloc, VS100d::crtd_calloc, + "malloc", &VS100d::pcrtd_malloc, VS100d::crtd_malloc, + "realloc", &VS100d::pcrtd_realloc, VS100d::crtd_realloc, + "_recalloc", &VS100d::pcrtd_recalloc, VS100d::crtd__recalloc, + scalar_new_name, &VS100d::pcrtd_scalar_new, VS100d::crtd_scalar_new, + vector_new_name, &VS100d::pcrtd_vector_new, VS100d::crtd_vector_new, + "_aligned_malloc_dbg", &VS100d::pcrtd__aligned_malloc_dbg, VS100d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS100d::pcrtd__aligned_offset_malloc_dbg, VS100d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS100d::pcrtd__aligned_realloc_dbg, VS100d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS100d::pcrtd__aligned_offset_realloc_dbg, VS100d::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS100d::pcrtd__aligned_recalloc_dbg, VS100d::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS100d::pcrtd__aligned_offset_recalloc_dbg,VS100d::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS100d::pcrtd_aligned_malloc, VS100d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS100d::pcrtd_aligned_offset_malloc, VS100d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS100d::pcrtd_aligned_realloc, VS100d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS100d::pcrtd_aligned_offset_realloc, VS100d::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS100d::pcrtd_aligned_recalloc, VS100d::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS100d::pcrtd_aligned_offset_recalloc, VS100d::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, +}; + +static patchentry_t msvcr110Patch [] = { + scalar_new_dbg_name, &VS110::pcrtd__scalar_new_dbg, VS110::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS110::pcrtd__vector_new_dbg, VS110::crtd__vector_new_dbg, + "calloc", &VS110::pcrtd_calloc, VS110::crtd_calloc, + "malloc", &VS110::pcrtd_malloc, VS110::crtd_malloc, + "realloc", &VS110::pcrtd_realloc, VS110::crtd_realloc, + "_recalloc", &VS110::pcrtd_recalloc, VS110::crtd__recalloc, + scalar_new_name, &VS110::pcrtd_scalar_new, VS110::crtd_scalar_new, + vector_new_name, &VS110::pcrtd_vector_new, VS110::crtd_vector_new, + "_aligned_malloc", &VS110::pcrtd_aligned_malloc, VS110::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS110::pcrtd_aligned_offset_malloc, VS110::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS110::pcrtd_aligned_realloc, VS110::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS110::pcrtd_aligned_offset_realloc, VS110::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS110::pcrtd_aligned_recalloc, VS110::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS110::pcrtd_aligned_offset_recalloc, VS110::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, +}; + +static patchentry_t msvcr110dPatch [] = { + "_calloc_dbg", &VS110d::pcrtd__calloc_dbg, VS110d::crtd__calloc_dbg, + "_malloc_dbg", &VS110d::pcrtd__malloc_dbg, VS110d::crtd__malloc_dbg, + "_realloc_dbg", &VS110d::pcrtd__realloc_dbg, VS110d::crtd__realloc_dbg, + "_recalloc_dbg", &VS110d::pcrtd__recalloc_dbg, VS110d::crtd__recalloc_dbg, + scalar_new_dbg_name, &VS110d::pcrtd__scalar_new_dbg, VS110d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS110d::pcrtd__vector_new_dbg, VS110d::crtd__vector_new_dbg, + "calloc", &VS110d::pcrtd_calloc, VS110d::crtd_calloc, + "malloc", &VS110d::pcrtd_malloc, VS110d::crtd_malloc, + "realloc", &VS110d::pcrtd_realloc, VS110d::crtd_realloc, + "_recalloc", &VS110d::pcrtd_recalloc, VS110d::crtd__recalloc, + scalar_new_name, &VS110d::pcrtd_scalar_new, VS110d::crtd_scalar_new, + vector_new_name, &VS110d::pcrtd_vector_new, VS110d::crtd_vector_new, + "_aligned_malloc_dbg", &VS110d::pcrtd__aligned_malloc_dbg, VS110d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS110d::pcrtd__aligned_offset_malloc_dbg, VS110d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS110d::pcrtd__aligned_realloc_dbg, VS110d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS110d::pcrtd__aligned_offset_realloc_dbg, VS110d::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS110d::pcrtd__aligned_recalloc_dbg, VS110d::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS110d::pcrtd__aligned_offset_recalloc_dbg,VS110d::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS110d::pcrtd_aligned_malloc, VS110d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS110d::pcrtd_aligned_offset_malloc, VS110d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS110d::pcrtd_aligned_realloc, VS110d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS110d::pcrtd_aligned_offset_realloc, VS110d::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS110d::pcrtd_aligned_recalloc, VS110d::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS110d::pcrtd_aligned_offset_recalloc, VS110d::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, +}; + +patchentry_t VisualLeakDetector::m_ntdllPatch [] = { + "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, + "RtlFreeHeap", NULL, VisualLeakDetector::_RtlFreeHeap, + "RtlReAllocateHeap", NULL, VisualLeakDetector::_RtlReAllocateHeap, + NULL, NULL, NULL +}; + +patchentry_t VisualLeakDetector::m_ole32Patch [] = { + "CoGetMalloc", NULL, VisualLeakDetector::_CoGetMalloc, + "CoTaskMemAlloc", NULL, VisualLeakDetector::_CoTaskMemAlloc, + "CoTaskMemRealloc", NULL, VisualLeakDetector::_CoTaskMemRealloc, + NULL, NULL, NULL +}; + +moduleentry_t VisualLeakDetector::m_patchTable [] = { + // Win32 heap APIs. + "kernel32.dll", 0x0, m_kernelbasePatch, // we patch this record on Win7 + "kernel32.dll", 0x0, m_kernel32Patch, + + // MFC new operators (exported by ordinal). + "mfc42.dll", 0x0, mfc42Patch, + "mfc42d.dll", 0x0, mfc42dPatch, + "mfc42u.dll", 0x0, mfc42uPatch, + "mfc42ud.dll", 0x0, mfc42udPatch, + "mfc70.dll", 0x0, mfc70Patch, + "mfc70d.dll", 0x0, mfc70dPatch, + "mfc70u.dll", 0x0, mfc70uPatch, + "mfc70ud.dll", 0x0, mfc70udPatch, + "mfc71.dll", 0x0, mfc71Patch, + "mfc71d.dll", 0x0, mfc71dPatch, + "mfc71u.dll", 0x0, mfc71uPatch, + "mfc71ud.dll", 0x0, mfc71udPatch, + "mfc80.dll", 0x0, mfc80Patch, + "mfc80d.dll", 0x0, mfc80dPatch, + "mfc80u.dll", 0x0, mfc80uPatch, + "mfc80ud.dll", 0x0, mfc80udPatch, + "mfc90.dll", 0x0, mfc90Patch, + "mfc90d.dll", 0x0, mfc90dPatch, + "mfc90u.dll", 0x0, mfc90uPatch, + "mfc90ud.dll", 0x0, mfc90udPatch, + "mfc100.dll", 0x0, mfc100Patch, + "mfc100d.dll", 0x0, mfc100dPatch, + "mfc100u.dll", 0x0, mfc100uPatch, + "mfc100ud.dll", 0x0, mfc100udPatch, + "mfc110.dll", 0x0, mfc110Patch, + "mfc110d.dll", 0x0, mfc110dPatch, + "mfc110u.dll", 0x0, mfc110uPatch, + "mfc110ud.dll", 0x0, mfc110udPatch, + + // CRT new operators and heap APIs. + "msvcrt.dll", 0x0, msvcrtPatch, + "msvcrtd.dll", 0x0, msvcrtdPatch, + "msvcr70.dll", 0x0, msvcr70Patch, + "msvcr70d.dll", 0x0, msvcr70dPatch, + "msvcr71.dll", 0x0, msvcr71Patch, + "msvcr71d.dll", 0x0, msvcr71dPatch, + "msvcr80.dll", 0x0, msvcr80Patch, + "msvcr80d.dll", 0x0, msvcr80dPatch, + "msvcr90.dll", 0x0, msvcr90Patch, + "msvcr90d.dll", 0x0, msvcr90dPatch, + "msvcr100.dll", 0x0, msvcr100Patch, + "msvcr100d.dll",0x0, msvcr100dPatch, + "msvcr110.dll", 0x0, msvcr110Patch, + "msvcr110d.dll",0x0, msvcr110dPatch, + + // NT APIs. + "ntdll.dll", 0x0, m_ntdllPatch, + + // COM heap APIs. + "ole32.dll", 0x0, m_ole32Patch +}; diff --git a/ntapi.h b/ntapi.h index 017368ad..f2b3a357 100644 --- a/ntapi.h +++ b/ntapi.h @@ -46,7 +46,7 @@ struct unicodestring_t { // be load-time linked (no import library is available for these). typedef NTSTATUS (__stdcall *LdrLoadDll_t) (LPWSTR, ULONG, unicodestring_t *, PHANDLE); typedef LPVOID (__stdcall *RtlAllocateHeap_t) (HANDLE, DWORD, SIZE_T); -typedef BOOL (__stdcall *RtlFreeHeap_t) (HANDLE, DWORD, LPVOID); +typedef BYTE (__stdcall *RtlFreeHeap_t) (HANDLE, DWORD, LPVOID); typedef LPVOID (__stdcall *RtlReAllocateHeap_t) (HANDLE, DWORD, LPVOID, SIZE_T); // Provide forward declarations for the NT APIs for any source files that diff --git a/vld.cpp b/vld.cpp index a4a0da6f..cf602a07 100644 --- a/vld.cpp +++ b/vld.cpp @@ -58,579 +58,6 @@ ReportHookSet* g_pReportHooks; // The one and only VisualLeakDetector object instance. __declspec(dllexport) VisualLeakDetector g_vld; -// Global function pointers for explicit dynamic linking with functions listed -// in the import patch table. Using explicit dynamic linking minimizes VLD's -// footprint by loading only modules that are actually used. These pointers will -// be linked to the real functions the first time they are used. - -// The import patch table: lists the heap-related API imports that VLD patches -// through to replacement functions provided by VLD. Having this table simply -// makes it more convenient to add additional IAT patches. -patchentry_t VisualLeakDetector::m_kernelbasePatch [] = { - "GetProcAddress", NULL, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. - NULL, NULL, NULL -}; - -patchentry_t VisualLeakDetector::m_kernel32Patch [] = { - "HeapAlloc", NULL, _HeapAlloc, - "HeapCreate", NULL, _HeapCreate, - "HeapDestroy", NULL, _HeapDestroy, - "HeapFree", NULL, _HeapFree, - "HeapReAlloc", NULL, _HeapReAlloc, - NULL, NULL, NULL -}; - -#define ORDINAL(x) (LPCSTR)x -#if !defined(_M_X64) -#define ORDINAL2(x86, x64) (LPCSTR)x86 -#else -#define ORDINAL2(x86, x64) (LPCSTR)x64 -#endif - -VisualLeakDetector::_GetProcAddressType *VisualLeakDetector::m_original_GetProcAddress = NULL; - -static patchentry_t mfc42Patch [] = { - // XXX why are the vector new operators missing for mfc42.dll? - //ORDINAL(711), &VS60::pmfcd_scalar_new, VS60::mfcd_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc42dPatch [] = { - // XXX why are the vector new operators missing for mfc42d.dll? - ORDINAL(711), &VS60d::pmfcd_scalar_new, VS60d::mfcd_scalar_new, - ORDINAL(712), &VS60d::pmfcd__scalar_new_dbg_4p, VS60d::mfcd__scalar_new_dbg_4p, - ORDINAL(714), &VS60d::pmfcd__scalar_new_dbg_3p, VS60d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc42uPatch [] = { - // XXX why are the vector new operators missing for mfc42u.dll? - //ORDINAL(711), &VS60::pmfcud_scalar_new, VS60::mfcud_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc42udPatch [] = { - // XXX why are the vector new operators missing for mfc42ud.dll? - ORDINAL(711), &VS60d::pmfcud_scalar_new, VS60d::mfcud_scalar_new, - ORDINAL(712), &VS60d::pmfcud__scalar_new_dbg_4p, VS60d::mfcud__scalar_new_dbg_4p, - ORDINAL(714), &VS60d::pmfcud__scalar_new_dbg_3p, VS60d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc70Patch [] = { - //ORDINAL(257), &VS70::pmfcd_vector_new, VS70::mfcd_vector_new, - //ORDINAL(832), &VS70::pmfcd_scalar_new, VS70::mfcd_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc70dPatch [] = { - ORDINAL(257), &VS70d::pmfcd_vector_new, VS70d::mfcd_vector_new, - ORDINAL(258), &VS70d::pmfcd__vector_new_dbg_4p, VS70d::mfcd__vector_new_dbg_4p, - ORDINAL(259), &VS70d::pmfcd__vector_new_dbg_3p, VS70d::mfcd__vector_new_dbg_3p, - ORDINAL(832), &VS70d::pmfcd_scalar_new, VS70d::mfcd_scalar_new, - ORDINAL(833), &VS70d::pmfcd__scalar_new_dbg_4p, VS70d::mfcd__scalar_new_dbg_4p, - ORDINAL(834), &VS70d::pmfcd__scalar_new_dbg_3p, VS70d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc70uPatch [] = { - //ORDINAL(258), &VS70::pmfcud_vector_new, VS70::mfcud_vector_new, - //ORDINAL(833), &VS70::pmfcud_scalar_new, VS70::mfcud_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc70udPatch [] = { - ORDINAL(258), &VS70d::pmfcud_vector_new, VS70d::mfcud_vector_new, - ORDINAL(259), &VS70d::pmfcud__vector_new_dbg_4p, VS70d::mfcud__vector_new_dbg_4p, - ORDINAL(260), &VS70d::pmfcud__vector_new_dbg_3p, VS70d::mfcud__vector_new_dbg_3p, - ORDINAL(833), &VS70d::pmfcud_scalar_new, VS70d::mfcud_scalar_new, - ORDINAL(834), &VS70d::pmfcud__scalar_new_dbg_4p, VS70d::mfcud__scalar_new_dbg_4p, - ORDINAL(835), &VS70d::pmfcud__scalar_new_dbg_3p, VS70d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc71Patch [] = { - //ORDINAL(267), &VS71::pmfcd_vector_new, VS71::mfcd_vector_new, - //ORDINAL(893), &VS71::pmfcd_scalar_new, VS71::mfcd_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc71dPatch [] = { - ORDINAL(267), &VS71d::pmfcd_vector_new, VS71d::mfcd_vector_new, - ORDINAL(268), &VS71d::pmfcd__vector_new_dbg_4p, VS71d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS71d::pmfcd__vector_new_dbg_3p, VS71d::mfcd__vector_new_dbg_3p, - ORDINAL(893), &VS71d::pmfcd_scalar_new, VS71d::mfcd_scalar_new, - ORDINAL(894), &VS71d::pmfcd__scalar_new_dbg_4p, VS71d::mfcd__scalar_new_dbg_4p, - ORDINAL(895), &VS71d::pmfcd__scalar_new_dbg_3p, VS71d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc71uPatch [] = { - //ORDINAL(267), &VS71::pmfcud_vector_new, VS71::mfcud_vector_new, - //ORDINAL(893), &VS71::pmfcud_scalar_new, VS71::mfcud_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc71udPatch [] = { - ORDINAL(267), &VS71d::pmfcud_vector_new, VS71d::mfcud_vector_new, - ORDINAL(268), &VS71d::pmfcud__vector_new_dbg_4p, VS71d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS71d::pmfcud__vector_new_dbg_3p, VS71d::mfcud__vector_new_dbg_3p, - ORDINAL(893), &VS71d::pmfcud_scalar_new, VS71d::mfcud_scalar_new, - ORDINAL(894), &VS71d::pmfcud__scalar_new_dbg_4p, VS71d::mfcud__scalar_new_dbg_4p, - ORDINAL(895), &VS71d::pmfcud__scalar_new_dbg_3p, VS71d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc80Patch [] = { - //ORDINAL(267), &VS80::pmfcd_vector_new, VS80::mfcd_vector_new, - //ORDINAL2(893,907), &VS80::pmfcd_scalar_new, VS80::mfcd_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc80dPatch [] = { - ORDINAL(267), &VS80d::pmfcd_vector_new, VS80d::mfcd_vector_new, - ORDINAL(268), &VS80d::pmfcd__vector_new_dbg_4p, VS80d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS80d::pmfcd__vector_new_dbg_3p, VS80d::mfcd__vector_new_dbg_3p, - ORDINAL2(893,907), &VS80d::pmfcd_scalar_new, VS80d::mfcd_scalar_new, - ORDINAL2(894,908), &VS80d::pmfcd__scalar_new_dbg_4p, VS80d::mfcd__scalar_new_dbg_4p, - ORDINAL2(895,909), &VS80d::pmfcd__scalar_new_dbg_3p, VS80d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc80uPatch [] = { - //ORDINAL(267), &VS80::pmfcud_vector_new, VS80::mfcud_vector_new, - //ORDINAL2(893,907), &VS80::pmfcud_scalar_new, VS80::mfcud_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc80udPatch [] = { - ORDINAL(267), &VS80d::pmfcud_vector_new, VS80d::mfcud_vector_new, - ORDINAL(268), &VS80d::pmfcud__vector_new_dbg_4p, VS80d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS80d::pmfcud__vector_new_dbg_3p, VS80d::mfcud__vector_new_dbg_3p, - ORDINAL2(893,907), &VS80d::pmfcud_scalar_new, VS80d::mfcud_scalar_new, - ORDINAL2(894,908), &VS80d::pmfcud__scalar_new_dbg_4p, VS80d::mfcud__scalar_new_dbg_4p, - ORDINAL2(895,909), &VS80d::pmfcud__scalar_new_dbg_3p, VS80d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc90Patch [] = { - ORDINAL(265), &VS90::pmfcd_vector_new, VS90::mfcd_vector_new, - ORDINAL2(798, 776), &VS90::pmfcd_scalar_new, VS90::mfcd_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc90dPatch [] = { - ORDINAL(267), &VS90d::pmfcd_vector_new, VS90d::mfcd_vector_new, - ORDINAL(268), &VS90d::pmfcd__vector_new_dbg_4p, VS90d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS90d::pmfcd__vector_new_dbg_3p, VS90d::mfcd__vector_new_dbg_3p, - ORDINAL2(931, 909), &VS90d::pmfcd_scalar_new, VS90d::mfcd_scalar_new, - ORDINAL2(932, 910), &VS90d::pmfcd__scalar_new_dbg_4p, VS90d::mfcd__scalar_new_dbg_4p, - ORDINAL2(933, 911), &VS90d::pmfcd__scalar_new_dbg_3p, VS90d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc90uPatch [] = { - ORDINAL(265), &VS90::pmfcud_vector_new, VS90::mfcud_vector_new, - ORDINAL2(798, 776), &VS90::pmfcud_scalar_new, VS90::mfcud_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc90udPatch [] = { - ORDINAL(267), &VS90d::pmfcud_vector_new, VS90d::mfcud_vector_new, - ORDINAL(268), &VS90d::pmfcud__vector_new_dbg_4p, VS90d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS90d::pmfcud__vector_new_dbg_3p, VS90d::mfcud__vector_new_dbg_3p, - ORDINAL2(935, 913), &VS90d::pmfcud_scalar_new, VS90d::mfcud_scalar_new, - ORDINAL2(936, 914), &VS90d::pmfcud__scalar_new_dbg_4p, VS90d::mfcud__scalar_new_dbg_4p, - ORDINAL2(937, 915), &VS90d::pmfcud__scalar_new_dbg_3p, VS90d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc100Patch [] = { - ORDINAL(265), &VS100::pmfcd_vector_new, VS100::mfcd_vector_new, - ORDINAL2(1294, 1272), &VS100::pmfcd_scalar_new, VS100::mfcd_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc100dPatch [] = { - ORDINAL(267), &VS100d::pmfcd_vector_new, VS100d::mfcd_vector_new, - ORDINAL(268), &VS100d::pmfcd__vector_new_dbg_4p, VS100d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS100d::pmfcd__vector_new_dbg_3p, VS100d::mfcd__vector_new_dbg_3p, - ORDINAL2(1427, 1405), &VS100d::pmfcd_scalar_new, VS100d::mfcd_scalar_new, - ORDINAL2(1428, 1406), &VS100d::pmfcd__scalar_new_dbg_4p, VS100d::mfcd__scalar_new_dbg_4p, - ORDINAL2(1429, 1407), &VS100d::pmfcd__scalar_new_dbg_3p, VS100d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc100uPatch [] = { - ORDINAL(265), &VS100::pmfcud_vector_new, VS100::mfcud_vector_new, - ORDINAL2(1298, 1276), &VS100::pmfcud_scalar_new, VS100::mfcud_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc100udPatch [] = { - ORDINAL(267), &VS100d::pmfcud_vector_new, VS100d::mfcud_vector_new, - ORDINAL(268), &VS100d::pmfcud__vector_new_dbg_4p, VS100d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS100d::pmfcud__vector_new_dbg_3p, VS100d::mfcud__vector_new_dbg_3p, - ORDINAL2(1434, 1412), &VS100d::pmfcud_scalar_new, VS100d::mfcud_scalar_new, - ORDINAL2(1435, 1413), &VS100d::pmfcud__scalar_new_dbg_4p, VS100d::mfcud__scalar_new_dbg_4p, - ORDINAL2(1436, 1414), &VS100d::pmfcud__scalar_new_dbg_3p, VS100d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc110Patch [] = { - ORDINAL(265), &VS110::pmfcd_vector_new, VS110::mfcd_vector_new, - ORDINAL2(1498, 1476), &VS110::pmfcd_scalar_new, VS110::mfcd_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc110dPatch [] = { - ORDINAL(267), &VS110d::pmfcd_vector_new, VS110d::mfcd_vector_new, - ORDINAL(268), &VS110d::pmfcd__vector_new_dbg_4p, VS110d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS110d::pmfcd__vector_new_dbg_3p, VS110d::mfcd__vector_new_dbg_3p, - ORDINAL2(1629, 1607), &VS110d::pmfcd_scalar_new, VS110d::mfcd_scalar_new, - ORDINAL2(1630, 1608), &VS110d::pmfcd__scalar_new_dbg_4p, VS110d::mfcd__scalar_new_dbg_4p, - ORDINAL2(1631, 1609), &VS110d::pmfcd__scalar_new_dbg_3p, VS110d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t mfc110uPatch [] = { - ORDINAL(265), &VS110::pmfcud_vector_new, VS110::mfcud_vector_new, - ORDINAL2(1502, 1480), &VS110::pmfcud_scalar_new, VS110::mfcud_scalar_new, - NULL, NULL, NULL -}; - -static patchentry_t mfc110udPatch [] = { - ORDINAL(267), &VS110d::pmfcud_vector_new, VS110d::mfcud_vector_new, - ORDINAL(268), &VS110d::pmfcud__vector_new_dbg_4p, VS110d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS110d::pmfcud__vector_new_dbg_3p, VS110d::mfcud__vector_new_dbg_3p, - ORDINAL2(1636, 1614), &VS110d::pmfcud_scalar_new, VS110d::mfcud_scalar_new, - ORDINAL2(1637, 1615), &VS110d::pmfcud__scalar_new_dbg_4p, VS110d::mfcud__scalar_new_dbg_4p, - ORDINAL2(1638, 1616), &VS110d::pmfcud__scalar_new_dbg_3p, VS110d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL -}; - -static patchentry_t msvcrtPatch [] = { - scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, - //vector_new_dbg_name, &VS60::pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, - "calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, - "malloc", &VS60::pcrtd_malloc, VS60::crtd_malloc, - "realloc", &VS60::pcrtd_realloc, VS60::crtd_realloc, - scalar_new_name, &VS60::pcrtd_scalar_new, VS60::crtd_scalar_new, - //vector_new_name, &VS60::pcrtd_vector_new, VS60::crtd_vector_new, - NULL, NULL, NULL -}; - -static patchentry_t msvcrtdPatch [] = { - "_calloc_dbg", &VS60d::pcrtd__calloc_dbg, VS60d::crtd__calloc_dbg, - "_malloc_dbg", &VS60d::pcrtd__malloc_dbg, VS60d::crtd__malloc_dbg, - "_realloc_dbg", &VS60d::pcrtd__realloc_dbg, VS60d::crtd__realloc_dbg, - scalar_new_dbg_name, &VS60d::pcrtd__scalar_new_dbg, VS60d::crtd__scalar_new_dbg, - //vector_new_dbg_name, &VS60d::pcrtd__vector_new_dbg, VS60d::crtd__vector_new_dbg, - "calloc", &VS60d::pcrtd_calloc, VS60d::crtd_calloc, - "malloc", &VS60d::pcrtd_malloc, VS60d::crtd_malloc, - "realloc", &VS60d::pcrtd_realloc, VS60d::crtd_realloc, - scalar_new_name, &VS60d::pcrtd_scalar_new, VS60d::crtd_scalar_new, - //vector_new_name, &VS60d::pcrtd_vector_new, VS60d::crtd_vector_new, - NULL, NULL, NULL -}; - -static patchentry_t msvcr70Patch [] = { - scalar_new_dbg_name, &VS70::pcrtd__scalar_new_dbg, VS70::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS70::pcrtd__vector_new_dbg, VS70::crtd__vector_new_dbg, - "calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, - "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, - "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, - scalar_new_name, &VS70::pcrtd_scalar_new, VS70::crtd_scalar_new, - vector_new_name, &VS70::pcrtd_vector_new, VS70::crtd_vector_new, - NULL, NULL, NULL -}; - -static patchentry_t msvcr70dPatch [] = { - "_calloc_dbg", &VS70d::pcrtd__calloc_dbg, VS70d::crtd__calloc_dbg, - "_malloc_dbg", &VS70d::pcrtd__malloc_dbg, VS70d::crtd__malloc_dbg, - "_realloc_dbg", &VS70d::pcrtd__realloc_dbg, VS70d::crtd__realloc_dbg, - scalar_new_dbg_name, &VS70d::pcrtd__scalar_new_dbg, VS70d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS70d::pcrtd__vector_new_dbg, VS70d::crtd__vector_new_dbg, - "calloc", &VS70d::pcrtd_calloc, VS70d::crtd_calloc, - "malloc", &VS70d::pcrtd_malloc, VS70d::crtd_malloc, - "realloc", &VS70d::pcrtd_realloc, VS70d::crtd_realloc, - scalar_new_name, &VS70d::pcrtd_scalar_new, VS70d::crtd_scalar_new, - vector_new_name, &VS70d::pcrtd_vector_new, VS70d::crtd_vector_new, - NULL, NULL, NULL -}; - -static patchentry_t msvcr71Patch [] = { - scalar_new_dbg_name, &VS71::pcrtd__scalar_new_dbg, VS71::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS71::pcrtd__vector_new_dbg, VS71::crtd__vector_new_dbg, - "calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, - "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, - "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, - scalar_new_name, &VS71::pcrtd_scalar_new, VS71::crtd_scalar_new, - vector_new_name, &VS71::pcrtd_vector_new, VS71::crtd_vector_new, - NULL, NULL, NULL -}; - -static patchentry_t msvcr71dPatch [] = { - "_calloc_dbg", &VS71d::pcrtd__calloc_dbg, VS71d::crtd__calloc_dbg, - "_malloc_dbg", &VS71d::pcrtd__malloc_dbg, VS71d::crtd__malloc_dbg, - "_realloc_dbg", &VS71d::pcrtd__realloc_dbg, VS71d::crtd__realloc_dbg, - scalar_new_dbg_name, &VS71d::pcrtd__scalar_new_dbg, VS71d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS71d::pcrtd__vector_new_dbg, VS71d::crtd__vector_new_dbg, - "calloc", &VS71d::pcrtd_calloc, VS71d::crtd_calloc, - "malloc", &VS71d::pcrtd_malloc, VS71d::crtd_malloc, - "realloc", &VS71d::pcrtd_realloc, VS71d::crtd_realloc, - scalar_new_name, &VS71d::pcrtd_scalar_new, VS71d::crtd_scalar_new, - vector_new_name, &VS71d::pcrtd_vector_new, VS71d::crtd_vector_new, - NULL, NULL, NULL -}; - -static patchentry_t msvcr80Patch [] = { - scalar_new_dbg_name, &VS80::pcrtd__scalar_new_dbg, VS80::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS80::pcrtd__vector_new_dbg, VS80::crtd__vector_new_dbg, - "calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, - "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, - "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, - scalar_new_name, &VS80::pcrtd_scalar_new, VS80::crtd_scalar_new, - vector_new_name, &VS80::pcrtd_vector_new, VS80::crtd_vector_new, - "_aligned_malloc", &VS80::pcrtd_aligned_malloc, VS80::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS80::pcrtd_aligned_offset_malloc, VS80::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS80::pcrtd_aligned_realloc, VS80::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS80::pcrtd_aligned_offset_realloc, VS80::crtd__aligned_offset_realloc, - NULL, NULL, NULL -}; - -static patchentry_t msvcr80dPatch [] = { - "_calloc_dbg", &VS80d::pcrtd__calloc_dbg, VS80d::crtd__calloc_dbg, - "_malloc_dbg", &VS80d::pcrtd__malloc_dbg, VS80d::crtd__malloc_dbg, - "_realloc_dbg", &VS80d::pcrtd__realloc_dbg, VS80d::crtd__realloc_dbg, - scalar_new_dbg_name, &VS80d::pcrtd__scalar_new_dbg, VS80d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS80d::pcrtd__vector_new_dbg, VS80d::crtd__vector_new_dbg, - "calloc", &VS80d::pcrtd_calloc, VS80d::crtd_calloc, - "malloc", &VS80d::pcrtd_malloc, VS80d::crtd_malloc, - "realloc", &VS80d::pcrtd_realloc, VS80d::crtd_realloc, - scalar_new_name, &VS80d::pcrtd_scalar_new, VS80d::crtd_scalar_new, - vector_new_name, &VS80d::pcrtd_vector_new, VS80d::crtd_vector_new, - "_aligned_malloc_dbg", &VS80d::pcrtd__aligned_malloc_dbg, VS80d::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS80d::pcrtd__aligned_offset_malloc_dbg, VS80d::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS80d::pcrtd__aligned_realloc_dbg, VS80d::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS80d::pcrtd__aligned_offset_realloc_dbg, VS80d::crtd__aligned_offset_realloc_dbg, - "_aligned_malloc", &VS80d::pcrtd_aligned_malloc, VS80d::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS80d::pcrtd_aligned_offset_malloc, VS80d::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS80d::pcrtd_aligned_realloc, VS80d::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS80d::pcrtd_aligned_offset_realloc, VS80d::crtd__aligned_offset_realloc, - NULL, NULL, NULL -}; - -static patchentry_t msvcr90Patch [] = { - scalar_new_dbg_name, &VS90::pcrtd__scalar_new_dbg, VS90::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS90::pcrtd__vector_new_dbg, VS90::crtd__vector_new_dbg, - "calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, - "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, - "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, - "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, - scalar_new_name, &VS90::pcrtd_scalar_new, VS90::crtd_scalar_new, - vector_new_name, &VS90::pcrtd_vector_new, VS90::crtd_vector_new, - "_aligned_malloc", &VS90::pcrtd_aligned_malloc, VS90::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS90::pcrtd_aligned_offset_malloc, VS90::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS90::pcrtd_aligned_realloc, VS90::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS90::pcrtd_aligned_offset_realloc, VS90::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS90::pcrtd_aligned_recalloc, VS90::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS90::pcrtd_aligned_offset_recalloc, VS90::crtd__aligned_offset_recalloc, - NULL, NULL, NULL -}; - -static patchentry_t msvcr90dPatch [] = { - "_calloc_dbg", &VS90d::pcrtd__calloc_dbg, VS90d::crtd__calloc_dbg, - "_malloc_dbg", &VS90d::pcrtd__malloc_dbg, VS90d::crtd__malloc_dbg, - "_realloc_dbg", &VS90d::pcrtd__realloc_dbg, VS90d::crtd__realloc_dbg, - "_recalloc_dbg", &VS90d::pcrtd__recalloc_dbg, VS90d::crtd__recalloc_dbg, - scalar_new_dbg_name, &VS90d::pcrtd__scalar_new_dbg, VS90d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS90d::pcrtd__vector_new_dbg, VS90d::crtd__vector_new_dbg, - "calloc", &VS90d::pcrtd_calloc, VS90d::crtd_calloc, - "malloc", &VS90d::pcrtd_malloc, VS90d::crtd_malloc, - "realloc", &VS90d::pcrtd_realloc, VS90d::crtd_realloc, - "_recalloc", &VS90d::pcrtd_recalloc, VS90d::crtd__recalloc, - scalar_new_name, &VS90d::pcrtd_scalar_new, VS90d::crtd_scalar_new, - vector_new_name, &VS90d::pcrtd_vector_new, VS90d::crtd_vector_new, - "_aligned_malloc_dbg", &VS90d::pcrtd__aligned_malloc_dbg, VS90d::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS90d::pcrtd__aligned_offset_malloc_dbg, VS90d::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS90d::pcrtd__aligned_realloc_dbg, VS90d::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS90d::pcrtd__aligned_offset_realloc_dbg, VS90d::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", &VS90d::pcrtd__aligned_recalloc_dbg, VS90d::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", &VS90d::pcrtd__aligned_offset_recalloc_dbg, VS90d::crtd__aligned_offset_recalloc_dbg, - "_aligned_malloc", &VS90d::pcrtd_aligned_malloc, VS90d::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS90d::pcrtd_aligned_offset_malloc, VS90d::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS90d::pcrtd_aligned_realloc, VS90d::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS90d::pcrtd_aligned_offset_realloc, VS90d::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS90d::pcrtd_aligned_recalloc, VS90d::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS90d::pcrtd_aligned_offset_recalloc, VS90d::crtd__aligned_offset_recalloc, - NULL, NULL, NULL -}; - -static patchentry_t msvcr100Patch [] = { - scalar_new_dbg_name, &VS100::pcrtd__scalar_new_dbg, VS100::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS100::pcrtd__vector_new_dbg, VS100::crtd__vector_new_dbg, - "calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, - "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, - "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, - "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, - scalar_new_name, &VS100::pcrtd_scalar_new, VS100::crtd_scalar_new, - vector_new_name, &VS100::pcrtd_vector_new, VS100::crtd_vector_new, - "_aligned_malloc", &VS100::pcrtd_aligned_malloc, VS100::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS100::pcrtd_aligned_offset_malloc, VS100::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS100::pcrtd_aligned_realloc, VS100::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS100::pcrtd_aligned_offset_realloc, VS100::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS100::pcrtd_aligned_recalloc, VS100::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS100::pcrtd_aligned_offset_recalloc, VS100::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, -}; - -static patchentry_t msvcr100dPatch [] = { - "_calloc_dbg", &VS100d::pcrtd__calloc_dbg, VS100d::crtd__calloc_dbg, - "_malloc_dbg", &VS100d::pcrtd__malloc_dbg, VS100d::crtd__malloc_dbg, - "_realloc_dbg", &VS100d::pcrtd__realloc_dbg, VS100d::crtd__realloc_dbg, - "_recalloc_dbg", &VS100d::pcrtd__recalloc_dbg, VS100d::crtd__recalloc_dbg, - scalar_new_dbg_name, &VS100d::pcrtd__scalar_new_dbg, VS100d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS100d::pcrtd__vector_new_dbg, VS100d::crtd__vector_new_dbg, - "calloc", &VS100d::pcrtd_calloc, VS100d::crtd_calloc, - "malloc", &VS100d::pcrtd_malloc, VS100d::crtd_malloc, - "realloc", &VS100d::pcrtd_realloc, VS100d::crtd_realloc, - "_recalloc", &VS100d::pcrtd_recalloc, VS100d::crtd__recalloc, - scalar_new_name, &VS100d::pcrtd_scalar_new, VS100d::crtd_scalar_new, - vector_new_name, &VS100d::pcrtd_vector_new, VS100d::crtd_vector_new, - "_aligned_malloc_dbg", &VS100d::pcrtd__aligned_malloc_dbg, VS100d::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS100d::pcrtd__aligned_offset_malloc_dbg, VS100d::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS100d::pcrtd__aligned_realloc_dbg, VS100d::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS100d::pcrtd__aligned_offset_realloc_dbg, VS100d::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", &VS100d::pcrtd__aligned_recalloc_dbg, VS100d::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", &VS100d::pcrtd__aligned_offset_recalloc_dbg,VS100d::crtd__aligned_offset_recalloc_dbg, - "_aligned_malloc", &VS100d::pcrtd_aligned_malloc, VS100d::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS100d::pcrtd_aligned_offset_malloc, VS100d::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS100d::pcrtd_aligned_realloc, VS100d::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS100d::pcrtd_aligned_offset_realloc, VS100d::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS100d::pcrtd_aligned_recalloc, VS100d::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS100d::pcrtd_aligned_offset_recalloc, VS100d::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, -}; - -static patchentry_t msvcr110Patch [] = { - scalar_new_dbg_name, &VS110::pcrtd__scalar_new_dbg, VS110::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS110::pcrtd__vector_new_dbg, VS110::crtd__vector_new_dbg, - "calloc", &VS110::pcrtd_calloc, VS110::crtd_calloc, - "malloc", &VS110::pcrtd_malloc, VS110::crtd_malloc, - "realloc", &VS110::pcrtd_realloc, VS110::crtd_realloc, - "_recalloc", &VS110::pcrtd_recalloc, VS110::crtd__recalloc, - scalar_new_name, &VS110::pcrtd_scalar_new, VS110::crtd_scalar_new, - vector_new_name, &VS110::pcrtd_vector_new, VS110::crtd_vector_new, - "_aligned_malloc", &VS110::pcrtd_aligned_malloc, VS110::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS110::pcrtd_aligned_offset_malloc, VS110::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS110::pcrtd_aligned_realloc, VS110::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS110::pcrtd_aligned_offset_realloc, VS110::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS110::pcrtd_aligned_recalloc, VS110::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS110::pcrtd_aligned_offset_recalloc, VS110::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, -}; - -static patchentry_t msvcr110dPatch [] = { - "_calloc_dbg", &VS110d::pcrtd__calloc_dbg, VS110d::crtd__calloc_dbg, - "_malloc_dbg", &VS110d::pcrtd__malloc_dbg, VS110d::crtd__malloc_dbg, - "_realloc_dbg", &VS110d::pcrtd__realloc_dbg, VS110d::crtd__realloc_dbg, - "_recalloc_dbg", &VS110d::pcrtd__recalloc_dbg, VS110d::crtd__recalloc_dbg, - scalar_new_dbg_name, &VS110d::pcrtd__scalar_new_dbg, VS110d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS110d::pcrtd__vector_new_dbg, VS110d::crtd__vector_new_dbg, - "calloc", &VS110d::pcrtd_calloc, VS110d::crtd_calloc, - "malloc", &VS110d::pcrtd_malloc, VS110d::crtd_malloc, - "realloc", &VS110d::pcrtd_realloc, VS110d::crtd_realloc, - "_recalloc", &VS110d::pcrtd_recalloc, VS110d::crtd__recalloc, - scalar_new_name, &VS110d::pcrtd_scalar_new, VS110d::crtd_scalar_new, - vector_new_name, &VS110d::pcrtd_vector_new, VS110d::crtd_vector_new, - "_aligned_malloc_dbg", &VS110d::pcrtd__aligned_malloc_dbg, VS110d::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS110d::pcrtd__aligned_offset_malloc_dbg, VS110d::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS110d::pcrtd__aligned_realloc_dbg, VS110d::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS110d::pcrtd__aligned_offset_realloc_dbg, VS110d::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", &VS110d::pcrtd__aligned_recalloc_dbg, VS110d::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", &VS110d::pcrtd__aligned_offset_recalloc_dbg,VS110d::crtd__aligned_offset_recalloc_dbg, - "_aligned_malloc", &VS110d::pcrtd_aligned_malloc, VS110d::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS110d::pcrtd_aligned_offset_malloc, VS110d::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS110d::pcrtd_aligned_realloc, VS110d::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS110d::pcrtd_aligned_offset_realloc, VS110d::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS110d::pcrtd_aligned_recalloc, VS110d::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS110d::pcrtd_aligned_offset_recalloc, VS110d::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, -}; - -patchentry_t VisualLeakDetector::m_ntdllPatch [] = { - "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, - "RtlFreeHeap", NULL, VisualLeakDetector::_RtlFreeHeap, - "RtlReAllocateHeap", NULL, VisualLeakDetector::_RtlReAllocateHeap, - NULL, NULL, NULL -}; - -patchentry_t VisualLeakDetector::m_ole32Patch [] = { - "CoGetMalloc", NULL, VisualLeakDetector::_CoGetMalloc, - "CoTaskMemAlloc", NULL, VisualLeakDetector::_CoTaskMemAlloc, - "CoTaskMemRealloc", NULL, VisualLeakDetector::_CoTaskMemRealloc, - NULL, NULL, NULL -}; - -moduleentry_t VisualLeakDetector::m_patchTable [] = { - // Win32 heap APIs. - "kernel32.dll", 0x0, m_kernelbasePatch, // we patch this record on Win7 - "kernel32.dll", 0x0, m_kernel32Patch, - - // MFC new operators (exported by ordinal). - "mfc42.dll", 0x0, mfc42Patch, - "mfc42d.dll", 0x0, mfc42dPatch, - "mfc42u.dll", 0x0, mfc42uPatch, - "mfc42ud.dll", 0x0, mfc42udPatch, - "mfc70.dll", 0x0, mfc70Patch, - "mfc70d.dll", 0x0, mfc70dPatch, - "mfc70u.dll", 0x0, mfc70uPatch, - "mfc70ud.dll", 0x0, mfc70udPatch, - "mfc71.dll", 0x0, mfc71Patch, - "mfc71d.dll", 0x0, mfc71dPatch, - "mfc71u.dll", 0x0, mfc71uPatch, - "mfc71ud.dll", 0x0, mfc71udPatch, - "mfc80.dll", 0x0, mfc80Patch, - "mfc80d.dll", 0x0, mfc80dPatch, - "mfc80u.dll", 0x0, mfc80uPatch, - "mfc80ud.dll", 0x0, mfc80udPatch, - "mfc90.dll", 0x0, mfc90Patch, - "mfc90d.dll", 0x0, mfc90dPatch, - "mfc90u.dll", 0x0, mfc90uPatch, - "mfc90ud.dll", 0x0, mfc90udPatch, - "mfc100.dll", 0x0, mfc100Patch, - "mfc100d.dll", 0x0, mfc100dPatch, - "mfc100u.dll", 0x0, mfc100uPatch, - "mfc100ud.dll", 0x0, mfc100udPatch, - "mfc110.dll", 0x0, mfc110Patch, - "mfc110d.dll", 0x0, mfc110dPatch, - "mfc110u.dll", 0x0, mfc110uPatch, - "mfc110ud.dll", 0x0, mfc110udPatch, - - // CRT new operators and heap APIs. - "msvcrt.dll", 0x0, msvcrtPatch, - "msvcrtd.dll", 0x0, msvcrtdPatch, - "msvcr70.dll", 0x0, msvcr70Patch, - "msvcr70d.dll", 0x0, msvcr70dPatch, - "msvcr71.dll", 0x0, msvcr71Patch, - "msvcr71d.dll", 0x0, msvcr71dPatch, - "msvcr80.dll", 0x0, msvcr80Patch, - "msvcr80d.dll", 0x0, msvcr80dPatch, - "msvcr90.dll", 0x0, msvcr90Patch, - "msvcr90d.dll", 0x0, msvcr90dPatch, - "msvcr100.dll", 0x0, msvcr100Patch, - "msvcr100d.dll",0x0, msvcr100dPatch, - "msvcr110.dll", 0x0, msvcr110Patch, - "msvcr110d.dll",0x0, msvcr110dPatch, - - // NT APIs. - "ntdll.dll", 0x0, m_ntdllPatch, - - // COM heap APIs. - "ole32.dll", 0x0, m_ole32Patch -}; - // Patch only this entries in Kernel32.dll and KernelBase.dll patchentry_t ldrLoadDllPatch [] = { "LdrLoadDll", NULL, VisualLeakDetector::_LdrLoadDll, @@ -640,7 +67,6 @@ moduleentry_t ntdllPatch [] = { "ntdll.dll", NULL, ldrLoadDllPatch, }; - BOOL IsWin7OrBetter() { OSVERSIONINFOEX info = { sizeof(OSVERSIONINFOEX) }; @@ -1631,6 +1057,114 @@ VOID VisualLeakDetector::mapHeap (HANDLE heap) } } +// unmapblock - Tracks memory blocks that are freed. Unmaps the specified block +// from the block's information, relinquishing internally allocated resources. +// +// - heap (IN): Handle to the heap to which this block is being freed. +// +// - mem (IN): Pointer to the memory block being freed. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context) +{ + if (NULL == mem) + return; + + // Find this heap's block map. + CriticalSectionLocker cs(m_heapMapLock); + HeapMap::Iterator heapit = m_heapMap->find(heap); + if (heapit == m_heapMap->end()) { + // We don't have a block map for this heap. We must not have monitored + // this allocation (probably happened before VLD was initialized). + return; + } + + // Find this block in the block map. + BlockMap *blockmap = &(*heapit).second->blockMap; + BlockMap::Iterator blockit = blockmap->find(mem); + if (blockit == blockmap->end()) + { + // This memory block is not in the block map. We must not have monitored this + // allocation (probably happened before VLD was initialized). + + // This can also result from allocating on one heap, and freeing on another heap. + // This is an especially bad way to corrupt the application. + // Now we have to search through every heap and every single block in each to make + // sure that this is indeed the case. + if (m_options & VLD_OPT_VALIDATE_HEAPFREE) + { + HANDLE other_heap = NULL; + blockinfo_t* alloc_block = findAllocedBlock(mem, other_heap); // other_heap is an out parameter + bool diff = other_heap != heap; // Check indeed if the other heap is different + if (alloc_block && alloc_block->callStack && diff) + { + Report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); + Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); + Report(L" Call Stack:\n"); + alloc_block->callStack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + + // Now we need a way to print the current callstack at this point: + CallStack* stack_here = CallStack::Create(); + stack_here->getStackTrace(m_maxTraceFrames, context); + Report(L"Deallocation Call stack.\n"); + Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); + Report(L" Call Stack:\n"); + stack_here->dump(FALSE); + // Now it should be safe to delete our temporary callstack + delete stack_here; + stack_here = NULL; + if (IsDebuggerPresent()) + DebugBreak(); + } + } + return; + } + + // Free the blockinfo_t structure and erase it from the block map. + blockinfo_t *info = (*blockit).second; + m_curAlloc -= info->size; + delete info->callStack; + delete info; + blockmap->erase(blockit); +} + +// unmapheap - Tracks heap destruction. Unmaps the specified heap from its block +// map. The block map is cleared and deleted, relinquishing internally +// allocated resources. +// +// - heap (IN): Handle to the heap which is being destroyed. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::unmapHeap (HANDLE heap) +{ + // Find this heap's block map. + CriticalSectionLocker cs(m_heapMapLock); + HeapMap::Iterator heapit = m_heapMap->find(heap); + if (heapit == m_heapMap->end()) { + // This heap hasn't been mapped. We must not have monitored this heap's + // creation (probably happened before VLD was initialized). + return; + } + + // Free all of the blockinfo_t structures stored in the block map. + heapinfo_t *heapinfo = (*heapit).second; + BlockMap *blockmap = &heapinfo->blockMap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + delete (*blockit).second->callStack; + delete (*blockit).second; + } + delete heapinfo; + + // Remove this heap's block map from the heap map. + m_heapMap->erase(heapit); +} + // remapblock - Tracks reallocations. Unmaps a block from its previously // collected information and remaps it to updated information. // @@ -2001,114 +1535,6 @@ blockinfo_t* VisualLeakDetector::findAllocedBlock(LPCVOID mem, __out HANDLE& hea return result; } -// unmapblock - Tracks memory blocks that are freed. Unmaps the specified block -// from the block's information, relinquishing internally allocated resources. -// -// - heap (IN): Handle to the heap to which this block is being freed. -// -// - mem (IN): Pointer to the memory block being freed. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context) -{ - if (NULL == mem) - return; - - // Find this heap's block map. - CriticalSectionLocker cs(m_heapMapLock); - HeapMap::Iterator heapit = m_heapMap->find(heap); - if (heapit == m_heapMap->end()) { - // We don't have a block map for this heap. We must not have monitored - // this allocation (probably happened before VLD was initialized). - return; - } - - // Find this block in the block map. - BlockMap *blockmap = &(*heapit).second->blockMap; - BlockMap::Iterator blockit = blockmap->find(mem); - if (blockit == blockmap->end()) { - // This memory block is not in the block map. We must not have monitored this - // allocation (probably happened before VLD was initialized). - - // This can also result from allocating on one heap, and freeing on another heap. - // This is an especially bad way to corrupt the application. - // Now we have to search through every heap and every single block in each to make - // sure that this is indeed the case. - if (m_options & VLD_OPT_VALIDATE_HEAPFREE) - { - HANDLE other_heap = NULL; - blockinfo_t* alloc_block = findAllocedBlock(mem, other_heap); // other_heap is an out parameter - bool diff = other_heap != heap; // Check indeed if the other heap is different - if (alloc_block && alloc_block->callStack && diff) - { - Report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); - Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); - Report(L" Call Stack:\n"); - alloc_block->callStack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); - - // Now we need a way to print the current callstack at this point: - CallStack* stack_here = CallStack::Create(); - stack_here->getStackTrace(m_maxTraceFrames, context); - Report(L"Deallocation Call stack.\n"); - Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); - Report(L" Call Stack:\n"); - stack_here->dump(FALSE); - // Now it should be safe to delete our temporary callstack - delete stack_here; - stack_here = NULL; - if (IsDebuggerPresent()) - DebugBreak(); - } - } - return; - } - - // Free the blockinfo_t structure and erase it from the block map. - blockinfo_t *info = (*blockit).second; - m_curAlloc -= info->size; - delete info->callStack; - delete info; - blockmap->erase(blockit); -} - -// unmapheap - Tracks heap destruction. Unmaps the specified heap from its block -// map. The block map is cleared and deleted, relinquishing internally -// allocated resources. -// -// - heap (IN): Handle to the heap which is being destroyed. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::unmapHeap (HANDLE heap) -{ - // Find this heap's block map. - CriticalSectionLocker cs(m_heapMapLock); - HeapMap::Iterator heapit = m_heapMap->find(heap); - if (heapit == m_heapMap->end()) { - // This heap hasn't been mapped. We must not have monitored this heap's - // creation (probably happened before VLD was initialized). - return; - } - - // Free all of the blockinfo_t structures stored in the block map. - heapinfo_t *heapinfo = (*heapit).second; - BlockMap *blockmap = &heapinfo->blockMap; - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callStack; - delete (*blockit).second; - } - delete heapinfo; - - // Remove this heap's block map from the heap map. - m_heapMap->erase(heapit); -} - - //////////////////////////////////////////////////////////////////////////////// // // Static Leak Detection Functions (Callbacks) @@ -2235,1422 +1661,113 @@ BOOL VisualLeakDetector::detachFromModule (PCWSTR /*modulepath*/, DWORD64 module return TRUE; } -void VisualLeakDetector::firstAllocCall(tls_t * tls) -{ - if (tls->ppCallStack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getCallStack(tls->ppCallStack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; -} - //////////////////////////////////////////////////////////////////////////////// // -// Standard CRT and MFC IAT Replacement Functions -// -// The addresses of these functions are not actually directly patched into the -// import address tables, but these functions do get indirectly called by the -// patch functions that are placed in the import address tables. +// Win32 IAT Replacement Functions // //////////////////////////////////////////////////////////////////////////////// -// _calloc - This function is just a wrapper around the real calloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - pcalloc (IN): Pointer to the particular calloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. +// _GetProcAddress - Calls to GetProcAddress are patched through to this +// function. If the requested function is a function that has been patched +// through to one of VLD's handlers, then the address of VLD's handler +// function is returned instead of the real address. Otherwise, this +// function is just a wrapper around the real GetProcAddress. // -// - num (IN): The number of blocks, of size 'size', to be allocated. +// - module (IN): Handle (base address) of the module from which to retrieve +// the address of an exported function. // -// - size (IN): The size, in bytes, of the memory block to be allocated. +// - procname (IN): ANSI string containing the name of the exported function +// whose address is to be retrieved. // // Return Value: // -// Returns the value returned from the specified calloc. +// Returns a pointer to the requested function, or VLD's replacement for +// the function, if there is a replacement function. // -void* VisualLeakDetector::_calloc (calloc_t pcalloc, - context_t& context, - bool debugRuntime, - size_t num, - size_t size) +FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) { - tls_t *tls = g_vld.getTls(); - - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pcalloc(num, size); + // See if there is an entry in the patch table that matches the requested + // function. + UINT tablesize = _countof(g_vld.m_patchTable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &g_vld.m_patchTable[index]; + if ((entry->moduleBase == 0x0) || ((HMODULE)entry->moduleBase != module)) { + // This patch table entry is for a different module. + continue; + } - if (firstcall) - firstAllocCall(tls); + patchentry_t *patchentry = entry->patchTable; + while(patchentry->importName) + { + // This patch table entry is for the specified module. If the requested + // imports name matches the entry's import name (or ordinal), then + // return the address of the replacement instead of the address of the + // actual import. + if ((SIZE_T)patchentry->importName < (SIZE_T)g_vld.m_vldBase) { + // This entry's import name is not a valid pointer to data in + // vld.dll. It must be an ordinal value. + if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { + if (patchentry->original != NULL) + *patchentry->original = g_vld._RGetProcAddress(module, procname); + return (FARPROC)patchentry->replacement; + } + } + else { + __try + { + if (strcmp(patchentry->importName, procname) == 0) { + if (patchentry->original != NULL) + *patchentry->original = g_vld._RGetProcAddress(module, procname); + return (FARPROC)patchentry->replacement; + } + } + __except(FilterFunction(GetExceptionCode())) + { + if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { + if (patchentry->original != NULL) + *patchentry->original = g_vld._RGetProcAddress(module, procname); + return (FARPROC)patchentry->replacement; + } + } + } + patchentry++; + } + } - return block; + // The requested function is not a patched function. Just return the real + // address of the requested function. + return g_vld._RGetProcAddress(module, procname); } -// _malloc - This function is just a wrapper around the real malloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - pmalloc (IN): Pointer to the particular malloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned from the specified malloc. -// -void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size) +FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) { - tls_t *tls = g_vld.getTls(); - - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size); - - if (firstcall) - firstAllocCall(tls); - - return block; + return m_original_GetProcAddress(module, procname); } -// _new - This function is just a wrapper around the real CRT and MFC new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. +// _LdrLoadDll - Calls to LdrLoadDll are patched through to this function. This +// function invokes the real LdrLoadDll and then re-attaches VLD to all +// modules loaded in the process after loading of the new DLL is complete. +// All modules must be re-enumerated because the explicit load of the +// specified module may result in the implicit load of one or more additional +// modules which are dependencies of the specified module. +// +// - searchpath (IN): The path to use for searching for the specified module to +// be loaded. // -// - pnew (IN): Pointer to the particular new implementation to call. +// - flags (IN): Pointer to action flags. // -// - fp (IN): Frame pointer from the call that initiated this allocation. +// - modulename (IN): Pointer to a unicodestring_t structure specifying the +// name of the module to be loaded. // -// - size (IN): The size, in bytes, of the memory block to be allocated. +// - modulehandle (OUT): Address of a HANDLE to receive the newly loaded +// module's handle. // // Return Value: // -// Returns the value returned by the specified CRT new operator. +// Returns the value returned by LdrLoadDll. // -void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntime, size_t size) -{ - tls_t* tls = g_vld.getTls(); - - // The new operator is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew(size); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// _realloc - This function is just a wrapper around the real realloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - prealloc (IN): Pointer to the particular realloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified realloc. -// -void* VisualLeakDetector::_realloc (realloc_t prealloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t size) -{ - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// _recalloc - This function is just a wrapper around the real _recalloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - prealloc (IN): Pointer to the particular realloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified realloc. -// -void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size) -{ - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// __aligned_malloc - This function is just a wrapper around the real malloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - pmalloc (IN): Pointer to the particular malloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned from the specified malloc. -// -void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, bool debugRuntime, - size_t size, size_t alignment) -{ - tls_t *tls = g_vld.getTls(); - - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size, alignment); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// __aligned_offset_malloc - This function is just a wrapper around the real malloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - pmalloc (IN): Pointer to the particular malloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned from the specified _aligned_offset_malloc. -// -void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, bool debugRuntime, - size_t size, size_t alignment, size_t offset) -{ - tls_t *tls = g_vld.getTls(); - - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size, alignment, offset); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// __aligned_realloc - This function is just a wrapper around the real realloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - prealloc (IN): Pointer to the particular realloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified _aligned_realloc. -// -void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment) -{ - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size, alignment); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// __aligned_offset_realloc - This function is just a wrapper around the real realloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - prealloc (IN): Pointer to the particular realloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified _aligned_offset_realloc. -// -void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t prealloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment, - size_t offset) -{ - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size, alignment, offset); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// __aligned_recalloc - This function is just a wrapper around the real recalloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - precalloc (IN): Pointer to the particular recalloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - num (IN): Count of the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified _aligned_realloc. -// -void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment) -{ - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size, alignment); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// __aligned_offset_recalloc - This function is just a wrapper around the real recalloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - precalloc (IN): Pointer to the particular realloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - num (IN): Count of the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified _aligned_offset_realloc. -// -void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t precalloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment, - size_t offset) -{ - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size, alignment, offset); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// __aligned_malloc_dbg - This function is just a wrapper around the real _aligned_malloc_dbg -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to -// call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _aligned_malloc_dbg. -// -void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_dbg, - context_t& context, - bool debugRuntime, - size_t size, - size_t alignment, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, alignment, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// __aligned_offset_malloc_dbg - This function is just a wrapper around the real -// _aligned_offset_malloc_dbg that sets appropriate flags to be consulted when -// the memory is actually allocated by RtlAllocateHeap. -// -// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to -// call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _aligned_malloc_dbg. -// -void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_malloc_dbg, - context_t& context, - bool debugRuntime, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, alignment, offset, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// _aligned_realloc_debug - This function is just a wrapper around the real -// _aligned_realloc_dbg that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_realloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, alignment, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// _aligned_offset_realloc_debug - This function is just a wrapper around the real -// _aligned_offset_realloc_dbg that sets appropriate flags to be consulted when -// the memory is actually allocated by RtlAllocateHeap. -// -// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_realloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, alignment, offset, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// _aligned_recalloc_debug - This function is just a wrapper around the real -// _aligned_realloc_dbg that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - p_recalloc_dbg (IN): Pointer to the particular __recalloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - num (IN): The number of memory blocks to reallocate. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, alignment, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// _aligned_offset_recalloc_debug - This function is just a wrapper around the real -// _aligned_offset_recalloc_dbg that sets appropriate flags to be consulted when -// the memory is actually allocated by RtlAllocateHeap. -// -// - p_recalloc_dbg (IN): Pointer to the particular __recalloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - num (IN): The number of memory blocks to reallocate. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, alignment, offset, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Debug CRT and MFC IAT Replacement Functions -// -// The addresses of these functions are not actually directly patched into the -// import address tables, but these functions do get indirectly called by the -// patch functions that are placed in the import address tables. -// -//////////////////////////////////////////////////////////////////////////////// - -// __calloc_dbg - This function is just a wrapper around the real _calloc_dbg -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - p_calloc_dbg: Pointer to the particular _calloc_dbg implementation to -// call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _calloc_dbg. -// -void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, - context_t& context, - bool debugRuntime, - size_t num, - size_t size, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_calloc_dbg(num, size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// __malloc_dbg - This function is just a wrapper around the real _malloc_dbg -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to -// call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _malloc_dbg. -// -void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, - context_t& context, - bool debugRuntime, - size_t size, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// new_dbg_crt - This function is just a wrapper around the real CRT debug new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - pnew_dbg_crt (IN): Pointer to the particular CRT new operator -// implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified CRT debug new operator. -// -void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, - context_t& context, - bool debugRuntime, - size_t size, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - // The debug new operator is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg_crt(size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// new_dbg_mfc - This function is just a wrapper around the real MFC debug new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - pnew_dbg (IN): Pointer to the particular CRT new operator -// implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified CRT debug new operator. -// -void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, - context_t& context, - size_t size, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg(size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// new_dbg_mfc - This function is just a wrapper around the real MFC debug new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - pnew_dbg_mfc (IN): Pointer to the particular MFC new operator -// implementation to call. -// -// - fp (IN): Frame pointer of the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified MFC debug new operator. -// -void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, - context_t& context, - size_t size, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg_mfc(size, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// __realloc_debug - This function is just a wrapper around the real -// _realloc_dbg that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// __recalloc_debug - This function is just a wrapper around the real -// _recalloc_dbg that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - p_recalloc_dbg (IN): Pointer to the particular __realloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - int type, - char const *file, - int line) -{ - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Win32 IAT Replacement Functions -// -//////////////////////////////////////////////////////////////////////////////// - -// _GetProcAddress - Calls to GetProcAddress are patched through to this -// function. If the requested function is a function that has been patched -// through to one of VLD's handlers, then the address of VLD's handler -// function is returned instead of the real address. Otherwise, this -// function is just a wrapper around the real GetProcAddress. -// -// - module (IN): Handle (base address) of the module from which to retrieve -// the address of an exported function. -// -// - procname (IN): ANSI string containing the name of the exported function -// whose address is to be retrieved. -// -// Return Value: -// -// Returns a pointer to the requested function, or VLD's replacement for -// the function, if there is a replacement function. -// -FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) -{ - // See if there is an entry in the patch table that matches the requested - // function. - UINT tablesize = _countof(g_vld.m_patchTable); - for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &g_vld.m_patchTable[index]; - if ((entry->moduleBase == 0x0) || ((HMODULE)entry->moduleBase != module)) { - // This patch table entry is for a different module. - continue; - } - - patchentry_t *patchentry = entry->patchTable; - while(patchentry->importName) - { - // This patch table entry is for the specified module. If the requested - // imports name matches the entry's import name (or ordinal), then - // return the address of the replacement instead of the address of the - // actual import. - if ((SIZE_T)patchentry->importName < (SIZE_T)g_vld.m_vldBase) { - // This entry's import name is not a valid pointer to data in - // vld.dll. It must be an ordinal value. - if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { - if (patchentry->original != NULL) - *patchentry->original = g_vld._RGetProcAddress(module, procname); - return (FARPROC)patchentry->replacement; - } - } - else { - __try - { - if (strcmp(patchentry->importName, procname) == 0) { - if (patchentry->original != NULL) - *patchentry->original = g_vld._RGetProcAddress(module, procname); - return (FARPROC)patchentry->replacement; - } - } - __except(FilterFunction(GetExceptionCode())) - { - if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { - if (patchentry->original != NULL) - *patchentry->original = g_vld._RGetProcAddress(module, procname); - return (FARPROC)patchentry->replacement; - } - } - } - patchentry++; - } - } - - // The requested function is not a patched function. Just return the real - // address of the requested function. - return g_vld._RGetProcAddress(module, procname); -} - -FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) -{ - return m_original_GetProcAddress(module, procname); -} - -// _HeapCreate - Calls to HeapCreate are patched through to this function. This -// function is just a wrapper around the real HeapCreate that calls VLD's heap -// creation tracking function after the heap has been created. -// -// - options (IN): Heap options. -// -// - initsize (IN): Initial size of the heap. -// -// - maxsize (IN): Maximum size of the heap. -// -// Return Value: -// -// Returns the value returned by HeapCreate. -// -HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) -{ - // Get the return address within the calling function. - UINT_PTR ra = (UINT_PTR)_ReturnAddress(); - - // Create the heap. - HANDLE heap = HeapCreate(options, initsize, maxsize); - - // Map the created heap handle to a new block map. - g_vld.mapHeap(heap); - - // Try to get the name of the function containing the return address. - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; - SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; - - g_symbolLock.Enter(); - DWORD64 displacement; - BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); - g_symbolLock.Leave(); - if (symfound == TRUE) { - if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { - // HeapCreate was called by _heap_init. This is a static CRT heap (msvcr*.dll). - CriticalSectionLocker cs(g_vld.m_heapMapLock); - HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); - assert(heapit != g_vld.m_heapMap->end()); - HMODULE hCallingModule = (HMODULE)functioninfo->ModBase; - WCHAR callingmodulename [MAX_PATH] = L""; - if (hCallingModule && GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) - { - _wcslwr_s(callingmodulename); - if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime - (*heapit).second->flags |= VLD_HEAP_CRT_DBG; - } - } - } - - return heap; -} - -// _HeapDestroy - Calls to HeapDestroy are patched through to this function. -// This function is just a wrapper around the real HeapDestroy that calls -// VLD's heap destruction tracking function after the heap has been destroyed. -// -// - heap (IN): Handle to the heap to be destroyed. -// -// Return Value: -// -// Returns the valued returned by HeapDestroy. -// -BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) -{ - // After this heap is destroyed, the heap's address space will be unmapped - // from the process's address space. So, we'd better generate a leak report - // for this heap now, while we can still read from the memory blocks - // allocated to it. - if (!(g_vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) - g_vld.reportHeapLeaks(heap); - - g_vld.unmapHeap(heap); - - return HeapDestroy(heap); -} - -// _LdrLoadDll - Calls to LdrLoadDll are patched through to this function. This -// function invokes the real LdrLoadDll and then re-attaches VLD to all -// modules loaded in the process after loading of the new DLL is complete. -// All modules must be re-enumerated because the explicit load of the -// specified module may result in the implicit load of one or more additional -// modules which are dependencies of the specified module. -// -// - searchpath (IN): The path to use for searching for the specified module to -// be loaded. -// -// - flags (IN): Pointer to action flags. -// -// - modulename (IN): Pointer to a unicodestring_t structure specifying the -// name of the module to be loaded. -// -// - modulehandle (OUT): Address of a HANDLE to receive the newly loaded -// module's handle. -// -// Return Value: -// -// Returns the value returned by LdrLoadDll. -// -NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle) +NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, + PHANDLE modulehandle) { CriticalSectionLocker cs(g_vld.m_loaderLock); @@ -3729,166 +1846,6 @@ void VisualLeakDetector::getCallStack( CallStack **&ppcallstack, context_t &cont callstack->getStackTrace(g_vld.m_maxTraceFrames, context); } -// _RtlAllocateHeap - Calls to RtlAllocateHeap are patched through to this -// function. This function invokes the real RtlAllocateHeap and then calls -// VLD's allocation tracking function. Pretty much all memory allocations -// will eventually result in a call to RtlAllocateHeap, so this is where we -// finally map the allocated block. -// -// - heap (IN): Handle to the heap from which to allocate memory. -// -// - flags (IN): Heap allocation control flags. -// -// - size (IN): Size, in bytes, of the block to allocate. -// -// Return Value: -// -// Returns the return value from RtlAllocateHeap. -// -LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) -{ - // Allocate the block. - LPVOID block = RtlAllocateHeap(heap, flags, size); - - if ((block == NULL) || !g_vld.enabled()) - return block; - - tls_t* tls = g_vld.getTls(); - tls->blockProcessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - return block; - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - tls->context = context; - - AllocateHeap(tls, heap, block, size); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// for kernel32.dll -LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) -{ - // Allocate the block. - LPVOID block = HeapAlloc(heap, flags, size); - - if ((block == NULL) || !g_vld.enabled()) - return block; - - tls_t* tls = g_vld.getTls(); - tls->blockProcessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - return block; - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - tls->context = context; - - AllocateHeap(tls, heap, block, size); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size) -{ - bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; - - // The module that initiated this allocation is included in leak - // detection. Map this block to the specified heap. - g_vld.mapBlock(heap, block, size, crtalloc, tls->ppCallStack); -} - -// _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. -// This function calls VLD's free tracking function and then invokes the real -// RtlFreeHeap. Pretty much all memory frees will eventually result in a call -// to RtlFreeHeap, so this is where we finally unmap the freed block. -// -// - heap (IN): Handle to the heap to which the block being freed belongs. -// -// - flags (IN): Heap control flags. -// -// - mem (IN): Pointer to the memory block being freed. -// -// Return Value: -// -// Returns the value returned by RtlFreeHeap. -// -BOOL VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) -{ - BOOL status; - - if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls - { - context_t context; - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - - // Unmap the block from the specified heap. - g_vld.unmapBlock(heap, mem, context); - } - - status = RtlFreeHeap(heap, flags, mem); - - return status; -} - -// for kernel32.dll -BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) -{ - BOOL status; - - if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls - { - context_t context; - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - - // Unmap the block from the specified heap. - g_vld.unmapBlock(heap, mem, context); - } - - status = HeapFree(heap, flags, mem); - - return status; -} - // Find the information for the module that initiated this reallocation. bool VisualLeakDetector::isModuleExcluded(UINT_PTR address) { @@ -3907,470 +1864,6 @@ bool VisualLeakDetector::isModuleExcluded(UINT_PTR address) return excluded; } -// _RtlReAllocateHeap - Calls to RtlReAllocateHeap are patched through to this -// function. This function invokes the real RtlReAllocateHeap and then calls -// VLD's reallocation tracking function. All arguments passed to this function -// are passed on to the real RtlReAllocateHeap without modification. Pretty -// much all memory re-allocations will eventually result in a call to -// RtlReAllocateHeap, so this is where we finally remap the reallocated block. -// -// - heap (IN): Handle to the heap to reallocate memory from. -// -// - flags (IN): Heap control flags. -// -// - mem (IN): Pointer to the currently allocated block which is to be -// reallocated. -// -// - size (IN): Size, in bytes, of the block to reallocate. -// -// Return Value: -// -// Returns the value returned by RtlReAllocateHeap. -// -LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) -{ - LPVOID newmem; - - // Reallocate the block. - newmem = RtlReAllocateHeap(heap, flags, mem, size); - if (newmem == NULL) - return newmem; - - tls_t *tls = g_vld.getTls(); - tls->blockProcessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - return newmem; - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - ReAllocateHeap(tls, heap, mem, newmem, size, context); - - if (firstcall) - { - firstAllocCall(tls); - tls->ppCallStack = NULL; - } - - return newmem; -} - -// for kernel32.dll -LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) -{ - LPVOID newmem; - - // Reallocate the block. - newmem = HeapReAlloc(heap, flags, mem, size); - if (newmem == NULL) - return newmem; - - tls_t *tls = g_vld.getTls(); - tls->blockProcessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - return newmem; - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - ReAllocateHeap(tls, heap, mem, newmem, size, context); - - if (firstcall) - { - firstAllocCall(tls); - tls->ppCallStack = NULL; - } - - return newmem; -} - -void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context) -{ - bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; - - // Reset thread local flags and variables, in case any libraries called - // into while remapping the block allocate some memory. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; - - // The module that initiated this allocation is included in leak - // detection. Remap the block. - g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->ppCallStack, context); - -#ifdef _DEBUG - if(tls->context.fp != 0) - __debugbreak(); -#endif - if (crtalloc) - tls->flags |= VLD_TLS_CRTALLOC; - - tls->context = context; -} - -//////////////////////////////////////////////////////////////////////////////// -// -// COM IAT Replacement Functions -// -//////////////////////////////////////////////////////////////////////////////// - -// _CoGetMalloc - Calls to CoGetMalloc are patched through to this function. -// This function returns a pointer to Visual Leak Detector's implementation -// of the IMalloc interface, instead of returning a pointer to the system -// implementation. This allows VLD's implementation of the IMalloc interface -// (which is basically a thin wrapper around the system implementation) to be -// invoked in place of the system implementation. -// -// - context (IN): Reserved; value must be 1. -// -// - imalloc (IN): Address of a pointer to receive the address of VLD's -// implementation of the IMalloc interface. -// -// Return Value: -// -// Always returns S_OK. -// -HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) -{ - static CoGetMalloc_t pCoGetMalloc = NULL; - - HRESULT hr = S_OK; - - HMODULE ole32; - - *imalloc = (LPMALLOC)&g_vld; - - if (pCoGetMalloc == NULL) { - // This is the first call to this function. Link to the real - // CoGetMalloc and get a pointer to the system implementation of the - // IMalloc interface. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoGetMalloc = (CoGetMalloc_t)g_vld._RGetProcAddress(ole32, "CoGetMalloc"); - hr = pCoGetMalloc(context, &g_vld.m_iMalloc); - } - else - { - // wait for different thread initialization - int c = 0; - while(g_vld.m_iMalloc == NULL && c < 10) - { - Sleep(1); - c++; - } - if (g_vld.m_iMalloc == NULL) - hr = E_INVALIDARG; - } - - return hr; -} - -// _CoTaskMemAlloc - Calls to CoTaskMemAlloc are patched through to this -// function. This function is just a wrapper around the real CoTaskMemAlloc -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - size (IN): Size of the memory block to allocate. -// -// Return Value: -// -// Returns the value returned from CoTaskMemAlloc. -// -LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) -{ - static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; - - LPVOID block; - context_t context; - HMODULE ole32; - tls_t *tls = g_vld.getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockProcessed = FALSE; - } - - if (pCoTaskMemAlloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemAlloc. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemAlloc = (CoTaskMemAlloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pCoTaskMemAlloc(size); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// _CoTaskMemRealloc - Calls to CoTaskMemRealloc are patched through to this -// function. This function is just a wrapper around the real CoTaskMemRealloc -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size, in bytes, of the block to reallocate. -// -// Return Value: -// -// Returns the value returned from CoTaskMemRealloc. -// -LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) -{ - static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; - - LPVOID block; - context_t context; - HMODULE ole32; - tls_t *tls = g_vld.getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockProcessed = FALSE; - } - - if (pCoTaskMemRealloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemRealloc. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemRealloc = (CoTaskMemRealloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = pCoTaskMemRealloc(mem, size); - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Public COM IMalloc Implementation Functions -// -//////////////////////////////////////////////////////////////////////////////// - -// AddRef - Calls to IMalloc::AddRef end up here. This function is just a -// wrapper around the real IMalloc::AddRef implementation. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::AddRef. -// -ULONG VisualLeakDetector::AddRef () -{ - assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->AddRef() : 0; -} - -// Alloc - Calls to IMalloc::Alloc end up here. This function is just a wrapper -// around the real IMalloc::Alloc implementation that sets appropriate flags -// to be consulted when the memory is actually allocated by RtlAllocateHeap. -// -// - size (IN): The size of the memory block to allocate. -// -// Return Value: -// -// Returns the value returned by the system's IMalloc::Alloc implementation. -// -LPVOID VisualLeakDetector::Alloc (SIZE_T size) -{ - LPVOID block; - context_t context; - tls_t *tls = getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - assert(m_iMalloc != NULL); - block = (m_iMalloc) ? m_iMalloc->Alloc(size) : NULL; - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// DidAlloc - Calls to IMalloc::DidAlloc will end up here. This function is just -// a wrapper around the system implementation of IMalloc::DidAlloc. -// -// - mem (IN): Pointer to a memory block to inquire about. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::DidAlloc. -// -INT VisualLeakDetector::DidAlloc (LPVOID mem) -{ - assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->DidAlloc(mem) : 0; -} - -// Free - Calls to IMalloc::Free will end up here. This function is just a -// wrapper around the real IMalloc::Free implementation. -// -// - mem (IN): Pointer to the memory block to be freed. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::Free (LPVOID mem) -{ - assert(m_iMalloc != NULL); - if (m_iMalloc) m_iMalloc->Free(mem); -} - -// GetSize - Calls to IMalloc::GetSize will end up here. This function is just a -// wrapper around the real IMalloc::GetSize implementation. -// -// - mem (IN): Pointer to the memory block to inquire about. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::GetSize. -// -SIZE_T VisualLeakDetector::GetSize (LPVOID mem) -{ - assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->GetSize(mem) : 0; -} - -// HeapMinimize - Calls to IMalloc::HeapMinimize will end up here. This function -// is just a wrapper around the real IMalloc::HeapMinimize implementation. -// -// Return Value: -// -// None. -// -VOID VisualLeakDetector::HeapMinimize () -{ - assert(m_iMalloc != NULL); - if (m_iMalloc) m_iMalloc->HeapMinimize(); -} - -// QueryInterface - Calls to IMalloc::QueryInterface will end up here. This -// function is just a wrapper around the real IMalloc::QueryInterface -// implementation. -// -// - iid (IN): COM interface ID to query about. -// -// - object (IN): Address of a pointer to receive the requested interface -// pointer. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::QueryInterface. -// -HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) -{ - assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->QueryInterface(iid, object) : E_UNEXPECTED; -} - -// Realloc - Calls to IMalloc::Realloc will end up here. This function is just a -// wrapper around the real IMalloc::Realloc implementation that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size, in bytes, of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::Realloc. -// -LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) -{ - LPVOID block; - context_t context; - tls_t *tls = getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - assert(m_iMalloc != NULL); - block = (m_iMalloc) ? m_iMalloc->Realloc(mem, size) : NULL; - - if (firstcall) - firstAllocCall(tls); - - return block; -} - -// Release - Calls to IMalloc::Release will end up here. This function is just -// a wrapper around the real IMalloc::Release implementation. -// -// Return Value: -// -// Returns the value returned by the system implementation of -// IMalloc::Release. -// -ULONG VisualLeakDetector::Release () -{ - assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->Release() : 0; -} - SIZE_T VisualLeakDetector::GetLeaksCount() { if (m_options & VLD_OPT_VLDOFF) { diff --git a/vld.vcxproj b/vld.vcxproj index d5ade2ac..621401de 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -237,6 +237,7 @@ + Create @@ -248,6 +249,7 @@ + diff --git a/vld.vcxproj.filters b/vld.vcxproj.filters index 50636a22..0e4b603a 100644 --- a/vld.vcxproj.filters +++ b/vld.vcxproj.filters @@ -36,6 +36,12 @@ Source Files + + Source Files + + + Source Files + diff --git a/vld_hooks.cpp b/vld_hooks.cpp new file mode 100644 index 00000000..242937a3 --- /dev/null +++ b/vld_hooks.cpp @@ -0,0 +1,1974 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - VisualLeakDetector Class Implementation +// Copyright (c) 2005-2011 VLD Team +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#include "stdafx.h" + +#pragma comment(lib, "dbghelp.lib") + +#include + +#define VLDBUILD // Declares that we are building Visual Leak Detector. +#include "callstack.h" // Provides a class for handling call stacks. +#include "crtmfcpatch.h" // Provides CRT and MFC patch functions. +#include "map.h" // Provides a lightweight STL-like map template. +#include "ntapi.h" // Provides access to NT APIs. +#include "set.h" // Provides a lightweight STL-like set template. +#include "utility.h" // Provides various utility functions. +#include "vldheap.h" // Provides internal new and delete operators. +#include "vldint.h" // Provides access to the Visual Leak Detector internals. + +extern HANDLE g_currentProcess; +extern CriticalSection g_symbolLock; + +void VisualLeakDetector::firstAllocCall(tls_t * tls) +{ + if (tls->ppCallStack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getCallStack(tls->ppCallStack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; +} + +//////////////////////////////////////////////////////////////////////////////// +// +// Standard CRT and MFC IAT Replacement Functions +// +// The addresses of these functions are not actually directly patched into the +// import address tables, but these functions do get indirectly called by the +// patch functions that are placed in the import address tables. +// +//////////////////////////////////////////////////////////////////////////////// + +// _calloc - This function is just a wrapper around the real calloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - pcalloc (IN): Pointer to the particular calloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - num (IN): The number of blocks, of size 'size', to be allocated. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned from the specified calloc. +// +void* VisualLeakDetector::_calloc (calloc_t pcalloc, + context_t& context, + bool debugRuntime, + size_t num, + size_t size) +{ + tls_t *tls = g_vld.getTls(); + + // malloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pcalloc(num, size); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// _malloc - This function is just a wrapper around the real malloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - pmalloc (IN): Pointer to the particular malloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned from the specified malloc. +// +void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size) +{ + tls_t *tls = g_vld.getTls(); + + // malloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pmalloc(size); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// _new - This function is just a wrapper around the real CRT and MFC new +// operators that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - pnew (IN): Pointer to the particular new implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned by the specified CRT new operator. +// +void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntime, size_t size) +{ + tls_t* tls = g_vld.getTls(); + + // The new operator is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew(size); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// _realloc - This function is just a wrapper around the real realloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - prealloc (IN): Pointer to the particular realloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified realloc. +// +void* VisualLeakDetector::_realloc (realloc_t prealloc, + context_t& context, + bool debugRuntime, + void *mem, + size_t size) +{ + tls_t *tls = g_vld.getTls(); + + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = prealloc(mem, size); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// _recalloc - This function is just a wrapper around the real _recalloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - prealloc (IN): Pointer to the particular realloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified realloc. +// +void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size) +{ + tls_t *tls = g_vld.getTls(); + + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// __aligned_malloc - This function is just a wrapper around the real malloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - pmalloc (IN): Pointer to the particular malloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned from the specified malloc. +// +void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, bool debugRuntime, + size_t size, size_t alignment) +{ + tls_t *tls = g_vld.getTls(); + + // malloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pmalloc(size, alignment); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// __aligned_offset_malloc - This function is just a wrapper around the real malloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - pmalloc (IN): Pointer to the particular malloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// Return Value: +// +// Returns the value returned from the specified _aligned_offset_malloc. +// +void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, bool debugRuntime, + size_t size, size_t alignment, size_t offset) +{ + tls_t *tls = g_vld.getTls(); + + // malloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pmalloc(size, alignment, offset); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// __aligned_realloc - This function is just a wrapper around the real realloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - prealloc (IN): Pointer to the particular realloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified _aligned_realloc. +// +void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + size_t alignment) +{ + tls_t *tls = g_vld.getTls(); + + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = prealloc(mem, size, alignment); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// __aligned_offset_realloc - This function is just a wrapper around the real realloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - prealloc (IN): Pointer to the particular realloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified _aligned_offset_realloc. +// +void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t prealloc, + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + size_t alignment, + size_t offset) +{ + tls_t *tls = g_vld.getTls(); + + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = prealloc(mem, size, alignment, offset); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// __aligned_recalloc - This function is just a wrapper around the real recalloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - precalloc (IN): Pointer to the particular recalloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - num (IN): Count of the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified _aligned_realloc. +// +void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size, + size_t alignment) +{ + tls_t *tls = g_vld.getTls(); + + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size, alignment); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// __aligned_offset_recalloc - This function is just a wrapper around the real recalloc that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - precalloc (IN): Pointer to the particular realloc implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - num (IN): Count of the memory block to reallocate. +// +// - size (IN): Size of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned from the specified _aligned_offset_realloc. +// +void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t precalloc, + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size, + size_t alignment, + size_t offset) +{ + tls_t *tls = g_vld.getTls(); + + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size, alignment, offset); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// __aligned_malloc_dbg - This function is just a wrapper around the real _aligned_malloc_dbg +// that sets appropriate flags to be consulted when the memory is actually +// allocated by RtlAllocateHeap. +// +// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to +// call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _aligned_malloc_dbg. +// +void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_dbg, + context_t& context, + bool debugRuntime, + size_t size, + size_t alignment, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_malloc_dbg(size, alignment, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// __aligned_offset_malloc_dbg - This function is just a wrapper around the real +// _aligned_offset_malloc_dbg that sets appropriate flags to be consulted when +// the memory is actually allocated by RtlAllocateHeap. +// +// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to +// call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _aligned_malloc_dbg. +// +void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_malloc_dbg, + context_t& context, + bool debugRuntime, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_malloc_dbg(size, alignment, offset, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// _aligned_realloc_debug - This function is just a wrapper around the real +// _aligned_realloc_dbg that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_realloc_dbg, + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + size_t alignment, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_realloc_dbg(mem, size, alignment, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// _aligned_offset_realloc_debug - This function is just a wrapper around the real +// _aligned_offset_realloc_dbg that sets appropriate flags to be consulted when +// the memory is actually allocated by RtlAllocateHeap. +// +// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_realloc_dbg, + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_realloc_dbg(mem, size, alignment, offset, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// _aligned_recalloc_debug - This function is just a wrapper around the real +// _aligned_realloc_dbg that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - p_recalloc_dbg (IN): Pointer to the particular __recalloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - num (IN): The number of memory blocks to reallocate. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_recalloc_dbg, + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size, + size_t alignment, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, alignment, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// _aligned_offset_recalloc_debug - This function is just a wrapper around the real +// _aligned_offset_recalloc_dbg that sets appropriate flags to be consulted when +// the memory is actually allocated by RtlAllocateHeap. +// +// - p_recalloc_dbg (IN): Pointer to the particular __recalloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - num (IN): The number of memory blocks to reallocate. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_recalloc_dbg, + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, alignment, offset, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +//////////////////////////////////////////////////////////////////////////////// +// +// Debug CRT and MFC IAT Replacement Functions +// +// The addresses of these functions are not actually directly patched into the +// import address tables, but these functions do get indirectly called by the +// patch functions that are placed in the import address tables. +// +//////////////////////////////////////////////////////////////////////////////// + +// __calloc_dbg - This function is just a wrapper around the real _calloc_dbg +// that sets appropriate flags to be consulted when the memory is actually +// allocated by RtlAllocateHeap. +// +// - p_calloc_dbg: Pointer to the particular _calloc_dbg implementation to +// call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _calloc_dbg. +// +void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, + context_t& context, + bool debugRuntime, + size_t num, + size_t size, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_calloc_dbg(num, size, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// __malloc_dbg - This function is just a wrapper around the real _malloc_dbg +// that sets appropriate flags to be consulted when the memory is actually +// allocated by RtlAllocateHeap. +// +// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to +// call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _malloc_dbg. +// +void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, + context_t& context, + bool debugRuntime, + size_t size, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_malloc_dbg(size, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// new_dbg_crt - This function is just a wrapper around the real CRT debug new +// operators that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - pnew_dbg_crt (IN): Pointer to the particular CRT new operator +// implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified CRT debug new operator. +// +void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, + context_t& context, + bool debugRuntime, + size_t size, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // The debug new operator is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew_dbg_crt(size, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// new_dbg_mfc - This function is just a wrapper around the real MFC debug new +// operators that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - pnew_dbg (IN): Pointer to the particular CRT new operator +// implementation to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - type (IN): The CRT "use type" of the block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified CRT debug new operator. +// +void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, + context_t& context, + size_t size, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew_dbg(size, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// new_dbg_mfc - This function is just a wrapper around the real MFC debug new +// operators that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - pnew_dbg_mfc (IN): Pointer to the particular MFC new operator +// implementation to call. +// +// - fp (IN): Frame pointer of the call that initiated this allocation. +// +// - size (IN): The size, in bytes, of the memory block to be allocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified MFC debug new operator. +// +void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, + context_t& context, + size_t size, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew_dbg_mfc(size, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// __realloc_debug - This function is just a wrapper around the real +// _realloc_dbg that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_realloc_dbg(mem, size, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// __recalloc_debug - This function is just a wrapper around the real +// _recalloc_dbg that sets appropriate flags to be consulted when the memory is +// actually allocated by RtlAllocateHeap. +// +// - p_recalloc_dbg (IN): Pointer to the particular __realloc_dbg implementation +// to call. +// +// - fp (IN): Frame pointer from the call that initiated this allocation. +// +// - mem (IN): Pointer to the memory block to be reallocated. +// +// - size (IN): The size of the memory block to reallocate. +// +// - type (IN): The CRT "use type" of the block to be reallocated. +// +// - file (IN): The name of the file from which this function is being called. +// +// - line (IN): The line number, in the above file, at which this function is +// being called. +// +// Return Value: +// +// Returns the value returned by the specified _realloc_dbg. +// +void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// _HeapCreate - Calls to HeapCreate are patched through to this function. This +// function is just a wrapper around the real HeapCreate that calls VLD's heap +// creation tracking function after the heap has been created. +// +// - options (IN): Heap options. +// +// - initsize (IN): Initial size of the heap. +// +// - maxsize (IN): Maximum size of the heap. +// +// Return Value: +// +// Returns the value returned by HeapCreate. +// +HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) +{ + // Get the return address within the calling function. + UINT_PTR ra = (UINT_PTR)_ReturnAddress(); + + // Create the heap. + HANDLE heap = HeapCreate(options, initsize, maxsize); + + // Map the created heap handle to a new block map. + g_vld.mapHeap(heap); + + // Try to get the name of the function containing the return address. + BYTE symbolbuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; + SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; + + g_symbolLock.Enter(); + DWORD64 displacement; + BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); + g_symbolLock.Leave(); + if (symfound == TRUE) { + if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { + // HeapCreate was called by _heap_init. This is a static CRT heap (msvcr*.dll). + CriticalSectionLocker cs(g_vld.m_heapMapLock); + HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); + assert(heapit != g_vld.m_heapMap->end()); + HMODULE hCallingModule = (HMODULE)functioninfo->ModBase; + WCHAR callingmodulename [MAX_PATH] = L""; + if (hCallingModule && GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) + { + _wcslwr_s(callingmodulename); + if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime + (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + } + } + } + + return heap; +} + +// _HeapDestroy - Calls to HeapDestroy are patched through to this function. +// This function is just a wrapper around the real HeapDestroy that calls +// VLD's heap destruction tracking function after the heap has been destroyed. +// +// - heap (IN): Handle to the heap to be destroyed. +// +// Return Value: +// +// Returns the valued returned by HeapDestroy. +// +BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) +{ + // After this heap is destroyed, the heap's address space will be unmapped + // from the process's address space. So, we'd better generate a leak report + // for this heap now, while we can still read from the memory blocks + // allocated to it. + if (!(g_vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) + g_vld.reportHeapLeaks(heap); + + g_vld.unmapHeap(heap); + + return HeapDestroy(heap); +} + +// _RtlAllocateHeap - Calls to RtlAllocateHeap are patched through to this +// function. This function invokes the real RtlAllocateHeap and then calls +// VLD's allocation tracking function. Pretty much all memory allocations +// will eventually result in a call to RtlAllocateHeap, so this is where we +// finally map the allocated block. +// +// - heap (IN): Handle to the heap from which to allocate memory. +// +// - flags (IN): Heap allocation control flags. +// +// - size (IN): Size, in bytes, of the block to allocate. +// +// Return Value: +// +// Returns the return value from RtlAllocateHeap. +// +LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) +{ + // Allocate the block. + LPVOID block = RtlAllocateHeap(heap, flags, size); + + if ((block == NULL) || !g_vld.enabled()) + return block; + + tls_t* tls = g_vld.getTls(); + tls->blockProcessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; + + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + tls->context = context; + + AllocateHeap(tls, heap, block, size); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// HeapAlloc (kernel32.dll) call RtlAllocateHeap (ntdll.dll) +LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) +{ + // Allocate the block. + LPVOID block = HeapAlloc(heap, flags, size); + + if ((block == NULL) || !g_vld.enabled()) + return block; + + tls_t* tls = g_vld.getTls(); + tls->blockProcessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; + + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + tls->context = context; + + AllocateHeap(tls, heap, block, size); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size) +{ + bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; + + // The module that initiated this allocation is included in leak + // detection. Map this block to the specified heap. + g_vld.mapBlock(heap, block, size, crtalloc, tls->ppCallStack); +} + +// _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. +// This function calls VLD's free tracking function and then invokes the real +// RtlFreeHeap. Pretty much all memory frees will eventually result in a call +// to RtlFreeHeap, so this is where we finally unmap the freed block. +// +// - heap (IN): Handle to the heap to which the block being freed belongs. +// +// - flags (IN): Heap control flags. +// +// - mem (IN): Pointer to the memory block being freed. +// +// Return Value: +// +// Returns the value returned by RtlFreeHeap. +// +BYTE VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) +{ + BYTE status; + + if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls + { + context_t context; + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + + // Unmap the block from the specified heap. + g_vld.unmapBlock(heap, mem, context); + } + + status = RtlFreeHeap(heap, flags, mem); + + return status; +} + +// HeapFree (kernel32.dll) call RtlFreeHeap (ntdll.dll) +BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) +{ + BOOL status; + + if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls + { + context_t context; + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + + // Unmap the block from the specified heap. + g_vld.unmapBlock(heap, mem, context); + } + + status = HeapFree(heap, flags, mem); + + return status; +} + +// _RtlReAllocateHeap - Calls to RtlReAllocateHeap are patched through to this +// function. This function invokes the real RtlReAllocateHeap and then calls +// VLD's reallocation tracking function. All arguments passed to this function +// are passed on to the real RtlReAllocateHeap without modification. Pretty +// much all memory re-allocations will eventually result in a call to +// RtlReAllocateHeap, so this is where we finally remap the reallocated block. +// +// - heap (IN): Handle to the heap to reallocate memory from. +// +// - flags (IN): Heap control flags. +// +// - mem (IN): Pointer to the currently allocated block which is to be +// reallocated. +// +// - size (IN): Size, in bytes, of the block to reallocate. +// +// Return Value: +// +// Returns the value returned by RtlReAllocateHeap. +// +LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) +{ + LPVOID newmem; + + // Reallocate the block. + newmem = RtlReAllocateHeap(heap, flags, mem, size); + if (newmem == NULL) + return newmem; + + tls_t *tls = g_vld.getTls(); + tls->blockProcessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + return newmem; + + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + ReAllocateHeap(tls, heap, mem, newmem, size, context); + + if (firstcall) + { + firstAllocCall(tls); + tls->ppCallStack = NULL; + } + + return newmem; +} + +// for kernel32.dll +LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) +{ + LPVOID newmem; + + // Reallocate the block. + newmem = HeapReAlloc(heap, flags, mem, size); + if (newmem == NULL) + return newmem; + + tls_t *tls = g_vld.getTls(); + tls->blockProcessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + return newmem; + + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + ReAllocateHeap(tls, heap, mem, newmem, size, context); + + if (firstcall) + { + firstAllocCall(tls); + tls->ppCallStack = NULL; + } + + return newmem; +} + +void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context) +{ + bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; + + // Reset thread local flags and variables, in case any libraries called + // into while remapping the block allocate some memory. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; + + // The module that initiated this allocation is included in leak + // detection. Remap the block. + g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->ppCallStack, context); + +#ifdef _DEBUG + if(tls->context.fp != 0) + __debugbreak(); +#endif + if (crtalloc) + tls->flags |= VLD_TLS_CRTALLOC; + + tls->context = context; +} + +//////////////////////////////////////////////////////////////////////////////// +// +// COM IAT Replacement Functions +// +//////////////////////////////////////////////////////////////////////////////// + +// _CoGetMalloc - Calls to CoGetMalloc are patched through to this function. +// This function returns a pointer to Visual Leak Detector's implementation +// of the IMalloc interface, instead of returning a pointer to the system +// implementation. This allows VLD's implementation of the IMalloc interface +// (which is basically a thin wrapper around the system implementation) to be +// invoked in place of the system implementation. +// +// - context (IN): Reserved; value must be 1. +// +// - imalloc (IN): Address of a pointer to receive the address of VLD's +// implementation of the IMalloc interface. +// +// Return Value: +// +// Always returns S_OK. +// +HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) +{ + static CoGetMalloc_t pCoGetMalloc = NULL; + + HRESULT hr = S_OK; + + HMODULE ole32; + + *imalloc = (LPMALLOC)&g_vld; + + if (pCoGetMalloc == NULL) { + // This is the first call to this function. Link to the real + // CoGetMalloc and get a pointer to the system implementation of the + // IMalloc interface. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoGetMalloc = (CoGetMalloc_t)g_vld._RGetProcAddress(ole32, "CoGetMalloc"); + hr = pCoGetMalloc(context, &g_vld.m_iMalloc); + } + else + { + // wait for different thread initialization + int c = 0; + while(g_vld.m_iMalloc == NULL && c < 10) + { + Sleep(1); + c++; + } + if (g_vld.m_iMalloc == NULL) + hr = E_INVALIDARG; + } + + return hr; +} + +// _CoTaskMemAlloc - Calls to CoTaskMemAlloc are patched through to this +// function. This function is just a wrapper around the real CoTaskMemAlloc +// that sets appropriate flags to be consulted when the memory is actually +// allocated by RtlAllocateHeap. +// +// - size (IN): Size of the memory block to allocate. +// +// Return Value: +// +// Returns the value returned from CoTaskMemAlloc. +// +LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) +{ + static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; + + LPVOID block; + context_t context; + HMODULE ole32; + tls_t *tls = g_vld.getTls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockProcessed = FALSE; + } + + if (pCoTaskMemAlloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemAlloc. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoTaskMemAlloc = (CoTaskMemAlloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pCoTaskMemAlloc(size); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// _CoTaskMemRealloc - Calls to CoTaskMemRealloc are patched through to this +// function. This function is just a wrapper around the real CoTaskMemRealloc +// that sets appropriate flags to be consulted when the memory is actually +// allocated by RtlAllocateHeap. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size, in bytes, of the block to reallocate. +// +// Return Value: +// +// Returns the value returned from CoTaskMemRealloc. +// +LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) +{ + static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; + + LPVOID block; + context_t context; + HMODULE ole32; + tls_t *tls = g_vld.getTls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockProcessed = FALSE; + } + + if (pCoTaskMemRealloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemRealloc. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoTaskMemRealloc = (CoTaskMemRealloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + block = pCoTaskMemRealloc(mem, size); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +//////////////////////////////////////////////////////////////////////////////// +// +// Public COM IMalloc Implementation Functions +// +//////////////////////////////////////////////////////////////////////////////// + +// AddRef - Calls to IMalloc::AddRef end up here. This function is just a +// wrapper around the real IMalloc::AddRef implementation. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::AddRef. +// +ULONG VisualLeakDetector::AddRef () +{ + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->AddRef() : 0; +} + +// Alloc - Calls to IMalloc::Alloc end up here. This function is just a wrapper +// around the real IMalloc::Alloc implementation that sets appropriate flags +// to be consulted when the memory is actually allocated by RtlAllocateHeap. +// +// - size (IN): The size of the memory block to allocate. +// +// Return Value: +// +// Returns the value returned by the system's IMalloc::Alloc implementation. +// +LPVOID VisualLeakDetector::Alloc (SIZE_T size) +{ + LPVOID block; + context_t context; + tls_t *tls = getTls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + assert(m_iMalloc != NULL); + block = (m_iMalloc) ? m_iMalloc->Alloc(size) : NULL; + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// DidAlloc - Calls to IMalloc::DidAlloc will end up here. This function is just +// a wrapper around the system implementation of IMalloc::DidAlloc. +// +// - mem (IN): Pointer to a memory block to inquire about. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::DidAlloc. +// +INT VisualLeakDetector::DidAlloc (LPVOID mem) +{ + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->DidAlloc(mem) : 0; +} + +// Free - Calls to IMalloc::Free will end up here. This function is just a +// wrapper around the real IMalloc::Free implementation. +// +// - mem (IN): Pointer to the memory block to be freed. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::Free (LPVOID mem) +{ + assert(m_iMalloc != NULL); + if (m_iMalloc) m_iMalloc->Free(mem); +} + +// GetSize - Calls to IMalloc::GetSize will end up here. This function is just a +// wrapper around the real IMalloc::GetSize implementation. +// +// - mem (IN): Pointer to the memory block to inquire about. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::GetSize. +// +SIZE_T VisualLeakDetector::GetSize (LPVOID mem) +{ + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->GetSize(mem) : 0; +} + +// HeapMinimize - Calls to IMalloc::HeapMinimize will end up here. This function +// is just a wrapper around the real IMalloc::HeapMinimize implementation. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::HeapMinimize () +{ + assert(m_iMalloc != NULL); + if (m_iMalloc) m_iMalloc->HeapMinimize(); +} + +// QueryInterface - Calls to IMalloc::QueryInterface will end up here. This +// function is just a wrapper around the real IMalloc::QueryInterface +// implementation. +// +// - iid (IN): COM interface ID to query about. +// +// - object (IN): Address of a pointer to receive the requested interface +// pointer. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::QueryInterface. +// +HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) +{ + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->QueryInterface(iid, object) : E_UNEXPECTED; +} + +// Realloc - Calls to IMalloc::Realloc will end up here. This function is just a +// wrapper around the real IMalloc::Realloc implementation that sets +// appropriate flags to be consulted when the memory is actually allocated by +// RtlAllocateHeap. +// +// - mem (IN): Pointer to the memory block to reallocate. +// +// - size (IN): Size, in bytes, of the memory block to reallocate. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::Realloc. +// +LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) +{ + LPVOID block; + context_t context; + tls_t *tls = getTls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + assert(m_iMalloc != NULL); + block = (m_iMalloc) ? m_iMalloc->Realloc(mem, size) : NULL; + + if (firstcall) + firstAllocCall(tls); + + return block; +} + +// Release - Calls to IMalloc::Release will end up here. This function is just +// a wrapper around the real IMalloc::Release implementation. +// +// Return Value: +// +// Returns the value returned by the system implementation of +// IMalloc::Release. +// +ULONG VisualLeakDetector::Release () +{ + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->Release() : 0; +} diff --git a/vldint.h b/vldint.h index 05e3d301..c72e28b5 100644 --- a/vldint.h +++ b/vldint.h @@ -318,7 +318,7 @@ class VisualLeakDetector : public IMalloc static LPVOID __stdcall _HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); - static BOOL __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); + static BYTE __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); // COM IAT replacement functions @@ -353,7 +353,7 @@ class VisualLeakDetector : public IMalloc static patchentry_t m_kernel32Patch []; static patchentry_t m_ntdllPatch []; static patchentry_t m_ole32Patch []; - static moduleentry_t m_patchTable []; // Table of imports patched for attaching VLD to other modules. + static moduleentry_t m_patchTable [46]; // Table of imports patched for attaching VLD to other modules. FILE *m_reportFile; // File where the memory leak report may be sent to. WCHAR m_reportFilePath [MAX_PATH]; // Full path and name of file to send memory leak report to. const char *m_selfTestFile; // Filename where the memory leak self-test block is leaked. From 4b2fa918c50430bfddceaf768637cd16a7b25a7a Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Thu, 3 Nov 2011 16:54:40 +0000 Subject: [PATCH 124/321] version.h fixed in installer git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C71963 --- setup/version.h | 8 ++++---- setup/vld-setup.nsi | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/setup/version.h b/setup/version.h index f4aba6d2..5822885f 100644 --- a/setup/version.h +++ b/setup/version.h @@ -1,9 +1,9 @@ -#define VLDVERSION L"2.2" -#define VERSION_NUMBER 2,2,0,0 -#define VERSION_STRING "2.2.0.0" +#define VLDVERSION L"2.2.1" +#define VERSION_NUMBER 2,2,1,0 +#define VERSION_STRING "2.2.1.0" #define VERSION_COPYRIGHT "Copyright (C) 2005-2011" #ifndef __FILE__ -!define VLD_VERSION "2.2" // NSIS Script +!define VLD_VERSION "2.2.1" // NSIS Script #endif diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 015c3955..2878281a 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -181,6 +181,7 @@ SectionEnd Section "Source Code" SetOutPath "${SRC_PATH}" + File "version.h" File "..\*.cpp" File "..\*.h" File "..\vld.vcxproj" From 2f59ee37116279b9fa2988b46e9957a62a95ce67 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 21 Nov 2011 22:35:21 +0000 Subject: [PATCH 125/321] calloc hook temporary disabled because of some memory leaks with static linking git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C72516 --- dllspatches.cpp | 42 ++++++++++++++++++++--------------------- tests/basics/basics.cpp | 26 ++++++++++++++----------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/dllspatches.cpp b/dllspatches.cpp index 6ede89a1..8e4e3c44 100644 --- a/dllspatches.cpp +++ b/dllspatches.cpp @@ -301,7 +301,7 @@ static patchentry_t mfc110udPatch [] = { static patchentry_t msvcrtPatch [] = { scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, //vector_new_dbg_name, &VS60::pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, - "calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, + //"calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, "malloc", &VS60::pcrtd_malloc, VS60::crtd_malloc, "realloc", &VS60::pcrtd_realloc, VS60::crtd_realloc, scalar_new_name, &VS60::pcrtd_scalar_new, VS60::crtd_scalar_new, @@ -310,12 +310,12 @@ static patchentry_t msvcrtPatch [] = { }; static patchentry_t msvcrtdPatch [] = { - "_calloc_dbg", &VS60d::pcrtd__calloc_dbg, VS60d::crtd__calloc_dbg, + //"_calloc_dbg", &VS60d::pcrtd__calloc_dbg, VS60d::crtd__calloc_dbg, "_malloc_dbg", &VS60d::pcrtd__malloc_dbg, VS60d::crtd__malloc_dbg, "_realloc_dbg", &VS60d::pcrtd__realloc_dbg, VS60d::crtd__realloc_dbg, scalar_new_dbg_name, &VS60d::pcrtd__scalar_new_dbg, VS60d::crtd__scalar_new_dbg, //vector_new_dbg_name, &VS60d::pcrtd__vector_new_dbg, VS60d::crtd__vector_new_dbg, - "calloc", &VS60d::pcrtd_calloc, VS60d::crtd_calloc, + //"calloc", &VS60d::pcrtd_calloc, VS60d::crtd_calloc, "malloc", &VS60d::pcrtd_malloc, VS60d::crtd_malloc, "realloc", &VS60d::pcrtd_realloc, VS60d::crtd_realloc, scalar_new_name, &VS60d::pcrtd_scalar_new, VS60d::crtd_scalar_new, @@ -326,7 +326,7 @@ static patchentry_t msvcrtdPatch [] = { static patchentry_t msvcr70Patch [] = { scalar_new_dbg_name, &VS70::pcrtd__scalar_new_dbg, VS70::crtd__scalar_new_dbg, vector_new_dbg_name, &VS70::pcrtd__vector_new_dbg, VS70::crtd__vector_new_dbg, - "calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, + //"calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, scalar_new_name, &VS70::pcrtd_scalar_new, VS70::crtd_scalar_new, @@ -335,12 +335,12 @@ static patchentry_t msvcr70Patch [] = { }; static patchentry_t msvcr70dPatch [] = { - "_calloc_dbg", &VS70d::pcrtd__calloc_dbg, VS70d::crtd__calloc_dbg, + //"_calloc_dbg", &VS70d::pcrtd__calloc_dbg, VS70d::crtd__calloc_dbg, "_malloc_dbg", &VS70d::pcrtd__malloc_dbg, VS70d::crtd__malloc_dbg, "_realloc_dbg", &VS70d::pcrtd__realloc_dbg, VS70d::crtd__realloc_dbg, scalar_new_dbg_name, &VS70d::pcrtd__scalar_new_dbg, VS70d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS70d::pcrtd__vector_new_dbg, VS70d::crtd__vector_new_dbg, - "calloc", &VS70d::pcrtd_calloc, VS70d::crtd_calloc, + //"calloc", &VS70d::pcrtd_calloc, VS70d::crtd_calloc, "malloc", &VS70d::pcrtd_malloc, VS70d::crtd_malloc, "realloc", &VS70d::pcrtd_realloc, VS70d::crtd_realloc, scalar_new_name, &VS70d::pcrtd_scalar_new, VS70d::crtd_scalar_new, @@ -351,7 +351,7 @@ static patchentry_t msvcr70dPatch [] = { static patchentry_t msvcr71Patch [] = { scalar_new_dbg_name, &VS71::pcrtd__scalar_new_dbg, VS71::crtd__scalar_new_dbg, vector_new_dbg_name, &VS71::pcrtd__vector_new_dbg, VS71::crtd__vector_new_dbg, - "calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, + //"calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, scalar_new_name, &VS71::pcrtd_scalar_new, VS71::crtd_scalar_new, @@ -360,12 +360,12 @@ static patchentry_t msvcr71Patch [] = { }; static patchentry_t msvcr71dPatch [] = { - "_calloc_dbg", &VS71d::pcrtd__calloc_dbg, VS71d::crtd__calloc_dbg, + //"_calloc_dbg", &VS71d::pcrtd__calloc_dbg, VS71d::crtd__calloc_dbg, "_malloc_dbg", &VS71d::pcrtd__malloc_dbg, VS71d::crtd__malloc_dbg, "_realloc_dbg", &VS71d::pcrtd__realloc_dbg, VS71d::crtd__realloc_dbg, scalar_new_dbg_name, &VS71d::pcrtd__scalar_new_dbg, VS71d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS71d::pcrtd__vector_new_dbg, VS71d::crtd__vector_new_dbg, - "calloc", &VS71d::pcrtd_calloc, VS71d::crtd_calloc, + //"calloc", &VS71d::pcrtd_calloc, VS71d::crtd_calloc, "malloc", &VS71d::pcrtd_malloc, VS71d::crtd_malloc, "realloc", &VS71d::pcrtd_realloc, VS71d::crtd_realloc, scalar_new_name, &VS71d::pcrtd_scalar_new, VS71d::crtd_scalar_new, @@ -376,7 +376,7 @@ static patchentry_t msvcr71dPatch [] = { static patchentry_t msvcr80Patch [] = { scalar_new_dbg_name, &VS80::pcrtd__scalar_new_dbg, VS80::crtd__scalar_new_dbg, vector_new_dbg_name, &VS80::pcrtd__vector_new_dbg, VS80::crtd__vector_new_dbg, - "calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, + //"calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, scalar_new_name, &VS80::pcrtd_scalar_new, VS80::crtd_scalar_new, @@ -389,12 +389,12 @@ static patchentry_t msvcr80Patch [] = { }; static patchentry_t msvcr80dPatch [] = { - "_calloc_dbg", &VS80d::pcrtd__calloc_dbg, VS80d::crtd__calloc_dbg, + //"_calloc_dbg", &VS80d::pcrtd__calloc_dbg, VS80d::crtd__calloc_dbg, "_malloc_dbg", &VS80d::pcrtd__malloc_dbg, VS80d::crtd__malloc_dbg, "_realloc_dbg", &VS80d::pcrtd__realloc_dbg, VS80d::crtd__realloc_dbg, scalar_new_dbg_name, &VS80d::pcrtd__scalar_new_dbg, VS80d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS80d::pcrtd__vector_new_dbg, VS80d::crtd__vector_new_dbg, - "calloc", &VS80d::pcrtd_calloc, VS80d::crtd_calloc, + //"calloc", &VS80d::pcrtd_calloc, VS80d::crtd_calloc, "malloc", &VS80d::pcrtd_malloc, VS80d::crtd_malloc, "realloc", &VS80d::pcrtd_realloc, VS80d::crtd_realloc, scalar_new_name, &VS80d::pcrtd_scalar_new, VS80d::crtd_scalar_new, @@ -413,7 +413,7 @@ static patchentry_t msvcr80dPatch [] = { static patchentry_t msvcr90Patch [] = { scalar_new_dbg_name, &VS90::pcrtd__scalar_new_dbg, VS90::crtd__scalar_new_dbg, vector_new_dbg_name, &VS90::pcrtd__vector_new_dbg, VS90::crtd__vector_new_dbg, - "calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, + //"calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, @@ -429,13 +429,13 @@ static patchentry_t msvcr90Patch [] = { }; static patchentry_t msvcr90dPatch [] = { - "_calloc_dbg", &VS90d::pcrtd__calloc_dbg, VS90d::crtd__calloc_dbg, + //"_calloc_dbg", &VS90d::pcrtd__calloc_dbg, VS90d::crtd__calloc_dbg, "_malloc_dbg", &VS90d::pcrtd__malloc_dbg, VS90d::crtd__malloc_dbg, "_realloc_dbg", &VS90d::pcrtd__realloc_dbg, VS90d::crtd__realloc_dbg, "_recalloc_dbg", &VS90d::pcrtd__recalloc_dbg, VS90d::crtd__recalloc_dbg, scalar_new_dbg_name, &VS90d::pcrtd__scalar_new_dbg, VS90d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS90d::pcrtd__vector_new_dbg, VS90d::crtd__vector_new_dbg, - "calloc", &VS90d::pcrtd_calloc, VS90d::crtd_calloc, + //"calloc", &VS90d::pcrtd_calloc, VS90d::crtd_calloc, "malloc", &VS90d::pcrtd_malloc, VS90d::crtd_malloc, "realloc", &VS90d::pcrtd_realloc, VS90d::crtd_realloc, "_recalloc", &VS90d::pcrtd_recalloc, VS90d::crtd__recalloc, @@ -459,7 +459,7 @@ static patchentry_t msvcr90dPatch [] = { static patchentry_t msvcr100Patch [] = { scalar_new_dbg_name, &VS100::pcrtd__scalar_new_dbg, VS100::crtd__scalar_new_dbg, vector_new_dbg_name, &VS100::pcrtd__vector_new_dbg, VS100::crtd__vector_new_dbg, - "calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, + //"calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, @@ -475,13 +475,13 @@ static patchentry_t msvcr100Patch [] = { }; static patchentry_t msvcr100dPatch [] = { - "_calloc_dbg", &VS100d::pcrtd__calloc_dbg, VS100d::crtd__calloc_dbg, + //"_calloc_dbg", &VS100d::pcrtd__calloc_dbg, VS100d::crtd__calloc_dbg, "_malloc_dbg", &VS100d::pcrtd__malloc_dbg, VS100d::crtd__malloc_dbg, "_realloc_dbg", &VS100d::pcrtd__realloc_dbg, VS100d::crtd__realloc_dbg, "_recalloc_dbg", &VS100d::pcrtd__recalloc_dbg, VS100d::crtd__recalloc_dbg, scalar_new_dbg_name, &VS100d::pcrtd__scalar_new_dbg, VS100d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS100d::pcrtd__vector_new_dbg, VS100d::crtd__vector_new_dbg, - "calloc", &VS100d::pcrtd_calloc, VS100d::crtd_calloc, + //"calloc", &VS100d::pcrtd_calloc, VS100d::crtd_calloc, "malloc", &VS100d::pcrtd_malloc, VS100d::crtd_malloc, "realloc", &VS100d::pcrtd_realloc, VS100d::crtd_realloc, "_recalloc", &VS100d::pcrtd_recalloc, VS100d::crtd__recalloc, @@ -505,7 +505,7 @@ static patchentry_t msvcr100dPatch [] = { static patchentry_t msvcr110Patch [] = { scalar_new_dbg_name, &VS110::pcrtd__scalar_new_dbg, VS110::crtd__scalar_new_dbg, vector_new_dbg_name, &VS110::pcrtd__vector_new_dbg, VS110::crtd__vector_new_dbg, - "calloc", &VS110::pcrtd_calloc, VS110::crtd_calloc, + //"calloc", &VS110::pcrtd_calloc, VS110::crtd_calloc, "malloc", &VS110::pcrtd_malloc, VS110::crtd_malloc, "realloc", &VS110::pcrtd_realloc, VS110::crtd_realloc, "_recalloc", &VS110::pcrtd_recalloc, VS110::crtd__recalloc, @@ -521,13 +521,13 @@ static patchentry_t msvcr110Patch [] = { }; static patchentry_t msvcr110dPatch [] = { - "_calloc_dbg", &VS110d::pcrtd__calloc_dbg, VS110d::crtd__calloc_dbg, + //"_calloc_dbg", &VS110d::pcrtd__calloc_dbg, VS110d::crtd__calloc_dbg, "_malloc_dbg", &VS110d::pcrtd__malloc_dbg, VS110d::crtd__malloc_dbg, "_realloc_dbg", &VS110d::pcrtd__realloc_dbg, VS110d::crtd__realloc_dbg, "_recalloc_dbg", &VS110d::pcrtd__recalloc_dbg, VS110d::crtd__recalloc_dbg, scalar_new_dbg_name, &VS110d::pcrtd__scalar_new_dbg, VS110d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS110d::pcrtd__vector_new_dbg, VS110d::crtd__vector_new_dbg, - "calloc", &VS110d::pcrtd_calloc, VS110d::crtd_calloc, + //"calloc", &VS110d::pcrtd_calloc, VS110d::crtd_calloc, "malloc", &VS110d::pcrtd_malloc, VS110d::crtd_malloc, "realloc", &VS110d::pcrtd_realloc, VS110d::crtd_realloc, "_recalloc", &VS110d::pcrtd_recalloc, VS110d::crtd__recalloc, diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index a4109767..1c515bf5 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -65,16 +65,16 @@ namespace tut ensure("leaks", leaks == (repeat * 2)); } - template<> - template<> - void object::test<4>() - { - set_test_name("Calloc"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eCalloc,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } + //template<> + //template<> + //void object::test<4>() + //{ + // set_test_name("Calloc"); + // int prev = (int)VLDGetLeaksCount(); + // LeakMemory(eCalloc,repeat,false); + // int leaks = (int)VLDGetLeaksCount() - prev; + // ensure("leaks", leaks == (repeat * 2)); + //} template<> template<> @@ -222,7 +222,7 @@ int _tmain(int argc, _TCHAR* argv[]) else if (_tcsicmp(_T("all"), argv[1]) == 0) { checkAll = true; - multiplayer = 17; + multiplayer = 17 - 2; } else { @@ -243,7 +243,11 @@ int _tmain(int argc, _TCHAR* argv[]) else { for (int leak_type = 0; leak_type < eCount; leak_type++) + { + if (leak_type == eCalloc) + continue; LeakMemory((LeakOption)leak_type,repeat,bFree); + } } int leaks = (int)VLDGetLeaksCount() - prevleaks; wprintf(_T("End of test app...\n\n")); From 8d566b611b2d40e6f98b28b9a7cad787c479e756 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 21 Nov 2011 23:13:39 +0000 Subject: [PATCH 126/321] Print function fixed. Patch by xpol This commit fixes 8809 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C72517 --- utility.cpp | 4 +- vld.cpp | 158 ++++++++++++++++++++++++++-------------------------- 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/utility.cpp b/utility.cpp index b716ffc4..1e4cce18 100644 --- a/utility.cpp +++ b/utility.cpp @@ -603,7 +603,7 @@ VOID Print (LPWSTR messagew) } if ( s_reportToStdOut ) - fwprintf(stdout,messagew); + fputws(messagew, stdout); if (s_reportToDebugger) OutputDebugStringW(messagew); @@ -624,7 +624,7 @@ VOID Print (LPWSTR messagew) } if ( s_reportToStdOut ) - printf(messagea); + fputs(messagea, stdout); if (s_reportToDebugger) OutputDebugStringA(messagea); diff --git a/vld.cpp b/vld.cpp index cf602a07..166d2a3e 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1070,65 +1070,65 @@ VOID VisualLeakDetector::mapHeap (HANDLE heap) // VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context) { - if (NULL == mem) - return; - - // Find this heap's block map. - CriticalSectionLocker cs(m_heapMapLock); - HeapMap::Iterator heapit = m_heapMap->find(heap); - if (heapit == m_heapMap->end()) { - // We don't have a block map for this heap. We must not have monitored - // this allocation (probably happened before VLD was initialized). - return; - } - - // Find this block in the block map. - BlockMap *blockmap = &(*heapit).second->blockMap; - BlockMap::Iterator blockit = blockmap->find(mem); - if (blockit == blockmap->end()) - { - // This memory block is not in the block map. We must not have monitored this - // allocation (probably happened before VLD was initialized). - - // This can also result from allocating on one heap, and freeing on another heap. - // This is an especially bad way to corrupt the application. - // Now we have to search through every heap and every single block in each to make - // sure that this is indeed the case. - if (m_options & VLD_OPT_VALIDATE_HEAPFREE) - { - HANDLE other_heap = NULL; - blockinfo_t* alloc_block = findAllocedBlock(mem, other_heap); // other_heap is an out parameter - bool diff = other_heap != heap; // Check indeed if the other heap is different - if (alloc_block && alloc_block->callStack && diff) - { - Report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); - Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); - Report(L" Call Stack:\n"); - alloc_block->callStack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); - - // Now we need a way to print the current callstack at this point: - CallStack* stack_here = CallStack::Create(); - stack_here->getStackTrace(m_maxTraceFrames, context); - Report(L"Deallocation Call stack.\n"); - Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); - Report(L" Call Stack:\n"); - stack_here->dump(FALSE); - // Now it should be safe to delete our temporary callstack - delete stack_here; - stack_here = NULL; - if (IsDebuggerPresent()) - DebugBreak(); - } - } - return; - } - - // Free the blockinfo_t structure and erase it from the block map. - blockinfo_t *info = (*blockit).second; - m_curAlloc -= info->size; - delete info->callStack; - delete info; - blockmap->erase(blockit); + if (NULL == mem) + return; + + // Find this heap's block map. + CriticalSectionLocker cs(m_heapMapLock); + HeapMap::Iterator heapit = m_heapMap->find(heap); + if (heapit == m_heapMap->end()) { + // We don't have a block map for this heap. We must not have monitored + // this allocation (probably happened before VLD was initialized). + return; + } + + // Find this block in the block map. + BlockMap *blockmap = &(*heapit).second->blockMap; + BlockMap::Iterator blockit = blockmap->find(mem); + if (blockit == blockmap->end()) + { + // This memory block is not in the block map. We must not have monitored this + // allocation (probably happened before VLD was initialized). + + // This can also result from allocating on one heap, and freeing on another heap. + // This is an especially bad way to corrupt the application. + // Now we have to search through every heap and every single block in each to make + // sure that this is indeed the case. + if (m_options & VLD_OPT_VALIDATE_HEAPFREE) + { + HANDLE other_heap = NULL; + blockinfo_t* alloc_block = findAllocedBlock(mem, other_heap); // other_heap is an out parameter + bool diff = other_heap != heap; // Check indeed if the other heap is different + if (alloc_block && alloc_block->callStack && diff) + { + Report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); + Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); + Report(L" Call Stack:\n"); + alloc_block->callStack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + + // Now we need a way to print the current callstack at this point: + CallStack* stack_here = CallStack::Create(); + stack_here->getStackTrace(m_maxTraceFrames, context); + Report(L"Deallocation Call stack.\n"); + Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); + Report(L" Call Stack:\n"); + stack_here->dump(FALSE); + // Now it should be safe to delete our temporary callstack + delete stack_here; + stack_here = NULL; + if (IsDebuggerPresent()) + DebugBreak(); + } + } + return; + } + + // Free the blockinfo_t structure and erase it from the block map. + blockinfo_t *info = (*blockit).second; + m_curAlloc -= info->size; + delete info->callStack; + delete info; + blockmap->erase(blockit); } // unmapheap - Tracks heap destruction. Unmaps the specified heap from its block @@ -1143,26 +1143,26 @@ VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t & // VOID VisualLeakDetector::unmapHeap (HANDLE heap) { - // Find this heap's block map. - CriticalSectionLocker cs(m_heapMapLock); - HeapMap::Iterator heapit = m_heapMap->find(heap); - if (heapit == m_heapMap->end()) { - // This heap hasn't been mapped. We must not have monitored this heap's - // creation (probably happened before VLD was initialized). - return; - } - - // Free all of the blockinfo_t structures stored in the block map. - heapinfo_t *heapinfo = (*heapit).second; - BlockMap *blockmap = &heapinfo->blockMap; - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callStack; - delete (*blockit).second; - } - delete heapinfo; - - // Remove this heap's block map from the heap map. - m_heapMap->erase(heapit); + // Find this heap's block map. + CriticalSectionLocker cs(m_heapMapLock); + HeapMap::Iterator heapit = m_heapMap->find(heap); + if (heapit == m_heapMap->end()) { + // This heap hasn't been mapped. We must not have monitored this heap's + // creation (probably happened before VLD was initialized). + return; + } + + // Free all of the blockinfo_t structures stored in the block map. + heapinfo_t *heapinfo = (*heapit).second; + BlockMap *blockmap = &heapinfo->blockMap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + delete (*blockit).second->callStack; + delete (*blockit).second; + } + delete heapinfo; + + // Remove this heap's block map from the heap map. + m_heapMap->erase(heapit); } // remapblock - Tracks reallocations. Unmaps a block from its previously From e580a65f1a1f652e16d817729b26199ab610ce2f Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 21 Nov 2011 23:22:13 +0000 Subject: [PATCH 127/321] Add support for _strdup() and _strdup_dbg(). Patch by xpol (issue 8809). Previous patch was created by benpmorgan (issue 8722). This commit fixes 8809 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C72518 --- crtmfcpatch.h | 63 +++++++++++++++++++++++++++++++++++++++ dllspatches.cpp | 7 +++++ tests/basics/Allocs.cpp | 13 +++++++- tests/basics/LeakOption.h | 1 + tests/basics/basics.cpp | 17 ++++++++++- vld_hooks.cpp | 57 +++++++++++++++++++++++++++++++++++ vldint.h | 5 ++++ 7 files changed, 161 insertions(+), 2 deletions(-) diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 76962a03..2cb2a4d0 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -46,6 +46,10 @@ class CrtMfcPatch static void* __cdecl crtd_malloc (size_t size); static void* __cdecl crtd_realloc (void *mem, size_t size); static void* __cdecl crtd__recalloc (void *mem, size_t num, size_t size); + + static char* __cdecl crtd__strdup (const char* src); + static char* __cdecl crtd__strdup_dbg (const char* src, int type, char const *file, int line); + static void* __cdecl crtd_scalar_new (size_t size); static void* __cdecl crtd_vector_new (size_t size); @@ -79,10 +83,12 @@ class CrtMfcPatch static void* pcrtd__malloc_dbg; static void* pcrtd__realloc_dbg; static void* pcrtd__recalloc_dbg; + static void* pcrtd__strdup_dbg; static void* pcrtd_calloc; static void* pcrtd_malloc; static void* pcrtd_realloc; static void* pcrtd_recalloc; + static void* pcrtd__strdup; static void* pcrtd__aligned_malloc_dbg; static void* pcrtd__aligned_offset_malloc_dbg; static void* pcrtd__aligned_realloc_dbg; @@ -256,6 +262,22 @@ void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, return g_vld.__recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, type, file, line); } + +template +char* CrtMfcPatch::crtd__strdup_dbg (const char* src, + int type, + char const *file, + int line) +{ + _strdup_dbg_t pcrtxxd__strdup_dbg = (_strdup_dbg_t)pcrtd__strdup_dbg; + assert(pcrtxxd__strdup_dbg); + + context_t context; + CAPTURE_CONTEXT(context); + + return g_vld.__strdup_dbg(pcrtxxd__strdup_dbg, context, debug, src, type, file, line); +} + // crtd__scalar_new_dbg - Calls to the CRT's debug scalar new operator from // msvcrXXd.dll are patched through to this function. // @@ -416,6 +438,19 @@ void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, siz return g_vld.__recalloc(pcrtxxd_recalloc, context, debug, mem, num, size); } + +template +char* CrtMfcPatch::crtd__strdup (const char* src) +{ + _strdup_t pcrtxxd_strdup = (_strdup_t)pcrtd__strdup; + assert(pcrtxxd_strdup); + + context_t context; + CAPTURE_CONTEXT(context); + + return g_vld.__strdup(pcrtxxd_strdup, context, debug, src); +} + // crtd__aligned_malloc_dbg - Calls to _aligned_malloc_dbg from msvcrXXd.dll are patched // through to this function. // @@ -1187,10 +1222,12 @@ void* VS60::pcrtd__calloc_dbg = NULL; void* VS60::pcrtd__malloc_dbg = NULL; void* VS60::pcrtd__realloc_dbg = NULL; void* VS60::pcrtd__recalloc_dbg = NULL; +void* VS60::pcrtd__strdup_dbg = NULL; void* VS60::pcrtd_calloc = NULL; void* VS60::pcrtd_malloc = NULL; void* VS60::pcrtd_realloc = NULL; void* VS60::pcrtd_recalloc = NULL; +void* VS60::pcrtd__strdup = NULL; void* VS60::pcrtd__aligned_malloc_dbg = NULL; void* VS60::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS60::pcrtd__aligned_realloc_dbg = NULL; @@ -1224,10 +1261,12 @@ void* VS60d::pcrtd__calloc_dbg = NULL; void* VS60d::pcrtd__malloc_dbg = NULL; void* VS60d::pcrtd__realloc_dbg = NULL; void* VS60d::pcrtd__recalloc_dbg = NULL; +void* VS60d::pcrtd__strdup_dbg = NULL; void* VS60d::pcrtd_calloc = NULL; void* VS60d::pcrtd_malloc = NULL; void* VS60d::pcrtd_realloc = NULL; void* VS60d::pcrtd_recalloc = NULL; +void* VS60d::pcrtd__strdup = NULL; void* VS60d::pcrtd__aligned_malloc_dbg = NULL; void* VS60d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS60d::pcrtd__aligned_realloc_dbg = NULL; @@ -1261,10 +1300,12 @@ void* VS70::pcrtd__calloc_dbg = NULL; void* VS70::pcrtd__malloc_dbg = NULL; void* VS70::pcrtd__realloc_dbg = NULL; void* VS70::pcrtd__recalloc_dbg = NULL; +void* VS70::pcrtd__strdup_dbg = NULL; void* VS70::pcrtd_calloc = NULL; void* VS70::pcrtd_malloc = NULL; void* VS70::pcrtd_realloc = NULL; void* VS70::pcrtd_recalloc = NULL; +void* VS70::pcrtd__strdup = NULL; void* VS70::pcrtd__aligned_malloc_dbg = NULL; void* VS70::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS70::pcrtd__aligned_realloc_dbg = NULL; @@ -1298,10 +1339,12 @@ void* VS70d::pcrtd__calloc_dbg = NULL; void* VS70d::pcrtd__malloc_dbg = NULL; void* VS70d::pcrtd__realloc_dbg = NULL; void* VS70d::pcrtd__recalloc_dbg = NULL; +void* VS70d::pcrtd__strdup_dbg = NULL; void* VS70d::pcrtd_calloc = NULL; void* VS70d::pcrtd_malloc = NULL; void* VS70d::pcrtd_realloc = NULL; void* VS70d::pcrtd_recalloc = NULL; +void* VS70d::pcrtd__strdup = NULL; void* VS70d::pcrtd__aligned_malloc_dbg = NULL; void* VS70d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS70d::pcrtd__aligned_realloc_dbg = NULL; @@ -1335,10 +1378,12 @@ void* VS71::pcrtd__calloc_dbg = NULL; void* VS71::pcrtd__malloc_dbg = NULL; void* VS71::pcrtd__realloc_dbg = NULL; void* VS71::pcrtd__recalloc_dbg = NULL; +void* VS71::pcrtd__strdup_dbg = NULL; void* VS71::pcrtd_calloc = NULL; void* VS71::pcrtd_malloc = NULL; void* VS71::pcrtd_realloc = NULL; void* VS71::pcrtd_recalloc = NULL; +void* VS71::pcrtd__strdup = NULL; void* VS71::pcrtd__aligned_malloc_dbg = NULL; void* VS71::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS71::pcrtd__aligned_realloc_dbg = NULL; @@ -1372,10 +1417,12 @@ void* VS71d::pcrtd__calloc_dbg = NULL; void* VS71d::pcrtd__malloc_dbg = NULL; void* VS71d::pcrtd__realloc_dbg = NULL; void* VS71d::pcrtd__recalloc_dbg = NULL; +void* VS71d::pcrtd__strdup_dbg = NULL; void* VS71d::pcrtd_calloc = NULL; void* VS71d::pcrtd_malloc = NULL; void* VS71d::pcrtd_realloc = NULL; void* VS71d::pcrtd_recalloc = NULL; +void* VS71d::pcrtd__strdup = NULL; void* VS71d::pcrtd__aligned_malloc_dbg = NULL; void* VS71d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS71d::pcrtd__aligned_realloc_dbg = NULL; @@ -1409,10 +1456,12 @@ void* VS80::pcrtd__calloc_dbg = NULL; void* VS80::pcrtd__malloc_dbg = NULL; void* VS80::pcrtd__realloc_dbg = NULL; void* VS80::pcrtd__recalloc_dbg = NULL; +void* VS80::pcrtd__strdup_dbg = NULL; void* VS80::pcrtd_calloc = NULL; void* VS80::pcrtd_malloc = NULL; void* VS80::pcrtd_realloc = NULL; void* VS80::pcrtd_recalloc = NULL; +void* VS80::pcrtd__strdup = NULL; void* VS80::pcrtd__aligned_malloc_dbg = NULL; void* VS80::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS80::pcrtd__aligned_realloc_dbg = NULL; @@ -1446,10 +1495,12 @@ void* VS80d::pcrtd__calloc_dbg = NULL; void* VS80d::pcrtd__malloc_dbg = NULL; void* VS80d::pcrtd__realloc_dbg = NULL; void* VS80d::pcrtd__recalloc_dbg = NULL; +void* VS80d::pcrtd__strdup_dbg = NULL; void* VS80d::pcrtd_calloc = NULL; void* VS80d::pcrtd_malloc = NULL; void* VS80d::pcrtd_realloc = NULL; void* VS80d::pcrtd_recalloc = NULL; +void* VS80d::pcrtd__strdup = NULL; void* VS80d::pcrtd__aligned_malloc_dbg = NULL; void* VS80d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS80d::pcrtd__aligned_realloc_dbg = NULL; @@ -1483,10 +1534,12 @@ void* VS90::pcrtd__calloc_dbg = NULL; void* VS90::pcrtd__malloc_dbg = NULL; void* VS90::pcrtd__realloc_dbg = NULL; void* VS90::pcrtd__recalloc_dbg = NULL; +void* VS90::pcrtd__strdup_dbg = NULL; void* VS90::pcrtd_calloc = NULL; void* VS90::pcrtd_malloc = NULL; void* VS90::pcrtd_realloc = NULL; void* VS90::pcrtd_recalloc = NULL; +void* VS90::pcrtd__strdup = NULL; void* VS90::pcrtd__aligned_malloc_dbg = NULL; void* VS90::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS90::pcrtd__aligned_realloc_dbg = NULL; @@ -1520,10 +1573,12 @@ void* VS90d::pcrtd__calloc_dbg = NULL; void* VS90d::pcrtd__malloc_dbg = NULL; void* VS90d::pcrtd__realloc_dbg = NULL; void* VS90d::pcrtd__recalloc_dbg = NULL; +void* VS90d::pcrtd__strdup_dbg = NULL; void* VS90d::pcrtd_calloc = NULL; void* VS90d::pcrtd_malloc = NULL; void* VS90d::pcrtd_realloc = NULL; void* VS90d::pcrtd_recalloc = NULL; +void* VS90d::pcrtd__strdup = NULL; void* VS90d::pcrtd__aligned_malloc_dbg = NULL; void* VS90d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS90d::pcrtd__aligned_realloc_dbg = NULL; @@ -1557,10 +1612,12 @@ void* VS100::pcrtd__calloc_dbg = NULL; void* VS100::pcrtd__malloc_dbg = NULL; void* VS100::pcrtd__realloc_dbg = NULL; void* VS100::pcrtd__recalloc_dbg = NULL; +void* VS100::pcrtd__strdup_dbg = NULL; void* VS100::pcrtd_calloc = NULL; void* VS100::pcrtd_malloc = NULL; void* VS100::pcrtd_realloc = NULL; void* VS100::pcrtd_recalloc = NULL; +void* VS100::pcrtd__strdup = NULL; void* VS100::pcrtd__aligned_malloc_dbg = NULL; void* VS100::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS100::pcrtd__aligned_realloc_dbg = NULL; @@ -1594,10 +1651,12 @@ void* VS100d::pcrtd__calloc_dbg = NULL; void* VS100d::pcrtd__malloc_dbg = NULL; void* VS100d::pcrtd__realloc_dbg = NULL; void* VS100d::pcrtd__recalloc_dbg = NULL; +void* VS100d::pcrtd__strdup_dbg = NULL; void* VS100d::pcrtd_calloc = NULL; void* VS100d::pcrtd_malloc = NULL; void* VS100d::pcrtd_realloc = NULL; void* VS100d::pcrtd_recalloc = NULL; +void* VS100d::pcrtd__strdup = NULL; void* VS100d::pcrtd__aligned_malloc_dbg = NULL; void* VS100d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS100d::pcrtd__aligned_realloc_dbg = NULL; @@ -1631,10 +1690,12 @@ void* VS110::pcrtd__calloc_dbg = NULL; void* VS110::pcrtd__malloc_dbg = NULL; void* VS110::pcrtd__realloc_dbg = NULL; void* VS110::pcrtd__recalloc_dbg = NULL; +void* VS110::pcrtd__strdup_dbg = NULL; void* VS110::pcrtd_calloc = NULL; void* VS110::pcrtd_malloc = NULL; void* VS110::pcrtd_realloc = NULL; void* VS110::pcrtd_recalloc = NULL; +void* VS110::pcrtd__strdup = NULL; void* VS110::pcrtd__aligned_malloc_dbg = NULL; void* VS110::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS110::pcrtd__aligned_realloc_dbg = NULL; @@ -1668,10 +1729,12 @@ void* VS110d::pcrtd__calloc_dbg = NULL; void* VS110d::pcrtd__malloc_dbg = NULL; void* VS110d::pcrtd__realloc_dbg = NULL; void* VS110d::pcrtd__recalloc_dbg = NULL; +void* VS110d::pcrtd__strdup_dbg = NULL; void* VS110d::pcrtd_calloc = NULL; void* VS110d::pcrtd_malloc = NULL; void* VS110d::pcrtd_realloc = NULL; void* VS110d::pcrtd_recalloc = NULL; +void* VS110d::pcrtd__strdup = NULL; void* VS110d::pcrtd__aligned_malloc_dbg = NULL; void* VS110d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS110d::pcrtd__aligned_realloc_dbg = NULL; diff --git a/dllspatches.cpp b/dllspatches.cpp index 8e4e3c44..ec0cbecf 100644 --- a/dllspatches.cpp +++ b/dllspatches.cpp @@ -304,6 +304,7 @@ static patchentry_t msvcrtPatch [] = { //"calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, "malloc", &VS60::pcrtd_malloc, VS60::crtd_malloc, "realloc", &VS60::pcrtd_realloc, VS60::crtd_realloc, + "_strdup", &VS60::pcrtd__strdup, VS60::crtd__strdup, scalar_new_name, &VS60::pcrtd_scalar_new, VS60::crtd_scalar_new, //vector_new_name, &VS60::pcrtd_vector_new, VS60::crtd_vector_new, NULL, NULL, NULL @@ -329,6 +330,7 @@ static patchentry_t msvcr70Patch [] = { //"calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, + "_strdup", &VS70::pcrtd__strdup, VS70::crtd__strdup, scalar_new_name, &VS70::pcrtd_scalar_new, VS70::crtd_scalar_new, vector_new_name, &VS70::pcrtd_vector_new, VS70::crtd_vector_new, NULL, NULL, NULL @@ -354,6 +356,7 @@ static patchentry_t msvcr71Patch [] = { //"calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, + "_strdup", &VS71::pcrtd__strdup, VS71::crtd__strdup, scalar_new_name, &VS71::pcrtd_scalar_new, VS71::crtd_scalar_new, vector_new_name, &VS71::pcrtd_vector_new, VS71::crtd_vector_new, NULL, NULL, NULL @@ -379,6 +382,7 @@ static patchentry_t msvcr80Patch [] = { //"calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, + "_strdup", &VS80::pcrtd__strdup, VS80::crtd__strdup, scalar_new_name, &VS80::pcrtd_scalar_new, VS80::crtd_scalar_new, vector_new_name, &VS80::pcrtd_vector_new, VS80::crtd_vector_new, "_aligned_malloc", &VS80::pcrtd_aligned_malloc, VS80::crtd__aligned_malloc, @@ -416,6 +420,7 @@ static patchentry_t msvcr90Patch [] = { //"calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, + "_strdup", &VS90::pcrtd__strdup, VS90::crtd__strdup, "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, scalar_new_name, &VS90::pcrtd_scalar_new, VS90::crtd_scalar_new, vector_new_name, &VS90::pcrtd_vector_new, VS90::crtd_vector_new, @@ -462,6 +467,7 @@ static patchentry_t msvcr100Patch [] = { //"calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, + "_strdup", &VS100::pcrtd__strdup, VS100::crtd__strdup, "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, scalar_new_name, &VS100::pcrtd_scalar_new, VS100::crtd_scalar_new, vector_new_name, &VS100::pcrtd_vector_new, VS100::crtd_vector_new, @@ -508,6 +514,7 @@ static patchentry_t msvcr110Patch [] = { //"calloc", &VS110::pcrtd_calloc, VS110::crtd_calloc, "malloc", &VS110::pcrtd_malloc, VS110::crtd_malloc, "realloc", &VS110::pcrtd_realloc, VS110::crtd_realloc, + "_strdup", &VS110::pcrtd__strdup, VS110::crtd__strdup, "_recalloc", &VS110::pcrtd_recalloc, VS110::crtd__recalloc, scalar_new_name, &VS110::pcrtd_scalar_new, VS110::crtd_scalar_new, vector_new_name, &VS110::pcrtd_vector_new, VS110::crtd_vector_new, diff --git a/tests/basics/Allocs.cpp b/tests/basics/Allocs.cpp index fed9e64b..bfcb989a 100644 --- a/tests/basics/Allocs.cpp +++ b/tests/basics/Allocs.cpp @@ -105,7 +105,18 @@ void AllocF(LeakOption type, bool bFree) _aligned_free(leaked_memory); _aligned_free_dbg(leaked_memory_dbg); } - } + } + else if (type == eStrdup) + { + leaked_memory = (int*)strdup("strdup() leaks!"); + leaked_memory_dbg = (int*)_strdup_dbg("_strdup_dbg() leaks!", _NORMAL_BLOCK,__FILE__,__LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + } + } + } void AllocE(LeakOption type, bool bFree) diff --git a/tests/basics/LeakOption.h b/tests/basics/LeakOption.h index 9ebd5230..6a37885b 100644 --- a/tests/basics/LeakOption.h +++ b/tests/basics/LeakOption.h @@ -11,6 +11,7 @@ enum LeakOption eCoTaskMem, // For COM, use "CoTaskMem" eAlignedMalloc, // "_aligned_malloc" eAlignedRealloc, // "_aligned_realloc" + eStrdup, // "strdup" eCount, }; diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 1c515bf5..dd2cfb19 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -120,6 +120,17 @@ namespace tut ensure("leaks", leaks == (repeat * 3)); } + template<> + template<> + void object::test<9>() + { + set_test_name("Strdup"); + int prev = (int)VLDGetLeaksCount(); + LeakMemory(eStrdup,repeat,false); + int leaks = (int)VLDGetLeaksCount() - prev; + ensure("leaks", leaks == (repeat * 2)); + } + test_runner_singleton runner; } @@ -161,7 +172,7 @@ void PrintUsage() wprintf(_T("Usage:\n")); wprintf(_T("\ttest_basics \n")); wprintf(_T("\t - The type of memory allocation to test with. This can be one of the following:\n")); - wprintf(_T("\t [malloc,new,new_array,calloc,realloc]\n")); + wprintf(_T("\t [malloc,new,new_array,calloc,realloc,CoTaskMem,AlignedMalloc,AlignedRealloc,strdup,all]\n")); wprintf(_T("\t - The number of times to repeat each unique memory leak.\n\n")); } @@ -219,6 +230,10 @@ int _tmain(int argc, _TCHAR* argv[]) leak_type = eAlignedRealloc; multiplayer = 3; } + else if (_tcsicmp(_T("strdup"), argv[1]) == 0) + { + leak_type = eStrdup; + } else if (_tcsicmp(_T("all"), argv[1]) == 0) { checkAll = true; diff --git a/vld_hooks.cpp b/vld_hooks.cpp index 242937a3..9f64380f 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -277,6 +277,32 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, return block; } +char* VisualLeakDetector::__strdup( _strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src ) +{ + tls_t *tls = g_vld.getTls(); + + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + char* block = pstrdup(src); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + + // __aligned_malloc - This function is just a wrapper around the real malloc that sets // appropriate flags to be consulted when the memory is actually allocated by // RtlAllocateHeap. @@ -1011,6 +1037,37 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, return block; } +char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, + context_t& context, + bool debugRuntime, + const char* src, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + char* block = p_strdup_dbg(src, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + // new_dbg_crt - This function is just a wrapper around the real CRT debug new // operators that sets appropriate flags to be consulted when the memory is // actually allocated by RtlAllocateHeap. diff --git a/vldint.h b/vldint.h index c72e28b5..ca6f4e35 100644 --- a/vldint.h +++ b/vldint.h @@ -70,6 +70,8 @@ typedef void* (__cdecl *new_dbg_crt_t) (size_t, int, const char *, int); typedef void* (__cdecl *new_dbg_mfc_t) (size_t, const char *, int); typedef void* (__cdecl *realloc_t) (void *, size_t); typedef void* (__cdecl *_recalloc_t) (void *, size_t, size_t); +typedef char* (__cdecl *_strdup_t) (const char*); +typedef char* (__cdecl *_strdup_dbg_t) (const char*, int, const char* ,int); typedef void* (__cdecl *_aligned_malloc_t) (size_t, size_t); typedef void* (__cdecl *_aligned_offset_malloc_t) (size_t, size_t, size_t); typedef void* (__cdecl *_aligned_realloc_t) (void *, size_t, size_t); @@ -205,6 +207,7 @@ class VisualLeakDetector : public IMalloc void* _new (new_t pnew, context_t& context, bool debugRuntime, size_t size); void* _realloc (realloc_t prealloc, context_t& context, bool debugRuntime, void *mem, size_t size); void* __recalloc (_recalloc_t precalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size); + char* __strdup(_strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src); // Debug CRT and MFC common handlers void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, bool debugRuntime, size_t num, size_t size, int type, char const *file, int line); @@ -214,6 +217,7 @@ class VisualLeakDetector : public IMalloc void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, int type, char const *file, int line); void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, int type, char const *file, int line); + char* __strdup_dbg(_strdup_dbg_t pstrdup, context_t& context, bool debugRuntime, const char* src, int type, char const *file, int line); void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment); void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset); @@ -374,6 +378,7 @@ class VisualLeakDetector : public IMalloc static _GetProcAddressType * m_original_GetProcAddress; }; + // Configuration option default values #define VLD_DEFAULT_MAX_DATA_DUMP 256 #define VLD_DEFAULT_MAX_TRACE_FRAMES 64 From d449fa224d8aa8878bb3b85165a1b9e5e7cbf10d Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 22 Nov 2011 00:00:40 +0000 Subject: [PATCH 128/321] fixed strdup not hooking with debug libraries wcsdup function hook added git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C72522 --- crtmfcpatch.h | 60 +++++++++++++++++++++++++++++++++++++++++ dllspatches.cpp | 35 +++++++++++++++++++++--- tests/basics/Allocs.cpp | 4 +++ tests/basics/basics.cpp | 3 ++- vld_hooks.cpp | 55 +++++++++++++++++++++++++++++++++++++ vldint.h | 4 +++ 6 files changed, 157 insertions(+), 4 deletions(-) diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 2cb2a4d0..2ca94452 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -49,6 +49,8 @@ class CrtMfcPatch static char* __cdecl crtd__strdup (const char* src); static char* __cdecl crtd__strdup_dbg (const char* src, int type, char const *file, int line); + static wchar_t* __cdecl crtd__wcsdup (const wchar_t* src); + static wchar_t* __cdecl crtd__wcsdup_dbg (const wchar_t* src, int type, char const *file, int line); static void* __cdecl crtd_scalar_new (size_t size); static void* __cdecl crtd_vector_new (size_t size); @@ -84,11 +86,13 @@ class CrtMfcPatch static void* pcrtd__realloc_dbg; static void* pcrtd__recalloc_dbg; static void* pcrtd__strdup_dbg; + static void* pcrtd__wcsdup_dbg; static void* pcrtd_calloc; static void* pcrtd_malloc; static void* pcrtd_realloc; static void* pcrtd_recalloc; static void* pcrtd__strdup; + static void* pcrtd__wcsdup; static void* pcrtd__aligned_malloc_dbg; static void* pcrtd__aligned_offset_malloc_dbg; static void* pcrtd__aligned_realloc_dbg; @@ -278,6 +282,22 @@ char* CrtMfcPatch::crtd__strdup_dbg (const char* src, return g_vld.__strdup_dbg(pcrtxxd__strdup_dbg, context, debug, src, type, file, line); } + +template +wchar_t* CrtMfcPatch::crtd__wcsdup_dbg (const wchar_t* src, + int type, + char const *file, + int line) +{ + _wcsdup_dbg_t pcrtxxd__wcsdup_dbg = (_wcsdup_dbg_t)pcrtd__wcsdup_dbg; + assert(pcrtxxd__wcsdup_dbg); + + context_t context; + CAPTURE_CONTEXT(context); + + return g_vld.__wcsdup_dbg(pcrtxxd__wcsdup_dbg, context, debug, src, type, file, line); +} + // crtd__scalar_new_dbg - Calls to the CRT's debug scalar new operator from // msvcrXXd.dll are patched through to this function. // @@ -451,6 +471,18 @@ char* CrtMfcPatch::crtd__strdup (const char* src) return g_vld.__strdup(pcrtxxd_strdup, context, debug, src); } +template +wchar_t* CrtMfcPatch::crtd__wcsdup (const wchar_t* src) +{ + _wcsdup_t pcrtxxd_wcsdup = (_wcsdup_t)pcrtd__wcsdup; + assert(pcrtxxd_wcsdup); + + context_t context; + CAPTURE_CONTEXT(context); + + return g_vld.__wcsdup(pcrtxxd_wcsdup, context, debug, src); +} + // crtd__aligned_malloc_dbg - Calls to _aligned_malloc_dbg from msvcrXXd.dll are patched // through to this function. // @@ -1223,11 +1255,13 @@ void* VS60::pcrtd__malloc_dbg = NULL; void* VS60::pcrtd__realloc_dbg = NULL; void* VS60::pcrtd__recalloc_dbg = NULL; void* VS60::pcrtd__strdup_dbg = NULL; +void* VS60::pcrtd__wcsdup_dbg = NULL; void* VS60::pcrtd_calloc = NULL; void* VS60::pcrtd_malloc = NULL; void* VS60::pcrtd_realloc = NULL; void* VS60::pcrtd_recalloc = NULL; void* VS60::pcrtd__strdup = NULL; +void* VS60::pcrtd__wcsdup = NULL; void* VS60::pcrtd__aligned_malloc_dbg = NULL; void* VS60::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS60::pcrtd__aligned_realloc_dbg = NULL; @@ -1262,11 +1296,13 @@ void* VS60d::pcrtd__malloc_dbg = NULL; void* VS60d::pcrtd__realloc_dbg = NULL; void* VS60d::pcrtd__recalloc_dbg = NULL; void* VS60d::pcrtd__strdup_dbg = NULL; +void* VS60d::pcrtd__wcsdup_dbg = NULL; void* VS60d::pcrtd_calloc = NULL; void* VS60d::pcrtd_malloc = NULL; void* VS60d::pcrtd_realloc = NULL; void* VS60d::pcrtd_recalloc = NULL; void* VS60d::pcrtd__strdup = NULL; +void* VS60d::pcrtd__wcsdup = NULL; void* VS60d::pcrtd__aligned_malloc_dbg = NULL; void* VS60d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS60d::pcrtd__aligned_realloc_dbg = NULL; @@ -1301,11 +1337,13 @@ void* VS70::pcrtd__malloc_dbg = NULL; void* VS70::pcrtd__realloc_dbg = NULL; void* VS70::pcrtd__recalloc_dbg = NULL; void* VS70::pcrtd__strdup_dbg = NULL; +void* VS70::pcrtd__wcsdup_dbg = NULL; void* VS70::pcrtd_calloc = NULL; void* VS70::pcrtd_malloc = NULL; void* VS70::pcrtd_realloc = NULL; void* VS70::pcrtd_recalloc = NULL; void* VS70::pcrtd__strdup = NULL; +void* VS70::pcrtd__wcsdup = NULL; void* VS70::pcrtd__aligned_malloc_dbg = NULL; void* VS70::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS70::pcrtd__aligned_realloc_dbg = NULL; @@ -1340,11 +1378,13 @@ void* VS70d::pcrtd__malloc_dbg = NULL; void* VS70d::pcrtd__realloc_dbg = NULL; void* VS70d::pcrtd__recalloc_dbg = NULL; void* VS70d::pcrtd__strdup_dbg = NULL; +void* VS70d::pcrtd__wcsdup_dbg = NULL; void* VS70d::pcrtd_calloc = NULL; void* VS70d::pcrtd_malloc = NULL; void* VS70d::pcrtd_realloc = NULL; void* VS70d::pcrtd_recalloc = NULL; void* VS70d::pcrtd__strdup = NULL; +void* VS70d::pcrtd__wcsdup = NULL; void* VS70d::pcrtd__aligned_malloc_dbg = NULL; void* VS70d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS70d::pcrtd__aligned_realloc_dbg = NULL; @@ -1379,11 +1419,13 @@ void* VS71::pcrtd__malloc_dbg = NULL; void* VS71::pcrtd__realloc_dbg = NULL; void* VS71::pcrtd__recalloc_dbg = NULL; void* VS71::pcrtd__strdup_dbg = NULL; +void* VS71::pcrtd__wcsdup_dbg = NULL; void* VS71::pcrtd_calloc = NULL; void* VS71::pcrtd_malloc = NULL; void* VS71::pcrtd_realloc = NULL; void* VS71::pcrtd_recalloc = NULL; void* VS71::pcrtd__strdup = NULL; +void* VS71::pcrtd__wcsdup = NULL; void* VS71::pcrtd__aligned_malloc_dbg = NULL; void* VS71::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS71::pcrtd__aligned_realloc_dbg = NULL; @@ -1418,11 +1460,13 @@ void* VS71d::pcrtd__malloc_dbg = NULL; void* VS71d::pcrtd__realloc_dbg = NULL; void* VS71d::pcrtd__recalloc_dbg = NULL; void* VS71d::pcrtd__strdup_dbg = NULL; +void* VS71d::pcrtd__wcsdup_dbg = NULL; void* VS71d::pcrtd_calloc = NULL; void* VS71d::pcrtd_malloc = NULL; void* VS71d::pcrtd_realloc = NULL; void* VS71d::pcrtd_recalloc = NULL; void* VS71d::pcrtd__strdup = NULL; +void* VS71d::pcrtd__wcsdup = NULL; void* VS71d::pcrtd__aligned_malloc_dbg = NULL; void* VS71d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS71d::pcrtd__aligned_realloc_dbg = NULL; @@ -1457,11 +1501,13 @@ void* VS80::pcrtd__malloc_dbg = NULL; void* VS80::pcrtd__realloc_dbg = NULL; void* VS80::pcrtd__recalloc_dbg = NULL; void* VS80::pcrtd__strdup_dbg = NULL; +void* VS80::pcrtd__wcsdup_dbg = NULL; void* VS80::pcrtd_calloc = NULL; void* VS80::pcrtd_malloc = NULL; void* VS80::pcrtd_realloc = NULL; void* VS80::pcrtd_recalloc = NULL; void* VS80::pcrtd__strdup = NULL; +void* VS80::pcrtd__wcsdup = NULL; void* VS80::pcrtd__aligned_malloc_dbg = NULL; void* VS80::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS80::pcrtd__aligned_realloc_dbg = NULL; @@ -1496,11 +1542,13 @@ void* VS80d::pcrtd__malloc_dbg = NULL; void* VS80d::pcrtd__realloc_dbg = NULL; void* VS80d::pcrtd__recalloc_dbg = NULL; void* VS80d::pcrtd__strdup_dbg = NULL; +void* VS80d::pcrtd__wcsdup_dbg = NULL; void* VS80d::pcrtd_calloc = NULL; void* VS80d::pcrtd_malloc = NULL; void* VS80d::pcrtd_realloc = NULL; void* VS80d::pcrtd_recalloc = NULL; void* VS80d::pcrtd__strdup = NULL; +void* VS80d::pcrtd__wcsdup = NULL; void* VS80d::pcrtd__aligned_malloc_dbg = NULL; void* VS80d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS80d::pcrtd__aligned_realloc_dbg = NULL; @@ -1535,11 +1583,13 @@ void* VS90::pcrtd__malloc_dbg = NULL; void* VS90::pcrtd__realloc_dbg = NULL; void* VS90::pcrtd__recalloc_dbg = NULL; void* VS90::pcrtd__strdup_dbg = NULL; +void* VS90::pcrtd__wcsdup_dbg = NULL; void* VS90::pcrtd_calloc = NULL; void* VS90::pcrtd_malloc = NULL; void* VS90::pcrtd_realloc = NULL; void* VS90::pcrtd_recalloc = NULL; void* VS90::pcrtd__strdup = NULL; +void* VS90::pcrtd__wcsdup = NULL; void* VS90::pcrtd__aligned_malloc_dbg = NULL; void* VS90::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS90::pcrtd__aligned_realloc_dbg = NULL; @@ -1574,11 +1624,13 @@ void* VS90d::pcrtd__malloc_dbg = NULL; void* VS90d::pcrtd__realloc_dbg = NULL; void* VS90d::pcrtd__recalloc_dbg = NULL; void* VS90d::pcrtd__strdup_dbg = NULL; +void* VS90d::pcrtd__wcsdup_dbg = NULL; void* VS90d::pcrtd_calloc = NULL; void* VS90d::pcrtd_malloc = NULL; void* VS90d::pcrtd_realloc = NULL; void* VS90d::pcrtd_recalloc = NULL; void* VS90d::pcrtd__strdup = NULL; +void* VS90d::pcrtd__wcsdup = NULL; void* VS90d::pcrtd__aligned_malloc_dbg = NULL; void* VS90d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS90d::pcrtd__aligned_realloc_dbg = NULL; @@ -1613,11 +1665,13 @@ void* VS100::pcrtd__malloc_dbg = NULL; void* VS100::pcrtd__realloc_dbg = NULL; void* VS100::pcrtd__recalloc_dbg = NULL; void* VS100::pcrtd__strdup_dbg = NULL; +void* VS100::pcrtd__wcsdup_dbg = NULL; void* VS100::pcrtd_calloc = NULL; void* VS100::pcrtd_malloc = NULL; void* VS100::pcrtd_realloc = NULL; void* VS100::pcrtd_recalloc = NULL; void* VS100::pcrtd__strdup = NULL; +void* VS100::pcrtd__wcsdup = NULL; void* VS100::pcrtd__aligned_malloc_dbg = NULL; void* VS100::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS100::pcrtd__aligned_realloc_dbg = NULL; @@ -1652,11 +1706,13 @@ void* VS100d::pcrtd__malloc_dbg = NULL; void* VS100d::pcrtd__realloc_dbg = NULL; void* VS100d::pcrtd__recalloc_dbg = NULL; void* VS100d::pcrtd__strdup_dbg = NULL; +void* VS100d::pcrtd__wcsdup_dbg = NULL; void* VS100d::pcrtd_calloc = NULL; void* VS100d::pcrtd_malloc = NULL; void* VS100d::pcrtd_realloc = NULL; void* VS100d::pcrtd_recalloc = NULL; void* VS100d::pcrtd__strdup = NULL; +void* VS100d::pcrtd__wcsdup = NULL; void* VS100d::pcrtd__aligned_malloc_dbg = NULL; void* VS100d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS100d::pcrtd__aligned_realloc_dbg = NULL; @@ -1691,11 +1747,13 @@ void* VS110::pcrtd__malloc_dbg = NULL; void* VS110::pcrtd__realloc_dbg = NULL; void* VS110::pcrtd__recalloc_dbg = NULL; void* VS110::pcrtd__strdup_dbg = NULL; +void* VS110::pcrtd__wcsdup_dbg = NULL; void* VS110::pcrtd_calloc = NULL; void* VS110::pcrtd_malloc = NULL; void* VS110::pcrtd_realloc = NULL; void* VS110::pcrtd_recalloc = NULL; void* VS110::pcrtd__strdup = NULL; +void* VS110::pcrtd__wcsdup = NULL; void* VS110::pcrtd__aligned_malloc_dbg = NULL; void* VS110::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS110::pcrtd__aligned_realloc_dbg = NULL; @@ -1730,11 +1788,13 @@ void* VS110d::pcrtd__malloc_dbg = NULL; void* VS110d::pcrtd__realloc_dbg = NULL; void* VS110d::pcrtd__recalloc_dbg = NULL; void* VS110d::pcrtd__strdup_dbg = NULL; +void* VS110d::pcrtd__wcsdup_dbg = NULL; void* VS110d::pcrtd_calloc = NULL; void* VS110d::pcrtd_malloc = NULL; void* VS110d::pcrtd_realloc = NULL; void* VS110d::pcrtd_recalloc = NULL; void* VS110d::pcrtd__strdup = NULL; +void* VS110d::pcrtd__wcsdup = NULL; void* VS110d::pcrtd__aligned_malloc_dbg = NULL; void* VS110d::pcrtd__aligned_offset_malloc_dbg = NULL; void* VS110d::pcrtd__aligned_realloc_dbg = NULL; diff --git a/dllspatches.cpp b/dllspatches.cpp index ec0cbecf..25a0471b 100644 --- a/dllspatches.cpp +++ b/dllspatches.cpp @@ -319,6 +319,7 @@ static patchentry_t msvcrtdPatch [] = { //"calloc", &VS60d::pcrtd_calloc, VS60d::crtd_calloc, "malloc", &VS60d::pcrtd_malloc, VS60d::crtd_malloc, "realloc", &VS60d::pcrtd_realloc, VS60d::crtd_realloc, + "_strdup", &VS60d::pcrtd__strdup, VS60d::crtd__strdup, scalar_new_name, &VS60d::pcrtd_scalar_new, VS60d::crtd_scalar_new, //vector_new_name, &VS60d::pcrtd_vector_new, VS60d::crtd_vector_new, NULL, NULL, NULL @@ -331,6 +332,7 @@ static patchentry_t msvcr70Patch [] = { "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, "_strdup", &VS70::pcrtd__strdup, VS70::crtd__strdup, + "_wcsdup", &VS70::pcrtd__wcsdup, VS70::crtd__wcsdup, scalar_new_name, &VS70::pcrtd_scalar_new, VS70::crtd_scalar_new, vector_new_name, &VS70::pcrtd_vector_new, VS70::crtd_vector_new, NULL, NULL, NULL @@ -345,6 +347,8 @@ static patchentry_t msvcr70dPatch [] = { //"calloc", &VS70d::pcrtd_calloc, VS70d::crtd_calloc, "malloc", &VS70d::pcrtd_malloc, VS70d::crtd_malloc, "realloc", &VS70d::pcrtd_realloc, VS70d::crtd_realloc, + "_strdup", &VS70d::pcrtd__strdup, VS70d::crtd__strdup, + "_wcsdup", &VS70d::pcrtd__wcsdup, VS70d::crtd__wcsdup, scalar_new_name, &VS70d::pcrtd_scalar_new, VS70d::crtd_scalar_new, vector_new_name, &VS70d::pcrtd_vector_new, VS70d::crtd_vector_new, NULL, NULL, NULL @@ -357,6 +361,7 @@ static patchentry_t msvcr71Patch [] = { "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, "_strdup", &VS71::pcrtd__strdup, VS71::crtd__strdup, + "_wcsdup", &VS71::pcrtd__wcsdup, VS71::crtd__wcsdup, scalar_new_name, &VS71::pcrtd_scalar_new, VS71::crtd_scalar_new, vector_new_name, &VS71::pcrtd_vector_new, VS71::crtd_vector_new, NULL, NULL, NULL @@ -366,11 +371,15 @@ static patchentry_t msvcr71dPatch [] = { //"_calloc_dbg", &VS71d::pcrtd__calloc_dbg, VS71d::crtd__calloc_dbg, "_malloc_dbg", &VS71d::pcrtd__malloc_dbg, VS71d::crtd__malloc_dbg, "_realloc_dbg", &VS71d::pcrtd__realloc_dbg, VS71d::crtd__realloc_dbg, + "_strdup_dbg", &VS71d::pcrtd__strdup_dbg, VS71d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS71d::pcrtd__wcsdup_dbg, VS71d::crtd__wcsdup_dbg, scalar_new_dbg_name, &VS71d::pcrtd__scalar_new_dbg, VS71d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS71d::pcrtd__vector_new_dbg, VS71d::crtd__vector_new_dbg, //"calloc", &VS71d::pcrtd_calloc, VS71d::crtd_calloc, "malloc", &VS71d::pcrtd_malloc, VS71d::crtd_malloc, "realloc", &VS71d::pcrtd_realloc, VS71d::crtd_realloc, + "_strdup", &VS71d::pcrtd__strdup, VS71d::crtd__strdup, + "_wcsdup", &VS71d::pcrtd__wcsdup, VS71d::crtd__wcsdup, scalar_new_name, &VS71d::pcrtd_scalar_new, VS71d::crtd_scalar_new, vector_new_name, &VS71d::pcrtd_vector_new, VS71d::crtd_vector_new, NULL, NULL, NULL @@ -383,6 +392,7 @@ static patchentry_t msvcr80Patch [] = { "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, "_strdup", &VS80::pcrtd__strdup, VS80::crtd__strdup, + "_wcsdup", &VS80::pcrtd__wcsdup, VS80::crtd__wcsdup, scalar_new_name, &VS80::pcrtd_scalar_new, VS80::crtd_scalar_new, vector_new_name, &VS80::pcrtd_vector_new, VS80::crtd_vector_new, "_aligned_malloc", &VS80::pcrtd_aligned_malloc, VS80::crtd__aligned_malloc, @@ -396,11 +406,15 @@ static patchentry_t msvcr80dPatch [] = { //"_calloc_dbg", &VS80d::pcrtd__calloc_dbg, VS80d::crtd__calloc_dbg, "_malloc_dbg", &VS80d::pcrtd__malloc_dbg, VS80d::crtd__malloc_dbg, "_realloc_dbg", &VS80d::pcrtd__realloc_dbg, VS80d::crtd__realloc_dbg, + "_strdup_dbg", &VS80d::pcrtd__strdup_dbg, VS80d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS80d::pcrtd__wcsdup_dbg, VS80d::crtd__wcsdup_dbg, scalar_new_dbg_name, &VS80d::pcrtd__scalar_new_dbg, VS80d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS80d::pcrtd__vector_new_dbg, VS80d::crtd__vector_new_dbg, //"calloc", &VS80d::pcrtd_calloc, VS80d::crtd_calloc, "malloc", &VS80d::pcrtd_malloc, VS80d::crtd_malloc, "realloc", &VS80d::pcrtd_realloc, VS80d::crtd_realloc, + "_strdup", &VS80d::pcrtd__strdup, VS80d::crtd__strdup, + "_wcsdup", &VS80d::pcrtd__wcsdup, VS80d::crtd__wcsdup, scalar_new_name, &VS80d::pcrtd_scalar_new, VS80d::crtd_scalar_new, vector_new_name, &VS80d::pcrtd_vector_new, VS80d::crtd_vector_new, "_aligned_malloc_dbg", &VS80d::pcrtd__aligned_malloc_dbg, VS80d::crtd__aligned_malloc_dbg, @@ -420,8 +434,9 @@ static patchentry_t msvcr90Patch [] = { //"calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, - "_strdup", &VS90::pcrtd__strdup, VS90::crtd__strdup, "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, + "_strdup", &VS90::pcrtd__strdup, VS90::crtd__strdup, + "_wcsdup", &VS90::pcrtd__wcsdup, VS90::crtd__wcsdup, scalar_new_name, &VS90::pcrtd_scalar_new, VS90::crtd_scalar_new, vector_new_name, &VS90::pcrtd_vector_new, VS90::crtd_vector_new, "_aligned_malloc", &VS90::pcrtd_aligned_malloc, VS90::crtd__aligned_malloc, @@ -438,12 +453,16 @@ static patchentry_t msvcr90dPatch [] = { "_malloc_dbg", &VS90d::pcrtd__malloc_dbg, VS90d::crtd__malloc_dbg, "_realloc_dbg", &VS90d::pcrtd__realloc_dbg, VS90d::crtd__realloc_dbg, "_recalloc_dbg", &VS90d::pcrtd__recalloc_dbg, VS90d::crtd__recalloc_dbg, + "_strdup_dbg", &VS90d::pcrtd__strdup_dbg, VS90d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS90d::pcrtd__wcsdup_dbg, VS90d::crtd__wcsdup_dbg, scalar_new_dbg_name, &VS90d::pcrtd__scalar_new_dbg, VS90d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS90d::pcrtd__vector_new_dbg, VS90d::crtd__vector_new_dbg, //"calloc", &VS90d::pcrtd_calloc, VS90d::crtd_calloc, "malloc", &VS90d::pcrtd_malloc, VS90d::crtd_malloc, "realloc", &VS90d::pcrtd_realloc, VS90d::crtd_realloc, "_recalloc", &VS90d::pcrtd_recalloc, VS90d::crtd__recalloc, + "_strdup", &VS90d::pcrtd__strdup, VS90d::crtd__strdup, + "_wcsdup", &VS90d::pcrtd__wcsdup, VS90d::crtd__wcsdup, scalar_new_name, &VS90d::pcrtd_scalar_new, VS90d::crtd_scalar_new, vector_new_name, &VS90d::pcrtd_vector_new, VS90d::crtd_vector_new, "_aligned_malloc_dbg", &VS90d::pcrtd__aligned_malloc_dbg, VS90d::crtd__aligned_malloc_dbg, @@ -467,8 +486,9 @@ static patchentry_t msvcr100Patch [] = { //"calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, - "_strdup", &VS100::pcrtd__strdup, VS100::crtd__strdup, "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, + "_strdup", &VS100::pcrtd__strdup, VS100::crtd__strdup, + "_wcsdup", &VS100::pcrtd__wcsdup, VS100::crtd__wcsdup, scalar_new_name, &VS100::pcrtd_scalar_new, VS100::crtd_scalar_new, vector_new_name, &VS100::pcrtd_vector_new, VS100::crtd_vector_new, "_aligned_malloc", &VS100::pcrtd_aligned_malloc, VS100::crtd__aligned_malloc, @@ -485,12 +505,16 @@ static patchentry_t msvcr100dPatch [] = { "_malloc_dbg", &VS100d::pcrtd__malloc_dbg, VS100d::crtd__malloc_dbg, "_realloc_dbg", &VS100d::pcrtd__realloc_dbg, VS100d::crtd__realloc_dbg, "_recalloc_dbg", &VS100d::pcrtd__recalloc_dbg, VS100d::crtd__recalloc_dbg, + "_strdup_dbg", &VS100d::pcrtd__strdup_dbg, VS100d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS100d::pcrtd__wcsdup_dbg, VS100d::crtd__wcsdup_dbg, scalar_new_dbg_name, &VS100d::pcrtd__scalar_new_dbg, VS100d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS100d::pcrtd__vector_new_dbg, VS100d::crtd__vector_new_dbg, //"calloc", &VS100d::pcrtd_calloc, VS100d::crtd_calloc, "malloc", &VS100d::pcrtd_malloc, VS100d::crtd_malloc, "realloc", &VS100d::pcrtd_realloc, VS100d::crtd_realloc, "_recalloc", &VS100d::pcrtd_recalloc, VS100d::crtd__recalloc, + "_strdup", &VS100d::pcrtd__strdup, VS100d::crtd__strdup, + "_wcsdup", &VS100d::pcrtd__wcsdup, VS100d::crtd__wcsdup, scalar_new_name, &VS100d::pcrtd_scalar_new, VS100d::crtd_scalar_new, vector_new_name, &VS100d::pcrtd_vector_new, VS100d::crtd_vector_new, "_aligned_malloc_dbg", &VS100d::pcrtd__aligned_malloc_dbg, VS100d::crtd__aligned_malloc_dbg, @@ -514,8 +538,9 @@ static patchentry_t msvcr110Patch [] = { //"calloc", &VS110::pcrtd_calloc, VS110::crtd_calloc, "malloc", &VS110::pcrtd_malloc, VS110::crtd_malloc, "realloc", &VS110::pcrtd_realloc, VS110::crtd_realloc, - "_strdup", &VS110::pcrtd__strdup, VS110::crtd__strdup, "_recalloc", &VS110::pcrtd_recalloc, VS110::crtd__recalloc, + "_strdup", &VS110::pcrtd__strdup, VS110::crtd__strdup, + "_wcsdup", &VS110::pcrtd__wcsdup, VS110::crtd__wcsdup, scalar_new_name, &VS110::pcrtd_scalar_new, VS110::crtd_scalar_new, vector_new_name, &VS110::pcrtd_vector_new, VS110::crtd_vector_new, "_aligned_malloc", &VS110::pcrtd_aligned_malloc, VS110::crtd__aligned_malloc, @@ -532,12 +557,16 @@ static patchentry_t msvcr110dPatch [] = { "_malloc_dbg", &VS110d::pcrtd__malloc_dbg, VS110d::crtd__malloc_dbg, "_realloc_dbg", &VS110d::pcrtd__realloc_dbg, VS110d::crtd__realloc_dbg, "_recalloc_dbg", &VS110d::pcrtd__recalloc_dbg, VS110d::crtd__recalloc_dbg, + "_strdup_dbg", &VS110d::pcrtd__strdup_dbg, VS110d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS110d::pcrtd__wcsdup_dbg, VS110d::crtd__wcsdup_dbg, scalar_new_dbg_name, &VS110d::pcrtd__scalar_new_dbg, VS110d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS110d::pcrtd__vector_new_dbg, VS110d::crtd__vector_new_dbg, //"calloc", &VS110d::pcrtd_calloc, VS110d::crtd_calloc, "malloc", &VS110d::pcrtd_malloc, VS110d::crtd_malloc, "realloc", &VS110d::pcrtd_realloc, VS110d::crtd_realloc, "_recalloc", &VS110d::pcrtd_recalloc, VS110d::crtd__recalloc, + "_strdup", &VS110d::pcrtd__strdup, VS110d::crtd__strdup, + "_wcsdup", &VS110d::pcrtd__wcsdup, VS110d::crtd__wcsdup, scalar_new_name, &VS110d::pcrtd_scalar_new, VS110d::crtd_scalar_new, vector_new_name, &VS110d::pcrtd_vector_new, VS110d::crtd_vector_new, "_aligned_malloc_dbg", &VS110d::pcrtd__aligned_malloc_dbg, VS110d::crtd__aligned_malloc_dbg, diff --git a/tests/basics/Allocs.cpp b/tests/basics/Allocs.cpp index bfcb989a..bd5ae7be 100644 --- a/tests/basics/Allocs.cpp +++ b/tests/basics/Allocs.cpp @@ -110,10 +110,14 @@ void AllocF(LeakOption type, bool bFree) { leaked_memory = (int*)strdup("strdup() leaks!"); leaked_memory_dbg = (int*)_strdup_dbg("_strdup_dbg() leaks!", _NORMAL_BLOCK,__FILE__,__LINE__); + void* leaked_wmemory = (int*)wcsdup(L"wcsdup() leaks!"); + void* leaked_wmemory_dbg = (int*)_wcsdup_dbg(L"_wcsdup_dbg() leaks!", _NORMAL_BLOCK,__FILE__,__LINE__); if (bFree) { free(leaked_memory); _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + free(leaked_wmemory); + _free_dbg(leaked_wmemory_dbg,_NORMAL_BLOCK); } } diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index dd2cfb19..810368d3 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -128,7 +128,7 @@ namespace tut int prev = (int)VLDGetLeaksCount(); LeakMemory(eStrdup,repeat,false); int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); + ensure("leaks", leaks == (repeat * 4)); } test_runner_singleton runner; @@ -233,6 +233,7 @@ int _tmain(int argc, _TCHAR* argv[]) else if (_tcsicmp(_T("strdup"), argv[1]) == 0) { leak_type = eStrdup; + multiplayer = 4; } else if (_tcsicmp(_T("all"), argv[1]) == 0) { diff --git a/vld_hooks.cpp b/vld_hooks.cpp index 9f64380f..cbd8f329 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -302,6 +302,30 @@ char* VisualLeakDetector::__strdup( _strdup_t pstrdup, context_t& context, bool return block; } +wchar_t* VisualLeakDetector::__wcsdup( _wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src ) +{ + tls_t *tls = g_vld.getTls(); + + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + wchar_t* block = pwcsdup(src); + + if (firstcall) + firstAllocCall(tls); + + return block; +} // __aligned_malloc - This function is just a wrapper around the real malloc that sets // appropriate flags to be consulted when the memory is actually allocated by @@ -1068,6 +1092,37 @@ char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, return block; } +wchar_t* VisualLeakDetector::__wcsdup_dbg (_wcsdup_dbg_t p_wcsdup_dbg, + context_t& context, + bool debugRuntime, + const wchar_t* src, + int type, + char const *file, + int line) +{ + tls_t *tls = g_vld.getTls(); + + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + wchar_t* block = p_wcsdup_dbg(src, type, file, line); + + if (firstcall) + firstAllocCall(tls); + + return block; +} + // new_dbg_crt - This function is just a wrapper around the real CRT debug new // operators that sets appropriate flags to be consulted when the memory is // actually allocated by RtlAllocateHeap. diff --git a/vldint.h b/vldint.h index ca6f4e35..e222fd4f 100644 --- a/vldint.h +++ b/vldint.h @@ -72,6 +72,8 @@ typedef void* (__cdecl *realloc_t) (void *, size_t); typedef void* (__cdecl *_recalloc_t) (void *, size_t, size_t); typedef char* (__cdecl *_strdup_t) (const char*); typedef char* (__cdecl *_strdup_dbg_t) (const char*, int, const char* ,int); +typedef wchar_t* (__cdecl *_wcsdup_t) (const wchar_t*); +typedef wchar_t* (__cdecl *_wcsdup_dbg_t) (const wchar_t*, int, const char* ,int); typedef void* (__cdecl *_aligned_malloc_t) (size_t, size_t); typedef void* (__cdecl *_aligned_offset_malloc_t) (size_t, size_t, size_t); typedef void* (__cdecl *_aligned_realloc_t) (void *, size_t, size_t); @@ -208,6 +210,7 @@ class VisualLeakDetector : public IMalloc void* _realloc (realloc_t prealloc, context_t& context, bool debugRuntime, void *mem, size_t size); void* __recalloc (_recalloc_t precalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size); char* __strdup(_strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src); + wchar_t* __wcsdup(_wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src); // Debug CRT and MFC common handlers void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, bool debugRuntime, size_t num, size_t size, int type, char const *file, int line); @@ -218,6 +221,7 @@ class VisualLeakDetector : public IMalloc void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, int type, char const *file, int line); void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, int type, char const *file, int line); char* __strdup_dbg(_strdup_dbg_t pstrdup, context_t& context, bool debugRuntime, const char* src, int type, char const *file, int line); + wchar_t* __wcsdup_dbg(_wcsdup_dbg_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src, int type, char const *file, int line); void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment); void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset); From 16174ed8034899ef9bd050aa7cafd408553d97d6 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 22 Nov 2011 00:57:30 +0000 Subject: [PATCH 129/321] Visual Studio C++ 2008/2010 Express Edition compilation fixed This commit fixes 9562 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C72523 --- vld.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vld.rc b/vld.rc index 857fdb0f..09d1b247 100755 --- a/vld.rc +++ b/vld.rc @@ -8,7 +8,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -35,7 +35,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include \r\n" "\0" END From 31f894d578a1210497881054308c0f5dee1f60e6 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 10 Dec 2011 01:21:12 +0000 Subject: [PATCH 130/321] Bug fixed when CRT linked as static library. Closes #9249 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C73117 --- vld_hooks.cpp | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/vld_hooks.cpp b/vld_hooks.cpp index cbd8f329..0c52635d 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -1405,31 +1405,46 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m HANDLE heap = HeapCreate(options, initsize, maxsize); // Map the created heap handle to a new block map. - g_vld.mapHeap(heap); + vld.mapheap(heap); // Try to get the name of the function containing the return address. - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; + BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; + functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; - g_symbolLock.Enter(); + g_symbollock.Enter(); DWORD64 displacement; - BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); - g_symbolLock.Leave(); + BOOL symfound = SymFromAddrW(g_currentprocess, ra, &displacement, functioninfo); + g_symbollock.Leave(); if (symfound == TRUE) { if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { // HeapCreate was called by _heap_init. This is a static CRT heap (msvcr*.dll). - CriticalSectionLocker cs(g_vld.m_heapMapLock); - HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); - assert(heapit != g_vld.m_heapMap->end()); + CriticalSectionLocker cs(vld.m_heapmaplock); + HeapMap::Iterator heapit = vld.m_heapmap->find(heap); + assert(heapit != vld.m_heapmap->end()); HMODULE hCallingModule = (HMODULE)functioninfo->ModBase; - WCHAR callingmodulename [MAX_PATH] = L""; - if (hCallingModule && GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) + if (hCallingModule) { - _wcslwr_s(callingmodulename); - if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime + HMODULE hCurrentModule = GetModuleHandleW(NULL); + if (hCallingModule == hCurrentModule) + { + // CRT static linking +#ifdef _DEBUG // debug runtime (*heapit).second->flags |= VLD_HEAP_CRT_DBG; +#endif + } + else + { + // CRT dynamic linking + WCHAR callingmodulename [MAX_PATH] = L""; + if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) + { + _wcslwr_s(callingmodulename); + if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime + (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + } + } } } } From b28f3c799292e635aea7a6124e609622962129d1 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 11 Dec 2011 01:48:46 +0000 Subject: [PATCH 131/321] Previous commit bug fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C73138 --- vld_hooks.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vld_hooks.cpp b/vld_hooks.cpp index 0c52635d..1a80f311 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -1405,24 +1405,24 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m HANDLE heap = HeapCreate(options, initsize, maxsize); // Map the created heap handle to a new block map. - vld.mapheap(heap); + g_vld.mapHeap(heap); // Try to get the name of the function containing the return address. - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + (MAXSYMBOLNAMELENGTH * sizeof(WCHAR)) - 1] = { 0 }; + BYTE symbolbuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAXSYMBOLNAMELENGTH; + functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; - g_symbollock.Enter(); + g_symbolLock.Enter(); DWORD64 displacement; - BOOL symfound = SymFromAddrW(g_currentprocess, ra, &displacement, functioninfo); - g_symbollock.Leave(); + BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); + g_symbolLock.Leave(); if (symfound == TRUE) { if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { // HeapCreate was called by _heap_init. This is a static CRT heap (msvcr*.dll). - CriticalSectionLocker cs(vld.m_heapmaplock); - HeapMap::Iterator heapit = vld.m_heapmap->find(heap); - assert(heapit != vld.m_heapmap->end()); + CriticalSectionLocker cs(g_vld.m_heapMapLock); + HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); + assert(heapit != g_vld.m_heapMap->end()); HMODULE hCallingModule = (HMODULE)functioninfo->ModBase; if (hCallingModule) { From 6d0ee9f25c63d9fc172a62df8f2b963b4ce22486 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 11 Dec 2011 01:53:44 +0000 Subject: [PATCH 132/321] Calloc support returned back git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C73139 --- dllspatches.cpp | 42 ++++++++++++++++++++--------------------- tests/basics/basics.cpp | 26 +++++++++++-------------- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/dllspatches.cpp b/dllspatches.cpp index 25a0471b..7a8cc0d2 100644 --- a/dllspatches.cpp +++ b/dllspatches.cpp @@ -301,7 +301,7 @@ static patchentry_t mfc110udPatch [] = { static patchentry_t msvcrtPatch [] = { scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, //vector_new_dbg_name, &VS60::pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, - //"calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, + "calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, "malloc", &VS60::pcrtd_malloc, VS60::crtd_malloc, "realloc", &VS60::pcrtd_realloc, VS60::crtd_realloc, "_strdup", &VS60::pcrtd__strdup, VS60::crtd__strdup, @@ -311,12 +311,12 @@ static patchentry_t msvcrtPatch [] = { }; static patchentry_t msvcrtdPatch [] = { - //"_calloc_dbg", &VS60d::pcrtd__calloc_dbg, VS60d::crtd__calloc_dbg, + "_calloc_dbg", &VS60d::pcrtd__calloc_dbg, VS60d::crtd__calloc_dbg, "_malloc_dbg", &VS60d::pcrtd__malloc_dbg, VS60d::crtd__malloc_dbg, "_realloc_dbg", &VS60d::pcrtd__realloc_dbg, VS60d::crtd__realloc_dbg, scalar_new_dbg_name, &VS60d::pcrtd__scalar_new_dbg, VS60d::crtd__scalar_new_dbg, //vector_new_dbg_name, &VS60d::pcrtd__vector_new_dbg, VS60d::crtd__vector_new_dbg, - //"calloc", &VS60d::pcrtd_calloc, VS60d::crtd_calloc, + "calloc", &VS60d::pcrtd_calloc, VS60d::crtd_calloc, "malloc", &VS60d::pcrtd_malloc, VS60d::crtd_malloc, "realloc", &VS60d::pcrtd_realloc, VS60d::crtd_realloc, "_strdup", &VS60d::pcrtd__strdup, VS60d::crtd__strdup, @@ -328,7 +328,7 @@ static patchentry_t msvcrtdPatch [] = { static patchentry_t msvcr70Patch [] = { scalar_new_dbg_name, &VS70::pcrtd__scalar_new_dbg, VS70::crtd__scalar_new_dbg, vector_new_dbg_name, &VS70::pcrtd__vector_new_dbg, VS70::crtd__vector_new_dbg, - //"calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, + "calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, "_strdup", &VS70::pcrtd__strdup, VS70::crtd__strdup, @@ -339,12 +339,12 @@ static patchentry_t msvcr70Patch [] = { }; static patchentry_t msvcr70dPatch [] = { - //"_calloc_dbg", &VS70d::pcrtd__calloc_dbg, VS70d::crtd__calloc_dbg, + "_calloc_dbg", &VS70d::pcrtd__calloc_dbg, VS70d::crtd__calloc_dbg, "_malloc_dbg", &VS70d::pcrtd__malloc_dbg, VS70d::crtd__malloc_dbg, "_realloc_dbg", &VS70d::pcrtd__realloc_dbg, VS70d::crtd__realloc_dbg, scalar_new_dbg_name, &VS70d::pcrtd__scalar_new_dbg, VS70d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS70d::pcrtd__vector_new_dbg, VS70d::crtd__vector_new_dbg, - //"calloc", &VS70d::pcrtd_calloc, VS70d::crtd_calloc, + "calloc", &VS70d::pcrtd_calloc, VS70d::crtd_calloc, "malloc", &VS70d::pcrtd_malloc, VS70d::crtd_malloc, "realloc", &VS70d::pcrtd_realloc, VS70d::crtd_realloc, "_strdup", &VS70d::pcrtd__strdup, VS70d::crtd__strdup, @@ -357,7 +357,7 @@ static patchentry_t msvcr70dPatch [] = { static patchentry_t msvcr71Patch [] = { scalar_new_dbg_name, &VS71::pcrtd__scalar_new_dbg, VS71::crtd__scalar_new_dbg, vector_new_dbg_name, &VS71::pcrtd__vector_new_dbg, VS71::crtd__vector_new_dbg, - //"calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, + "calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, "_strdup", &VS71::pcrtd__strdup, VS71::crtd__strdup, @@ -368,14 +368,14 @@ static patchentry_t msvcr71Patch [] = { }; static patchentry_t msvcr71dPatch [] = { - //"_calloc_dbg", &VS71d::pcrtd__calloc_dbg, VS71d::crtd__calloc_dbg, + "_calloc_dbg", &VS71d::pcrtd__calloc_dbg, VS71d::crtd__calloc_dbg, "_malloc_dbg", &VS71d::pcrtd__malloc_dbg, VS71d::crtd__malloc_dbg, "_realloc_dbg", &VS71d::pcrtd__realloc_dbg, VS71d::crtd__realloc_dbg, "_strdup_dbg", &VS71d::pcrtd__strdup_dbg, VS71d::crtd__strdup_dbg, "_wcsdup_dbg", &VS71d::pcrtd__wcsdup_dbg, VS71d::crtd__wcsdup_dbg, scalar_new_dbg_name, &VS71d::pcrtd__scalar_new_dbg, VS71d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS71d::pcrtd__vector_new_dbg, VS71d::crtd__vector_new_dbg, - //"calloc", &VS71d::pcrtd_calloc, VS71d::crtd_calloc, + "calloc", &VS71d::pcrtd_calloc, VS71d::crtd_calloc, "malloc", &VS71d::pcrtd_malloc, VS71d::crtd_malloc, "realloc", &VS71d::pcrtd_realloc, VS71d::crtd_realloc, "_strdup", &VS71d::pcrtd__strdup, VS71d::crtd__strdup, @@ -388,7 +388,7 @@ static patchentry_t msvcr71dPatch [] = { static patchentry_t msvcr80Patch [] = { scalar_new_dbg_name, &VS80::pcrtd__scalar_new_dbg, VS80::crtd__scalar_new_dbg, vector_new_dbg_name, &VS80::pcrtd__vector_new_dbg, VS80::crtd__vector_new_dbg, - //"calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, + "calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, "_strdup", &VS80::pcrtd__strdup, VS80::crtd__strdup, @@ -403,14 +403,14 @@ static patchentry_t msvcr80Patch [] = { }; static patchentry_t msvcr80dPatch [] = { - //"_calloc_dbg", &VS80d::pcrtd__calloc_dbg, VS80d::crtd__calloc_dbg, + "_calloc_dbg", &VS80d::pcrtd__calloc_dbg, VS80d::crtd__calloc_dbg, "_malloc_dbg", &VS80d::pcrtd__malloc_dbg, VS80d::crtd__malloc_dbg, "_realloc_dbg", &VS80d::pcrtd__realloc_dbg, VS80d::crtd__realloc_dbg, "_strdup_dbg", &VS80d::pcrtd__strdup_dbg, VS80d::crtd__strdup_dbg, "_wcsdup_dbg", &VS80d::pcrtd__wcsdup_dbg, VS80d::crtd__wcsdup_dbg, scalar_new_dbg_name, &VS80d::pcrtd__scalar_new_dbg, VS80d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS80d::pcrtd__vector_new_dbg, VS80d::crtd__vector_new_dbg, - //"calloc", &VS80d::pcrtd_calloc, VS80d::crtd_calloc, + "calloc", &VS80d::pcrtd_calloc, VS80d::crtd_calloc, "malloc", &VS80d::pcrtd_malloc, VS80d::crtd_malloc, "realloc", &VS80d::pcrtd_realloc, VS80d::crtd_realloc, "_strdup", &VS80d::pcrtd__strdup, VS80d::crtd__strdup, @@ -431,7 +431,7 @@ static patchentry_t msvcr80dPatch [] = { static patchentry_t msvcr90Patch [] = { scalar_new_dbg_name, &VS90::pcrtd__scalar_new_dbg, VS90::crtd__scalar_new_dbg, vector_new_dbg_name, &VS90::pcrtd__vector_new_dbg, VS90::crtd__vector_new_dbg, - //"calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, + "calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, @@ -449,7 +449,7 @@ static patchentry_t msvcr90Patch [] = { }; static patchentry_t msvcr90dPatch [] = { - //"_calloc_dbg", &VS90d::pcrtd__calloc_dbg, VS90d::crtd__calloc_dbg, + "_calloc_dbg", &VS90d::pcrtd__calloc_dbg, VS90d::crtd__calloc_dbg, "_malloc_dbg", &VS90d::pcrtd__malloc_dbg, VS90d::crtd__malloc_dbg, "_realloc_dbg", &VS90d::pcrtd__realloc_dbg, VS90d::crtd__realloc_dbg, "_recalloc_dbg", &VS90d::pcrtd__recalloc_dbg, VS90d::crtd__recalloc_dbg, @@ -457,7 +457,7 @@ static patchentry_t msvcr90dPatch [] = { "_wcsdup_dbg", &VS90d::pcrtd__wcsdup_dbg, VS90d::crtd__wcsdup_dbg, scalar_new_dbg_name, &VS90d::pcrtd__scalar_new_dbg, VS90d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS90d::pcrtd__vector_new_dbg, VS90d::crtd__vector_new_dbg, - //"calloc", &VS90d::pcrtd_calloc, VS90d::crtd_calloc, + "calloc", &VS90d::pcrtd_calloc, VS90d::crtd_calloc, "malloc", &VS90d::pcrtd_malloc, VS90d::crtd_malloc, "realloc", &VS90d::pcrtd_realloc, VS90d::crtd_realloc, "_recalloc", &VS90d::pcrtd_recalloc, VS90d::crtd__recalloc, @@ -483,7 +483,7 @@ static patchentry_t msvcr90dPatch [] = { static patchentry_t msvcr100Patch [] = { scalar_new_dbg_name, &VS100::pcrtd__scalar_new_dbg, VS100::crtd__scalar_new_dbg, vector_new_dbg_name, &VS100::pcrtd__vector_new_dbg, VS100::crtd__vector_new_dbg, - //"calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, + "calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, @@ -501,7 +501,7 @@ static patchentry_t msvcr100Patch [] = { }; static patchentry_t msvcr100dPatch [] = { - //"_calloc_dbg", &VS100d::pcrtd__calloc_dbg, VS100d::crtd__calloc_dbg, + "_calloc_dbg", &VS100d::pcrtd__calloc_dbg, VS100d::crtd__calloc_dbg, "_malloc_dbg", &VS100d::pcrtd__malloc_dbg, VS100d::crtd__malloc_dbg, "_realloc_dbg", &VS100d::pcrtd__realloc_dbg, VS100d::crtd__realloc_dbg, "_recalloc_dbg", &VS100d::pcrtd__recalloc_dbg, VS100d::crtd__recalloc_dbg, @@ -509,7 +509,7 @@ static patchentry_t msvcr100dPatch [] = { "_wcsdup_dbg", &VS100d::pcrtd__wcsdup_dbg, VS100d::crtd__wcsdup_dbg, scalar_new_dbg_name, &VS100d::pcrtd__scalar_new_dbg, VS100d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS100d::pcrtd__vector_new_dbg, VS100d::crtd__vector_new_dbg, - //"calloc", &VS100d::pcrtd_calloc, VS100d::crtd_calloc, + "calloc", &VS100d::pcrtd_calloc, VS100d::crtd_calloc, "malloc", &VS100d::pcrtd_malloc, VS100d::crtd_malloc, "realloc", &VS100d::pcrtd_realloc, VS100d::crtd_realloc, "_recalloc", &VS100d::pcrtd_recalloc, VS100d::crtd__recalloc, @@ -535,7 +535,7 @@ static patchentry_t msvcr100dPatch [] = { static patchentry_t msvcr110Patch [] = { scalar_new_dbg_name, &VS110::pcrtd__scalar_new_dbg, VS110::crtd__scalar_new_dbg, vector_new_dbg_name, &VS110::pcrtd__vector_new_dbg, VS110::crtd__vector_new_dbg, - //"calloc", &VS110::pcrtd_calloc, VS110::crtd_calloc, + "calloc", &VS110::pcrtd_calloc, VS110::crtd_calloc, "malloc", &VS110::pcrtd_malloc, VS110::crtd_malloc, "realloc", &VS110::pcrtd_realloc, VS110::crtd_realloc, "_recalloc", &VS110::pcrtd_recalloc, VS110::crtd__recalloc, @@ -553,7 +553,7 @@ static patchentry_t msvcr110Patch [] = { }; static patchentry_t msvcr110dPatch [] = { - //"_calloc_dbg", &VS110d::pcrtd__calloc_dbg, VS110d::crtd__calloc_dbg, + "_calloc_dbg", &VS110d::pcrtd__calloc_dbg, VS110d::crtd__calloc_dbg, "_malloc_dbg", &VS110d::pcrtd__malloc_dbg, VS110d::crtd__malloc_dbg, "_realloc_dbg", &VS110d::pcrtd__realloc_dbg, VS110d::crtd__realloc_dbg, "_recalloc_dbg", &VS110d::pcrtd__recalloc_dbg, VS110d::crtd__recalloc_dbg, @@ -561,7 +561,7 @@ static patchentry_t msvcr110dPatch [] = { "_wcsdup_dbg", &VS110d::pcrtd__wcsdup_dbg, VS110d::crtd__wcsdup_dbg, scalar_new_dbg_name, &VS110d::pcrtd__scalar_new_dbg, VS110d::crtd__scalar_new_dbg, vector_new_dbg_name, &VS110d::pcrtd__vector_new_dbg, VS110d::crtd__vector_new_dbg, - //"calloc", &VS110d::pcrtd_calloc, VS110d::crtd_calloc, + "calloc", &VS110d::pcrtd_calloc, VS110d::crtd_calloc, "malloc", &VS110d::pcrtd_malloc, VS110d::crtd_malloc, "realloc", &VS110d::pcrtd_realloc, VS110d::crtd_realloc, "_recalloc", &VS110d::pcrtd_recalloc, VS110d::crtd__recalloc, diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 810368d3..b04cc9cb 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -65,16 +65,16 @@ namespace tut ensure("leaks", leaks == (repeat * 2)); } - //template<> - //template<> - //void object::test<4>() - //{ - // set_test_name("Calloc"); - // int prev = (int)VLDGetLeaksCount(); - // LeakMemory(eCalloc,repeat,false); - // int leaks = (int)VLDGetLeaksCount() - prev; - // ensure("leaks", leaks == (repeat * 2)); - //} + template<> + template<> + void object::test<4>() + { + set_test_name("Calloc"); + int prev = (int)VLDGetLeaksCount(); + LeakMemory(eCalloc,repeat,false); + int leaks = (int)VLDGetLeaksCount() - prev; + ensure("leaks", leaks == (repeat * 2)); + } template<> template<> @@ -238,7 +238,7 @@ int _tmain(int argc, _TCHAR* argv[]) else if (_tcsicmp(_T("all"), argv[1]) == 0) { checkAll = true; - multiplayer = 17 - 2; + multiplayer = 21; } else { @@ -259,11 +259,7 @@ int _tmain(int argc, _TCHAR* argv[]) else { for (int leak_type = 0; leak_type < eCount; leak_type++) - { - if (leak_type == eCalloc) - continue; LeakMemory((LeakOption)leak_type,repeat,bFree); - } } int leaks = (int)VLDGetLeaksCount() - prevleaks; wprintf(_T("End of test app...\n\n")); From 9fb332ab95e5f2ef688a136ecfbbf11957d60df2 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 17 Dec 2011 23:53:04 +0000 Subject: [PATCH 133/321] Hang fixed with GetOpenFileName() This commit fixes 9519 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C73441 --- AUTHORS.txt | 2 +- CHANGES.txt | 21 +- callstack.cpp | 895 ++++++++++---------- criticalsection.h | 1 - setup/version.h | 8 +- utility.cpp | 3 + utility.h | 9 + vld.cpp | 52 +- vld_hooks.cpp | 1975 +++++++++++++++++++++++---------------------- 9 files changed, 1496 insertions(+), 1470 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index ec5acdce..b70e762d 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -4,7 +4,7 @@ chrisJohnson http://www.codeplex.com/site/users/view/chrisJohnson Contributors: (listed alphabetically) ------------------------------------------------ -geordi, jerker_back, Laurent Lessieux (llessieux), snakefoot, VictorKharkov +benpmorgan, geordi, jerker_back, Laurent Lessieux (llessieux), snakefoot, VictorKharkov, xpol Many thanks to everyone who supported development without having svn write access. diff --git a/CHANGES.txt b/CHANGES.txt index de4b935b..af23df28 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,27 @@ -Visual Leak Detector (VLD) Version 2.2 +Visual Leak Detector (VLD) Version 2.2.2 Change Log / Release Notes +2.2.2 (18 December 2011) +---------------------------- + Bugs Fixed: + + Memory leaks with static linking fixed. + + Visual Studio C++ 2008/2010 Express Edition compilation fixed. + + Hang fixed with GetOpenFileName(). + +2.2.1 (22 November 2011) +---------------------------- + Enhancements: + + strdup and _wcsdup functions support added. + + Preliminary support for VS 11 added. + + Bugs Fixed: + + Low performance after upgrading from VLD v2.1. + + Runtime error R6002 fixed because of wrong memory dump format. + + version.h fixed in installer. + + Some PVS studio warning fixed. + 2.2 (21 Jule 2011) ---------------------------- Enhancements: diff --git a/callstack.cpp b/callstack.cpp index b4f0daba..3a6e2e20 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -40,51 +40,51 @@ extern VisualLeakDetector g_vld; // CallStack::CallStack () { - m_capacity = CALLSTACK_CHUNK_SIZE; - m_size = 0; - m_status = 0x0; - m_store.next = NULL; - m_topChunk = &m_store; - m_topIndex = 0; - m_resolved = NULL; - m_resolvedCapacity = 0; - m_resolvedLength = 0; + m_capacity = CALLSTACK_CHUNK_SIZE; + m_size = 0; + m_status = 0x0; + m_store.next = NULL; + m_topChunk = &m_store; + m_topIndex = 0; + m_resolved = NULL; + m_resolvedCapacity = 0; + m_resolvedLength = 0; } // Destructor - Frees all memory allocated to the CallStack. // CallStack::~CallStack () { - CallStack::chunk_t *chunk = m_store.next; - CallStack::chunk_t *temp; - - while (chunk) { - temp = chunk; - chunk = temp->next; - delete temp; - } - - if (m_resolved) - { - delete [] m_resolved; - } - - m_resolved = NULL; - m_resolvedCapacity = 0; - m_resolvedLength = 0; + CallStack::chunk_t *chunk = m_store.next; + CallStack::chunk_t *temp; + + while (chunk) { + temp = chunk; + chunk = temp->next; + delete temp; + } + + if (m_resolved) + { + delete [] m_resolved; + } + + m_resolved = NULL; + m_resolvedCapacity = 0; + m_resolvedLength = 0; } CallStack* CallStack::Create() { - CallStack* result = NULL; - if (g_vld.GetOptions() & VLD_OPT_SAFE_STACK_WALK) { - result = new SafeCallStack(); - } - else { - result = new FastCallStack(); - } - return result; - + CallStack* result = NULL; + if (g_vld.GetOptions() & VLD_OPT_SAFE_STACK_WALK) { + result = new SafeCallStack(); + } + else { + result = new FastCallStack(); + } + return result; + } // operator == - Equality operator. Compares the CallStack to another CallStack // for equality. Two CallStacks are equal if they are the same size and if @@ -99,31 +99,31 @@ CallStack* CallStack::Create() // BOOL CallStack::operator == (const CallStack &other) const { - if (m_size != other.m_size) { - // They can't be equal if the sizes are different. - return FALSE; - } - - // Walk the chunk list and within each chunk walk the frames array until we - // either find a mismatch, or until we reach the end of the call stacks. - const CallStack::chunk_t *prevChunk = NULL; - const CallStack::chunk_t *chunk = &m_store; - const CallStack::chunk_t *otherChunk = &other.m_store; - while (prevChunk != m_topChunk) { - UINT32 size = (chunk == m_topChunk) ? m_topIndex : CALLSTACK_CHUNK_SIZE; - for (UINT32 index = 0; index < size; index++) { - if (chunk->frames[index] != otherChunk->frames[index]) { - // Found a mismatch. They are not equal. - return FALSE; - } - } - prevChunk = chunk; - chunk = chunk->next; - otherChunk = otherChunk->next; - } - - // Reached the end of the call stacks. They are equal. - return TRUE; + if (m_size != other.m_size) { + // They can't be equal if the sizes are different. + return FALSE; + } + + // Walk the chunk list and within each chunk walk the frames array until we + // either find a mismatch, or until we reach the end of the call stacks. + const CallStack::chunk_t *prevChunk = NULL; + const CallStack::chunk_t *chunk = &m_store; + const CallStack::chunk_t *otherChunk = &other.m_store; + while (prevChunk != m_topChunk) { + UINT32 size = (chunk == m_topChunk) ? m_topIndex : CALLSTACK_CHUNK_SIZE; + for (UINT32 index = 0; index < size; index++) { + if (chunk->frames[index] != otherChunk->frames[index]) { + // Found a mismatch. They are not equal. + return FALSE; + } + } + prevChunk = chunk; + chunk = chunk->next; + otherChunk = otherChunk->next; + } + + // Reached the end of the call stacks. They are equal. + return TRUE; } // operator [] - Random access operator. Retrieves the frame at the specified @@ -145,14 +145,14 @@ BOOL CallStack::operator == (const CallStack &other) const // UINT_PTR CallStack::operator [] (UINT32 index) const { - UINT32 chunknumber = index / CALLSTACK_CHUNK_SIZE; - const CallStack::chunk_t *chunk = &m_store; + UINT32 chunknumber = index / CALLSTACK_CHUNK_SIZE; + const CallStack::chunk_t *chunk = &m_store; - for (UINT32 count = 0; count < chunknumber; count++) { - chunk = chunk->next; - } + for (UINT32 count = 0; count < chunknumber; count++) { + chunk = chunk->next; + } - return chunk->frames[index % CALLSTACK_CHUNK_SIZE]; + return chunk->frames[index % CALLSTACK_CHUNK_SIZE]; } // clear - Resets the CallStack, returning it to a state where no frames have @@ -168,16 +168,16 @@ UINT_PTR CallStack::operator [] (UINT32 index) const // VOID CallStack::clear () { - m_size = 0; - m_topChunk = &m_store; - m_topIndex = 0; - if (m_resolved) - { - delete [] m_resolved; - m_resolved = NULL; - } - m_resolvedCapacity = 0; - m_resolvedLength = 0; + m_size = 0; + m_topChunk = &m_store; + m_topIndex = 0; + if (m_resolved) + { + delete [] m_resolved; + m_resolved = NULL; + } + m_resolvedCapacity = 0; + m_resolvedLength = 0; } @@ -196,108 +196,110 @@ VOID CallStack::clear () // void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const { - // The stack was dumped already - if (m_resolved) - { - dumpResolved(); - return; - } - - if (m_status & CALLSTACK_STATUS_INCOMPLETE) { - // This call stack appears to be incomplete. Using StackWalk64 may be - // more reliable. - Report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" - L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" - L" complete stack trace.\n"); - } - - IMAGEHLP_LINE64 sourceInfo = { 0 }; - sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - - BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; - - WCHAR lowerCaseName [MAX_PATH]; - WCHAR callingModuleName [MAX_PATH]; - - const size_t max_size = MAXREPORTLENGTH + 1; - - // Iterate through each frame in the call stack. - for (UINT32 frame = start_frame; frame < m_size; frame++) - { - // Try to get the source file and line number associated with - // this program counter address. - SIZE_T programCounter = (*this)[frame]; - g_symbolLock.Enter(); - BOOL foundline = FALSE; - DWORD displacement = 0; - foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); - if (foundline && !showInternalFrames) { - wcscpy_s(lowerCaseName, sourceInfo.FileName); - _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); - if (isInternalModule(lowerCaseName)) { - // Don't show frames in files internal to the heap. - g_symbolLock.Leave(); - continue; - } - } - - // Initialize structures passed to the symbol handler. - SYMBOL_INFO* functionInfo = (SYMBOL_INFO*)&symbolBuffer; - functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functionInfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; - - // Try to get the name of the function containing this program - // counter address. - DWORD64 displacement64 = 0; - LPWSTR functionName; - if (SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { - functionName = functionInfo->Name; - } - else { - // GetFormattedMessage( GetLastError() ); - functionName = L"(Function name unavailable)"; - displacement64 = 0; - } - g_symbolLock.Leave(); - - HMODULE hCallingModule = GetCallingModule(programCounter); - LPWSTR moduleName = L"(Module name unavailable)"; - if (hCallingModule && - GetModuleFileName(hCallingModule, callingModuleName, _countof(callingModuleName)) > 0) - { - moduleName = wcsrchr(callingModuleName, L'\\'); - if (moduleName == NULL) - moduleName = wcsrchr(callingModuleName, L'/'); - if (moduleName != NULL) - moduleName++; - else - moduleName = callingModuleName; - } - - // Use static here to increase performance, and avoid heap allocs. Hopefully this won't - // prove to be an issue in thread safety. If it does, it will have to be simply non-static. - static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; - int NumChars = -1; - // Display the current stack frame's information. - if (foundline) { - if (displacement == 0) - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); - else - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); - } - else { - if (displacement64 == 0) - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", - programCounter, moduleName, functionName); - else - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", - programCounter, moduleName, functionName, (DWORD)displacement64); - } - - Print(stack_line); - } + // The stack was dumped already + if (m_resolved) + { + dumpResolved(); + return; + } + + if (m_status & CALLSTACK_STATUS_INCOMPLETE) { + // This call stack appears to be incomplete. Using StackWalk64 may be + // more reliable. + Report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" + L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" + L" complete stack trace.\n"); + } + + IMAGEHLP_LINE64 sourceInfo = { 0 }; + sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + + BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; + + WCHAR lowerCaseName [MAX_PATH]; + WCHAR callingModuleName [MAX_PATH]; + + const size_t max_size = MAXREPORTLENGTH + 1; + + // Iterate through each frame in the call stack. + for (UINT32 frame = start_frame; frame < m_size; frame++) + { + // Try to get the source file and line number associated with + // this program counter address. + SIZE_T programCounter = (*this)[frame]; + g_symbolLock.Enter(); + BOOL foundline = FALSE; + DWORD displacement = 0; + DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); + foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + if (foundline && !showInternalFrames) { + wcscpy_s(lowerCaseName, sourceInfo.FileName); + _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); + if (isInternalModule(lowerCaseName)) { + // Don't show frames in files internal to the heap. + g_symbolLock.Leave(); + continue; + } + } + + // Initialize structures passed to the symbol handler. + SYMBOL_INFO* functionInfo = (SYMBOL_INFO*)&symbolBuffer; + functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functionInfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; + + // Try to get the name of the function containing this program + // counter address. + DWORD64 displacement64 = 0; + LPWSTR functionName; + DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); + if (SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { + functionName = functionInfo->Name; + } + else { + // GetFormattedMessage( GetLastError() ); + functionName = L"(Function name unavailable)"; + displacement64 = 0; + } + g_symbolLock.Leave(); + + HMODULE hCallingModule = GetCallingModule(programCounter); + LPWSTR moduleName = L"(Module name unavailable)"; + if (hCallingModule && + GetModuleFileName(hCallingModule, callingModuleName, _countof(callingModuleName)) > 0) + { + moduleName = wcsrchr(callingModuleName, L'\\'); + if (moduleName == NULL) + moduleName = wcsrchr(callingModuleName, L'/'); + if (moduleName != NULL) + moduleName++; + else + moduleName = callingModuleName; + } + + // Use static here to increase performance, and avoid heap allocs. Hopefully this won't + // prove to be an issue in thread safety. If it does, it will have to be simply non-static. + static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; + int NumChars = -1; + // Display the current stack frame's information. + if (foundline) { + if (displacement == 0) + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s\n", + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); + else + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); + } + else { + if (displacement64 == 0) + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", + programCounter, moduleName, functionName); + else + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", + programCounter, moduleName, functionName, (DWORD)displacement64); + } + + Print(stack_line); + } } // Resolve - Creates a nicely formatted rendition of the CallStack, including @@ -316,130 +318,132 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const // void CallStack::resolve(BOOL showInternalFrames) { - if (m_resolved) - { - // already resolved, no need to do it again - // resolving twice may report an incorrect module for the stack frames - // if the memory was leaked in a dynamic library that was already unloaded. - return; - } - if (m_status & CALLSTACK_STATUS_INCOMPLETE) { - // This call stack appears to be incomplete. Using StackWalk64 may be - // more reliable. - Report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" - L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" - L" complete stack trace.\n"); - } - - IMAGEHLP_LINE64 sourceInfo = { 0 }; - sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - - BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; - - WCHAR callingModuleName [MAX_PATH] = L""; - WCHAR lowerCaseName [MAX_PATH]; - - const size_t max_line_length = MAXREPORTLENGTH + 1; - m_resolvedCapacity = m_size * max_line_length; - m_resolved = new WCHAR[m_resolvedCapacity]; - const size_t allocedBytes = m_resolvedCapacity * sizeof(WCHAR); - ZeroMemory(m_resolved, allocedBytes); - - // Iterate through each frame in the call stack. - for (UINT32 frame = 0; frame < m_size; frame++) - { - // Try to get the source file and line number associated with - // this program counter address. - SIZE_T programCounter = (*this)[frame]; - g_symbolLock.Enter(); - BOOL foundline = FALSE; - DWORD displacement = 0; - - // It turns out that calls to SymGetLineFromAddrW64 may free the very memory we are scrutinizing here - // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. - // When that happens there is nothing we can do except crash. - foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); - assert(m_resolved != NULL); - - if (foundline && !showInternalFrames) { - wcscpy_s(lowerCaseName, sourceInfo.FileName); - _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); - if (isInternalModule(lowerCaseName)) { - // Don't show frames in files internal to the heap. - g_symbolLock.Leave(); - continue; - } - } - - // Initialize structures passed to the symbol handler. - SYMBOL_INFO* functionInfo = (SYMBOL_INFO*)&symbolBuffer; - functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functionInfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; - - // Try to get the name of the function containing this program - // counter address. - DWORD64 displacement64 = 0; - LPWSTR functionName; - if (SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { - functionName = functionInfo->Name; - } - else { - // GetFormattedMessage( GetLastError() ); - functionName = L"(Function name unavailable)"; - displacement64 = 0; - } - g_symbolLock.Leave(); - - HMODULE hCallingModule = GetCallingModule(programCounter); - LPWSTR moduleName = L"(Module name unavailable)"; - if (hCallingModule && - GetModuleFileName(hCallingModule, callingModuleName, _countof(callingModuleName)) > 0) - { - moduleName = wcsrchr(callingModuleName, L'\\'); - if (moduleName == NULL) - moduleName = wcsrchr(callingModuleName, L'/'); - if (moduleName != NULL) - moduleName++; - else - moduleName = callingModuleName; - } - - // Use static here to increase performance, and avoid heap allocs. Hopefully this won't - // prove to be an issue in thread safety. If it does, it will have to be simply non-static. - static WCHAR stack_line[max_line_length] = L""; - int NumChars = -1; - // Display the current stack frame's information. - if (foundline) { - // Just truncate anything that is too long. - if (displacement == 0) - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); - else - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); - } - else { - if (displacement64 == 0) - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", - programCounter, moduleName, functionName); - else - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", - programCounter, moduleName, functionName, (DWORD)displacement64); - } - - if (NumChars >= 0) { - assert(m_resolved != NULL); - m_resolvedLength += NumChars; - wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); - } - } // end for loop + if (m_resolved) + { + // already resolved, no need to do it again + // resolving twice may report an incorrect module for the stack frames + // if the memory was leaked in a dynamic library that was already unloaded. + return; + } + if (m_status & CALLSTACK_STATUS_INCOMPLETE) { + // This call stack appears to be incomplete. Using StackWalk64 may be + // more reliable. + Report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" + L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" + L" complete stack trace.\n"); + } + + IMAGEHLP_LINE64 sourceInfo = { 0 }; + sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + + BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; + + WCHAR callingModuleName [MAX_PATH] = L""; + WCHAR lowerCaseName [MAX_PATH]; + + const size_t max_line_length = MAXREPORTLENGTH + 1; + m_resolvedCapacity = m_size * max_line_length; + m_resolved = new WCHAR[m_resolvedCapacity]; + const size_t allocedBytes = m_resolvedCapacity * sizeof(WCHAR); + ZeroMemory(m_resolved, allocedBytes); + + // Iterate through each frame in the call stack. + for (UINT32 frame = 0; frame < m_size; frame++) + { + // Try to get the source file and line number associated with + // this program counter address. + SIZE_T programCounter = (*this)[frame]; + g_symbolLock.Enter(); + BOOL foundline = FALSE; + DWORD displacement = 0; + + // It turns out that calls to SymGetLineFromAddrW64 may free the very memory we are scrutinizing here + // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. + // When that happens there is nothing we can do except crash. + DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); + foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + assert(m_resolved != NULL); + + if (foundline && !showInternalFrames) { + wcscpy_s(lowerCaseName, sourceInfo.FileName); + _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); + if (isInternalModule(lowerCaseName)) { + // Don't show frames in files internal to the heap. + g_symbolLock.Leave(); + continue; + } + } + + // Initialize structures passed to the symbol handler. + SYMBOL_INFO* functionInfo = (SYMBOL_INFO*)&symbolBuffer; + functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functionInfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; + + // Try to get the name of the function containing this program + // counter address. + DWORD64 displacement64 = 0; + LPWSTR functionName; + DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); + if (SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { + functionName = functionInfo->Name; + } + else { + // GetFormattedMessage( GetLastError() ); + functionName = L"(Function name unavailable)"; + displacement64 = 0; + } + g_symbolLock.Leave(); + + HMODULE hCallingModule = GetCallingModule(programCounter); + LPWSTR moduleName = L"(Module name unavailable)"; + if (hCallingModule && + GetModuleFileName(hCallingModule, callingModuleName, _countof(callingModuleName)) > 0) + { + moduleName = wcsrchr(callingModuleName, L'\\'); + if (moduleName == NULL) + moduleName = wcsrchr(callingModuleName, L'/'); + if (moduleName != NULL) + moduleName++; + else + moduleName = callingModuleName; + } + + // Use static here to increase performance, and avoid heap allocs. Hopefully this won't + // prove to be an issue in thread safety. If it does, it will have to be simply non-static. + static WCHAR stack_line[max_line_length] = L""; + int NumChars = -1; + // Display the current stack frame's information. + if (foundline) { + // Just truncate anything that is too long. + if (displacement == 0) + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s\n", + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); + else + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); + } + else { + if (displacement64 == 0) + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", + programCounter, moduleName, functionName); + else + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", + programCounter, moduleName, functionName, (DWORD)displacement64); + } + + if (NumChars >= 0) { + assert(m_resolved != NULL); + m_resolvedLength += NumChars; + wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); + } + } // end for loop } // DumpResolve void CallStack::dumpResolved() const { - if (m_resolved) - Print(m_resolved); + if (m_resolved) + Print(m_resolved); } @@ -452,14 +456,14 @@ void CallStack::dumpResolved() const // DWORD CallStack::getHashValue () const { - DWORD hashcode = 0xD202EF8D; - - // Iterate through each frame in the call stack. - for (UINT32 frame = 0; frame < m_size; frame++) { - UINT_PTR programcounter = (*this)[frame]; - hashcode = CalculateCRC32(programcounter, hashcode); - } - return hashcode; + DWORD hashcode = 0xD202EF8D; + + // Iterate through each frame in the call stack. + for (UINT32 frame = 0; frame < m_size; frame++) { + UINT_PTR programcounter = (*this)[frame]; + hashcode = CalculateCRC32(programcounter, hashcode); + } + return hashcode; } // push_back - Pushes a frame's program counter onto the CallStack. Pushes are @@ -477,42 +481,42 @@ DWORD CallStack::getHashValue () const // VOID CallStack::push_back (const UINT_PTR programcounter) { - if (m_size == m_capacity) { - // At current capacity. Allocate additional storage. - CallStack::chunk_t *chunk = new CallStack::chunk_t; - chunk->next = NULL; - m_topChunk->next = chunk; - m_topChunk = chunk; - m_topIndex = 0; - m_capacity += CALLSTACK_CHUNK_SIZE; - } - else if (m_topIndex >= CALLSTACK_CHUNK_SIZE) { - // There is more capacity, but not in this chunk. Go to the next chunk. - // Note that this only happens if this CallStack has previously been - // cleared (clearing resets the data, but doesn't give up any allocated - // space). - m_topChunk = m_topChunk->next; - m_topIndex = 0; - } - - m_topChunk->frames[m_topIndex++] = programcounter; - m_size++; + if (m_size == m_capacity) { + // At current capacity. Allocate additional storage. + CallStack::chunk_t *chunk = new CallStack::chunk_t; + chunk->next = NULL; + m_topChunk->next = chunk; + m_topChunk = chunk; + m_topIndex = 0; + m_capacity += CALLSTACK_CHUNK_SIZE; + } + else if (m_topIndex >= CALLSTACK_CHUNK_SIZE) { + // There is more capacity, but not in this chunk. Go to the next chunk. + // Note that this only happens if this CallStack has previously been + // cleared (clearing resets the data, but doesn't give up any allocated + // space). + m_topChunk = m_topChunk->next; + m_topIndex = 0; + } + + m_topChunk->frames[m_topIndex++] = programcounter; + m_size++; } bool CallStack::isInternalModule( const PWSTR filename ) const { - return wcsstr(filename, L"\\crt\\src\\afxmem.cpp") || - wcsstr(filename, L"\\crt\\src\\dbgheap.c") || - wcsstr(filename, L"\\crt\\src\\malloc.c") || - wcsstr(filename, L"\\crt\\src\\dbgmalloc.c") || - wcsstr(filename, L"\\crt\\src\\new.cpp") || - wcsstr(filename, L"\\crt\\src\\newaop.cpp") || - wcsstr(filename, L"\\crt\\src\\dbgcalloc.c") || - wcsstr(filename, L"\\crt\\src\\realloc.c") || - wcsstr(filename, L"\\crt\\src\\dbgrealloc.c") || - wcsstr(filename, L"\\crt\\src\\dbgdel.cp") || - wcsstr(filename, L"\\crt\\src\\free.c") || - wcsstr(filename, L"\\vc\\include\\xmemory0"); + return wcsstr(filename, L"\\crt\\src\\afxmem.cpp") || + wcsstr(filename, L"\\crt\\src\\dbgheap.c") || + wcsstr(filename, L"\\crt\\src\\malloc.c") || + wcsstr(filename, L"\\crt\\src\\dbgmalloc.c") || + wcsstr(filename, L"\\crt\\src\\new.cpp") || + wcsstr(filename, L"\\crt\\src\\newaop.cpp") || + wcsstr(filename, L"\\crt\\src\\dbgcalloc.c") || + wcsstr(filename, L"\\crt\\src\\realloc.c") || + wcsstr(filename, L"\\crt\\src\\dbgrealloc.c") || + wcsstr(filename, L"\\crt\\src\\dbgdel.cp") || + wcsstr(filename, L"\\crt\\src\\free.c") || + wcsstr(filename, L"\\vc\\include\\xmemory0"); } // getStackTrace - Traces the stack as far back as possible, or until 'maxdepth' @@ -536,71 +540,71 @@ bool CallStack::isInternalModule( const PWSTR filename ) const // VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) { - UINT32 count = 0; - UINT_PTR* framePointer = context.fp; + UINT32 count = 0; + UINT_PTR* framePointer = context.fp; #if defined(_M_IX86) - while (count < maxdepth) { - if (*framePointer < (UINT_PTR)framePointer) { - if (*framePointer == NULL) { - // Looks like we reached the end of the stack. - break; - } - else { - // Invalid frame pointer. Frame pointer addresses should always - // increase as we move up the stack. - m_status |= CALLSTACK_STATUS_INCOMPLETE; - break; - } - } - if (*framePointer & (sizeof(UINT_PTR*) - 1)) { - // Invalid frame pointer. Frame pointer addresses should always - // be aligned to the size of a pointer. This probably means that - // we've encountered a frame that was created by a module built with - // frame pointer omission (FPO) optimization turned on. - m_status |= CALLSTACK_STATUS_INCOMPLETE; - break; - } - if (IsBadReadPtr((UINT*)*framePointer, sizeof(UINT_PTR*))) { - // Bogus frame pointer. Again, this probably means that we've - // encountered a frame built with FPO optimization. - m_status |= CALLSTACK_STATUS_INCOMPLETE; - break; - } - count++; - push_back(*(framePointer + 1)); - framePointer = (UINT_PTR*)*framePointer; - } + while (count < maxdepth) { + if (*framePointer < (UINT_PTR)framePointer) { + if (*framePointer == NULL) { + // Looks like we reached the end of the stack. + break; + } + else { + // Invalid frame pointer. Frame pointer addresses should always + // increase as we move up the stack. + m_status |= CALLSTACK_STATUS_INCOMPLETE; + break; + } + } + if (*framePointer & (sizeof(UINT_PTR*) - 1)) { + // Invalid frame pointer. Frame pointer addresses should always + // be aligned to the size of a pointer. This probably means that + // we've encountered a frame that was created by a module built with + // frame pointer omission (FPO) optimization turned on. + m_status |= CALLSTACK_STATUS_INCOMPLETE; + break; + } + if (IsBadReadPtr((UINT*)*framePointer, sizeof(UINT_PTR*))) { + // Bogus frame pointer. Again, this probably means that we've + // encountered a frame built with FPO optimization. + m_status |= CALLSTACK_STATUS_INCOMPLETE; + break; + } + count++; + push_back(*(framePointer + 1)); + framePointer = (UINT_PTR*)*framePointer; + } #elif defined(_M_X64) - UINT32 maxframes = min(62, maxdepth + 10); - static USHORT (WINAPI *s_pfnCaptureStackBackTrace)(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash) = 0; - if (s_pfnCaptureStackBackTrace == 0) - { - const HMODULE hNtDll = GetModuleHandleW(L"ntdll.dll"); - reinterpret_cast(s_pfnCaptureStackBackTrace) - = ::GetProcAddress(hNtDll, "RtlCaptureStackBackTrace"); - if (s_pfnCaptureStackBackTrace == 0) - return; - } - UINT_PTR* myFrames = new UINT_PTR[maxframes]; - ZeroMemory(myFrames, sizeof(UINT_PTR) * maxframes); - s_pfnCaptureStackBackTrace(0, maxframes, (PVOID*)myFrames, NULL); - UINT32 startIndex = 0; - while (count < maxframes) { - if (myFrames[count] == 0) - break; - if (myFrames[count] == *(framePointer + 1)) - startIndex = count; - count++; - } - count = startIndex; - while (count < maxframes) { - if (myFrames[count] == 0) - break; - push_back(myFrames[count]); - count++; - } - delete [] myFrames; + UINT32 maxframes = min(62, maxdepth + 10); + static USHORT (WINAPI *s_pfnCaptureStackBackTrace)(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash) = 0; + if (s_pfnCaptureStackBackTrace == 0) + { + const HMODULE hNtDll = GetModuleHandleW(L"ntdll.dll"); + reinterpret_cast(s_pfnCaptureStackBackTrace) + = ::GetProcAddress(hNtDll, "RtlCaptureStackBackTrace"); + if (s_pfnCaptureStackBackTrace == 0) + return; + } + UINT_PTR* myFrames = new UINT_PTR[maxframes]; + ZeroMemory(myFrames, sizeof(UINT_PTR) * maxframes); + s_pfnCaptureStackBackTrace(0, maxframes, (PVOID*)myFrames, NULL); + UINT32 startIndex = 0; + while (count < maxframes) { + if (myFrames[count] == 0) + break; + if (myFrames[count] == *(framePointer + 1)) + startIndex = count; + count++; + } + count = startIndex; + while (count < maxframes) { + if (myFrames[count] == 0) + break; + push_back(myFrames[count]); + count++; + } + delete [] myFrames; #endif } @@ -625,57 +629,58 @@ VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) // VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) { - UINT_PTR* framePointer = context.fp; - DWORD architecture = X86X64ARCHITECTURE; - CONTEXT currentContext; - memset(¤tContext, 0, sizeof(currentContext)); + UINT_PTR* framePointer = context.fp; + DWORD architecture = X86X64ARCHITECTURE; + CONTEXT currentContext; + memset(¤tContext, 0, sizeof(currentContext)); - // Get the required values for initialization of the STACKFRAME64 structure - // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame. + // Get the required values for initialization of the STACKFRAME64 structure + // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame. #if defined(_M_IX86) - UINT_PTR programcounter = *(framePointer + 1); - UINT_PTR stackpointer = (*framePointer) - maxdepth * 10 * sizeof(void*); // An approximation. - currentContext.SPREG = stackpointer; - currentContext.BPREG = (DWORD64)framePointer; - currentContext.IPREG = programcounter; + UINT_PTR programcounter = *(framePointer + 1); + UINT_PTR stackpointer = (*framePointer) - maxdepth * 10 * sizeof(void*); // An approximation. + currentContext.SPREG = stackpointer; + currentContext.BPREG = (DWORD64)framePointer; + currentContext.IPREG = programcounter; #elif defined(_M_X64) - currentContext.SPREG = context.Rsp; - currentContext.BPREG = (DWORD64)framePointer; - currentContext.IPREG = context.Rip; + currentContext.SPREG = context.Rsp; + currentContext.BPREG = (DWORD64)framePointer; + currentContext.IPREG = context.Rip; #else - // If you want to retarget Visual Leak Detector to another processor - // architecture then you'll need to provide architecture-specific code to - // obtain the program counter and stack pointer from the given frame pointer. + // If you want to retarget Visual Leak Detector to another processor + // architecture then you'll need to provide architecture-specific code to + // obtain the program counter and stack pointer from the given frame pointer. #error "Visual Leak Detector is not supported on this architecture." #endif // _M_IX86 || _M_X64 - // Initialize the STACKFRAME64 structure. - STACKFRAME64 frame; - memset(&frame, 0x0, sizeof(frame)); - frame.AddrPC.Offset = currentContext.IPREG; - frame.AddrPC.Mode = AddrModeFlat; - frame.AddrStack.Offset = currentContext.SPREG; - frame.AddrStack.Mode = AddrModeFlat; - frame.AddrFrame.Offset = currentContext.BPREG; - frame.AddrFrame.Mode = AddrModeFlat; - frame.Virtual = TRUE; - - // Walk the stack. - CriticalSectionLocker cs(g_stackWalkLock); - UINT32 count = 0; - while (count < maxdepth) { - count++; - if (!StackWalk64(architecture, g_currentProcess, g_currentThread, &frame, ¤tContext, NULL, - SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { - // Couldn't trace back through any more frames. - break; - } - if (frame.AddrFrame.Offset == 0) { - // End of stack. - break; - } - - // Push this frame's program counter onto the CallStack. - push_back((UINT_PTR)frame.AddrPC.Offset); - } + // Initialize the STACKFRAME64 structure. + STACKFRAME64 frame; + memset(&frame, 0x0, sizeof(frame)); + frame.AddrPC.Offset = currentContext.IPREG; + frame.AddrPC.Mode = AddrModeFlat; + frame.AddrStack.Offset = currentContext.SPREG; + frame.AddrStack.Mode = AddrModeFlat; + frame.AddrFrame.Offset = currentContext.BPREG; + frame.AddrFrame.Mode = AddrModeFlat; + frame.Virtual = TRUE; + + // Walk the stack. + CriticalSectionLocker cs(g_stackWalkLock); + UINT32 count = 0; + while (count < maxdepth) { + count++; + DbgTrace(L"dbghelp32.dll %i: StackWalk64\n", GetCurrentThreadId()); + if (!StackWalk64(architecture, g_currentProcess, g_currentThread, &frame, ¤tContext, NULL, + SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { + // Couldn't trace back through any more frames. + break; + } + if (frame.AddrFrame.Offset == 0) { + // End of stack. + break; + } + + // Push this frame's program counter onto the CallStack. + push_back((UINT_PTR)frame.AddrPC.Offset); + } } diff --git a/criticalsection.h b/criticalsection.h index 53c4f775..3cf3c0eb 100644 --- a/criticalsection.h +++ b/criticalsection.h @@ -62,7 +62,6 @@ class CriticalSectionLocker { LeaveLock(); } - private: void LeaveLock() diff --git a/setup/version.h b/setup/version.h index 5822885f..8a1a2a01 100644 --- a/setup/version.h +++ b/setup/version.h @@ -1,9 +1,9 @@ -#define VLDVERSION L"2.2.1" -#define VERSION_NUMBER 2,2,1,0 -#define VERSION_STRING "2.2.1.0" +#define VLDVERSION L"2.2.2" +#define VERSION_NUMBER 2,2,2,0 +#define VERSION_STRING "2.2.2.0" #define VERSION_COPYRIGHT "Copyright (C) 2005-2011" #ifndef __FILE__ -!define VLD_VERSION "2.2.1" // NSIS Script +!define VLD_VERSION "2.2.2" // NSIS Script #endif diff --git a/utility.cpp b/utility.cpp index 1e4cce18..b2a29790 100644 --- a/utility.cpp +++ b/utility.cpp @@ -269,6 +269,7 @@ BOOL FindImport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodule IMAGE_THUNK_DATA *iate; FARPROC import; + DbgTrace(L"dbghelp32.dll %i: FindImport - ImageDirectoryEntryToDataEx\n", GetCurrentThreadId()); idte = FindOriginalImportDescriptor(importmodule, exportmodulename); if (idte == NULL) return FALSE; @@ -553,6 +554,7 @@ BOOL PatchModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tables // Loop through the import patch table, individually patching each import // listed in the table. + DbgTrace(L"dbghelp32.dll %i: PatchModule - ImageDirectoryEntryToDataEx\n", GetCurrentThreadId()); for (index = 0; index < tablesize; index++) { entry = &patchtable[index]; if (PatchImport(importmodule, entry) == TRUE) { @@ -800,6 +802,7 @@ VOID RestoreModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tabl // Loop through the import patch table, individually restoring each import // listed in the table. + DbgTrace(L"dbghelp32.dll %i: RestoreModule - ImageDirectoryEntryToDataEx\n", GetCurrentThreadId()); for (index = 0; index < tablesize; index++) { entry = &patchtable[index]; RestoreImport(importmodule, entry); diff --git a/utility.h b/utility.h index a58fc791..bb15d6fe 100644 --- a/utility.h +++ b/utility.h @@ -124,6 +124,15 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module); BOOL PatchModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); VOID Print (LPWSTR message); VOID Report (LPCWSTR format, ...); +#ifdef _DEBUG +#define DbgPrint(x) Print(x) +#define DbgReport(...) Report(__VA_ARGS__) +#define DbgTrace(...) +#else +#define DbgPrint(x) +#define DbgReport(...) +#define DbgTrace(...) +#endif VOID RestoreImport (HMODULE importmodule, moduleentry_t* module); VOID RestoreModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); VOID SetReportEncoding (encoding_e encoding); diff --git a/vld.cpp b/vld.cpp index 166d2a3e..33344f9f 100644 --- a/vld.cpp +++ b/vld.cpp @@ -54,6 +54,7 @@ HANDLE g_processHeap; // Handle to the process's heap (COM allocati CriticalSection g_stackWalkLock; // Serializes calls to StackWalk64 from the Debug Help Library. CriticalSection g_symbolLock; // Serializes calls to the Debug Help Library symbols handling APIs. ReportHookSet* g_pReportHooks; +volatile long g_loaderLockCounter = 0; // The one and only VisualLeakDetector object instance. __declspec(dllexport) VisualLeakDetector g_vld; @@ -209,6 +210,7 @@ VisualLeakDetector::VisualLeakDetector () #else SymSetOptions(SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS | SYMOPT_LOAD_LINES); #endif + DbgTrace(L"dbghelp32.dll %i: SymInitializeW\n", GetCurrentThreadId()); if (!SymInitializeW(g_currentProcess, symbolpath, FALSE)) { Report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" L" File and function names will probably not be available in call stacks.\n", GetLastError()); @@ -223,6 +225,7 @@ VisualLeakDetector::VisualLeakDetector () // Attach Visual Leak Detector to every module loaded in the process. ModuleSet* newmodules = new ModuleSet(); newmodules->reserve(MODULE_SET_RESERVE); + DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); attachToLoadedModules(newmodules); m_loadedModules = newmodules; @@ -347,6 +350,7 @@ VisualLeakDetector::~VisualLeakDetector () if (m_status & VLD_STATUS_INSTALLED) { // Detach Visual Leak Detector from all previously attached modules. + DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); EnumerateLoadedModulesW64(g_currentProcess, detachFromModule, NULL); HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); @@ -379,6 +383,7 @@ VisualLeakDetector::~VisualLeakDetector () } // Free resources used by the symbol handler. + DbgTrace(L"dbghelp32.dll %i: SymCleanup\n", GetCurrentThreadId()); if (!SymCleanup(g_currentProcess)) { Report(L"WARNING: Visual Leak Detector: The symbol handler failed to deallocate resources (error=%lu).\n", GetLastError()); @@ -520,6 +525,7 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) g_symbolLock.Enter(); if ((refresh == true) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { // Discard the previously loaded symbols, so we can refresh them. + DbgTrace(L"dbghelp32.dll %i: SymUnloadModule64\n", GetCurrentThreadId()); if (SymUnloadModule64(g_currentProcess, modulebase) == false) { Report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" L" numbers shown in the memory leak report for %s may be inaccurate.\n", modulename, modulename); @@ -539,9 +545,13 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) { CriticalSectionLocker cs(g_vld.m_heapMapLock); // fix GetModuleFileName thread lock g_symbolLock.Enter(); + DbgTrace(L"dbghelp32.dll %i: SymLoadModuleEx\n", GetCurrentThreadId()); DWORD64 module = SymLoadModuleEx(g_currentProcess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0); if (module == modulebase) + { + DbgTrace(L"dbghelp32.dll %i: SymGetModuleInfoW64\n", GetCurrentThreadId()); SymbolsLoaded = SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo); + } g_symbolLock.Leave(); } if (SymbolsLoaded) @@ -750,6 +760,7 @@ VOID VisualLeakDetector::configure () wcsncpy_s(inipath, MAX_PATH, L"vld.ini", _TRUNCATE); } } + DbgReport(L"Visual Leak Detector read settings from file: %s\n", inipath); #define BSIZE 64 WCHAR buffer [BSIZE] = {0}; @@ -1769,35 +1780,13 @@ FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, PHANDLE modulehandle) { - CriticalSectionLocker cs(g_vld.m_loaderLock); - // Load the DLL. + _InterlockedIncrement(&g_loaderLockCounter); NTSTATUS status = LdrLoadDll(searchpath, flags, modulename, modulehandle); - if (STATUS_SUCCESS == status) { - // Duplicate code here from VisualLeakDetector::RefreshModules. Consider refactoring this out. - // Create a new set of all loaded modules, including any newly loaded - // modules. - ModuleSet *newmodules = new ModuleSet; - newmodules->reserve(MODULE_SET_RESERVE); - EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); - - // Attach to all modules included in the set. - g_vld.attachToLoadedModules(newmodules); - - // Start using the new set of loaded modules. - g_vld.m_modulesLock.Enter(); - ModuleSet *oldmodules = g_vld.m_loadedModules; - g_vld.m_loadedModules = newmodules; - g_vld.m_modulesLock.Leave(); - - // Free resources used by the old module list. - for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { - delete [] (*moduleit).name; - delete [] (*moduleit).path; - } - delete oldmodules; - } + if (STATUS_SUCCESS == status && g_loaderLockCounter == 1) + g_vld.RefreshModules(); + _InterlockedDecrement(&g_loaderLockCounter); return status; } @@ -1813,6 +1802,7 @@ VOID VisualLeakDetector::RefreshModules() // modules. ModuleSet* newmodules = new ModuleSet(); newmodules->reserve(MODULE_SET_RESERVE); + DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); // Attach to all modules included in the set. @@ -1849,7 +1839,6 @@ void VisualLeakDetector::getCallStack( CallStack **&ppcallstack, context_t &cont // Find the information for the module that initiated this reallocation. bool VisualLeakDetector::isModuleExcluded(UINT_PTR address) { - bool excluded = false; moduleinfo_t moduleinfo; ModuleSet::Iterator moduleit; moduleinfo.addrLow = address; @@ -1858,10 +1847,11 @@ bool VisualLeakDetector::isModuleExcluded(UINT_PTR address) CriticalSectionLocker cs(g_vld.m_modulesLock); moduleit = g_vld.m_loadedModules->find(moduleinfo); - if (moduleit != g_vld.m_loadedModules->end()) { - excluded = (*moduleit).flags & VLD_MODULE_EXCLUDED ? true : false; - } - return excluded; + if (moduleit != g_vld.m_loadedModules->end()) + return (*moduleit).flags & VLD_MODULE_EXCLUDED ? true : false; + else if (g_loaderLockCounter != 0) // new module inside LdrLoadDll + return true; + return false; } SIZE_T VisualLeakDetector::GetLeaksCount() diff --git a/vld_hooks.cpp b/vld_hooks.cpp index 1a80f311..d65cf942 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -42,15 +42,15 @@ extern CriticalSection g_symbolLock; void VisualLeakDetector::firstAllocCall(tls_t * tls) { - if (tls->ppCallStack) - { - tls->flags &= ~VLD_TLS_CRTALLOC; - getCallStack(tls->ppCallStack, tls->context); - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + if (tls->ppCallStack) + { + tls->flags &= ~VLD_TLS_CRTALLOC; + getCallStack(tls->ppCallStack, tls->context); + } + + // Reset thread local flags and variables for the next allocation. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; } //////////////////////////////////////////////////////////////////////////////// @@ -80,32 +80,32 @@ void VisualLeakDetector::firstAllocCall(tls_t * tls) // Returns the value returned from the specified calloc. // void* VisualLeakDetector::_calloc (calloc_t pcalloc, - context_t& context, - bool debugRuntime, - size_t num, - size_t size) + context_t& context, + bool debugRuntime, + size_t num, + size_t size) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // malloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pcalloc(num, size); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pcalloc(num, size); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // _malloc - This function is just a wrapper around the real malloc that sets @@ -124,27 +124,27 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // malloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pmalloc(size); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // _new - This function is just a wrapper around the real CRT and MFC new @@ -163,27 +163,27 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool de // void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntime, size_t size) { - tls_t* tls = g_vld.getTls(); + tls_t* tls = g_vld.getTls(); - // The new operator is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // The new operator is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew(size); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew(size); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // _realloc - This function is just a wrapper around the real realloc that sets @@ -203,32 +203,32 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntim // Returns the value returned from the specified realloc. // void* VisualLeakDetector::_realloc (realloc_t prealloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t size) + context_t& context, + bool debugRuntime, + void *mem, + size_t size) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = prealloc(mem, size); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // _recalloc - This function is just a wrapper around the real _recalloc that sets @@ -248,83 +248,83 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // Returns the value returned from the specified realloc. // void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size) + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } char* VisualLeakDetector::__strdup( _strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src ) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - char* block = pstrdup(src); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + char* block = pstrdup(src); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } wchar_t* VisualLeakDetector::__wcsdup( _wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src ) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - wchar_t* block = pwcsdup(src); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + wchar_t* block = pwcsdup(src); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // __aligned_malloc - This function is just a wrapper around the real malloc that sets @@ -342,29 +342,29 @@ wchar_t* VisualLeakDetector::__wcsdup( _wcsdup_t pwcsdup, context_t& context, bo // Returns the value returned from the specified malloc. // void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, bool debugRuntime, - size_t size, size_t alignment) + size_t size, size_t alignment) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // malloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size, alignment); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pmalloc(size, alignment); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // __aligned_offset_malloc - This function is just a wrapper around the real malloc that sets @@ -382,29 +382,29 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t // Returns the value returned from the specified _aligned_offset_malloc. // void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, bool debugRuntime, - size_t size, size_t alignment, size_t offset) + size_t size, size_t alignment, size_t offset) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // malloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size, alignment, offset); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pmalloc(size, alignment, offset); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // __aligned_realloc - This function is just a wrapper around the real realloc that sets @@ -424,33 +424,33 @@ void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmal // Returns the value returned from the specified _aligned_realloc. // void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment) + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + size_t alignment) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size, alignment); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = prealloc(mem, size, alignment); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // __aligned_offset_realloc - This function is just a wrapper around the real realloc that sets @@ -470,34 +470,34 @@ void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, // Returns the value returned from the specified _aligned_offset_realloc. // void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t prealloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment, - size_t offset) + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + size_t alignment, + size_t offset) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size, alignment, offset); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = prealloc(mem, size, alignment, offset); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // __aligned_recalloc - This function is just a wrapper around the real recalloc that sets @@ -519,34 +519,34 @@ void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t p // Returns the value returned from the specified _aligned_realloc. // void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment) + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size, + size_t alignment) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size, alignment); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size, alignment); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // __aligned_offset_recalloc - This function is just a wrapper around the real recalloc that sets @@ -568,35 +568,35 @@ void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, // Returns the value returned from the specified _aligned_offset_realloc. // void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t precalloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment, - size_t offset) + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size, + size_t alignment, + size_t offset) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // realloc is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size, alignment, offset); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = precalloc(mem, num, size, alignment, offset); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // __aligned_malloc_dbg - This function is just a wrapper around the real _aligned_malloc_dbg @@ -622,35 +622,35 @@ void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t // Returns the value returned by the specified _aligned_malloc_dbg. // void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_dbg, - context_t& context, - bool debugRuntime, - size_t size, - size_t alignment, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + size_t size, + size_t alignment, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, alignment, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_malloc_dbg(size, alignment, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // __aligned_offset_malloc_dbg - This function is just a wrapper around the real @@ -676,36 +676,36 @@ void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_ // Returns the value returned by the specified _aligned_malloc_dbg. // void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_malloc_dbg, - context_t& context, - bool debugRuntime, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, alignment, offset, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_malloc_dbg(size, alignment, offset, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // _aligned_realloc_debug - This function is just a wrapper around the real @@ -733,36 +733,36 @@ void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_db // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_realloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + size_t alignment, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, alignment, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_realloc_dbg(mem, size, alignment, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // _aligned_offset_realloc_debug - This function is just a wrapper around the real @@ -790,37 +790,37 @@ void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_reall // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_realloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, alignment, offset, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_realloc_dbg(mem, size, alignment, offset, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // _aligned_recalloc_debug - This function is just a wrapper around the real @@ -850,37 +850,37 @@ void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_ // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size, + size_t alignment, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, alignment, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, alignment, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // _aligned_offset_recalloc_debug - This function is just a wrapper around the real @@ -910,38 +910,38 @@ void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_rec // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size, + size_t alignment, + size_t offset, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, alignment, offset, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, alignment, offset, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } //////////////////////////////////////////////////////////////////////////////// @@ -977,35 +977,35 @@ void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recallo // Returns the value returned by the specified _calloc_dbg. // void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, - context_t& context, - bool debugRuntime, - size_t num, - size_t size, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + size_t num, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_calloc_dbg(num, size, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_calloc_dbg(num, size, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // __malloc_dbg - This function is just a wrapper around the real _malloc_dbg @@ -1031,96 +1031,96 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // Returns the value returned by the specified _malloc_dbg. // void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, - context_t& context, - bool debugRuntime, - size_t size, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = p_malloc_dbg(size, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, - context_t& context, - bool debugRuntime, - const char* src, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + const char* src, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - char* block = p_strdup_dbg(src, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + char* block = p_strdup_dbg(src, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } wchar_t* VisualLeakDetector::__wcsdup_dbg (_wcsdup_dbg_t p_wcsdup_dbg, - context_t& context, - bool debugRuntime, - const wchar_t* src, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + const wchar_t* src, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _malloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - wchar_t* block = p_wcsdup_dbg(src, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + wchar_t* block = p_wcsdup_dbg(src, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // new_dbg_crt - This function is just a wrapper around the real CRT debug new @@ -1146,34 +1146,34 @@ wchar_t* VisualLeakDetector::__wcsdup_dbg (_wcsdup_dbg_t p_wcsdup_dbg, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, - context_t& context, - bool debugRuntime, - size_t size, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // The debug new operator is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // The debug new operator is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg_crt(size, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew_dbg_crt(size, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // new_dbg_mfc - This function is just a wrapper around the real MFC debug new @@ -1199,29 +1199,29 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // Returns the value returned by the specified CRT debug new operator. // void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, - context_t& context, - size_t size, - int type, - char const *file, - int line) + context_t& context, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg(size, type, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew_dbg(size, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // new_dbg_mfc - This function is just a wrapper around the real MFC debug new @@ -1245,28 +1245,28 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, // Returns the value returned by the specified MFC debug new operator. // void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, - context_t& context, - size_t size, - char const *file, - int line) + context_t& context, + size_t size, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg_mfc(size, file, line); + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew_dbg_mfc(size, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // __realloc_debug - This function is just a wrapper around the real @@ -1294,35 +1294,35 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + void *mem, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_realloc_dbg(mem, size, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // __recalloc_debug - This function is just a wrapper around the real @@ -1350,36 +1350,36 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // Returns the value returned by the specified _realloc_dbg. // void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - int type, - char const *file, - int line) + context_t& context, + bool debugRuntime, + void *mem, + size_t num, + size_t size, + int type, + char const *file, + int line) { - tls_t *tls = g_vld.getTls(); + tls_t *tls = g_vld.getTls(); - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + // _realloc_dbg is a CRT function and allocates from the CRT heap. + if (debugRuntime) + tls->flags |= VLD_TLS_CRTALLOC; - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - tls->blockProcessed = FALSE; - } + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + tls->context = context; + tls->blockProcessed = FALSE; + } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, type, file, line); + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + void* block = p_recalloc_dbg(mem, num, size, type, file, line); - if (firstcall) - firstAllocCall(tls); + if (firstcall) + firstAllocCall(tls); - return block; + return block; } // _HeapCreate - Calls to HeapCreate are patched through to this function. This @@ -1398,58 +1398,59 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, // HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) { - // Get the return address within the calling function. - UINT_PTR ra = (UINT_PTR)_ReturnAddress(); - - // Create the heap. - HANDLE heap = HeapCreate(options, initsize, maxsize); - - // Map the created heap handle to a new block map. - g_vld.mapHeap(heap); - - // Try to get the name of the function containing the return address. - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; - SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; - - g_symbolLock.Enter(); - DWORD64 displacement; - BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); - g_symbolLock.Leave(); - if (symfound == TRUE) { - if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { - // HeapCreate was called by _heap_init. This is a static CRT heap (msvcr*.dll). - CriticalSectionLocker cs(g_vld.m_heapMapLock); - HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); - assert(heapit != g_vld.m_heapMap->end()); - HMODULE hCallingModule = (HMODULE)functioninfo->ModBase; - if (hCallingModule) - { - HMODULE hCurrentModule = GetModuleHandleW(NULL); - if (hCallingModule == hCurrentModule) - { - // CRT static linking + // Get the return address within the calling function. + UINT_PTR ra = (UINT_PTR)_ReturnAddress(); + + // Create the heap. + HANDLE heap = HeapCreate(options, initsize, maxsize); + + // Map the created heap handle to a new block map. + g_vld.mapHeap(heap); + + // Try to get the name of the function containing the return address. + BYTE symbolbuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; + SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; + + g_symbolLock.Enter(); + DWORD64 displacement; + DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); + BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); + g_symbolLock.Leave(); + if (symfound == TRUE) { + if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { + // HeapCreate was called by _heap_init. This is a static CRT heap (msvcr*.dll). + CriticalSectionLocker cs(g_vld.m_heapMapLock); + HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); + assert(heapit != g_vld.m_heapMap->end()); + HMODULE hCallingModule = (HMODULE)functioninfo->ModBase; + if (hCallingModule) + { + HMODULE hCurrentModule = GetModuleHandleW(NULL); + if (hCallingModule == hCurrentModule) + { + // CRT static linking #ifdef _DEBUG // debug runtime - (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + (*heapit).second->flags |= VLD_HEAP_CRT_DBG; #endif - } - else - { - // CRT dynamic linking - WCHAR callingmodulename [MAX_PATH] = L""; - if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) - { - _wcslwr_s(callingmodulename); - if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime - (*heapit).second->flags |= VLD_HEAP_CRT_DBG; - } - } - } - } - } - - return heap; + } + else + { + // CRT dynamic linking + WCHAR callingmodulename [MAX_PATH] = L""; + if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) + { + _wcslwr_s(callingmodulename); + if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime + (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + } + } + } + } + } + + return heap; } // _HeapDestroy - Calls to HeapDestroy are patched through to this function. @@ -1464,16 +1465,16 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m // BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) { - // After this heap is destroyed, the heap's address space will be unmapped - // from the process's address space. So, we'd better generate a leak report - // for this heap now, while we can still read from the memory blocks - // allocated to it. - if (!(g_vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) - g_vld.reportHeapLeaks(heap); + // After this heap is destroyed, the heap's address space will be unmapped + // from the process's address space. So, we'd better generate a leak report + // for this heap now, while we can still read from the memory blocks + // allocated to it. + if (!(g_vld.m_options & VLD_OPT_SKIP_HEAPFREE_LEAKS)) + g_vld.reportHeapLeaks(heap); - g_vld.unmapHeap(heap); + g_vld.unmapHeap(heap); - return HeapDestroy(heap); + return HeapDestroy(heap); } // _RtlAllocateHeap - Calls to RtlAllocateHeap are patched through to this @@ -1494,92 +1495,92 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) // LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) { - // Allocate the block. - LPVOID block = RtlAllocateHeap(heap, flags, size); - - if ((block == NULL) || !g_vld.enabled()) - return block; - - tls_t* tls = g_vld.getTls(); - tls->blockProcessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - return block; - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - tls->context = context; - - AllocateHeap(tls, heap, block, size); - - if (firstcall) - firstAllocCall(tls); - - return block; + // Allocate the block. + LPVOID block = RtlAllocateHeap(heap, flags, size); + + if ((block == NULL) || !g_vld.enabled()) + return block; + + tls_t* tls = g_vld.getTls(); + tls->blockProcessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; + + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + tls->context = context; + + AllocateHeap(tls, heap, block, size); + + if (firstcall) + firstAllocCall(tls); + + return block; } // HeapAlloc (kernel32.dll) call RtlAllocateHeap (ntdll.dll) LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) { - // Allocate the block. - LPVOID block = HeapAlloc(heap, flags, size); - - if ((block == NULL) || !g_vld.enabled()) - return block; - - tls_t* tls = g_vld.getTls(); - tls->blockProcessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - return block; - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - tls->context = context; - - AllocateHeap(tls, heap, block, size); - - if (firstcall) - firstAllocCall(tls); - - return block; + // Allocate the block. + LPVOID block = HeapAlloc(heap, flags, size); + + if ((block == NULL) || !g_vld.enabled()) + return block; + + tls_t* tls = g_vld.getTls(); + tls->blockProcessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; + + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + tls->context = context; + + AllocateHeap(tls, heap, block, size); + + if (firstcall) + firstAllocCall(tls); + + return block; } void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size) { - bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; + bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; - // The module that initiated this allocation is included in leak - // detection. Map this block to the specified heap. - g_vld.mapBlock(heap, block, size, crtalloc, tls->ppCallStack); + // The module that initiated this allocation is included in leak + // detection. Map this block to the specified heap. + g_vld.mapBlock(heap, block, size, crtalloc, tls->ppCallStack); } // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. @@ -1599,41 +1600,41 @@ void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SI // BYTE VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) { - BYTE status; + BYTE status; - if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls - { - context_t context; - // Record the current frame pointer. - CAPTURE_CONTEXT(context); + if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls + { + context_t context; + // Record the current frame pointer. + CAPTURE_CONTEXT(context); - // Unmap the block from the specified heap. - g_vld.unmapBlock(heap, mem, context); - } + // Unmap the block from the specified heap. + g_vld.unmapBlock(heap, mem, context); + } - status = RtlFreeHeap(heap, flags, mem); + status = RtlFreeHeap(heap, flags, mem); - return status; + return status; } // HeapFree (kernel32.dll) call RtlFreeHeap (ntdll.dll) BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) { - BOOL status; + BOOL status; - if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls - { - context_t context; - // Record the current frame pointer. - CAPTURE_CONTEXT(context); + if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls + { + context_t context; + // Record the current frame pointer. + CAPTURE_CONTEXT(context); - // Unmap the block from the specified heap. - g_vld.unmapBlock(heap, mem, context); - } + // Unmap the block from the specified heap. + g_vld.unmapBlock(heap, mem, context); + } - status = HeapFree(heap, flags, mem); + status = HeapFree(heap, flags, mem); - return status; + return status; } // _RtlReAllocateHeap - Calls to RtlReAllocateHeap are patched through to this @@ -1658,110 +1659,110 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) // LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { - LPVOID newmem; - - // Reallocate the block. - newmem = RtlReAllocateHeap(heap, flags, mem, size); - if (newmem == NULL) - return newmem; - - tls_t *tls = g_vld.getTls(); - tls->blockProcessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - return newmem; - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - ReAllocateHeap(tls, heap, mem, newmem, size, context); - - if (firstcall) - { - firstAllocCall(tls); - tls->ppCallStack = NULL; - } - - return newmem; + LPVOID newmem; + + // Reallocate the block. + newmem = RtlReAllocateHeap(heap, flags, mem, size); + if (newmem == NULL) + return newmem; + + tls_t *tls = g_vld.getTls(); + tls->blockProcessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + return newmem; + + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + ReAllocateHeap(tls, heap, mem, newmem, size, context); + + if (firstcall) + { + firstAllocCall(tls); + tls->ppCallStack = NULL; + } + + return newmem; } // for kernel32.dll LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { - LPVOID newmem; - - // Reallocate the block. - newmem = HeapReAlloc(heap, flags, mem, size); - if (newmem == NULL) - return newmem; - - tls_t *tls = g_vld.getTls(); - tls->blockProcessed = TRUE; - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - return newmem; - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context); - } - - ReAllocateHeap(tls, heap, mem, newmem, size, context); - - if (firstcall) - { - firstAllocCall(tls); - tls->ppCallStack = NULL; - } - - return newmem; + LPVOID newmem; + + // Reallocate the block. + newmem = HeapReAlloc(heap, flags, mem, size); + if (newmem == NULL) + return newmem; + + tls_t *tls = g_vld.getTls(); + tls->blockProcessed = TRUE; + bool firstcall = (tls->context.fp == 0x0); + context_t context; + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + } + else + context = tls->context; + + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + return newmem; + + if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // Begin the stack trace with the current frame. Obtain the current + // frame pointer. + firstcall = true; + CAPTURE_CONTEXT(context); + } + + ReAllocateHeap(tls, heap, mem, newmem, size, context); + + if (firstcall) + { + firstAllocCall(tls); + tls->ppCallStack = NULL; + } + + return newmem; } void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context) { - bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; + bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; - // Reset thread local flags and variables, in case any libraries called - // into while remapping the block allocate some memory. - tls->context.fp = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + // Reset thread local flags and variables, in case any libraries called + // into while remapping the block allocate some memory. + tls->context.fp = 0x0; + tls->flags &= ~VLD_TLS_CRTALLOC; - // The module that initiated this allocation is included in leak - // detection. Remap the block. - g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->ppCallStack, context); + // The module that initiated this allocation is included in leak + // detection. Remap the block. + g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->ppCallStack, context); #ifdef _DEBUG - if(tls->context.fp != 0) - __debugbreak(); + if(tls->context.fp != 0) + __debugbreak(); #endif - if (crtalloc) - tls->flags |= VLD_TLS_CRTALLOC; + if (crtalloc) + tls->flags |= VLD_TLS_CRTALLOC; - tls->context = context; + tls->context = context; } //////////////////////////////////////////////////////////////////////////////// @@ -1788,36 +1789,36 @@ void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LP // HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) { - static CoGetMalloc_t pCoGetMalloc = NULL; - - HRESULT hr = S_OK; - - HMODULE ole32; - - *imalloc = (LPMALLOC)&g_vld; - - if (pCoGetMalloc == NULL) { - // This is the first call to this function. Link to the real - // CoGetMalloc and get a pointer to the system implementation of the - // IMalloc interface. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoGetMalloc = (CoGetMalloc_t)g_vld._RGetProcAddress(ole32, "CoGetMalloc"); - hr = pCoGetMalloc(context, &g_vld.m_iMalloc); - } - else - { - // wait for different thread initialization - int c = 0; - while(g_vld.m_iMalloc == NULL && c < 10) - { - Sleep(1); - c++; - } - if (g_vld.m_iMalloc == NULL) - hr = E_INVALIDARG; - } - - return hr; + static CoGetMalloc_t pCoGetMalloc = NULL; + + HRESULT hr = S_OK; + + HMODULE ole32; + + *imalloc = (LPMALLOC)&g_vld; + + if (pCoGetMalloc == NULL) { + // This is the first call to this function. Link to the real + // CoGetMalloc and get a pointer to the system implementation of the + // IMalloc interface. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoGetMalloc = (CoGetMalloc_t)g_vld._RGetProcAddress(ole32, "CoGetMalloc"); + hr = pCoGetMalloc(context, &g_vld.m_iMalloc); + } + else + { + // wait for different thread initialization + int c = 0; + while(g_vld.m_iMalloc == NULL && c < 10) + { + Sleep(1); + c++; + } + if (g_vld.m_iMalloc == NULL) + hr = E_INVALIDARG; + } + + return hr; } // _CoTaskMemAlloc - Calls to CoTaskMemAlloc are patched through to this @@ -1833,36 +1834,36 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) // LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) { - static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; - - LPVOID block; - context_t context; - HMODULE ole32; - tls_t *tls = g_vld.getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockProcessed = FALSE; - } - - if (pCoTaskMemAlloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemAlloc. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemAlloc = (CoTaskMemAlloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pCoTaskMemAlloc(size); - - if (firstcall) - firstAllocCall(tls); - - return block; + static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; + + LPVOID block; + context_t context; + HMODULE ole32; + tls_t *tls = g_vld.getTls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockProcessed = FALSE; + } + + if (pCoTaskMemAlloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemAlloc. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoTaskMemAlloc = (CoTaskMemAlloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + block = pCoTaskMemAlloc(size); + + if (firstcall) + firstAllocCall(tls); + + return block; } // _CoTaskMemRealloc - Calls to CoTaskMemRealloc are patched through to this @@ -1880,36 +1881,36 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) // LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) { - static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; - - LPVOID block; - context_t context; - HMODULE ole32; - tls_t *tls = g_vld.getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockProcessed = FALSE; - } - - if (pCoTaskMemRealloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemRealloc. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemRealloc = (CoTaskMemRealloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = pCoTaskMemRealloc(mem, size); - - if (firstcall) - firstAllocCall(tls); - - return block; + static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; + + LPVOID block; + context_t context; + HMODULE ole32; + tls_t *tls = g_vld.getTls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockProcessed = FALSE; + } + + if (pCoTaskMemRealloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemRealloc. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoTaskMemRealloc = (CoTaskMemRealloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + block = pCoTaskMemRealloc(mem, size); + + if (firstcall) + firstAllocCall(tls); + + return block; } //////////////////////////////////////////////////////////////////////////////// @@ -1928,8 +1929,8 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) // ULONG VisualLeakDetector::AddRef () { - assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->AddRef() : 0; + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->AddRef() : 0; } // Alloc - Calls to IMalloc::Alloc end up here. This function is just a wrapper @@ -1944,27 +1945,27 @@ ULONG VisualLeakDetector::AddRef () // LPVOID VisualLeakDetector::Alloc (SIZE_T size) { - LPVOID block; - context_t context; - tls_t *tls = getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - assert(m_iMalloc != NULL); - block = (m_iMalloc) ? m_iMalloc->Alloc(size) : NULL; - - if (firstcall) - firstAllocCall(tls); - - return block; + LPVOID block; + context_t context; + tls_t *tls = getTls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + assert(m_iMalloc != NULL); + block = (m_iMalloc) ? m_iMalloc->Alloc(size) : NULL; + + if (firstcall) + firstAllocCall(tls); + + return block; } // DidAlloc - Calls to IMalloc::DidAlloc will end up here. This function is just @@ -1979,8 +1980,8 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) // INT VisualLeakDetector::DidAlloc (LPVOID mem) { - assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->DidAlloc(mem) : 0; + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->DidAlloc(mem) : 0; } // Free - Calls to IMalloc::Free will end up here. This function is just a @@ -1994,8 +1995,8 @@ INT VisualLeakDetector::DidAlloc (LPVOID mem) // VOID VisualLeakDetector::Free (LPVOID mem) { - assert(m_iMalloc != NULL); - if (m_iMalloc) m_iMalloc->Free(mem); + assert(m_iMalloc != NULL); + if (m_iMalloc) m_iMalloc->Free(mem); } // GetSize - Calls to IMalloc::GetSize will end up here. This function is just a @@ -2010,8 +2011,8 @@ VOID VisualLeakDetector::Free (LPVOID mem) // SIZE_T VisualLeakDetector::GetSize (LPVOID mem) { - assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->GetSize(mem) : 0; + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->GetSize(mem) : 0; } // HeapMinimize - Calls to IMalloc::HeapMinimize will end up here. This function @@ -2023,8 +2024,8 @@ SIZE_T VisualLeakDetector::GetSize (LPVOID mem) // VOID VisualLeakDetector::HeapMinimize () { - assert(m_iMalloc != NULL); - if (m_iMalloc) m_iMalloc->HeapMinimize(); + assert(m_iMalloc != NULL); + if (m_iMalloc) m_iMalloc->HeapMinimize(); } // QueryInterface - Calls to IMalloc::QueryInterface will end up here. This @@ -2043,8 +2044,8 @@ VOID VisualLeakDetector::HeapMinimize () // HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) { - assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->QueryInterface(iid, object) : E_UNEXPECTED; + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->QueryInterface(iid, object) : E_UNEXPECTED; } // Realloc - Calls to IMalloc::Realloc will end up here. This function is just a @@ -2063,27 +2064,27 @@ HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) // LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) { - LPVOID block; - context_t context; - tls_t *tls = getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context); - tls->context = context; - tls->blockProcessed = FALSE; - } - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - assert(m_iMalloc != NULL); - block = (m_iMalloc) ? m_iMalloc->Realloc(mem, size) : NULL; - - if (firstcall) - firstAllocCall(tls); - - return block; + LPVOID block; + context_t context; + tls_t *tls = getTls(); + + bool firstcall = (tls->context.fp == 0x0); + if (firstcall) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + CAPTURE_CONTEXT(context); + tls->context = context; + tls->blockProcessed = FALSE; + } + + // Do the allocation. The block will be mapped by _RtlReAllocateHeap. + assert(m_iMalloc != NULL); + block = (m_iMalloc) ? m_iMalloc->Realloc(mem, size) : NULL; + + if (firstcall) + firstAllocCall(tls); + + return block; } // Release - Calls to IMalloc::Release will end up here. This function is just @@ -2096,6 +2097,6 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) // ULONG VisualLeakDetector::Release () { - assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->Release() : 0; + assert(m_iMalloc != NULL); + return (m_iMalloc) ? m_iMalloc->Release() : 0; } From 82d804bd2b5f4402c9e8624441fe34425ad4e425 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 4 Feb 2012 23:12:32 +0000 Subject: [PATCH 134/321] Non-critical patch for correct installer script execution on x64 Windows Patch by sharky72 git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C74629 --- setup/build_version.bat | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup/build_version.bat b/setup/build_version.bat index 49f6b40a..f6f71eaf 100644 --- a/setup/build_version.bat +++ b/setup/build_version.bat @@ -18,6 +18,9 @@ PAUSE GOTO :EndGood :GoodPaths +SET ProgFiles=%ProgramFiles% +IF /i "%PROCESSOR_ARCHITECTURE%" == "AMD64" SET ProgFiles=%ProgramFiles(x86)% + SET BUILDTYPE=/%1 IF "%1"=="" SET BUILDTYPE=/rebuild rem IF "%1"=="build" SET BUILDTYPE= @@ -38,8 +41,8 @@ IF %ERRORLEVEL% NEQ 0 GOTO EndBad devenv /nologo vld_vs10.sln %BUILDTYPE% "Release|x64" /Project vld IF %ERRORLEVEL% NEQ 0 GOTO EndBad -if not exist "%ProgramFiles%\NSIS\makensis.exe" GOTO EndBad -"%ProgramFiles%\NSIS\makensis.exe" /V3 setup\vld-setup.nsi +if not exist "%ProgFiles%\NSIS\makensis.exe" GOTO EndBad +"%ProgFiles%\NSIS\makensis.exe" /V3 setup\vld-setup.nsi IF %ERRORLEVEL% NEQ 0 GOTO EndBad CD setup From 5e09f9bc57b36c33b25fed8cb4939dbc5c4fba06 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 12 Feb 2012 23:29:02 +0000 Subject: [PATCH 135/321] Wrong memory leaks report fixed git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C74923 --- setup/version.h | 10 +++++----- vld.cpp | 3 ++- vld_def.h | 1 + vld_hooks.cpp | 8 +++++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/setup/version.h b/setup/version.h index 8a1a2a01..bc15d614 100644 --- a/setup/version.h +++ b/setup/version.h @@ -1,9 +1,9 @@ -#define VLDVERSION L"2.2.2" -#define VERSION_NUMBER 2,2,2,0 -#define VERSION_STRING "2.2.2.0" -#define VERSION_COPYRIGHT "Copyright (C) 2005-2011" +#define VLDVERSION L"2.2.3" +#define VERSION_NUMBER 2,2,3,0 +#define VERSION_STRING "2.2.3.0" +#define VERSION_COPYRIGHT "Copyright (C) 2005-2012" #ifndef __FILE__ -!define VLD_VERSION "2.2.2" // NSIS Script +!define VLD_VERSION "2.2.3" // NSIS Script #endif diff --git a/vld.cpp b/vld.cpp index 33344f9f..e36065d2 100644 --- a/vld.cpp +++ b/vld.cpp @@ -2048,7 +2048,8 @@ void VisualLeakDetector::GlobalEnableLeakDetection () CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_INCLUDE | VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | - VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS | VLD_OPT_VALIDATE_HEAPFREE; + VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS | VLD_OPT_VALIDATE_HEAPFREE | + VLD_OPT_RELEASE_CRT_RUNTIME; UINT32 VisualLeakDetector::GetOptions() { diff --git a/vld_def.h b/vld_def.h index 1fc828bf..78d8e4de 100644 --- a/vld_def.h +++ b/vld_def.h @@ -37,6 +37,7 @@ #define VLD_OPT_REPORT_TO_STDOUT 0x0800 // If set, the memory leak report is sent to stdout. #define VLD_OPT_SKIP_HEAPFREE_LEAKS 0x1000 // If set, VLD skip HeapFree memory leaks. #define VLD_OPT_VALIDATE_HEAPFREE 0x2000 // If set, VLD verifies and reports heap consistency for HeapFree calls. +#define VLD_OPT_RELEASE_CRT_RUNTIME 0x4000 // If set, VLD treat CRT runtime as release version (use only with define VLD_FORCE_ENABLE). #define VLD_RPTHOOK_INSTALL 0 #define VLD_RPTHOOK_REMOVE 1 diff --git a/vld_hooks.cpp b/vld_hooks.cpp index d65cf942..8e0637dd 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -1431,9 +1431,11 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m if (hCallingModule == hCurrentModule) { // CRT static linking -#ifdef _DEBUG // debug runtime - (*heapit).second->flags |= VLD_HEAP_CRT_DBG; -#endif + if (!(g_vld.m_options & VLD_OPT_RELEASE_CRT_RUNTIME)) + { + // debug runtime + (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + } } else { From 5ce39dd9b68447f541899b223956ccc66131783f Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 14 Feb 2012 21:34:57 +0000 Subject: [PATCH 136/321] Copyright string updated Change log updated git-tfs-id: [https://tfs.codeplex.com/tfs/TFS07]$/vld/vld/trunk;C74992 --- CHANGES.txt | 10 +++++++++- README.html | 2 +- callstack.cpp | 2 +- callstack.h | 2 +- crtmfcpatch.h | 2 +- dllspatches.cpp | 2 +- map.h | 2 +- ntapi.cpp | 2 +- ntapi.h | 2 +- set.h | 2 +- setup/vld-setup.nsi | 2 +- tests/suite/testsuite.cpp | 2 +- tree.h | 2 +- utility.cpp | 2 +- utility.h | 2 +- vld.cpp | 2 +- vld.h | 2 +- vld.ini | 2 +- vld_def.h | 2 +- vld_hooks.cpp | 2 +- vldapi.cpp | 2 +- vldheap.cpp | 2 +- vldheap.h | 2 +- vldint.h | 2 +- 24 files changed, 32 insertions(+), 24 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index af23df28..192bc06b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,16 @@ -Visual Leak Detector (VLD) Version 2.2.2 +Visual Leak Detector (VLD) Version 2.2.3 Change Log / Release Notes +2.2.3 (15 Febrary 2012) +---------------------------- + Enhancements: + + New option VLD_OPT_RELEASE_CRT_RUNTIME added. Useful only with define VLD_FORCE_ENABLE. + + Bugs Fixed: + + Memory leaks with static linking fixed finally. + 2.2.2 (18 December 2011) ---------------------------- Bugs Fixed: diff --git a/README.html b/README.html index 11a06854..d0e72cc4 100644 --- a/README.html +++ b/README.html @@ -771,7 +771,7 @@

Additional Developers Wanted

- + diff --git a/callstack.cpp b/callstack.cpp index 3a6e2e20..63e0bb17 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Implementations -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/callstack.h b/callstack.h index de685aa4..68f69f6b 100644 --- a/callstack.h +++ b/callstack.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Definitions -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 2ca94452..46cc6a12 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CRT and MFC IAT Patch Functions Header -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/dllspatches.cpp b/dllspatches.cpp index 7a8cc0d2..4ea23ed3 100644 --- a/dllspatches.cpp +++ b/dllspatches.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/map.h b/map.h index 1dd0a599..1a4ad873 100644 --- a/map.h +++ b/map.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Lightweight STL-like Map Template -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/ntapi.cpp b/ntapi.cpp index a982fe71..e25f1416 100644 --- a/ntapi.cpp +++ b/ntapi.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Global NT API Function Pointers -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/ntapi.h b/ntapi.h index f2b3a357..1ce2d565 100644 --- a/ntapi.h +++ b/ntapi.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - NT API Definitions -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/set.h b/set.h index 6d2a9d20..4c12c97a 100644 --- a/set.h +++ b/set.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Lightweight STL-like Set Template -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 2878281a..7d4d271b 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -1,7 +1,7 @@ ################################################################################ # # Visual Leak Detector - NSIS Installation Script -# Copyright (c) 2005-2011 VLD Team +# Copyright (c) 2005-2012 VLD Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 21fe5b3b..4cad2b7b 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Test Suite -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/tree.h b/tree.h index 03e143bd..9b12be46 100644 --- a/tree.h +++ b/tree.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Red-black Tree Template -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/utility.cpp b/utility.cpp index b2a29790..7d8ab295 100644 --- a/utility.cpp +++ b/utility.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Various Utility Functions -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/utility.h b/utility.h index bb15d6fe..9b4bfdd6 100644 --- a/utility.h +++ b/utility.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Various Utility Definitions -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.cpp b/vld.cpp index e36065d2..feda6512 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.h b/vld.h index 653b41fb..29d1216a 100644 --- a/vld.h +++ b/vld.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Import Library Header -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.ini b/vld.ini index a8827665..009e06ce 100644 --- a/vld.ini +++ b/vld.ini @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Visual Leak Detector - Initialization/Configuration File -;; Copyright (c) 2005-2011 VLD Team +;; Copyright (c) 2005-2012 VLD Team ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public diff --git a/vld_def.h b/vld_def.h index 78d8e4de..252835dd 100644 --- a/vld_def.h +++ b/vld_def.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Import Library Header -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld_hooks.cpp b/vld_hooks.cpp index 8e0637dd..bb2e4b9e 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldapi.cpp b/vldapi.cpp index 283dcfd5..a35591b7 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Exported APIs -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldheap.cpp b/vldheap.cpp index bda2d0ea..13ea30d1 100644 --- a/vldheap.cpp +++ b/vldheap.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Internal C++ Heap Management -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldheap.h b/vldheap.h index 1df165b6..1d35d441 100644 --- a/vldheap.h +++ b/vldheap.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Internal C++ Heap Management Definitions -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldint.h b/vldint.h index e222fd4f..e4c7e7cd 100644 --- a/vldint.h +++ b/vldint.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Definition -// Copyright (c) 2005-2011 VLD Team +// Copyright (c) 2005-2012 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public From 1fc85446c1998f2e67d150b3275be0011b5ed679 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 30 Sep 2012 02:30:31 +0400 Subject: [PATCH 137/321] .gitignore added --- .gitignore | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2a0399ac..50cd1297 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,7 @@ -Debug -Release -C?Debug -CPP?Debug -*.ncb -*.suo -*.vcproj.*.*.user -*setup.exe \ No newline at end of file +obj/ +Debug/ +Release/ +Win32/ +Win64/ +*.vcxproj.user +*.*sdf \ No newline at end of file From a93c4aa8db4bd959952a25ba56585b2246811b5f Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Wed, 10 Oct 2012 04:08:36 +0400 Subject: [PATCH 138/321] .mailmap added --- .mailmap | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..78547429 --- /dev/null +++ b/.mailmap @@ -0,0 +1,5 @@ +Arkadiy Shapkin KindDragon +Arkadiy Shapkin +Dan Moulding +Dan Moulding +Dan Moulding From 2d6bda22a1dcd9acf2682008e64bba62f04397e8 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 14 Jan 2013 22:01:13 +0400 Subject: [PATCH 139/321] Readme converted to markdown format --- .gitignore | 4 +- README.html | 780 ------------------------ README.md | 32 + codeproject-article.html | 334 ---------- mfc_detect/vldmfc_detect_vs11.sln | 38 ++ tests/console/{README.txt => README.md} | 7 +- vld_vs11.sln | 159 +++++ 7 files changed, 236 insertions(+), 1118 deletions(-) delete mode 100644 README.html create mode 100644 README.md delete mode 100644 codeproject-article.html create mode 100644 mfc_detect/vldmfc_detect_vs11.sln rename tests/console/{README.txt => README.md} (81%) create mode 100644 vld_vs11.sln diff --git a/.gitignore b/.gitignore index 50cd1297..2c213a1e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ Release/ Win32/ Win64/ *.vcxproj.user -*.*sdf \ No newline at end of file +*.*sdf +*.suo +ipch/ diff --git a/README.html b/README.html deleted file mode 100644 index d0e72cc4..00000000 --- a/README.html +++ /dev/null @@ -1,780 +0,0 @@ - - - - - - - - - - Visual Leak Detector (Beta) - - - - - - - - -
- -

Visual Leak Detector 1.9h (Beta)

- -

Enhanced Memory Leak Detection for Visual C++

- -
- - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 00000000..a3568283 --- /dev/null +++ b/README.md @@ -0,0 +1,32 @@ +# Visual Leak Detector + +## Introduction + +Visual C++ provides built-in memory leak detection, but its capabilities are minimal at best. This memory leak detector was created as a free alternative to the built-in memory leak detector provided with Visual C++. Here are some of Visual Leak Detector's features, none of which exist in the built-in detector: + +* Provides a complete stack trace for each leaked block, including source file and line number information when available. +* Detects most, if not all, types of in-process memory leaks including COM-based leaks, and pure Win32 heap-based leaks. +* Selected modules (DLLs or even the main EXE) can be excluded from leak detection. +* Provides complete data dumps (in hex and ASCII) of leaked blocks. +* Customizable memory leak report: can be saved to a file or sent to the debugger and can include a variable level of detail. + +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 [http://vld.codeplex.com/documentation](http://vld.codeplex.com/documentation) + +## 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 at Codeplex](http://vld.codeplex.com/SourceControl/BrowseLatest) +* [Source code at GitHub](https://github.com/KindDragon/vld) + +Copyright © 2005-2013 VLD Team + + [1]: http://vld.codeplex.com/discussions + [2]: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N3QTYHP9LH6UY&lc=GB&item_name=Visual%20Leak%20Detector¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted + [3]: http://vld.codeplex.com/license \ No newline at end of file diff --git a/codeproject-article.html b/codeproject-article.html deleted file mode 100644 index e914e705..00000000 --- a/codeproject-article.html +++ /dev/null @@ -1,334 +0,0 @@ - - - -

Please choose 'View Source' in your browser to view the HTML, or -File | Save to save this file to your hard drive for editing.

-
- - - - - - -

Screenshot of Visual Studio 6.0 with Visual Leak Detector's memory leak report displayed.

-

Table of Contents

- -

Introduction

-

Visual C++ provides built-in memory leak detection, but its capabilities are minimal at best. This memory leak detector was created as a free alternative to the built-in memory leak detector provided with Visual C++. Here are some of Visual Leak Detector's features, none of which exist in the built-in detector:

-
    -
  • Provides a complete stack trace for each leaked block, including source file and line number information when available. -
  • Provides complete data dumps (in hex and ASCII) of leaked blocks. -
  • Customizable level of detail in the memory leak report.
-

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. Here are some key advantages that Visual Leak Detector has over many other free alternatives:

-
    -
  • Visual Leak Detector is cleanly packaged as an easy-to-use library. You don't need to compile its source code to use it. And you only need to make minor additions to your own source code to integrate it with your program. -
  • In addition to providing stack traces with source files, line numbers, and function names, Visual Leak Detector also provides data dumps. -
  • It works with both C++ and C programs (compatible with both new/delete and malloc/free). -
  • The full source code to the library is included and it is well documented, so it is easy to customize it to suit your needs.
-

Visual Leak Detector is licensed free of charge as a service to the Windows developer community.

-

What's New?

-

14 November 2006: A new beta version of has been posted. This version fixes a few bugs, most notably a deadlock bug and a couple of failed assertion bugs, that were identified in the 1.9c beta.

-

Note that the beta version does not have the same limitations of the 1.0 version. Whereas 1.0 can only detect leaks resulting from new or malloc, the beta can detect many different classes of leaks.

-

Please also note that the article below describes the inner workings of the 1.0 version. Because the beta version might change significantly before the next official release, the article will not be updated to reflect the design of the beta version until the official release is complete.

-

Using Visual Leak Detector

-

This section briefly describes the basics of using Visual Leak Detector (VLD). For a more in-depth discussion of the configuration options, runtime APIs, and a discussion of the more advanced usage scenarios (such as using VLD with DLLs), please see the full documentation included in the downloadable Zip files.

-

To use VLD with your project, follow these simple steps:

-
    -
  1. Copy the VLD library (*.lib) files to your Visual C++ installation's "lib" subdirectory. -
  2. Copy the VLD header files (vld.h and vldapi.h) to your Visual C++ installation's "include" subdirectory. -
  3. In the source file containing your program's main entry point, include the vld.h header file. It's best, but not absolutely required, to include this header before any other header files, except for stdafx.h. If the source file, include stdafx.h, then vld.h should be included after it. -
  4. If you are running Windows 2000 or earlier, then you will need to copy dbghelp.dll to the directory where the executable being debugged resides. -
  5. Build the debug version of your project.
-

VLD will detect memory leaks in your program whenever you run the debug version under the Visual C++ debugger. A report of all the memory leaks detected will be displayed in the debugger's output window when your program exits. Double-clicking on a source file's line number in the memory leak report will take you to that file and line in the editor window, allowing easy navigation of the code path leading up to the allocation that resulted in a memory leak.

-

Note: When you build release versions of your program, VLD will not be linked into the executable. So it is safe to leave vld.h included in your source files when doing release builds. Doing so will not result in any performance degradation or any other undesirable overhead.

-

Making a Memory Leak Detector

-

The goal of Visual Leak Detector was to build a better replacement for the memory leak detector built-in to Visual C++. With that in mind, I set out to use the same method used by the built-in detector, namely the CRT Debug Heap. But this new detector would provide enhancements -- primarily full stack traces, which can be extremely helpful for finding and fixing leaks.

-

The Built-In Detector

-

The built-in detector is pretty simple really. When a program is exiting, the CRT runs a bunch of cleanup code after main returns. If the built-in detector is enabled, then it runs a memory leak check as part of the cleanup procedure. The memory leak check simply looks at the debug heap: if there are any user blocks still allocated on the debug heap, then they must be memory leaks. The debug version of malloc stores the file and line number that allocated each block in the block's header at the time it is allocated. When the built-in detector identifies a memory leak, it simply peers inside the block header to get the file and line number. It then reports that information to the debugger where it is displayed.

-

Note that the built-in detector detects leaks without doing any monitoring of allocations or frees. It simply takes a snapshot of the heap just before the process terminates and determines if there are any leaks based on that snapshot. A snapshot of the heap only tells us if there are leaks; it does not tell us how they were leaked. Clearly, to determine the "how" we also need to obtain a stack trace. But to obtain a stack trace, we need to be able to monitor every allocation on-the-fly at runtime. This is what will distinguish our leak detector from the built-in one.

-

Allocation Hooking

-

Luckily for us, Microsoft has provided an easy way to monitor every allocation made from the debug heap: allocation hooks. An allocation hook is simply a user-supplied callback function that will be called just before each allocation is made from the debug heap. Microsoft has provided a function, _CrtSetAllocHook, which registers the allocation hook function with the debug heap. When the debug heap calls the allocation hook, one of the arguments passed is an ID number that uniquely identifies each allocation -- it's basically a serial number for each memory block allocated. There's not enough room in the memory block header for us to record any information directly in it, but we can use this unique ID number as a key to map each block to any data that we want to record.

-

Walking the Stack

-

Now that we have a way to be notified every time a block is allocated, as well as a way to uniquely identify each allocation, all that's left to do is to record the call stack each time an allocation occurs. We could conceivably attempt to unwind the stack ourselves using inline assembly. But stack frames can be organized in different ways, depending on compiler optimizations and calling conventions, so it could become complicated to do it that way. Once again, Microsoft has provided us with a tool to help us out. This time it is a function that we can call iteratively to walk the stack, frame by frame. That function is StackWalk64. It is part of the Debug Help Library (dbghelp.dll). As long as we provide it with the information that it needs to establish a starting "frame of reference", so to speak, it can examine our stack from there and reliably unwind it for us. Each time StackWalk64 is called, it gives back a STACKFRAME64 structure that can be reused as input for the next call to StackWalk64. It can be repeatedly called this way until the end of the stack is reached.

-

Initializing the Memory Leak Detector

-

We now have the beginnings of a better memory leak detector. We can monitor every allocation, and for each allocation monitored, we can obtain and record a stack trace. The only challenge that remains is to ensure that the allocation hook function is registered with the debug heap as soon as the program starts executing. This can be very simply solved by creating a global instance of a C++ class object. The constructor will run when the program is initialized. From the constructor, we can call _CrtSetAllocHook to register our allocation hook function. But wait, what if the program we are debugging already has other global C++ class objects that allocate memory? How can we ensure that our constructor will be called first, and that our allocation hook function will be installed before any other global objects are constructed? Unfortunately, the C++ specification does not spell out any rules for deciding in which order to construct global objects. So there are no absolute guarantees that our constructor will be called first. But we can come very close to guaranteeing it. We can leverage a compiler-specific preprocessor directive that explicitly tells the compiler to ensure that our global variable is constructed as soon as possible: #pragma init_seg (compiler). This directive tells the compiler to place our global object in the "compiler" initialization segment. Objects in this segment are the first to be constructed. Next, objects in the "library" segment are constructed, and objects in the "user" segment are constructed last. The "user" segment is the default segment for global objects. Generally speaking, no normal user objects should ever be placed in the "compiler" segment, so this provides a reasonable amount of certainty that our global object will be constructed before any user objects.

-

Detecting Memory Leaks

-

Because global objects are destroyed in the inverse order they are constructed, our global object will be destroyed after any user objects. We can then examine the heap, just like the built-in detector does. If we find a block on the heap that has not been freed, it is a leak and we can look up its call stack using the unique ID number recorded by our allocation hook function. An STL map would work fine here for mapping the ID number to the call stacks. I didn't use an STL map because I wanted my library to be compatible with both new and old versions of Visual C++. The STL from older versions is incompatible with the newer versions, so I couldn't use STL components. But the good news is that this gave me the opportunity to create a data structure similar in concept to the STL map, but with specific optimizations for use with my memory leak detector.

-

Do you remember that the built-in leak detector peers inside the memory block to get the name of the file and the line number where the block was allocated? Well, all we have for our call stack is a bunch of program addresses. Dumping all those hex numbers to the debugger wouldn't be of much use. To make those addresses more meaningful, we need to translate them to human readable information: files and line numbers (and function names too). Once again, Microsoft comes through with the tools that will help us do our job: the symbol handler APIs. Like StackWalk64, they also happen to be part of the Debug Help Library. I won't dwell on them in detail here, because there are a lot of them and they're pretty simple to use. They don't require as much ingenuity to use as StackWalk64 does. We can use two of the symbol handler APIs to get the filenames, line numbers, and function names that we want. The aptly named SymGetLineFromAddr64 translates addresses into source filenames and line numbers. Its sister API, SymFromAddr translates addresses into symbol names. For program addresses, which are what we have, the corresponding symbol name will be the name of the function containing that program address.

-

Key Parts of the Source Code

-

In case you got bored with the above section and skipped ahead, I'll summarize it here. In a nutshell, this memory leak detector works like this:

-
    -
  1. A global object is automatically constructed. It is the first object constructed. The constructor registers our allocation hook function. -
  2. Every allocation eventually calls our allocation hook function. The allocation hook function obtains and records the call stack for each allocation. The call stack information is recorded in a specialized STL-like map. -
  3. When the program terminates, the global object is the last object destroyed. It examines the heap and identifies leaks. Leaked blocks are looked up in the map and matched with their corresponding call stack. The resulting data is sent to the debugger to be displayed.
-

Step 1: Registering the Allocation Hook

-

Here is the VisualLeakDetector class constructor. Note the call to _CrtSetAllocHook. This is where our callback function, allochook, is registered with the debug heap. The call to linkdebughelplibrary performs an explicit dynamic link with the Debug Help Library (dbghelp.dll). Because VLD is itself a library, implicitly linking with the Debug Help Library through the import library dbghelp.lib is undesirable; it would make the VLD library dependent on dbghelp.lib at link-time. dbghelp.lib will not be present on many Windows computers and it's not redistributable, so we need to link with the DLL at runtime in order to bypass the import library. There is a lot of other stuff going on in here as well, but most of it has to do with custom configuration options that VLD supports.

// Constructor - Dynamically links with the Debug Help Library and installs the
-//   allocation hook function so that the C runtime's debug heap manager will
-//   call the hook function for every heap request.
-//
-VisualLeakDetector::VisualLeakDetector ()
-{
-    // Initialize private data.
-    m_mallocmap    = new BlockMap;
-    m_process      = GetCurrentProcess();
-    m_selftestfile = __FILE__;
-    m_status       = 0x0;
-    m_thread       = GetCurrentThread();
-    m_tlsindex     = TlsAlloc();
-
-    if (_VLD_configflags & VLD_CONFIG_SELF_TEST) {
-        // Self-test mode has been enabled.
-        // Intentionally leak a small amount of
-        // memory so that memory leak self-checking can be verified.
-        strncpy(new char [21], "Memory Leak Self-Test", 21);
-        m_selftestline = __LINE__;
-    }
-
-    if (m_tlsindex == TLS_OUT_OF_INDEXES) {
-        report("ERROR: Visual Leak Detector:" 
-               " Couldn't allocate thread local storage.\n");
-    }
-    else if (linkdebughelplibrary()) {
-        // Register our allocation hook function with the debug heap.
-        m_poldhook = _CrtSetAllocHook(allochook);
-        report("Visual Leak Detector " 
-               "Version "VLD_VERSION" installed ("VLD_LIBTYPE").\n");
-        reportconfig();
-        if (_VLD_configflags & VLD_CONFIG_START_DISABLED) {
-            // Memory leak detection will initially be disabled.
-            m_status |= VLD_STATUS_NEVER_ENABLED;
-        }
-
-        m_status |= VLD_STATUS_INSTALLED;
-        return;
-    }
-    
-    report("Visual Leak Detector is NOT installed!\n");
-}
-

Step 2: Walking the Stack

-

Here is the function responsible for obtaining call stacks. This is perhaps the trickiest part of the entire program. Setting up for the first call to StackWalk64 is where the tricky bit is. To start the stack trace, StackWalk64 needs to know exactly where on the stack to begin walking. It never assumes that we want to start tracing from the current stack frame. This requires that we provide it with the address of the current frame, as well as the current program address. I've seen other examples that attempt to get this information by calling GetThreadContext to retrieve the current thread's context, which would contain both of the required addresses. But, as its documentation clearly states, GetThreadContext can't be relied upon to get valid information for a running thread. By definition, this means that GetThreadContext can't get a valid context for the current thread. A better approach is to get the required addresses directly, and the only way to do that is with inline assembly.

-

Obtaining the address of the current frame is easy: it's stored in a CPU register (EBP) that we can directly read it from. The program address is a little harder to obtain. Though there is a CPU register (EIP) that always contains the current program address, on Intel x86 CPUs, it can't be read by software. But we can get the same address in a round-about way, by calling another function and from within that function obtaining the return address. The return address is the same as the program address that called the function. For this, I've created a separate function, getprogramcounterx86x64. Since we're already doing inline assembly, we could write a simple function call in assembly, instead of writing another C++ function, but to keep it easier to understand, I've used C++ wherever it's possible to do so.

-

In the following code, pStackWalk64, pSymFunctionTableAccess64 and pSymGetModuleBase64 are all pointers to the functions exported by dbghelp.dll.

// getstacktrace - Traces the stack, starting from this function, as far
-//   back as possible.
-//
-//  - callstack (OUT): Pointer to an empty CallStack to be populated with
-//    entries from the stack trace.
-//
-//  Return Value:
-//
-//    None.
-//
-void VisualLeakDetector::getstacktrace (CallStack *callstack)
-{
-    DWORD        architecture;
-    CONTEXT      context;
-    unsigned int count = 0;
-    STACKFRAME64 frame;
-    DWORD_PTR    framepointer;
-    DWORD_PTR    programcounter;
-
-    // Get the required values for initialization of the STACKFRAME64 structure
-    // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame.
-#if defined(_M_IX86) || defined(_M_X64)
-    architecture = X86X64ARCHITECTURE;
-    programcounter = getprogramcounterx86x64();
-    __asm mov [framepointer], BPREG // Get the frame pointer (aka base pointer)
-#else
-// If you want to retarget Visual Leak Detector to another processor
-// architecture then you'll need to provide architecture-specific code to
-// retrieve the current frame pointer and program counter in order to initialize
-// the STACKFRAME64 structure below.
-#error "Visual Leak Detector is not supported on this architecture."
-#endif // defined(_M_IX86) || defined(_M_X64)
-
-    // Initialize the STACKFRAME64 structure.
-    memset(&frame, 0x0, sizeof(frame));
-    frame.AddrPC.Offset    = programcounter;
-    frame.AddrPC.Mode      = AddrModeFlat;
-    frame.AddrFrame.Offset = framepointer;
-    frame.AddrFrame.Mode   = AddrModeFlat;
-
-    // Walk the stack.
-    while (count < _VLD_maxtraceframes) {
-        count++;
-        if (!pStackWalk64(architecture, m_process, m_thread, 
-             &frame, &context, NULL, pSymFunctionTableAccess64, 
-             pSymGetModuleBase64, NULL)) {
-            // Couldn't trace back through any more frames.
-            break;
-        }
-        if (frame.AddrFrame.Offset == 0) {
-            // End of stack.
-            break;
-        }
-
-        // Push this frame's program counter onto the provided CallStack.
-        callstack->push_back((DWORD_PTR)frame.AddrPC.Offset);
-    }
-}
-

And here is the function that retrieves the EIP register. Again, this has to be done as a separate function call because there is no way for the software to directly read the EIP register. But the same value can be obtained by making a function call, and then from within the called function getting the return address. The return address is the program address that made the function call, and it is pushed onto the stack when the function call is made. We get it by copying it from the stack.

// getprogramcounterx86x64 - Helper function that retrieves the program counter
-//   for getstacktrace() on Intel x86 or x64 architectures.
-//
-//  Note: Inlining of this function must be disabled. The whole purpose of this
-//    function's existence depends upon it being a *called* function.
-//
-//  Return Value:
-//
-//    Returns the caller's program address.
-//
-#if defined(_M_IX86) || defined(_M_X64)
-#pragma auto_inline(off)
-DWORD_PTR VisualLeakDetector::getprogramcounterx86x64 ()
-{
-    DWORD_PTR programcounter;
-
-    // Get the return address out of the current stack frame
-    __asm mov AXREG, [BPREG + SIZEOFPTR]
-    // Put the return address into the variable we'll return
-    __asm mov [programcounter], AXREG
-
-    return programcounter;
-}
-#pragma auto_inline(on)
-#endif // defined(_M_IX86) || defined(_M_X64)
-

Step 3: Generating a Better Memory Leak Report

-

Finally, here is the function that converts the program addresses obtained while walking the stack into useful symbol names. Note that the address-to-symbol conversion code is only run if memory leaks are detected. This avoids having to do symbol lookups on-the-fly while the program is running, which would add considerable additional overhead. Not to mention that it just doesn't make sense to store (large) symbol names for later retrieval when you can store (small) addresses instead.

-

The CRT doesn't expose any documented method for gaining access to its internal linked-list of allocated memory blocks. This linked list is what is used by the built-in detector for taking a "snapshot" of the heap to determine if there are any memory leaks. I've come up with a very simple trick to gain access to the list. Any time a new memory block is allocated, it happens to be placed at the beginning of the linked-list. So, to get a pointer to the head of the list, I just allocate a temporary memory block. That block's address can be converted to the address of the containing _CrtMemBlockHeader structure and now I have a pointer to the beginning of the linked list.

-

In the following code, pSymSetOptions, pSymInitialize, pSymGetLineFromAddr64, and pSymFromAddr are all pointers to the functions exported by dbghelp.dll. The report function is just a custom wrapper around OutputDebugString which sends messages to the debugger for display in the debugger's output window.

-

This function is quite long. To cut down on clutter, I've removed all of the uninteresting and trivial parts. To see this function in its entirety, please download the source ZIP file.

// reportleaks - Generates a memory leak report when the program terminates if
-//   leaks were detected. The report is displayed in the debug output window.
-//
-//  Return Value:
-//
-//    None.
-//
-void VisualLeakDetector::reportleaks ()
-{
-
-    ...
-
-    // Initialize the symbol handler. We use it for obtaining source file/line
-    // number information and function names for the memory leak report.
-    symbolpath = buildsymbolsearchpath();
-    pSymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME);
-    if (!pSymInitialize(m_process, symbolpath, TRUE)) {
-        report("WARNING: Visual Leak Detector: The symbol handler" 
-               " failed to initialize (error=%lu).\n"
-               "    Stack traces will probably not be available" 
-               " for leaked blocks.\n", GetLastError());
-    }
-
-    ...
-
-#ifdef _MT
-    _mlock(_HEAP_LOCK);
-#endif // _MT
-    pheap = new char;
-    pheader = pHdr(pheap)->pBlockHeaderNext;
-    delete pheap;
-    while (pheader) {
-
-        ...
-
-        callstack = m_mallocmap->find(pheader->lRequest);
-        if (callstack) {
-
-            ...
-
-            // Iterate through each frame in the call stack.
-            for (frame = 0; frame < callstack->size(); frame++) {
-                // Try to get the source file and line number associated with
-                // this program counter address.
-                if (pSymGetLineFromAddr64(m_process, 
-                   (*callstack)[frame], &displacement, &sourceinfo)) {
-
-                    ...
-
-                }
-
-                // Try to get the name of the function containing this program
-                // counter address.
-                if (pSymFromAddr(m_process, (*callstack)[frame], 
-                    &displacement64, pfunctioninfo)) {
-                    functionname = pfunctioninfo->Name;
-                }
-                else {
-                    functionname = "(Function name unavailable)";
-                }
-
-                ...
-
-            }
-
-            ...
-
-        }
-        pheader = pheader->pBlockHeaderNext;
-    }
-#ifdef _MT
-    _munlock(_HEAP_LOCK);
-#endif // _MT
-
-    ...
-
-}
-

Known Bugs and Restrictions

-

There are currently no known bugs in the latest release, but there are some known restrictions:

-
    -
  • VLD does not detect COM leaks, out-of-process resource leaks, or any other types of memory leaks that are not associated with the CRT heap. In simpler terms, VLD only detects memory leaks that are the result of calls to new or malloc. Keep in mind that VLD was created as an alternative to the built-in memory leak detector, which also only detects leaks from new and malloc. -
  • VLD is not compatible with version 6.5 of the Debug Help Library (dbghelp.dll). The recommended version of dbghelp.dll to use with VLD is 6.3. Version 6.3 is included in the VLD distribution. -
  • The pre-compiled libraries included in the VLD distribution may not be compatible with Visual Studio 2005. If you need to use VLD with Visual Studio 2005, building VLD from source in Visual Studio 2005 should create compatible libraries.
-

Credits

-
    -
  • Thanks to Alexandre Nikolov for quickly discovering the bug in 0.9e and helping to slap together a quick fix. -
  • Credit for the idea of how to make VLD's global class VisualLeakDetector object get constructed before any other user global objects goes to cmk. Thanks cmk! -
  • Thanks to Nitrogenycs (aka Matthias) for discovering the VLD_MAX_DATA_DUMP infinite loop bug. -
  • Thanks to hsvcs (aka Holger) for discovering the VLD_MAX_DATA_DUMP compilation bug. -
  • Thanks to Don Clugston for pointing out to me that people sometimes do build optimized debug executables, and that I need to watch out for that.
-

References

-

Here are some links to useful related articles and resources:

- -

License

-

Visual Leak Detector is distributed under the terms of the GNU Lesser General Public License. See the documentation included in the downloadable ZIP files for detailed licensing information.

-

History

-

This list gives a brief overview of the changes made from release to release. For a detailed description of changes made in each release, please see the change log, CHANGES.txt, in the downloadable ZIP files.

-
    -
  • 14 November 2006: Version 1.9d beta - Fixed a deadlock bug that may occur in multithreaded programs. Also fixed a two failed assertion bugs.
    • -
  • 6 November 2006: Version 1.9c beta - New installer to make starting out with VLD easier. All known incompatibilities with Visual Studio 2005 have been fixed. -
  • 9 March 2006: Version 1.9a beta - Entirely new leak detection engine detects most, if not all, in-process memory leaks not just leaks from new or malloc. Added many other new convenience features as well. -
  • 5 August 2005: Version 1.0 - A couple of new features have been added, and a few bugs have been fixed. Major revisions have been made to this article to bring it up to date with respect to the 1.0 release. -
  • 2 May 2005: Version 0.9i beta - This release fixed several bugs. It also includes support for Windows x64. -
  • 22 April 2005: Version 0.9h beta - This release contains a crucial fix for an internal logic bug in version 0.9g. -
  • 22 April 2005: Version 0.9g beta - This release contains a vastly improved internal search/sort algorithm that results in a significant overall performance boost. -
  • 13 April 2005: Version 0.9f beta - This provides a quick fix for a bug in 0.9e that can cause crashes. -
  • 12 April 2005: Version 0.9e beta - Solves compatibility problems between the pre-built libraries and Visual Studio .NET by removing the use of STL components (the pre-built libraries are built in Visual Studio 6.0 and the STL is not compatible between .NET and 6.0). -
  • 30 March 2005: Version 0.9d beta - First release of VLD as a set of pre-built libraries. -
  • 17 March 2005: Version 0.9c beta - Fixed a compilation error if VLD_MAX_DATA_DUMP is defined. -
  • 15 March 2005: Version 0.9b beta - Improved ability to detect leaks in global C++ object constructors. -
  • 12 March 2005: Version 0.9a beta - Initial public release.
- - - - \ No newline at end of file diff --git a/mfc_detect/vldmfc_detect_vs11.sln b/mfc_detect/vldmfc_detect_vs11.sln new file mode 100644 index 00000000..74958d5e --- /dev/null +++ b/mfc_detect/vldmfc_detect_vs11.sln @@ -0,0 +1,38 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect", "vldmfc_detect.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug (Unicode)|Win32 = Debug (Unicode)|Win32 + Debug (Unicode)|x64 = Debug (Unicode)|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release (Unicode)|Win32 = Release (Unicode)|Win32 + Release (Unicode)|x64 = Release (Unicode)|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|Win32.ActiveCfg = Release (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|Win32.Build.0 = Release (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|x64.ActiveCfg = Release (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|x64.Build.0 = Release (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/tests/console/README.txt b/tests/console/README.md similarity index 81% rename from tests/console/README.txt rename to tests/console/README.md index 958ea8b3..c898bd82 100644 --- a/tests/console/README.txt +++ b/tests/console/README.md @@ -1,6 +1,7 @@ -Visual Leak Detector Example Console Application (Version 1.0.1) +Visual Leak Detector Example Console Application +================================================ - Example Program Using Visual Leak Detector in a Console Application +Example Program Using Visual Leak Detector in a Console Application About The Example Program: @@ -33,4 +34,4 @@ program the memory was allocated and how it got there. Documentation: -------------- -See the README.html file for the complete Visual Leak Detector documentation. +See the [http://vld.codeplex.com/documentation](http://vld.codeplex.com/documentation) for the complete Visual Leak Detector documentation. diff --git a/vld_vs11.sln b/vld_vs11.sln new file mode 100644 index 00000000..e040f53a --- /dev/null +++ b/vld_vs11.sln @@ -0,0 +1,159 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" + ProjectSection(ProjectDependencies) = postProject + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug(Release)|Win32 = Debug(Release)|Win32 + Debug(Release)|x64 = Debug(Release)|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + EndGlobalSection +EndGlobal From 098db1c9f5537c173dd4190c6005813dbf603604 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 14 Jan 2013 22:02:06 +0400 Subject: [PATCH 140/321] Copyright string updated --- callstack.cpp | 4 ++-- callstack.h | 2 +- crtmfcpatch.h | 2 +- dllspatches.cpp | 2 +- map.h | 2 +- ntapi.cpp | 2 +- ntapi.h | 2 +- set.h | 2 +- setup/version.h | 2 +- setup/vld-setup.nsi | 2 +- tests/suite/testsuite.cpp | 2 +- tree.h | 2 +- utility.cpp | 2 +- utility.h | 2 +- vld.cpp | 2 +- vld.h | 2 +- vld.ini | 2 +- vld_def.h | 2 +- vld_hooks.cpp | 2 +- vldapi.cpp | 2 +- vldheap.cpp | 2 +- vldheap.h | 2 +- vldint.h | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 63e0bb17..78f689b1 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Implementations -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -84,8 +84,8 @@ CallStack* CallStack::Create() result = new FastCallStack(); } return result; - } + // operator == - Equality operator. Compares the CallStack to another CallStack // for equality. Two CallStacks are equal if they are the same size and if // every frame in each is identical to the corresponding frame in the other. diff --git a/callstack.h b/callstack.h index 68f69f6b..8f12f171 100644 --- a/callstack.h +++ b/callstack.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Definitions -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 46cc6a12..d7ff5d7b 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CRT and MFC IAT Patch Functions Header -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/dllspatches.cpp b/dllspatches.cpp index 4ea23ed3..fd016b02 100644 --- a/dllspatches.cpp +++ b/dllspatches.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/map.h b/map.h index 1a4ad873..c1987c0e 100644 --- a/map.h +++ b/map.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Lightweight STL-like Map Template -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/ntapi.cpp b/ntapi.cpp index e25f1416..79b449b3 100644 --- a/ntapi.cpp +++ b/ntapi.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Global NT API Function Pointers -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/ntapi.h b/ntapi.h index 1ce2d565..ddd8f54e 100644 --- a/ntapi.h +++ b/ntapi.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - NT API Definitions -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/set.h b/set.h index 4c12c97a..dda1905d 100644 --- a/set.h +++ b/set.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Lightweight STL-like Set Template -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/setup/version.h b/setup/version.h index bc15d614..df110df7 100644 --- a/setup/version.h +++ b/setup/version.h @@ -2,7 +2,7 @@ #define VLDVERSION L"2.2.3" #define VERSION_NUMBER 2,2,3,0 #define VERSION_STRING "2.2.3.0" -#define VERSION_COPYRIGHT "Copyright (C) 2005-2012" +#define VERSION_COPYRIGHT "Copyright (C) 2005-2013" #ifndef __FILE__ !define VLD_VERSION "2.2.3" // NSIS Script diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi index 7d4d271b..7c332755 100644 --- a/setup/vld-setup.nsi +++ b/setup/vld-setup.nsi @@ -1,7 +1,7 @@ ################################################################################ # # Visual Leak Detector - NSIS Installation Script -# Copyright (c) 2005-2012 VLD Team +# Copyright (c) 2005-2013 VLD Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 4cad2b7b..0770abdb 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Test Suite -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/tree.h b/tree.h index 9b12be46..0a997e65 100644 --- a/tree.h +++ b/tree.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Red-black Tree Template -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/utility.cpp b/utility.cpp index 7d8ab295..dfdbcf06 100644 --- a/utility.cpp +++ b/utility.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Various Utility Functions -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/utility.h b/utility.h index 9b4bfdd6..8d1d8959 100644 --- a/utility.h +++ b/utility.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Various Utility Definitions -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.cpp b/vld.cpp index feda6512..c96bf453 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.h b/vld.h index 29d1216a..a24a09f9 100644 --- a/vld.h +++ b/vld.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Import Library Header -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.ini b/vld.ini index 009e06ce..b2d031f4 100644 --- a/vld.ini +++ b/vld.ini @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Visual Leak Detector - Initialization/Configuration File -;; Copyright (c) 2005-2012 VLD Team +;; Copyright (c) 2005-2013 VLD Team ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public diff --git a/vld_def.h b/vld_def.h index 252835dd..93bbfaf1 100644 --- a/vld_def.h +++ b/vld_def.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Import Library Header -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld_hooks.cpp b/vld_hooks.cpp index bb2e4b9e..68d0e3cf 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldapi.cpp b/vldapi.cpp index a35591b7..0fbc6194 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Exported APIs -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldheap.cpp b/vldheap.cpp index 13ea30d1..73a19aa8 100644 --- a/vldheap.cpp +++ b/vldheap.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Internal C++ Heap Management -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldheap.h b/vldheap.h index 1d35d441..be884a69 100644 --- a/vldheap.h +++ b/vldheap.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Internal C++ Heap Management Definitions -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldint.h b/vldint.h index e4c7e7cd..637f2a07 100644 --- a/vldint.h +++ b/vldint.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Definition -// Copyright (c) 2005-2012 VLD Team +// Copyright (c) 2005-2013 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public From 75b61b48e375bd813cdfee2f189eac0df27af733 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 29 Apr 2013 03:24:17 +0400 Subject: [PATCH 141/321] LdrLoadDll hook fixed in Windows 8 --- .gitignore | 2 +- ntapi.cpp | 1 + ntapi.h | 2 ++ vld.cpp | 35 ++++++++++++++++++++++++++++++++++- vldint.h | 4 +++- 5 files changed, 41 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2c213a1e..0d85dedc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ obj/ Debug/ Release/ Win32/ -Win64/ +x64/ *.vcxproj.user *.*sdf *.suo diff --git a/ntapi.cpp b/ntapi.cpp index 79b449b3..0e91f87a 100644 --- a/ntapi.cpp +++ b/ntapi.cpp @@ -28,6 +28,7 @@ // Global function pointers for explicit dynamic linking with NT APIs that can't // be load-time linked (there is no import library available for these). LdrLoadDll_t LdrLoadDll; +LdrLoadDllWin8_t LdrLoadDllWin8; RtlAllocateHeap_t RtlAllocateHeap; RtlFreeHeap_t RtlFreeHeap; RtlReAllocateHeap_t RtlReAllocateHeap; diff --git a/ntapi.h b/ntapi.h index ddd8f54e..8a8dd937 100644 --- a/ntapi.h +++ b/ntapi.h @@ -45,6 +45,7 @@ struct unicodestring_t { // Function pointer types for explicit dynamic linking with functions that can't // be load-time linked (no import library is available for these). typedef NTSTATUS (__stdcall *LdrLoadDll_t) (LPWSTR, ULONG, unicodestring_t *, PHANDLE); +typedef NTSTATUS (__stdcall *LdrLoadDllWin8_t) (DWORD_PTR, PULONG, unicodestring_t *, PHANDLE); typedef LPVOID (__stdcall *RtlAllocateHeap_t) (HANDLE, DWORD, SIZE_T); typedef BYTE (__stdcall *RtlFreeHeap_t) (HANDLE, DWORD, LPVOID); typedef LPVOID (__stdcall *RtlReAllocateHeap_t) (HANDLE, DWORD, LPVOID, SIZE_T); @@ -52,6 +53,7 @@ typedef LPVOID (__stdcall *RtlReAllocateHeap_t) (HANDLE, DWORD, LPVOID, SIZE_T); // Provide forward declarations for the NT APIs for any source files that // include this header. extern LdrLoadDll_t LdrLoadDll; +extern LdrLoadDllWin8_t LdrLoadDllWin8; extern RtlAllocateHeap_t RtlAllocateHeap; extern RtlFreeHeap_t RtlFreeHeap; extern RtlReAllocateHeap_t RtlReAllocateHeap; diff --git a/vld.cpp b/vld.cpp index c96bf453..c68ea782 100644 --- a/vld.cpp +++ b/vld.cpp @@ -81,6 +81,19 @@ BOOL IsWin7OrBetter() return FALSE; } +BOOL IsWin8OrBetter() +{ + OSVERSIONINFOEX info = { sizeof(OSVERSIONINFOEX) }; + GetVersionEx((LPOSVERSIONINFO)&info); + if (info.dwMajorVersion > 6) + return TRUE; + + if (info.dwMajorVersion == 6 && info.dwMinorVersion >= 2) + return TRUE; + + return FALSE; +} + // Constructor - Initializes private data, loads configuration options, and // attaches Visual Leak Detector to all other modules loaded into the current // process. @@ -129,7 +142,15 @@ VisualLeakDetector::VisualLeakDetector () HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); if (ntdll) { - LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); + if (!IsWin8OrBetter()) + { + LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); + } + else + { + LdrLoadDllWin8 = (LdrLoadDllWin8_t)GetProcAddress(ntdll, "LdrLoadDll"); + ldrLoadDllPatch[0].replacement = VisualLeakDetector::_LdrLoadDllWin8; + } RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); @@ -1791,6 +1812,18 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod return status; } +NTSTATUS VisualLeakDetector::_LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, unicodestring_t *modulename, + PHANDLE modulehandle) +{ + // Load the DLL. + NTSTATUS status = LdrLoadDllWin8(reserved, flags, modulename, modulehandle); + + if (STATUS_SUCCESS == status) + g_vld.RefreshModules(); + + return status; +} + VOID VisualLeakDetector::RefreshModules() { if (m_options & VLD_OPT_VLDOFF) diff --git a/vldint.h b/vldint.h index 637f2a07..8e984158 100644 --- a/vldint.h +++ b/vldint.h @@ -271,7 +271,9 @@ class VisualLeakDetector : public IMalloc VOID ResolveCallstacks(); static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle); + PHANDLE modulehandle); + static NTSTATUS __stdcall _LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, unicodestring_t *modulename, + PHANDLE modulehandle); static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); private: //////////////////////////////////////////////////////////////////////////////// From 8d636a4ef5dae48f2660fbe8f9a8a1a74859ec39 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 29 Apr 2013 03:45:23 +0400 Subject: [PATCH 142/321] Version changed to 2.3 --- CHANGES.txt | 7 ++++++- setup/version.h | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 192bc06b..f5a06015 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,13 @@ -Visual Leak Detector (VLD) Version 2.2.3 +Visual Leak Detector (VLD) Version 2.3.0 Change Log / Release Notes +2.3 (29 April 2013) +---------------------------- + Enhancements: + + Windows 8 support added. + 2.2.3 (15 Febrary 2012) ---------------------------- Enhancements: diff --git a/setup/version.h b/setup/version.h index df110df7..9abdad05 100644 --- a/setup/version.h +++ b/setup/version.h @@ -1,9 +1,9 @@ -#define VLDVERSION L"2.2.3" -#define VERSION_NUMBER 2,2,3,0 -#define VERSION_STRING "2.2.3.0" +#define VLDVERSION L"2.3" +#define VERSION_NUMBER 2,3,0,0 +#define VERSION_STRING "2.3.0.0" #define VERSION_COPYRIGHT "Copyright (C) 2005-2013" #ifndef __FILE__ -!define VLD_VERSION "2.2.3" // NSIS Script +!define VLD_VERSION "2.3" // NSIS Script #endif From b3c827666dcc563317f5ad82f79870e7baf048ed Mon Sep 17 00:00:00 2001 From: "Jeffrey L. Deal" Date: Mon, 15 Apr 2013 11:52:46 -0500 Subject: [PATCH 143/321] Fix for Issue Item Number: 10098 --- vld.cpp | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/vld.cpp b/vld.cpp index c68ea782..a301b3d1 100644 --- a/vld.cpp +++ b/vld.cpp @@ -975,18 +975,31 @@ tls_t* VisualLeakDetector::getTls () assert(GetLastError() == ERROR_SUCCESS); if (tls == NULL) { - // This thread's thread local storage structure has not been allocated. - tls = new tls_t; + DWORD threadId = GetCurrentThreadId(); + + { + CriticalSectionLocker cs(m_tlsLock); + TlsMap::Iterator it = m_tlsMap->find(threadId); + if(it == m_tlsMap->end()) { + // This thread's thread local storage structure has not been allocated. + tls = new tls_t; + + // Add this thread's TLS to the TlsSet. + m_tlsMap->insert(threadId,tls); + } + else { + // Already had a thread with this ID + tls = (*it).second; + } + } + TlsSetValue(m_tlsIndex, tls); ZeroMemory(&tls->context, sizeof(tls->context)); tls->flags = 0x0; tls->oldFlags = 0x0; - tls->threadId = GetCurrentThreadId(); + tls->threadId = threadId; tls->ppCallStack = NULL; - - // Add this thread's TLS to the TlsSet. - CriticalSectionLocker cs(m_tlsLock); - m_tlsMap->insert(tls->threadId,tls); + tls->blockProcessed = FALSE; } return tls; From 84d8146614b5a7e7ca7d087170402c028b5af4ba Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 29 Apr 2013 04:14:32 +0400 Subject: [PATCH 144/321] Change list updated --- .gitignore | 1 + CHANGES.txt | 3 +++ vldint.h | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0d85dedc..34553ac5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ x64/ *.*sdf *.suo ipch/ +setup/vld-*-setup.exe diff --git a/CHANGES.txt b/CHANGES.txt index f5a06015..bb51dc83 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,9 @@ Visual Leak Detector (VLD) Version 2.3.0 Enhancements: + Windows 8 support added. + Bugs Fixed: + + Memory leaks with duplicate thread id fixed (thanks to jlddodger). + 2.2.3 (15 Febrary 2012) ---------------------------- Enhancements: diff --git a/vldint.h b/vldint.h index 8e984158..3f1fc0e3 100644 --- a/vldint.h +++ b/vldint.h @@ -271,9 +271,9 @@ class VisualLeakDetector : public IMalloc VOID ResolveCallstacks(); static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle); - static NTSTATUS __stdcall _LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle); + PHANDLE modulehandle); + static NTSTATUS __stdcall _LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, unicodestring_t *modulename, + PHANDLE modulehandle); static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); private: //////////////////////////////////////////////////////////////////////////////// From e9d284656cd1e9d3b525ea9d23b545cb61f62b6c Mon Sep 17 00:00:00 2001 From: chrisJohnson_cp Date: Sat, 4 May 2013 06:20:44 -0600 Subject: [PATCH 145/321] Refactored the .vcxproj file to reduce massive amounts of duplication. For each and every one of the 4 build configurations there are many duplicate build settings. Each contained it's own build settings and was differentiated from other groups by a condition. This is absolutely not necassary. Some build settings do not change no matter what the configuration. For instance VLD is unicode compliant, so that should not change no matter whether the configuration is Debug, Release, or Win32 or x64. Tested the changes by building Debug|x64, which build passed. This is my first commit using Visual Studio's Git extension. --- vld.vcxproj | 462 +++++++++++++++++++++------------------------------- 1 file changed, 188 insertions(+), 274 deletions(-) diff --git a/vld.vcxproj b/vld.vcxproj index 621401de..2358d0f5 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -1,277 +1,191 @@  - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - vld - SAK - SAK - SAK - SAK - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - MinimumRecommendedRules.ruleset - - - MinimumRecommendedRules.ruleset - - - MinimumRecommendedRules.ruleset - - - MinimumRecommendedRules.ruleset - - - $(ProjectName)_x86 - $(ProjectName)_x86 - $(ProjectName)_x64 - $(ProjectName)_x64 - - - - Disabled - setup;%(AdditionalIncludeDirectories) - _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level4 - false - EditAndContinue - true - - - true - 0x03200000 - false - %(AdditionalLibraryDirectories) - psapi.lib;%(AdditionalDependencies) - - - - - vld.dll.dependency.x86.manifest - - - copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y - - - setup - - - - - X64 - - - Disabled - setup;%(AdditionalIncludeDirectories) - _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level4 - false - ProgramDatabase - - - true - 0x03200000 - false - MachineX64 - %(AdditionalLibraryDirectories) - psapi.lib;%(AdditionalDependencies) - - - - - vld.dll.dependency.x64.manifest - - - copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - setup - - - - - Full - Speed - true - setup;%(AdditionalIncludeDirectories) - NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - Use - OldStyle - false - - - true - true - true - 0x03200000 - false - %(AdditionalLibraryDirectories) - %(AdditionalDependencies) - - - - - vld.dll.dependency.x86.manifest - - - copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y - - - setup - - - - - X64 - - - Full - Speed - true - setup;%(AdditionalIncludeDirectories) - NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - Use - OldStyle - false - false - - - true - true - true - 0x03200000 - false - MachineX64 - true - %(AdditionalLibraryDirectories) - %(AdditionalDependencies) - - - - - vld.dll.dependency.x64.manifest - - - copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - setup - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + vld + SAK + SAK + SAK + SAK + Unicode + DynamicLibrary + true + x86 + x64 + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(ProjectDir)bin\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + MinimumRecommendedRules.ruleset + $(ProjectName)_$(NumericPlatform) + .dll + + + + setup;%(AdditionalIncludeDirectories) + Use + + + true + 0x03200000 + false + %(AdditionalLibraryDirectories) + + + + + + copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + + + setup + + + + + Disabled + _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + EditAndContinue + true + + + psapi.lib;%(AdditionalDependencies) + + + vld.dll.dependency.x86.manifest + + + + + Disabled + _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + ProgramDatabase + + + MachineX64 + psapi.lib;%(AdditionalDependencies) + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + OldStyle + false + + + true + true + %(AdditionalDependencies) + + + vld.dll.dependency.x86.manifest + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + OldStyle + false + false + + + true + true + MachineX64 + true + %(AdditionalDependencies) + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From b963ca3f9b7d81d8ccda097bdeda0458859209b7 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 21 May 2013 20:00:57 +0400 Subject: [PATCH 146/321] Static CRT configuration added to projects --- tests/basics/ExecuteTestBasics_x64.bat | 26 +- tests/basics/ExecuteTestBasics_x86.bat | 26 +- tests/basics/basics.vcxproj | 293 +++++++++++++++++++--- tests/copydlls.bat | 5 + tests/corruption/corruption.vcxproj | 188 ++++++++++++-- tests/dynamic_app/dynamic_app.vcxproj | 323 ++++++++++++++++++++++--- tests/dynamic_dll/dynamic.vcxproj | 220 +++++++++++++++++ tests/mfc/vldmfc.vcxproj | 323 +++++++++++++++++++++++-- tests/mfc_dll/mfc.rc | Bin 6466 -> 6486 bytes tests/mfc_dll/mfc.vcxproj | 267 +++++++++++++++++++- tests/suite/testsuite.vcxproj | 276 ++++++++++++++++++--- vld_vs11.sln | 174 ++++++++++--- 12 files changed, 1925 insertions(+), 196 deletions(-) create mode 100644 tests/copydlls.bat diff --git a/tests/basics/ExecuteTestBasics_x64.bat b/tests/basics/ExecuteTestBasics_x64.bat index f3e06254..61a1e45a 100644 --- a/tests/basics/ExecuteTestBasics_x64.bat +++ b/tests/basics/ExecuteTestBasics_x64.bat @@ -1,13 +1,23 @@ @echo off -.\x64\Debug\test_basics -.\x64\Debug\test_basics invalid_argument 5 -.\x64\Debug\test_basics malloc 5 -.\x64\Debug\test_basics new 5 -.\x64\Debug\test_basics new_array 5 -.\x64\Debug\test_basics calloc 5 -.\x64\Debug\test_basics realloc 5 -.\x64\Debug\test_basics CoTaskMem 5 +set Platform=.\x64 +"%Platform%\Debug(Release)\test_basics" +"%Platform%\Debug(Release)\test_basics" invalid_argument 5 +"%Platform%\Debug(Release)\test_basics" malloc 5 +"%Platform%\Debug(Release)\test_basics" new 5 +"%Platform%\Debug(Release)\test_basics" new_array 5 +"%Platform%\Debug(Release)\test_basics" calloc 5 +"%Platform%\Debug(Release)\test_basics" realloc 5 +"%Platform%\Debug(Release)\test_basics" CoTaskMem 5 + +"%Platform%\Debug(Release)_StaticCrt\test_basics" +"%Platform%\Debug(Release)_StaticCrt\test_basics" invalid_argument 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" malloc 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" new 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" new_array 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" calloc 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" realloc 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" CoTaskMem 5 pause diff --git a/tests/basics/ExecuteTestBasics_x86.bat b/tests/basics/ExecuteTestBasics_x86.bat index bf20b111..73bdf391 100644 --- a/tests/basics/ExecuteTestBasics_x86.bat +++ b/tests/basics/ExecuteTestBasics_x86.bat @@ -1,13 +1,23 @@ @echo off -.\Win32\Debug\test_basics -.\Win32\Debug\test_basics invalid_argument 5 -.\Win32\Debug\test_basics malloc 5 -.\Win32\Debug\test_basics new 5 -.\Win32\Debug\test_basics new_array 5 -.\Win32\Debug\test_basics calloc 5 -.\Win32\Debug\test_basics realloc 5 -.\Win32\Debug\test_basics CoTaskMem 5 +set Platform=.\Win32 +"%Platform%\Debug(Release)\test_basics" +"%Platform%\Debug(Release)\test_basics" invalid_argument 5 +"%Platform%\Debug(Release)\test_basics" malloc 5 +"%Platform%\Debug(Release)\test_basics" new 5 +"%Platform%\Debug(Release)\test_basics" new_array 5 +"%Platform%\Debug(Release)\test_basics" calloc 5 +"%Platform%\Debug(Release)\test_basics" realloc 5 +"%Platform%\Debug(Release)\test_basics" CoTaskMem 5 + +"%Platform%\Debug(Release)_StaticCrt\test_basics" +"%Platform%\Debug(Release)_StaticCrt\test_basics" invalid_argument 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" malloc 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" new 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" new_array 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" calloc 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" realloc 5 +"%Platform%\Debug(Release)_StaticCrt\test_basics" CoTaskMem 5 pause diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index 766b622f..85a7d6ba 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -1,6 +1,14 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + Debug(Release) Win32 @@ -9,6 +17,14 @@ Debug(Release) x64 + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -17,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -38,87 +62,169 @@ true Unicode
- - - - - - -

Introduction

- -

Visual C++ provides built-in memory leak detection, but its capabilities are minimal at best. This memory leak - detector was created as a free alternative to the built-in memory leak detector provided with Visual C++. Here - are some of Visual Leak Detector's features, none of which exist in the built-in detector:

- -
    -
  • Provides a complete stack trace for each leaked block, including source file and line number information when - available.
    • - -
  • Detects most, if not all, types of in-process memory leaks including COM-based leaks, and pure Win32 heap-based - leaks.
    • - -
  • Selected modules (DLLs or even the main EXE) can be excluded from leak detection.
    • - -
  • Provides complete data dumps (in hex and ASCII) of leaked blocks.
    • - -
  • Customizable memory leak report: can be saved to a file or sent to the debugger and can include a variable level - of detail.
    • -
- -

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 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 me a note. Or, if you'd - prefer, you can contribute a small donation. Both are very appreciated.

- - - - -

Using Visual Leak Detector

- -

This section briefly describes the basics of using Visual Leak Detector (VLD).

- -

Important! : Before using VLD with any Visual C++ project, you must first add the Visual Leak - Detector include and library directories to the Visual C++ include and library directory search paths:

- -
    -
  • Visual C++ 8 and 9: Go to Tools -> Options -> Projects and Solutions -> VC++ Directories. - Select "Include files" from the "Show Directories For" drop-down menu. Add the - include subdirectory from the Visual Leak Detector installation directory. Move it - to the bottom of the list. Then select "Library files" from the drop-down menu and add the - lib subdirectory from the Visual Leak Detector installation directory. Again, move - it to the bottom of the list.
    • - -
  • Visual C++ 7: Go to Project Properties -> C/C++ -> General -> Additional Include - Directories and add the include subdirectory from the Visual Leak Detector - installation directory. Move it to the bottom of the list. Then select Additional Library Directories and add - the lib subdirectory from the Visual Leak Detector installation directory. Again, - move it to the bottom of the list.
    • - -
  • Visual C++ 6: Go to Tools -> Options -> Directories. Select "Include files" from - the "Show Directories For" drop-down menu. Add the include subdirectory - from the Visual Leak Detector installation directory. Move it to the bottom of the list. Then select "Library - files" from the drop-down menu and add the lib subdirectory from the Visual Leak - Detector installation directory. Again, move it to the bottom of the list.
    • -
- -

To use VLD with your project, follow these simple steps:

- -
    -
  1. In at least one C/C++ source file from your program, include the vld.h header - file. It should not matter which file you add the include statement to. It also should not matter in what order - the header is included in relation to other headers. The only exception is - stdafx.h (or any other precompiled header). A precompiled header, such as - stdafx.h, must always be the first header included in a source file, so - vld.h must be included after any precompiled headers.
    2. - -
  2. If your program contains one or more DLLs that you would also like to check for memory leaks, then also include - vld.h in at least one source file from each DLL to be included in leak - detection.
    3. - -
  3. Build the debug version of your program.
    4. -
- -

Note: Unlike earlier (pre-1.9) versions of VLD, it is now acceptable to include - vld.h in every source file, or to include it in a common header that is included by - many or all source files. Only one copy of the VLD code will be loaded into the process, regardless of how many - source files include vld.h.

- -

VLD will detect memory leaks in your program whenever you run the debug version. When you run the program under the - Visual C++ debugger, a report of all the memory leaks detected will be displayed in the debugger's output window - when your program exits (the report can optionally be saved to a file instead, see - ReportFile under Configuration Options). Double-clicking on a - source file's line number in the memory leak report will take you to that file and line in the editor window, - allowing easy navigation of the code path leading up to the allocation that resulted in the memory leak.

- -

Note: When you build release versions of your program, VLD will not be linked into the - executable. So it is safe to leave vld.h included in your source files when doing - release builds. Doing so will not result in any performance degradation or any other undesirable overhead.

- - - - -

Configuration Options

- -

There are a several configuration options that control specific aspects of VLD's operation. These configuration - options are stored in the vld.ini configuration file. By default, the configuration - file should be in the Visual Leak Detector installation directory. However, the configuration file can be copied to - the program's working directory, in which case the configuration settings in that copy of - vld.ini will apply only when debugging that one program.

- -
-
VLD
-
-

This option acts as a master on/off switch. By default, this option is set to "on". To completely - disable Visual Leak Detector at runtime, set this option to "off". When VLD is turned off using this - option, it will do nothing but print a message to the debugger indicating that it has been turned off.

-
- -
AggregateDuplicates
-
-

Normally, VLD displays each individual leaked block in detail. Setting this option to "yes" will make VLD - aggregate all leaks that share the same size and call stack under a single entry in the memory leak report. - Only the first leaked block will be reported in detail. No other identical leaks will be displayed. Instead, - a tally showing the total number of leaks matching that size and call stack will be shown. This can be useful - if there are only a few sources of leaks, but those few sources are repeatedly leaking a very large number of - memory blocks.

-
- -
ForceIncludeModules
-
-

In some rare cases, it may be necessary to include a module in leak detection, but it may not be possible to - include vld.h in any of the module's sources. In such cases, this option can be - used to force VLD to include those modules in leak detection. List the names of the modules (DLLs) to be - forcefully included in leak detection. If you do use this option, it's advisable to also add - vld.lib to the list of library modules in the linker options of your project's - settings.

- -

Caution: Use this option only when absolutely necessary. In some situations, - use of this option may result in unpredictable behavior including false leak reports and/or crashes. It's - best to stay away from this option unless you are sure you understand what you are doing.

-
- -
MaxDataDump
-
-

Set this option to an integer value to limit the amount of data displayed in memory block data dumps. When - this number of bytes of data have been dumped, the dump will stop. This can be useful if any of the leaked - blocks are very large and the debugger's output window becomes too cluttered. You can set this option to 0 - (zero) if you want to suppress data dumps altogether.

-
- -
MaxTraceFrames
-
-

By default, VLD will trace the call stack for each allocated block as far back as possible. Each frame traced - adds additional overhead (in both CPU time and memory usage) to your debug executable. If you'd like to limit - this overhead, you can define this macro to an integer value. The stack trace will stop when it has traced - this number of frames. The frame count may include some of the "internal" frames which, by default, are not - displayed in the debugger's output window (see TraceInternalFrames below). In - some cases there may be about three or four "internal" frames at the beginning of the call stack. Keep this - in mind when using this macro, or you may not see the number of frames you expect.

-
- -
ReportEncoding
-
-

When the memory leak report is saved to a file, the report may optionally be Unicode encoded instead of using - the default ASCII encoding. This might be useful if the data contained in leaked blocks is likely to consist - of Unicode text. Set this option to "unicode" to generate a Unicode encoded report.

-
- -
ReportFile
-
-

Use this option to specify the name and location of the file in which to save the memory leak report when - using a file as the report destination, as specified by the ReportTo option. If - no file is specified here, then VLD will save the report in a file named "memory_leak_report.txt" in the - working directory of the program.

-
- -
ReportTo
-
-

The memory leak report may be sent to a file in addition to, or instead of, the debugger. Use this option to - specify which type of destination to use. Specify one of "debugger" (the default), "file", or "both".

-
- -
SelfTest
-
-

VLD has the ability to check itself for memory leaks. This feature is always active. Every time you run VLD, - in addition to checking your own program for memory leaks, it is also checking itself for leaks. Setting this - option to "on" forces VLD to intentionally leak a small amount of memory: a 21-character block filled with - the text "Memory Leak Self-Test". This provides a way to test VLD's ability to check itself for memory leaks - and verify that this capability is working correctly. This option is usually only useful for debugging VLD - itself.

-
- -
SlowDebuggerDump
-
-

If enabled, this option causes Visual Leak Detector to write the memory leak report to the debugger's output - window at a slower than normal rate. This option is specifically designed to work around a known issue with - some older versions of Visual Studio where some data sent to the output window might be lost if it is sent - too quickly. If you notice that some information seems to be missing from the memory leak report, try turning - this on.

-
- -
StackWalkMethod
-
-

Selects the method to be used for walking the stack to obtain call stacks for allocated memory blocks. The - default "fast" method may not always be able to successfully trace completely through all call stacks. In - such cases, the "safe" method may prove to be more reliable in obtaining the full stack trace. The - disadvantage with the "safe" method is that it is significantly slower than the "fast" method and will - probably result in very noticeable performance degradation of the program being debugged. In most cases it - should be okay to leave this option set to "fast". If you experience problems getting VLD to show call - stacks, you can try setting this option to "safe".

- -

If you do use the "safe" method, and notice a significant performance decrease, you may want to consider - using the MaxTraceFrames option to limit the number of frames traced to a - relatively small number. This can reduce the amount of time spent tracing the stack by a very large - amount.

-
- -
StartDisabled
-
-

Set this option to "yes" to disable memory leak detection initially. This can be useful if you need to be - able to selectively enable memory leak detection from runtime, without needing to rebuild the executable; - however, this option should be used with caution. Any memory leaks that may occur before memory leak - detection is enabled at runtime will go undetected. For example, if the constructor of some global variable - allocates memory before execution reaches a subsequent call to VLDEnable, then - VLD will not be able to detect if the memory allocated by the global variable is never freed. Refer to the - following section on controlling leak detection at runtime for details on using the - runtime APIs which can be useful in conjunction with this option.

-
- -
TraceInternalFrames
-
-

This option determines whether or not all frames of the call stack, including frames internal to the heap, - are traced. There will always be a number of frames on the call stack which are internal to Visual Leak - Detector and C/C++ or Win32 heap APIs that aren't generally useful for determining the cause of a leak. - Normally these frames are skipped during the stack trace, which somewhat reduces the time spent tracing and - amount of data collected and stored in memory. Including all frames in the stack trace, all the way down into - VLD's own code can, however, be useful for debugging VLD itself.

-
-
- - - - -

Controlling Leak Detection at Runtime

- -

Using the default configuration, VLD's memory leak detection will be enabled during the entire run of your program. - In certain scenarios it may be desirable to selectively disable memory leak detection in certain segments of your - code. VLD provides simple APIs for controlling the state of memory leak detection at runtime. To access these APIs, - include vld.h in the source file that needs to use them.

- -
-
VLDDisable
-
-

This function disables memory leak detection. After calling this function, memory leak detection will remain - disabled until it is explicitly re-enabled via a call to VLDEnable.

- - 
void VLDDisable (void);
- -

Arguments:

- -

This function accepts no arguments.

- -

Return Value:

- -

None (this function always succeeds).

- -

Notes:

- -

This function controls memory leak detection on a per-thread basis. In other words, calling this function - disables memory leak detection for only the thread that called the function. Memory leak detection will - remain enabled for any other threads in the same process. This insulates the programmer from having to - synchronize multiple threads that disable and enable memory leak detection. However, note also that this - means that in order to disable memory leak detection process-wide, this function must be called from every - thread in the process.

-
- - -
VLDEnable
-
-

This function enables memory leak detection if it was previously disabled. After calling this function, - memory leak detection will remain enabled unless it is explicitly disabled again via a call to - VLDDisable().

- - 
void VLDEnable (void);
- -

Arguments:

- -

This function accepts no arguments.

- -

Return Value:

- -

None (this function always succeeds).

- -

Notes:

- -

This function controls memory leak detection on a per-thread basis. See the remarks for - VLDDisable regarding multithreading and memory leak detection for details. - Those same concepts also apply to this function.

-
-
- - - - -

Building Visual Leak Detector from Source

- -

Because Visual Leak Detector is open source, it can be built from source if you want to tweak it to your - liking. As of Visual Studio 2008, the source can usually be built out-of-the-box without downloading or installing - any other tools. If you are using Visual Studio 2008 (or later), you can skip ahead to - Executing Your Built vld.dll. - -

Users with older versions of Visual Studio should continue reading here and follow the instructions in the next - subsection.

- -

For Older Versions of Visual Studio

- -

The most difficult part about building VLD from source is getting your build environment correctly set up. - But if you follow these instructions carefully, the process should be fairly painless.

- -
    -
  1. VLD depends on the Debug Help Library. This library is part of - Debugging Tools for Windows (DTfW). - Download and install DTfW in order to install the required headers and libraries. I recommend installing version - 6.5 of DTfW, or later. Newer versions tend to work fine, but older versions will probably not work. Be sure to - manually select to install the SDK files during the DTfW installation or the headers and libraries will not be - installed (they are not always installed with a default installation).
    2. - -
  2. Visual C++ will need to be made aware of where it can find the Debug Help Library header and library files. - Add the sdk\inc and sdk\lib subdirectories from the - DTfW installation directory to the include and library search paths in Visual C++. (See the section above - on using Visual Leak Detector on instructions for adding to these search paths). -
    3. - -
  3. VLD also requires a reasonably up-to-date Platform SDK. It is known to work with the latest SDK (as of this - writing) which is the Windows Server 2003 R2 SDK. It should also work with earlier SDKs, such as the Windows XP - SP2 SDK or may even work with SDKs as old as the February 2003 SDK. If in doubt, - update - your Platform SDK to the latest version.
    4. - -
  4. Again, Visual C++ will need to know where to find the Platform SDK headers and libraries. Add the - Include and Lib subdirectories from the - Platform SDK installation directory to the Include and Library search paths, respectively. The - Platform SDK directories should be placed just after the DTfW directories.
    5. -
- -

To summarize, your Visual C++ include search path should look something like this:

- -
    -
  • C:\Program Files\Debugging Tools for Windows\sdk\inc
    • - -
  • C:\Program Files\Microsoft Platform SDK\Include
    • - -
  • C:\Program Files\Microsoft Visual Studio\VCx\Include
    • - -
  • ...
    • -
- -

And your Visual C++ library search path should look like this:

- -
    -
  • C:\Program Files\Debugging Tools for Windows\sdk\lib
    • - -
  • C:\Program Files\Microsoft Platform SDK\Lib
    • - -
  • C:\Program Files\Microsoft Visual Studio\VCx\Lib
    • - -
  • ...
    • -
- -

In the above examples, "VCx" could be "VC", "VC7", or "VC98" (or possibly other values) depending on which version of - Visual Studio you have installed. Also, the name of your Platform SDK directory will probably be different from - the example depending on which version of the Platform SDK you have installed.

- -

Once you have completed all of the above steps, your build environment should be ready. To build VLD, just open the - vld.sln solution file and do a full build.

- -

Executing Your Built vld.dll

- -

When actually running the built project, vld.dll will expect to find the Debug Help - Library as a private assembly. The private assembly must be located in the same directory as - vld.dll (either the Release or - Debug directory by default). Otherwise, when VLD is loaded, an error message will pop - up indicating that the program failed to initialize, and you will see a message similar to the following in the - debugger's output window:

-

LDR: LdrpWalkImportDescriptor() failed to probe C:\Projects\vld\Release\vld.dll for its manifest, - ntstatus 0xc0150002

- -

To ensure that vld.dll finds the required private assembly, you need to copy - dbghelp.dll and Microsoft.DTfW.DHL.manifest to the - same directory that vld.dll is in.

- - - - -

Windows x64 Support

- -

Currently VLD will not build on x64 due to limitations of the x64 compiler. Some efforts have been undertaken to - get it working in a 64-bit environment, but have not yet been successful. If you need 64-bit support and run into - problems trying to build the source in 64-bit mode, please let me know. - I'll be glad to assist in getting the 64-bit code working properly, if at all possible.

- - - - -

Frequently Asked Questions

- -
-
When I try to compile my program with VLD, it fails and the compiler gives this error: Cannot open include file: - 'vld.h': No such file or directory.
-
-

The compiler can't find the header file that VLD installed. This probably means that VLD's include - subdirectory has not been added to the Visual C++ include search path. See the section above about - Using Visual Leak Detector for instructions on how to add VLD's directories to the search - path.

-
-
In the memory leak report, the callstack contains many lines that say - "File and line number unvailable" or "Function name unavailable".
-
-

This may mean that VLD couldn't find the symbol database for your program. The symbol database is ususally in - a file named [my-program-name].pdb. If this file is not located in the same - directory as the program itself, then VLD will probably not find it and can't show any file or function - names.

-
-
- - - - -

Known Restrictions

- -

Known restrictions/limitations in this version of VLD include:

- -
    -
  • Memory allocations made through calls to functions loaded from a DLL using delayed loading may not be - detected.
    • - -
  • Support for programs that use MFC 7.0 or MFC 7.1 is not complete yet. Some memory leaks from such MFC-based - programs may not be detected. A possible workaround for this restriction is to try forcefully including the MFC - DLLs in memory leak detection, by setting the ForceIncludeModules configuration - option to: "mfc70d.dll mfc71d.dll" and explicitly adding vld.lib as an input file - on the linker command line (can be added through project settings by adding it to the list of library modules in - the linker options). This restriction does not apply to programs that use MFC 4.2, MFC 8.0, or MFC 9.0, which are - all fully supported.
    • - -
  • Visual Leak Detector may report leaks internal to Visual Leak Detector if the main thread of the process - terminates while other threads are still running.
    • - -
  • On Windows 2000 and earlier operating systems, you may need to manually add the - bin subdirectory from the Visual Leak Detector installation directory to the system - PATH environment variable. Also, dbghelp.dll will probably need to be manually copied - to the directory where the program being debugged resides. Otherwise the system may not find the required DLLs when - running VLD.
    • - -
  • If more than one copy of the same C Runtime DLL is loaded in the process at the same time, then some leaks may - go undetected (note that loading more than one copy of the C Runtime DLL at the same time is probably a bad idea - to begin with).
    • -
- - - -

Contributing

- -

I 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 hop onto - GitHub (accounts are free) and issue pull requests for changes that you've made and - would like to share.

- -

Git Repository URL: git://github.com/dmoulding/vld.git

- -

License

- -

Visual Leak Detector is distributed under the terms of the - GNU Lesser General Public License. This license allows you to - use the VLD library with your own programs without restriction. However, if you build a program (or another library) - that is based on the VLD source code, or uses parts of the VLD source code in it, then some restrictions - will apply. What this means is that you are free to ship and use the distributed version of the VLD DLL with regular - commercial programs. But if you create a modified version of VLD, that modified version must remain "free software". - See the COPYING.txt file for details.

- -

The Debug Help Library (dbghelp.dll) and Microsoft C Runtime Library - (msvcr80.dll) distributed with this software are not part of - Visual Leak Detector and are not covered under the terms of the GNU Lesser General Public License. They are - separately copyrighted works of Microsoft Corporation. Microsoft reserves all its rights to its copyrights in the - Debug Help Library and Microsoft C Runtime Library. Neither your use of the Visual Leak Detector software, - nor your license under the GNU Lesser General Public license grant you any rights to use the Debug Help Library or - Microsoft C Runtime Library in ANY WAY (for example, redistributing them) that would infringe upon - Microsoft Corporation's copyright in the Debug Help Library or Microsoft C Runtime Library.

- -

NO WARRANTY

- -

BECAUSE VISUAL LEAK DETECTOR ("THE SOFTWARE") IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE SOFTWARE, TO - THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER - PARTIES PROVIDE THE SOFTWARE "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE - QUALITY AND PERFORMANCE OF THE SOFTWARE IS WITH YOU. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION.

- -

IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY - WHO MAY MODIFY AND/OR REDISTRIBUTE THE SOFTWARE AS PERMITTED BY THE LICENSING TERMS SET FORTH ABOVE, BE LIABLE TO YOU - FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY - TO USE THE SOFTWARE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED - BY YOU OR THIRD PARTIES OR A FAILURE OF THE SOFTWARE TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

- - - - -

Contacting the Author

- -

Please forward any bug reports, questions, comments or suggestions to me at -dmoulding@gmail.com.

- -

Donations to help support ongoing development of Visual Leak Detector are very appreciated!

- -
-
- - - -
-
- - - -

Additional Developers Wanted

- -

This project is looking for additional developers who have the time, knowledge, and talent, to help make VLD continue - to be a useful utility for the Windows developer community. If you feel that you or someone you know would be - interested in becoming an active member of the Visual Leak Detector development team, please let me know.

- - - -

- Valid XHTML 1.0! - Valid CSS! -

- - - - - -
 + + Application + true + Unicode + Application true Unicode + + Application + true + Unicode + Application true Unicode false + + Application + true + Unicode + false + Application true Unicode false + + Application + true + Unicode + false + Application false true Unicode + + Application + false + true + Unicode + Application false true Unicode + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + false $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + false $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + false $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + false $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + false $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + false $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + Use @@ -131,18 +237,34 @@ Console true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) NotSet - 2.1 %(AdditionalDependencies) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y -"$(TargetPath)" test -exit /b 0 + ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) Copying over Visual Leak Detector Dependencies @@ -158,17 +280,33 @@ exit /b 0 Console true - $(ProjectDir)..\..\$(Platform)\Release + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) NotSet - 2.1 %(AdditionalDependencies) - copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y -"$(TargetPath)" test -exit /b 0 + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) Copying over Visual Leak Detector Dependencies @@ -184,16 +322,34 @@ exit /b 0 Console true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) NotSet - 2.1 %(AdditionalDependencies) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) Copying over Visual Leak Detector Dependencies @@ -209,15 +365,33 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Console true - $(ProjectDir)..\..\$(Platform)\Release + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) NotSet - 2.1 %(AdditionalDependencies) - copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) Copying over Visual Leak Detector Dependencies @@ -236,14 +410,33 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ true true true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y -"$(TargetPath)" test + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) Copying over Visual Leak Detector Dependencies @@ -262,13 +455,33 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ true true true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) Copying over Visual Leak Detector Dependencies @@ -283,11 +496,17 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ Create + Create Create + Create Create + Create Create + Create Create + Create Create + Create diff --git a/tests/copydlls.bat b/tests/copydlls.bat new file mode 100644 index 00000000..d6ef93bf --- /dev/null +++ b/tests/copydlls.bat @@ -0,0 +1,5 @@ +REM Copying over Visual Leak Detector Dependencies +copy %~p0\..\bin\%1\vld_%2.dll %3\vld_%2.dll /y +copy %~p0\..\bin\%1\vld_%2.pdb %3\vld_%2.pdb /y +copy %~p0\..\setup\dbghelp\%2\dbghelp.dll %3\dbghelp.dll /y +copy %~p0\..\setup\dbghelp\%2\Microsoft.DTfW.DHL.manifest %3\Microsoft.DTfW.DHL.manifest /y \ No newline at end of file diff --git a/tests/corruption/corruption.vcxproj b/tests/corruption/corruption.vcxproj index 7a05c7f4..f463076b 100644 --- a/tests/corruption/corruption.vcxproj +++ b/tests/corruption/corruption.vcxproj @@ -1,6 +1,14 @@  + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -29,59 +45,113 @@ true Unicode + + Application + true + Unicode + Application true Unicode + + Application + true + Unicode + Application false true Unicode + + Application + false + true + Unicode + Application false true Unicode + + Application + false + true + Unicode + + + + + + + + + + + + + true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + false $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + false $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + @@ -94,13 +164,31 @@ Console true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) + Copying over Visual Leak Detector Dependencies @@ -115,13 +203,31 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ Console true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) + Copying over Visual Leak Detector Dependencies @@ -139,13 +245,34 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ true true true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) + Copying over Visual Leak Detector Dependencies @@ -163,13 +290,34 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ true true true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) + Copying over Visual Leak Detector Dependencies diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index be19774e..e2271026 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -1,6 +1,14 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + Debug(Release) Win32 @@ -9,6 +17,14 @@ Debug(Release) x64 + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -17,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -37,54 +61,104 @@ true Unicode + + Application + true + Unicode + Application true Unicode + + Application + true + Unicode + Application true Unicode + + Application + true + Unicode + Application true Unicode + + Application + true + Unicode + Application false true Unicode + + Application + false + true + Unicode + Application false true Unicode + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + true @@ -94,12 +168,25 @@ + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ dynamic + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + true $(ProjectDir)$(Platform)\$(Configuration)\ @@ -107,24 +194,49 @@ dynamic true + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + true + true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ dynamic + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + false $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ dynamic + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + false $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ dynamic + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + @@ -137,13 +249,39 @@ Console true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y @@ -168,13 +306,34 @@ exit /b 0 Console true - $(ProjectDir)..\..\$(Platform)\Release + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y @@ -195,16 +354,40 @@ exit /b 0 Console true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -220,15 +403,39 @@ copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir) Console true - $(ProjectDir)..\..\$(Platform)\Release + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -248,13 +455,39 @@ copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir) true true true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y @@ -277,16 +510,42 @@ exit /b 0 true true true - $(ProjectDir)..\..\$(Platform)\$(Configuration) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies diff --git a/tests/dynamic_dll/dynamic.vcxproj b/tests/dynamic_dll/dynamic.vcxproj index ef28b644..a693757c 100644 --- a/tests/dynamic_dll/dynamic.vcxproj +++ b/tests/dynamic_dll/dynamic.vcxproj @@ -1,6 +1,14 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + Debug(Release) Win32 @@ -9,6 +17,14 @@ Debug(Release) x64 + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -17,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -38,85 +62,165 @@ true Unicode + + DynamicLibrary + true + Unicode + DynamicLibrary true Unicode + + DynamicLibrary + true + Unicode + DynamicLibrary true Unicode + + DynamicLibrary + true + Unicode + DynamicLibrary true Unicode + + DynamicLibrary + true + Unicode + DynamicLibrary false true Unicode + + DynamicLibrary + false + true + Unicode + DynamicLibrary false true Unicode + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + false $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + false $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + Use @@ -131,6 +235,21 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + + + + Use @@ -145,6 +264,20 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + Use @@ -159,6 +292,21 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + + + + Use @@ -173,6 +321,20 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + Level3 @@ -189,6 +351,23 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + + Level3 @@ -205,6 +384,23 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + + @@ -215,32 +411,56 @@ false + false false + false false + false false + false + + + + + + + + false + false false + false + + + + Create + Create Create + Create Create + Create Create + Create Create + Create Create + Create diff --git a/tests/mfc/vldmfc.vcxproj b/tests/mfc/vldmfc.vcxproj index a997f636..c8c03d7a 100644 --- a/tests/mfc/vldmfc.vcxproj +++ b/tests/mfc/vldmfc.vcxproj @@ -1,6 +1,14 @@  + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -28,21 +44,41 @@ Dynamic MultiByte + + Application + Static + MultiByte + Application Dynamic Unicode + + Application + Static + Unicode + Application Dynamic MultiByte + + Application + Static + MultiByte + Application Dynamic MultiByte + + Application + Static + MultiByte + @@ -50,45 +86,85 @@ + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ false + false false + false $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ true + true true + true AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + @@ -119,7 +195,53 @@ $(OutDir)\vldmfc.exe true - ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + Windows + false + + + MachineX86 + true + + + true + .\Release/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) Windows false @@ -132,10 +254,8 @@ .\Release/vldmfc.bsc - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) + Copying over Visual Leak Detector Dependencies @@ -166,7 +286,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ $(OutDir)\vldmfc.exe true - ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) Windows false @@ -178,10 +298,52 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ .\Release/vldmfc.bsc - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + Windows + false + + + true + + + true + .\Release/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) + Copying over Visual Leak Detector Dependencies @@ -215,7 +377,7 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ $(OutDir)\vldmfc.exe true - ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows false @@ -228,10 +390,56 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ .\Debug/vldmfc.bsc - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + true + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) + Copying over Visual Leak Detector Dependencies @@ -263,7 +471,52 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ $(OutDir)\vldmfc.exe true - ..\..\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + true + Windows + false + + + + + true + .\Debug/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/vldmfc.tlb + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) true Windows false @@ -275,54 +528,84 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ .\Debug/vldmfc.bsc - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest + ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) + Copying over Visual Leak Detector Dependencies %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create Create + Create %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) Create + Create Create + Create %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/tests/mfc_dll/mfc.rc b/tests/mfc_dll/mfc.rc index 859e16e01c69093220a345dda4499d7a16bfc24a..cbc426ecb18c0a992c3276b1679c92a11e14caca 100644 GIT binary patch delta 41 ocmX?Pbj@gkhahJOLn=ctLkUCtW_Lk;Mg(`VyP);v2|}CL0Q~z4qyPW_ delta 25 hcmca+bjWCfhv4QQK|aRGL4sD3#f14bZxUL<1^{(|2u1(^ diff --git a/tests/mfc_dll/mfc.vcxproj b/tests/mfc_dll/mfc.vcxproj index a6182f51..48a727eb 100644 --- a/tests/mfc_dll/mfc.vcxproj +++ b/tests/mfc_dll/mfc.vcxproj @@ -1,6 +1,14 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + Debug(Release) Win32 @@ -9,6 +17,14 @@ Debug(Release) x64 + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -17,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -30,6 +54,7 @@ {2178E5B2-1032-441F-A664-F3D8D1FD1913} mfc MFCDLLProj + test_mfc @@ -38,24 +63,48 @@ Unicode Dynamic + + DynamicLibrary + true + Unicode + Static + DynamicLibrary true Unicode Dynamic + + DynamicLibrary + true + Unicode + Static + DynamicLibrary true Unicode Dynamic + + DynamicLibrary + true + Unicode + Static + DynamicLibrary true Unicode Dynamic + + DynamicLibrary + true + Unicode + Static + DynamicLibrary false @@ -63,6 +112,13 @@ Unicode Dynamic + + DynamicLibrary + false + true + Unicode + Static + DynamicLibrary false @@ -70,63 +126,112 @@ Unicode Dynamic + + DynamicLibrary + false + true + Unicode + Static + + + + + + + + + + + + + + + + + + + true $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ - test_mfc + + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ true $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ - test_mfc + + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ - test_mfc + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ true $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ - test_mfc + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ false $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ - test_mfc + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ false $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ - test_mfc + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ @@ -150,6 +255,29 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + Use @@ -172,6 +300,28 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + Use @@ -194,6 +344,29 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + Use @@ -216,6 +389,28 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + Level3 @@ -242,6 +437,33 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + Level3 @@ -268,6 +490,33 @@ $(IntDir);%(AdditionalIncludeDirectories) + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + @@ -276,11 +525,17 @@ Create + Create Create + Create Create + Create Create + Create Create + Create Create + Create diff --git a/tests/suite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj index e74170f7..55b2e84f 100644 --- a/tests/suite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -1,6 +1,14 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + Debug(Release) Win32 @@ -9,6 +17,14 @@ Debug(Release) x64 + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -17,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -39,80 +63,152 @@ Application NotSet + + Application + NotSet + Application NotSet + + Application + NotSet + Application NotSet + + Application + NotSet + Application NotSet + + Application + NotSet + Application NotSet + + Application + NotSet + Application NotSet + + Application + NotSet + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + @@ -127,14 +223,32 @@ false - $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + true + + + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + EditAndContinue + false + + + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) true - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) Copying over Visual Leak Detector Dependencies @@ -148,16 +262,33 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ true - $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true true true - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Full + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + true + true + true + + + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) Copying over Visual Leak Detector Dependencies @@ -174,14 +305,32 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ true - $(SolutionDir)\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + true + + + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + EditAndContinue + true + + + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) true - copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.dll $(Outdir)\vld_x86.dll /y -copy $(ProjectDir)..\..\$(Platform)\Release\vld_x86.pdb $(Outdir)\vld_x86.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) Copying over Visual Leak Detector Dependencies @@ -201,16 +350,39 @@ copy $(ProjectDir)..\..\setup\dbghelp\x86\Microsoft.DTfW.DHL.manifest $(OutDir)\ false - $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + true + MachineX64 + + + + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + ProgramDatabase + false + + + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) true MachineX64 - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) Copying over Visual Leak Detector Dependencies @@ -227,17 +399,38 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ true - $(SolutionDir)\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true true MachineX64 true - copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\$(Configuration)\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Full + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + true + true + MachineX64 + true + + + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) Copying over Visual Leak Detector Dependencies @@ -257,16 +450,39 @@ copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\ true - $(SolutionDir)\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + true + MachineX64 + true + + + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + ProgramDatabase + true + + + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) true MachineX64 true - copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.dll $(Outdir)\vld_x64.dll /y -copy $(ProjectDir)..\..\$(Platform)\Release\vld_x64.pdb $(Outdir)\vld_x64.pdb /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\dbghelp.dll $(OutDir)\dbghelp.dll /y -copy $(ProjectDir)..\..\setup\dbghelp\x64\Microsoft.DTfW.DHL.manifest $(OutDir)\Microsoft.DTfW.DHL.manifest /y + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) Copying over Visual Leak Detector Dependencies diff --git a/vld_vs11.sln b/vld_vs11.sln index e040f53a..5e1181da 100644 --- a/vld_vs11.sln +++ b/vld_vs11.sln @@ -24,7 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "tests\dynami {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" ProjectSection(ProjectDependencies) = postProject @@ -40,108 +40,212 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug(Release)|Win32 = Debug(Release)|Win32 - Debug(Release)|x64 = Debug(Release)|x64 + Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 + Debug_StaticCrt|x64 = Debug_StaticCrt|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + DebugRelease_StaticCrt|Win32 = DebugRelease_StaticCrt|Win32 + DebugRelease_StaticCrt|x64 = DebugRelease_StaticCrt|x64 + DebugRelease|Win32 = DebugRelease|Win32 + DebugRelease|x64 = DebugRelease|x64 + Release_StaticCrt|Win32 = Release_StaticCrt|Win32 + Release_StaticCrt|x64 = Release_StaticCrt|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.Build.0 = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 998dea36661442ed659f5e3f218df3a2672fba2b Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Thu, 14 Nov 2013 01:42:49 +0400 Subject: [PATCH 147/321] Setup rewrited to InnoSetup --- .gitignore | 1 + setup/build_version.bat | 4 +- setup/modpath.iss | 169 +++++++++++++++++++++++ setup/vld-setup.iss | 269 +++++++++++++++++++++++++++++++++++++ setup/vld-setup.nsi | 291 ---------------------------------------- 5 files changed, 441 insertions(+), 293 deletions(-) create mode 100644 setup/modpath.iss create mode 100644 setup/vld-setup.iss delete mode 100644 setup/vld-setup.nsi diff --git a/.gitignore b/.gitignore index 34553ac5..b351a77e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ x64/ *.suo ipch/ setup/vld-*-setup.exe +setup/Output/ diff --git a/setup/build_version.bat b/setup/build_version.bat index f6f71eaf..5f54ff21 100644 --- a/setup/build_version.bat +++ b/setup/build_version.bat @@ -41,8 +41,8 @@ IF %ERRORLEVEL% NEQ 0 GOTO EndBad devenv /nologo vld_vs10.sln %BUILDTYPE% "Release|x64" /Project vld IF %ERRORLEVEL% NEQ 0 GOTO EndBad -if not exist "%ProgFiles%\NSIS\makensis.exe" GOTO EndBad -"%ProgFiles%\NSIS\makensis.exe" /V3 setup\vld-setup.nsi +if not exist "%ProgFiles%\Inno Setup 5\ISCC.exe" GOTO EndBad +"%ProgFiles%\Inno Setup 5\ISCC.exe" setup\vld-setup.iss IF %ERRORLEVEL% NEQ 0 GOTO EndBad CD setup diff --git a/setup/modpath.iss b/setup/modpath.iss new file mode 100644 index 00000000..3a2e6c7c --- /dev/null +++ b/setup/modpath.iss @@ -0,0 +1,169 @@ +// ---------------------------------------------------------------------------- +// +// Inno Setup Ver: 5.4.2 +// Script Version: 1.4.2 +// Author: Jared Breland +// Homepage: http://www.legroom.net/software +// License: GNU Lesser General Public License (LGPL), version 3 +// http://www.gnu.org/licenses/lgpl.html +// +// Script Function: +// Allow modification of environmental path directly from Inno Setup installers +// +// Instructions: +// Copy modpath.iss to the same directory as your setup script +// +// Add this statement to your [Setup] section +// ChangesEnvironment=true +// +// Add this statement to your [Tasks] section +// You can change the Description or Flags +// You can change the Name, but it must match the ModPathName setting below +// Name: modifypath; Description: &Add application directory to your environmental path; Flags: unchecked +// +// Add the following to the end of your [Code] section +// ModPathName defines the name of the task defined above +// ModPathType defines whether the 'user' or 'system' path will be modified; +// this will default to user if anything other than system is set +// setArrayLength must specify the total number of dirs to be added +// Result[0] contains first directory, Result[1] contains second, etc. +// const +// ModPathName = 'modifypath'; +// ModPathType = 'user'; +// +// function ModPathDir(): TArrayOfString; +// begin +// setArrayLength(Result, 1); +// Result[0] := ExpandConstant('{app}'); +// end; +// #include "modpath.iss" +// ---------------------------------------------------------------------------- + +procedure ModPath(); +var + oldpath: String; + newpath: String; + updatepath: Boolean; + pathArr: TArrayOfString; + aExecFile: String; + aExecArr: TArrayOfString; + i, d: Integer; + pathdir: TArrayOfString; + regroot: Integer; + regpath: String; + +begin + // Get constants from main script and adjust behavior accordingly + // ModPathType MUST be 'system' or 'user'; force 'user' if invalid + if ModPathType = 'system' then begin + regroot := HKEY_LOCAL_MACHINE; + regpath := 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment'; + end else begin + regroot := HKEY_CURRENT_USER; + regpath := 'Environment'; + end; + + // Get array of new directories and act on each individually + pathdir := ModPathDir(); + for d := 0 to GetArrayLength(pathdir)-1 do begin + updatepath := true; + + // Get current path, split into an array + RegQueryStringValue(regroot, regpath, 'Path', oldpath); + oldpath := oldpath + ';'; + i := 0; + + while (Pos(';', oldpath) > 0) do begin + SetArrayLength(pathArr, i+1); + pathArr[i] := Copy(oldpath, 0, Pos(';', oldpath)-1); + oldpath := Copy(oldpath, Pos(';', oldpath)+1, Length(oldpath)); + i := i + 1; + + // Check if current directory matches app dir + if pathdir[d] = pathArr[i-1] then begin + // if uninstalling, remove dir from path + if IsUninstaller() = true then begin + continue; + // if installing, flag that dir already exists in path + end else begin + updatepath := false; + end; + end; + + // Add current directory to new path + if i = 1 then begin + newpath := pathArr[i-1]; + end else begin + newpath := newpath + ';' + pathArr[i-1]; + end; + end; + + // Append app dir to path if not already included + if (IsUninstaller() = false) AND (updatepath = true) then + newpath := newpath + ';' + pathdir[d]; + + // Write new path + RegWriteStringValue(regroot, regpath, 'Path', newpath); + end; +end; + +// Split a string into an array using passed delimeter +procedure MPExplode(var Dest: TArrayOfString; Text: String; Separator: String); +var + i: Integer; +begin + i := 0; + repeat + SetArrayLength(Dest, i+1); + if Pos(Separator,Text) > 0 then begin + Dest[i] := Copy(Text, 1, Pos(Separator, Text)-1); + Text := Copy(Text, Pos(Separator,Text) + Length(Separator), Length(Text)); + i := i + 1; + end else begin + Dest[i] := Text; + Text := ''; + end; + until Length(Text)=0; +end; + +procedure CurStepChangedModPath(CurStep: TSetupStep); +var + taskname: String; +begin + taskname := ModPathName; + if CurStep = ssPostInstall then + if IsTaskSelected(taskname) then + ModPath(); +end; + +procedure CurUninstallStepChangedModPath(CurUninstallStep: TUninstallStep); +var + aSelectedTasks: TArrayOfString; + i: Integer; + taskname: String; + regpath: String; + regstring: String; + appid: String; +begin + // only run during actual uninstall + if CurUninstallStep = usUninstall then begin + // get list of selected tasks saved in registry at install time + appid := '{#emit SetupSetting("AppId")}'; + if appid = '' then appid := '{#emit SetupSetting("AppName")}'; + regpath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\'+appid+'_is1'); + RegQueryStringValue(HKLM, regpath, 'Inno Setup: Selected Tasks', regstring); + if regstring = '' then RegQueryStringValue(HKCU, regpath, 'Inno Setup: Selected Tasks', regstring); + + // check each task; if matches modpath taskname, trigger patch removal + if regstring <> '' then begin + taskname := ModPathName; + MPExplode(aSelectedTasks, regstring, ','); + if GetArrayLength(aSelectedTasks) > 0 then begin + for i := 0 to GetArrayLength(aSelectedTasks)-1 do begin + if comparetext(aSelectedTasks[i], taskname) = 0 then + ModPath(); + end; + end; + end; + end; +end; diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss new file mode 100644 index 00000000..9014014d --- /dev/null +++ b/setup/vld-setup.iss @@ -0,0 +1,269 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "Visual Leak Detector" +#define MyAppVersion "2.3" +#define MyAppPublisher "VLD Team" +#define MyAppURL "http://vld.codeplex.com/" + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{851FBFF7-5148-40A2-A654-942BE80F5B90} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\{#MyAppName} +DefaultGroupName={#MyAppName} +LicenseFile=license-free.txt +OutputBaseFilename=vld-{#MyAppVersion}-setup +Compression=lzma +SolidCompression=True +MinVersion=0,5.0 +; Tell Windows Explorer to reload the environment +ChangesEnvironment=yes +AllowNoIcons=yes +DisableDirPage=auto +DirExistsWarning=no + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Icons] +Name: "{group}\View Documentation"; Filename: "http://vld.codeplex.com/documentation" + +[Files] +Source: "dbghelp\x64\dbghelp.dll"; DestDir: "{app}\dbghelp\x64"; Flags: ignoreversion +Source: "dbghelp\x64\Microsoft.DTfW.DHL.manifest"; DestDir: "{app}\dbghelp\x64"; Flags: ignoreversion +Source: "dbghelp\x86\dbghelp.dll"; DestDir: "{app}\dbghelp\x86"; Flags: ignoreversion +Source: "dbghelp\x86\Microsoft.DTfW.DHL.manifest"; DestDir: "{app}\dbghelp\x86"; Flags: ignoreversion +Source: "..\Win32\Release\vld.lib"; DestDir: "{app}\lib\Win32"; Flags: ignoreversion +Source: "..\Win32\Release\vld_x86.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion +Source: "..\x64\Release\vld.lib"; DestDir: "{app}\lib\Win64"; Flags: ignoreversion +Source: "..\x64\Release\vld_x64.dll"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion +Source: "..\vld.h"; DestDir: "{app}\include"; Flags: ignoreversion +Source: "..\vld_def.h"; DestDir: "{app}\include"; Flags: ignoreversion +Source: "..\vld.ini"; DestDir: "{app}"; Flags: ignoreversion +Source: "version.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\AUTHORS.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\CHANGES.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\callstack.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\dllspatches.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\ntapi.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\stdafx.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\utility.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vld.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vld_hooks.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vldapi.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vldheap.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\callstack.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\criticalsection.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\crtmfcpatch.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\map.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\ntapi.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\resource.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\set.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\stdafx.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\tree.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\utility.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vld.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vld_def.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vldheap.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vldint.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vld.dll.dependency.x64.manifest"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vld.dll.dependency.x86.manifest"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vld.rc"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vld.vcxproj"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\vld.vcxproj.filters"; DestDir: "{app}\src"; Flags: ignoreversion + +[Tasks] +Name: "modifypath"; Description: "Add VLD directory to your environmental path" + +[ThirdParty] +UseRelativePaths=True + +[Code] +const + ModPathName = 'modifypath'; + ModPathType = 'system'; + +function ModPathDir(): TArrayOfString; +begin + setArrayLength(Result, 2); + Result[0] := ExpandConstant('{app}\bin\Win32'); + Result[1] := ExpandConstant('{app}\bin\Win64'); +end; + +#include "modpath.iss" + +function GetUninstallString(regPath: string): String; +var + sUnInstPath: String; + sUnInstString: String; +begin + sUnInstPath := ExpandConstant(regPath); + sUnInstString := ''; + if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstString) then + RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstString); + Result := sUnInstString; +end; + +function UninstallOldVersion(regPath: string; params: string): Boolean; +var + iResultCode: Integer; +begin + // default return value + Result := False; + + if MsgBox('VLD is already installed. Uninstall the current version?', + mbConfirmation, MB_YESNO) = IDYES then + begin + regPath := RemoveQuotes(regPath); + if Exec(regPath, params,'', SW_HIDE, ewWaitUntilTerminated, iResultCode) then + Result := True; + end +end; + +function UninstallOldVersions(): Boolean; +var + nsisUnInstallString: String; + isUnInstallString: String; +begin + nsisUnInstallString := GetUninstallString('Software\Microsoft\Windows\CurrentVersion\Uninstall\Visual Leak Detector'); + isUnInstallString := GetUninstallString('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#emit SetupSetting("AppId")}_is1'); + Result := True; + if (nsisUnInstallString <> '') then + begin + Result := UninstallOldVersion(nsisUnInstallString, '/S'); + end + else if (isUnInstallString <> '') then + begin + Result := UninstallOldVersion(isUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES'); + end; +end; + +function EncodeString(str: string): string; +begin + Result := str; + StringChangeEx(Result, '(', '%28', True); + StringChangeEx(Result, ')', '%29', True); +end; + +procedure UpdateString(var dirList: string; path: string; suffix: string); +begin + if dirList = '' then + dirList := path + suffix + else if (Pos(path, dirList) = 0) and (Pos(EncodeString(path), dirList) = 0) then + dirList := path + dirList; + Log(dirList); +end; + +procedure ModifyProps(filename: string; libfolder: string); +var + XMLDocument: Variant; + XMLParent, XMLNode, XMLNodes: Variant; + IncludeDirectoriesNode: Variant; + AdditionalIncludeDirectories: string; + LibraryDirectoriesNode: Variant; + AdditionalLibraryDirectories: string; +begin + if not FileExists(filename) then + Exit; + XMLDocument := CreateOleObject('Msxml2.DOMDocument.6.0'); + try + XMLDocument.async := False; + XMLDocument.load(filename); + if (XMLDocument.parseError.errorCode = 0) then + begin + XMLDocument.setProperty('SelectionLanguage', 'XPath'); + XMLDocument.setProperty('SelectionNamespaces', 'xmlns:b=''http://schemas.microsoft.com/developer/msbuild/2003'''); + XMLNodes := XMLDocument.SelectNodes('//b:Project'); + if XMLNodes.Length = 0 then + Exit; + XMLParent := XMLNodes.Item[0]; + XMLNodes := XMLParent.SelectNodes('//b:ItemDefinitionGroup'); + if XMLNodes.Length > 0 then + XMLParent := XMLNodes.Item[0] + else + begin + XMLNode := XMLDocument.CreateNode(1, 'ItemDefinitionGroup', + 'http://schemas.microsoft.com/developer/msbuild/2003'); + XMLParent := XMLParent.AppendChild(XMLNode); + end; + XMLNodes := XMLParent.SelectNodes('//b:ClCompile'); + if XMLNodes.Length > 0 then + XMLParent := XMLNodes.Item[0] + else + begin + XMLNode := XMLDocument.CreateNode(1, 'ClCompile', + 'http://schemas.microsoft.com/developer/msbuild/2003'); + XMLParent := XMLParent.AppendChild(XMLNode); + end; + XMLNodes := XMLParent.SelectNodes('//b:AdditionalIncludeDirectories'); + if XMLNodes.Length > 0 then + IncludeDirectoriesNode := XMLNodes.Item[0] + else + begin + XMLNode := XMLDocument.CreateNode(1, 'AdditionalIncludeDirectories', + 'http://schemas.microsoft.com/developer/msbuild/2003'); + IncludeDirectoriesNode := XMLParent.AppendChild(XMLNode); + end; + XMLNodes := XMLParent.SelectNodes('//b:AdditionalLibraryDirectories'); + if XMLNodes.Length > 0 then + LibraryDirectoriesNode := XMLNodes.Item[0] + else + begin + XMLNode := XMLDocument.CreateNode(1, 'AdditionalLibraryDirectories', + 'http://schemas.microsoft.com/developer/msbuild/2003'); + LibraryDirectoriesNode := XMLParent.AppendChild(XMLNode); + end; + AdditionalIncludeDirectories := ''; + if not VarIsNull(IncludeDirectoriesNode) then + AdditionalIncludeDirectories := IncludeDirectoriesNode.Text; + AdditionalLibraryDirectories := '';; + if not VarIsNull(LibraryDirectoriesNode) then + AdditionalLibraryDirectories := LibraryDirectoriesNode.Text; + UpdateString(AdditionalIncludeDirectories, ExpandConstant('{app}\include;'), '%(AdditionalIncludeDirectories)'); + UpdateString(AdditionalLibraryDirectories, ExpandConstant('{app}\lib\' + libfolder + ';'), '%(AdditionalLibraryDirectories)'); + IncludeDirectoriesNode.Text := AdditionalIncludeDirectories; + LibraryDirectoriesNode.Text := AdditionalLibraryDirectories; + XMLDocument.save(filename); + end; + except + ShowExceptionMessage; + end; +end; + +procedure ModifyAllProps(); +var + Path: string; +begin + Path := GetEnv('LOCALAPPDATA')+'\Microsoft\MSBuild\v4.0\'; + if DirExists(Path) then + begin + ModifyProps(Path + 'Microsoft.Cpp.Win32.user.props', 'Win32'); + ModifyProps(Path + 'Microsoft.Cpp.x64.user.props', 'Win64'); + end; +end; + +procedure CurStepChanged(CurStep: TSetupStep); +begin + if CurStep = ssInstall then + begin + if not UninstallOldVersions() then + Abort(); + ModifyAllProps(); + end; + CurStepChangedModPath(CurStep); +end; + +procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); +begin + CurUninstallStepChangedModPath(CurUninstallStep); +end; diff --git a/setup/vld-setup.nsi b/setup/vld-setup.nsi deleted file mode 100644 index 7c332755..00000000 --- a/setup/vld-setup.nsi +++ /dev/null @@ -1,291 +0,0 @@ -################################################################################ -# -# Visual Leak Detector - NSIS Installation Script -# Copyright (c) 2005-2013 VLD Team -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -# -# See COPYING.txt for the full terms of the GNU General Public License. -# -################################################################################ - -!include "Library.nsh" # Provides the dynamic link library installation system -!include "LogicLib.nsh" # Provides useable conditional script syntax -!include "MUI.nsh" # Provides the modern user-interface - -!include "version.h" # Version number - -# Define build system paths -#!define CRT_PATH "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT" -!define DTFW_PATH "C:\Program Files\Debugging Tools for Windows (x86)" -!define EDITENV_PATH "editenv" - -# Define build system files -#!define CRT_DLL "msvcr90.dll" -#!define CRT_MANIFEST "Microsoft.VC90.CRT.manifest" -!define DHL_DLL "dbghelp.dll" -!define EDITENV_DLL "editenv.dll" - -# Define installer paths -!define BIN_PATH "$INSTDIR\bin" -!define INCLUDE_PATH "$INSTDIR\include" -!define LIB_PATH "$INSTDIR\lib" -!define LNK_PATH "$SMPROGRAMS\$SM_PATH" -!define SRC_PATH "$INSTDIR\src" - -# Define editenv system environment variable scope -!define ES_SYSTEM 1 - -# Define registry keys -!define REG_KEY_PRODUCT "Software\Visual Leak Detector" -!define REG_KEY_UNINSTALL "Software\Microsoft\Windows\CurrentVersion\Uninstall\Visual Leak Detector" - -# Define page settings -!define MUI_FINISHPAGE_NOAUTOCLOSE -!define MUI_FINISHPAGE_SHOWREADME "http://vld.codeplex.com/documentation" -!define MUI_FINISHPAGE_SHOWREADME_TEXT "View Documentation" -!define MUI_LICENSEPAGE_BUTTON "Continue" -!define MUI_LICENSEPAGE_TEXT_BOTTOM "Click the 'Continue' button to continue installing. Remember, you aren't required to (and are not being asked to) agree to anything before using this software." -!define MUI_LICENSEPAGE_TEXT_TOP "Press Page Down to see the rest of the text." -!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Visual Leak Detector" -!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM -!define MUI_STARTMENUPAGE_REGISTRY_KEY "${REG_KEY_PRODUCT}" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "LnkPath" -!define MUI_UNFINISHPAGE_NOAUTOCLOSE - -# Define installer attributes -InstallDir "$PROGRAMFILES\Visual Leak Detector" -InstallDirRegKey HKLM "${REG_KEY_PRODUCT}" "InstallPath" -Name "Visual Leak Detector ${VLD_VERSION}" -OutFile "vld-${VLD_VERSION}-setup.exe" -SetCompressor /SOLID lzma -ShowInstDetails show -ShowUninstDetails show - -# Declare global variables -Var INSTALLED_VERSION -Var SM_PATH - -# Define the installer pages -!insertmacro MUI_PAGE_WELCOME -!define MUI_PAGE_HEADER_TEXT "No License Required for Use" -!define MUI_PAGE_HEADER_SUBTEXT "This software is provided 'AS IS' without warranty of any kind." -!insertmacro MUI_PAGE_LICENSE "license-free.txt" -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_STARTMENU "Shortcuts" $SM_PATH -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - -# Define the uninstaller pages -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -# Set the modern UI language -!insertmacro MUI_LANGUAGE "English" - -################################################################################ -# -# Installation -# -Function .onInit - ReadRegStr $INSTALLED_VERSION HKLM "${REG_KEY_PRODUCT}" "InstalledVersion" - ${UNLESS} $INSTALLED_VERSION == "" - ${IF} $INSTALLED_VERSION == ${VLD_VERSION} - MessageBox MB_ICONINFORMATION|MB_OKCANCEL "Setup has detected that Visual Leak Detector version $INSTALLED_VERSION is already installed on this computer.$\n$\nClick 'OK' if you want to continue and repair the existing installation. Click 'Cancel' if you want to abort installation." \ - IDOK continue IDCANCEL abort - ${ELSE} - MessageBox MB_ICONEXCLAMATION|MB_YESNO "Setup has detected that a different version of Visual Leak Detector is already installed on this computer.$\nIt is highly recommended that you first uninstall the version currently installed before proceeding.$\n$\nAre you sure you want to continue installing?" \ - IDYES continue IDNO abort - ${ENDIF} -abort: - Abort -continue: - ${ENDUNLESS} -FunctionEnd - -Section "Uninstaller" - SetOutPath "$INSTDIR" - WriteUninstaller "$INSTDIR\uninstall.exe" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "DisplayName" "Visual Leak Detector ${VLD_VERSION}" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "UninstallString" "$INSTDIR\uninstall.exe" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "InstallLocation" "$INSTDIR" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "Publisher" "VLD Team" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "URLInfoAbout" "http://vld.codeplex.com/" - WriteRegStr HKLM "${REG_KEY_UNINSTALL}" "DisplayVersion" "${VLD_VERSION}" - WriteRegDWORD HKLM "${REG_KEY_UNINSTALL}" "NoModify" 1 - WriteRegDWORD HKLM "${REG_KEY_UNINSTALL}" "NoRepair" 1 -SectionEnd - -Section "Registry Keys" - WriteRegStr HKLM "${REG_KEY_PRODUCT}" "IniFile" "$INSTDIR\vld.ini" - WriteRegStr HKLM "${REG_KEY_PRODUCT}" "InstallPath" "$INSTDIR" - WriteRegStr HKLM "${REG_KEY_PRODUCT}" "InstalledVersion" "${VLD_VERSION}" -SectionEnd - -Section "Header File" - SetOutPath "${INCLUDE_PATH}" - File "..\vld.h" - File "..\vld_def.h" -SectionEnd - -Section "Import Library" - SetOutPath "${LIB_PATH}\Win32" - File "..\Win32\Release\vld.lib" - SetOutPath "${LIB_PATH}\Win64" - File "..\x64\Release\vld.lib" -SectionEnd - -Section "Dynamic Link Libraries" - SetOutPath "${BIN_PATH}\Win32" - !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "..\Win32\Release\vld_x86.dll" "${BIN_PATH}\Win32\vld_x86.dll" $INSTDIR - SetOutPath "${BIN_PATH}\Win64" - !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "..\x64\Release\vld_x64.dll" "${BIN_PATH}\Win64\vld_x64.dll" $INSTDIR - MessageBox MB_YESNO "Visual Leak Detector needs the location of vld_x86.dll and vld_x64.dll to be added to your 'Path' environment variable.$\n$\nWould you like the installer to add it to the path now? If you select No, you'll need to add it to the path manually." \ - IDYES addtopath IDNO skipaddtopath -addtopath: - DetailPrint "Adding ${BIN_PATH} to the 'Path' system environment variable." - InitPluginsDir - SetOutPath "$PLUGINSDIR" - File "${EDITENV_PATH}\${EDITENV_DLL}" - System::Call "editenv::pathAdd(i ${ES_SYSTEM}, t '${BIN_PATH}\Win32') ? u" - System::Call "editenv::pathAdd(i ${ES_SYSTEM}, t '${BIN_PATH}\Win64') ? u" - Delete "$PLUGINSDIR\${EDITENV_DLL}" - SetOutPath "${BIN_PATH}" -skipaddtopath: - SetOutPath "${BIN_PATH}\Win32" - !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "dbghelp\x86\${DHL_DLL}" "${BIN_PATH}\Win32\${DHL_DLL}" $INSTDIR - File "dbghelp\x86\Microsoft.DTfW.DHL.manifest" - SetOutPath "${BIN_PATH}\Win64" - !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "dbghelp\x64\${DHL_DLL}" "${BIN_PATH}\Win64\${DHL_DLL}" $INSTDIR - File "dbghelp\x64\Microsoft.DTfW.DHL.manifest" -# File "${CRT_PATH}\${CRT_MANIFEST}" -SectionEnd - -Section "Configuration File" - SetOutPath "$INSTDIR" - File "..\vld.ini" -SectionEnd - -Section "Source Code" - SetOutPath "${SRC_PATH}" - File "version.h" - File "..\*.cpp" - File "..\*.h" - File "..\vld.vcxproj" - File "..\vld.vcxproj.filters" - File "..\*.manifest" - File "..\*.rc" -SectionEnd - -Section "Documentation" - SetOutPath "$INSTDIR" - File "..\AUTHORS.txt" - File "..\CHANGES.txt" - File "..\COPYING.txt" -SectionEnd - -Section "Start Menu Shortcuts" - !insertmacro MUI_STARTMENU_WRITE_BEGIN "Shortcuts" - SetOutPath "$INSTDIR" - SetShellVarContext all - CreateDirectory "${LNK_PATH}" - CreateShortcut "${LNK_PATH}\Configure.lnk" "$INSTDIR\vld.ini" - CreateShortcut "${LNK_PATH}\Documentation.lnk" "http://vld.codeplex.com/documentation" - CreateShortcut "${LNK_PATH}\Authors.lnk" "$INSTDIR\AUTHORS.txt" - CreateShortcut "${LNK_PATH}\License.lnk" "$INSTDIR\COPYING.txt" - CreateShortcut "${LNK_PATH}\Uninstall.lnk" "$INSTDIR\uninstall.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - - -################################################################################ -# -# Uninstallation -# -Section "un.Header File" - Delete "${INCLUDE_PATH}\vld.h" - Delete "${INCLUDE_PATH}\vld_def.h" - RMDir "${INCLUDE_PATH}" -SectionEnd - -Section "un.Import Library" - Delete "${LIB_PATH}\Win32\vld.lib" - RMDir "${LIB_PATH}\Win32" - Delete "${LIB_PATH}\Win64\vld.lib" - RMDir "${LIB_PATH}\Win64" - RMDir "${LIB_PATH}" -SectionEnd - -Section "un.Dynamic Link Libraries" - !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win32\vld_x86.dll" - !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win64\vld_x64.dll" - DetailPrint "Removing ${BIN_PATH} from the 'Path' system environment variable." - InitPluginsDir - SetOutPath "$PLUGINSDIR" - File "${EDITENV_PATH}\${EDITENV_DLL}" - System::Call "editenv::pathRemove(i ${ES_SYSTEM}, t '${BIN_PATH}\Win32') ? u" - System::Call "editenv::pathRemove(i ${ES_SYSTEM}, t '${BIN_PATH}\Win64') ? u" - Delete "$PLUGINSDIR\${EDITENV_DLL}" - !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win32\${DHL_DLL}" - Delete "${BIN_PATH}\Win32\Microsoft.DTfW.DHL.manifest" - RMDir "${BIN_PATH}\Win32" - !insertmacro UnInstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "${BIN_PATH}\Win64\${DHL_DLL}" - Delete "${BIN_PATH}\Win64\Microsoft.DTfW.DHL.manifest" - RMDir "${BIN_PATH}\Win64" -# Delete "${BIN_PATH}\${CRT_MANIFEST}" - RMDir "${BIN_PATH}" -SectionEnd - -Section "un.Configuration File" - Delete "$INSTDIR\vld.ini" -SectionEnd - -Section "un.Source Code" - Delete "${SRC_PATH}\*.cpp" - Delete "${SRC_PATH}\*.h" - Delete "${SRC_PATH}\vld.vcxproj" - Delete "${SRC_PATH}\vld.vcxproj.filters" - Delete "${SRC_PATH}\*.manifest" - Delete "${SRC_PATH}\*.rc" - RMDir "${SRC_PATH}" -SectionEnd - -Section "un.Documentation" - Delete "$INSTDIR\AUTHORS.txt" - Delete "$INSTDIR\CHANGES.txt" - Delete "$INSTDIR\COPYING.txt" -SectionEnd - -Section "un.Start Menu Shortcuts" - !insertmacro MUI_STARTMENU_GETFOLDER "Shortcuts" $SM_PATH - SetShellVarContext all - Delete "${LNK_PATH}\Configure.lnk" - Delete "${LNK_PATH}\Authors.lnk" - Delete "${LNK_PATH}\Documentation.lnk" - Delete "${LNK_PATH}\License.lnk" - Delete "${LNK_PATH}\Uninstall.lnk" - RMDir "${LNK_PATH}" -SectionEnd - -Section "un.Registry Keys" - DeleteRegKey HKLM "${REG_KEY_PRODUCT}" -SectionEnd - -Section "un.Uninstaller" - Delete "$INSTDIR\uninstall.exe" - RMDir "$INSTDIR" - DeleteRegKey HKLM "${REG_KEY_UNINSTALL}" -SectionEnd From d6472959c87737514475a86ae7afc397bdbce020 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 25 Nov 2013 00:24:11 +0400 Subject: [PATCH 148/321] Header for C code fixed --- vld.h | 29 ++++++++++-------- vld_def.h | 92 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 63 insertions(+), 58 deletions(-) diff --git a/vld.h b/vld.h index a24a09f9..723c1634 100644 --- a/vld.h +++ b/vld.h @@ -25,9 +25,12 @@ #include "vld_def.h" -#if defined _DEBUG || defined VLD_FORCE_ENABLE +typedef int VLD_BOOL; +typedef unsigned int VLD_UINT; +typedef size_t VLD_SIZET; +typedef void* VLD_HMODULE; -#include +#if defined _DEBUG || defined VLD_FORCE_ENABLE #pragma comment(lib, "vld.lib") @@ -123,7 +126,7 @@ __declspec(dllimport) void VLDGlobalEnable (); // // None. // -__declspec(dllimport) UINT VLDReportLeaks (); +__declspec(dllimport) VLD_UINT VLDReportLeaks (); // VLDGetLeaksCount - Return memory leaks count to the execution point. // @@ -131,7 +134,7 @@ __declspec(dllimport) UINT VLDReportLeaks (); // // None. // -__declspec(dllimport) UINT VLDGetLeaksCount (); +__declspec(dllimport) VLD_UINT VLDGetLeaksCount (); // VLDMarkAllLeaksAsReported - Mark all leaks as reported. // @@ -160,7 +163,7 @@ __declspec(dllimport) void VLDRefreshModules(); // None. // -__declspec(dllimport) void VLDEnableModule(HMODULE module); +__declspec(dllimport) void VLDEnableModule(VLD_HMODULE module); // VLDDisableModule - Disable Memory leak checking on the specified module. @@ -171,7 +174,7 @@ __declspec(dllimport) void VLDEnableModule(HMODULE module); // // None. // -__declspec(dllimport) void VLDDisableModule(HMODULE module); +__declspec(dllimport) void VLDDisableModule(VLD_HMODULE module); // VLDGetOptions - Return all current options. // @@ -179,7 +182,7 @@ __declspec(dllimport) void VLDDisableModule(HMODULE module); // // Mask of current options. // -__declspec(dllimport) UINT VLDGetOptions(); +__declspec(dllimport) VLD_UINT VLDGetOptions(); // VLDGetReportFilename - Return current report filename. // @@ -189,7 +192,7 @@ __declspec(dllimport) UINT VLDGetOptions(); // // None. // -__declspec(dllimport) void VLDGetReportFilename(WCHAR *filename); +__declspec(dllimport) void VLDGetReportFilename(wchar_t *filename); // VLDSetOptions - Update the report options via function call rather than INI file. // @@ -211,7 +214,7 @@ __declspec(dllimport) void VLDGetReportFilename(WCHAR *filename); // // None. // -__declspec(dllimport) void VLDSetOptions(UINT option_mask, SIZE_T maxDataDump, UINT maxTraceFrames); +__declspec(dllimport) void VLDSetOptions(VLD_UINT option_mask, VLD_SIZET maxDataDump, VLD_UINT maxTraceFrames); // VLDSetModulesList - Set list of modules included/excluded in leak detection // depending on parameter "includeModules". @@ -224,7 +227,7 @@ __declspec(dllimport) void VLDSetOptions(UINT option_mask, SIZE_T maxDataDump, U // // None. // -__declspec(dllimport) void VLDSetModulesList(CONST WCHAR *modules, BOOL includeModules); +__declspec(dllimport) void VLDSetModulesList(const wchar_t *modules, VLD_BOOL includeModules); // VLDGetModulesList - Return current list of included/excluded modules // depending on flag VLD_OPT_TRACE_INTERNAL_FRAMES. @@ -235,9 +238,9 @@ __declspec(dllimport) void VLDSetModulesList(CONST WCHAR *modules, BOOL includeM // // Return Value: // -// BOOL: TRUE if include modules, otherwise FALSE. +// VLD_BOOL: TRUE if include modules, otherwise FALSE. // -__declspec(dllimport) BOOL VLDGetModulesList(WCHAR *modules, UINT size); +__declspec(dllimport) VLD_BOOL VLDGetModulesList(wchar_t *modules, VLD_UINT size); // VLDSetReportOptions - Update the report options via function call rather than INI file. // @@ -253,7 +256,7 @@ __declspec(dllimport) BOOL VLDGetModulesList(WCHAR *modules, UINT size); // // None. // -__declspec(dllimport) void VLDSetReportOptions(UINT option_mask, CONST WCHAR *filename); +__declspec(dllimport) void VLDSetReportOptions(VLD_UINT option_mask, const wchar_t *filename); // VLDSetReportHook - Installs or uninstalls a client-defined reporting function by hooking it // into the C run-time debug reporting process (debug version only). diff --git a/vld_def.h b/vld_def.h index 93bbfaf1..40614ed8 100644 --- a/vld_def.h +++ b/vld_def.h @@ -1,45 +1,47 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Import Library Header -// Copyright (c) 2005-2013 VLD Team -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#define VLD_OPT_AGGREGATE_DUPLICATES 0x0001 // If set, aggregate duplicate leaks in the leak report. -#define VLD_OPT_MODULE_LIST_INCLUDE 0x0002 // If set, modules in the module list are included, all others are excluded. -#define VLD_OPT_REPORT_TO_DEBUGGER 0x0004 // If set, the memory leak report is sent to the debugger. -#define VLD_OPT_REPORT_TO_FILE 0x0008 // If set, the memory leak report is sent to a file. -#define VLD_OPT_SAFE_STACK_WALK 0x0010 // If set, the stack is walked using the "safe" method (StackWalk64). -#define VLD_OPT_SELF_TEST 0x0020 // If set, perform a self-test to verify memory leak self-checking. -#define VLD_OPT_SLOW_DEBUGGER_DUMP 0x0040 // If set, inserts a slight delay between sending output to the debugger. -#define VLD_OPT_START_DISABLED 0x0080 // If set, memory leak detection will initially disabled. -#define VLD_OPT_TRACE_INTERNAL_FRAMES 0x0100 // If set, include useless frames (e.g. internal to VLD) in call stacks. -#define VLD_OPT_UNICODE_REPORT 0x0200 // If set, the leak report will be encoded UTF-16 instead of ASCII. -#define VLD_OPT_VLDOFF 0x0400 // If set, VLD will be completely deactivated. It will not attach to any modules. -#define VLD_OPT_REPORT_TO_STDOUT 0x0800 // If set, the memory leak report is sent to stdout. -#define VLD_OPT_SKIP_HEAPFREE_LEAKS 0x1000 // If set, VLD skip HeapFree memory leaks. -#define VLD_OPT_VALIDATE_HEAPFREE 0x2000 // If set, VLD verifies and reports heap consistency for HeapFree calls. -#define VLD_OPT_RELEASE_CRT_RUNTIME 0x4000 // If set, VLD treat CRT runtime as release version (use only with define VLD_FORCE_ENABLE). - -#define VLD_RPTHOOK_INSTALL 0 -#define VLD_RPTHOOK_REMOVE 1 - -typedef int (__cdecl * VLD_REPORT_HOOK)(int reportType, wchar_t *message, int *returnValue); +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Import Library Header +// Copyright (c) 2005-2013 VLD Team +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include + +#define VLD_OPT_AGGREGATE_DUPLICATES 0x0001 // If set, aggregate duplicate leaks in the leak report. +#define VLD_OPT_MODULE_LIST_INCLUDE 0x0002 // If set, modules in the module list are included, all others are excluded. +#define VLD_OPT_REPORT_TO_DEBUGGER 0x0004 // If set, the memory leak report is sent to the debugger. +#define VLD_OPT_REPORT_TO_FILE 0x0008 // If set, the memory leak report is sent to a file. +#define VLD_OPT_SAFE_STACK_WALK 0x0010 // If set, the stack is walked using the "safe" method (StackWalk64). +#define VLD_OPT_SELF_TEST 0x0020 // If set, perform a self-test to verify memory leak self-checking. +#define VLD_OPT_SLOW_DEBUGGER_DUMP 0x0040 // If set, inserts a slight delay between sending output to the debugger. +#define VLD_OPT_START_DISABLED 0x0080 // If set, memory leak detection will initially disabled. +#define VLD_OPT_TRACE_INTERNAL_FRAMES 0x0100 // If set, include useless frames (e.g. internal to VLD) in call stacks. +#define VLD_OPT_UNICODE_REPORT 0x0200 // If set, the leak report will be encoded UTF-16 instead of ASCII. +#define VLD_OPT_VLDOFF 0x0400 // If set, VLD will be completely deactivated. It will not attach to any modules. +#define VLD_OPT_REPORT_TO_STDOUT 0x0800 // If set, the memory leak report is sent to stdout. +#define VLD_OPT_SKIP_HEAPFREE_LEAKS 0x1000 // If set, VLD skip HeapFree memory leaks. +#define VLD_OPT_VALIDATE_HEAPFREE 0x2000 // If set, VLD verifies and reports heap consistency for HeapFree calls. +#define VLD_OPT_RELEASE_CRT_RUNTIME 0x4000 // If set, VLD treat CRT runtime as release version (use only with define VLD_FORCE_ENABLE). + +#define VLD_RPTHOOK_INSTALL 0 +#define VLD_RPTHOOK_REMOVE 1 + +typedef int (__cdecl * VLD_REPORT_HOOK)(int reportType, wchar_t *message, int *returnValue); From 01e53e5edafd007afac3593df0b396639ffd4ba5 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 15 Dec 2013 15:48:06 +0400 Subject: [PATCH 149/321] VS 2013 support added --- .gitignore | 2 + crtmfcpatch.h | 88 ++- dllspatches.cpp | 77 ++- mfc_detect/vldmfc.cpp | 12 +- tests/mfc/vldmfc.vcxproj | 1244 ++++++++++++++++++------------------- tests/suite/testsuite.cpp | 8 +- vldint.h | 2 +- 7 files changed, 800 insertions(+), 633 deletions(-) diff --git a/.gitignore b/.gitignore index b351a77e..a8ef86e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ obj/ Debug/ +Debug (Unicode)/ Release/ +Release (Unicode)/ Win32/ x64/ *.vcxproj.user diff --git a/crtmfcpatch.h b/crtmfcpatch.h index d7ff5d7b..6805c88a 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1244,11 +1244,16 @@ typedef CrtMfcPatch<100> VS100; typedef CrtMfcPatch<100, true> VS100d; -// Visual Studio 2011 +// Visual Studio 2012 typedef CrtMfcPatch<110> VS110; typedef CrtMfcPatch<110, true> VS110d; +// Visual Studio 2013 +typedef CrtMfcPatch<120> + VS120; +typedef CrtMfcPatch<120, true> + VS120d; void* VS60::pcrtd__calloc_dbg = NULL; void* VS60::pcrtd__malloc_dbg = NULL; @@ -1824,3 +1829,84 @@ void* VS110d::pmfcud__vector_new_dbg_4p = NULL; void* VS110d::pmfcud__scalar_new_dbg_3p = NULL; void* VS110d::pmfcud__vector_new_dbg_3p = NULL; +void* VS120::pcrtd__calloc_dbg = NULL; +void* VS120::pcrtd__malloc_dbg = NULL; +void* VS120::pcrtd__realloc_dbg = NULL; +void* VS120::pcrtd__recalloc_dbg = NULL; +void* VS120::pcrtd__strdup_dbg = NULL; +void* VS120::pcrtd__wcsdup_dbg = NULL; +void* VS120::pcrtd_calloc = NULL; +void* VS120::pcrtd_malloc = NULL; +void* VS120::pcrtd_realloc = NULL; +void* VS120::pcrtd_recalloc = NULL; +void* VS120::pcrtd__strdup = NULL; +void* VS120::pcrtd__wcsdup = NULL; +void* VS120::pcrtd__aligned_malloc_dbg = NULL; +void* VS120::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS120::pcrtd__aligned_realloc_dbg = NULL; +void* VS120::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS120::pcrtd__aligned_recalloc_dbg = NULL; +void* VS120::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS120::pcrtd_aligned_malloc = NULL; +void* VS120::pcrtd_aligned_offset_malloc = NULL; +void* VS120::pcrtd_aligned_realloc = NULL; +void* VS120::pcrtd_aligned_offset_realloc = NULL; +void* VS120::pcrtd_aligned_recalloc = NULL; +void* VS120::pcrtd_aligned_offset_recalloc = NULL; +void* VS120::pcrtd__scalar_new_dbg = NULL; +void* VS120::pcrtd__vector_new_dbg = NULL; +void* VS120::pcrtd_scalar_new = NULL; +void* VS120::pcrtd_vector_new = NULL; +void* VS120::pmfcd_scalar_new = NULL; +void* VS120::pmfcd_vector_new = NULL; +void* VS120::pmfcd__scalar_new_dbg_4p = NULL; +void* VS120::pmfcd__vector_new_dbg_4p = NULL; +void* VS120::pmfcd__scalar_new_dbg_3p = NULL; +void* VS120::pmfcd__vector_new_dbg_3p = NULL; +void* VS120::pmfcud_scalar_new = NULL; +void* VS120::pmfcud_vector_new = NULL; +void* VS120::pmfcud__scalar_new_dbg_4p = NULL; +void* VS120::pmfcud__vector_new_dbg_4p = NULL; +void* VS120::pmfcud__scalar_new_dbg_3p = NULL; +void* VS120::pmfcud__vector_new_dbg_3p = NULL; + +void* VS120d::pcrtd__calloc_dbg = NULL; +void* VS120d::pcrtd__malloc_dbg = NULL; +void* VS120d::pcrtd__realloc_dbg = NULL; +void* VS120d::pcrtd__recalloc_dbg = NULL; +void* VS120d::pcrtd__strdup_dbg = NULL; +void* VS120d::pcrtd__wcsdup_dbg = NULL; +void* VS120d::pcrtd_calloc = NULL; +void* VS120d::pcrtd_malloc = NULL; +void* VS120d::pcrtd_realloc = NULL; +void* VS120d::pcrtd_recalloc = NULL; +void* VS120d::pcrtd__strdup = NULL; +void* VS120d::pcrtd__wcsdup = NULL; +void* VS120d::pcrtd__aligned_malloc_dbg = NULL; +void* VS120d::pcrtd__aligned_offset_malloc_dbg = NULL; +void* VS120d::pcrtd__aligned_realloc_dbg = NULL; +void* VS120d::pcrtd__aligned_offset_realloc_dbg = NULL; +void* VS120d::pcrtd__aligned_recalloc_dbg = NULL; +void* VS120d::pcrtd__aligned_offset_recalloc_dbg = NULL; +void* VS120d::pcrtd_aligned_malloc = NULL; +void* VS120d::pcrtd_aligned_offset_malloc = NULL; +void* VS120d::pcrtd_aligned_realloc = NULL; +void* VS120d::pcrtd_aligned_offset_realloc = NULL; +void* VS120d::pcrtd_aligned_recalloc = NULL; +void* VS120d::pcrtd_aligned_offset_recalloc = NULL; +void* VS120d::pcrtd__scalar_new_dbg = NULL; +void* VS120d::pcrtd__vector_new_dbg = NULL; +void* VS120d::pcrtd_scalar_new = NULL; +void* VS120d::pcrtd_vector_new = NULL; +void* VS120d::pmfcd_scalar_new = NULL; +void* VS120d::pmfcd_vector_new = NULL; +void* VS120d::pmfcd__scalar_new_dbg_4p = NULL; +void* VS120d::pmfcd__vector_new_dbg_4p = NULL; +void* VS120d::pmfcd__scalar_new_dbg_3p = NULL; +void* VS120d::pmfcd__vector_new_dbg_3p = NULL; +void* VS120d::pmfcud_scalar_new = NULL; +void* VS120d::pmfcud_vector_new = NULL; +void* VS120d::pmfcud__scalar_new_dbg_4p = NULL; +void* VS120d::pmfcud__vector_new_dbg_4p = NULL; +void* VS120d::pmfcud__scalar_new_dbg_3p = NULL; +void* VS120d::pmfcud__vector_new_dbg_3p = NULL; diff --git a/dllspatches.cpp b/dllspatches.cpp index fd016b02..8013a1f2 100644 --- a/dllspatches.cpp +++ b/dllspatches.cpp @@ -281,13 +281,13 @@ static patchentry_t mfc110dPatch [] = { ORDINAL2(1631, 1609), &VS110d::pmfcd__scalar_new_dbg_3p, VS110d::mfcd__scalar_new_dbg_3p, NULL, NULL, NULL }; - + static patchentry_t mfc110uPatch [] = { ORDINAL(265), &VS110::pmfcud_vector_new, VS110::mfcud_vector_new, ORDINAL2(1502, 1480), &VS110::pmfcud_scalar_new, VS110::mfcud_scalar_new, NULL, NULL, NULL -}; - +}; + static patchentry_t mfc110udPatch [] = { ORDINAL(267), &VS110d::pmfcud_vector_new, VS110d::mfcud_vector_new, ORDINAL(268), &VS110d::pmfcud__vector_new_dbg_4p, VS110d::mfcud__vector_new_dbg_4p, @@ -298,6 +298,22 @@ static patchentry_t mfc110udPatch [] = { NULL, NULL, NULL }; +static patchentry_t mfc120uPatch [] = { + ORDINAL(265), &VS120::pmfcud_vector_new, VS120::mfcud_vector_new, + ORDINAL2(1506, 1484), &VS120::pmfcud_scalar_new, VS120::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc120udPatch [] = { + ORDINAL(267), &VS120d::pmfcud_vector_new, VS120d::mfcud_vector_new, + ORDINAL(268), &VS120d::pmfcud__vector_new_dbg_4p, VS120d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS120d::pmfcud__vector_new_dbg_3p, VS120d::mfcud__vector_new_dbg_3p, + ORDINAL2(1640, 1618), &VS120d::pmfcud_scalar_new, VS120d::mfcud_scalar_new, + ORDINAL2(1641, 1619), &VS120d::pmfcud__scalar_new_dbg_4p, VS120d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1642, 1620), &VS120d::pmfcud__scalar_new_dbg_3p, VS120d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + static patchentry_t msvcrtPatch [] = { scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, //vector_new_dbg_name, &VS60::pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, @@ -584,6 +600,57 @@ static patchentry_t msvcr110dPatch [] = { NULL, NULL, NULL, }; +static patchentry_t msvcr120Patch [] = { + scalar_new_dbg_name, &VS120::pcrtd__scalar_new_dbg, VS120::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS120::pcrtd__vector_new_dbg, VS120::crtd__vector_new_dbg, + "calloc", &VS120::pcrtd_calloc, VS120::crtd_calloc, + "malloc", &VS120::pcrtd_malloc, VS120::crtd_malloc, + "realloc", &VS120::pcrtd_realloc, VS120::crtd_realloc, + "_recalloc", &VS120::pcrtd_recalloc, VS120::crtd__recalloc, + "_strdup", &VS120::pcrtd__strdup, VS120::crtd__strdup, + "_wcsdup", &VS120::pcrtd__wcsdup, VS120::crtd__wcsdup, + scalar_new_name, &VS120::pcrtd_scalar_new, VS120::crtd_scalar_new, + vector_new_name, &VS120::pcrtd_vector_new, VS120::crtd_vector_new, + "_aligned_malloc", &VS120::pcrtd_aligned_malloc, VS120::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS120::pcrtd_aligned_offset_malloc, VS120::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS120::pcrtd_aligned_realloc, VS120::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS120::pcrtd_aligned_offset_realloc, VS120::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS120::pcrtd_aligned_recalloc, VS120::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS120::pcrtd_aligned_offset_recalloc, VS120::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, +}; + +static patchentry_t msvcr120dPatch [] = { + "_calloc_dbg", &VS120d::pcrtd__calloc_dbg, VS120d::crtd__calloc_dbg, + "_malloc_dbg", &VS120d::pcrtd__malloc_dbg, VS120d::crtd__malloc_dbg, + "_realloc_dbg", &VS120d::pcrtd__realloc_dbg, VS120d::crtd__realloc_dbg, + "_recalloc_dbg", &VS120d::pcrtd__recalloc_dbg, VS120d::crtd__recalloc_dbg, + "_strdup_dbg", &VS120d::pcrtd__strdup_dbg, VS120d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS120d::pcrtd__wcsdup_dbg, VS120d::crtd__wcsdup_dbg, + scalar_new_dbg_name, &VS120d::pcrtd__scalar_new_dbg, VS120d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS120d::pcrtd__vector_new_dbg, VS120d::crtd__vector_new_dbg, + "calloc", &VS120d::pcrtd_calloc, VS120d::crtd_calloc, + "malloc", &VS120d::pcrtd_malloc, VS120d::crtd_malloc, + "realloc", &VS120d::pcrtd_realloc, VS120d::crtd_realloc, + "_recalloc", &VS120d::pcrtd_recalloc, VS120d::crtd__recalloc, + "_strdup", &VS120d::pcrtd__strdup, VS120d::crtd__strdup, + "_wcsdup", &VS120d::pcrtd__wcsdup, VS120d::crtd__wcsdup, + scalar_new_name, &VS120d::pcrtd_scalar_new, VS120d::crtd_scalar_new, + vector_new_name, &VS120d::pcrtd_vector_new, VS120d::crtd_vector_new, + "_aligned_malloc_dbg", &VS120d::pcrtd__aligned_malloc_dbg, VS120d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS120d::pcrtd__aligned_offset_malloc_dbg, VS120d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS120d::pcrtd__aligned_realloc_dbg, VS120d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS120d::pcrtd__aligned_offset_realloc_dbg, VS120d::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS120d::pcrtd__aligned_recalloc_dbg, VS120d::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS120d::pcrtd__aligned_offset_recalloc_dbg,VS120d::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS120d::pcrtd_aligned_malloc, VS120d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS120d::pcrtd_aligned_offset_malloc, VS120d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS120d::pcrtd_aligned_realloc, VS120d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS120d::pcrtd_aligned_offset_realloc, VS120d::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS120d::pcrtd_aligned_recalloc, VS120d::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS120d::pcrtd_aligned_offset_recalloc, VS120d::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, +}; patchentry_t VisualLeakDetector::m_ntdllPatch [] = { "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, "RtlFreeHeap", NULL, VisualLeakDetector::_RtlFreeHeap, @@ -632,6 +699,8 @@ moduleentry_t VisualLeakDetector::m_patchTable [] = { "mfc110d.dll", 0x0, mfc110dPatch, "mfc110u.dll", 0x0, mfc110uPatch, "mfc110ud.dll", 0x0, mfc110udPatch, + "mfc120u.dll", 0x0, mfc120uPatch, + "mfc120ud.dll", 0x0, mfc120udPatch, // CRT new operators and heap APIs. "msvcrt.dll", 0x0, msvcrtPatch, @@ -648,6 +717,8 @@ moduleentry_t VisualLeakDetector::m_patchTable [] = { "msvcr100d.dll",0x0, msvcr100dPatch, "msvcr110.dll", 0x0, msvcr110Patch, "msvcr110d.dll",0x0, msvcr110dPatch, + "msvcr120.dll", 0x0, msvcr120Patch, + "msvcr120d.dll",0x0, msvcr120dPatch, // NT APIs. "ntdll.dll", 0x0, m_ntdllPatch, diff --git a/mfc_detect/vldmfc.cpp b/mfc_detect/vldmfc.cpp index eceda658..419b4591 100644 --- a/mfc_detect/vldmfc.cpp +++ b/mfc_detect/vldmfc.cpp @@ -224,7 +224,7 @@ BOOL CMFCExampleApp::InitInstance() #define MFCDLLNAME _T("mfc90d.dll") #elif _MFC_VER == 0x0A00 // VS 2010 #define MFCDLLNAME _T("mfc100d.dll") -#elif _MFC_VER == 0x0B00 // VS 2011 +#elif _MFC_VER == 0x0B00 // VS 2012 #define MFCDLLNAME _T("mfc110d.dll") #endif #else @@ -236,8 +236,10 @@ BOOL CMFCExampleApp::InitInstance() #define MFCDLLNAME _T("mfc90ud.dll") #elif _MFC_VER == 0x0A00 // VS 2010 #define MFCDLLNAME _T("mfc100ud.dll") -#elif _MFC_VER == 0x0B00 // VS 2011 +#elif _MFC_VER == 0x0B00 // VS 2012 #define MFCDLLNAME _T("mfc110ud.dll") +#elif _MFC_VER == 0x0C00 // VS 2013 +#define MFCDLLNAME _T("mfc120ud.dll") #endif #endif #else @@ -250,7 +252,7 @@ BOOL CMFCExampleApp::InitInstance() #define MFCDLLNAME _T("mfc90.dll") #elif _MFC_VER == 0x0A00 // VS 2010 #define MFCDLLNAME _T("mfc100.dll") -#elif _MFC_VER == 0x0B00 // VS 2010 +#elif _MFC_VER == 0x0B00 // VS 2012 #define MFCDLLNAME _T("mfc110.dll") #endif #else @@ -262,8 +264,10 @@ BOOL CMFCExampleApp::InitInstance() #define MFCDLLNAME _T("mfc90u.dll") #elif _MFC_VER == 0x0A00 // VS 2010 #define MFCDLLNAME _T("mfc100u.dll") -#elif _MFC_VER == 0x0B00 // VS 2011 +#elif _MFC_VER == 0x0B00 // VS 2012 #define MFCDLLNAME _T("mfc110u.dll") +#elif _MFC_VER == 0x0C00 // VS 2013 +#define MFCDLLNAME _T("mfc120u.dll") #endif #endif #endif diff --git a/tests/mfc/vldmfc.vcxproj b/tests/mfc/vldmfc.vcxproj index c8c03d7a..5f78fd2c 100644 --- a/tests/mfc/vldmfc.vcxproj +++ b/tests/mfc/vldmfc.vcxproj @@ -1,624 +1,624 @@ - + - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {A231973E-072A-428E-982E-5363ADD1CDE2} - MFCProj - - - - Application - Dynamic - MultiByte - - - Application - Static - MultiByte - - - Application - Dynamic - Unicode - - - Application - Static - Unicode - - - Application - Dynamic - MultiByte - - - Application - Static - MultiByte - - - Application - Dynamic - MultiByte - - - Application - Static - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - false - false - false - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - true - true - true - true - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - - - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/vldmfc.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Level3 - true - Use - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - Windows - false - - - MachineX86 - true - - - true - .\Release/vldmfc.bsc - - - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/vldmfc.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - Level3 - true - Use - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - Windows - false - - - MachineX86 - true - - - true - .\Release/vldmfc.bsc - - - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/vldmfc.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Level3 - true - Use - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - Windows - false - - - true - - - true - .\Release/vldmfc.bsc - - - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/vldmfc.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - Level3 - true - Use - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - Windows - false - - - true - - - true - .\Release/vldmfc.bsc - - - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/vldmfc.tlb - - - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - stdafx.h - .\Debug/vldmfc.pch - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - Windows - false - - - MachineX86 - - - true - .\Debug/vldmfc.bsc - - - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/vldmfc.tlb - - - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Use - stdafx.h - .\Debug/vldmfc.pch - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - true - Windows - false - - - MachineX86 - - - true - .\Debug/vldmfc.bsc - - - ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/vldmfc.tlb - - - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - stdafx.h - .\Debug/vldmfc.pch - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - Windows - false - - - - - true - .\Debug/vldmfc.bsc - - - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/vldmfc.tlb - - - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - stdafx.h - .\Debug/vldmfc.pch - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - true - Windows - false - - - - - true - .\Debug/vldmfc.bsc - - - ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - Create - Create - Create - Create - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - Create - Create - Create - Create - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {A231973E-072A-428E-982E-5363ADD1CDE2} + MFCProj + + + + Application + Dynamic + Unicode + + + Application + Static + Unicode + + + Application + Dynamic + Unicode + + + Application + Static + Unicode + + + Application + Dynamic + Unicode + + + Application + Static + Unicode + + + Application + Dynamic + Unicode + + + Application + Static + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + false + false + false + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + true + true + true + true + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + + + + + + + + + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + Windows + false + + + MachineX86 + true + + + true + .\Release/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + Windows + false + + + MachineX86 + true + + + true + .\Release/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\Release x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + Windows + false + + + true + + + true + .\Release/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + Windows + false + + + true + + + true + .\Release/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\Release x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + true + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + true + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/vldmfc.tlb + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + true + Windows + false + + + + + true + .\Debug/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/vldmfc.tlb + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + true + Windows + false + + + + + true + .\Debug/vldmfc.bsc + + + ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + Create + Create + Create + Create + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + Create + Create + Create + Create + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 0770abdb..6d968721 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -60,8 +60,10 @@ enum action_e { #define CRTDLLNAME _T("msvcr90d.dll") #elif _MSC_VER == 1600 // VS 2010 #define CRTDLLNAME _T("msvcr100d.dll") -#elif _MSC_VER == 1700 // VS 2011 +#elif _MSC_VER == 1700 // VS 2012 #define CRTDLLNAME _T("msvcr110d.dll") +#elif _MSC_VER == 1800 // VS 2013 +#define CRTDLLNAME _T("msvcr120d.dll") #endif #else #if _MSC_VER == 1400 // VS 2005 @@ -70,8 +72,10 @@ enum action_e { #define CRTDLLNAME _T("msvcr90.dll") #elif _MSC_VER == 1600 // VS 2010 #define CRTDLLNAME _T("msvcr100.dll") -#elif _MSC_VER == 1700 // VS 2011 +#elif _MSC_VER == 1700 // VS 2012 #define CRTDLLNAME _T("msvcr110.dll") +#elif _MSC_VER == 1800 // VS 2013 +#define CRTDLLNAME _T("msvcr120.dll") #endif #endif diff --git a/vldint.h b/vldint.h index 3f1fc0e3..e55e1b85 100644 --- a/vldint.h +++ b/vldint.h @@ -363,7 +363,7 @@ class VisualLeakDetector : public IMalloc static patchentry_t m_kernel32Patch []; static patchentry_t m_ntdllPatch []; static patchentry_t m_ole32Patch []; - static moduleentry_t m_patchTable [46]; // Table of imports patched for attaching VLD to other modules. + static moduleentry_t m_patchTable [50]; // Table of imports patched for attaching VLD to other modules. FILE *m_reportFile; // File where the memory leak report may be sent to. WCHAR m_reportFilePath [MAX_PATH]; // Full path and name of file to send memory leak report to. const char *m_selfTestFile; // Filename where the memory leak self-test block is leaked. From d8f8acca5bec5bab94850f51849455214b9ffb3b Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 15 Dec 2013 16:28:39 +0400 Subject: [PATCH 150/321] Copyright updated --- CHANGES.txt | 12 +++++++++++- README.md | 2 +- callstack.cpp | 2 +- callstack.h | 2 +- crtmfcpatch.h | 2 +- dllspatches.cpp | 2 +- map.h | 2 +- ntapi.cpp | 2 +- ntapi.h | 2 +- set.h | 2 +- setup/version.h | 10 +++++----- setup/vld-setup.iss | 2 +- tree.h | 2 +- utility.cpp | 2 +- utility.h | 2 +- vld.cpp | 2 +- vld.h | 10 +++++----- vld.ini | 5 ++--- vld_def.h | 2 +- vld_hooks.cpp | 2 +- vldapi.cpp | 2 +- vldheap.cpp | 2 +- vldheap.h | 2 +- vldint.h | 2 +- 24 files changed, 43 insertions(+), 34 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index bb51dc83..07f45537 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,18 @@ -Visual Leak Detector (VLD) Version 2.3.0 +Visual Leak Detector (VLD) Version 2.4.0 Change Log / Release Notes +2.4 (15 December 2013) +---------------------------- + Enhancements: + + VS2013 support added. + + Improved usage in C code. + + Setup rewrited to InnoSetup, autopatching common props implemented for VS2010-2013. + + Bugs Fixed: + + Memory leaks with duplicate thread id fixed (thanks to jlddodger). + 2.3 (29 April 2013) ---------------------------- Enhancements: diff --git a/README.md b/README.md index a3568283..764b93ff 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ We encourage developers who've added their own features, or fixed bugs they've f * [Source code at Codeplex](http://vld.codeplex.com/SourceControl/BrowseLatest) * [Source code at GitHub](https://github.com/KindDragon/vld) -Copyright © 2005-2013 VLD Team +Copyright © 2005-2014 VLD Team [1]: http://vld.codeplex.com/discussions [2]: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N3QTYHP9LH6UY&lc=GB&item_name=Visual%20Leak%20Detector¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted diff --git a/callstack.cpp b/callstack.cpp index 78f689b1..5f0dac48 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Implementations -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/callstack.h b/callstack.h index 8f12f171..9566f3ce 100644 --- a/callstack.h +++ b/callstack.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CallStack Class Definitions -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 6805c88a..7c4e5f6c 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - CRT and MFC IAT Patch Functions Header -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/dllspatches.cpp b/dllspatches.cpp index 8013a1f2..006367eb 100644 --- a/dllspatches.cpp +++ b/dllspatches.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/map.h b/map.h index c1987c0e..1c8f456d 100644 --- a/map.h +++ b/map.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Lightweight STL-like Map Template -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/ntapi.cpp b/ntapi.cpp index 0e91f87a..fad6a8d6 100644 --- a/ntapi.cpp +++ b/ntapi.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Global NT API Function Pointers -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/ntapi.h b/ntapi.h index 8a8dd937..54f82cbb 100644 --- a/ntapi.h +++ b/ntapi.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - NT API Definitions -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/set.h b/set.h index dda1905d..c3a03865 100644 --- a/set.h +++ b/set.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Lightweight STL-like Set Template -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/setup/version.h b/setup/version.h index 9abdad05..33907cce 100644 --- a/setup/version.h +++ b/setup/version.h @@ -1,9 +1,9 @@ -#define VLDVERSION L"2.3" -#define VERSION_NUMBER 2,3,0,0 -#define VERSION_STRING "2.3.0.0" -#define VERSION_COPYRIGHT "Copyright (C) 2005-2013" +#define VLDVERSION L"2.4" +#define VERSION_NUMBER 2,4,0,0 +#define VERSION_STRING "2.4.0.0" +#define VERSION_COPYRIGHT "Copyright (C) 2005-2014" #ifndef __FILE__ -!define VLD_VERSION "2.3" // NSIS Script +!define VLD_VERSION "2.4" // NSIS Script #endif diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index 9014014d..1dddbbbe 100644 --- a/setup/vld-setup.iss +++ b/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.3" +#define MyAppVersion "2.4" #define MyAppPublisher "VLD Team" #define MyAppURL "http://vld.codeplex.com/" diff --git a/tree.h b/tree.h index 0a997e65..3514ccbf 100644 --- a/tree.h +++ b/tree.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Red-black Tree Template -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/utility.cpp b/utility.cpp index dfdbcf06..6c038339 100644 --- a/utility.cpp +++ b/utility.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Various Utility Functions -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/utility.h b/utility.h index 8d1d8959..dfa0040c 100644 --- a/utility.h +++ b/utility.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Various Utility Definitions -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.cpp b/vld.cpp index a301b3d1..46331652 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld.h b/vld.h index 723c1634..371daf82 100644 --- a/vld.h +++ b/vld.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Import Library Header -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -293,18 +293,18 @@ __declspec(dllexport) void VLDResolveCallstacks(); #define VLDEnable() #define VLDDisable() #define VLDRestore() -#define VLDReportLeaks() 0 -#define VLDGetLeaksCount() 0 +#define VLDReportLeaks() (0) +#define VLDGetLeaksCount() (0) #define VLDMarkAllLeaksAsReported() #define VLDRefreshModules() #define VLDEnableModule(a) #define VLDDisableModule(b) -#define VLDGetOptions() 0 +#define VLDGetOptions() (0) #define VLDGetReportFilename(a) #define VLDSetOptions(a, b, c) #define VLDSetReportHook(a, b) #define VLDSetModulesList(a) -#define VLDGetModulesList(a, b) FALSE +#define VLDGetModulesList(a, b) (FALSE) #define VLDSetReportOptions(a, b) #endif // _DEBUG diff --git a/vld.ini b/vld.ini index b2d031f4..378f17ba 100644 --- a/vld.ini +++ b/vld.ini @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Visual Leak Detector - Initialization/Configuration File -;; Copyright (c) 2005-2013 VLD Team +;; Copyright (c) 2005-2014 VLD Team ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -52,8 +52,7 @@ AggregateDuplicates = no ; Only modules that link with the debug CRT libraries should be listed here. ; Doing otherwise might result in false memory leak reports or even crashes. ; -; Valid Values: Any list containing module names (i.e. names of EXEs or DLLs), -; for example, d3d9.dll;dxgi.dll;d3d10.dll;d3d10_1.dll;d3d11.dll +; Valid Values: Any list containing module names (i.e. names of EXEs or DLLs) ; Default: None. ; ForceIncludeModules = diff --git a/vld_def.h b/vld_def.h index 40614ed8..fccc2e68 100644 --- a/vld_def.h +++ b/vld_def.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Import Library Header -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vld_hooks.cpp b/vld_hooks.cpp index 68d0e3cf..e06a5da1 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Implementation -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldapi.cpp b/vldapi.cpp index 0fbc6194..ab85e103 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Exported APIs -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldheap.cpp b/vldheap.cpp index 73a19aa8..fe280db5 100644 --- a/vldheap.cpp +++ b/vldheap.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Internal C++ Heap Management -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldheap.h b/vldheap.h index be884a69..85bed4e3 100644 --- a/vldheap.h +++ b/vldheap.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Internal C++ Heap Management Definitions -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/vldint.h b/vldint.h index e55e1b85..e570a4e4 100644 --- a/vldint.h +++ b/vldint.h @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - VisualLeakDetector Class Definition -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public From 367d5721978b2b67ac02947a7140daf2e8ffef72 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 16 Dec 2013 02:12:49 +0400 Subject: [PATCH 151/321] Memory leaks with static linked CRT fixed for VS2012/2013. Called allocation function added to printed callstack. --- CHANGES.txt | 5 ++-- callstack.cpp | 15 +++++++++- crtmfcpatch.h | 80 ++++++++++++++++++++++++------------------------- dllspatches.cpp | 17 ++++++----- utility.h | 13 +++++--- vld.cpp | 77 ++++++++++++++++++++++++++++++++++++++++++++--- vld_hooks.cpp | 34 +++++++++++---------- vldint.h | 13 +++++--- 8 files changed, 176 insertions(+), 78 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 07f45537..a92bf48e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,15 +3,16 @@ Visual Leak Detector (VLD) Version 2.4.0 Change Log / Release Notes -2.4 (15 December 2013) +2.4 (16 December 2013) ---------------------------- Enhancements: + VS2013 support added. + Improved usage in C code. + Setup rewrited to InnoSetup, autopatching common props implemented for VS2010-2013. + + Called allocation function added to printed callstack. Bugs Fixed: - + Memory leaks with duplicate thread id fixed (thanks to jlddodger). + + Memory leaks with static linked CRT fixed for VS2012/2013. 2.3 (29 April 2013) ---------------------------- diff --git a/callstack.cpp b/callstack.cpp index 5f0dac48..63b17a84 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -541,6 +541,12 @@ bool CallStack::isInternalModule( const PWSTR filename ) const VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) { UINT32 count = 0; + UINT_PTR function = context.func; + if (function != NULL) + { + count++; + push_back(function); + } UINT_PTR* framePointer = context.fp; #if defined(_M_IX86) @@ -629,6 +635,14 @@ VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) // VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) { + UINT32 count = 0; + UINT_PTR function = context.func; + if (function != NULL) + { + count++; + push_back(function); + } + UINT_PTR* framePointer = context.fp; DWORD architecture = X86X64ARCHITECTURE; CONTEXT currentContext; @@ -666,7 +680,6 @@ VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) // Walk the stack. CriticalSectionLocker cs(g_stackWalkLock); - UINT32 count = 0; while (count < maxdepth) { count++; DbgTrace(L"dbghelp32.dll %i: StackWalk64\n", GetCurrentThreadId()); diff --git a/crtmfcpatch.h b/crtmfcpatch.h index 7c4e5f6c..fcedf081 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -161,7 +161,7 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, assert(pcrtxxd__calloc_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__calloc_dbg); return g_vld.__calloc_dbg(pcrtxxd__calloc_dbg, context, debug, num, size, type, file, line); } @@ -192,7 +192,7 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, assert(pcrtxxd__malloc_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__malloc_dbg); return g_vld.__malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, type, file, line); } @@ -226,7 +226,7 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__realloc_dbg); return g_vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, type, file, line); } @@ -261,7 +261,7 @@ void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, assert(pcrtxxd__recalloc_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__recalloc_dbg); return g_vld.__recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, type, file, line); } @@ -277,7 +277,7 @@ char* CrtMfcPatch::crtd__strdup_dbg (const char* src, assert(pcrtxxd__strdup_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__strdup_dbg); return g_vld.__strdup_dbg(pcrtxxd__strdup_dbg, context, debug, src, type, file, line); } @@ -293,7 +293,7 @@ wchar_t* CrtMfcPatch::crtd__wcsdup_dbg (const wchar_t* src, assert(pcrtxxd__wcsdup_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__wcsdup_dbg); return g_vld.__wcsdup_dbg(pcrtxxd__wcsdup_dbg, context, debug, src, type, file, line); } @@ -324,7 +324,7 @@ void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, assert(pcrtxxd_new_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__scalar_new_dbg); return g_vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); } @@ -355,7 +355,7 @@ void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, assert(pcrtxxd_new_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__vector_new_dbg); return g_vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); } @@ -380,7 +380,7 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) assert(pcrtxxd_calloc); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_calloc); return g_vld._calloc(pcrtxxd_calloc, context, debug, num, size); } @@ -403,7 +403,7 @@ void* CrtMfcPatch::crtd_malloc (size_t size) assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_malloc); return g_vld._malloc(pcrtxxd_malloc, context, debug, size); } @@ -428,7 +428,7 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_realloc); return g_vld._realloc(pcrtxxd_realloc, context, debug, mem, size); } @@ -453,7 +453,7 @@ void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, siz assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_recalloc); return g_vld.__recalloc(pcrtxxd_recalloc, context, debug, mem, num, size); } @@ -466,7 +466,7 @@ char* CrtMfcPatch::crtd__strdup (const char* src) assert(pcrtxxd_strdup); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__strdup); return g_vld.__strdup(pcrtxxd_strdup, context, debug, src); } @@ -478,7 +478,7 @@ wchar_t* CrtMfcPatch::crtd__wcsdup (const wchar_t* src) assert(pcrtxxd_wcsdup); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__wcsdup); return g_vld.__wcsdup(pcrtxxd_wcsdup, context, debug, src); } @@ -510,7 +510,7 @@ void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size assert(pcrtxxd__aligned_malloc_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__aligned_malloc_dbg); return g_vld.__aligned_malloc_dbg(pcrtxxd__aligned_malloc_dbg, context, debug, size, alignment, type, file, line); } @@ -543,7 +543,7 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t assert(pcrtxxd__malloc_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__aligned_offset_malloc_dbg); return g_vld.__aligned_offset_malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, alignment, offset, type, file, line); } @@ -578,7 +578,7 @@ void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__aligned_realloc_dbg); return g_vld.__aligned_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, type, file, line); } @@ -614,7 +614,7 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__aligned_offset_realloc_dbg); return g_vld.__aligned_offset_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, offset, type, file, line); } @@ -652,7 +652,7 @@ void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *me assert(pcrtxxd__recalloc_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__aligned_recalloc_dbg); return g_vld.__aligned_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, type, file, line); } @@ -691,7 +691,7 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void assert(pcrtxxd__recalloc_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd__aligned_offset_recalloc_dbg); return g_vld.__aligned_offset_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, offset, type, file, line); } @@ -714,7 +714,7 @@ void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_aligned_malloc); return g_vld.__aligned_malloc(pcrtxxd_malloc, context, debug, size, alignment); } @@ -737,7 +737,7 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_aligned_offset_malloc); return g_vld.__aligned_offset_malloc(pcrtxxd_malloc, context, debug, size, alignment, offset); } @@ -762,7 +762,7 @@ void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t s assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_aligned_realloc); return g_vld.__aligned_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment); } @@ -787,7 +787,7 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, s assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_aligned_offset_realloc); return g_vld.__aligned_offset_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment, offset); } @@ -814,7 +814,7 @@ void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_aligned_recalloc); return g_vld.__aligned_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment); } @@ -841,7 +841,7 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_aligned_offset_recalloc); return g_vld.__aligned_offset_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment, offset); } @@ -862,7 +862,7 @@ void* CrtMfcPatch::crtd_scalar_new (size_t size) assert(pcrtxxd_scalar_new); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_scalar_new); return g_vld._new(pcrtxxd_scalar_new, context, debug, size); } @@ -883,7 +883,7 @@ void* CrtMfcPatch::crtd_vector_new (size_t size) assert(pcrtxxd_scalar_new); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pcrtd_vector_new); return g_vld._new(pcrtxxd_scalar_new, context, debug, size); } @@ -920,7 +920,7 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcd__scalar_new_dbg_4p); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -948,7 +948,7 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcd__scalar_new_dbg_3p); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -979,7 +979,7 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcd__scalar_new_dbg_4p); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -1007,7 +1007,7 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcd__vector_new_dbg_3p); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -1028,7 +1028,7 @@ void* CrtMfcPatch::mfcd_scalar_new (size_t size) assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcd_scalar_new); return g_vld._new(pmfcxxd_new, context, debug, size); } @@ -1049,7 +1049,7 @@ void* CrtMfcPatch::mfcd_vector_new (size_t size) assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcd_vector_new); return g_vld._new(pmfcxxd_new, context, debug, size); } @@ -1080,7 +1080,7 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcud__scalar_new_dbg_4p); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -1108,7 +1108,7 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcud__scalar_new_dbg_3p); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -1139,7 +1139,7 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcud__scalar_new_dbg_4p); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -1167,7 +1167,7 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcud__vector_new_dbg_3p); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -1188,7 +1188,7 @@ void* CrtMfcPatch::mfcud_scalar_new (size_t size) assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcud_scalar_new); return g_vld._new(pmfcxxd_new, context, debug, size); } @@ -1209,7 +1209,7 @@ void* CrtMfcPatch::mfcud_vector_new (size_t size) assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pmfcud_vector_new); return g_vld._new(pmfcxxd_new, context, debug, size); } diff --git a/dllspatches.cpp b/dllspatches.cpp index 006367eb..3a487422 100644 --- a/dllspatches.cpp +++ b/dllspatches.cpp @@ -57,16 +57,17 @@ const char vector_new_name[] = "??_U@YAPEAX_K@Z"; // makes it more convenient to add additional IAT patches. patchentry_t VisualLeakDetector::m_kernelbasePatch [] = { "GetProcAddress", NULL, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. + "GetProcessHeap", (LPVOID*)&m_GetProcessHeap, _GetProcessHeap, NULL, NULL, NULL }; patchentry_t VisualLeakDetector::m_kernel32Patch [] = { - "HeapAlloc", NULL, _HeapAlloc, - "HeapCreate", NULL, _HeapCreate, - "HeapDestroy", NULL, _HeapDestroy, - "HeapFree", NULL, _HeapFree, - "HeapReAlloc", NULL, _HeapReAlloc, - NULL, NULL, NULL + "HeapAlloc", NULL, _HeapAlloc, + "HeapCreate", (LPVOID*)&m_HeapCreate, _HeapCreate, + "HeapDestroy", NULL, _HeapDestroy, + "HeapFree", NULL, _HeapFree, + "HeapReAlloc", NULL, _HeapReAlloc, + NULL, NULL, NULL }; #define ORDINAL(x) (LPCSTR)x @@ -76,7 +77,9 @@ patchentry_t VisualLeakDetector::m_kernel32Patch [] = { #define ORDINAL2(x86, x64) (LPCSTR)x64 #endif -VisualLeakDetector::_GetProcAddressType *VisualLeakDetector::m_original_GetProcAddress = NULL; +GetProcAddress_t VisualLeakDetector::m_GetProcAddress = NULL; +GetProcessHeap_t VisualLeakDetector::m_GetProcessHeap = NULL; +HeapCreate_t VisualLeakDetector::m_HeapCreate = NULL; static patchentry_t mfc42Patch [] = { // XXX why are the vector new operators missing for mfc42.dll? diff --git a/utility.h b/utility.h index dfa0040c..1eb26846 100644 --- a/utility.h +++ b/utility.h @@ -61,6 +61,7 @@ Applications should never include this header." struct context_t { UINT_PTR* fp; + UINT_PTR func; #if defined(_M_X64) DWORD64 Rsp; DWORD64 Rip; @@ -69,14 +70,18 @@ struct context_t #if defined(_M_IX86) // Copies the current frame pointer to the supplied variable. -#define CAPTURE_CONTEXT(context) context.fp = ((UINT_PTR*)_AddressOfReturnAddress()) - 1 +#define CAPTURE_CONTEXT(context, function) \ + context.fp = ((UINT_PTR*)_AddressOfReturnAddress()) - 1; \ + context.func = (UINT_PTR)(function) #define GET_RETURN_ADDRESS(context) *(context.fp + 1) #elif defined(_M_X64) // Capture current context -#define CAPTURE_CONTEXT(context) CONTEXT _ctx; \ +#define CAPTURE_CONTEXT(context, function) \ + CONTEXT _ctx; \ RtlCaptureContext(&_ctx); \ - context.Rsp = _ctx.Rsp; context.Rip = _ctx.Rip; \ - context.fp = ((UINT_PTR*)_AddressOfReturnAddress()) - 1 + context.Rsp = _ctx.Rsp; context.Rip = _ctx.Rip; \ + context.fp = ((UINT_PTR*)_AddressOfReturnAddress()) - 1; \ + context.func = (UINT_PTR)(function) #define GET_RETURN_ADDRESS(context) *(context.fp + 1) #else // If you want to retarget Visual Leak Detector to another processor diff --git a/vld.cpp b/vld.cpp index 46331652..74d52c4c 100644 --- a/vld.cpp +++ b/vld.cpp @@ -124,14 +124,14 @@ VisualLeakDetector::VisualLeakDetector () if (!IsWin7OrBetter()) // kernel32.dll { if (kernel32) - m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernel32,"GetProcAddress"); + m_GetProcAddress = (GetProcAddress_t) GetProcAddress(kernel32,"GetProcAddress"); } else { assert(m_patchTable[0].patchTable == m_kernelbasePatch); m_patchTable[0].exportModuleName = "kernelbase.dll"; if (kernelBase) - m_original_GetProcAddress = (_GetProcAddressType *) GetProcAddress(kernelBase,"GetProcAddress"); + m_GetProcAddress = (GetProcAddress_t) GetProcAddress(kernelBase,"GetProcAddress"); } // Initialize global variables. @@ -157,7 +157,7 @@ VisualLeakDetector::VisualLeakDetector () } g_stackWalkLock.Initialize(); g_symbolLock.Initialize(); - g_vldHeap = HeapCreate(0x0, 0, 0); + g_vldHeap = HeapCreate(0x0, 0, 0); g_vldHeapLock.Initialize(); g_pReportHooks = new ReportHookSet; @@ -1712,6 +1712,74 @@ BOOL VisualLeakDetector::detachFromModule (PCWSTR /*modulepath*/, DWORD64 module // //////////////////////////////////////////////////////////////////////////////// + +// GetProcessHeap - Calls to GetProcessHeap are patched through to this function. This +// function is just a wrapper around the real GetProcessHeap. +// +// Return Value: +// +// Returns the value returned by GetProcessHeap. +// +HANDLE VisualLeakDetector::_GetProcessHeap() +{ + // Get the return address within the calling function. + UINT_PTR ra = (UINT_PTR) _ReturnAddress(); + + // Get the process heap. + HANDLE heap = m_GetProcessHeap(); + + // Try to get the name of the function containing the return address. + BYTE symbolbuffer[sizeof(SYMBOL_INFO) +MAX_SYMBOL_NAME_SIZE] = { 0 }; + SYMBOL_INFO *functioninfo = (SYMBOL_INFO*) &symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; + + g_symbolLock.Enter(); + DWORD64 displacement; + DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); + BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); + g_symbolLock.Leave(); + if (symfound == TRUE) { + if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { + // GetProcessHeap was called by _heap_init (VS2012 and upper). This is a static CRT heap (msvcr*.dll). + CriticalSectionLocker cs(g_vld.m_heapMapLock); + HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); + if (heapit == g_vld.m_heapMap->end()) + { + g_vld.mapHeap(heap); + heapit = g_vld.m_heapMap->find(heap); + } + HMODULE hCallingModule = (HMODULE) functioninfo->ModBase; + if (hCallingModule) + { + HMODULE hCurrentModule = GetModuleHandleW(NULL); + if (hCallingModule == hCurrentModule) + { + // CRT static linking + if (!(g_vld.m_options & VLD_OPT_RELEASE_CRT_RUNTIME)) + { + // debug runtime + (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + } + } + else + { + // CRT dynamic linking + WCHAR callingmodulename[MAX_PATH] = L""; + if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) + { + _wcslwr_s(callingmodulename); + if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime + (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + } + } + } + } + } + + return heap; +} + // _GetProcAddress - Calls to GetProcAddress are patched through to this // function. If the requested function is a function that has been patched // through to one of VLD's handlers, then the address of VLD's handler @@ -1786,7 +1854,7 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) { - return m_original_GetProcAddress(module, procname); + return m_GetProcAddress(module, procname); } // _LdrLoadDll - Calls to LdrLoadDll are patched through to this function. This @@ -1877,6 +1945,7 @@ void VisualLeakDetector::getCallStack( CallStack **&ppcallstack, context_t &cont context_t context = context_; *ppcallstack = callstack; context_.fp = 0x0; + context_.func = 0x0; ppcallstack = NULL; callstack->getStackTrace(g_vld.m_maxTraceFrames, context); diff --git a/vld_hooks.cpp b/vld_hooks.cpp index e06a5da1..f187b004 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -50,6 +50,7 @@ void VisualLeakDetector::firstAllocCall(tls_t * tls) // Reset thread local flags and variables for the next allocation. tls->context.fp = 0x0; + tls->context.func = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; } @@ -1402,7 +1403,7 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m UINT_PTR ra = (UINT_PTR)_ReturnAddress(); // Create the heap. - HANDLE heap = HeapCreate(options, initsize, maxsize); + HANDLE heap = m_HeapCreate(options, initsize, maxsize); // Map the created heap handle to a new block map. g_vld.mapHeap(heap); @@ -1420,7 +1421,7 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m g_symbolLock.Leave(); if (symfound == TRUE) { if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { - // HeapCreate was called by _heap_init. This is a static CRT heap (msvcr*.dll). + // HeapCreate was called by _heap_init (VS2010 and before). This is a static CRT heap (msvcr*.dll). CriticalSectionLocker cs(g_vld.m_heapMapLock); HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); assert(heapit != g_vld.m_heapMap->end()); @@ -1510,7 +1511,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, RtlAllocateHeap); } else context = tls->context; @@ -1522,7 +1523,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si // Begin the stack trace with the current frame. Obtain the current // frame pointer. firstcall = true; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, RtlAllocateHeap); } tls->context = context; @@ -1551,7 +1552,7 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, HeapAlloc); } else context = tls->context; @@ -1563,7 +1564,7 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) // Begin the stack trace with the current frame. Obtain the current // frame pointer. firstcall = true; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, HeapAlloc); } tls->context = context; @@ -1608,7 +1609,7 @@ BYTE VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) { context_t context; // Record the current frame pointer. - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, RtlFreeHeap); // Unmap the block from the specified heap. g_vld.unmapBlock(heap, mem, context); @@ -1628,7 +1629,7 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) { context_t context; // Record the current frame pointer. - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, HeapFree); // Unmap the block from the specified heap. g_vld.unmapBlock(heap, mem, context); @@ -1675,7 +1676,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, RtlReAllocateHeap); } else context = tls->context; @@ -1687,7 +1688,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID // Begin the stack trace with the current frame. Obtain the current // frame pointer. firstcall = true; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, RtlReAllocateHeap); } ReAllocateHeap(tls, heap, mem, newmem, size, context); @@ -1718,7 +1719,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, HeapReAlloc); } else context = tls->context; @@ -1730,7 +1731,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S // Begin the stack trace with the current frame. Obtain the current // frame pointer. firstcall = true; - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, HeapReAlloc); } ReAllocateHeap(tls, heap, mem, newmem, size, context); @@ -1751,6 +1752,7 @@ void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LP // Reset thread local flags and variables, in case any libraries called // into while remapping the block allocate some memory. tls->context.fp = 0x0; + tls->context.func = 0x0; tls->flags &= ~VLD_TLS_CRTALLOC; // The module that initiated this allocation is included in leak @@ -1847,7 +1849,7 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pCoTaskMemAlloc); tls->context = context; tls->blockProcessed = FALSE; } @@ -1894,7 +1896,7 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, pCoTaskMemRealloc); tls->context = context; tls->blockProcessed = FALSE; } @@ -1955,7 +1957,7 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, NULL); tls->context = context; tls->blockProcessed = FALSE; } @@ -2074,7 +2076,7 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - CAPTURE_CONTEXT(context); + CAPTURE_CONTEXT(context, NULL); tls->context = context; tls->blockProcessed = FALSE; } diff --git a/vldint.h b/vldint.h index e570a4e4..61da7b6d 100644 --- a/vldint.h +++ b/vldint.h @@ -56,6 +56,10 @@ extern "C" __declspec(dllexport) void VLDRestore (); // Function pointer types for explicit dynamic linking with functions listed in // the import patch table. +typedef HANDLE(__stdcall *GetProcessHeap_t) (); +typedef HANDLE(__stdcall *HeapCreate_t) (DWORD, SIZE_T, SIZE_T); +typedef FARPROC(__stdcall *GetProcAddress_t) (HMODULE, LPCSTR); + typedef void* (__cdecl *_calloc_dbg_t) (size_t, size_t, int, const char*, int); typedef void* (__cdecl *_malloc_dbg_t) (size_t, int, const char *, int); typedef void* (__cdecl *_realloc_dbg_t) (void *, size_t, int, const char *, int); @@ -319,7 +323,8 @@ class VisualLeakDetector : public IMalloc // within this class's code. See crtmfcpatch.cpp for those functions. //////////////////////////////////////////////////////////////////////////////// // Win32 IAT replacement functions - static FARPROC __stdcall _GetProcAddress (HMODULE module, LPCSTR procname); + static FARPROC __stdcall _GetProcAddress(HMODULE module, LPCSTR procname); + static HANDLE __stdcall _GetProcessHeap(); static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); static BOOL __stdcall _HeapDestroy (HANDLE heap); @@ -378,10 +383,10 @@ class VisualLeakDetector : public IMalloc TlsMap *m_tlsMap; // Set of all thread-local storage structures for the process. HMODULE m_vldBase; // Visual Leak Detector's own module handle (base address). - typedef FARPROC __stdcall _GetProcAddressType(HMODULE module, LPCSTR procname); - VOID __stdcall ChangeModuleState(HMODULE module, bool on); - static _GetProcAddressType * m_original_GetProcAddress; + static GetProcAddress_t m_GetProcAddress; + static GetProcessHeap_t m_GetProcessHeap; + static HeapCreate_t m_HeapCreate; }; From 647a6499181a3e81581a876b5dc06987d92878b9 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 17 Dec 2013 23:49:22 +0400 Subject: [PATCH 152/321] VS project configuration fixed --- tests/Common.props | 23 + tests/basics/basics.vcxproj | 1040 +++++++++++----------- tests/corruption/corruption.vcxproj | 678 +++++++-------- tests/dynamic_app/dynamic_app.vcxproj | 1144 +++++++++++++------------ tests/dynamic_dll/dynamic.vcxproj | 948 ++++++++++---------- tests/mfc/vldmfc.vcxproj | 26 +- tests/mfc_dll/mfc.vcxproj | 1116 ++++++++++++------------ tests/suite/testsuite.cpp | 2 +- tests/suite/testsuite.vcxproj | 1000 ++++++++++----------- vld.vcxproj | 380 ++++---- 10 files changed, 3228 insertions(+), 3129 deletions(-) create mode 100644 tests/Common.props diff --git a/tests/Common.props b/tests/Common.props new file mode 100644 index 00000000..a2e9bd23 --- /dev/null +++ b/tests/Common.props @@ -0,0 +1,23 @@ + + + + + d + + + x86 + x64 + + Debug + Debug + Release + Release + Release + Release + + + <_ProjectFileVersion>10.0.40219.1 + + + + \ No newline at end of file diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index 85a7d6ba..c2ea5efe 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -1,515 +1,527 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {0943354A-41E0-4215-878A-8D0FE758052C} - Win32Proj - basics - test_basics - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - false - - - Application - true - Unicode - false - - - Application - true - Unicode - false - - - Application - true - Unicode - false - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - - - - - + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {0943354A-41E0-4215-878A-8D0FE758052C} + Win32Proj + basics + test_basics + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + false + + + Application + true + Unicode + false + + + Application + true + Unicode + false + + + Application + true + Unicode + false + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + + + + + \ No newline at end of file diff --git a/tests/corruption/corruption.vcxproj b/tests/corruption/corruption.vcxproj index f463076b..d628843c 100644 --- a/tests/corruption/corruption.vcxproj +++ b/tests/corruption/corruption.vcxproj @@ -1,336 +1,344 @@ - - - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {87911ED6-84BC-4526-9654-A4FF4E0EDF52} - Win32Proj - corruption - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - - - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - - - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - - - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - - - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - - - - - - - - - + + + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} + Win32Proj + corruption + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index e2271026..93069a7f 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -1,567 +1,579 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} - Win32Proj - dynamic_app - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - true - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - true - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - Level4 - - - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - Level4 - - - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - Level4 - - - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - Level4 - - - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 - Copying over Visual Leak Detector Dependencies - - - - - - - - - - - - - - - - - + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} + Win32Proj + dynamic_app + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + true + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + true + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y +copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y +"$(TargetPath)" test +exit /b 0 + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/dynamic_dll/dynamic.vcxproj b/tests/dynamic_dll/dynamic.vcxproj index a693757c..f6530e56 100644 --- a/tests/dynamic_dll/dynamic.vcxproj +++ b/tests/dynamic_dll/dynamic.vcxproj @@ -1,469 +1,481 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} - Win32Proj - dynamic - dynamic - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - - - - - - - - - - - - false - false - false - false - false - false - false - false - - - - - - - - - - - - - - - - - false - false - false - false - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - - - - - + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + Win32Proj + dynamic + dynamic + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + + + + + + + + + + + + false + false + false + false + false + false + false + false + + + + + + + + + + + + + + + + + false + false + false + false + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + + + + + \ No newline at end of file diff --git a/tests/mfc/vldmfc.vcxproj b/tests/mfc/vldmfc.vcxproj index 5f78fd2c..8d893d38 100644 --- a/tests/mfc/vldmfc.vcxproj +++ b/tests/mfc/vldmfc.vcxproj @@ -1,5 +1,5 @@  - + Debug_StaticCrt @@ -85,34 +85,42 @@ + + + + + + + + @@ -208,7 +216,7 @@ .\Release/vldmfc.bsc - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -254,7 +262,7 @@ .\Release/vldmfc.bsc - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -298,7 +306,7 @@ .\Release/vldmfc.bsc - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -342,7 +350,7 @@ .\Release/vldmfc.bsc - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -390,7 +398,7 @@ .\Debug/vldmfc.bsc - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -438,7 +446,7 @@ .\Debug/vldmfc.bsc - ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -483,7 +491,7 @@ .\Debug/vldmfc.bsc - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -528,7 +536,7 @@ .\Debug/vldmfc.bsc - ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies diff --git a/tests/mfc_dll/mfc.vcxproj b/tests/mfc_dll/mfc.vcxproj index 48a727eb..8f9addf1 100644 --- a/tests/mfc_dll/mfc.vcxproj +++ b/tests/mfc_dll/mfc.vcxproj @@ -1,553 +1,565 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {2178E5B2-1032-441F-A664-F3D8D1FD1913} - mfc - MFCDLLProj - test_mfc - - - - DynamicLibrary - true - Unicode - Dynamic - - - DynamicLibrary - true - Unicode - Static - - - DynamicLibrary - true - Unicode - Dynamic - - - DynamicLibrary - true - Unicode - Static - - - DynamicLibrary - true - Unicode - Dynamic - - - DynamicLibrary - true - Unicode - Static - - - DynamicLibrary - true - Unicode - Dynamic - - - DynamicLibrary - true - Unicode - Static - - - DynamicLibrary - false - true - Unicode - Dynamic - - - DynamicLibrary - false - true - Unicode - Static - - - DynamicLibrary - false - true - Unicode - Dynamic - - - DynamicLibrary - false - true - Unicode - Static - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - true - true - .\mfc.def - - - false - NDEBUG;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - .\mfc.def - - - false - NDEBUG;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - true - true - .\mfc.def - - - false - NDEBUG;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - .\mfc.def - - - false - NDEBUG;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {2178E5B2-1032-441F-A664-F3D8D1FD1913} + mfc + MFCDLLProj + test_mfc + + + + DynamicLibrary + true + Unicode + Dynamic + + + DynamicLibrary + true + Unicode + Static + + + DynamicLibrary + true + Unicode + Dynamic + + + DynamicLibrary + true + Unicode + Static + + + DynamicLibrary + true + Unicode + Dynamic + + + DynamicLibrary + true + Unicode + Static + + + DynamicLibrary + true + Unicode + Dynamic + + + DynamicLibrary + true + Unicode + Static + + + DynamicLibrary + false + true + Unicode + Dynamic + + + DynamicLibrary + false + true + Unicode + Static + + + DynamicLibrary + false + true + Unicode + Dynamic + + + DynamicLibrary + false + true + Unicode + Static + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 6d968721..b8b30e20 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -1,7 +1,7 @@ //////////////////////////////////////////////////////////////////////////////// // // Visual Leak Detector - Test Suite -// Copyright (c) 2005-2013 VLD Team +// Copyright (c) 2005-2014 VLD Team // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/tests/suite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj index 55b2e84f..61938799 100644 --- a/tests/suite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -1,495 +1,507 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {EE4A829C-5FD8-460B-8A90-B518B9BABB70} - testsuite - SAK - SAK - SAK - SAK - - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - false - EditAndContinue - false - - - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - - - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - false - EditAndContinue - false - - - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - true - - - ..\copydlls.bat $(Platform)\Debug x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Full - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - true - true - - - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - true - true - - - ..\copydlls.bat $(Platform)\$(Configuration) x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Full - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) - MultiThreaded - true - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - true - true - - - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - false - EditAndContinue - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - - - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - false - EditAndContinue - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - - - ..\copydlls.bat $(Platform)\Release x86 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN64;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - false - ProgramDatabase - false - - - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - MachineX64 - - - - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN64;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - false - ProgramDatabase - false - - - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - ..\copydlls.bat $(Platform)\Debug x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Full - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) - MultiThreadedDLL - true - true - - - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - true - MachineX64 - true - - - ..\copydlls.bat $(Platform)\$(Configuration) x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Full - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) - MultiThreaded - true - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - true - MachineX64 - true - - - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN64;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - false - ProgramDatabase - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - MachineX64 - true - - - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - WIN64;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - false - ProgramDatabase - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - MachineX64 - true - - - ..\copydlls.bat $(Platform)\Release x64 $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - - + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} + testsuite + SAK + SAK + SAK + SAK + + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + EditAndContinue + false + + + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + EditAndContinue + false + + + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Full + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) + MultiThreadedDLL + true + true + + + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Full + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + EditAndContinue + true + + + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + EditAndContinue + true + + + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + ProgramDatabase + false + + + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + true + MachineX64 + + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + ProgramDatabase + false + + + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + true + MachineX64 + + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Full + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) + MultiThreadedDLL + true + true + + + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + true + true + MachineX64 + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Full + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + true + true + MachineX64 + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + ProgramDatabase + true + + + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + true + MachineX64 + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + ProgramDatabase + true + + + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + true + MachineX64 + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + \ No newline at end of file diff --git a/vld.vcxproj b/vld.vcxproj index 2358d0f5..74af9865 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -1,191 +1,191 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - vld - SAK - SAK - SAK - SAK - Unicode - DynamicLibrary - true - x86 - x64 - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)bin\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - MinimumRecommendedRules.ruleset - $(ProjectName)_$(NumericPlatform) - .dll - - - - setup;%(AdditionalIncludeDirectories) - Use - - - true - 0x03200000 - false - %(AdditionalLibraryDirectories) - - - - - - copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y - - - setup - - - - - Disabled - _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level4 - false - EditAndContinue - true - - - psapi.lib;%(AdditionalDependencies) - - - vld.dll.dependency.x86.manifest - - - - - Disabled - _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level4 - false - ProgramDatabase - - - MachineX64 - psapi.lib;%(AdditionalDependencies) - - - vld.dll.dependency.x64.manifest - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - - - - - Full - Speed - true - NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - OldStyle - false - - - true - true - %(AdditionalDependencies) - - - vld.dll.dependency.x86.manifest - - - - - Full - Speed - true - NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - OldStyle - false - false - - - true - true - MachineX64 - true - %(AdditionalDependencies) - - - vld.dll.dependency.x64.manifest - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + vld + SAK + SAK + SAK + SAK + Unicode + DynamicLibrary + true + x86 + x64 + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(ProjectDir)bin\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + MinimumRecommendedRules.ruleset + $(ProjectName)_$(NumericPlatform) + .dll + + + + setup;%(AdditionalIncludeDirectories) + Use + + + true + 0x03200000 + false + %(AdditionalLibraryDirectories) + + + + + + copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + + + setup + + + + + Disabled + _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + EditAndContinue + true + + + psapi.lib;%(AdditionalDependencies) + + + vld.dll.dependency.x86.manifest + + + + + Disabled + _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + ProgramDatabase + + + MachineX64 + psapi.lib;%(AdditionalDependencies) + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + OldStyle + false + + + true + true + %(AdditionalDependencies) + + + vld.dll.dependency.x86.manifest + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + OldStyle + false + false + + + true + true + MachineX64 + true + %(AdditionalDependencies) + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 4c99674e651c1abb0e2786e10fbda5d4f11424d2 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 21 Dec 2013 00:52:41 +0400 Subject: [PATCH 153/321] Installer fixed --- setup/vld-setup.iss | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index 1dddbbbe..ed3ebcd5 100644 --- a/setup/vld-setup.iss +++ b/setup/vld-setup.iss @@ -5,6 +5,7 @@ #define MyAppVersion "2.4" #define MyAppPublisher "VLD Team" #define MyAppURL "http://vld.codeplex.com/" +#define MyAppRegKey "Software\Visual Leak Detector" [Setup] ; NOTE: The value of AppId uniquely identifies this application. @@ -18,7 +19,7 @@ AppPublisher={#MyAppPublisher} AppPublisherURL={#MyAppURL} AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} -DefaultDirName={pf}\{#MyAppName} +DefaultDirName={reg:HKLM\{#MyAppRegKey},InstallPath|{pf}\{#MyAppName}} DefaultGroupName={#MyAppName} LicenseFile=license-free.txt OutputBaseFilename=vld-{#MyAppVersion}-setup @@ -84,10 +85,17 @@ Source: "..\vld.vcxproj.filters"; DestDir: "{app}\src"; Flags: ignoreversion [Tasks] Name: "modifypath"; Description: "Add VLD directory to your environmental path" +Name: "modifyVSProps"; Description: "Add VLD directory to VS2010-2013" [ThirdParty] UseRelativePaths=True +[Registry] +Root: "HKLM"; Subkey: "{#MyAppRegKey}"; Flags: uninsdeletekeyifempty +Root: "HKLM"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "InstalledVersion"; ValueData: "{#MyAppVersion}" +Root: "HKLM"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}" +Root: "HKLM"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "IniFile"; ValueData: "{app}\vld.ini" + [Code] const ModPathName = 'modifypath'; @@ -258,7 +266,8 @@ begin begin if not UninstallOldVersions() then Abort(); - ModifyAllProps(); + if IsTaskSelected('modifyVSProps') then + ModifyAllProps(); end; CurStepChangedModPath(CurStep); end; From e7cdaf5b7be8e9441954e44de39c898f9db8676c Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 23 Dec 2013 00:34:10 +0400 Subject: [PATCH 154/321] Installer now update VS2008 settings --- setup/vld-setup.iss | 187 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 176 insertions(+), 11 deletions(-) diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index ed3ebcd5..793fa8e9 100644 --- a/setup/vld-setup.iss +++ b/setup/vld-setup.iss @@ -85,7 +85,8 @@ Source: "..\vld.vcxproj.filters"; DestDir: "{app}\src"; Flags: ignoreversion [Tasks] Name: "modifypath"; Description: "Add VLD directory to your environmental path" -Name: "modifyVSProps"; Description: "Add VLD directory to VS2010-2013" +Name: "modifyVS2008Props"; Description: "Add VLD directory to VS 2008" +Name: "modifyVS2010Props"; Description: "Add VLD directory to VS 2010 - VS 2013" [ThirdParty] UseRelativePaths=True @@ -96,7 +97,16 @@ Root: "HKLM"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "Installed Root: "HKLM"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}" Root: "HKLM"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "IniFile"; ValueData: "{app}\vld.ini" -[Code] +[Code] +type + TKey = string; + TValue = string; + TKeyValue = record + Key: TKey; + Value: TValue; + end; + TKeyValueList = array of TKeyValue; + const ModPathName = 'modifypath'; ModPathType = 'system'; @@ -139,7 +149,7 @@ begin end; function UninstallOldVersions(): Boolean; -var +var nsisUnInstallString: String; isUnInstallString: String; begin @@ -156,6 +166,151 @@ begin end; end; +function Count(What, Where: String): Integer; +begin + Result := 0; + if Length(What) = 0 then + exit; + while Pos(What,Where)>0 do + begin + Where := Copy(Where,Pos(What,Where)+Length(What),Length(Where)); + Result := Result + 1; + end; +end; + +procedure Explode(var ADest: TKeyValueList; aText, aSeparator: String); +var tmp: Integer; + item: TKeyValue; +begin + SetArrayLength(ADest, (Count(aSeparator,aText) / 2) + 1); + tmp := 0; + repeat + item.Key := ''; + item.Value := ''; + if Pos(aSeparator,aText)>0 then + begin + item.Key := Copy(aText,1,Pos(aSeparator,aText)-1); + aText := Copy(aText,Pos(aSeparator,aText)+Length(aSeparator),Length(aText)); + end else + begin + item.Key := aText; + aText := ''; + end; + if Pos(aSeparator,aText)>0 then + begin + item.Value := Copy(aText,1,Pos(aSeparator,aText)-1); + aText := Copy(aText,Pos(aSeparator,aText)+Length(aSeparator),Length(aText)); + end else + begin + item.Value := aText; + aText := ''; + end; + ADest[tmp] := item; + tmp := tmp + 1; + until Length(aText)=0; +end; + +function Merge(ADest: TKeyValueList; aSeparator: String): String; +var i, n, l: Integer; + str: String; +begin + n := GetArrayLength(ADest); + l := n + (n - 1); + if l < 0 then l := 0; + Result := ''; + for i := 0 to n - 1 do + begin + str := ADest[i].Key + aSeparator + ADest[i].Value; + Result := Result + str; + if i < n - 1 then Result := Result + aSeparator; + end; +end; + +function UpdatePath(dirList: String; path: String): String; +begin + if dirList = '' then + Result := path + else if Pos(path, dirList) = 0 then + Result := path + ';' + dirList + else + Result := dirList; +end; + +procedure UpdatePaths(var dirList: string; path32: string; path64: string); +var map: TKeyValueList; + i: Integer; +begin + Explode(map, dirList, '|'); + for i := 0 to GetArrayLength(map) - 1 do + begin + if map[i].Key = 'Win32' then map[i].Value := UpdatePath(map[i].Value, path32) + else if map[i].Key = 'x64' then map[i].Value := UpdatePath(map[i].Value, path64); + end; + dirList := Merge(map, '|'); + Log(dirList); +end; + +procedure ModifySettings(filename: string); +var + XMLDocument: Variant; + XMLParent, XMLNode, XMLNodes: Variant; + IncludeDirectoriesNode: Variant; + AdditionalIncludeDirectories: string; + LibraryDirectoriesNode: Variant; + AdditionalLibraryDirectories: string; + libfolder: string; +begin + XMLDocument := CreateOleObject('Msxml2.DOMDocument.3.0'); + try + XMLDocument.async := False; + XMLDocument.load(filename); + if (XMLDocument.parseError.errorCode = 0) then + begin + XMLDocument.setProperty('SelectionLanguage', 'XPath'); + XMLNodes := XMLDocument.SelectNodes('//UserSettings/ToolsOptions/ToolsOptionsCategory[@name="Projects"]/ToolsOptionsSubCategory[@name="VCDirectories"]'); + if XMLNodes.Length = 0 then + Exit; + XMLParent := XMLNodes.Item[0]; + XMLNodes := XMLParent.SelectNodes('//PropertyValue[@name="LibraryDirectories"]'); + if XMLNodes.Length > 0 then + LibraryDirectoriesNode := XMLNodes.Item[0]; + XMLNodes := XMLParent.SelectNodes('//PropertyValue[@name="IncludeDirectories"]'); + if XMLNodes.Length > 0 then + IncludeDirectoriesNode := XMLNodes.Item[0]; + AdditionalIncludeDirectories := ''; + if not VarIsNull(IncludeDirectoriesNode) then + AdditionalIncludeDirectories := IncludeDirectoriesNode.Text; + AdditionalLibraryDirectories := ''; + if not VarIsNull(LibraryDirectoriesNode) then + AdditionalLibraryDirectories := LibraryDirectoriesNode.Text; + UpdatePaths(AdditionalIncludeDirectories, ExpandConstant('{app}\include'), ExpandConstant('{app}\include')); + UpdatePaths(AdditionalLibraryDirectories, ExpandConstant('{app}\lib\Win32'), ExpandConstant('{app}\lib\Win64')); + IncludeDirectoriesNode.Text := AdditionalIncludeDirectories; + LibraryDirectoriesNode.Text := AdditionalLibraryDirectories; + XMLDocument.save(filename); + end; + except + ShowExceptionMessage; + end; +end; + +procedure ModifyVS2008Settings(); +var + Path, CurSettings: string; +begin + if RegQueryStringValue(HKEY_CURRENT_USER, 'Software\Microsoft\VisualStudio\9.0', + 'VisualStudioLocation', Path) then + begin + StringChangeEx(Path, '%USERPROFILE%', GetEnv('USERPROFILE'), True); + if RegQueryStringValue(HKEY_CURRENT_USER, 'Software\Microsoft\VisualStudio\9.0\Profile', + 'AutoSaveFile', CurSettings) then + begin + StringChangeEx(CurSettings, '%vsspv_visualstudio_dir%', Path, True); + ModifySettings(CurSettings); + end; + end; +end; + function EncodeString(str: string): string; begin Result := str; @@ -173,17 +328,17 @@ begin end; procedure ModifyProps(filename: string; libfolder: string); -var +var XMLDocument: Variant; XMLParent, XMLNode, XMLNodes: Variant; IncludeDirectoriesNode: Variant; AdditionalIncludeDirectories: string; LibraryDirectoriesNode: Variant; AdditionalLibraryDirectories: string; -begin +begin if not FileExists(filename) then Exit; - XMLDocument := CreateOleObject('Msxml2.DOMDocument.6.0'); + XMLDocument := CreateOleObject('Msxml2.DOMDocument.3.0'); try XMLDocument.async := False; XMLDocument.load(filename); @@ -249,9 +404,9 @@ begin end; procedure ModifyAllProps(); -var - Path: string; -begin +var + Path: string; +begin Path := GetEnv('LOCALAPPDATA')+'\Microsoft\MSBuild\v4.0\'; if DirExists(Path) then begin @@ -266,13 +421,23 @@ begin begin if not UninstallOldVersions() then Abort(); - if IsTaskSelected('modifyVSProps') then + if IsTaskSelected('modifyVS2008Props') then + ModifyVS2008Settings(); + if IsTaskSelected('modifyVS2010Props') then ModifyAllProps(); end; CurStepChangedModPath(CurStep); -end; +end; procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); begin CurUninstallStepChangedModPath(CurUninstallStep); end; + +function NextButtonClick(CurPageID: Integer): Boolean; +begin + Result := True; + + if CurPageID = wpReady then + Msgbox('Please close Visual Studio before starting the installation.', mbInformation, MB_OK); +end; \ No newline at end of file From b79142a5958d4e48081081cb085e466fb49d7a11 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Thu, 9 Jan 2014 04:13:44 +0400 Subject: [PATCH 155/321] PatchModule crash fixed in some situations --- setup/vld-setup.iss | 2 +- tests/loading_modules/loading_modules.vcxproj | 536 ++++++++++++++++++ .../loading_modules.vcxproj.filters | 33 ++ tests/loading_modules/modules.cpp | 50 ++ tests/loading_modules/stdafx.cpp | 8 + tests/loading_modules/stdafx.h | 16 + tests/loading_modules/targetver.h | 8 + vld.cpp | 118 ++-- vldint.h | 3 +- 9 files changed, 723 insertions(+), 51 deletions(-) create mode 100644 tests/loading_modules/loading_modules.vcxproj create mode 100644 tests/loading_modules/loading_modules.vcxproj.filters create mode 100644 tests/loading_modules/modules.cpp create mode 100644 tests/loading_modules/stdafx.cpp create mode 100644 tests/loading_modules/stdafx.h create mode 100644 tests/loading_modules/targetver.h diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index 793fa8e9..d6a780b5 100644 --- a/setup/vld-setup.iss +++ b/setup/vld-setup.iss @@ -25,7 +25,7 @@ LicenseFile=license-free.txt OutputBaseFilename=vld-{#MyAppVersion}-setup Compression=lzma SolidCompression=True -MinVersion=0,5.0 +MinVersion=0,5.01 ; Tell Windows Explorer to reload the environment ChangesEnvironment=yes AllowNoIcons=yes diff --git a/tests/loading_modules/loading_modules.vcxproj b/tests/loading_modules/loading_modules.vcxproj new file mode 100644 index 00000000..e0d9b21d --- /dev/null +++ b/tests/loading_modules/loading_modules.vcxproj @@ -0,0 +1,536 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {B86B0687-4C6B-454D-974E-4BDDB00B5BDC} + Win32Proj + loading_modules + loading_modules + + + + Application + true + Unicode + v120 + + + Application + true + Unicode + v120 + + + Application + true + Unicode + v120 + + + Application + true + Unicode + v120 + + + Application + true + Unicode + false + v120 + + + Application + true + Unicode + false + v120 + + + Application + true + Unicode + false + v120 + + + Application + true + Unicode + false + v120 + + + Application + false + true + Unicode + v120 + + + Application + false + true + Unicode + v120 + + + Application + false + true + Unicode + v120 + + + Application + false + true + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + + + + + + \ No newline at end of file diff --git a/tests/loading_modules/loading_modules.vcxproj.filters b/tests/loading_modules/loading_modules.vcxproj.filters new file mode 100644 index 00000000..42b7c770 --- /dev/null +++ b/tests/loading_modules/loading_modules.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/tests/loading_modules/modules.cpp b/tests/loading_modules/modules.cpp new file mode 100644 index 00000000..0abc84ea --- /dev/null +++ b/tests/loading_modules/modules.cpp @@ -0,0 +1,50 @@ +#include "stdafx.h" +#include +#include +#include +#include + +UINT WINAPI ThreadProc1(LPVOID pParam) +{ + for (int i = 0; i < 10000; i++) + { + HMODULE hModule = ::LoadLibrary(_T("wtsapi32.dll")); + + if (NULL != hModule) + { + ::FreeLibrary(hModule); + hModule = NULL; + } + } + + return 0; +} + +UINT WINAPI ThreadProc2(LPVOID pParam) +{ + for (int i = 0; i < 10000; i++) + { + HMODULE hModule = ::LoadLibrary(_T("psapi.dll")); + + if (NULL != hModule) + { + ::FreeLibrary(hModule); + hModule = NULL; + } + } + + return 0; +} + +int _tmain(int argc, _TCHAR* argv[]) +{ + UINT nThreadID; + HANDLE hThread[2]; + + hThread[0] = (HANDLE) _beginthreadex(NULL, 0, ThreadProc1, NULL, 0, &nThreadID); + hThread[1] = (HANDLE) _beginthreadex(NULL, 0, ThreadProc2, NULL, 0, &nThreadID); + + ::WaitForMultipleObjects(2, hThread, TRUE, INFINITE); + + return 0; +} diff --git a/tests/loading_modules/stdafx.cpp b/tests/loading_modules/stdafx.cpp new file mode 100644 index 00000000..27f0ee01 --- /dev/null +++ b/tests/loading_modules/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// basics.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/tests/loading_modules/stdafx.h b/tests/loading_modules/stdafx.h new file mode 100644 index 00000000..686c8f5b --- /dev/null +++ b/tests/loading_modules/stdafx.h @@ -0,0 +1,16 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#include +#include +#include + + + +// TODO: reference additional headers your program requires here diff --git a/tests/loading_modules/targetver.h b/tests/loading_modules/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/tests/loading_modules/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/vld.cpp b/vld.cpp index 74d52c4c..78ca173d 100644 --- a/vld.cpp +++ b/vld.cpp @@ -169,7 +169,7 @@ VisualLeakDetector::VisualLeakDetector () m_totalAlloc = 0; m_curAlloc = 0; m_maxAlloc = 0; - m_loadedModules = NULL; + m_loadedModules = new ModuleSet(); m_optionsLock.Initialize(); m_loaderLock.Initialize(); m_heapMapLock.Initialize(); @@ -249,7 +249,9 @@ VisualLeakDetector::VisualLeakDetector () DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); attachToLoadedModules(newmodules); + ModuleSet* oldmodules = m_loadedModules; m_loadedModules = newmodules; + delete oldmodules; m_status |= VLD_STATUS_INSTALLED; HMODULE dbghelp = GetModuleHandleW(L"dbghelp.dll"); @@ -480,6 +482,44 @@ VisualLeakDetector::~VisualLeakDetector () // //////////////////////////////////////////////////////////////////////////////// +UINT32 VisualLeakDetector::getModuleState(ModuleSet::Iterator& it, UINT32& moduleFlags) +{ + const moduleinfo_t& moduleinfo = *it; + DWORD64 modulebase = (DWORD64) moduleinfo.addrLow; + moduleFlags = 0; + + if (IsBadReadPtr((UINT*) modulebase, sizeof(UINT*))) // module unloaded + return 0; + + bool isNewModule = false; + m_modulesLock.Enter(); + ModuleSet* oldmodules = m_loadedModules; + ModuleSet::Iterator oldit = oldmodules->find(moduleinfo); + if (oldit != oldmodules->end()) // We've seen this "new" module loaded in the process before. + moduleFlags = (*oldit).flags; + else // This is new loaded module + isNewModule = true; + m_modulesLock.Leave(); + + if (isNewModule) + return 1; + + if (IsModulePatched((HMODULE) modulebase, m_patchTable, _countof(m_patchTable))) + { + // This module is already attached. Just update the module's + // flags, nothing more. + ModuleSet::Muterator updateit; + updateit = it; + (*updateit).flags = moduleFlags; + return 2; + } + + // This module may have been attached before and has been + // detached. We'll need to try reattaching to it in case it + // was unloaded and then subsequently reloaded. + return 3; +} + // attachtoloadedmodules - Attaches VLD to all modules contained in the provided // ModuleSet. Not all modules are in the ModuleSet will actually be included // in leak detection. Only modules that import the global VisualLeakDetector @@ -499,52 +539,22 @@ VisualLeakDetector::~VisualLeakDetector () // VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) { - ModuleSet::Muterator updateit; - // Iterate through the supplied set, until all modules have been attached. - for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { - DWORD64 modulebase = (DWORD64)(*newit).addrLow; - - bool moduleLoaded = false; - UINT32 moduleflags = 0x0; - m_modulesLock.Enter(); - ModuleSet* oldmodules = m_loadedModules; - if (oldmodules != NULL) { - // This is not the first time we have been called to attach to the - // currently loaded modules. - ModuleSet::Iterator oldit = oldmodules->find(*newit); - if (oldit != oldmodules->end()) { - moduleLoaded = true; - moduleflags = (*oldit).flags; - } - } - m_modulesLock.Leave(); + for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) + { + UINT32 moduleFlags = 0x0; + UINT32 state = getModuleState(newit, moduleFlags); - bool refresh = false; - if (moduleLoaded) // We've seen this "new" module loaded in the process before. - { - if (IsModulePatched((HMODULE)modulebase, m_patchTable, _countof(m_patchTable))) - { - // This module is already attached. Just update the module's - // flags, nothing more. - updateit = newit; - (*updateit).flags = moduleflags; - continue; - } - else { - // This module may have been attached before and has been - // detached. We'll need to try reattaching to it in case it - // was unloaded and then subsequently reloaded. - refresh = true; - } - } + if (state == 0 || state == 2) + continue; + DWORD64 modulebase = (DWORD64) (*newit).addrLow; LPCWSTR modulename = (*newit).name; LPCWSTR modulepath = (*newit).path; DWORD modulesize = (DWORD)((*newit).addrHigh - (*newit).addrLow) + 1; g_symbolLock.Enter(); - if ((refresh == true) && (moduleflags & VLD_MODULE_SYMBOLSLOADED)) { + if ((state == 3) && (moduleFlags & VLD_MODULE_SYMBOLSLOADED)) { // Discard the previously loaded symbols, so we can refresh them. DbgTrace(L"dbghelp32.dll %i: SymUnloadModule64\n", GetCurrentThreadId()); if (SymUnloadModule64(g_currentProcess, modulebase) == false) { @@ -576,16 +586,21 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) g_symbolLock.Leave(); } if (SymbolsLoaded) - moduleflags |= VLD_MODULE_SYMBOLSLOADED; + moduleFlags |= VLD_MODULE_SYMBOLSLOADED; if (_wcsicmp(TEXT(VLDDLL), modulename) == 0) { // What happens when a module goes through it's own portal? Bad things. // Like infinite recursion. And ugly bald men wearing dresses. VLD // should not, therefore, attach to itself. continue; - } + } + + // increase reference count to module + HMODULE modulelocal = NULL; + if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCTSTR) modulebase, &modulelocal)) + continue; - if (!FindImport((HMODULE)modulebase, m_vldBase, VLDDLL, "?g_vld@@3VVisualLeakDetector@@A")) + if (!FindImport(modulelocal, m_vldBase, VLDDLL, "?g_vld@@3VVisualLeakDetector@@A")) { // This module does not import VLD. This means that none of the module's // sources #included vld.h. @@ -593,19 +608,19 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) { if (wcsstr(m_forcedModuleList, modulename) == NULL) { // Exclude this module from leak detection. - moduleflags |= VLD_MODULE_EXCLUDED; + moduleFlags |= VLD_MODULE_EXCLUDED; } } else { if (wcsstr(m_forcedModuleList, modulename) != NULL) { // Exclude this module from leak detection. - moduleflags |= VLD_MODULE_EXCLUDED; + moduleFlags |= VLD_MODULE_EXCLUDED; } } } - if ((moduleflags & VLD_MODULE_EXCLUDED) == 0 && - !(moduleflags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { + if ((moduleFlags & VLD_MODULE_EXCLUDED) == 0 && + !(moduleFlags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { // This module is going to be included in leak detection, but complete // symbols for this module couldn't be loaded. This means that any stack // traces through this module may lack information, like line numbers @@ -616,11 +631,14 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) } // Update the module's flags in the "new modules" set. + ModuleSet::Muterator updateit; updateit = newit; - (*updateit).flags = moduleflags; + (*updateit).flags = moduleFlags; // Attach to the module. - PatchModule((HMODULE)modulebase, m_patchTable, _countof(m_patchTable)); + PatchModule(modulelocal, m_patchTable, _countof(m_patchTable)); + + FreeLibrary(modulelocal); } } @@ -1897,10 +1915,12 @@ NTSTATUS VisualLeakDetector::_LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, PHANDLE modulehandle) { // Load the DLL. + _InterlockedIncrement(&g_loaderLockCounter); NTSTATUS status = LdrLoadDllWin8(reserved, flags, modulename, modulehandle); - if (STATUS_SUCCESS == status) + if (STATUS_SUCCESS == status && g_loaderLockCounter == 1) g_vld.RefreshModules(); + _InterlockedDecrement(&g_loaderLockCounter); return status; } diff --git a/vldint.h b/vldint.h index 61da7b6d..5558997d 100644 --- a/vldint.h +++ b/vldint.h @@ -284,7 +284,8 @@ class VisualLeakDetector : public IMalloc // Private leak detection functions - see each function definition for details. //////////////////////////////////////////////////////////////////////////////// VOID attachToLoadedModules (ModuleSet *newmodules); - LPWSTR buildSymbolSearchPath (); + UINT32 getModuleState(ModuleSet::Iterator& it, UINT32 &moduleFlags); + LPWSTR buildSymbolSearchPath(); VOID configure (); BOOL enabled (); SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); From 575264ba3cb50f8c9188c099117e7b3eaaf521b0 Mon Sep 17 00:00:00 2001 From: Shapkin Arkady Date: Wed, 26 Feb 2014 18:58:48 +0400 Subject: [PATCH 156/321] Memory leaks count fixed for case static/dynamic linked MFC --- utility.cpp | 22 ++++++++++++++++ utility.h | 1 + vld.cpp | 74 ++++++++++++++++++++++++++++------------------------- 3 files changed, 62 insertions(+), 35 deletions(-) diff --git a/utility.cpp b/utility.cpp index 6c038339..00cc7998 100644 --- a/utility.cpp +++ b/utility.cpp @@ -367,6 +367,28 @@ VOID InsertReportDelay () s_reportDelay = TRUE; } +// ConvertModulePathToAscii - Convert module path to ascii encoding. +void ConvertModulePathToAscii( LPCWSTR modulename, LPSTR * modulenamea ) +{ + size_t length = ::WideCharToMultiByte(CP_ACP, 0, modulename, -1, 0, 0, 0, 0); + *modulenamea = new CHAR [length]; + + // wcstombs_s requires locale to be already set up correctly, but it might not be correct on vld init step. So use WideCharToMultiByte instead + CHAR defaultChar = '?'; + BOOL defaultCharUsed = FALSE; + + int count = ::WideCharToMultiByte(CP_ACP, 0/*flags*/, modulename, (int)-1, *modulenamea, (int)length, &defaultChar, &defaultCharUsed); + assert(count != 0); + if ( defaultCharUsed ) + { + ::OutputDebugStringW(__FILEW__ L": " __FUNCTIONW__ L" - defaultChar was used while conversion from \""); + ::OutputDebugStringW(modulename); + ::OutputDebugStringW(L"\" to ANSI \""); + ::OutputDebugStringA(*modulenamea); + ::OutputDebugStringW(L"\". Result can be wrong.\n"); + } +} + // IsModulePatched - Checks to see if any of the imports listed in the specified // patch table have been patched into the specified importmodule. // diff --git a/utility.h b/utility.h index 1eb26846..a892d211 100644 --- a/utility.h +++ b/utility.h @@ -148,6 +148,7 @@ BOOL StrToBool (LPCWSTR s); DWORD _GetProcessIdOfThread (HANDLE thread); #define GetProcessIdOfThread _GetProcessIdOfThread #endif +void ConvertModulePathToAscii( LPCWSTR modulename, LPSTR * modulenamea ); DWORD CalculateCRC32(UINT_PTR p, UINT startValue = 0xD202EF8D); // Formats a message string using the specified message and variable // list of arguments. diff --git a/vld.cpp b/vld.cpp index 78ca173d..33d91cf2 100644 --- a/vld.cpp +++ b/vld.cpp @@ -593,29 +593,49 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) // Like infinite recursion. And ugly bald men wearing dresses. VLD // should not, therefore, attach to itself. continue; - } - - // increase reference count to module - HMODULE modulelocal = NULL; - if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCTSTR) modulebase, &modulelocal)) + } + + // increase reference count to module + HMODULE modulelocal = NULL; + if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCTSTR) modulebase, &modulelocal)) continue; if (!FindImport(modulelocal, m_vldBase, VLDDLL, "?g_vld@@3VVisualLeakDetector@@A")) { - // This module does not import VLD. This means that none of the module's - // sources #included vld.h. - if ((m_options & VLD_OPT_MODULE_LIST_INCLUDE) != 0) + bool isMfcModule = false; + if (_wcsnicmp(modulename, L"mfc", 3) == 0) { - if (wcsstr(m_forcedModuleList, modulename) == NULL) { - // Exclude this module from leak detection. - moduleFlags |= VLD_MODULE_EXCLUDED; + LPSTR modulenamea; + ConvertModulePathToAscii(modulename, &modulenamea); + + for (UINT index = 0; index < _countof(m_patchTable); index++) { + moduleentry_t *entry = &m_patchTable[index]; + if (_stricmp(entry->exportModuleName, modulenamea) == 0) { + isMfcModule = true; + break; + } } + + delete [] modulenamea; } - else + // mfc dll shouldn't be excluded + if (!isMfcModule) { - if (wcsstr(m_forcedModuleList, modulename) != NULL) { - // Exclude this module from leak detection. - moduleFlags |= VLD_MODULE_EXCLUDED; + // This module does not import VLD. This means that none of the module's + // sources #included vld.h. + if ((m_options & VLD_OPT_MODULE_LIST_INCLUDE) != 0) + { + if (wcsstr(m_forcedModuleList, modulename) == NULL) { + // Exclude this module from leak detection. + moduleFlags |= VLD_MODULE_EXCLUDED; + } + } + else + { + if (wcsstr(m_forcedModuleList, modulename) != NULL) { + // Exclude this module from leak detection. + moduleFlags |= VLD_MODULE_EXCLUDED; + } } } } @@ -1650,24 +1670,8 @@ BOOL VisualLeakDetector::addLoadedModule (PCWSTR modulepath, DWORD64 modulebase, g_vld.m_vldBase = (HMODULE)modulebase; } else { - // Convert the module path to ASCII. - length = ::WideCharToMultiByte(CP_ACP, 0, modulename, -1, 0, 0, 0, 0); - LPSTR modulenamea = new CHAR [length]; - - // wcstombs_s requires locale to be already set up correctly, but it might not be correct on vld init step. So use WideCharToMultiByte instead - CHAR defaultChar = '?'; - BOOL defaultCharUsed = FALSE; - - int count = ::WideCharToMultiByte(CP_ACP, 0/*flags*/, modulename, (int)-1, modulenamea, (int)length, &defaultChar, &defaultCharUsed); - assert(count != 0); - if ( defaultCharUsed ) - { - ::OutputDebugStringW(__FILEW__ L": " __FUNCTIONW__ L" - defaultChar was used while conversion from \""); - ::OutputDebugStringW(modulename); - ::OutputDebugStringW(L"\" to ANSI \""); - ::OutputDebugStringA(modulenamea); - ::OutputDebugStringW(L"\". Result can be wrong.\n"); - } + LPSTR modulenamea; + ConvertModulePathToAscii(modulename, &modulenamea); // See if this is a module listed in the patch table. If it is, update // the corresponding patch table entries' module base address. @@ -1858,7 +1862,7 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) if (patchentry->original != NULL) *patchentry->original = g_vld._RGetProcAddress(module, procname); return (FARPROC)patchentry->replacement; - } + } } } patchentry++; @@ -2052,7 +2056,7 @@ void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) CriticalSectionLocker cs(m_modulesLock); moduleit = m_loadedModules->begin(); while( moduleit != m_loadedModules->end() ) - { + { if ( (*moduleit).addrLow == (UINT_PTR)module) { moduleinfo_t *mod = (moduleinfo_t *)&(*moduleit); From e92528becd04f7d220c991cbb2f378612a26ab1c Mon Sep 17 00:00:00 2001 From: Shapkin Arkady Date: Fri, 28 Feb 2014 20:01:46 +0400 Subject: [PATCH 157/321] Thread methods added --- tests/dynamic_app/dynamic_app.cpp | 2 +- vld.cpp | 197 ++++++++++++++++++++---------- vld.h | 33 +++++ vld_hooks.cpp | 4 +- vldapi.cpp | 19 ++- vldint.h | 22 ++-- 6 files changed, 201 insertions(+), 76 deletions(-) diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 936b8448..e1b2db23 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -177,7 +177,7 @@ int _tmain(int argc, _TCHAR* argv[]) totalleaks = (int)VLDGetLeaksCount(); int leaks2 = totalleaks - prevleaks; prevleaks = totalleaks; - assert(leaks2 == 7); + assert(leaks2 == 11); LeakDuplicateLeaks(); // leaks 6 totalleaks = (int)VLDGetLeaksCount(); diff --git a/vld.cpp b/vld.cpp index 33d91cf2..788f192c 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1063,12 +1063,13 @@ tls_t* VisualLeakDetector::getTls () // // None. // -VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack) +VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, CallStack **&ppcallstack) { // Record the block's information. blockinfo_t* blockinfo = new blockinfo_t; blockinfo->callStack = NULL; - ppcallstack = &blockinfo->callStack; + ppcallstack = &blockinfo->callStack; + blockinfo->threadId = threadId; blockinfo->serialNumber = m_requestCurr++; blockinfo->size = size; blockinfo->reported = false; @@ -1185,7 +1186,8 @@ VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t & if (alloc_block && alloc_block->callStack && diff) { Report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); - Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); + Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); + Report(L" TID: %u\n", alloc_block->threadId); Report(L" Call Stack:\n"); alloc_block->callStack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); @@ -1276,13 +1278,13 @@ VOID VisualLeakDetector::unmapHeap (HANDLE heap) // None. // VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - bool crtalloc, CallStack **&ppcallstack, const context_t &context) + bool crtalloc, DWORD threadId, CallStack **&ppcallstack, const context_t &context) { if (newmem != mem) { // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. unmapBlock(heap, mem, context); - mapBlock(heap, newmem, size, crtalloc, ppcallstack); + mapBlock(heap, newmem, size, crtalloc, threadId, ppcallstack); return; } @@ -1295,7 +1297,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // block has also not been mapped to a blockinfo_t entry yet either, // so treat this reallocation as a brand-new allocation (this will // also map the heap to a new block map). - mapBlock(heap, newmem, size, crtalloc, ppcallstack); + mapBlock(heap, newmem, size, crtalloc, threadId, ppcallstack); return; } @@ -1305,7 +1307,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (blockit == blockmap->end()) { // The block hasn't been mapped to a blockinfo_t entry yet. // Treat this reallocation as a new allocation. - mapBlock(heap, newmem, size, crtalloc, ppcallstack); + mapBlock(heap, newmem, size, crtalloc, threadId, ppcallstack); return; } @@ -1338,7 +1340,8 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (m_curAlloc > m_maxAlloc) m_maxAlloc = m_curAlloc; - // Update the block's size. + info->threadId = threadId; + // Update the block's size. info->size = size; ppcallstack = &info->callStack; } @@ -1407,7 +1410,7 @@ VOID VisualLeakDetector::reportConfig () // // None. // -SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo) +SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo, DWORD threadId) { BlockMap* blockmap = &heapinfo->blockMap; SIZE_T memoryleaks = 0; @@ -1419,7 +1422,10 @@ SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo) LPCVOID block = (*blockit).first; blockinfo_t* info = (*blockit).second; if (info->reported) - continue; + continue; + + if (threadId != ((DWORD)-1) && info->threadId != threadId) + continue; if (heapinfo->flags & VLD_HEAP_CRT_DBG) { // This block is allocated to a CRT heap, so the block has a CRT @@ -1463,8 +1469,9 @@ SIZE_T VisualLeakDetector::reportHeapLeaks (HANDLE heap) Set aggregatedLeaks; heapinfo_t* heapinfo = (*heapit).second; - // Generate a memory leak report for heap. - SIZE_T leaks_count = reportLeaks(heapinfo, aggregatedLeaks); + // Generate a memory leak report for heap. + bool firstLeak = true; + SIZE_T leaks_count = reportLeaks(heapinfo, firstLeak, aggregatedLeaks); // Show a summary. if (leaks_count != 0) { @@ -1474,11 +1481,10 @@ SIZE_T VisualLeakDetector::reportHeapLeaks (HANDLE heap) return leaks_count; } -SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, Set &aggregatedLeaks) +SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, Set &aggregatedLeaks, DWORD threadId) { BlockMap* blockmap = &heapinfo->blockMap; SIZE_T leaksFound = 0; - bool firstLeak = true; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { @@ -1489,6 +1495,9 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, Set if (info->reported) continue; + if (threadId != ((DWORD)-1) && info->threadId != threadId) + continue; + Set::Iterator it = aggregatedLeaks.find(info); if (it != aggregatedLeaks.end()) continue; @@ -1520,8 +1529,8 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, Set if (firstLeak) { // A confusing way to only display this message once Report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); firstLeak = false; - } - leaksFound++; + } + SIZE_T blockLeaksCount = 1; Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialNumber, address, size); assert(info->callStack); if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { @@ -1531,15 +1540,20 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, Set // add only the number that were erased, since the 'one left over' // is already recorded as a leak - leaksFound += erased; - - DWORD callstackCRC = 0; - if (info->callStack) - callstackCRC = CalculateCRC32(info->size, info->callStack->getHashValue()); - Report(L"Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, erased + 1); - } - // Dump the call stack. - Report(L" Call Stack:\n"); + blockLeaksCount += erased; + } + + DWORD callstackCRC = 0; + if (info->callStack) + callstackCRC = CalculateCRC32(info->size, info->callStack->getHashValue()); + Report(L" Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, blockLeaksCount); + leaksFound += blockLeaksCount; + + // Dump the call stack. + if (blockLeaksCount == 1) + Report(L" Call Stack (TID %u):\n", info->threadId); + else + Report(L" Call Stack:\n"); if (info->callStack) info->callStack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); @@ -1559,15 +1573,16 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, Set return leaksFound; } -VOID VisualLeakDetector::markAllLeaksAsReported (heapinfo_t* heapinfo) +VOID VisualLeakDetector::markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD threadId) { - BlockMap* blockmap = &heapinfo->blockMap; - - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) - { - blockinfo_t* info = (*blockit).second; - info->reported = true; - } + BlockMap* blockmap = &heapinfo->blockMap; + + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) + { + blockinfo_t* info = (*blockit).second; + if (threadId == ((DWORD)-1) || info->threadId == threadId) + info->reported = true; + } } // FindAllocedBlock - Find if a particular memory allocation is tracked inside of VLD. @@ -1995,41 +2010,82 @@ bool VisualLeakDetector::isModuleExcluded(UINT_PTR address) SIZE_T VisualLeakDetector::GetLeaksCount() { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return 0; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return 0; + } + + SIZE_T leaksCount = 0; + // Generate a memory leak report for each heap in the process. + CriticalSectionLocker cs(m_heapMapLock); + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + leaksCount += getLeaksCount(heapinfo); + } + return leaksCount; +} - SIZE_T leaksCount = 0; - // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(m_heapMapLock); - for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { - HANDLE heap = (*heapit).first; - UNREFERENCED_PARAMETER(heap); - heapinfo_t* heapinfo = (*heapit).second; - leaksCount += getLeaksCount(heapinfo); - } - return leaksCount; +SIZE_T VisualLeakDetector::GetThreadLeaksCount(DWORD threadId) +{ + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return 0; + } + + SIZE_T leaksCount = 0; + // Generate a memory leak report for each heap in the process. + CriticalSectionLocker cs(m_heapMapLock); + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + leaksCount += getLeaksCount(heapinfo, threadId); + } + return leaksCount; } SIZE_T VisualLeakDetector::ReportLeaks( ) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return 0; - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return 0; + } + + // Generate a memory leak report for each heap in the process. + SIZE_T leaksCount = 0; + CriticalSectionLocker cs(m_heapMapLock); + bool firstLeak = true; + Set aggregatedLeaks; + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + leaksCount += reportLeaks(heapinfo, firstLeak, aggregatedLeaks); + } + return leaksCount; +} - // Generate a memory leak report for each heap in the process. - SIZE_T leaksCount = 0; - CriticalSectionLocker cs(m_heapMapLock); - Set aggregatedLeaks; - for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { - HANDLE heap = (*heapit).first; - UNREFERENCED_PARAMETER(heap); - heapinfo_t* heapinfo = (*heapit).second; - leaksCount += reportLeaks(heapinfo, aggregatedLeaks); - } - return leaksCount; +SIZE_T VisualLeakDetector::ReportThreadLeaks( DWORD threadId ) +{ + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return 0; + } + + // Generate a memory leak report for each heap in the process. + SIZE_T leaksCount = 0; + CriticalSectionLocker cs(m_heapMapLock); + bool firstLeak = true; + Set aggregatedLeaks; + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + leaksCount += reportLeaks(heapinfo, firstLeak, aggregatedLeaks, threadId); + } + return leaksCount; } VOID VisualLeakDetector::MarkAllLeaksAsReported( ) @@ -2049,6 +2105,23 @@ VOID VisualLeakDetector::MarkAllLeaksAsReported( ) } } +VOID VisualLeakDetector::MarkThreadLeaksAsReported( DWORD threadId ) +{ + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Generate a memory leak report for each heap in the process. + CriticalSectionLocker cs(m_heapMapLock); + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + markAllLeaksAsReported(heapinfo, threadId); + } +} + void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) { ModuleSet::Iterator moduleit; diff --git a/vld.h b/vld.h index 371daf82..52686dcb 100644 --- a/vld.h +++ b/vld.h @@ -128,6 +128,16 @@ __declspec(dllimport) void VLDGlobalEnable (); // __declspec(dllimport) VLD_UINT VLDReportLeaks (); +// VLDReportThreadLeaks - Report thread leaks up to the execution point. +// +// threadId: thread Id. +// +// Return Value: +// +// None. +// +__declspec(dllimport) VLD_UINT VLDReportThreadLeaks (VLD_UINT threadId); + // VLDGetLeaksCount - Return memory leaks count to the execution point. // // Return Value: @@ -136,6 +146,16 @@ __declspec(dllimport) VLD_UINT VLDReportLeaks (); // __declspec(dllimport) VLD_UINT VLDGetLeaksCount (); +// VLDGetThreadLeaksCount - Return thread memory leaks count to the execution point. +// +// threadId: thread Id. +// +// Return Value: +// +// None. +// +__declspec(dllimport) VLD_UINT VLDGetThreadLeaksCount (VLD_UINT threadId); + // VLDMarkAllLeaksAsReported - Mark all leaks as reported. // // Return Value: @@ -144,6 +164,16 @@ __declspec(dllimport) VLD_UINT VLDGetLeaksCount (); // __declspec(dllimport) void VLDMarkAllLeaksAsReported (); +// VLDMarkThreadLeaksAsReported - Mark thread leaks as reported. +// +// threadId: thread Id. +// +// Return Value: +// +// None. +// +__declspec(dllimport) void VLDMarkThreadLeaksAsReported (VLD_UINT threadId); + // VLDRefreshModules - Look for recently loaded DLLs and patch them if necessary. // @@ -294,8 +324,11 @@ __declspec(dllexport) void VLDResolveCallstacks(); #define VLDDisable() #define VLDRestore() #define VLDReportLeaks() (0) +#define VLDReportThreadLeaks() (0) #define VLDGetLeaksCount() (0) +#define VLDGetThreadLeaksCount() (0) #define VLDMarkAllLeaksAsReported() +#define VLDMarkThreadLeaksAsReported(a) #define VLDRefreshModules() #define VLDEnableModule(a) #define VLDDisableModule(b) diff --git a/vld_hooks.cpp b/vld_hooks.cpp index f187b004..f98f6cb4 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -1583,7 +1583,7 @@ void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SI // The module that initiated this allocation is included in leak // detection. Map this block to the specified heap. - g_vld.mapBlock(heap, block, size, crtalloc, tls->ppCallStack); + g_vld.mapBlock(heap, block, size, crtalloc, tls->threadId, tls->ppCallStack); } // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. @@ -1757,7 +1757,7 @@ void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LP // The module that initiated this allocation is included in leak // detection. Remap the block. - g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->ppCallStack, context); + g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->threadId, tls->ppCallStack, context); #ifdef _DEBUG if(tls->context.fp != 0) diff --git a/vldapi.cpp b/vldapi.cpp index ab85e103..f6cb6083 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -67,14 +67,29 @@ __declspec(dllexport) UINT VLDReportLeaks () return (UINT)g_vld.ReportLeaks(); } +__declspec(dllexport) UINT VLDReportThreadLeaks (UINT threadId) +{ + return (UINT)g_vld.ReportThreadLeaks(threadId); +} + __declspec(dllexport) UINT VLDGetLeaksCount () { - return (UINT)g_vld.GetLeaksCount(); + return (UINT)g_vld.GetLeaksCount(); +} + +__declspec(dllexport) UINT VLDGetThreadLeaksCount (UINT threadId) +{ + return (UINT)g_vld.GetThreadLeaksCount(threadId); } __declspec(dllexport) void VLDMarkAllLeaksAsReported () { - g_vld.MarkAllLeaksAsReported(); + g_vld.MarkAllLeaksAsReported(); +} + +__declspec(dllexport) void VLDMarkThreadLeaksAsReported (UINT threadId) +{ + g_vld.MarkThreadLeaksAsReported(threadId); } __declspec(dllexport) void VLDRefreshModules() diff --git a/vldint.h b/vldint.h index 5558997d..708ce5f1 100644 --- a/vldint.h +++ b/vldint.h @@ -96,7 +96,8 @@ typedef void* (__cdecl *_aligned_offset_recalloc_dbg_t) (void *, size_t, size_t, // a BlockMap which maps each of these structures to its corresponding memory // block. struct blockinfo_t { - CallStack *callStack; + CallStack *callStack; + DWORD threadId; SIZE_T serialNumber; SIZE_T size; bool reported; @@ -260,9 +261,12 @@ class VisualLeakDetector : public IMalloc void GlobalEnableLeakDetection (); VOID RefreshModules(); - SIZE_T GetLeaksCount(); - SIZE_T ReportLeaks(); - VOID MarkAllLeaksAsReported(); + SIZE_T GetLeaksCount(); + SIZE_T GetThreadLeaksCount(DWORD threadId); + SIZE_T ReportLeaks(); + SIZE_T ReportThreadLeaks(DWORD threadId); + VOID MarkAllLeaksAsReported(); + VOID MarkThreadLeaksAsReported(DWORD threadId); VOID EnableModule(HMODULE module); VOID DisableModule(HMODULE module); UINT32 GetOptions(); @@ -290,15 +294,15 @@ class VisualLeakDetector : public IMalloc BOOL enabled (); SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); tls_t* getTls (); - VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, CallStack **&ppcallstack); + VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, CallStack **&ppcallstack); VOID mapHeap (HANDLE heap); VOID remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - bool crtalloc, CallStack **&ppcallstack, const context_t &context); + bool crtalloc, DWORD threadId, CallStack **&ppcallstack, const context_t &context); VOID reportConfig (); SIZE_T reportHeapLeaks (HANDLE heap); - SIZE_T getLeaksCount (heapinfo_t* heapinfo); - SIZE_T reportLeaks( heapinfo_t* heapinfo, Set &aggregatedLeaks ); - VOID markAllLeaksAsReported (heapinfo_t* heapinfo); + SIZE_T getLeaksCount (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); + SIZE_T reportLeaks(heapinfo_t* heapinfo, bool &firstLeak, Set &aggregatedLeaks, DWORD threadId = (DWORD)-1); + VOID markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); VOID unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context); VOID unmapHeap (HANDLE heap); void resolveStacks(heapinfo_t* heapinfo); From d84107cda24ae11d80c31a1e20eda222a36e121d Mon Sep 17 00:00:00 2001 From: Shapkin Arkady Date: Wed, 5 Mar 2014 19:14:55 +0400 Subject: [PATCH 158/321] Memory reporting fixed at exit --- vld.cpp | 259 +++++++++++++++++++++++++------------------------- vld_hooks.cpp | 19 ++-- vldapi.cpp | 8 +- vldint.h | 27 +++--- 4 files changed, 159 insertions(+), 154 deletions(-) diff --git a/vld.cpp b/vld.cpp index 788f192c..7146f354 100644 --- a/vld.cpp +++ b/vld.cpp @@ -416,7 +416,6 @@ VisualLeakDetector::~VisualLeakDetector () for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { BlockMap *blockmap = &(*heapit).second->blockMap; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callStack; delete (*blockit).second; } delete blockmap; @@ -1036,7 +1035,7 @@ tls_t* VisualLeakDetector::getTls () tls->flags = 0x0; tls->oldFlags = 0x0; tls->threadId = threadId; - tls->ppCallStack = NULL; + tls->pblockInfo = NULL; tls->blockProcessed = FALSE; } @@ -1063,13 +1062,13 @@ tls_t* VisualLeakDetector::getTls () // // None. // -VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, CallStack **&ppcallstack) +VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo) { // Record the block's information. - blockinfo_t* blockinfo = new blockinfo_t; + blockinfo_t* blockinfo = new blockinfo_t(); blockinfo->callStack = NULL; - ppcallstack = &blockinfo->callStack; - blockinfo->threadId = threadId; + pblockInfo = blockinfo; + blockinfo->threadId = threadId; blockinfo->serialNumber = m_requestCurr++; blockinfo->size = size; blockinfo->reported = false; @@ -1104,11 +1103,11 @@ VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool c // mechanism unknown to VLD), or the heap wouldn't have allocated it // again. Replace the previously allocated info with the new info. blockit = blockmap->find(mem); - delete (*blockit).second->callStack; + m_curAlloc -= (*blockit).second->size; delete (*blockit).second; blockmap->erase(blockit); blockmap->insert(mem, blockinfo); - ppcallstack = NULL; + pblockInfo = NULL; } } @@ -1186,8 +1185,8 @@ VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t & if (alloc_block && alloc_block->callStack && diff) { Report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); - Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); - Report(L" TID: %u\n", alloc_block->threadId); + Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); + Report(L" TID: %u\n", alloc_block->threadId); Report(L" Call Stack:\n"); alloc_block->callStack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); @@ -1211,7 +1210,6 @@ VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t & // Free the blockinfo_t structure and erase it from the block map. blockinfo_t *info = (*blockit).second; m_curAlloc -= info->size; - delete info->callStack; delete info; blockmap->erase(blockit); } @@ -1241,7 +1239,7 @@ VOID VisualLeakDetector::unmapHeap (HANDLE heap) heapinfo_t *heapinfo = (*heapit).second; BlockMap *blockmap = &heapinfo->blockMap; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second->callStack; + m_curAlloc -= (*blockit).second->size; delete (*blockit).second; } delete heapinfo; @@ -1278,13 +1276,13 @@ VOID VisualLeakDetector::unmapHeap (HANDLE heap) // None. // VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - bool crtalloc, DWORD threadId, CallStack **&ppcallstack, const context_t &context) + bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context) { if (newmem != mem) { // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. unmapBlock(heap, mem, context); - mapBlock(heap, newmem, size, crtalloc, threadId, ppcallstack); + mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo); return; } @@ -1297,7 +1295,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // block has also not been mapped to a blockinfo_t entry yet either, // so treat this reallocation as a brand-new allocation (this will // also map the heap to a new block map). - mapBlock(heap, newmem, size, crtalloc, threadId, ppcallstack); + mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo); return; } @@ -1307,7 +1305,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (blockit == blockmap->end()) { // The block hasn't been mapped to a blockinfo_t entry yet. // Treat this reallocation as a new allocation. - mapBlock(heap, newmem, size, crtalloc, threadId, ppcallstack); + mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo); return; } @@ -1316,8 +1314,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S blockinfo_t* info = (*blockit).second; if (info->callStack) { - delete info->callStack; - info->callStack = NULL; + info->callStack.reset(); } if (crtalloc) { @@ -1340,10 +1337,10 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (m_curAlloc > m_maxAlloc) m_maxAlloc = m_curAlloc; - info->threadId = threadId; - // Update the block's size. + info->threadId = threadId; + // Update the block's size. info->size = size; - ppcallstack = &info->callStack; + pblockInfo = info; } // reportconfig - Generates a brief report summarizing Visual Leak Detector's @@ -1422,10 +1419,10 @@ SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo, DWORD threadId) LPCVOID block = (*blockit).first; blockinfo_t* info = (*blockit).second; if (info->reported) - continue; + continue; - if (threadId != ((DWORD)-1) && info->threadId != threadId) - continue; + if (threadId != ((DWORD)-1) && info->threadId != threadId) + continue; if (heapinfo->flags & VLD_HEAP_CRT_DBG) { // This block is allocated to a CRT heap, so the block has a CRT @@ -1469,8 +1466,8 @@ SIZE_T VisualLeakDetector::reportHeapLeaks (HANDLE heap) Set aggregatedLeaks; heapinfo_t* heapinfo = (*heapit).second; - // Generate a memory leak report for heap. - bool firstLeak = true; + // Generate a memory leak report for heap. + bool firstLeak = true; SIZE_T leaks_count = reportLeaks(heapinfo, firstLeak, aggregatedLeaks); // Show a summary. @@ -1495,8 +1492,8 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S if (info->reported) continue; - if (threadId != ((DWORD)-1) && info->threadId != threadId) - continue; + if (threadId != ((DWORD)-1) && info->threadId != threadId) + continue; Set::Iterator it = aggregatedLeaks.find(info); if (it != aggregatedLeaks.end()) @@ -1529,8 +1526,8 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S if (firstLeak) { // A confusing way to only display this message once Report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); firstLeak = false; - } - SIZE_T blockLeaksCount = 1; + } + SIZE_T blockLeaksCount = 1; Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialNumber, address, size); assert(info->callStack); if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { @@ -1541,19 +1538,19 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S // add only the number that were erased, since the 'one left over' // is already recorded as a leak blockLeaksCount += erased; - } - - DWORD callstackCRC = 0; - if (info->callStack) - callstackCRC = CalculateCRC32(info->size, info->callStack->getHashValue()); - Report(L" Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, blockLeaksCount); - leaksFound += blockLeaksCount; - - // Dump the call stack. - if (blockLeaksCount == 1) - Report(L" Call Stack (TID %u):\n", info->threadId); - else - Report(L" Call Stack:\n"); + } + + DWORD callstackCRC = 0; + if (info->callStack) + callstackCRC = CalculateCRC32(info->size, info->callStack->getHashValue()); + Report(L" Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, blockLeaksCount); + leaksFound += blockLeaksCount; + + // Dump the call stack. + if (blockLeaksCount == 1) + Report(L" Call Stack (TID %u):\n", info->threadId); + else + Report(L" Call Stack:\n"); if (info->callStack) info->callStack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); @@ -1575,14 +1572,14 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S VOID VisualLeakDetector::markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD threadId) { - BlockMap* blockmap = &heapinfo->blockMap; - - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) - { - blockinfo_t* info = (*blockit).second; - if (threadId == ((DWORD)-1) || info->threadId == threadId) - info->reported = true; - } + BlockMap* blockmap = &heapinfo->blockMap; + + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) + { + blockinfo_t* info = (*blockit).second; + if (threadId == ((DWORD)-1) || info->threadId == threadId) + info->reported = true; + } } // FindAllocedBlock - Find if a particular memory allocation is tracked inside of VLD. @@ -1598,6 +1595,7 @@ VOID VisualLeakDetector::markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD thr // blockinfo_t* VisualLeakDetector::findAllocedBlock(LPCVOID mem, __out HANDLE& heap) { + heap = NULL; blockinfo_t* result = NULL; // Iterate through all heaps for (HeapMap::Iterator it = m_heapMap->begin(); @@ -1975,17 +1973,16 @@ VOID VisualLeakDetector::RefreshModules() delete oldmodules; } -void VisualLeakDetector::getCallStack( CallStack **&ppcallstack, context_t &context_ ) +void VisualLeakDetector::getCallStack( CallStack *&pcallstack, context_t &context_ ) { CallStack* callstack = CallStack::Create(); // Reset thread local flags and variables, in case any libraries called // into while mapping the block allocate some memory. context_t context = context_; - *ppcallstack = callstack; + pcallstack = callstack; context_.fp = 0x0; context_.func = 0x0; - ppcallstack = NULL; callstack->getStackTrace(g_vld.m_maxTraceFrames, context); } @@ -2010,82 +2007,82 @@ bool VisualLeakDetector::isModuleExcluded(UINT_PTR address) SIZE_T VisualLeakDetector::GetLeaksCount() { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return 0; - } - - SIZE_T leaksCount = 0; - // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(m_heapMapLock); - for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { - HANDLE heap = (*heapit).first; - UNREFERENCED_PARAMETER(heap); - heapinfo_t* heapinfo = (*heapit).second; - leaksCount += getLeaksCount(heapinfo); - } - return leaksCount; + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return 0; + } + + SIZE_T leaksCount = 0; + // Generate a memory leak report for each heap in the process. + CriticalSectionLocker cs(m_heapMapLock); + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + leaksCount += getLeaksCount(heapinfo); + } + return leaksCount; } SIZE_T VisualLeakDetector::GetThreadLeaksCount(DWORD threadId) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return 0; - } - - SIZE_T leaksCount = 0; - // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(m_heapMapLock); - for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { - HANDLE heap = (*heapit).first; - UNREFERENCED_PARAMETER(heap); - heapinfo_t* heapinfo = (*heapit).second; - leaksCount += getLeaksCount(heapinfo, threadId); - } - return leaksCount; + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return 0; + } + + SIZE_T leaksCount = 0; + // Generate a memory leak report for each heap in the process. + CriticalSectionLocker cs(m_heapMapLock); + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + leaksCount += getLeaksCount(heapinfo, threadId); + } + return leaksCount; } SIZE_T VisualLeakDetector::ReportLeaks( ) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return 0; - } - - // Generate a memory leak report for each heap in the process. - SIZE_T leaksCount = 0; - CriticalSectionLocker cs(m_heapMapLock); - bool firstLeak = true; - Set aggregatedLeaks; - for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { - HANDLE heap = (*heapit).first; - UNREFERENCED_PARAMETER(heap); - heapinfo_t* heapinfo = (*heapit).second; - leaksCount += reportLeaks(heapinfo, firstLeak, aggregatedLeaks); - } - return leaksCount; + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return 0; + } + + // Generate a memory leak report for each heap in the process. + SIZE_T leaksCount = 0; + CriticalSectionLocker cs(m_heapMapLock); + bool firstLeak = true; + Set aggregatedLeaks; + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + leaksCount += reportLeaks(heapinfo, firstLeak, aggregatedLeaks); + } + return leaksCount; } SIZE_T VisualLeakDetector::ReportThreadLeaks( DWORD threadId ) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return 0; - } - - // Generate a memory leak report for each heap in the process. - SIZE_T leaksCount = 0; - CriticalSectionLocker cs(m_heapMapLock); - bool firstLeak = true; - Set aggregatedLeaks; - for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { - HANDLE heap = (*heapit).first; - UNREFERENCED_PARAMETER(heap); - heapinfo_t* heapinfo = (*heapit).second; - leaksCount += reportLeaks(heapinfo, firstLeak, aggregatedLeaks, threadId); - } - return leaksCount; + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return 0; + } + + // Generate a memory leak report for each heap in the process. + SIZE_T leaksCount = 0; + CriticalSectionLocker cs(m_heapMapLock); + bool firstLeak = true; + Set aggregatedLeaks; + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + leaksCount += reportLeaks(heapinfo, firstLeak, aggregatedLeaks, threadId); + } + return leaksCount; } VOID VisualLeakDetector::MarkAllLeaksAsReported( ) @@ -2107,19 +2104,19 @@ VOID VisualLeakDetector::MarkAllLeaksAsReported( ) VOID VisualLeakDetector::MarkThreadLeaksAsReported( DWORD threadId ) { - if (m_options & VLD_OPT_VLDOFF) { - // VLD has been turned off. - return; - } - - // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(m_heapMapLock); - for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { - HANDLE heap = (*heapit).first; - UNREFERENCED_PARAMETER(heap); - heapinfo_t* heapinfo = (*heapit).second; - markAllLeaksAsReported(heapinfo, threadId); - } + if (m_options & VLD_OPT_VLDOFF) { + // VLD has been turned off. + return; + } + + // Generate a memory leak report for each heap in the process. + CriticalSectionLocker cs(m_heapMapLock); + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + HANDLE heap = (*heapit).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapit).second; + markAllLeaksAsReported(heapinfo, threadId); + } } void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) diff --git a/vld_hooks.cpp b/vld_hooks.cpp index f98f6cb4..fb02d861 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -42,10 +42,13 @@ extern CriticalSection g_symbolLock; void VisualLeakDetector::firstAllocCall(tls_t * tls) { - if (tls->ppCallStack) + if (tls->pblockInfo) { tls->flags &= ~VLD_TLS_CRTALLOC; - getCallStack(tls->ppCallStack, tls->context); + CallStack* callstack; + getCallStack(callstack, tls->context); + tls->pblockInfo->callStack.reset(callstack); + tls->pblockInfo = NULL; } // Reset thread local flags and variables for the next allocation. @@ -1583,7 +1586,7 @@ void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SI // The module that initiated this allocation is included in leak // detection. Map this block to the specified heap. - g_vld.mapBlock(heap, block, size, crtalloc, tls->threadId, tls->ppCallStack); + g_vld.mapBlock(heap, block, size, crtalloc, tls->threadId, tls->pblockInfo); } // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. @@ -1696,7 +1699,9 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID if (firstcall) { firstAllocCall(tls); - tls->ppCallStack = NULL; + std::unique_ptr &callStack = tls->pblockInfo->callStack; + tls->pblockInfo = NULL; + callStack.reset(); } return newmem; @@ -1739,7 +1744,9 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S if (firstcall) { firstAllocCall(tls); - tls->ppCallStack = NULL; + std::unique_ptr &callStack = tls->pblockInfo->callStack; + tls->pblockInfo = NULL; + callStack.reset(); } return newmem; @@ -1757,7 +1764,7 @@ void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LP // The module that initiated this allocation is included in leak // detection. Remap the block. - g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->threadId, tls->ppCallStack, context); + g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->threadId, tls->pblockInfo, context); #ifdef _DEBUG if(tls->context.fp != 0) diff --git a/vldapi.cpp b/vldapi.cpp index f6cb6083..245312d2 100644 --- a/vldapi.cpp +++ b/vldapi.cpp @@ -69,12 +69,12 @@ __declspec(dllexport) UINT VLDReportLeaks () __declspec(dllexport) UINT VLDReportThreadLeaks (UINT threadId) { - return (UINT)g_vld.ReportThreadLeaks(threadId); + return (UINT)g_vld.ReportThreadLeaks(threadId); } __declspec(dllexport) UINT VLDGetLeaksCount () { - return (UINT)g_vld.GetLeaksCount(); + return (UINT)g_vld.GetLeaksCount(); } __declspec(dllexport) UINT VLDGetThreadLeaksCount (UINT threadId) @@ -84,12 +84,12 @@ __declspec(dllexport) UINT VLDGetThreadLeaksCount (UINT threadId) __declspec(dllexport) void VLDMarkAllLeaksAsReported () { - g_vld.MarkAllLeaksAsReported(); + g_vld.MarkAllLeaksAsReported(); } __declspec(dllexport) void VLDMarkThreadLeaksAsReported (UINT threadId) { - g_vld.MarkThreadLeaksAsReported(threadId); + g_vld.MarkThreadLeaksAsReported(threadId); } __declspec(dllexport) void VLDRefreshModules() diff --git a/vldint.h b/vldint.h index 708ce5f1..8a655064 100644 --- a/vldint.h +++ b/vldint.h @@ -31,6 +31,7 @@ #include #include +#include #include "vld_def.h" #include "version.h" #include "callstack.h" // Provides a custom class for handling call stacks. @@ -96,8 +97,8 @@ typedef void* (__cdecl *_aligned_offset_recalloc_dbg_t) (void *, size_t, size_t, // a BlockMap which maps each of these structures to its corresponding memory // block. struct blockinfo_t { - CallStack *callStack; - DWORD threadId; + std::unique_ptr callStack; + DWORD threadId; SIZE_T serialNumber; SIZE_T size; bool reported; @@ -159,7 +160,7 @@ struct tls_t { UINT32 oldFlags; // Thread-local status old flags BOOL blockProcessed; // Internal diagnostic feature DWORD threadId; // Thread ID of the thread that owns this TLS structure. - CallStack** ppCallStack; // Memory block callstack pointer. + blockinfo_t* pblockInfo; // Store pointer to callstack. }; // The TlsSet allows VLD to keep track of all thread local storage structures @@ -261,12 +262,12 @@ class VisualLeakDetector : public IMalloc void GlobalEnableLeakDetection (); VOID RefreshModules(); - SIZE_T GetLeaksCount(); - SIZE_T GetThreadLeaksCount(DWORD threadId); - SIZE_T ReportLeaks(); - SIZE_T ReportThreadLeaks(DWORD threadId); - VOID MarkAllLeaksAsReported(); - VOID MarkThreadLeaksAsReported(DWORD threadId); + SIZE_T GetLeaksCount(); + SIZE_T GetThreadLeaksCount(DWORD threadId); + SIZE_T ReportLeaks(); + SIZE_T ReportThreadLeaks(DWORD threadId); + VOID MarkAllLeaksAsReported(); + VOID MarkThreadLeaksAsReported(DWORD threadId); VOID EnableModule(HMODULE module); VOID DisableModule(HMODULE module); UINT32 GetOptions(); @@ -294,15 +295,15 @@ class VisualLeakDetector : public IMalloc BOOL enabled (); SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); tls_t* getTls (); - VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, CallStack **&ppcallstack); + VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo); VOID mapHeap (HANDLE heap); VOID remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - bool crtalloc, DWORD threadId, CallStack **&ppcallstack, const context_t &context); + bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context); VOID reportConfig (); SIZE_T reportHeapLeaks (HANDLE heap); SIZE_T getLeaksCount (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); SIZE_T reportLeaks(heapinfo_t* heapinfo, bool &firstLeak, Set &aggregatedLeaks, DWORD threadId = (DWORD)-1); - VOID markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); + VOID markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); VOID unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context); VOID unmapHeap (HANDLE heap); void resolveStacks(heapinfo_t* heapinfo); @@ -314,7 +315,7 @@ class VisualLeakDetector : public IMalloc // Utils static bool isModuleExcluded (UINT_PTR returnaddress); blockinfo_t* findAllocedBlock(LPCVOID, __out HANDLE& heap); - static void getCallStack( CallStack **&ppcallstack, context_t &context ); + static void getCallStack( CallStack *&pcallstack, context_t &context ); static inline void firstAllocCall(tls_t * tls); void setupReporting(); void checkInternalMemoryLeaks(); From 09b7de0009fc00d7a3974e6299305bc73223b9a1 Mon Sep 17 00:00:00 2001 From: Shapkin Arkady Date: Thu, 6 Mar 2014 18:26:59 +0400 Subject: [PATCH 159/321] Format specifier fixed --- vld.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vld.cpp b/vld.cpp index 7146f354..5f5368f8 100644 --- a/vld.cpp +++ b/vld.cpp @@ -335,7 +335,7 @@ void VisualLeakDetector::checkInternalMemoryLeaks() leakline = header->line; mbstowcs_s(&count, leakfilew, MAX_PATH, leakfile, _TRUNCATE); Report(L"ERROR: Visual Leak Detector: Detected a memory leak internal to Visual Leak Detector!!\n"); - Report(L"---------- Block %Iu at " ADDRESSFORMAT L": %u bytes ----------\n", header->serialNumber, VLDBLOCKDATA(header), header->size); + Report(L"---------- Block %Iu at " ADDRESSFORMAT L": %Iu bytes ----------\n", header->serialNumber, VLDBLOCKDATA(header), header->size); Report(L" Call Stack:\n"); Report(L" %s (%d): Full call stack not available.\n", leakfilew, leakline); if (m_maxDataDump != 0) { @@ -1185,7 +1185,7 @@ VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t & if (alloc_block && alloc_block->callStack && diff) { Report(L"CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another.\nThis will result in a corrupted heap.\nAllocation Call stack.\n"); - Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); + Report(L"---------- Block %Iu at " ADDRESSFORMAT L": %Iu bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); Report(L" TID: %u\n", alloc_block->threadId); Report(L" Call Stack:\n"); alloc_block->callStack->dump(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); @@ -1194,7 +1194,7 @@ VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t & CallStack* stack_here = CallStack::Create(); stack_here->getStackTrace(m_maxTraceFrames, context); Report(L"Deallocation Call stack.\n"); - Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); + Report(L"---------- Block %Iu at " ADDRESSFORMAT L": %Iu bytes ----------\n", alloc_block->serialNumber, mem, alloc_block->size); Report(L" Call Stack:\n"); stack_here->dump(FALSE); // Now it should be safe to delete our temporary callstack @@ -1528,7 +1528,7 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S firstLeak = false; } SIZE_T blockLeaksCount = 1; - Report(L"---------- Block %ld at " ADDRESSFORMAT L": %u bytes ----------\n", info->serialNumber, address, size); + Report(L"---------- Block %Iu at " ADDRESSFORMAT L": %Iu bytes ----------\n", info->serialNumber, address, size); assert(info->callStack); if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { // Aggregate all other leaks which are duplicates of this one @@ -1543,7 +1543,7 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S DWORD callstackCRC = 0; if (info->callStack) callstackCRC = CalculateCRC32(info->size, info->callStack->getHashValue()); - Report(L" Leak Hash: 0x%08X Count: %Iu\n", callstackCRC, blockLeaksCount); + Report(L" Leak Hash: 0x%08X, Count: %Iu, Total %Iu bytes\n", callstackCRC, blockLeaksCount, size * blockLeaksCount); leaksFound += blockLeaksCount; // Dump the call stack. From 1c206d62fc420138530f31f228c97430a68d8f3c Mon Sep 17 00:00:00 2001 From: Shapkin Arkady Date: Fri, 7 Mar 2014 18:13:06 +0400 Subject: [PATCH 160/321] Allocator added --- .editorconfig | 28 +++++++++++++++++++++++ vld.cpp | 3 +-- vld.vcxproj | 1 + vld.vcxproj.filters | 3 +++ vldallocator.h | 55 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 .editorconfig create mode 100644 vldallocator.h diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9bfc71ef --- /dev/null +++ b/.editorconfig @@ -0,0 +1,28 @@ +# EditorConfig is awesome: http://visualstudiogallery.msdn.microsoft.com/c8bccfe2-650c-4b42-bc5c-845e21f96328 + +# top-most EditorConfig file +root = true + +# Windows-style newlines +[*] +end_of_line = crlf + +# 4 space indentation +[*.py] +indent_style = space +indent_size = 4 + +# 4 space indentation +[*.c] +indent_style = space +indent_size = 4 + +# 4 space indentation +[*.cpp] +indent_style = space +indent_size = 4 + +# 4 space indentation +[*.h] +indent_style = space +indent_size = 4 \ No newline at end of file diff --git a/vld.cpp b/vld.cpp index 5f5368f8..56a138c7 100644 --- a/vld.cpp +++ b/vld.cpp @@ -34,7 +34,7 @@ #include "ntapi.h" // Provides access to NT APIs. #include "set.h" // Provides a lightweight STL-like set template. #include "utility.h" // Provides various utility functions. -#include "vldheap.h" // Provides internal new and delete operators. +#include "vldallocator.h"// Provides internal allocator. #include "vldint.h" // Provides access to the Visual Leak Detector internals. #define BLOCK_MAP_RESERVE 64 // This should strike a balance between memory use and a desire to minimize heap hits. @@ -265,7 +265,6 @@ VisualLeakDetector::VisualLeakDetector () L" debugger is the only selected report destination. The debugger cannot display\n" L" Unicode characters, so the report will also be sent to a file. If no file has\n" L" been specified, the default file name is \"" VLD_DEFAULT_REPORT_FILE_NAME L"\".\n"); - } reportConfig(); } diff --git a/vld.vcxproj b/vld.vcxproj index 74af9865..23d2161e 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -179,6 +179,7 @@ + diff --git a/vld.vcxproj.filters b/vld.vcxproj.filters index 0e4b603a..0564e514 100644 --- a/vld.vcxproj.filters +++ b/vld.vcxproj.filters @@ -89,6 +89,9 @@ Header Files + + Header Files + diff --git a/vldallocator.h b/vldallocator.h new file mode 100644 index 00000000..a026d377 --- /dev/null +++ b/vldallocator.h @@ -0,0 +1,55 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Internal C++ Heap Management Definitions +// Copyright (c) 2005-2014 VLD Team +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once +#include +#include "vldheap.h" // Provides internal new and delete operators. + +template +class vldallocator: public std::allocator +{ +public: + typedef size_t size_type; + typedef T* pointer; + typedef const T* const_pointer; + + template + struct rebind + { + typedef vldallocator<_Tp1> other; + }; + + pointer allocate(size_type n, const void *hint=0) + { + return (pointer)::operator new(sizeof(T)*n, __FILE__, __LINE__); + } + + void deallocate(pointer p, size_type n) + { + return ::operator delete(p); + } + + vldallocator() throw(): std::allocator() { } + vldallocator(const vldallocator &a) throw(): std::allocator(a) { } + ~vldallocator() throw() { } +}; From 1f8cd36ccd4f11f85082fbe482b4f88b80e60fd7 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 9 Mar 2014 02:03:39 +0400 Subject: [PATCH 161/321] dbghelp added to repository --- lib/dbghelp/include/DbgHelp.h | 4594 +++++++++++++++++++++++++++++ lib/dbghelp/lib/Win32/DbgHelp.Lib | Bin 0 -> 48050 bytes lib/dbghelp/lib/x64/DbgHelp.Lib | Bin 0 -> 43712 bytes vld.vcxproj | 372 +-- vldint.h | 12 +- 5 files changed, 4788 insertions(+), 190 deletions(-) create mode 100644 lib/dbghelp/include/DbgHelp.h create mode 100644 lib/dbghelp/lib/Win32/DbgHelp.Lib create mode 100644 lib/dbghelp/lib/x64/DbgHelp.Lib diff --git a/lib/dbghelp/include/DbgHelp.h b/lib/dbghelp/include/DbgHelp.h new file mode 100644 index 00000000..cfd863b7 --- /dev/null +++ b/lib/dbghelp/include/DbgHelp.h @@ -0,0 +1,4594 @@ +/*++ BUILD Version: 0000 Increment this if a change has global effects + +Copyright (c) Microsoft Corporation. All rights reserved. + +Module Name: + + dbghelp.h + +Abstract: + + This module defines the prototypes and constants required for the image + help routines. + + Contains debugging support routines that are redistributable. + +Revision History: + +--*/ + +#ifndef _DBGHELP_ +#define _DBGHELP_ + +#if _MSC_VER > 1020 +#pragma once +#endif + + +// As a general principal always call the 64 bit version +// of every API, if a choice exists. The 64 bit version +// works great on 32 bit platforms, and is forward +// compatible to 64 bit platforms. + +#ifdef _WIN64 +#ifndef _IMAGEHLP64 +#define _IMAGEHLP64 +#endif +#endif + +#include + +// For those without specstrings.h +// Since there are different versions of this header, I need to +// individually test each item and define it if it is not around. + +#ifndef __in + #define __in +#endif +#ifndef __out + #define __out +#endif +#ifndef __inout + #define __inout +#endif +#ifndef __in_opt + #define __in_opt +#endif +#ifndef __out_opt + #define __out_opt +#endif +#ifndef __inout_opt + #define __inout_opt +#endif +#ifndef __in_ecount + #define __in_ecount(x) +#endif +#ifndef __out_ecount + #define __out_ecount(x) +#endif +#ifndef __inout_ecount + #define __inout_ecount(x) +#endif +#ifndef __in_bcount + #define __in_bcount(x) +#endif +#ifndef __out_bcount + #define __out_bcount(x) +#endif +#ifndef __inout_bcount + #define __inout_bcount(x) +#endif +#ifndef __out_xcount + #define __out_xcount(x) +#endif +#ifndef __deref_opt_out + #define __deref_opt_out +#endif +#ifndef __deref_out + #define __deref_out +#endif +#ifndef __out_ecount_opt + #define __out_ecount_opt(x) +#endif +#ifndef __in_bcount_opt + #define __in_bcount_opt(x) +#endif +#ifndef __out_bcount_opt + #define __out_bcount_opt(x) +#endif +#ifndef __deref_out_opt + #define __deref_out_opt +#endif + + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef _IMAGEHLP_SOURCE_ + #define IMAGEAPI __stdcall + #define DBHLP_DEPRECIATED +#else + #define IMAGEAPI DECLSPEC_IMPORT __stdcall + #if (_MSC_VER >= 1300) && !defined(MIDL_PASS) + #define DBHLP_DEPRECIATED __declspec(deprecated) + #else + #define DBHLP_DEPRECIATED + #endif +#endif + +#define DBHLPAPI IMAGEAPI + +#define IMAGE_SEPARATION (64*1024) + +// Observant readers may notice that 2 new fields, +// 'fReadOnly' and 'Version' have been added to +// the LOADED_IMAGE structure after 'fDOSImage'. +// This does not change the size of the structure +// from previous headers. That is because while +// 'fDOSImage' is a byte, it is padded by the +// compiler to 4 bytes. So the 2 new fields are +// slipped into the extra space. + +typedef struct _LOADED_IMAGE { + PSTR ModuleName; + HANDLE hFile; + PUCHAR MappedAddress; +#ifdef _IMAGEHLP64 + PIMAGE_NT_HEADERS64 FileHeader; +#else + PIMAGE_NT_HEADERS32 FileHeader; +#endif + PIMAGE_SECTION_HEADER LastRvaSection; + ULONG NumberOfSections; + PIMAGE_SECTION_HEADER Sections; + ULONG Characteristics; + BOOLEAN fSystemImage; + BOOLEAN fDOSImage; + BOOLEAN fReadOnly; + UCHAR Version; + LIST_ENTRY Links; + ULONG SizeOfImage; +} LOADED_IMAGE, *PLOADED_IMAGE; + +#define MAX_SYM_NAME 2000 + + +// Error codes set by dbghelp functions. Call GetLastError +// to see them. +// Dbghelp also sets error codes found in winerror.h + +#define ERROR_IMAGE_NOT_STRIPPED 0x8800 // the image is not stripped. No dbg file available. +#define ERROR_NO_DBG_POINTER 0x8801 // image is stripped but there is no pointer to a dbg file +#define ERROR_NO_PDB_POINTER 0x8802 // image does not point to a pdb file + +typedef BOOL +(CALLBACK *PFIND_DEBUG_FILE_CALLBACK)( + __in HANDLE FileHandle, + __in PCSTR FileName, + __in PVOID CallerData + ); + +HANDLE +IMAGEAPI +SymFindDebugInfoFile( + __in HANDLE hProcess, + __in PCSTR FileName, + __out_ecount(MAX_PATH + 1) PSTR DebugFilePath, + __in_opt PFIND_DEBUG_FILE_CALLBACK Callback, + __in_opt PVOID CallerData + ); + +typedef BOOL +(CALLBACK *PFIND_DEBUG_FILE_CALLBACKW)( + __in HANDLE FileHandle, + __in PCWSTR FileName, + __in PVOID CallerData + ); + +HANDLE +IMAGEAPI +SymFindDebugInfoFileW( + __in HANDLE hProcess, + __in PCWSTR FileName, + __out_ecount(MAX_PATH + 1) PWSTR DebugFilePath, + __in_opt PFIND_DEBUG_FILE_CALLBACKW Callback, + __in_opt PVOID CallerData + ); + +HANDLE +IMAGEAPI +FindDebugInfoFile ( + __in PCSTR FileName, + __in PCSTR SymbolPath, + __out_ecount(MAX_PATH + 1) PSTR DebugFilePath + ); + +HANDLE +IMAGEAPI +FindDebugInfoFileEx ( + __in PCSTR FileName, + __in PCSTR SymbolPath, + __out_ecount(MAX_PATH + 1) PSTR DebugFilePath, + __in_opt PFIND_DEBUG_FILE_CALLBACK Callback, + __in_opt PVOID CallerData + ); + +HANDLE +IMAGEAPI +FindDebugInfoFileExW ( + __in PCWSTR FileName, + __in PCWSTR SymbolPath, + __out_ecount(MAX_PATH + 1) PWSTR DebugFilePath, + __in_opt PFIND_DEBUG_FILE_CALLBACKW Callback, + __in_opt PVOID CallerData + ); + +typedef BOOL +(CALLBACK *PFINDFILEINPATHCALLBACK)( + __in PCSTR filename, + __in PVOID context + ); + +BOOL +IMAGEAPI +SymFindFileInPath( + __in HANDLE hprocess, + __in_opt PCSTR SearchPath, + __in PCSTR FileName, + __in_opt PVOID id, + __in DWORD two, + __in DWORD three, + __in DWORD flags, + __out_ecount(MAX_PATH + 1) PSTR FoundFile, + __in_opt PFINDFILEINPATHCALLBACK callback, + __in_opt PVOID context + ); + +typedef BOOL +(CALLBACK *PFINDFILEINPATHCALLBACKW)( + __in PCWSTR filename, + __in PVOID context + ); + +BOOL +IMAGEAPI +SymFindFileInPathW( + __in HANDLE hprocess, + __in_opt PCWSTR SearchPath, + __in PCWSTR FileName, + __in_opt PVOID id, + __in DWORD two, + __in DWORD three, + __in DWORD flags, + __out_ecount(MAX_PATH + 1) PWSTR FoundFile, + __in_opt PFINDFILEINPATHCALLBACKW callback, + __in_opt PVOID context + ); + +typedef BOOL +(CALLBACK *PFIND_EXE_FILE_CALLBACK)( + __in HANDLE FileHandle, + __in PCSTR FileName, + __in_opt PVOID CallerData + ); + +HANDLE +IMAGEAPI +SymFindExecutableImage( + __in HANDLE hProcess, + __in PCSTR FileName, + __out_ecount(MAX_PATH + 1) PSTR ImageFilePath, + __in PFIND_EXE_FILE_CALLBACK Callback, + __in PVOID CallerData + ); + +typedef BOOL +(CALLBACK *PFIND_EXE_FILE_CALLBACKW)( + __in HANDLE FileHandle, + __in PCWSTR FileName, + __in_opt PVOID CallerData + ); + +HANDLE +IMAGEAPI +SymFindExecutableImageW( + __in HANDLE hProcess, + __in PCWSTR FileName, + __out_ecount(MAX_PATH + 1) PWSTR ImageFilePath, + __in PFIND_EXE_FILE_CALLBACKW Callback, + __in PVOID CallerData + ); + +HANDLE +IMAGEAPI +FindExecutableImage( + __in PCSTR FileName, + __in PCSTR SymbolPath, + __out_ecount(MAX_PATH + 1) PSTR ImageFilePath + ); + +HANDLE +IMAGEAPI +FindExecutableImageEx( + __in PCSTR FileName, + __in PCSTR SymbolPath, + __out_ecount(MAX_PATH + 1) PSTR ImageFilePath, + __in_opt PFIND_EXE_FILE_CALLBACK Callback, + __in_opt PVOID CallerData + ); + +HANDLE +IMAGEAPI +FindExecutableImageExW( + __in PCWSTR FileName, + __in PCWSTR SymbolPath, + __out_ecount(MAX_PATH + 1) PWSTR ImageFilePath, + __in_opt PFIND_EXE_FILE_CALLBACKW Callback, + __in PVOID CallerData + ); + +PIMAGE_NT_HEADERS +IMAGEAPI +ImageNtHeader ( + __in PVOID Base + ); + +PVOID +IMAGEAPI +ImageDirectoryEntryToDataEx ( + __in PVOID Base, + __in BOOLEAN MappedAsImage, + __in USHORT DirectoryEntry, + __out PULONG Size, + __out_opt PIMAGE_SECTION_HEADER *FoundHeader + ); + +PVOID +IMAGEAPI +ImageDirectoryEntryToData ( + __in PVOID Base, + __in BOOLEAN MappedAsImage, + __in USHORT DirectoryEntry, + __out PULONG Size + ); + +PIMAGE_SECTION_HEADER +IMAGEAPI +ImageRvaToSection( + __in PIMAGE_NT_HEADERS NtHeaders, + __in PVOID Base, + __in ULONG Rva + ); + +PVOID +IMAGEAPI +ImageRvaToVa( + __in PIMAGE_NT_HEADERS NtHeaders, + __in PVOID Base, + __in ULONG Rva, + __in_opt OUT PIMAGE_SECTION_HEADER *LastRvaSection + ); + +#ifndef _WIN64 +// This api won't be ported to Win64 - Fix your code. + +typedef struct _IMAGE_DEBUG_INFORMATION { + LIST_ENTRY List; + DWORD ReservedSize; + PVOID ReservedMappedBase; + USHORT ReservedMachine; + USHORT ReservedCharacteristics; + DWORD ReservedCheckSum; + DWORD ImageBase; + DWORD SizeOfImage; + + DWORD ReservedNumberOfSections; + PIMAGE_SECTION_HEADER ReservedSections; + + DWORD ReservedExportedNamesSize; + PSTR ReservedExportedNames; + + DWORD ReservedNumberOfFunctionTableEntries; + PIMAGE_FUNCTION_ENTRY ReservedFunctionTableEntries; + DWORD ReservedLowestFunctionStartingAddress; + DWORD ReservedHighestFunctionEndingAddress; + + DWORD ReservedNumberOfFpoTableEntries; + PFPO_DATA ReservedFpoTableEntries; + + DWORD SizeOfCoffSymbols; + PIMAGE_COFF_SYMBOLS_HEADER CoffSymbols; + + DWORD ReservedSizeOfCodeViewSymbols; + PVOID ReservedCodeViewSymbols; + + PSTR ImageFilePath; + PSTR ImageFileName; + PSTR ReservedDebugFilePath; + + DWORD ReservedTimeDateStamp; + + BOOL ReservedRomImage; + PIMAGE_DEBUG_DIRECTORY ReservedDebugDirectory; + DWORD ReservedNumberOfDebugDirectories; + + DWORD ReservedOriginalFunctionTableBaseAddress; + + DWORD Reserved[ 2 ]; + +} IMAGE_DEBUG_INFORMATION, *PIMAGE_DEBUG_INFORMATION; + + +PIMAGE_DEBUG_INFORMATION +IMAGEAPI +MapDebugInformation( + __in_opt HANDLE FileHandle, + __in PCSTR FileName, + __in_opt PCSTR SymbolPath, + __in ULONG ImageBase + ); + +BOOL +IMAGEAPI +UnmapDebugInformation( + __out_xcount(unknown) PIMAGE_DEBUG_INFORMATION DebugInfo + ); + +#endif + +BOOL +IMAGEAPI +SearchTreeForFile( + __in PCSTR RootPath, + __in PCSTR InputPathName, + __out_ecount(MAX_PATH + 1) PSTR OutputPathBuffer + ); + +BOOL +IMAGEAPI +SearchTreeForFileW( + __in PCWSTR RootPath, + __in PCWSTR InputPathName, + __out_ecount(MAX_PATH + 1) PWSTR OutputPathBuffer + ); + +typedef BOOL +(CALLBACK *PENUMDIRTREE_CALLBACK)( + __in PCSTR FilePath, + __in_opt PVOID CallerData + ); + +BOOL +IMAGEAPI +EnumDirTree( + __in_opt HANDLE hProcess, + __in PCSTR RootPath, + __in PCSTR InputPathName, + __out_ecount_opt(MAX_PATH + 1) PSTR OutputPathBuffer, + __in_opt PENUMDIRTREE_CALLBACK cb, + __in_opt PVOID data + ); + +typedef BOOL +(CALLBACK *PENUMDIRTREE_CALLBACKW)( + __in PCWSTR FilePath, + __in_opt PVOID CallerData + ); + +BOOL +IMAGEAPI +EnumDirTreeW( + __in_opt HANDLE hProcess, + __in PCWSTR RootPath, + __in PCWSTR InputPathName, + __out_ecount_opt(MAX_PATH + 1) PWSTR OutputPathBuffer, + __in_opt PENUMDIRTREE_CALLBACKW cb, + __in_opt PVOID data + ); + +BOOL +IMAGEAPI +MakeSureDirectoryPathExists( + __in PCSTR DirPath + ); + +// +// UnDecorateSymbolName Flags +// + +#define UNDNAME_COMPLETE (0x0000) // Enable full undecoration +#define UNDNAME_NO_LEADING_UNDERSCORES (0x0001) // Remove leading underscores from MS extended keywords +#define UNDNAME_NO_MS_KEYWORDS (0x0002) // Disable expansion of MS extended keywords +#define UNDNAME_NO_FUNCTION_RETURNS (0x0004) // Disable expansion of return type for primary declaration +#define UNDNAME_NO_ALLOCATION_MODEL (0x0008) // Disable expansion of the declaration model +#define UNDNAME_NO_ALLOCATION_LANGUAGE (0x0010) // Disable expansion of the declaration language specifier +#define UNDNAME_NO_MS_THISTYPE (0x0020) // NYI Disable expansion of MS keywords on the 'this' type for primary declaration +#define UNDNAME_NO_CV_THISTYPE (0x0040) // NYI Disable expansion of CV modifiers on the 'this' type for primary declaration +#define UNDNAME_NO_THISTYPE (0x0060) // Disable all modifiers on the 'this' type +#define UNDNAME_NO_ACCESS_SPECIFIERS (0x0080) // Disable expansion of access specifiers for members +#define UNDNAME_NO_THROW_SIGNATURES (0x0100) // Disable expansion of 'throw-signatures' for functions and pointers to functions +#define UNDNAME_NO_MEMBER_TYPE (0x0200) // Disable expansion of 'static' or 'virtual'ness of members +#define UNDNAME_NO_RETURN_UDT_MODEL (0x0400) // Disable expansion of MS model for UDT returns +#define UNDNAME_32_BIT_DECODE (0x0800) // Undecorate 32-bit decorated names +#define UNDNAME_NAME_ONLY (0x1000) // Crack only the name for primary declaration; + // return just [scope::]name. Does expand template params +#define UNDNAME_NO_ARGUMENTS (0x2000) // Don't undecorate arguments to function +#define UNDNAME_NO_SPECIAL_SYMS (0x4000) // Don't undecorate special names (v-table, vcall, vector xxx, metatype, etc) + +DWORD +IMAGEAPI +WINAPI +UnDecorateSymbolName( + __in PCSTR name, + __out_ecount(maxStringLength) PSTR outputString, + __in DWORD maxStringLength, + __in DWORD flags + ); + +DWORD +IMAGEAPI +WINAPI +UnDecorateSymbolNameW( + __in PCWSTR name, + __out_ecount(maxStringLength) PWSTR outputString, + __in DWORD maxStringLength, + __in DWORD flags + ); + +// +// these values are used for synthesized file types +// that can be passed in as image headers instead of +// the standard ones from ntimage.h +// + +#define DBHHEADER_DEBUGDIRS 0x1 +#define DBHHEADER_CVMISC 0x2 +#define DBHHEADER_PDBGUID 0x3 +typedef struct _MODLOAD_DATA { + DWORD ssize; // size of this struct + DWORD ssig; // signature identifying the passed data + PVOID data; // pointer to passed data + DWORD size; // size of passed data + DWORD flags; // options +} MODLOAD_DATA, *PMODLOAD_DATA; + +typedef struct _MODLOAD_CVMISC { + DWORD oCV; // ofset to the codeview record + size_t cCV; // size of the codeview record + DWORD oMisc; // offset to the misc record + size_t cMisc; // size of the misc record + DWORD dtImage; // datetime stamp of the image + DWORD cImage; // size of the image +} MODLOAD_CVMISC, *PMODLOAD_CVMISC; + +typedef struct _MODLOAD_PDBGUID_PDBAGE { + GUID PdbGuid; // Pdb Guid + DWORD PdbAge; // Pdb Age +} MODLOAD_PDBGUID_PDBAGE, *PMODLOAD_PDBGUID_PDBAGE; + +// +// StackWalking API +// + +typedef enum { + AddrMode1616, + AddrMode1632, + AddrModeReal, + AddrModeFlat +} ADDRESS_MODE; + +typedef struct _tagADDRESS64 { + DWORD64 Offset; + WORD Segment; + ADDRESS_MODE Mode; +} ADDRESS64, *LPADDRESS64; + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define ADDRESS ADDRESS64 +#define LPADDRESS LPADDRESS64 +#else +typedef struct _tagADDRESS { + DWORD Offset; + WORD Segment; + ADDRESS_MODE Mode; +} ADDRESS, *LPADDRESS; + +__inline +void +Address32To64( + __in LPADDRESS a32, + __out LPADDRESS64 a64 + ) +{ + a64->Offset = (ULONG64)(LONG64)(LONG)a32->Offset; + a64->Segment = a32->Segment; + a64->Mode = a32->Mode; +} + +__inline +void +Address64To32( + __in LPADDRESS64 a64, + __out LPADDRESS a32 + ) +{ + a32->Offset = (ULONG)a64->Offset; + a32->Segment = a64->Segment; + a32->Mode = a64->Mode; +} +#endif + +// +// This structure is included in the STACKFRAME structure, +// and is used to trace through usermode callbacks in a thread's +// kernel stack. The values must be copied by the kernel debugger +// from the DBGKD_GET_VERSION and WAIT_STATE_CHANGE packets. +// + +// +// New KDHELP structure for 64 bit system support. +// This structure is preferred in new code. +// +typedef struct _KDHELP64 { + + // + // address of kernel thread object, as provided in the + // WAIT_STATE_CHANGE packet. + // + DWORD64 Thread; + + // + // offset in thread object to pointer to the current callback frame + // in kernel stack. + // + DWORD ThCallbackStack; + + // + // offset in thread object to pointer to the current callback backing + // store frame in kernel stack. + // + DWORD ThCallbackBStore; + + // + // offsets to values in frame: + // + // address of next callback frame + DWORD NextCallback; + + // address of saved frame pointer (if applicable) + DWORD FramePointer; + + + // + // Address of the kernel function that calls out to user mode + // + DWORD64 KiCallUserMode; + + // + // Address of the user mode dispatcher function + // + DWORD64 KeUserCallbackDispatcher; + + // + // Lowest kernel mode address + // + DWORD64 SystemRangeStart; + + // + // Address of the user mode exception dispatcher function. + // Added in API version 10. + // + DWORD64 KiUserExceptionDispatcher; + + // + // Stack bounds, added in API version 11. + // + DWORD64 StackBase; + DWORD64 StackLimit; + + DWORD64 Reserved[5]; + +} KDHELP64, *PKDHELP64; + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define KDHELP KDHELP64 +#define PKDHELP PKDHELP64 +#else +typedef struct _KDHELP { + + // + // address of kernel thread object, as provided in the + // WAIT_STATE_CHANGE packet. + // + DWORD Thread; + + // + // offset in thread object to pointer to the current callback frame + // in kernel stack. + // + DWORD ThCallbackStack; + + // + // offsets to values in frame: + // + // address of next callback frame + DWORD NextCallback; + + // address of saved frame pointer (if applicable) + DWORD FramePointer; + + // + // Address of the kernel function that calls out to user mode + // + DWORD KiCallUserMode; + + // + // Address of the user mode dispatcher function + // + DWORD KeUserCallbackDispatcher; + + // + // Lowest kernel mode address + // + DWORD SystemRangeStart; + + // + // offset in thread object to pointer to the current callback backing + // store frame in kernel stack. + // + DWORD ThCallbackBStore; + + // + // Address of the user mode exception dispatcher function. + // Added in API version 10. + // + DWORD KiUserExceptionDispatcher; + + // + // Stack bounds, added in API version 11. + // + DWORD StackBase; + DWORD StackLimit; + + DWORD Reserved[5]; + +} KDHELP, *PKDHELP; + +__inline +void +KdHelp32To64( + __in PKDHELP p32, + __out PKDHELP64 p64 + ) +{ + p64->Thread = p32->Thread; + p64->ThCallbackStack = p32->ThCallbackStack; + p64->NextCallback = p32->NextCallback; + p64->FramePointer = p32->FramePointer; + p64->KiCallUserMode = p32->KiCallUserMode; + p64->KeUserCallbackDispatcher = p32->KeUserCallbackDispatcher; + p64->SystemRangeStart = p32->SystemRangeStart; + p64->KiUserExceptionDispatcher = p32->KiUserExceptionDispatcher; + p64->StackBase = p32->StackBase; + p64->StackLimit = p32->StackLimit; +} +#endif + +typedef struct _tagSTACKFRAME64 { + ADDRESS64 AddrPC; // program counter + ADDRESS64 AddrReturn; // return address + ADDRESS64 AddrFrame; // frame pointer + ADDRESS64 AddrStack; // stack pointer + ADDRESS64 AddrBStore; // backing store pointer + PVOID FuncTableEntry; // pointer to pdata/fpo or NULL + DWORD64 Params[4]; // possible arguments to the function + BOOL Far; // WOW far call + BOOL Virtual; // is this a virtual frame? + DWORD64 Reserved[3]; + KDHELP64 KdHelp; +} STACKFRAME64, *LPSTACKFRAME64; + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define STACKFRAME STACKFRAME64 +#define LPSTACKFRAME LPSTACKFRAME64 +#else +typedef struct _tagSTACKFRAME { + ADDRESS AddrPC; // program counter + ADDRESS AddrReturn; // return address + ADDRESS AddrFrame; // frame pointer + ADDRESS AddrStack; // stack pointer + PVOID FuncTableEntry; // pointer to pdata/fpo or NULL + DWORD Params[4]; // possible arguments to the function + BOOL Far; // WOW far call + BOOL Virtual; // is this a virtual frame? + DWORD Reserved[3]; + KDHELP KdHelp; + ADDRESS AddrBStore; // backing store pointer +} STACKFRAME, *LPSTACKFRAME; +#endif + + +typedef +BOOL +(__stdcall *PREAD_PROCESS_MEMORY_ROUTINE64)( + __in HANDLE hProcess, + __in DWORD64 qwBaseAddress, + __out_bcount(nSize) PVOID lpBuffer, + __in DWORD nSize, + __out LPDWORD lpNumberOfBytesRead + ); + +typedef +PVOID +(__stdcall *PFUNCTION_TABLE_ACCESS_ROUTINE64)( + __in HANDLE ahProcess, + __in DWORD64 AddrBase + ); + +typedef +DWORD64 +(__stdcall *PGET_MODULE_BASE_ROUTINE64)( + __in HANDLE hProcess, + __in DWORD64 Address + ); + +typedef +DWORD64 +(__stdcall *PTRANSLATE_ADDRESS_ROUTINE64)( + __in HANDLE hProcess, + __in HANDLE hThread, + __in LPADDRESS64 lpaddr + ); + +BOOL +IMAGEAPI +StackWalk64( + __in DWORD MachineType, + __in HANDLE hProcess, + __in HANDLE hThread, + __inout LPSTACKFRAME64 StackFrame, + __inout PVOID ContextRecord, + __in_opt PREAD_PROCESS_MEMORY_ROUTINE64 ReadMemoryRoutine, + __in_opt PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine, + __in_opt PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine, + __in_opt PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) + +#define PREAD_PROCESS_MEMORY_ROUTINE PREAD_PROCESS_MEMORY_ROUTINE64 +#define PFUNCTION_TABLE_ACCESS_ROUTINE PFUNCTION_TABLE_ACCESS_ROUTINE64 +#define PGET_MODULE_BASE_ROUTINE PGET_MODULE_BASE_ROUTINE64 +#define PTRANSLATE_ADDRESS_ROUTINE PTRANSLATE_ADDRESS_ROUTINE64 + +#define StackWalk StackWalk64 + +#else + +typedef +BOOL +(__stdcall *PREAD_PROCESS_MEMORY_ROUTINE)( + __in HANDLE hProcess, + __in DWORD lpBaseAddress, + __out_bcount(nSize) PVOID lpBuffer, + __in DWORD nSize, + __out PDWORD lpNumberOfBytesRead + ); + +typedef +PVOID +(__stdcall *PFUNCTION_TABLE_ACCESS_ROUTINE)( + __in HANDLE hProcess, + __in DWORD AddrBase + ); + +typedef +DWORD +(__stdcall *PGET_MODULE_BASE_ROUTINE)( + __in HANDLE hProcess, + __in DWORD Address + ); + +typedef +DWORD +(__stdcall *PTRANSLATE_ADDRESS_ROUTINE)( + __in HANDLE hProcess, + __in HANDLE hThread, + __out LPADDRESS lpaddr + ); + +BOOL +IMAGEAPI +StackWalk( + DWORD MachineType, + __in HANDLE hProcess, + __in HANDLE hThread, + __inout LPSTACKFRAME StackFrame, + __inout PVOID ContextRecord, + __in_opt PREAD_PROCESS_MEMORY_ROUTINE ReadMemoryRoutine, + __in_opt PFUNCTION_TABLE_ACCESS_ROUTINE FunctionTableAccessRoutine, + __in_opt PGET_MODULE_BASE_ROUTINE GetModuleBaseRoutine, + __in_opt PTRANSLATE_ADDRESS_ROUTINE TranslateAddress + ); + +#endif + + +#define API_VERSION_NUMBER 11 + +typedef struct API_VERSION { + USHORT MajorVersion; + USHORT MinorVersion; + USHORT Revision; + USHORT Reserved; +} API_VERSION, *LPAPI_VERSION; + +LPAPI_VERSION +IMAGEAPI +ImagehlpApiVersion( + VOID + ); + +LPAPI_VERSION +IMAGEAPI +ImagehlpApiVersionEx( + __in LPAPI_VERSION AppVersion + ); + +DWORD +IMAGEAPI +GetTimestampForLoadedLibrary( + __in HMODULE Module + ); + +// +// typedefs for function pointers +// +typedef BOOL +(CALLBACK *PSYM_ENUMMODULES_CALLBACK64)( + __in PCSTR ModuleName, + __in DWORD64 BaseOfDll, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PSYM_ENUMMODULES_CALLBACKW64)( + __in PCWSTR ModuleName, + __in DWORD64 BaseOfDll, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PENUMLOADED_MODULES_CALLBACK64)( + __in PCSTR ModuleName, + __in DWORD64 ModuleBase, + __in ULONG ModuleSize, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PENUMLOADED_MODULES_CALLBACKW64)( + __in PCWSTR ModuleName, + __in DWORD64 ModuleBase, + __in ULONG ModuleSize, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64)( + __in PCSTR SymbolName, + __in DWORD64 SymbolAddress, + __in ULONG SymbolSize, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64W)( + __in PCWSTR SymbolName, + __in DWORD64 SymbolAddress, + __in ULONG SymbolSize, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PSYMBOL_REGISTERED_CALLBACK64)( + __in HANDLE hProcess, + __in ULONG ActionCode, + __in_opt ULONG64 CallbackData, + __in_opt ULONG64 UserContext + ); + +typedef +PVOID +(CALLBACK *PSYMBOL_FUNCENTRY_CALLBACK)( + __in HANDLE hProcess, + __in DWORD AddrBase, + __in_opt PVOID UserContext + ); + +typedef +PVOID +(CALLBACK *PSYMBOL_FUNCENTRY_CALLBACK64)( + __in HANDLE hProcess, + __in ULONG64 AddrBase, + __in ULONG64 UserContext + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) + +#define PSYM_ENUMMODULES_CALLBACK PSYM_ENUMMODULES_CALLBACK64 +#define PSYM_ENUMSYMBOLS_CALLBACK PSYM_ENUMSYMBOLS_CALLBACK64 +#define PSYM_ENUMSYMBOLS_CALLBACKW PSYM_ENUMSYMBOLS_CALLBACK64W +#define PENUMLOADED_MODULES_CALLBACK PENUMLOADED_MODULES_CALLBACK64 +#define PSYMBOL_REGISTERED_CALLBACK PSYMBOL_REGISTERED_CALLBACK64 +#define PSYMBOL_FUNCENTRY_CALLBACK PSYMBOL_FUNCENTRY_CALLBACK64 + +#else + +typedef BOOL +(CALLBACK *PSYM_ENUMMODULES_CALLBACK)( + __in PCSTR ModuleName, + __in ULONG BaseOfDll, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)( + __in PCSTR SymbolName, + __in ULONG SymbolAddress, + __in ULONG SymbolSize, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PSYM_ENUMSYMBOLS_CALLBACKW)( + __in PCWSTR SymbolName, + __in ULONG SymbolAddress, + __in ULONG SymbolSize, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PENUMLOADED_MODULES_CALLBACK)( + __in PCSTR ModuleName, + __in ULONG ModuleBase, + __in ULONG ModuleSize, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PSYMBOL_REGISTERED_CALLBACK)( + __in HANDLE hProcess, + __in ULONG ActionCode, + __in_opt PVOID CallbackData, + __in_opt PVOID UserContext + ); + +#endif + + +// values found in SYMBOL_INFO.Tag +// +// This was taken from cvconst.h and should +// not override any values found there. +// +// #define _NO_CVCONST_H_ if you don't +// have access to that file... + +#ifdef _NO_CVCONST_H + +// DIA enums + +enum SymTagEnum +{ + SymTagNull, + SymTagExe, + SymTagCompiland, + SymTagCompilandDetails, + SymTagCompilandEnv, + SymTagFunction, + SymTagBlock, + SymTagData, + SymTagAnnotation, + SymTagLabel, + SymTagPublicSymbol, + SymTagUDT, + SymTagEnum, + SymTagFunctionType, + SymTagPointerType, + SymTagArrayType, + SymTagBaseType, + SymTagTypedef, + SymTagBaseClass, + SymTagFriend, + SymTagFunctionArgType, + SymTagFuncDebugStart, + SymTagFuncDebugEnd, + SymTagUsingNamespace, + SymTagVTableShape, + SymTagVTable, + SymTagCustom, + SymTagThunk, + SymTagCustomType, + SymTagManagedType, + SymTagDimension, + SymTagMax +}; + +#endif + +// +// flags found in SYMBOL_INFO.Flags +// + +#define SYMFLAG_VALUEPRESENT 0x00000001 +#define SYMFLAG_REGISTER 0x00000008 +#define SYMFLAG_REGREL 0x00000010 +#define SYMFLAG_FRAMEREL 0x00000020 +#define SYMFLAG_PARAMETER 0x00000040 +#define SYMFLAG_LOCAL 0x00000080 +#define SYMFLAG_CONSTANT 0x00000100 +#define SYMFLAG_EXPORT 0x00000200 +#define SYMFLAG_FORWARDER 0x00000400 +#define SYMFLAG_FUNCTION 0x00000800 +#define SYMFLAG_VIRTUAL 0x00001000 +#define SYMFLAG_THUNK 0x00002000 +#define SYMFLAG_TLSREL 0x00004000 +#define SYMFLAG_SLOT 0x00008000 +#define SYMFLAG_ILREL 0x00010000 +#define SYMFLAG_METADATA 0x00020000 +#define SYMFLAG_CLR_TOKEN 0x00040000 + +// this resets SymNext/Prev to the beginning +// of the module passed in the address field + +#define SYMFLAG_RESET 0x80000000 + +// +// symbol type enumeration +// +typedef enum { + SymNone = 0, + SymCoff, + SymCv, + SymPdb, + SymExport, + SymDeferred, + SymSym, // .sym file + SymDia, + SymVirtual, + NumSymTypes +} SYM_TYPE; + +// +// symbol data structure +// + +typedef struct _IMAGEHLP_SYMBOL64 { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_SYMBOL64) + DWORD64 Address; // virtual address including dll base address + DWORD Size; // estimated size of symbol, can be zero + DWORD Flags; // info about the symbols, see the SYMF defines + DWORD MaxNameLength; // maximum size of symbol name in 'Name' + CHAR Name[1]; // symbol name (null terminated string) +} IMAGEHLP_SYMBOL64, *PIMAGEHLP_SYMBOL64; + +typedef struct _IMAGEHLP_SYMBOL64_PACKAGE { + IMAGEHLP_SYMBOL64 sym; + CHAR name[MAX_SYM_NAME + 1]; +} IMAGEHLP_SYMBOL64_PACKAGE, *PIMAGEHLP_SYMBOL64_PACKAGE; + +typedef struct _IMAGEHLP_SYMBOLW64 { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_SYMBOLW64) + DWORD64 Address; // virtual address including dll base address + DWORD Size; // estimated size of symbol, can be zero + DWORD Flags; // info about the symbols, see the SYMF defines + DWORD MaxNameLength; // maximum size of symbol name in 'Name' + WCHAR Name[1]; // symbol name (null terminated string) +} IMAGEHLP_SYMBOLW64, *PIMAGEHLP_SYMBOLW64; + +typedef struct _IMAGEHLP_SYMBOLW64_PACKAGE { + IMAGEHLP_SYMBOLW64 sym; + WCHAR name[MAX_SYM_NAME + 1]; +} IMAGEHLP_SYMBOLW64_PACKAGE, *PIMAGEHLP_SYMBOLW64_PACKAGE; + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) + + #define IMAGEHLP_SYMBOL IMAGEHLP_SYMBOL64 + #define PIMAGEHLP_SYMBOL PIMAGEHLP_SYMBOL64 + #define IMAGEHLP_SYMBOL_PACKAGE IMAGEHLP_SYMBOL64_PACKAGE + #define PIMAGEHLP_SYMBOL_PACKAGE PIMAGEHLP_SYMBOL64_PACKAGE + #define IMAGEHLP_SYMBOLW IMAGEHLP_SYMBOLW64 + #define PIMAGEHLP_SYMBOLW PIMAGEHLP_SYMBOLW64 + #define IMAGEHLP_SYMBOLW_PACKAGE IMAGEHLP_SYMBOLW64_PACKAGE + #define PIMAGEHLP_SYMBOLW_PACKAGE PIMAGEHLP_SYMBOLW64_PACKAGE + +#else + + typedef struct _IMAGEHLP_SYMBOL { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_SYMBOL) + DWORD Address; // virtual address including dll base address + DWORD Size; // estimated size of symbol, can be zero + DWORD Flags; // info about the symbols, see the SYMF defines + DWORD MaxNameLength; // maximum size of symbol name in 'Name' + CHAR Name[1]; // symbol name (null terminated string) + } IMAGEHLP_SYMBOL, *PIMAGEHLP_SYMBOL; + + typedef struct _IMAGEHLP_SYMBOL_PACKAGE { + IMAGEHLP_SYMBOL sym; + CHAR name[MAX_SYM_NAME + 1]; + } IMAGEHLP_SYMBOL_PACKAGE, *PIMAGEHLP_SYMBOL_PACKAGE; + + typedef struct _IMAGEHLP_SYMBOLW { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_SYMBOLW) + DWORD Address; // virtual address including dll base address + DWORD Size; // estimated size of symbol, can be zero + DWORD Flags; // info about the symbols, see the SYMF defines + DWORD MaxNameLength; // maximum size of symbol name in 'Name' + WCHAR Name[1]; // symbol name (null terminated string) + } IMAGEHLP_SYMBOLW, *PIMAGEHLP_SYMBOLW; + + typedef struct _IMAGEHLP_SYMBOLW_PACKAGE { + IMAGEHLP_SYMBOLW sym; + WCHAR name[MAX_SYM_NAME + 1]; + } IMAGEHLP_SYMBOLW_PACKAGE, *PIMAGEHLP_SYMBOLW_PACKAGE; + +#endif + +// +// module data structure +// + +typedef struct _IMAGEHLP_MODULE64 { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_MODULE64) + DWORD64 BaseOfImage; // base load address of module + DWORD ImageSize; // virtual size of the loaded module + DWORD TimeDateStamp; // date/time stamp from pe header + DWORD CheckSum; // checksum from the pe header + DWORD NumSyms; // number of symbols in the symbol table + SYM_TYPE SymType; // type of symbols loaded + CHAR ModuleName[32]; // module name + CHAR ImageName[256]; // image name + CHAR LoadedImageName[256]; // symbol file name + // new elements: 07-Jun-2002 + CHAR LoadedPdbName[256]; // pdb file name + DWORD CVSig; // Signature of the CV record in the debug directories + CHAR CVData[MAX_PATH * 3]; // Contents of the CV record + DWORD PdbSig; // Signature of PDB + GUID PdbSig70; // Signature of PDB (VC 7 and up) + DWORD PdbAge; // DBI age of pdb + BOOL PdbUnmatched; // loaded an unmatched pdb + BOOL DbgUnmatched; // loaded an unmatched dbg + BOOL LineNumbers; // we have line number information + BOOL GlobalSymbols; // we have internal symbol information + BOOL TypeInfo; // we have type information + // new elements: 17-Dec-2003 + BOOL SourceIndexed; // pdb supports source server + BOOL Publics; // contains public symbols +} IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64; + +typedef struct _IMAGEHLP_MODULEW64 { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_MODULE64) + DWORD64 BaseOfImage; // base load address of module + DWORD ImageSize; // virtual size of the loaded module + DWORD TimeDateStamp; // date/time stamp from pe header + DWORD CheckSum; // checksum from the pe header + DWORD NumSyms; // number of symbols in the symbol table + SYM_TYPE SymType; // type of symbols loaded + WCHAR ModuleName[32]; // module name + WCHAR ImageName[256]; // image name + // new elements: 07-Jun-2002 + WCHAR LoadedImageName[256]; // symbol file name + WCHAR LoadedPdbName[256]; // pdb file name + DWORD CVSig; // Signature of the CV record in the debug directories + WCHAR CVData[MAX_PATH * 3]; // Contents of the CV record + DWORD PdbSig; // Signature of PDB + GUID PdbSig70; // Signature of PDB (VC 7 and up) + DWORD PdbAge; // DBI age of pdb + BOOL PdbUnmatched; // loaded an unmatched pdb + BOOL DbgUnmatched; // loaded an unmatched dbg + BOOL LineNumbers; // we have line number information + BOOL GlobalSymbols; // we have internal symbol information + BOOL TypeInfo; // we have type information + // new elements: 17-Dec-2003 + BOOL SourceIndexed; // pdb supports source server + BOOL Publics; // contains public symbols +} IMAGEHLP_MODULEW64, *PIMAGEHLP_MODULEW64; + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define IMAGEHLP_MODULE IMAGEHLP_MODULE64 +#define PIMAGEHLP_MODULE PIMAGEHLP_MODULE64 +#define IMAGEHLP_MODULEW IMAGEHLP_MODULEW64 +#define PIMAGEHLP_MODULEW PIMAGEHLP_MODULEW64 +#else +typedef struct _IMAGEHLP_MODULE { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_MODULE) + DWORD BaseOfImage; // base load address of module + DWORD ImageSize; // virtual size of the loaded module + DWORD TimeDateStamp; // date/time stamp from pe header + DWORD CheckSum; // checksum from the pe header + DWORD NumSyms; // number of symbols in the symbol table + SYM_TYPE SymType; // type of symbols loaded + CHAR ModuleName[32]; // module name + CHAR ImageName[256]; // image name + CHAR LoadedImageName[256]; // symbol file name +} IMAGEHLP_MODULE, *PIMAGEHLP_MODULE; + +typedef struct _IMAGEHLP_MODULEW { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_MODULE) + DWORD BaseOfImage; // base load address of module + DWORD ImageSize; // virtual size of the loaded module + DWORD TimeDateStamp; // date/time stamp from pe header + DWORD CheckSum; // checksum from the pe header + DWORD NumSyms; // number of symbols in the symbol table + SYM_TYPE SymType; // type of symbols loaded + WCHAR ModuleName[32]; // module name + WCHAR ImageName[256]; // image name + WCHAR LoadedImageName[256]; // symbol file name +} IMAGEHLP_MODULEW, *PIMAGEHLP_MODULEW; +#endif + +// +// source file line data structure +// + +typedef struct _IMAGEHLP_LINE64 { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_LINE64) + PVOID Key; // internal + DWORD LineNumber; // line number in file + PCHAR FileName; // full filename + DWORD64 Address; // first instruction of line +} IMAGEHLP_LINE64, *PIMAGEHLP_LINE64; + +typedef struct _IMAGEHLP_LINEW64 { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_LINE64) + PVOID Key; // internal + DWORD LineNumber; // line number in file + PWSTR FileName; // full filename + DWORD64 Address; // first instruction of line +} IMAGEHLP_LINEW64, *PIMAGEHLP_LINEW64; + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define IMAGEHLP_LINE IMAGEHLP_LINE64 +#define PIMAGEHLP_LINE PIMAGEHLP_LINE64 +#else +typedef struct _IMAGEHLP_LINE { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_LINE) + PVOID Key; // internal + DWORD LineNumber; // line number in file + PCHAR FileName; // full filename + DWORD Address; // first instruction of line +} IMAGEHLP_LINE, *PIMAGEHLP_LINE; + +typedef struct _IMAGEHLP_LINEW { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_LINE64) + PVOID Key; // internal + DWORD LineNumber; // line number in file + PCHAR FileName; // full filename + DWORD64 Address; // first instruction of line +} IMAGEHLP_LINEW, *PIMAGEHLP_LINEW; +#endif + +// +// source file structure +// + +typedef struct _SOURCEFILE { + DWORD64 ModBase; // base address of loaded module + PCHAR FileName; // full filename of source +} SOURCEFILE, *PSOURCEFILE; + +typedef struct _SOURCEFILEW { + DWORD64 ModBase; // base address of loaded module + PWSTR FileName; // full filename of source +} SOURCEFILEW, *PSOURCEFILEW; + +// +// data structures used for registered symbol callbacks +// + +#define CBA_DEFERRED_SYMBOL_LOAD_START 0x00000001 +#define CBA_DEFERRED_SYMBOL_LOAD_COMPLETE 0x00000002 +#define CBA_DEFERRED_SYMBOL_LOAD_FAILURE 0x00000003 +#define CBA_SYMBOLS_UNLOADED 0x00000004 +#define CBA_DUPLICATE_SYMBOL 0x00000005 +#define CBA_READ_MEMORY 0x00000006 +#define CBA_DEFERRED_SYMBOL_LOAD_CANCEL 0x00000007 +#define CBA_SET_OPTIONS 0x00000008 +#define CBA_EVENT 0x00000010 +#define CBA_DEFERRED_SYMBOL_LOAD_PARTIAL 0x00000020 +#define CBA_DEBUG_INFO 0x10000000 +#define CBA_SRCSRV_INFO 0x20000000 +#define CBA_SRCSRV_EVENT 0x40000000 + +typedef struct _IMAGEHLP_CBA_READ_MEMORY { + DWORD64 addr; // address to read from + PVOID buf; // buffer to read to + DWORD bytes; // amount of bytes to read + DWORD *bytesread; // pointer to store amount of bytes read +} IMAGEHLP_CBA_READ_MEMORY, *PIMAGEHLP_CBA_READ_MEMORY; + +enum { + sevInfo = 0, + sevProblem, + sevAttn, + sevFatal, + sevMax // unused +}; + +#define EVENT_SRCSPEW_START 100 +#define EVENT_SRCSPEW 100 +#define EVENT_SRCSPEW_END 199 + +typedef struct _IMAGEHLP_CBA_EVENT { + DWORD severity; // values from sevInfo to sevFatal + DWORD code; // numerical code IDs the error + PCHAR desc; // may contain a text description of the error + PVOID object; // value dependant upon the error code +} IMAGEHLP_CBA_EVENT, *PIMAGEHLP_CBA_EVENT; + +typedef struct _IMAGEHLP_CBA_EVENTW { + DWORD severity; // values from sevInfo to sevFatal + DWORD code; // numerical code IDs the error + PCWSTR desc; // may contain a text description of the error + PVOID object; // value dependant upon the error code +} IMAGEHLP_CBA_EVENTW, *PIMAGEHLP_CBA_EVENTW; + +typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD64 { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_DEFERRED_SYMBOL_LOAD64) + DWORD64 BaseOfImage; // base load address of module + DWORD CheckSum; // checksum from the pe header + DWORD TimeDateStamp; // date/time stamp from pe header + CHAR FileName[MAX_PATH]; // symbols file or image name + BOOLEAN Reparse; // load failure reparse + HANDLE hFile; // file handle, if passed + DWORD Flags; // +} IMAGEHLP_DEFERRED_SYMBOL_LOAD64, *PIMAGEHLP_DEFERRED_SYMBOL_LOAD64; + +typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOADW64 { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_DEFERRED_SYMBOL_LOADW64) + DWORD64 BaseOfImage; // base load address of module + DWORD CheckSum; // checksum from the pe header + DWORD TimeDateStamp; // date/time stamp from pe header + WCHAR FileName[MAX_PATH + 1]; // symbols file or image name + BOOLEAN Reparse; // load failure reparse + HANDLE hFile; // file handle, if passed + DWORD Flags; // +} IMAGEHLP_DEFERRED_SYMBOL_LOADW64, *PIMAGEHLP_DEFERRED_SYMBOL_LOADW64; + +#define DSLFLAG_MISMATCHED_PDB 0x1 +#define DSLFLAG_MISMATCHED_DBG 0x2 + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define IMAGEHLP_DEFERRED_SYMBOL_LOAD IMAGEHLP_DEFERRED_SYMBOL_LOAD64 +#define PIMAGEHLP_DEFERRED_SYMBOL_LOAD PIMAGEHLP_DEFERRED_SYMBOL_LOAD64 +#else +typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_DEFERRED_SYMBOL_LOAD) + DWORD BaseOfImage; // base load address of module + DWORD CheckSum; // checksum from the pe header + DWORD TimeDateStamp; // date/time stamp from pe header + CHAR FileName[MAX_PATH]; // symbols file or image name + BOOLEAN Reparse; // load failure reparse + HANDLE hFile; // file handle, if passed +} IMAGEHLP_DEFERRED_SYMBOL_LOAD, *PIMAGEHLP_DEFERRED_SYMBOL_LOAD; +#endif + +typedef struct _IMAGEHLP_DUPLICATE_SYMBOL64 { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_DUPLICATE_SYMBOL64) + DWORD NumberOfDups; // number of duplicates in the Symbol array + PIMAGEHLP_SYMBOL64 Symbol; // array of duplicate symbols + DWORD SelectedSymbol; // symbol selected (-1 to start) +} IMAGEHLP_DUPLICATE_SYMBOL64, *PIMAGEHLP_DUPLICATE_SYMBOL64; + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define IMAGEHLP_DUPLICATE_SYMBOL IMAGEHLP_DUPLICATE_SYMBOL64 +#define PIMAGEHLP_DUPLICATE_SYMBOL PIMAGEHLP_DUPLICATE_SYMBOL64 +#else +typedef struct _IMAGEHLP_DUPLICATE_SYMBOL { + DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_DUPLICATE_SYMBOL) + DWORD NumberOfDups; // number of duplicates in the Symbol array + PIMAGEHLP_SYMBOL Symbol; // array of duplicate symbols + DWORD SelectedSymbol; // symbol selected (-1 to start) +} IMAGEHLP_DUPLICATE_SYMBOL, *PIMAGEHLP_DUPLICATE_SYMBOL; +#endif + +// If dbghelp ever needs to display graphical UI, it will use this as the parent window. + +BOOL +IMAGEAPI +SymSetParentWindow( + __in HWND hwnd + ); + +PCHAR +IMAGEAPI +SymSetHomeDirectory( + __in_opt HANDLE hProcess, + __in_opt PCSTR dir + ); + +PWSTR +IMAGEAPI +SymSetHomeDirectoryW( + __in_opt HANDLE hProcess, + __in_opt PCWSTR dir + ); + +PCHAR +IMAGEAPI +SymGetHomeDirectory( + __in DWORD type, + __out_ecount(size) PSTR dir, + __in size_t size + ); + +PWSTR +IMAGEAPI +SymGetHomeDirectoryW( + __in DWORD type, + __out_ecount(size) PWSTR dir, + __in size_t size + ); + +typedef enum { + hdBase = 0, // root directory for dbghelp + hdSym, // where symbols are stored + hdSrc, // where source is stored + hdMax // end marker +}; + +typedef struct _OMAP { + ULONG rva; + ULONG rvaTo; +} OMAP, *POMAP; + +BOOL +IMAGEAPI +SymGetOmaps( + __in HANDLE hProcess, + __in DWORD64 BaseOfDll, + __out POMAP *OmapTo, + __out PDWORD64 cOmapTo, + __out POMAP *OmapFrom, + __out PDWORD64 cOmapFrom + ); + +// +// options that are set/returned by SymSetOptions() & SymGetOptions() +// these are used as a mask +// +#define SYMOPT_CASE_INSENSITIVE 0x00000001 +#define SYMOPT_UNDNAME 0x00000002 +#define SYMOPT_DEFERRED_LOADS 0x00000004 +#define SYMOPT_NO_CPP 0x00000008 +#define SYMOPT_LOAD_LINES 0x00000010 +#define SYMOPT_OMAP_FIND_NEAREST 0x00000020 +#define SYMOPT_LOAD_ANYTHING 0x00000040 +#define SYMOPT_IGNORE_CVREC 0x00000080 +#define SYMOPT_NO_UNQUALIFIED_LOADS 0x00000100 +#define SYMOPT_FAIL_CRITICAL_ERRORS 0x00000200 +#define SYMOPT_EXACT_SYMBOLS 0x00000400 +#define SYMOPT_ALLOW_ABSOLUTE_SYMBOLS 0x00000800 +#define SYMOPT_IGNORE_NT_SYMPATH 0x00001000 +#define SYMOPT_INCLUDE_32BIT_MODULES 0x00002000 +#define SYMOPT_PUBLICS_ONLY 0x00004000 +#define SYMOPT_NO_PUBLICS 0x00008000 +#define SYMOPT_AUTO_PUBLICS 0x00010000 +#define SYMOPT_NO_IMAGE_SEARCH 0x00020000 +#define SYMOPT_SECURE 0x00040000 +#define SYMOPT_NO_PROMPTS 0x00080000 +#define SYMOPT_OVERWRITE 0x00100000 +#define SYMOPT_IGNORE_IMAGEDIR 0x00200000 +#define SYMOPT_FLAT_DIRECTORY 0x00400000 +#define SYMOPT_FAVOR_COMPRESSED 0x00800000 +#define SYMOPT_ALLOW_ZERO_ADDRESS 0x01000000 +#define SYMOPT_DISABLE_SYMSRV_AUTODETECT 0x02000000 + +#define SYMOPT_DEBUG 0x80000000 + +DWORD +IMAGEAPI +SymSetOptions( + __in DWORD SymOptions + ); + +DWORD +IMAGEAPI +SymGetOptions( + VOID + ); + +BOOL +IMAGEAPI +SymCleanup( + __in HANDLE hProcess + ); + +BOOL +IMAGEAPI +SymMatchString( + __in PCSTR string, + __in PCSTR expression, + __in BOOL fCase + ); + +BOOL +IMAGEAPI +SymMatchStringA( + __in PCSTR string, + __in PCSTR expression, + __in BOOL fCase + ); + +BOOL +IMAGEAPI +SymMatchStringW( + __in PCWSTR string, + __in PCWSTR expression, + __in BOOL fCase + ); + +typedef BOOL +(CALLBACK *PSYM_ENUMSOURCEFILES_CALLBACK)( + __in PSOURCEFILE pSourceFile, + __in_opt PVOID UserContext + ); + +// for backwards compatibility - don't use this +#define PSYM_ENUMSOURCFILES_CALLBACK PSYM_ENUMSOURCEFILES_CALLBACK + +BOOL +IMAGEAPI +SymEnumSourceFiles( + __in HANDLE hProcess, + __in ULONG64 ModBase, + __in_opt PCSTR Mask, + __in PSYM_ENUMSOURCEFILES_CALLBACK cbSrcFiles, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PSYM_ENUMSOURCEFILES_CALLBACKW)( + __in PSOURCEFILEW pSourceFile, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumSourceFilesW( + __in HANDLE hProcess, + __in ULONG64 ModBase, + __in_opt PCWSTR Mask, + __in PSYM_ENUMSOURCEFILES_CALLBACKW cbSrcFiles, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumerateModules64( + __in HANDLE hProcess, + __in PSYM_ENUMMODULES_CALLBACK64 EnumModulesCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumerateModulesW64( + __in HANDLE hProcess, + __in PSYM_ENUMMODULES_CALLBACKW64 EnumModulesCallback, + __in_opt PVOID UserContext + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymEnumerateModules SymEnumerateModules64 +#else +BOOL +IMAGEAPI +SymEnumerateModules( + __in HANDLE hProcess, + __in PSYM_ENUMMODULES_CALLBACK EnumModulesCallback, + __in_opt PVOID UserContext + ); +#endif + +BOOL +IMAGEAPI +EnumerateLoadedModulesEx( + __in HANDLE hProcess, + __in PENUMLOADED_MODULES_CALLBACK64 EnumLoadedModulesCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +EnumerateLoadedModulesExW( + __in HANDLE hProcess, + __in PENUMLOADED_MODULES_CALLBACKW64 EnumLoadedModulesCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +EnumerateLoadedModules64( + __in HANDLE hProcess, + __in PENUMLOADED_MODULES_CALLBACK64 EnumLoadedModulesCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +EnumerateLoadedModulesW64( + __in HANDLE hProcess, + __in PENUMLOADED_MODULES_CALLBACKW64 EnumLoadedModulesCallback, + __in_opt PVOID UserContext + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define EnumerateLoadedModules EnumerateLoadedModules64 +#else +BOOL +IMAGEAPI +EnumerateLoadedModules( + __in HANDLE hProcess, + __in PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback, + __in_opt PVOID UserContext + ); +#endif + +PVOID +IMAGEAPI +SymFunctionTableAccess64( + __in HANDLE hProcess, + __in DWORD64 AddrBase + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymFunctionTableAccess SymFunctionTableAccess64 +#else +PVOID +IMAGEAPI +SymFunctionTableAccess( + __in HANDLE hProcess, + __in DWORD AddrBase + ); +#endif + +BOOL +IMAGEAPI +SymGetUnwindInfo( + __in HANDLE hProcess, + __in DWORD64 Address, + __out_bcount_opt(*Size) PVOID Buffer, + __inout PULONG Size + ); + +BOOL +IMAGEAPI +SymGetModuleInfo64( + __in HANDLE hProcess, + __in DWORD64 qwAddr, + __out PIMAGEHLP_MODULE64 ModuleInfo + ); + +BOOL +IMAGEAPI +SymGetModuleInfoW64( + __in HANDLE hProcess, + __in DWORD64 qwAddr, + __out PIMAGEHLP_MODULEW64 ModuleInfo + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymGetModuleInfo SymGetModuleInfo64 +#define SymGetModuleInfoW SymGetModuleInfoW64 +#else +BOOL +IMAGEAPI +SymGetModuleInfo( + __in HANDLE hProcess, + __in DWORD dwAddr, + __out PIMAGEHLP_MODULE ModuleInfo + ); + +BOOL +IMAGEAPI +SymGetModuleInfoW( + __in HANDLE hProcess, + __in DWORD dwAddr, + __out PIMAGEHLP_MODULEW ModuleInfo + ); +#endif + +DWORD64 +IMAGEAPI +SymGetModuleBase64( + __in HANDLE hProcess, + __in DWORD64 qwAddr + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymGetModuleBase SymGetModuleBase64 +#else +DWORD +IMAGEAPI +SymGetModuleBase( + __in HANDLE hProcess, + __in DWORD dwAddr + ); +#endif + +typedef struct _SRCCODEINFO { + DWORD SizeOfStruct; // set to sizeof(SRCCODEINFO) + PVOID Key; // not used + DWORD64 ModBase; // base address of module this applies to + CHAR Obj[MAX_PATH + 1]; // the object file within the module + CHAR FileName[MAX_PATH + 1]; // full filename + DWORD LineNumber; // line number in file + DWORD64 Address; // first instruction of line +} SRCCODEINFO, *PSRCCODEINFO; + +typedef struct _SRCCODEINFOW { + DWORD SizeOfStruct; // set to sizeof(SRCCODEINFO) + PVOID Key; // not used + DWORD64 ModBase; // base address of module this applies to + WCHAR Obj[MAX_PATH + 1]; // the object file within the module + WCHAR FileName[MAX_PATH + 1]; // full filename + DWORD LineNumber; // line number in file + DWORD64 Address; // first instruction of line +} SRCCODEINFOW, *PSRCCODEINFOW; + +typedef BOOL +(CALLBACK *PSYM_ENUMLINES_CALLBACK)( + __in PSRCCODEINFO LineInfo, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumLines( + __in HANDLE hProcess, + __in ULONG64 Base, + __in_opt PCSTR Obj, + __in_opt PCSTR File, + __in PSYM_ENUMLINES_CALLBACK EnumLinesCallback, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PSYM_ENUMLINES_CALLBACKW)( + __in PSRCCODEINFOW LineInfo, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumLinesW( + __in HANDLE hProcess, + __in ULONG64 Base, + __in_opt PCWSTR Obj, + __in_opt PCWSTR File, + __in PSYM_ENUMLINES_CALLBACKW EnumLinesCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymGetLineFromAddr64( + __in HANDLE hProcess, + __in DWORD64 qwAddr, + __out PDWORD pdwDisplacement, + __out PIMAGEHLP_LINE64 Line64 + ); + +BOOL +IMAGEAPI +SymGetLineFromAddrW64( + __in HANDLE hProcess, + __in DWORD64 dwAddr, + __out PDWORD pdwDisplacement, + __out PIMAGEHLP_LINEW64 Line + ); + +BOOL +IMAGEAPI +SymEnumSourceLines( + __in HANDLE hProcess, + __in ULONG64 Base, + __in_opt PCSTR Obj, + __in_opt PCSTR File, + __in_opt DWORD Line, + __in DWORD Flags, + __in PSYM_ENUMLINES_CALLBACK EnumLinesCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumSourceLinesW( + __in HANDLE hProcess, + __in ULONG64 Base, + __in_opt PCWSTR Obj, + __in_opt PCWSTR File, + __in_opt DWORD Line, + __in DWORD Flags, + __in PSYM_ENUMLINES_CALLBACKW EnumLinesCallback, + __in_opt PVOID UserContext + ); + +// flags for SymEnumSourceLines + +#define ESLFLAG_FULLPATH 0x1 +#define ESLFLAG_NEAREST 0x2 +#define ESLFLAG_PREV 0x4 +#define ESLFLAG_NEXT 0x8 + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymGetLineFromAddr SymGetLineFromAddr64 +#define SymGetLineFromAddrW SymGetLineFromAddrW64 +#else +BOOL +IMAGEAPI +SymGetLineFromAddr( + __in HANDLE hProcess, + __in DWORD dwAddr, + __out PDWORD pdwDisplacement, + __out PIMAGEHLP_LINE Line + ); + +BOOL +IMAGEAPI +SymGetLineFromAddrW( + __in HANDLE hProcess, + __in DWORD dwAddr, + __out PDWORD pdwDisplacement, + __out PIMAGEHLP_LINEW Line + ); +#endif + +BOOL +IMAGEAPI +SymGetLineFromName64( + __in HANDLE hProcess, + __in_opt PCSTR ModuleName, + __in_opt PCSTR FileName, + __in DWORD dwLineNumber, + __out PLONG plDisplacement, + __inout PIMAGEHLP_LINE64 Line + ); + +BOOL +IMAGEAPI +SymGetLineFromNameW64( + __in HANDLE hProcess, + __in_opt PCWSTR ModuleName, + __in_opt PCWSTR FileName, + __in DWORD dwLineNumber, + __out PLONG plDisplacement, + __inout PIMAGEHLP_LINEW64 Line + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymGetLineFromName SymGetLineFromName64 +#else +BOOL +IMAGEAPI +SymGetLineFromName( + __in HANDLE hProcess, + __in_opt PCSTR ModuleName, + __in_opt PCSTR FileName, + __in DWORD dwLineNumber, + __out PLONG plDisplacement, + __inout PIMAGEHLP_LINE Line + ); +#endif + +BOOL +IMAGEAPI +SymGetLineNext64( + __in HANDLE hProcess, + __inout PIMAGEHLP_LINE64 Line + ); + +BOOL +IMAGEAPI +SymGetLineNextW64( + __in HANDLE hProcess, + __inout PIMAGEHLP_LINEW64 Line + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymGetLineNext SymGetLineNext64 +#else +BOOL +IMAGEAPI +SymGetLineNext( + __in HANDLE hProcess, + __inout PIMAGEHLP_LINE Line + ); + +BOOL +IMAGEAPI +SymGetLineNextW( + __in HANDLE hProcess, + __inout PIMAGEHLP_LINEW Line + ); +#endif + +BOOL +IMAGEAPI +SymGetLinePrev64( + __in HANDLE hProcess, + __inout PIMAGEHLP_LINE64 Line + ); + +BOOL +IMAGEAPI +SymGetLinePrevW64( + __in HANDLE hProcess, + __inout PIMAGEHLP_LINEW64 Line + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymGetLinePrev SymGetLinePrev64 +#else +BOOL +IMAGEAPI +SymGetLinePrev( + __in HANDLE hProcess, + __inout PIMAGEHLP_LINE Line + ); + +BOOL +IMAGEAPI +SymGetLinePrevW( + __in HANDLE hProcess, + __inout PIMAGEHLP_LINEW Line + ); +#endif + +ULONG +IMAGEAPI +SymGetFileLineOffsets64( + __in HANDLE hProcess, + __in_opt PCSTR ModuleName, + __in PCSTR FileName, + __out_ecount(BufferLines) PDWORD64 Buffer, + __in ULONG BufferLines + ); + +BOOL +IMAGEAPI +SymMatchFileName( + __in PCSTR FileName, + __in PCSTR Match, + __deref_opt_out PSTR *FileNameStop, + __deref_opt_out PSTR *MatchStop + ); + +BOOL +IMAGEAPI +SymMatchFileNameW( + __in PCWSTR FileName, + __in PCWSTR Match, + __deref_opt_out PWSTR *FileNameStop, + __deref_opt_out PWSTR *MatchStop + ); + +BOOL +IMAGEAPI +SymGetSourceFile( + __in HANDLE hProcess, + __in ULONG64 Base, + __in_opt PCSTR Params, + __in PCSTR FileSpec, + __out_ecount(Size) PSTR FilePath, + __in DWORD Size + ); + +BOOL +IMAGEAPI +SymGetSourceFileW( + __in HANDLE hProcess, + __in ULONG64 Base, + __in_opt PCWSTR Params, + __in PCWSTR FileSpec, + __out_ecount(Size) PWSTR FilePath, + __in DWORD Size + ); + +BOOL +IMAGEAPI +SymGetSourceFileToken( + __in HANDLE hProcess, + __in ULONG64 Base, + __in PCSTR FileSpec, + __deref_out PVOID *Token, + __out DWORD *Size + ); + +BOOL +IMAGEAPI +SymGetSourceFileTokenW( + __in HANDLE hProcess, + __in ULONG64 Base, + __in PCWSTR FileSpec, + __deref_out PVOID *Token, + __out DWORD *Size + ); + +BOOL +IMAGEAPI +SymGetSourceFileFromToken( + __in HANDLE hProcess, + __in PVOID Token, + __in_opt PCSTR Params, + __out_ecount(Size) PSTR FilePath, + __in DWORD Size + ); + +BOOL +IMAGEAPI +SymGetSourceFileFromTokenW( + __in HANDLE hProcess, + __in PVOID Token, + __in_opt PCWSTR Params, + __out_ecount(Size) PWSTR FilePath, + __in DWORD Size + ); + +BOOL +IMAGEAPI +SymGetSourceVarFromToken( + __in HANDLE hProcess, + __in PVOID Token, + __in_opt PCSTR Params, + __in PCSTR VarName, + __out_ecount(Size) PSTR Value, + __in DWORD Size + ); + +BOOL +IMAGEAPI +SymGetSourceVarFromTokenW( + __in HANDLE hProcess, + __in PVOID Token, + __in_opt PCWSTR Params, + __in PCWSTR VarName, + __out_ecount(Size) PWSTR Value, + __in DWORD Size + ); + +typedef BOOL (CALLBACK *PENUMSOURCEFILETOKENSCALLBACK)(__in PVOID token, __in size_t size); + +BOOL +IMAGEAPI +SymEnumSourceFileTokens( + __in HANDLE hProcess, + __in ULONG64 Base, + __in PENUMSOURCEFILETOKENSCALLBACK Callback + ); + +BOOL +IMAGEAPI +SymInitialize( + __in HANDLE hProcess, + __in_opt PCSTR UserSearchPath, + __in BOOL fInvadeProcess + ); + +BOOL +IMAGEAPI +SymInitializeW( + __in HANDLE hProcess, + __in_opt PCWSTR UserSearchPath, + __in BOOL fInvadeProcess + ); + +BOOL +IMAGEAPI +SymGetSearchPath( + __in HANDLE hProcess, + __out_ecount(SearchPathLength) PSTR SearchPath, + __in DWORD SearchPathLength + ); + +BOOL +IMAGEAPI +SymGetSearchPathW( + __in HANDLE hProcess, + __out_ecount(SearchPathLength) PWSTR SearchPath, + __in DWORD SearchPathLength + ); + +BOOL +IMAGEAPI +SymSetSearchPath( + __in HANDLE hProcess, + __in_opt PCSTR SearchPath + ); + +BOOL +IMAGEAPI +SymSetSearchPathW( + __in HANDLE hProcess, + __in_opt PCWSTR SearchPath + ); + +#define SLMFLAG_VIRTUAL 0x1 +#define SLMFLAG_ALT_INDEX 0x2 +#define SLMFLAG_NO_SYMBOLS 0x4 + +DWORD64 +IMAGEAPI +SymLoadModuleEx( + __in HANDLE hProcess, + __in_opt HANDLE hFile, + __in_opt PCSTR ImageName, + __in_opt PCSTR ModuleName, + __in DWORD64 BaseOfDll, + __in DWORD DllSize, + __in_opt PMODLOAD_DATA Data, + __in_opt DWORD Flags + ); + +DWORD64 +IMAGEAPI +SymLoadModuleExW( + __in HANDLE hProcess, + __in_opt HANDLE hFile, + __in_opt PCWSTR ImageName, + __in_opt PCWSTR ModuleName, + __in DWORD64 BaseOfDll, + __in DWORD DllSize, + __in_opt PMODLOAD_DATA Data, + __in_opt DWORD Flags + ); + +BOOL +IMAGEAPI +SymUnloadModule64( + __in HANDLE hProcess, + __in DWORD64 BaseOfDll + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymUnloadModule SymUnloadModule64 +#else +BOOL +IMAGEAPI +SymUnloadModule( + __in HANDLE hProcess, + __in DWORD BaseOfDll + ); +#endif + +BOOL +IMAGEAPI +SymUnDName64( + __in PIMAGEHLP_SYMBOL64 sym, // Symbol to undecorate + __out_ecount(UnDecNameLength) PSTR UnDecName, // Buffer to store undecorated name in + __in DWORD UnDecNameLength // Size of the buffer + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymUnDName SymUnDName64 +#else +BOOL +IMAGEAPI +SymUnDName( + __in PIMAGEHLP_SYMBOL sym, // Symbol to undecorate + __out_ecount(UnDecNameLength) PSTR UnDecName, // Buffer to store undecorated name in + __in DWORD UnDecNameLength // Size of the buffer + ); +#endif + +BOOL +IMAGEAPI +SymRegisterCallback64( + __in HANDLE hProcess, + __in PSYMBOL_REGISTERED_CALLBACK64 CallbackFunction, + __in ULONG64 UserContext + ); + +BOOL +IMAGEAPI +SymRegisterCallbackW64( + __in HANDLE hProcess, + __in PSYMBOL_REGISTERED_CALLBACK64 CallbackFunction, + __in ULONG64 UserContext + ); + +BOOL +IMAGEAPI +SymRegisterFunctionEntryCallback64( + __in HANDLE hProcess, + __in PSYMBOL_FUNCENTRY_CALLBACK64 CallbackFunction, + __in ULONG64 UserContext + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymRegisterCallback SymRegisterCallback64 +#define SymRegisterFunctionEntryCallback SymRegisterFunctionEntryCallback64 +#else +BOOL +IMAGEAPI +SymRegisterCallback( + __in HANDLE hProcess, + __in PSYMBOL_REGISTERED_CALLBACK CallbackFunction, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymRegisterFunctionEntryCallback( + __in HANDLE hProcess, + __in PSYMBOL_FUNCENTRY_CALLBACK CallbackFunction, + __in_opt PVOID UserContext + ); +#endif + + +typedef struct _IMAGEHLP_SYMBOL_SRC { + DWORD sizeofstruct; + DWORD type; + char file[MAX_PATH]; +} IMAGEHLP_SYMBOL_SRC, *PIMAGEHLP_SYMBOL_SRC; + +typedef struct _MODULE_TYPE_INFO { // AKA TYPTYP + USHORT dataLength; + USHORT leaf; + BYTE data[1]; +} MODULE_TYPE_INFO, *PMODULE_TYPE_INFO; + +typedef struct _SYMBOL_INFO { + ULONG SizeOfStruct; + ULONG TypeIndex; // Type Index of symbol + ULONG64 Reserved[2]; + ULONG Index; + ULONG Size; + ULONG64 ModBase; // Base Address of module comtaining this symbol + ULONG Flags; + ULONG64 Value; // Value of symbol, ValuePresent should be 1 + ULONG64 Address; // Address of symbol including base address of module + ULONG Register; // register holding value or pointer to value + ULONG Scope; // scope of the symbol + ULONG Tag; // pdb classification + ULONG NameLen; // Actual length of name + ULONG MaxNameLen; + CHAR Name[1]; // Name of symbol +} SYMBOL_INFO, *PSYMBOL_INFO; + +typedef struct _SYMBOL_INFO_PACKAGE { + SYMBOL_INFO si; + CHAR name[MAX_SYM_NAME + 1]; +} SYMBOL_INFO_PACKAGE, *PSYMBOL_INFO_PACKAGE; + +typedef struct _SYMBOL_INFOW { + ULONG SizeOfStruct; + ULONG TypeIndex; // Type Index of symbol + ULONG64 Reserved[2]; + ULONG Index; + ULONG Size; + ULONG64 ModBase; // Base Address of module comtaining this symbol + ULONG Flags; + ULONG64 Value; // Value of symbol, ValuePresent should be 1 + ULONG64 Address; // Address of symbol including base address of module + ULONG Register; // register holding value or pointer to value + ULONG Scope; // scope of the symbol + ULONG Tag; // pdb classification + ULONG NameLen; // Actual length of name + ULONG MaxNameLen; + WCHAR Name[1]; // Name of symbol +} SYMBOL_INFOW, *PSYMBOL_INFOW; + +typedef struct _SYMBOL_INFO_PACKAGEW { + SYMBOL_INFOW si; + WCHAR name[MAX_SYM_NAME + 1]; +} SYMBOL_INFO_PACKAGEW, *PSYMBOL_INFO_PACKAGEW; + +typedef struct _IMAGEHLP_STACK_FRAME +{ + ULONG64 InstructionOffset; + ULONG64 ReturnOffset; + ULONG64 FrameOffset; + ULONG64 StackOffset; + ULONG64 BackingStoreOffset; + ULONG64 FuncTableEntry; + ULONG64 Params[4]; + ULONG64 Reserved[5]; + BOOL Virtual; + ULONG Reserved2; +} IMAGEHLP_STACK_FRAME, *PIMAGEHLP_STACK_FRAME; + +typedef VOID IMAGEHLP_CONTEXT, *PIMAGEHLP_CONTEXT; + + +BOOL +IMAGEAPI +SymSetContext( + __in HANDLE hProcess, + __in PIMAGEHLP_STACK_FRAME StackFrame, + __in_opt PIMAGEHLP_CONTEXT Context + ); + +BOOL +IMAGEAPI +SymSetScopeFromAddr( + __in HANDLE hProcess, + __in ULONG64 Address + ); + +BOOL +IMAGEAPI +SymSetScopeFromIndex( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in DWORD Index + ); + +typedef BOOL +(CALLBACK *PSYM_ENUMPROCESSES_CALLBACK)( + __in HANDLE hProcess, + __in PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumProcesses( + __in PSYM_ENUMPROCESSES_CALLBACK EnumProcessesCallback, + __in PVOID UserContext + ); + +BOOL +IMAGEAPI +SymFromAddr( + __in HANDLE hProcess, + __in DWORD64 Address, + __out_opt PDWORD64 Displacement, + __inout PSYMBOL_INFO Symbol + ); + +BOOL +IMAGEAPI +SymFromAddrW( + __in HANDLE hProcess, + __in DWORD64 Address, + __out_opt PDWORD64 Displacement, + __inout PSYMBOL_INFOW Symbol + ); + +BOOL +IMAGEAPI +SymFromToken( + __in HANDLE hProcess, + __in DWORD64 Base, + __in DWORD Token, + __inout PSYMBOL_INFO Symbol + ); + +BOOL +IMAGEAPI +SymFromTokenW( + __in HANDLE hProcess, + __in DWORD64 Base, + __in DWORD Token, + __inout PSYMBOL_INFOW Symbol + ); + +BOOL +IMAGEAPI +SymNext( + __in HANDLE hProcess, + __inout PSYMBOL_INFO si + ); + +BOOL +IMAGEAPI +SymNextW( + __in HANDLE hProcess, + __inout PSYMBOL_INFOW siw + ); + +BOOL +IMAGEAPI +SymPrev( + __in HANDLE hProcess, + __inout PSYMBOL_INFO si + ); + +BOOL +IMAGEAPI +SymPrevW( + __in HANDLE hProcess, + __inout PSYMBOL_INFOW siw + ); + +// While SymFromName will provide a symbol from a name, +// SymEnumSymbols can provide the same matching information +// for ALL symbols with a matching name, even regular +// expressions. That way you can search across modules +// and differentiate between identically named symbols. + +BOOL +IMAGEAPI +SymFromName( + __in HANDLE hProcess, + __in PCSTR Name, + __inout PSYMBOL_INFO Symbol + ); + +BOOL +IMAGEAPI +SymFromNameW( + __in HANDLE hProcess, + __in PCWSTR Name, + __inout PSYMBOL_INFOW Symbol + ); + +typedef BOOL +(CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)( + __in PSYMBOL_INFO pSymInfo, + __in ULONG SymbolSize, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumSymbols( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in_opt PCSTR Mask, + __in PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + +typedef BOOL +(CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACKW)( + __in PSYMBOL_INFOW pSymInfo, + __in ULONG SymbolSize, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumSymbolsW( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in_opt PCWSTR Mask, + __in PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumSymbolsForAddr( + __in HANDLE hProcess, + __in DWORD64 Address, + __in PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumSymbolsForAddrW( + __in HANDLE hProcess, + __in DWORD64 Address, + __in PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + +#define SYMSEARCH_MASKOBJS 0x01 // used internally to implement other APIs +#define SYMSEARCH_RECURSE 0X02 // recurse scopes +#define SYMSEARCH_GLOBALSONLY 0X04 // search only for global symbols +#define SYMSEARCH_ALLITEMS 0X08 // search for everything in the pdb, not just normal scoped symbols + +BOOL +IMAGEAPI +SymSearch( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in_opt DWORD Index, + __in_opt DWORD SymTag, + __in_opt PCSTR Mask, + __in_opt DWORD64 Address, + __in PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + __in_opt PVOID UserContext, + __in DWORD Options + ); + +BOOL +IMAGEAPI +SymSearchW( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in_opt DWORD Index, + __in_opt DWORD SymTag, + __in_opt PCWSTR Mask, + __in_opt DWORD64 Address, + __in PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, + __in_opt PVOID UserContext, + __in DWORD Options + ); + +BOOL +IMAGEAPI +SymGetScope( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in DWORD Index, + __inout PSYMBOL_INFO Symbol + ); + +BOOL +IMAGEAPI +SymGetScopeW( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in DWORD Index, + __inout PSYMBOL_INFOW Symbol + ); + +BOOL +IMAGEAPI +SymFromIndex( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in DWORD Index, + __inout PSYMBOL_INFO Symbol + ); + +BOOL +IMAGEAPI +SymFromIndexW( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in DWORD Index, + __inout PSYMBOL_INFOW Symbol + ); + +typedef enum _IMAGEHLP_SYMBOL_TYPE_INFO { + TI_GET_SYMTAG, + TI_GET_SYMNAME, + TI_GET_LENGTH, + TI_GET_TYPE, + TI_GET_TYPEID, + TI_GET_BASETYPE, + TI_GET_ARRAYINDEXTYPEID, + TI_FINDCHILDREN, + TI_GET_DATAKIND, + TI_GET_ADDRESSOFFSET, + TI_GET_OFFSET, + TI_GET_VALUE, + TI_GET_COUNT, + TI_GET_CHILDRENCOUNT, + TI_GET_BITPOSITION, + TI_GET_VIRTUALBASECLASS, + TI_GET_VIRTUALTABLESHAPEID, + TI_GET_VIRTUALBASEPOINTEROFFSET, + TI_GET_CLASSPARENTID, + TI_GET_NESTED, + TI_GET_SYMINDEX, + TI_GET_LEXICALPARENT, + TI_GET_ADDRESS, + TI_GET_THISADJUST, + TI_GET_UDTKIND, + TI_IS_EQUIV_TO, + TI_GET_CALLING_CONVENTION, + TI_IS_CLOSE_EQUIV_TO, + TI_GTIEX_REQS_VALID, + TI_GET_VIRTUALBASEOFFSET, + TI_GET_VIRTUALBASEDISPINDEX, + TI_GET_IS_REFERENCE, + TI_GET_INDIRECTVIRTUALBASECLASS, + IMAGEHLP_SYMBOL_TYPE_INFO_MAX, +} IMAGEHLP_SYMBOL_TYPE_INFO; + +typedef struct _TI_FINDCHILDREN_PARAMS { + ULONG Count; + ULONG Start; + ULONG ChildId[1]; +} TI_FINDCHILDREN_PARAMS; + +BOOL +IMAGEAPI +SymGetTypeInfo( + __in HANDLE hProcess, + __in DWORD64 ModBase, + __in ULONG TypeId, + __in IMAGEHLP_SYMBOL_TYPE_INFO GetType, + __out PVOID pInfo + ); + +#define IMAGEHLP_GET_TYPE_INFO_UNCACHED 0x00000001 +#define IMAGEHLP_GET_TYPE_INFO_CHILDREN 0x00000002 + +typedef struct _IMAGEHLP_GET_TYPE_INFO_PARAMS { + IN ULONG SizeOfStruct; + IN ULONG Flags; + IN ULONG NumIds; + IN PULONG TypeIds; + IN ULONG64 TagFilter; + IN ULONG NumReqs; + IN IMAGEHLP_SYMBOL_TYPE_INFO* ReqKinds; + IN PULONG_PTR ReqOffsets; + IN PULONG ReqSizes; + IN ULONG_PTR ReqStride; + IN ULONG_PTR BufferSize; + OUT PVOID Buffer; + OUT ULONG EntriesMatched; + OUT ULONG EntriesFilled; + OUT ULONG64 TagsFound; + OUT ULONG64 AllReqsValid; + IN ULONG NumReqsValid; + OUT PULONG64 ReqsValid OPTIONAL; +} IMAGEHLP_GET_TYPE_INFO_PARAMS, *PIMAGEHLP_GET_TYPE_INFO_PARAMS; + +BOOL +IMAGEAPI +SymGetTypeInfoEx( + __in HANDLE hProcess, + __in DWORD64 ModBase, + __inout PIMAGEHLP_GET_TYPE_INFO_PARAMS Params + ); + +BOOL +IMAGEAPI +SymEnumTypes( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumTypesW( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumTypesByName( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in_opt PCSTR mask, + __in PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymEnumTypesByNameW( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in_opt PCWSTR mask, + __in PSYM_ENUMERATESYMBOLS_CALLBACKW EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + +BOOL +IMAGEAPI +SymGetTypeFromName( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in PCSTR Name, + __inout PSYMBOL_INFO Symbol + ); + +BOOL +IMAGEAPI +SymGetTypeFromNameW( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in PCWSTR Name, + __inout PSYMBOL_INFOW Symbol + ); + +BOOL +IMAGEAPI +SymAddSymbol( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in PCSTR Name, + __in DWORD64 Address, + __in DWORD Size, + __in DWORD Flags + ); + +BOOL +IMAGEAPI +SymAddSymbolW( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in PCWSTR Name, + __in DWORD64 Address, + __in DWORD Size, + __in DWORD Flags + ); + +BOOL +IMAGEAPI +SymDeleteSymbol( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in_opt PCSTR Name, + __in DWORD64 Address, + __in DWORD Flags + ); + +BOOL +IMAGEAPI +SymDeleteSymbolW( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in_opt PCWSTR Name, + __in DWORD64 Address, + __in DWORD Flags + ); + +BOOL +IMAGEAPI +SymRefreshModuleList( + __in HANDLE hProcess + ); + +BOOL +IMAGEAPI +SymAddSourceStream( + __in HANDLE hProcess, + __in ULONG64 Base, + __in_opt PCSTR StreamFile, + __in_bcount_opt(Size) PBYTE Buffer, + __in size_t Size + ); + +typedef BOOL (WINAPI *SYMADDSOURCESTREAM)(HANDLE, ULONG64, PCSTR, PBYTE, size_t); + +BOOL +IMAGEAPI +SymAddSourceStreamA( + __in HANDLE hProcess, + __in ULONG64 Base, + __in_opt PCSTR StreamFile, + __in_bcount_opt(Size) PBYTE Buffer, + __in size_t Size + ); + +typedef BOOL (WINAPI *SYMADDSOURCESTREAMA)(HANDLE, ULONG64, PCSTR, PBYTE, size_t); + +BOOL +IMAGEAPI +SymAddSourceStreamW( + __in HANDLE hProcess, + __in ULONG64 Base, + __in_opt PCWSTR FileSpec, + __in_bcount_opt(Size) PBYTE Buffer, + __in size_t Size + ); + +BOOL +IMAGEAPI +SymSrvIsStoreW( + __in_opt HANDLE hProcess, + __in PCWSTR path + ); + +BOOL +IMAGEAPI +SymSrvIsStore( + __in_opt HANDLE hProcess, + __in PCSTR path + ); + +PCSTR +IMAGEAPI +SymSrvDeltaName( + __in HANDLE hProcess, + __in_opt PCSTR SymPath, + __in PCSTR Type, + __in PCSTR File1, + __in PCSTR File2 + ); + +PCWSTR +IMAGEAPI +SymSrvDeltaNameW( + __in HANDLE hProcess, + __in_opt PCWSTR SymPath, + __in PCWSTR Type, + __in PCWSTR File1, + __in PCWSTR File2 + ); + +PCSTR +IMAGEAPI +SymSrvGetSupplement( + __in HANDLE hProcess, + __in_opt PCSTR SymPath, + __in PCSTR Node, + __in PCSTR File + ); + +PCWSTR +IMAGEAPI +SymSrvGetSupplementW( + __in HANDLE hProcess, + __in_opt PCWSTR SymPath, + __in PCWSTR Node, + __in PCWSTR File + ); + +BOOL +IMAGEAPI +SymSrvGetFileIndexes( + __in PCSTR File, + __out GUID *Id, + __out PDWORD Val1, + __out_opt PDWORD Val2, + __in DWORD Flags + ); + +BOOL +IMAGEAPI +SymSrvGetFileIndexesW( + __in PCWSTR File, + __out GUID *Id, + __out PDWORD Val1, + __out_opt PDWORD Val2, + __in DWORD Flags + ); + +BOOL +IMAGEAPI +SymSrvGetFileIndexStringW( + __in HANDLE hProcess, + __in_opt PCWSTR SrvPath, + __in PCWSTR File, + __out_ecount(Size) PWSTR Index, + __in size_t Size, + __in DWORD Flags + ); + +BOOL +IMAGEAPI +SymSrvGetFileIndexString( + __in HANDLE hProcess, + __in_opt PCSTR SrvPath, + __in PCSTR File, + __out_ecount(Size) PSTR Index, + __in size_t Size, + __in DWORD Flags + ); + +typedef struct { + DWORD sizeofstruct; + char file[MAX_PATH +1]; + BOOL stripped; + DWORD timestamp; + DWORD size; + char dbgfile[MAX_PATH +1]; + char pdbfile[MAX_PATH + 1]; + GUID guid; + DWORD sig; + DWORD age; +} SYMSRV_INDEX_INFO, *PSYMSRV_INDEX_INFO; + +typedef struct { + DWORD sizeofstruct; + WCHAR file[MAX_PATH +1]; + BOOL stripped; + DWORD timestamp; + DWORD size; + WCHAR dbgfile[MAX_PATH +1]; + WCHAR pdbfile[MAX_PATH + 1]; + GUID guid; + DWORD sig; + DWORD age; +} SYMSRV_INDEX_INFOW, *PSYMSRV_INDEX_INFOW; + +BOOL +IMAGEAPI +SymSrvGetFileIndexInfo( + __in PCSTR File, + __out PSYMSRV_INDEX_INFO Info, + __in DWORD Flags + ); + +BOOL +IMAGEAPI +SymSrvGetFileIndexInfoW( + __in PCWSTR File, + __out PSYMSRV_INDEX_INFOW Info, + __in DWORD Flags + ); + +PCSTR +IMAGEAPI +SymSrvStoreSupplement( + __in HANDLE hProcess, + __in_opt PCSTR SrvPath, + __in PCSTR Node, + __in PCSTR File, + __in DWORD Flags + ); + +PCWSTR +IMAGEAPI +SymSrvStoreSupplementW( + __in HANDLE hProcess, + __in_opt PCWSTR SymPath, + __in PCWSTR Node, + __in PCWSTR File, + __in DWORD Flags + ); + +PCSTR +IMAGEAPI +SymSrvStoreFile( + __in HANDLE hProcess, + __in_opt PCSTR SrvPath, + __in PCSTR File, + __in DWORD Flags + ); + +PCWSTR +IMAGEAPI +SymSrvStoreFileW( + __in HANDLE hProcess, + __in_opt PCWSTR SrvPath, + __in PCWSTR File, + __in DWORD Flags + ); + +// used by SymGetSymbolFile's "Type" parameter + +typedef enum { + sfImage = 0, + sfDbg, + sfPdb, + sfMpd, + sfMax +}; + +BOOL +IMAGEAPI +SymGetSymbolFile( + __in_opt HANDLE hProcess, + __in_opt PCSTR SymPath, + __in PCSTR ImageFile, + __in DWORD Type, + __out_ecount(cSymbolFile) PSTR SymbolFile, + __in size_t cSymbolFile, + __out_ecount(cDbgFile) PSTR DbgFile, + __in size_t cDbgFile + ); + +BOOL +IMAGEAPI +SymGetSymbolFileW( + __in_opt HANDLE hProcess, + __in_opt PCWSTR SymPath, + __in PCWSTR ImageFile, + __in DWORD Type, + __out_ecount(cSymbolFile) PWSTR SymbolFile, + __in size_t cSymbolFile, + __out_ecount(cDbgFile) PWSTR DbgFile, + __in size_t cDbgFile + ); + +// +// Full user-mode dump creation. +// + +typedef BOOL (WINAPI *PDBGHELP_CREATE_USER_DUMP_CALLBACK)( + __in DWORD DataType, + __in PVOID* Data, + __out LPDWORD DataLength, + __in_opt PVOID UserData + ); + +BOOL +WINAPI +DbgHelpCreateUserDump( + __in_opt LPCSTR FileName, + __in PDBGHELP_CREATE_USER_DUMP_CALLBACK Callback, + __in_opt PVOID UserData + ); + +BOOL +WINAPI +DbgHelpCreateUserDumpW( + __in_opt LPCWSTR FileName, + __in PDBGHELP_CREATE_USER_DUMP_CALLBACK Callback, + __in_opt PVOID UserData + ); + +// ----------------------------------------------------------------- +// The following 4 legacy APIs are fully supported, but newer +// ones are recommended. SymFromName and SymFromAddr provide +// much more detailed info on the returned symbol. + +BOOL +IMAGEAPI +SymGetSymFromAddr64( + __in HANDLE hProcess, + __in DWORD64 qwAddr, + __out_opt PDWORD64 pdwDisplacement, + __inout PIMAGEHLP_SYMBOL64 Symbol + ); + + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymGetSymFromAddr SymGetSymFromAddr64 +#else +BOOL +IMAGEAPI +SymGetSymFromAddr( + __in HANDLE hProcess, + __in DWORD dwAddr, + __out_opt PDWORD pdwDisplacement, + __inout PIMAGEHLP_SYMBOL Symbol + ); +#endif + +// While following two APIs will provide a symbol from a name, +// SymEnumSymbols can provide the same matching information +// for ALL symbols with a matching name, even regular +// expressions. That way you can search across modules +// and differentiate between identically named symbols. + +BOOL +IMAGEAPI +SymGetSymFromName64( + __in HANDLE hProcess, + __in PCSTR Name, + __inout PIMAGEHLP_SYMBOL64 Symbol + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymGetSymFromName SymGetSymFromName64 +#else +BOOL +IMAGEAPI +SymGetSymFromName( + __in HANDLE hProcess, + __in PCSTR Name, + __inout PIMAGEHLP_SYMBOL Symbol + ); +#endif + + +// Symbol server exports + +typedef BOOL (WINAPI *PSYMBOLSERVERPROC)(PCSTR, PCSTR, PVOID, DWORD, DWORD, PSTR); +typedef BOOL (WINAPI *PSYMBOLSERVERPROCA)(PCSTR, PCSTR, PVOID, DWORD, DWORD, PSTR); +typedef BOOL (WINAPI *PSYMBOLSERVERPROCW)(PCWSTR, PCWSTR, PVOID, DWORD, DWORD, PWSTR); +typedef BOOL (WINAPI *PSYMBOLSERVERBYINDEXPROC)(PCSTR, PCSTR, PCSTR, PSTR); +typedef BOOL (WINAPI *PSYMBOLSERVERBYINDEXPROCA)(PCSTR, PCSTR, PCSTR, PSTR); +typedef BOOL (WINAPI *PSYMBOLSERVERBYINDEXPROCW)(PCWSTR, PCWSTR, PCWSTR, PWSTR); +typedef BOOL (WINAPI *PSYMBOLSERVEROPENPROC)(VOID); +typedef BOOL (WINAPI *PSYMBOLSERVERCLOSEPROC)(VOID); +typedef BOOL (WINAPI *PSYMBOLSERVERSETOPTIONSPROC)(UINT_PTR, ULONG64); +typedef BOOL (WINAPI *PSYMBOLSERVERSETOPTIONSWPROC)(UINT_PTR, ULONG64); +typedef BOOL (CALLBACK WINAPI *PSYMBOLSERVERCALLBACKPROC)(UINT_PTR action, ULONG64 data, ULONG64 context); +typedef UINT_PTR (WINAPI *PSYMBOLSERVERGETOPTIONSPROC)(); +typedef BOOL (WINAPI *PSYMBOLSERVERPINGPROC)(PCSTR); +typedef BOOL (WINAPI *PSYMBOLSERVERPINGPROCA)(PCSTR); +typedef BOOL (WINAPI *PSYMBOLSERVERPINGPROCW)(PCWSTR); +typedef BOOL (WINAPI *PSYMBOLSERVERGETVERSION)(LPAPI_VERSION); +typedef BOOL (WINAPI *PSYMBOLSERVERDELTANAME)(PCSTR, PVOID, DWORD, DWORD, PVOID, DWORD, DWORD, PSTR, size_t); +typedef BOOL (WINAPI *PSYMBOLSERVERDELTANAMEW)(PCWSTR, PVOID, DWORD, DWORD, PVOID, DWORD, DWORD, PWSTR, size_t); +typedef BOOL (WINAPI *PSYMBOLSERVERGETSUPPLEMENT)(PCSTR, PCSTR, PCSTR, PSTR, size_t); +typedef BOOL (WINAPI *PSYMBOLSERVERGETSUPPLEMENTW)(PCWSTR, PCWSTR, PCWSTR, PWSTR, size_t); +typedef BOOL (WINAPI *PSYMBOLSERVERSTORESUPPLEMENT)(PCSTR, PCSTR, PCSTR, PSTR, size_t, DWORD); +typedef BOOL (WINAPI *PSYMBOLSERVERSTORESUPPLEMENTW)(PCWSTR, PCWSTR, PCWSTR, PWSTR, size_t, DWORD); +typedef BOOL (WINAPI *PSYMBOLSERVERGETINDEXSTRING)(PVOID, DWORD, DWORD, PSTR, size_t); +typedef BOOL (WINAPI *PSYMBOLSERVERGETINDEXSTRINGW)(PVOID, DWORD, DWORD, PWSTR, size_t); +typedef BOOL (WINAPI *PSYMBOLSERVERSTOREFILE)(PCSTR, PCSTR, PVOID, DWORD, DWORD, PSTR, size_t, DWORD); +typedef BOOL (WINAPI *PSYMBOLSERVERSTOREFILEW)(PCWSTR, PCWSTR, PVOID, DWORD, DWORD, PWSTR, size_t, DWORD); +typedef BOOL (WINAPI *PSYMBOLSERVERISSTORE)(PCSTR); +typedef BOOL (WINAPI *PSYMBOLSERVERISSTOREW)(PCWSTR); +typedef DWORD (WINAPI *PSYMBOLSERVERVERSION)(); +typedef BOOL (CALLBACK WINAPI *PSYMBOLSERVERMESSAGEPROC)(UINT_PTR action, ULONG64 data, ULONG64 context); + +#define SYMSRV_VERSION 2 + +#define SSRVOPT_CALLBACK 0x00000001 +#define SSRVOPT_DWORD 0x00000002 +#define SSRVOPT_DWORDPTR 0x00000004 +#define SSRVOPT_GUIDPTR 0x00000008 +#define SSRVOPT_OLDGUIDPTR 0x00000010 +#define SSRVOPT_UNATTENDED 0x00000020 +#define SSRVOPT_NOCOPY 0x00000040 +#define SSRVOPT_GETPATH 0x00000040 +#define SSRVOPT_PARENTWIN 0x00000080 +#define SSRVOPT_PARAMTYPE 0x00000100 +#define SSRVOPT_SECURE 0x00000200 +#define SSRVOPT_TRACE 0x00000400 +#define SSRVOPT_SETCONTEXT 0x00000800 +#define SSRVOPT_PROXY 0x00001000 +#define SSRVOPT_DOWNSTREAM_STORE 0x00002000 +#define SSRVOPT_OVERWRITE 0x00004000 +#define SSRVOPT_RESETTOU 0x00008000 +#define SSRVOPT_CALLBACKW 0x00010000 +#define SSRVOPT_FLAT_DEFAULT_STORE 0x00020000 +#define SSRVOPT_PROXYW 0x00040000 +#define SSRVOPT_MESSAGE 0x00080000 +#define SSRVOPT_SERVICE 0x00100000 // deprecated +#define SSRVOPT_FAVOR_COMPRESSED 0x00200000 +#define SSRVOPT_STRING 0x00400000 +#define SSRVOPT_WINHTTP 0x00800000 +#define SSRVOPT_WININET 0x01000000 + +#define SSRVOPT_MAX 0x0100000 + +#define SSRVOPT_RESET ((ULONG_PTR)-1) + + +#define NUM_SSRVOPTS 30 + +#define SSRVACTION_TRACE 1 +#define SSRVACTION_QUERYCANCEL 2 +#define SSRVACTION_EVENT 3 +#define SSRVACTION_EVENTW 4 +#define SSRVACTION_SIZE 5 + +#define SYMSTOREOPT_COMPRESS 0x01 +#define SYMSTOREOPT_OVERWRITE 0x02 +#define SYMSTOREOPT_RETURNINDEX 0x04 +#define SYMSTOREOPT_POINTER 0x08 +#define SYMSTOREOPT_ALT_INDEX 0x10 +#define SYMSTOREOPT_UNICODE 0x20 +#define SYMSTOREOPT_PASS_IF_EXISTS 0x40 + +#ifdef DBGHELP_TRANSLATE_TCHAR + #define SymInitialize SymInitializeW + #define SymAddSymbol SymAddSymbolW + #define SymDeleteSymbol SymDeleteSymbolW + #define SearchTreeForFile SearchTreeForFileW + #define UnDecorateSymbolName UnDecorateSymbolNameW + #define SymGetLineFromName64 SymGetLineFromNameW64 + #define SymGetLineFromAddr64 SymGetLineFromAddrW64 + #define SymGetLineNext64 SymGetLineNextW64 + #define SymGetLinePrev64 SymGetLinePrevW64 + #define SymFromName SymFromNameW + #define SymFindExecutableImage SymFindExecutableImageW + #define FindExecutableImageEx FindExecutableImageExW + #define SymSearch SymSearchW + #define SymEnumLines SymEnumLinesW + #define SymEnumSourceLines SymEnumSourceLinesW + #define SymGetTypeFromName SymGetTypeFromNameW + #define SymEnumSymbolsForAddr SymEnumSymbolsForAddrW + #define SymFromAddr SymFromAddrW + #define SymMatchString SymMatchStringW + #define SymEnumSourceFiles SymEnumSourceFilesW + #define SymEnumSymbols SymEnumSymbolsW + #define SymLoadModuleEx SymLoadModuleExW + #define SymSetSearchPath SymSetSearchPathW + #define SymGetSearchPath SymGetSearchPathW + #define EnumDirTree EnumDirTreeW + #define SymFromToken SymFromTokenW + #define SymFromIndex SymFromIndexW + #define SymGetScope SymGetScopeW + #define SymNext SymNextW + #define SymPrev SymPrevW + #define SymEnumTypes SymEnumTypesW + #define SymEnumTypesByName SymEnumTypesByNameW + #define SymRegisterCallback64 SymRegisterCallbackW64 + #define SymFindDebugInfoFile SymFindDebugInfoFileW + #define FindDebugInfoFileEx FindDebugInfoFileExW + #define SymFindFileInPath SymFindFileInPathW + #define SymEnumerateModules64 SymEnumerateModulesW64 + #define SymSetHomeDirectory SymSetHomeDirectoryW + #define SymGetHomeDirectory SymGetHomeDirectoryW + #define SymGetSourceFile SymGetSourceFileW + #define SymGetSourceFileToken SymGetSourceFileTokenW + #define SymGetSourceFileFromToken SymGetSourceFileFromTokenW + #define SymGetSourceVarFromToken SymGetSourceVarFromTokenW + #define SymGetSourceFileToken SymGetSourceFileTokenW + #define SymGetFileLineOffsets64 SymGetFileLineOffsetsW64 + #define SymFindFileInPath SymFindFileInPathW + #define SymMatchFileName SymMatchFileNameW + #define SymGetSourceFileFromToken SymGetSourceFileFromTokenW + #define SymGetSourceVarFromToken SymGetSourceVarFromTokenW + #define SymGetModuleInfo64 SymGetModuleInfoW64 + #define SymSrvIsStore SymSrvIsStoreW + #define SymSrvDeltaName SymSrvDeltaNameW + #define SymSrvGetSupplement SymSrvGetSupplementW + #define SymSrvStoreSupplement SymSrvStoreSupplementW + #define SymSrvGetFileIndexes SymSrvGetFileIndexes + #define SymSrvGetFileIndexString SymSrvGetFileIndexStringW + #define SymSrvStoreFile SymSrvStoreFileW + #define SymGetSymbolFile SymGetSymbolFileW + #define EnumerateLoadedModules64 EnumerateLoadedModulesW64 + #define EnumerateLoadedModulesEx EnumerateLoadedModulesExW + #define SymSrvGetFileIndexInfo SymSrvGetFileIndexInfoW + + #define IMAGEHLP_LINE64 IMAGEHLP_LINEW64 + #define PIMAGEHLP_LINE64 PIMAGEHLP_LINEW64 + #define SYMBOL_INFO SYMBOL_INFOW + #define PSYMBOL_INFO PSYMBOL_INFOW + #define SYMBOL_INFO_PACKAGE SYMBOL_INFO_PACKAGEW + #define PSYMBOL_INFO_PACKAGE PSYMBOL_INFO_PACKAGEW + #define FIND_EXE_FILE_CALLBACK FIND_EXE_FILE_CALLBACKW + #define PFIND_EXE_FILE_CALLBACK PFIND_EXE_FILE_CALLBACKW + #define SYM_ENUMERATESYMBOLS_CALLBACK SYM_ENUMERATESYMBOLS_CALLBACKW + #define PSYM_ENUMERATESYMBOLS_CALLBACK PSYM_ENUMERATESYMBOLS_CALLBACKW + #define SRCCODEINFO SRCCODEINFOW + #define PSRCCODEINFO PSRCCODEINFOW + #define SOURCEFILE SOURCEFILEW + #define PSOURCEFILE PSOURCEFILEW + #define SYM_ENUMSOURECFILES_CALLBACK SYM_ENUMSOURCEFILES_CALLBACKW + #define PSYM_ENUMSOURCEFILES_CALLBACK PSYM_ENUMSOURECFILES_CALLBACKW + #define IMAGEHLP_CBA_EVENT IMAGEHLP_CBA_EVENTW + #define PIMAGEHLP_CBA_EVENT PIMAGEHLP_CBA_EVENTW + #define PENUMDIRTREE_CALLBACK PENUMDIRTREE_CALLBACKW + #define IMAGEHLP_DEFERRED_SYMBOL_LOAD64 IMAGEHLP_DEFERRED_SYMBOL_LOADW64 + #define PIMAGEHLP_DEFERRED_SYMBOL_LOAD64 PIMAGEHLP_DEFERRED_SYMBOL_LOADW64 + #define PFIND_DEBUG_FILE_CALLBACK PFIND_DEBUG_FILE_CALLBACKW + #define PFINDFILEINPATHCALLBACK PFINDFILEINPATHCALLBACKW + #define IMAGEHLP_MODULE64 IMAGEHLP_MODULEW64 + #define PIMAGEHLP_MODULE64 PIMAGEHLP_MODULEW64 + #define SYMSRV_INDEX_INFO SYMSRV_INDEX_INFOW + #define PSYMSRV_INDEX_INFO PSYMSRV_INDEX_INFOW + + #define PSYMBOLSERVERPROC PSYMBOLSERVERPROCW + #define PSYMBOLSERVERPINGPROC PSYMBOLSERVERPINGPROCW +#endif + +// ----------------------------------------------------------------- +// The following APIs exist only for backwards compatibility +// with a pre-release version documented in an MSDN release. + +// You should use SymFindFileInPath if you want to maintain +// future compatibility. + +DBHLP_DEPRECIATED +BOOL +IMAGEAPI +FindFileInPath( + __in HANDLE hprocess, + __in PCSTR SearchPath, + __in PCSTR FileName, + __in PVOID id, + __in DWORD two, + __in DWORD three, + __in DWORD flags, + __out_ecount(MAX_PATH + 1) PSTR FilePath + ); + +// You should use SymFindFileInPath if you want to maintain +// future compatibility. + +DBHLP_DEPRECIATED +BOOL +IMAGEAPI +FindFileInSearchPath( + __in HANDLE hprocess, + __in PCSTR SearchPath, + __in PCSTR FileName, + __in DWORD one, + __in DWORD two, + __in DWORD three, + __out_ecount(MAX_PATH + 1) PSTR FilePath + ); + +DBHLP_DEPRECIATED +BOOL +IMAGEAPI +SymEnumSym( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + +DBHLP_DEPRECIATED +BOOL +IMAGEAPI +SymEnumerateSymbols64( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in PSYM_ENUMSYMBOLS_CALLBACK64 EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + +DBHLP_DEPRECIATED +BOOL +IMAGEAPI +SymEnumerateSymbolsW64( + __in HANDLE hProcess, + __in ULONG64 BaseOfDll, + __in PSYM_ENUMSYMBOLS_CALLBACK64W EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymEnumerateSymbols SymEnumerateSymbols64 +#define SymEnumerateSymbolsW SymEnumerateSymbolsW64 +#else +DBHLP_DEPRECIATED +BOOL +IMAGEAPI +SymEnumerateSymbols( + __in HANDLE hProcess, + __in ULONG BaseOfDll, + __in PSYM_ENUMSYMBOLS_CALLBACK EnumSymbolsCallback, + __in_opt PVOID UserContext + ); + +DBHLP_DEPRECIATED +BOOL +IMAGEAPI +SymEnumerateSymbolsW( + __in HANDLE hProcess, + __in ULONG BaseOfDll, + __in PSYM_ENUMSYMBOLS_CALLBACKW EnumSymbolsCallback, + __in_opt PVOID UserContext + ); +#endif + +// use SymLoadModuleEx + +DWORD64 +IMAGEAPI +SymLoadModule64( + __in HANDLE hProcess, + __in_opt HANDLE hFile, + __in_opt PCSTR ImageName, + __in_opt PCSTR ModuleName, + __in DWORD64 BaseOfDll, + __in DWORD SizeOfDll + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymLoadModule SymLoadModule64 +#else +DWORD +IMAGEAPI +SymLoadModule( + __in HANDLE hProcess, + __in_opt HANDLE hFile, + __in_opt PCSTR ImageName, + __in_opt PCSTR ModuleName, + __in DWORD BaseOfDll, + __in DWORD SizeOfDll + ); +#endif + +BOOL +IMAGEAPI +SymGetSymNext64( + __in HANDLE hProcess, + __inout PIMAGEHLP_SYMBOL64 Symbol + ); + +BOOL +IMAGEAPI +SymGetSymNextW64( + __in HANDLE hProcess, + __inout PIMAGEHLP_SYMBOLW64 Symbol + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymGetSymNext SymGetSymNext64 +#define SymGetSymNextW SymGetSymNextW64 +#else +BOOL +IMAGEAPI +SymGetSymNext( + __in HANDLE hProcess, + __inout PIMAGEHLP_SYMBOL Symbol + ); + +BOOL +IMAGEAPI +SymGetSymNextW( + __in HANDLE hProcess, + __inout PIMAGEHLP_SYMBOLW Symbol + ); +#endif + +BOOL +IMAGEAPI +SymGetSymPrev64( + __in HANDLE hProcess, + __inout PIMAGEHLP_SYMBOL64 Symbol + ); + +BOOL +IMAGEAPI +SymGetSymPrevW64( + __in HANDLE hProcess, + __inout PIMAGEHLP_SYMBOLW64 Symbol + ); + +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define SymGetSymPrev SymGetSymPrev64 +#define SymGetSymPrevW SymGetSymPrevW64 +#else +BOOL +IMAGEAPI +SymGetSymPrev( + __in HANDLE hProcess, + __inout PIMAGEHLP_SYMBOL Symbol + ); + +BOOL +IMAGEAPI +SymGetSymPrevW( + __in HANDLE hProcess, + __inout PIMAGEHLP_SYMBOLW Symbol + ); +#endif + + +// These values should not be used. +// They have been replaced by SYMFLAG_ values. + +#define SYMF_OMAP_GENERATED 0x00000001 +#define SYMF_OMAP_MODIFIED 0x00000002 +#define SYMF_REGISTER 0x00000008 +#define SYMF_REGREL 0x00000010 +#define SYMF_FRAMEREL 0x00000020 +#define SYMF_PARAMETER 0x00000040 +#define SYMF_LOCAL 0x00000080 +#define SYMF_CONSTANT 0x00000100 +#define SYMF_EXPORT 0x00000200 +#define SYMF_FORWARDER 0x00000400 +#define SYMF_FUNCTION 0x00000800 +#define SYMF_VIRTUAL 0x00001000 +#define SYMF_THUNK 0x00002000 +#define SYMF_TLSREL 0x00004000 + +// These values should also not be used. +// They have been replaced by SYMFLAG_ values. + +#define IMAGEHLP_SYMBOL_INFO_VALUEPRESENT 1 +#define IMAGEHLP_SYMBOL_INFO_REGISTER SYMF_REGISTER // 0x0008 +#define IMAGEHLP_SYMBOL_INFO_REGRELATIVE SYMF_REGREL // 0x0010 +#define IMAGEHLP_SYMBOL_INFO_FRAMERELATIVE SYMF_FRAMEREL // 0x0020 +#define IMAGEHLP_SYMBOL_INFO_PARAMETER SYMF_PARAMETER // 0x0040 +#define IMAGEHLP_SYMBOL_INFO_LOCAL SYMF_LOCAL // 0x0080 +#define IMAGEHLP_SYMBOL_INFO_CONSTANT SYMF_CONSTANT // 0x0100 +#define IMAGEHLP_SYMBOL_FUNCTION SYMF_FUNCTION // 0x0800 +#define IMAGEHLP_SYMBOL_VIRTUAL SYMF_VIRTUAL // 0x1000 +#define IMAGEHLP_SYMBOL_THUNK SYMF_THUNK // 0x2000 +#define IMAGEHLP_SYMBOL_INFO_TLSRELATIVE SYMF_TLSREL // 0x4000 + +#include + + +#include + +#if defined(_MSC_VER) +#if _MSC_VER >= 800 +#if _MSC_VER >= 1200 +#pragma warning(push) +#endif +#pragma warning(disable:4200) /* Zero length array */ +#pragma warning(disable:4201) /* Nameless struct/union */ +#endif +#endif + +#define MINIDUMP_SIGNATURE ('PMDM') +#define MINIDUMP_VERSION (42899) +typedef DWORD RVA; +typedef ULONG64 RVA64; + +typedef struct _MINIDUMP_LOCATION_DESCRIPTOR { + ULONG32 DataSize; + RVA Rva; +} MINIDUMP_LOCATION_DESCRIPTOR; + +typedef struct _MINIDUMP_LOCATION_DESCRIPTOR64 { + ULONG64 DataSize; + RVA64 Rva; +} MINIDUMP_LOCATION_DESCRIPTOR64; + + +typedef struct _MINIDUMP_MEMORY_DESCRIPTOR { + ULONG64 StartOfMemoryRange; + MINIDUMP_LOCATION_DESCRIPTOR Memory; +} MINIDUMP_MEMORY_DESCRIPTOR, *PMINIDUMP_MEMORY_DESCRIPTOR; + +// DESCRIPTOR64 is used for full-memory minidumps where +// all of the raw memory is laid out sequentially at the +// end of the dump. There is no need for individual RVAs +// as the RVA is the base RVA plus the sum of the preceeding +// data blocks. +typedef struct _MINIDUMP_MEMORY_DESCRIPTOR64 { + ULONG64 StartOfMemoryRange; + ULONG64 DataSize; +} MINIDUMP_MEMORY_DESCRIPTOR64, *PMINIDUMP_MEMORY_DESCRIPTOR64; + + +typedef struct _MINIDUMP_HEADER { + ULONG32 Signature; + ULONG32 Version; + ULONG32 NumberOfStreams; + RVA StreamDirectoryRva; + ULONG32 CheckSum; + union { + ULONG32 Reserved; + ULONG32 TimeDateStamp; + }; + ULONG64 Flags; +} MINIDUMP_HEADER, *PMINIDUMP_HEADER; + +// +// The MINIDUMP_HEADER field StreamDirectoryRva points to +// an array of MINIDUMP_DIRECTORY structures. +// + +typedef struct _MINIDUMP_DIRECTORY { + ULONG32 StreamType; + MINIDUMP_LOCATION_DESCRIPTOR Location; +} MINIDUMP_DIRECTORY, *PMINIDUMP_DIRECTORY; + + +typedef struct _MINIDUMP_STRING { + ULONG32 Length; // Length in bytes of the string + WCHAR Buffer [0]; // Variable size buffer +} MINIDUMP_STRING, *PMINIDUMP_STRING; + + + +// +// The MINIDUMP_DIRECTORY field StreamType may be one of the following types. +// Types will be added in the future, so if a program reading the minidump +// header encounters a stream type it does not understand it should ignore +// the data altogether. Any tag above LastReservedStream will not be used by +// the system and is reserved for program-specific information. +// + +typedef enum _MINIDUMP_STREAM_TYPE { + + UnusedStream = 0, + ReservedStream0 = 1, + ReservedStream1 = 2, + ThreadListStream = 3, + ModuleListStream = 4, + MemoryListStream = 5, + ExceptionStream = 6, + SystemInfoStream = 7, + ThreadExListStream = 8, + Memory64ListStream = 9, + CommentStreamA = 10, + CommentStreamW = 11, + HandleDataStream = 12, + FunctionTableStream = 13, + UnloadedModuleListStream = 14, + MiscInfoStream = 15, + MemoryInfoListStream = 16, + ThreadInfoListStream = 17, + HandleOperationListStream = 18, + TokenStream = 19, + + ceStreamNull = 0x8000, + ceStreamSystemInfo = 0x8001, + ceStreamException = 0x8002, + ceStreamModuleList = 0x8003, + ceStreamProcessList = 0x8004, + ceStreamThreadList = 0x8005, + ceStreamThreadContextList = 0x8006, + ceStreamThreadCallStackList = 0x8007, + ceStreamMemoryVirtualList = 0x8008, + ceStreamMemoryPhysicalList = 0x8009, + ceStreamBucketParameters = 0x800A, + ceStreamProcessModuleMap = 0x800B, + ceStreamDiagnosisList = 0x800C, + + LastReservedStream = 0xffff + +} MINIDUMP_STREAM_TYPE; + + +// +// The minidump system information contains processor and +// Operating System specific information. +// + +// +// CPU information is obtained from one of two places. +// +// 1) On x86 computers, CPU_INFORMATION is obtained from the CPUID +// instruction. You must use the X86 portion of the union for X86 +// computers. +// +// 2) On non-x86 architectures, CPU_INFORMATION is obtained by calling +// IsProcessorFeatureSupported(). +// + +typedef union _CPU_INFORMATION { + + // + // X86 platforms use CPUID function to obtain processor information. + // + + struct { + + // + // CPUID Subfunction 0, register EAX (VendorId [0]), + // EBX (VendorId [1]) and ECX (VendorId [2]). + // + + ULONG32 VendorId [ 3 ]; + + // + // CPUID Subfunction 1, register EAX + // + + ULONG32 VersionInformation; + + // + // CPUID Subfunction 1, register EDX + // + + ULONG32 FeatureInformation; + + + // + // CPUID, Subfunction 80000001, register EBX. This will only + // be obtained if the vendor id is "AuthenticAMD". + // + + ULONG32 AMDExtendedCpuFeatures; + + } X86CpuInfo; + + // + // Non-x86 platforms use processor feature flags. + // + + struct { + + ULONG64 ProcessorFeatures [ 2 ]; + + } OtherCpuInfo; + +} CPU_INFORMATION, *PCPU_INFORMATION; + +typedef struct _MINIDUMP_SYSTEM_INFO { + + // + // ProcessorArchitecture, ProcessorLevel and ProcessorRevision are all + // taken from the SYSTEM_INFO structure obtained by GetSystemInfo( ). + // + + USHORT ProcessorArchitecture; + USHORT ProcessorLevel; + USHORT ProcessorRevision; + + union { + USHORT Reserved0; + struct { + UCHAR NumberOfProcessors; + UCHAR ProductType; + }; + }; + + // + // MajorVersion, MinorVersion, BuildNumber, PlatformId and + // CSDVersion are all taken from the OSVERSIONINFO structure + // returned by GetVersionEx( ). + // + + ULONG32 MajorVersion; + ULONG32 MinorVersion; + ULONG32 BuildNumber; + ULONG32 PlatformId; + + // + // RVA to a CSDVersion string in the string table. + // + + RVA CSDVersionRva; + + union { + ULONG32 Reserved1; + struct { + USHORT SuiteMask; + USHORT Reserved2; + }; + }; + + CPU_INFORMATION Cpu; + +} MINIDUMP_SYSTEM_INFO, *PMINIDUMP_SYSTEM_INFO; + + +// +// The minidump thread contains standard thread +// information plus an RVA to the memory for this +// thread and an RVA to the CONTEXT structure for +// this thread. +// + + +// +// ThreadId must be 4 bytes on all architectures. +// + +C_ASSERT (sizeof ( ((PPROCESS_INFORMATION)0)->dwThreadId ) == 4); + +typedef struct _MINIDUMP_THREAD { + ULONG32 ThreadId; + ULONG32 SuspendCount; + ULONG32 PriorityClass; + ULONG32 Priority; + ULONG64 Teb; + MINIDUMP_MEMORY_DESCRIPTOR Stack; + MINIDUMP_LOCATION_DESCRIPTOR ThreadContext; +} MINIDUMP_THREAD, *PMINIDUMP_THREAD; + +// +// The thread list is a container of threads. +// + +typedef struct _MINIDUMP_THREAD_LIST { + ULONG32 NumberOfThreads; + MINIDUMP_THREAD Threads [0]; +} MINIDUMP_THREAD_LIST, *PMINIDUMP_THREAD_LIST; + + +typedef struct _MINIDUMP_THREAD_EX { + ULONG32 ThreadId; + ULONG32 SuspendCount; + ULONG32 PriorityClass; + ULONG32 Priority; + ULONG64 Teb; + MINIDUMP_MEMORY_DESCRIPTOR Stack; + MINIDUMP_LOCATION_DESCRIPTOR ThreadContext; + MINIDUMP_MEMORY_DESCRIPTOR BackingStore; +} MINIDUMP_THREAD_EX, *PMINIDUMP_THREAD_EX; + +// +// The thread list is a container of threads. +// + +typedef struct _MINIDUMP_THREAD_EX_LIST { + ULONG32 NumberOfThreads; + MINIDUMP_THREAD_EX Threads [0]; +} MINIDUMP_THREAD_EX_LIST, *PMINIDUMP_THREAD_EX_LIST; + + +// +// The MINIDUMP_EXCEPTION is the same as EXCEPTION on Win64. +// + +typedef struct _MINIDUMP_EXCEPTION { + ULONG32 ExceptionCode; + ULONG32 ExceptionFlags; + ULONG64 ExceptionRecord; + ULONG64 ExceptionAddress; + ULONG32 NumberParameters; + ULONG32 __unusedAlignment; + ULONG64 ExceptionInformation [ EXCEPTION_MAXIMUM_PARAMETERS ]; +} MINIDUMP_EXCEPTION, *PMINIDUMP_EXCEPTION; + + +// +// The exception information stream contains the id of the thread that caused +// the exception (ThreadId), the exception record for the exception +// (ExceptionRecord) and an RVA to the thread context where the exception +// occured. +// + +typedef struct MINIDUMP_EXCEPTION_STREAM { + ULONG32 ThreadId; + ULONG32 __alignment; + MINIDUMP_EXCEPTION ExceptionRecord; + MINIDUMP_LOCATION_DESCRIPTOR ThreadContext; +} MINIDUMP_EXCEPTION_STREAM, *PMINIDUMP_EXCEPTION_STREAM; + + +// +// The MINIDUMP_MODULE contains information about a +// a specific module. It includes the CheckSum and +// the TimeDateStamp for the module so the module +// can be reloaded during the analysis phase. +// + +typedef struct _MINIDUMP_MODULE { + ULONG64 BaseOfImage; + ULONG32 SizeOfImage; + ULONG32 CheckSum; + ULONG32 TimeDateStamp; + RVA ModuleNameRva; + VS_FIXEDFILEINFO VersionInfo; + MINIDUMP_LOCATION_DESCRIPTOR CvRecord; + MINIDUMP_LOCATION_DESCRIPTOR MiscRecord; + ULONG64 Reserved0; // Reserved for future use. + ULONG64 Reserved1; // Reserved for future use. +} MINIDUMP_MODULE, *PMINIDUMP_MODULE; + + +// +// The minidump module list is a container for modules. +// + +typedef struct _MINIDUMP_MODULE_LIST { + ULONG32 NumberOfModules; + MINIDUMP_MODULE Modules [ 0 ]; +} MINIDUMP_MODULE_LIST, *PMINIDUMP_MODULE_LIST; + + +// +// Memory Ranges +// + +typedef struct _MINIDUMP_MEMORY_LIST { + ULONG32 NumberOfMemoryRanges; + MINIDUMP_MEMORY_DESCRIPTOR MemoryRanges [0]; +} MINIDUMP_MEMORY_LIST, *PMINIDUMP_MEMORY_LIST; + +typedef struct _MINIDUMP_MEMORY64_LIST { + ULONG64 NumberOfMemoryRanges; + RVA64 BaseRva; + MINIDUMP_MEMORY_DESCRIPTOR64 MemoryRanges [0]; +} MINIDUMP_MEMORY64_LIST, *PMINIDUMP_MEMORY64_LIST; + + +// +// Support for user supplied exception information. +// + +typedef struct _MINIDUMP_EXCEPTION_INFORMATION { + DWORD ThreadId; + PEXCEPTION_POINTERS ExceptionPointers; + BOOL ClientPointers; +} MINIDUMP_EXCEPTION_INFORMATION, *PMINIDUMP_EXCEPTION_INFORMATION; + +typedef struct _MINIDUMP_EXCEPTION_INFORMATION64 { + DWORD ThreadId; + ULONG64 ExceptionRecord; + ULONG64 ContextRecord; + BOOL ClientPointers; +} MINIDUMP_EXCEPTION_INFORMATION64, *PMINIDUMP_EXCEPTION_INFORMATION64; + + +// +// Support for capturing system handle state at the time of the dump. +// + +// Per-handle object information varies according to +// the OS, the OS version, the processor type and +// so on. The minidump gives a minidump identifier +// to each possible data format for identification +// purposes but does not control nor describe the actual data. +typedef enum _MINIDUMP_HANDLE_OBJECT_INFORMATION_TYPE { + MiniHandleObjectInformationNone, + MiniThreadInformation1, + MiniMutantInformation1, + MiniMutantInformation2, + MiniProcessInformation1, + MiniProcessInformation2, + MiniHandleObjectInformationTypeMax +} MINIDUMP_HANDLE_OBJECT_INFORMATION_TYPE; + +typedef struct _MINIDUMP_HANDLE_OBJECT_INFORMATION { + RVA NextInfoRva; + ULONG32 InfoType; + ULONG32 SizeOfInfo; + // Raw information follows. +} MINIDUMP_HANDLE_OBJECT_INFORMATION; + +typedef struct _MINIDUMP_HANDLE_DESCRIPTOR { + ULONG64 Handle; + RVA TypeNameRva; + RVA ObjectNameRva; + ULONG32 Attributes; + ULONG32 GrantedAccess; + ULONG32 HandleCount; + ULONG32 PointerCount; +} MINIDUMP_HANDLE_DESCRIPTOR, *PMINIDUMP_HANDLE_DESCRIPTOR; + +typedef struct _MINIDUMP_HANDLE_DESCRIPTOR_2 { + ULONG64 Handle; + RVA TypeNameRva; + RVA ObjectNameRva; + ULONG32 Attributes; + ULONG32 GrantedAccess; + ULONG32 HandleCount; + ULONG32 PointerCount; + RVA ObjectInfoRva; + ULONG32 Reserved0; +} MINIDUMP_HANDLE_DESCRIPTOR_2, *PMINIDUMP_HANDLE_DESCRIPTOR_2; + +// The latest MINIDUMP_HANDLE_DESCRIPTOR definition. +typedef MINIDUMP_HANDLE_DESCRIPTOR_2 MINIDUMP_HANDLE_DESCRIPTOR_N; +typedef MINIDUMP_HANDLE_DESCRIPTOR_N *PMINIDUMP_HANDLE_DESCRIPTOR_N; + +typedef struct _MINIDUMP_HANDLE_DATA_STREAM { + ULONG32 SizeOfHeader; + ULONG32 SizeOfDescriptor; + ULONG32 NumberOfDescriptors; + ULONG32 Reserved; +} MINIDUMP_HANDLE_DATA_STREAM, *PMINIDUMP_HANDLE_DATA_STREAM; + +// Some operating systems can track the last operations +// performed on a handle. For example, Application Verifier +// can enable this for some versions of Windows. The +// handle operation list collects handle operations +// known for the dump target. +// Each entry is an AVRF_HANDLE_OPERATION. +typedef struct _MINIDUMP_HANDLE_OPERATION_LIST { + ULONG32 SizeOfHeader; + ULONG32 SizeOfEntry; + ULONG32 NumberOfEntries; + ULONG32 Reserved; +} MINIDUMP_HANDLE_OPERATION_LIST, *PMINIDUMP_HANDLE_OPERATION_LIST; + + +// +// Support for capturing dynamic function table state at the time of the dump. +// + +typedef struct _MINIDUMP_FUNCTION_TABLE_DESCRIPTOR { + ULONG64 MinimumAddress; + ULONG64 MaximumAddress; + ULONG64 BaseAddress; + ULONG32 EntryCount; + ULONG32 SizeOfAlignPad; +} MINIDUMP_FUNCTION_TABLE_DESCRIPTOR, *PMINIDUMP_FUNCTION_TABLE_DESCRIPTOR; + +typedef struct _MINIDUMP_FUNCTION_TABLE_STREAM { + ULONG32 SizeOfHeader; + ULONG32 SizeOfDescriptor; + ULONG32 SizeOfNativeDescriptor; + ULONG32 SizeOfFunctionEntry; + ULONG32 NumberOfDescriptors; + ULONG32 SizeOfAlignPad; +} MINIDUMP_FUNCTION_TABLE_STREAM, *PMINIDUMP_FUNCTION_TABLE_STREAM; + + +// +// The MINIDUMP_UNLOADED_MODULE contains information about a +// a specific module that was previously loaded but no +// longer is. This can help with diagnosing problems where +// callers attempt to call code that is no longer loaded. +// + +typedef struct _MINIDUMP_UNLOADED_MODULE { + ULONG64 BaseOfImage; + ULONG32 SizeOfImage; + ULONG32 CheckSum; + ULONG32 TimeDateStamp; + RVA ModuleNameRva; +} MINIDUMP_UNLOADED_MODULE, *PMINIDUMP_UNLOADED_MODULE; + + +// +// The minidump unloaded module list is a container for unloaded modules. +// + +typedef struct _MINIDUMP_UNLOADED_MODULE_LIST { + ULONG32 SizeOfHeader; + ULONG32 SizeOfEntry; + ULONG32 NumberOfEntries; +} MINIDUMP_UNLOADED_MODULE_LIST, *PMINIDUMP_UNLOADED_MODULE_LIST; + + +// +// The miscellaneous information stream contains a variety +// of small pieces of information. A member is valid if +// it's within the available size and its corresponding +// bit is set. +// + +#define MINIDUMP_MISC1_PROCESS_ID 0x00000001 +#define MINIDUMP_MISC1_PROCESS_TIMES 0x00000002 +#define MINIDUMP_MISC1_PROCESSOR_POWER_INFO 0x00000004 +#define MINIDUMP_MISC3_PROCESS_INTEGRITY 0x00000010 +#define MINIDUMP_MISC3_PROCESS_EXECUTE_FLAGS 0x00000020 +#define MINIDUMP_MISC3_TIMEZONE 0x00000040 +#define MINIDUMP_MISC3_PROTECTED_PROCESS 0x00000080 + +typedef struct _MINIDUMP_MISC_INFO { + ULONG32 SizeOfInfo; + ULONG32 Flags1; + ULONG32 ProcessId; + ULONG32 ProcessCreateTime; + ULONG32 ProcessUserTime; + ULONG32 ProcessKernelTime; +} MINIDUMP_MISC_INFO, *PMINIDUMP_MISC_INFO; + +typedef struct _MINIDUMP_MISC_INFO_2 { + ULONG32 SizeOfInfo; + ULONG32 Flags1; + ULONG32 ProcessId; + ULONG32 ProcessCreateTime; + ULONG32 ProcessUserTime; + ULONG32 ProcessKernelTime; + ULONG32 ProcessorMaxMhz; + ULONG32 ProcessorCurrentMhz; + ULONG32 ProcessorMhzLimit; + ULONG32 ProcessorMaxIdleState; + ULONG32 ProcessorCurrentIdleState; +} MINIDUMP_MISC_INFO_2, *PMINIDUMP_MISC_INFO_2; + +typedef struct _MINIDUMP_MISC_INFO_3 { + ULONG32 SizeOfInfo; + ULONG32 Flags1; + ULONG32 ProcessId; + ULONG32 ProcessCreateTime; + ULONG32 ProcessUserTime; + ULONG32 ProcessKernelTime; + ULONG32 ProcessorMaxMhz; + ULONG32 ProcessorCurrentMhz; + ULONG32 ProcessorMhzLimit; + ULONG32 ProcessorMaxIdleState; + ULONG32 ProcessorCurrentIdleState; + ULONG32 ProcessIntegrityLevel; + ULONG32 ProcessExecuteFlags; + ULONG32 ProtectedProcess; + ULONG32 TimeZoneId; + TIME_ZONE_INFORMATION TimeZone; +} MINIDUMP_MISC_INFO_3, *PMINIDUMP_MISC_INFO_3; + +// The latest MINIDUMP_MISC_INFO definition. +typedef MINIDUMP_MISC_INFO_3 MINIDUMP_MISC_INFO_N; +typedef MINIDUMP_MISC_INFO_N* PMINIDUMP_MISC_INFO_N; + + +// +// The memory information stream contains memory region +// description information. This stream corresponds to +// what VirtualQuery would return for the process the +// dump was created for. +// + +typedef struct _MINIDUMP_MEMORY_INFO { + ULONG64 BaseAddress; + ULONG64 AllocationBase; + ULONG32 AllocationProtect; + ULONG32 __alignment1; + ULONG64 RegionSize; + ULONG32 State; + ULONG32 Protect; + ULONG32 Type; + ULONG32 __alignment2; +} MINIDUMP_MEMORY_INFO, *PMINIDUMP_MEMORY_INFO; + +typedef struct _MINIDUMP_MEMORY_INFO_LIST { + ULONG SizeOfHeader; + ULONG SizeOfEntry; + ULONG64 NumberOfEntries; +} MINIDUMP_MEMORY_INFO_LIST, *PMINIDUMP_MEMORY_INFO_LIST; + + +// +// The memory information stream contains memory region +// description information. This stream corresponds to +// what VirtualQuery would return for the process the +// dump was created for. +// + +// Thread dump writer status flags. +#define MINIDUMP_THREAD_INFO_ERROR_THREAD 0x00000001 +#define MINIDUMP_THREAD_INFO_WRITING_THREAD 0x00000002 +#define MINIDUMP_THREAD_INFO_EXITED_THREAD 0x00000004 +#define MINIDUMP_THREAD_INFO_INVALID_INFO 0x00000008 +#define MINIDUMP_THREAD_INFO_INVALID_CONTEXT 0x00000010 +#define MINIDUMP_THREAD_INFO_INVALID_TEB 0x00000020 + +typedef struct _MINIDUMP_THREAD_INFO { + ULONG32 ThreadId; + ULONG32 DumpFlags; + ULONG32 DumpError; + ULONG32 ExitStatus; + ULONG64 CreateTime; + ULONG64 ExitTime; + ULONG64 KernelTime; + ULONG64 UserTime; + ULONG64 StartAddress; + ULONG64 Affinity; +} MINIDUMP_THREAD_INFO, *PMINIDUMP_THREAD_INFO; + +typedef struct _MINIDUMP_THREAD_INFO_LIST { + ULONG SizeOfHeader; + ULONG SizeOfEntry; + ULONG NumberOfEntries; +} MINIDUMP_THREAD_INFO_LIST, *PMINIDUMP_THREAD_INFO_LIST; + +// +// Support for token information. +// +typedef struct _MINIDUMP_TOKEN_INFO_HEADER { + ULONG TokenSize; // The size of the token structure. + ULONG TokenId; // The PID in NtOpenProcessToken() call or TID in NtOpenThreadToken() call. + ULONG64 TokenHandle; // The handle value returned. +} MINIDUMP_TOKEN_INFO_HEADER, *PMINIDUMP_TOKEN_INFO_HEADER; + +typedef struct _MINIDUMP_TOKEN_INFO_LIST { + ULONG TokenListSize; + ULONG TokenListEntries; + ULONG ListHeaderSize; + ULONG ElementHeaderSize; +} MINIDUMP_TOKEN_INFO_LIST, *PMINIDUMP_TOKEN_INFO_LIST; + +// +// Support for arbitrary user-defined information. +// + +typedef struct _MINIDUMP_USER_RECORD { + ULONG32 Type; + MINIDUMP_LOCATION_DESCRIPTOR Memory; +} MINIDUMP_USER_RECORD, *PMINIDUMP_USER_RECORD; + + +typedef struct _MINIDUMP_USER_STREAM { + ULONG32 Type; + ULONG BufferSize; + PVOID Buffer; + +} MINIDUMP_USER_STREAM, *PMINIDUMP_USER_STREAM; + + +typedef struct _MINIDUMP_USER_STREAM_INFORMATION { + ULONG UserStreamCount; + PMINIDUMP_USER_STREAM UserStreamArray; +} MINIDUMP_USER_STREAM_INFORMATION, *PMINIDUMP_USER_STREAM_INFORMATION; + +// +// Callback support. +// + +typedef enum _MINIDUMP_CALLBACK_TYPE { + ModuleCallback, + ThreadCallback, + ThreadExCallback, + IncludeThreadCallback, + IncludeModuleCallback, + MemoryCallback, + CancelCallback, + WriteKernelMinidumpCallback, + KernelMinidumpStatusCallback, + RemoveMemoryCallback, + IncludeVmRegionCallback, + IoStartCallback, + IoWriteAllCallback, + IoFinishCallback, + ReadMemoryFailureCallback, + SecondaryFlagsCallback, +} MINIDUMP_CALLBACK_TYPE; + + +typedef struct _MINIDUMP_THREAD_CALLBACK { + ULONG ThreadId; + HANDLE ThreadHandle; + CONTEXT Context; + ULONG SizeOfContext; + ULONG64 StackBase; + ULONG64 StackEnd; +} MINIDUMP_THREAD_CALLBACK, *PMINIDUMP_THREAD_CALLBACK; + + +typedef struct _MINIDUMP_THREAD_EX_CALLBACK { + ULONG ThreadId; + HANDLE ThreadHandle; + CONTEXT Context; + ULONG SizeOfContext; + ULONG64 StackBase; + ULONG64 StackEnd; + ULONG64 BackingStoreBase; + ULONG64 BackingStoreEnd; +} MINIDUMP_THREAD_EX_CALLBACK, *PMINIDUMP_THREAD_EX_CALLBACK; + + +typedef struct _MINIDUMP_INCLUDE_THREAD_CALLBACK { + ULONG ThreadId; +} MINIDUMP_INCLUDE_THREAD_CALLBACK, *PMINIDUMP_INCLUDE_THREAD_CALLBACK; + + +typedef enum _THREAD_WRITE_FLAGS { + ThreadWriteThread = 0x0001, + ThreadWriteStack = 0x0002, + ThreadWriteContext = 0x0004, + ThreadWriteBackingStore = 0x0008, + ThreadWriteInstructionWindow = 0x0010, + ThreadWriteThreadData = 0x0020, + ThreadWriteThreadInfo = 0x0040, +} THREAD_WRITE_FLAGS; + +typedef struct _MINIDUMP_MODULE_CALLBACK { + PWCHAR FullPath; + ULONG64 BaseOfImage; + ULONG SizeOfImage; + ULONG CheckSum; + ULONG TimeDateStamp; + VS_FIXEDFILEINFO VersionInfo; + PVOID CvRecord; + ULONG SizeOfCvRecord; + PVOID MiscRecord; + ULONG SizeOfMiscRecord; +} MINIDUMP_MODULE_CALLBACK, *PMINIDUMP_MODULE_CALLBACK; + + +typedef struct _MINIDUMP_INCLUDE_MODULE_CALLBACK { + ULONG64 BaseOfImage; +} MINIDUMP_INCLUDE_MODULE_CALLBACK, *PMINIDUMP_INCLUDE_MODULE_CALLBACK; + + +typedef enum _MODULE_WRITE_FLAGS { + ModuleWriteModule = 0x0001, + ModuleWriteDataSeg = 0x0002, + ModuleWriteMiscRecord = 0x0004, + ModuleWriteCvRecord = 0x0008, + ModuleReferencedByMemory = 0x0010, + ModuleWriteTlsData = 0x0020, + ModuleWriteCodeSegs = 0x0040, +} MODULE_WRITE_FLAGS; + + +typedef struct _MINIDUMP_IO_CALLBACK { + HANDLE Handle; + ULONG64 Offset; + PVOID Buffer; + ULONG BufferBytes; +} MINIDUMP_IO_CALLBACK, *PMINIDUMP_IO_CALLBACK; + + +typedef struct _MINIDUMP_READ_MEMORY_FAILURE_CALLBACK +{ + ULONG64 Offset; + ULONG Bytes; + HRESULT FailureStatus; +} MINIDUMP_READ_MEMORY_FAILURE_CALLBACK, + *PMINIDUMP_READ_MEMORY_FAILURE_CALLBACK; + + +typedef struct _MINIDUMP_CALLBACK_INPUT { + ULONG ProcessId; + HANDLE ProcessHandle; + ULONG CallbackType; + union { + HRESULT Status; + MINIDUMP_THREAD_CALLBACK Thread; + MINIDUMP_THREAD_EX_CALLBACK ThreadEx; + MINIDUMP_MODULE_CALLBACK Module; + MINIDUMP_INCLUDE_THREAD_CALLBACK IncludeThread; + MINIDUMP_INCLUDE_MODULE_CALLBACK IncludeModule; + MINIDUMP_IO_CALLBACK Io; + MINIDUMP_READ_MEMORY_FAILURE_CALLBACK ReadMemoryFailure; + ULONG SecondaryFlags; + }; +} MINIDUMP_CALLBACK_INPUT, *PMINIDUMP_CALLBACK_INPUT; + +typedef struct _MINIDUMP_CALLBACK_OUTPUT { + union { + ULONG ModuleWriteFlags; + ULONG ThreadWriteFlags; + ULONG SecondaryFlags; + struct { + ULONG64 MemoryBase; + ULONG MemorySize; + }; + struct { + BOOL CheckCancel; + BOOL Cancel; + }; + HANDLE Handle; + struct { + MINIDUMP_MEMORY_INFO VmRegion; + BOOL Continue; + }; + HRESULT Status; + }; +} MINIDUMP_CALLBACK_OUTPUT, *PMINIDUMP_CALLBACK_OUTPUT; + + +// +// A normal minidump contains just the information +// necessary to capture stack traces for all of the +// existing threads in a process. +// +// A minidump with data segments includes all of the data +// sections from loaded modules in order to capture +// global variable contents. This can make the dump much +// larger if many modules have global data. +// +// A minidump with full memory includes all of the accessible +// memory in the process and can be very large. A minidump +// with full memory always has the raw memory data at the end +// of the dump so that the initial structures in the dump can +// be mapped directly without having to include the raw +// memory information. +// +// Stack and backing store memory can be filtered to remove +// data unnecessary for stack walking. This can improve +// compression of stacks and also deletes data that may +// be private and should not be stored in a dump. +// Memory can also be scanned to see what modules are +// referenced by stack and backing store memory to allow +// omission of other modules to reduce dump size. +// In either of these modes the ModuleReferencedByMemory flag +// is set for all modules referenced before the base +// module callbacks occur. +// +// On some operating systems a list of modules that were +// recently unloaded is kept in addition to the currently +// loaded module list. This information can be saved in +// the dump if desired. +// +// Stack and backing store memory can be scanned for referenced +// pages in order to pick up data referenced by locals or other +// stack memory. This can increase the size of a dump significantly. +// +// Module paths may contain undesired information such as user names +// or other important directory names so they can be stripped. This +// option reduces the ability to locate the proper image later +// and should only be used in certain situations. +// +// Complete operating system per-process and per-thread information can +// be gathered and stored in the dump. +// +// The virtual address space can be scanned for various types +// of memory to be included in the dump. +// +// Code which is concerned with potentially private information +// getting into the minidump can set a flag that automatically +// modifies all existing and future flags to avoid placing +// unnecessary data in the dump. Basic data, such as stack +// information, will still be included but optional data, such +// as indirect memory, will not. +// +// When doing a full memory dump it's possible to store all +// of the enumerated memory region descriptive information +// in a memory information stream. +// +// Additional thread information beyond the basic thread +// structure can be collected if desired. +// +// A minidump with code segments includes all of the code +// and code-related sections from loaded modules in order +// to capture executable content. +// +// MiniDumpWithoutAuxiliaryState turns off any secondary, +// auxiliary-supported memory gathering. +// +// MiniDumpWithFullAuxiliaryState asks any present auxiliary +// data providers to include all of their state in the dump. +// The exact set of what is provided depends on the auxiliary. +// This can be quite large. +// + +typedef enum _MINIDUMP_TYPE { + MiniDumpNormal = 0x00000000, + MiniDumpWithDataSegs = 0x00000001, + MiniDumpWithFullMemory = 0x00000002, + MiniDumpWithHandleData = 0x00000004, + MiniDumpFilterMemory = 0x00000008, + MiniDumpScanMemory = 0x00000010, + MiniDumpWithUnloadedModules = 0x00000020, + MiniDumpWithIndirectlyReferencedMemory = 0x00000040, + MiniDumpFilterModulePaths = 0x00000080, + MiniDumpWithProcessThreadData = 0x00000100, + MiniDumpWithPrivateReadWriteMemory = 0x00000200, + MiniDumpWithoutOptionalData = 0x00000400, + MiniDumpWithFullMemoryInfo = 0x00000800, + MiniDumpWithThreadInfo = 0x00001000, + MiniDumpWithCodeSegs = 0x00002000, + MiniDumpWithoutAuxiliaryState = 0x00004000, + MiniDumpWithFullAuxiliaryState = 0x00008000, + MiniDumpWithPrivateWriteCopyMemory = 0x00010000, + MiniDumpIgnoreInaccessibleMemory = 0x00020000, + MiniDumpWithTokenInformation = 0x00040000, + MiniDumpValidTypeFlags = 0x0007ffff, +} MINIDUMP_TYPE; + +// +// In addition to the primary flags provided to +// MiniDumpWriteDump there are additional, less +// frequently used options queried via the secondary +// flags callback. +// +// MiniSecondaryWithoutPowerInfo suppresses the minidump +// query that retrieves processor power information for +// MINIDUMP_MISC_INFO. +// + +typedef enum _MINIDUMP_SECONDARY_FLAGS { + MiniSecondaryWithoutPowerInfo = 0x00000001, + + MiniSecondaryValidFlags = 0x00000001, +} MINIDUMP_SECONDARY_FLAGS; + + +// +// The minidump callback should modify the FieldsToWrite parameter to reflect +// what portions of the specified thread or module should be written to the +// file. +// + +typedef +BOOL +(WINAPI * MINIDUMP_CALLBACK_ROUTINE) ( + __inout PVOID CallbackParam, + __in PMINIDUMP_CALLBACK_INPUT CallbackInput, + __inout PMINIDUMP_CALLBACK_OUTPUT CallbackOutput + ); + +typedef struct _MINIDUMP_CALLBACK_INFORMATION { + MINIDUMP_CALLBACK_ROUTINE CallbackRoutine; + PVOID CallbackParam; +} MINIDUMP_CALLBACK_INFORMATION, *PMINIDUMP_CALLBACK_INFORMATION; + + + +//++ +// +// PVOID +// RVA_TO_ADDR( +// PVOID Mapping, +// ULONG Rva +// ) +// +// Routine Description: +// +// Map an RVA that is contained within a mapped file to it's associated +// flat address. +// +// Arguments: +// +// Mapping - Base address of mapped file containing the RVA. +// +// Rva - An Rva to fixup. +// +// Return Values: +// +// A pointer to the desired data. +// +//-- + +#define RVA_TO_ADDR(Mapping,Rva) ((PVOID)(((ULONG_PTR) (Mapping)) + (Rva))) + +BOOL +WINAPI +MiniDumpWriteDump( + __in HANDLE hProcess, + __in DWORD ProcessId, + __in HANDLE hFile, + __in MINIDUMP_TYPE DumpType, + __in_opt PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, + __in_opt PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, + __in_opt PMINIDUMP_CALLBACK_INFORMATION CallbackParam + ); + +BOOL +WINAPI +MiniDumpReadDumpStream( + __in PVOID BaseOfDump, + __in ULONG StreamNumber, + __deref_out_opt PMINIDUMP_DIRECTORY * Dir, + __deref_out_opt PVOID * StreamPointer, + __out_opt ULONG * StreamSize + ); + +#if defined(_MSC_VER) +#if _MSC_VER >= 800 +#if _MSC_VER >= 1200 +#pragma warning(pop) +#else +#pragma warning(default:4200) /* Zero length array */ +#pragma warning(default:4201) /* Nameless struct/union */ +#endif +#endif +#endif + +#include + +#ifdef __cplusplus +} +#endif + + +#endif // _DBGHELP_ + diff --git a/lib/dbghelp/lib/Win32/DbgHelp.Lib b/lib/dbghelp/lib/Win32/DbgHelp.Lib new file mode 100644 index 0000000000000000000000000000000000000000..8ae9cf9702e9b8e452c7b5ab2339324c1dfc57e2 GIT binary patch literal 48050 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 - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - vld - SAK - SAK - SAK - SAK - Unicode - DynamicLibrary - true - x86 - x64 - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)bin\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - MinimumRecommendedRules.ruleset - $(ProjectName)_$(NumericPlatform) - .dll - - - - setup;%(AdditionalIncludeDirectories) - Use - - - true - 0x03200000 - false - %(AdditionalLibraryDirectories) - - + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + vld + SAK + SAK + SAK + SAK + Unicode + DynamicLibrary + true + x86 + x64 + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(ProjectDir)bin\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + MinimumRecommendedRules.ruleset + $(ProjectName)_$(NumericPlatform) + .dll + + + + ..\..\lib\dbghelp\include;setup;%(AdditionalIncludeDirectories) + Use + + + true + 0x03200000 + false + ..\..\lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) + + - - - copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y - - - setup - - - - - Disabled - _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level4 - false - EditAndContinue - true - - - psapi.lib;%(AdditionalDependencies) - - - vld.dll.dependency.x86.manifest - - - - - Disabled - _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level4 - false - ProgramDatabase - - - MachineX64 - psapi.lib;%(AdditionalDependencies) - - - vld.dll.dependency.x64.manifest - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - - - - - Full - Speed - true - NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - OldStyle - false - - - true - true - %(AdditionalDependencies) - - - vld.dll.dependency.x86.manifest - - - - - Full - Speed - true - NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - OldStyle - false - false - - - true - true - MachineX64 - true - %(AdditionalDependencies) - - - vld.dll.dependency.x64.manifest - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - + + + copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + + + setup + + + + + Disabled + _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + EditAndContinue + true + + + psapi.lib;%(AdditionalDependencies) + + + vld.dll.dependency.x86.manifest + + + + + Disabled + _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + ProgramDatabase + + + MachineX64 + psapi.lib;%(AdditionalDependencies) + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + OldStyle + false + + + true + true + %(AdditionalDependencies) + + + vld.dll.dependency.x86.manifest + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + OldStyle + false + false + + + true + true + MachineX64 + true + %(AdditionalDependencies) + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/vldint.h b/vldint.h index 8a655064..db4f5e4d 100644 --- a/vldint.h +++ b/vldint.h @@ -31,14 +31,18 @@ #include #include -#include #include "vld_def.h" #include "version.h" #include "callstack.h" // Provides a custom class for handling call stacks. #include "map.h" // Provides a custom STL-like map template. #include "ntapi.h" // Provides access to NT APIs. #include "set.h" // Provides a custom STL-like set template. -#include "utility.h" // Provides miscellaneous utility functions. +#include "utility.h" // Provides miscellaneous utility functions. + +#pragma push_macro("new") +#undef new +#include +#pragma pop_macro("new") #define MAXMODULELISTLENGTH 512 // Maximum module list length, in characters. #define SELFTESTTEXTA "Memory Leak Self-Test" @@ -48,8 +52,8 @@ #define VLDDLL "vld_x86.dll" #else #define VLDDLL "vld_x64.dll" -#endif - +#endif + // The Visual Leak Detector APIs. extern "C" __declspec(dllexport) void VLDDisable (); extern "C" __declspec(dllexport) void VLDEnable (); From 5ea1ccf5e91d7500cb14859516c2a27b57ded54a Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 13 Mar 2014 01:46:47 +0400 Subject: [PATCH 162/321] Deadlock fixed and missed memory leaks when dll loading. Closes #10555 Reverted commit 8d566b611b from version 2.2.2 --- tests/dynamic_app/ThreadTest.cpp | 126 ++--- tests/dynamic_app/dynamic_app.cpp | 340 ++++++------- vld.cpp | 42 +- vldint.h | 797 +++++++++++++++--------------- 4 files changed, 657 insertions(+), 648 deletions(-) diff --git a/tests/dynamic_app/ThreadTest.cpp b/tests/dynamic_app/ThreadTest.cpp index 44abaaba..828b9f2a 100644 --- a/tests/dynamic_app/ThreadTest.cpp +++ b/tests/dynamic_app/ThreadTest.cpp @@ -3,89 +3,99 @@ #include "LoadTests.h" #include +void RunPSApiLoaderTests() +{ + HMODULE hModule = ::LoadLibrary(_T("psapi.dll")); + + if (NULL != hModule) + { + ::FreeLibrary(hModule); + } +} + void Call_LoaderLocks(bool resolve) { - //RunLoaderTests(resolve); // will not crash - RunMFCLoaderTests(resolve); // Leaks 7 allocs + RunPSApiLoaderTests(); // will not crash + RunMFCLoaderTests(resolve); // Leaks 11 allocs - //HMODULE this_app = NULL; - //WCHAR path_name[MAX_PATH] = {0}; - // This also acquires the loader lock - //GetModuleFileName(this_app, path_name, MAX_PATH); + //HMODULE this_app = NULL; + //WCHAR path_name[MAX_PATH] = {0}; + // This also acquires the loader lock + //GetModuleFileName(this_app, path_name, MAX_PATH); } void Call_Three(bool resolve) { - Call_LoaderLocks(resolve); + Call_LoaderLocks(resolve); } void Call_Two(bool resolve) { - Call_Three(resolve); + Call_Three(resolve); } void Call_One(bool resolve) { - Call_Two(resolve); + Call_Two(resolve); } unsigned __stdcall Dynamic_Thread_Procedure(LPVOID foo) { - bool* resolve = (bool*)(foo); - Call_One(*resolve); - return 0; + bool* resolve = (bool*)(foo); + Call_One(*resolve); + return 0; } void RunLoaderLockTests(bool resolve) { - static const int NUMTHREADS = 64; - HANDLE threads[NUMTHREADS] = {0}; - unsigned thread_id = NULL; + static const int NUMTHREADS = 64; + HANDLE threads[NUMTHREADS] = {0}; + unsigned thread_id = NULL; - for (UINT i = 0; i < NUMTHREADS; ++i) - { - threads[i] = (HANDLE)_beginthreadex(NULL, // security attribute - 0, // stack size - Dynamic_Thread_Procedure, // start function - &resolve, // thread parameters - 0, // creation flags - &thread_id); // thread id - } + for (UINT i = 0; i < NUMTHREADS; ++i) + { + threads[i] = (HANDLE)_beginthreadex(NULL, // security attribute + 0, // stack size + Dynamic_Thread_Procedure, // start function + &resolve, // thread parameters + 0, // creation flags + &thread_id); // thread id + } - BOOL wait_for_all = TRUE; - DWORD result = WaitForMultipleObjects(NUMTHREADS, threads, wait_for_all, INFINITE); - switch (result) - { - case WAIT_OBJECT_0: - _tprintf(_T("All threads finished correctly.\n")); - break; - case WAIT_ABANDONED_0: - _tprintf(_T("Abandoned mutex.\n")); - break; - case WAIT_TIMEOUT: - _tprintf(_T("All threads timed out\n")); - break; - case WAIT_FAILED: - { - _tprintf(_T("Function call to Wait failed with unknown error\n")); - TCHAR lpMsgBuf[MAX_PATH] = {0}; - FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - lpMsgBuf, - MAX_PATH, - NULL ); - - _tprintf(_T("%s"), lpMsgBuf); - } + BOOL wait_for_all = TRUE; + DWORD result = WaitForMultipleObjects(NUMTHREADS, threads, wait_for_all, INFINITE); + switch (result) + { + case WAIT_OBJECT_0: + _tprintf(_T("All threads finished correctly.\n")); + break; + case WAIT_ABANDONED_0: + _tprintf(_T("Abandoned mutex.\n")); + break; + case WAIT_TIMEOUT: + _tprintf(_T("All threads timed out\n")); + break; + case WAIT_FAILED: + { + _tprintf(_T("Function call to Wait failed with unknown error\n")); + TCHAR lpMsgBuf[MAX_PATH] = {0}; + FormatMessage( + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + lpMsgBuf, + MAX_PATH, + NULL ); + + _tprintf(_T("%s"), lpMsgBuf); + } - break; - default: - _tprintf(_T("Some other return value\n")); - break; - } + break; + default: + _tprintf(_T("Some other return value\n")); + break; + } } diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index e1b2db23..bc0d34b5 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -14,197 +14,197 @@ // Leaks 6 memory allocations void LeakDuplicateLeaks() { - // For testing aggregation - for (int i = 0; i < 3; ++i) - { - int* tmp = new int(0x63); - tmp; - } - for (int i = 0; i < 3; ++i) - { - int* tmp = new int(0x63); - tmp; - } - // Should report 6 memory leaks + // For testing aggregation + for (int i = 0; i < 3; ++i) + { + int* tmp = new int(0x63); + tmp; + } + for (int i = 0; i < 3; ++i) + { + int* tmp = new int(0x63); + tmp; + } + // Should report 6 memory leaks } namespace tut { - struct test - { - virtual ~test() - { - } - }; - - typedef test_group tg; - typedef tg::object object; - tg dynamic_group("dynamic"); - - static const bool resolve = false; - - template<> - template<> - void object::test<1>() - { - set_test_name("LoaderTests"); - int prevleaks = (int)VLDGetLeaksCount(); - RunLoaderTests(resolve); // leaks 18 - int totalleaks = (int)VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; - ensure("leaks", leaks == 18); - } - - template<> - template<> - void object::test<2>() - { - set_test_name("MFCLoaderTests"); - int prevleaks = (int)VLDGetLeaksCount(); - RunMFCLoaderTests(resolve); // leaks 7 - int totalleaks = (int)VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; - ensure("leaks", leaks == 7); - } - - template<> - template<> - void object::test<3>() - { - set_test_name("DuplicateLeaks"); - int prevleaks = (int)VLDGetLeaksCount(); - LeakDuplicateLeaks(); // leaks 6 - int totalleaks = (int)VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; - ensure("leaks", leaks == 6); - } - - template<> - template<> - void object::test<4>() - { - // Creates 64 threads that each leaks 7 allocations. This equals 448 - set_test_name("thread"); - int prevleaks = (int)VLDGetLeaksCount(); - RunLoaderLockTests(resolve); - int totalleaks = (int)VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; - ensure("leaks", leaks == 448); - } - - test_runner_singleton runner; + struct test + { + virtual ~test() + { + } + }; + + typedef test_group tg; + typedef tg::object object; + tg dynamic_group("dynamic"); + + static const bool resolve = false; + + template<> + template<> + void object::test<1>() + { + set_test_name("LoaderTests"); + int prevleaks = (int)VLDGetLeaksCount(); + RunLoaderTests(resolve); // leaks 18 + int totalleaks = (int)VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ensure("leaks", leaks == 18); + } + + template<> + template<> + void object::test<2>() + { + set_test_name("MFCLoaderTests"); + int prevleaks = (int) VLDGetLeaksCount(); + RunMFCLoaderTests(resolve); // leaks 11 + int totalleaks = (int) VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ensure("leaks", leaks == 11); + } + + template<> + template<> + void object::test<3>() + { + set_test_name("DuplicateLeaks"); + int prevleaks = (int)VLDGetLeaksCount(); + LeakDuplicateLeaks(); // leaks 6 + int totalleaks = (int)VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ensure("leaks", leaks == 6); + } + + template<> + template<> + void object::test<4>() + { + // Creates 64 threads that each leaks 11 allocations + set_test_name("thread"); + int prevleaks = (int)VLDGetLeaksCount(); + RunLoaderLockTests(resolve); + int totalleaks = (int)VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ensure("leaks", leaks == 64 * 11); + } + + test_runner_singleton runner; } int RunAllTest() { - using namespace std; - tut::console_reporter reporter(std::cout); - tut::runner.get().set_callback(&reporter); - - try - { - tut::runner.get().run_tests(); - if(reporter.all_ok()) - { - return 0; - } - else - { - std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; - } - } - catch(const tut::no_such_group &ex) - { - std::cerr << "No such group: " << ex.what() << std::endl; - } - catch(const tut::no_such_test &ex) - { - std::cerr << "No such test: " << ex.what() << std::endl; - } - catch(const tut::tut_error &ex) - { - std::cout << "General error: " << ex.what() << std::endl; - } - return 1; + using namespace std; + tut::console_reporter reporter(std::cout); + tut::runner.get().set_callback(&reporter); + + try + { + tut::runner.get().run_tests(); + if(reporter.all_ok()) + { + return 0; + } + else + { + std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; + } + } + catch(const tut::no_such_group &ex) + { + std::cerr << "No such group: " << ex.what() << std::endl; + } + catch(const tut::no_such_test &ex) + { + std::cerr << "No such test: " << ex.what() << std::endl; + } + catch(const tut::tut_error &ex) + { + std::cout << "General error: " << ex.what() << std::endl; + } + return 1; } void PrintUsage() { - wprintf(_T("Usage:\n")); - wprintf(_T("\tdynamic [resolve:[true|false]]\n")); - wprintf(_T("\t - [OPTIONAL] Resolves callstacks before unloading the dynamic DLL.\n")); + wprintf(_T("Usage:\n")); + wprintf(_T("\tdynamic [resolve:[true|false]]\n")); + wprintf(_T("\t - [OPTIONAL] Resolves callstacks before unloading the dynamic DLL.\n")); } int __cdecl ReportHook(int /*reportHook*/, wchar_t *message, int* /*returnValue*/) { - OutputDebugString(message); - return 1; + OutputDebugString(message); + return 1; } int _tmain(int argc, _TCHAR* argv[]) { - if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) - return RunAllTest(); - - VLDSetReportHook(VLD_RPTHOOK_INSTALL, ReportHook); - wprintf(_T("======================================\n")); - wprintf(_T("==\n")); - wprintf(_T("== VLD Tests: Dynamic DLL Loading \n")); - wprintf(_T("==\n")); - wprintf(_T("======================================\n")); - - bool resolve = true; - bool doThreadTests = false; - if (argc == 2) - { - resolve = _tcsicmp(_T("true"), argv[1]) == 0; - } - else if (argc == 3) - { - resolve = _tcsicmp(_T("true"), argv[1]) == 0; - doThreadTests = _tcsicmp(_T("thread"), argv[2]) == 0; - } - - int tutleaks = (int)VLDGetLeaksCount(); - int prevleaks = tutleaks; - RunLoaderTests(resolve); // leaks 18 - int totalleaks = (int)VLDGetLeaksCount(); - int leaks1 = totalleaks - prevleaks; - prevleaks = totalleaks; - assert(leaks1 == 18); + if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) + return RunAllTest(); + + VLDSetReportHook(VLD_RPTHOOK_INSTALL, ReportHook); + wprintf(_T("======================================\n")); + wprintf(_T("==\n")); + wprintf(_T("== VLD Tests: Dynamic DLL Loading \n")); + wprintf(_T("==\n")); + wprintf(_T("======================================\n")); + + bool resolve = true; + bool doThreadTests = false; + if (argc == 2) + { + resolve = _tcsicmp(_T("true"), argv[1]) == 0; + } + else if (argc == 3) + { + resolve = _tcsicmp(_T("true"), argv[1]) == 0; + doThreadTests = _tcsicmp(_T("thread"), argv[2]) == 0; + } + + int tutleaks = (int)VLDGetLeaksCount(); + int prevleaks = tutleaks; + RunLoaderTests(resolve); // leaks 18 + int totalleaks = (int)VLDGetLeaksCount(); + int leaks1 = totalleaks - prevleaks; + prevleaks = totalleaks; + assert(leaks1 == 18); - RunMFCLoaderTests(resolve); // leaks 7 - totalleaks = (int)VLDGetLeaksCount(); - int leaks2 = totalleaks - prevleaks; - prevleaks = totalleaks; - assert(leaks2 == 11); + RunMFCLoaderTests(resolve); // leaks 11 + totalleaks = (int)VLDGetLeaksCount(); + int leaks2 = totalleaks - prevleaks; + prevleaks = totalleaks; + assert(leaks2 == 11); - LeakDuplicateLeaks(); // leaks 6 - totalleaks = (int)VLDGetLeaksCount(); - int leaks3 = totalleaks - prevleaks; - prevleaks = totalleaks; - assert(leaks3 == 6); - - if (doThreadTests) - { - // Creates 64 threads that each leaks 7 allocations. This equals 448 - RunLoaderLockTests(resolve); - totalleaks = (int)VLDGetLeaksCount(); - int leaks4 = totalleaks - prevleaks; - assert(leaks4 == 448); - - // ..................Total: 479 leaks total - totalleaks = (int)VLDGetLeaksCount() - tutleaks; - int diff = 479 - totalleaks; - return diff; - } - - // ..................Total: 31 leaks total - totalleaks = (int)VLDGetLeaksCount() - tutleaks; - VLDReportLeaks(); - VLDMarkAllLeaksAsReported(); - VLDSetReportHook(VLD_RPTHOOK_REMOVE, ReportHook); - int diff = 31 - totalleaks; - return diff; + LeakDuplicateLeaks(); // leaks 6 + totalleaks = (int)VLDGetLeaksCount(); + int leaks3 = totalleaks - prevleaks; + prevleaks = totalleaks; + assert(leaks3 == 6); + + if (doThreadTests) + { + // Creates 64 threads that each leaks 11 allocations + RunLoaderLockTests(resolve); + totalleaks = (int)VLDGetLeaksCount(); + int leaks4 = totalleaks - prevleaks; + assert(leaks4 == 64 * 11); + + // ..................Total: 479 leaks total + totalleaks = (int)VLDGetLeaksCount() - tutleaks; + int diff = (64 * 11 + 31) - totalleaks; + return diff; + } + + // ..................Total: 31 leaks total + totalleaks = (int)VLDGetLeaksCount() - tutleaks; + VLDReportLeaks(); + VLDMarkAllLeaksAsReported(); + VLDSetReportHook(VLD_RPTHOOK_REMOVE, ReportHook); + int diff = 31 - totalleaks; + return diff; } diff --git a/vld.cpp b/vld.cpp index 56a138c7..c1ace91a 100644 --- a/vld.cpp +++ b/vld.cpp @@ -53,8 +53,8 @@ CriticalSection g_imageLock; // Serializes calls to the Debug Help Library HANDLE g_processHeap; // Handle to the process's heap (COM allocations come from here). CriticalSection g_stackWalkLock; // Serializes calls to StackWalk64 from the Debug Help Library. CriticalSection g_symbolLock; // Serializes calls to the Debug Help Library symbols handling APIs. +CriticalSection g_loaderLock; // Serializes calls to LdrLoadDll, GetProcAddress and EnumerateLoadedModulesW64(). ReportHookSet* g_pReportHooks; -volatile long g_loaderLockCounter = 0; // The one and only VisualLeakDetector object instance. __declspec(dllexport) VisualLeakDetector g_vld; @@ -159,6 +159,7 @@ VisualLeakDetector::VisualLeakDetector () g_symbolLock.Initialize(); g_vldHeap = HeapCreate(0x0, 0, 0); g_vldHeapLock.Initialize(); + g_loaderLock.Initialize(); g_pReportHooks = new ReportHookSet; // Initialize remaining private data. @@ -171,7 +172,6 @@ VisualLeakDetector::VisualLeakDetector () m_maxAlloc = 0; m_loadedModules = new ModuleSet(); m_optionsLock.Initialize(); - m_loaderLock.Initialize(); m_heapMapLock.Initialize(); m_modulesLock.Initialize(); m_selfTestFile = __FILE__; @@ -455,10 +455,10 @@ VisualLeakDetector::~VisualLeakDetector () HeapDestroy(g_vldHeap); m_optionsLock.Delete(); - m_loaderLock.Delete(); m_heapMapLock.Delete(); m_modulesLock.Delete(); m_tlsLock.Delete(); + g_loaderLock.Delete(); g_imageLock.Delete(); g_stackWalkLock.Delete(); g_symbolLock.Delete(); @@ -1916,13 +1916,13 @@ FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, PHANDLE modulehandle) { - // Load the DLL. - _InterlockedIncrement(&g_loaderLockCounter); + // Load the DLL + g_loaderLock.Enter(); NTSTATUS status = LdrLoadDll(searchpath, flags, modulename, modulehandle); + g_loaderLock.Leave(); - if (STATUS_SUCCESS == status && g_loaderLockCounter == 1) + if (STATUS_SUCCESS == status) g_vld.RefreshModules(); - _InterlockedDecrement(&g_loaderLockCounter); return status; } @@ -1930,13 +1930,13 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod NTSTATUS VisualLeakDetector::_LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, unicodestring_t *modulename, PHANDLE modulehandle) { - // Load the DLL. - _InterlockedIncrement(&g_loaderLockCounter); + // Load the DLL + g_loaderLock.Enter(); NTSTATUS status = LdrLoadDllWin8(reserved, flags, modulename, modulehandle); + g_loaderLock.Leave(); - if (STATUS_SUCCESS == status && g_loaderLockCounter == 1) + if (STATUS_SUCCESS == status) g_vld.RefreshModules(); - _InterlockedDecrement(&g_loaderLockCounter); return status; } @@ -1946,17 +1946,19 @@ VOID VisualLeakDetector::RefreshModules() if (m_options & VLD_OPT_VLDOFF) return; - CriticalSectionLocker cs(m_loaderLock); - // Duplicate code here in this method. Consider refactoring out to another method. - // Create a new set of all loaded modules, including any newly loaded - // modules. ModuleSet* newmodules = new ModuleSet(); newmodules->reserve(MODULE_SET_RESERVE); - DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); - EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); + { + CriticalSectionLocker cs(g_loaderLock); + // Duplicate code here in this method. Consider refactoring out to another method. + // Create a new set of all loaded modules, including any newly loaded + // modules. + DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); + EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); - // Attach to all modules included in the set. - attachToLoadedModules(newmodules); + // Attach to all modules included in the set. + attachToLoadedModules(newmodules); + } // Start using the new set of loaded modules. m_modulesLock.Enter(); @@ -1999,8 +2001,6 @@ bool VisualLeakDetector::isModuleExcluded(UINT_PTR address) moduleit = g_vld.m_loadedModules->find(moduleinfo); if (moduleit != g_vld.m_loadedModules->end()) return (*moduleit).flags & VLD_MODULE_EXCLUDED ? true : false; - else if (g_loaderLockCounter != 0) // new module inside LdrLoadDll - return true; return false; } diff --git a/vldint.h b/vldint.h index db4f5e4d..e3f3668f 100644 --- a/vldint.h +++ b/vldint.h @@ -1,406 +1,405 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - VisualLeakDetector Class Definition -// Copyright (c) 2005-2014 VLD Team -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifndef VLDBUILD -#error \ - "This header should only be included by Visual Leak Detector when building it from source. \ - Applications should never include this header." -#endif - -#include -#include -#include "vld_def.h" -#include "version.h" -#include "callstack.h" // Provides a custom class for handling call stacks. -#include "map.h" // Provides a custom STL-like map template. -#include "ntapi.h" // Provides access to NT APIs. -#include "set.h" // Provides a custom STL-like set template. +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - VisualLeakDetector Class Definition +// Copyright (c) 2005-2014 VLD Team +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifndef VLDBUILD +#error \ + "This header should only be included by Visual Leak Detector when building it from source. \ + Applications should never include this header." +#endif + +#include +#include +#include "vld_def.h" +#include "version.h" +#include "callstack.h" // Provides a custom class for handling call stacks. +#include "map.h" // Provides a custom STL-like map template. +#include "ntapi.h" // Provides access to NT APIs. +#include "set.h" // Provides a custom STL-like set template. #include "utility.h" // Provides miscellaneous utility functions. #pragma push_macro("new") #undef new #include -#pragma pop_macro("new") - -#define MAXMODULELISTLENGTH 512 // Maximum module list length, in characters. -#define SELFTESTTEXTA "Memory Leak Self-Test" -#define SELFTESTTEXTW L"Memory Leak Self-Test" -#define VLDREGKEYPRODUCT L"Software\\Visual Leak Detector" -#ifndef WIN64 -#define VLDDLL "vld_x86.dll" -#else -#define VLDDLL "vld_x64.dll" +#pragma pop_macro("new") + +#define MAXMODULELISTLENGTH 512 // Maximum module list length, in characters. +#define SELFTESTTEXTA "Memory Leak Self-Test" +#define SELFTESTTEXTW L"Memory Leak Self-Test" +#define VLDREGKEYPRODUCT L"Software\\Visual Leak Detector" +#ifndef WIN64 +#define VLDDLL "vld_x86.dll" +#else +#define VLDDLL "vld_x64.dll" #endif -// The Visual Leak Detector APIs. -extern "C" __declspec(dllexport) void VLDDisable (); -extern "C" __declspec(dllexport) void VLDEnable (); -extern "C" __declspec(dllexport) void VLDRestore (); - -// Function pointer types for explicit dynamic linking with functions listed in -// the import patch table. -typedef HANDLE(__stdcall *GetProcessHeap_t) (); -typedef HANDLE(__stdcall *HeapCreate_t) (DWORD, SIZE_T, SIZE_T); -typedef FARPROC(__stdcall *GetProcAddress_t) (HMODULE, LPCSTR); - -typedef void* (__cdecl *_calloc_dbg_t) (size_t, size_t, int, const char*, int); -typedef void* (__cdecl *_malloc_dbg_t) (size_t, int, const char *, int); -typedef void* (__cdecl *_realloc_dbg_t) (void *, size_t, int, const char *, int); -typedef void* (__cdecl *_recalloc_dbg_t) (void *, size_t, size_t, int, const char *, int); -typedef void* (__cdecl *calloc_t) (size_t, size_t); -typedef HRESULT (__stdcall *CoGetMalloc_t) (DWORD, LPMALLOC *); -typedef LPVOID (__stdcall *CoTaskMemAlloc_t) (SIZE_T); -typedef LPVOID (__stdcall *CoTaskMemRealloc_t) (LPVOID, SIZE_T); -typedef void* (__cdecl *malloc_t) (size_t); -typedef void* (__cdecl *new_t) (size_t); -typedef void* (__cdecl *new_dbg_crt_t) (size_t, int, const char *, int); -typedef void* (__cdecl *new_dbg_mfc_t) (size_t, const char *, int); -typedef void* (__cdecl *realloc_t) (void *, size_t); -typedef void* (__cdecl *_recalloc_t) (void *, size_t, size_t); -typedef char* (__cdecl *_strdup_t) (const char*); -typedef char* (__cdecl *_strdup_dbg_t) (const char*, int, const char* ,int); -typedef wchar_t* (__cdecl *_wcsdup_t) (const wchar_t*); -typedef wchar_t* (__cdecl *_wcsdup_dbg_t) (const wchar_t*, int, const char* ,int); -typedef void* (__cdecl *_aligned_malloc_t) (size_t, size_t); -typedef void* (__cdecl *_aligned_offset_malloc_t) (size_t, size_t, size_t); -typedef void* (__cdecl *_aligned_realloc_t) (void *, size_t, size_t); -typedef void* (__cdecl *_aligned_offset_realloc_t) (void *, size_t, size_t, size_t); -typedef void* (__cdecl *_aligned_recalloc_t) (void *, size_t, size_t, size_t); -typedef void* (__cdecl *_aligned_offset_recalloc_t) (void *, size_t, size_t, size_t, size_t); -typedef void* (__cdecl *_aligned_malloc_dbg_t) (size_t, size_t, int, const char *, int); -typedef void* (__cdecl *_aligned_offset_malloc_dbg_t) (size_t, size_t, size_t, int, const char *, int); -typedef void* (__cdecl *_aligned_realloc_dbg_t) (void *, size_t, size_t, int, const char *, int); -typedef void* (__cdecl *_aligned_offset_realloc_dbg_t) (void *, size_t, size_t, size_t, int, const char *, int); -typedef void* (__cdecl *_aligned_recalloc_dbg_t) (void *, size_t, size_t, size_t, int, const char *, int); -typedef void* (__cdecl *_aligned_offset_recalloc_dbg_t) (void *, size_t, size_t, size_t, size_t, int, const char *, int); - -// Data is collected for every block allocated from any heap in the process. -// The data is stored in this structure and these structures are stored in -// a BlockMap which maps each of these structures to its corresponding memory -// block. -struct blockinfo_t { - std::unique_ptr callStack; - DWORD threadId; - SIZE_T serialNumber; - SIZE_T size; - bool reported; -}; - -// BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. -typedef Map BlockMap; - -// Information about each heap in the process is kept in this map. Primarily -// this is used for mapping heaps to all of the blocks allocated from those -// heaps. -struct heapinfo_t { - BlockMap blockMap; // Map of all blocks allocated from this heap. - UINT32 flags; // Heap status flags: -#define VLD_HEAP_CRT_DBG 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). -}; - -// HeapMaps map heaps (via their handles) to BlockMaps. -typedef Map HeapMap; - -// This structure stores information, primarily the virtual address range, about -// a given module and can be used with the Set template because it supports the -// '<' operator (sorts by virtual address range). -struct moduleinfo_t { - BOOL operator < (const struct moduleinfo_t& other) const - { - if (addrHigh < other.addrLow) { - return TRUE; - } - else { - return FALSE; - } - } - - SIZE_T addrLow; // Lowest address within the module's virtual address space (i.e. base address). - SIZE_T addrHigh; // Highest address within the module's virtual address space (i.e. base + size). - UINT32 flags; // Module flags: -#define VLD_MODULE_EXCLUDED 0x1 // If set, this module is excluded from leak detection. -#define VLD_MODULE_SYMBOLSLOADED 0x2 // If set, this module's debug symbols have been loaded. - LPCWSTR name; // The module's name (e.g. "kernel32.dll"). - LPCWSTR path; // The fully qualified path from where the module was loaded. -}; - -// ModuleSets store information about modules loaded in the process. -typedef Set ModuleSet; - -typedef Set ReportHookSet; - -// Thread local storage structure. Every thread in the process gets its own copy -// of this structure. Thread specific information, such as the current leak -// detection status (enabled or disabled) and the address that initiated the -// current allocation is stored here. -struct tls_t { - context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. - UINT32 flags; // Thread-local status flags: -#define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. -#define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. -#define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. - UINT32 oldFlags; // Thread-local status old flags - BOOL blockProcessed; // Internal diagnostic feature - DWORD threadId; // Thread ID of the thread that owns this TLS structure. - blockinfo_t* pblockInfo; // Store pointer to callstack. -}; - -// The TlsSet allows VLD to keep track of all thread local storage structures -// allocated in the process. -typedef Map TlsMap; - -class CallStack; - -//////////////////////////////////////////////////////////////////////////////// -// -// The VisualLeakDetector Class -// -// One global instance of this class is instantiated. Upon construction it -// patches the import address table (IAT) of every other module loaded in the -// process (see the "patchimport" utility function) to allow key Windows heap -// APIs to be patched through to, or redirected to, functions provided by VLD. -// Patching the IATs in this manner allows VLD to be made aware of all -// relevant heap activity, making it possible for VLD to detect and trace -// memory leaks. -// -// The one global instance of this class is constructed within the context of -// the process' main thread during process initialization and is destroyed in -// the same context during process termination. -// -// When the VisualLeakDetector object is destroyed, it consults its internal -// data structures, looking for any memory that has not been freed. A memory -// leak report is then generated, indicating any memory leaks that may have -// been identified. -// -// This class is derived from IMalloc so that it can provide an implementation -// of the IMalloc COM interface in order to support detection of COM-based -// memory leaks. However, this implementation of IMalloc is actually just a -// thin wrapper around the system's implementation of IMalloc. -// -class VisualLeakDetector : public IMalloc -{ -public: - VisualLeakDetector(); - ~VisualLeakDetector(); - - //////////////////////////////////////////////////////////////////////////////// - // Public CRT and MFC Common Handlers - // - // Many heap functions are indirectly rerouted to these handlers. One common - // function exists for each heap function with a given signature. These - // handlers are not direct IAT replacements, but are called by the individual - // IAT replacement functions. - //////////////////////////////////////////////////////////////////////////////// - // Standard CRT and MFC common handlers - void* _calloc (calloc_t pcalloc, context_t& context, bool debugRuntime, size_t num, size_t size); - void* _malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size); - void* _new (new_t pnew, context_t& context, bool debugRuntime, size_t size); - void* _realloc (realloc_t prealloc, context_t& context, bool debugRuntime, void *mem, size_t size); - void* __recalloc (_recalloc_t precalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size); - char* __strdup(_strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src); - wchar_t* __wcsdup(_wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src); - - // Debug CRT and MFC common handlers - void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, bool debugRuntime, size_t num, size_t size, int type, char const *file, int line); - void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); - void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); - void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); - void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); - void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, int type, char const *file, int line); - void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, int type, char const *file, int line); - char* __strdup_dbg(_strdup_dbg_t pstrdup, context_t& context, bool debugRuntime, const char* src, int type, char const *file, int line); - wchar_t* __wcsdup_dbg(_wcsdup_dbg_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src, int type, char const *file, int line); - - void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment); - void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset); - void *__aligned_realloc (_aligned_realloc_t p_aligned_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment); - void *__aligned_offset_realloc (_aligned_offset_realloc_t p_aligned_offset_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset); - void *__aligned_recalloc (_aligned_recalloc_t p_aligned_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment); - void *__aligned_offset_recalloc (_aligned_offset_recalloc_t p_aligned_offset_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset); - void* __aligned_malloc_dbg (_aligned_malloc_dbg_t p_aligned_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_aligned_offset_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - void* __aligned_realloc_dbg (_aligned_realloc_dbg_t p_aligned_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_aligned_offset_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - void* __aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_aligned_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_aligned_offset_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - - //////////////////////////////////////////////////////////////////////////////// - // Public IMalloc methods - for support of COM-based memory leak detection. - //////////////////////////////////////////////////////////////////////////////// - ULONG __stdcall AddRef (); - LPVOID __stdcall Alloc (SIZE_T size); - INT __stdcall DidAlloc (LPVOID mem); - VOID __stdcall Free (LPVOID mem); - SIZE_T __stdcall GetSize (LPVOID mem); - VOID __stdcall HeapMinimize (); - HRESULT __stdcall QueryInterface (REFIID iid, LPVOID *object); - LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); - ULONG __stdcall Release (); - - void DisableLeakDetection (); - void EnableLeakDetection (); - void RestoreLeakDetectionState (); - void GlobalDisableLeakDetection (); - void GlobalEnableLeakDetection (); - - VOID RefreshModules(); - SIZE_T GetLeaksCount(); - SIZE_T GetThreadLeaksCount(DWORD threadId); - SIZE_T ReportLeaks(); - SIZE_T ReportThreadLeaks(DWORD threadId); - VOID MarkAllLeaksAsReported(); - VOID MarkThreadLeaksAsReported(DWORD threadId); - VOID EnableModule(HMODULE module); - VOID DisableModule(HMODULE module); - UINT32 GetOptions(); - VOID GetReportFilename(WCHAR *filename); - VOID SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); - VOID SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); - int SetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook); - VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); - bool GetModulesList(WCHAR *modules, UINT size); - VOID ResolveCallstacks(); - - static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle); - static NTSTATUS __stdcall _LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle); - static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); -private: - //////////////////////////////////////////////////////////////////////////////// - // Private leak detection functions - see each function definition for details. - //////////////////////////////////////////////////////////////////////////////// - VOID attachToLoadedModules (ModuleSet *newmodules); - UINT32 getModuleState(ModuleSet::Iterator& it, UINT32 &moduleFlags); - LPWSTR buildSymbolSearchPath(); - VOID configure (); - BOOL enabled (); - SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); - tls_t* getTls (); - VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo); - VOID mapHeap (HANDLE heap); - VOID remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context); - VOID reportConfig (); - SIZE_T reportHeapLeaks (HANDLE heap); - SIZE_T getLeaksCount (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); - SIZE_T reportLeaks(heapinfo_t* heapinfo, bool &firstLeak, Set &aggregatedLeaks, DWORD threadId = (DWORD)-1); - VOID markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); - VOID unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context); - VOID unmapHeap (HANDLE heap); - void resolveStacks(heapinfo_t* heapinfo); - - // Static functions (callbacks) - static BOOL __stdcall addLoadedModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - static BOOL __stdcall detachFromModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - - // Utils - static bool isModuleExcluded (UINT_PTR returnaddress); - blockinfo_t* findAllocedBlock(LPCVOID, __out HANDLE& heap); - static void getCallStack( CallStack *&pcallstack, context_t &context ); - static inline void firstAllocCall(tls_t * tls); - void setupReporting(); - void checkInternalMemoryLeaks(); - bool waitForAllVLDThreads(); - - //////////////////////////////////////////////////////////////////////////////// - // IAT replacement functions - see each function definition for details. - // - // Because there are so many virtually identical CRT and MFC replacement - // functions, they are excluded from the class to reduce the amount of noise - // within this class's code. See crtmfcpatch.cpp for those functions. - //////////////////////////////////////////////////////////////////////////////// - // Win32 IAT replacement functions - static FARPROC __stdcall _GetProcAddress(HMODULE module, LPCSTR procname); - static HANDLE __stdcall _GetProcessHeap(); - - static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); - static BOOL __stdcall _HeapDestroy (HANDLE heap); - static LPVOID __stdcall _HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size); - static BOOL __stdcall _HeapFree (HANDLE heap, DWORD flags, LPVOID mem); - static LPVOID __stdcall _HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); - - static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); - static BYTE __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); - static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); - - // COM IAT replacement functions - static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); - static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); - static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); - - static void AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size); - static void ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context); - - //////////////////////////////////////////////////////////////////////////////// - // Private data - //////////////////////////////////////////////////////////////////////////////// - WCHAR m_forcedModuleList [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. - HeapMap *m_heapMap; // Map of all active heaps in the process. - IMalloc *m_iMalloc; // Pointer to the system implementation of IMalloc. - - SIZE_T m_requestCurr; // Current request number. - SIZE_T m_totalAlloc; // Grand total - sum of all allocations. - SIZE_T m_curAlloc; // Total amount currently allocated. - SIZE_T m_maxAlloc; // Largest ever allocated at once. - ModuleSet *m_loadedModules; // Contains information about all modules loaded in the process. - CriticalSection m_loaderLock; // Serializes the attachment of newly loaded modules. - CriticalSection m_heapMapLock; // Serializes access to the heap and block maps. - SIZE_T m_maxDataDump; // Maximum number of user-data bytes to dump for each leaked block. - UINT32 m_maxTraceFrames; // Maximum number of frames per stack trace for each leaked block. - CriticalSection m_modulesLock; // Protects accesses to the "loaded modules" ModuleSet. - CriticalSection m_optionsLock; // Serializes access to the heap and block maps. - UINT32 m_options; // Configuration options. - - static patchentry_t m_kernelbasePatch []; - static patchentry_t m_kernel32Patch []; - static patchentry_t m_ntdllPatch []; - static patchentry_t m_ole32Patch []; - static moduleentry_t m_patchTable [50]; // Table of imports patched for attaching VLD to other modules. - FILE *m_reportFile; // File where the memory leak report may be sent to. - WCHAR m_reportFilePath [MAX_PATH]; // Full path and name of file to send memory leak report to. - const char *m_selfTestFile; // Filename where the memory leak self-test block is leaked. - int m_selfTestLine; // Line number where the memory leak self-test block is leaked. - UINT32 m_status; // Status flags: -#define VLD_STATUS_DBGHELPLINKED 0x1 // If set, the explicit dynamic link to the Debug Help Library succeeded. -#define VLD_STATUS_INSTALLED 0x2 // If set, VLD was successfully installed. -#define VLD_STATUS_NEVER_ENABLED 0x4 // If set, VLD started disabled, and has not yet been manually enabled. -#define VLD_STATUS_FORCE_REPORT_TO_FILE 0x8 // If set, the leak report is being forced to a file. - DWORD m_tlsIndex; // Thread-local storage index. - CriticalSection m_tlsLock; // Protects accesses to the Set of TLS structures. - TlsMap *m_tlsMap; // Set of all thread-local storage structures for the process. - HMODULE m_vldBase; // Visual Leak Detector's own module handle (base address). - - VOID __stdcall ChangeModuleState(HMODULE module, bool on); - static GetProcAddress_t m_GetProcAddress; - static GetProcessHeap_t m_GetProcessHeap; - static HeapCreate_t m_HeapCreate; -}; - - -// Configuration option default values -#define VLD_DEFAULT_MAX_DATA_DUMP 256 -#define VLD_DEFAULT_MAX_TRACE_FRAMES 64 -#define VLD_DEFAULT_REPORT_FILE_NAME L".\\memory_leak_report.txt" +// The Visual Leak Detector APIs. +extern "C" __declspec(dllexport) void VLDDisable (); +extern "C" __declspec(dllexport) void VLDEnable (); +extern "C" __declspec(dllexport) void VLDRestore (); + +// Function pointer types for explicit dynamic linking with functions listed in +// the import patch table. +typedef HANDLE(__stdcall *GetProcessHeap_t) (); +typedef HANDLE(__stdcall *HeapCreate_t) (DWORD, SIZE_T, SIZE_T); +typedef FARPROC(__stdcall *GetProcAddress_t) (HMODULE, LPCSTR); + +typedef void* (__cdecl *_calloc_dbg_t) (size_t, size_t, int, const char*, int); +typedef void* (__cdecl *_malloc_dbg_t) (size_t, int, const char *, int); +typedef void* (__cdecl *_realloc_dbg_t) (void *, size_t, int, const char *, int); +typedef void* (__cdecl *_recalloc_dbg_t) (void *, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *calloc_t) (size_t, size_t); +typedef HRESULT (__stdcall *CoGetMalloc_t) (DWORD, LPMALLOC *); +typedef LPVOID (__stdcall *CoTaskMemAlloc_t) (SIZE_T); +typedef LPVOID (__stdcall *CoTaskMemRealloc_t) (LPVOID, SIZE_T); +typedef void* (__cdecl *malloc_t) (size_t); +typedef void* (__cdecl *new_t) (size_t); +typedef void* (__cdecl *new_dbg_crt_t) (size_t, int, const char *, int); +typedef void* (__cdecl *new_dbg_mfc_t) (size_t, const char *, int); +typedef void* (__cdecl *realloc_t) (void *, size_t); +typedef void* (__cdecl *_recalloc_t) (void *, size_t, size_t); +typedef char* (__cdecl *_strdup_t) (const char*); +typedef char* (__cdecl *_strdup_dbg_t) (const char*, int, const char* ,int); +typedef wchar_t* (__cdecl *_wcsdup_t) (const wchar_t*); +typedef wchar_t* (__cdecl *_wcsdup_dbg_t) (const wchar_t*, int, const char* ,int); +typedef void* (__cdecl *_aligned_malloc_t) (size_t, size_t); +typedef void* (__cdecl *_aligned_offset_malloc_t) (size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_realloc_t) (void *, size_t, size_t); +typedef void* (__cdecl *_aligned_offset_realloc_t) (void *, size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_recalloc_t) (void *, size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_offset_recalloc_t) (void *, size_t, size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_malloc_dbg_t) (size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_offset_malloc_dbg_t) (size_t, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_realloc_dbg_t) (void *, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_offset_realloc_dbg_t) (void *, size_t, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_recalloc_dbg_t) (void *, size_t, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_offset_recalloc_dbg_t) (void *, size_t, size_t, size_t, size_t, int, const char *, int); + +// Data is collected for every block allocated from any heap in the process. +// The data is stored in this structure and these structures are stored in +// a BlockMap which maps each of these structures to its corresponding memory +// block. +struct blockinfo_t { + std::unique_ptr callStack; + DWORD threadId; + SIZE_T serialNumber; + SIZE_T size; + bool reported; +}; + +// BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. +typedef Map BlockMap; + +// Information about each heap in the process is kept in this map. Primarily +// this is used for mapping heaps to all of the blocks allocated from those +// heaps. +struct heapinfo_t { + BlockMap blockMap; // Map of all blocks allocated from this heap. + UINT32 flags; // Heap status flags: +#define VLD_HEAP_CRT_DBG 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). +}; + +// HeapMaps map heaps (via their handles) to BlockMaps. +typedef Map HeapMap; + +// This structure stores information, primarily the virtual address range, about +// a given module and can be used with the Set template because it supports the +// '<' operator (sorts by virtual address range). +struct moduleinfo_t { + BOOL operator < (const struct moduleinfo_t& other) const + { + if (addrHigh < other.addrLow) { + return TRUE; + } + else { + return FALSE; + } + } + + SIZE_T addrLow; // Lowest address within the module's virtual address space (i.e. base address). + SIZE_T addrHigh; // Highest address within the module's virtual address space (i.e. base + size). + UINT32 flags; // Module flags: +#define VLD_MODULE_EXCLUDED 0x1 // If set, this module is excluded from leak detection. +#define VLD_MODULE_SYMBOLSLOADED 0x2 // If set, this module's debug symbols have been loaded. + LPCWSTR name; // The module's name (e.g. "kernel32.dll"). + LPCWSTR path; // The fully qualified path from where the module was loaded. +}; + +// ModuleSets store information about modules loaded in the process. +typedef Set ModuleSet; + +typedef Set ReportHookSet; + +// Thread local storage structure. Every thread in the process gets its own copy +// of this structure. Thread specific information, such as the current leak +// detection status (enabled or disabled) and the address that initiated the +// current allocation is stored here. +struct tls_t { + context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. + UINT32 flags; // Thread-local status flags: +#define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. +#define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. +#define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. + UINT32 oldFlags; // Thread-local status old flags + BOOL blockProcessed; // Internal diagnostic feature + DWORD threadId; // Thread ID of the thread that owns this TLS structure. + blockinfo_t* pblockInfo; // Store pointer to callstack. +}; + +// The TlsSet allows VLD to keep track of all thread local storage structures +// allocated in the process. +typedef Map TlsMap; + +class CallStack; + +//////////////////////////////////////////////////////////////////////////////// +// +// The VisualLeakDetector Class +// +// One global instance of this class is instantiated. Upon construction it +// patches the import address table (IAT) of every other module loaded in the +// process (see the "patchimport" utility function) to allow key Windows heap +// APIs to be patched through to, or redirected to, functions provided by VLD. +// Patching the IATs in this manner allows VLD to be made aware of all +// relevant heap activity, making it possible for VLD to detect and trace +// memory leaks. +// +// The one global instance of this class is constructed within the context of +// the process' main thread during process initialization and is destroyed in +// the same context during process termination. +// +// When the VisualLeakDetector object is destroyed, it consults its internal +// data structures, looking for any memory that has not been freed. A memory +// leak report is then generated, indicating any memory leaks that may have +// been identified. +// +// This class is derived from IMalloc so that it can provide an implementation +// of the IMalloc COM interface in order to support detection of COM-based +// memory leaks. However, this implementation of IMalloc is actually just a +// thin wrapper around the system's implementation of IMalloc. +// +class VisualLeakDetector : public IMalloc +{ +public: + VisualLeakDetector(); + ~VisualLeakDetector(); + + //////////////////////////////////////////////////////////////////////////////// + // Public CRT and MFC Common Handlers + // + // Many heap functions are indirectly rerouted to these handlers. One common + // function exists for each heap function with a given signature. These + // handlers are not direct IAT replacements, but are called by the individual + // IAT replacement functions. + //////////////////////////////////////////////////////////////////////////////// + // Standard CRT and MFC common handlers + void* _calloc (calloc_t pcalloc, context_t& context, bool debugRuntime, size_t num, size_t size); + void* _malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size); + void* _new (new_t pnew, context_t& context, bool debugRuntime, size_t size); + void* _realloc (realloc_t prealloc, context_t& context, bool debugRuntime, void *mem, size_t size); + void* __recalloc (_recalloc_t precalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size); + char* __strdup(_strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src); + wchar_t* __wcsdup(_wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src); + + // Debug CRT and MFC common handlers + void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, bool debugRuntime, size_t num, size_t size, int type, char const *file, int line); + void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); + void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); + void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); + void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); + void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, int type, char const *file, int line); + void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, int type, char const *file, int line); + char* __strdup_dbg(_strdup_dbg_t pstrdup, context_t& context, bool debugRuntime, const char* src, int type, char const *file, int line); + wchar_t* __wcsdup_dbg(_wcsdup_dbg_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src, int type, char const *file, int line); + + void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment); + void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset); + void *__aligned_realloc (_aligned_realloc_t p_aligned_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment); + void *__aligned_offset_realloc (_aligned_offset_realloc_t p_aligned_offset_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset); + void *__aligned_recalloc (_aligned_recalloc_t p_aligned_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment); + void *__aligned_offset_recalloc (_aligned_offset_recalloc_t p_aligned_offset_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset); + void* __aligned_malloc_dbg (_aligned_malloc_dbg_t p_aligned_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_aligned_offset_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + void* __aligned_realloc_dbg (_aligned_realloc_dbg_t p_aligned_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_aligned_offset_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + void* __aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_aligned_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_aligned_offset_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + + //////////////////////////////////////////////////////////////////////////////// + // Public IMalloc methods - for support of COM-based memory leak detection. + //////////////////////////////////////////////////////////////////////////////// + ULONG __stdcall AddRef (); + LPVOID __stdcall Alloc (SIZE_T size); + INT __stdcall DidAlloc (LPVOID mem); + VOID __stdcall Free (LPVOID mem); + SIZE_T __stdcall GetSize (LPVOID mem); + VOID __stdcall HeapMinimize (); + HRESULT __stdcall QueryInterface (REFIID iid, LPVOID *object); + LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); + ULONG __stdcall Release (); + + void DisableLeakDetection (); + void EnableLeakDetection (); + void RestoreLeakDetectionState (); + void GlobalDisableLeakDetection (); + void GlobalEnableLeakDetection (); + + VOID RefreshModules(); + SIZE_T GetLeaksCount(); + SIZE_T GetThreadLeaksCount(DWORD threadId); + SIZE_T ReportLeaks(); + SIZE_T ReportThreadLeaks(DWORD threadId); + VOID MarkAllLeaksAsReported(); + VOID MarkThreadLeaksAsReported(DWORD threadId); + VOID EnableModule(HMODULE module); + VOID DisableModule(HMODULE module); + UINT32 GetOptions(); + VOID GetReportFilename(WCHAR *filename); + VOID SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); + VOID SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); + int SetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook); + VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); + bool GetModulesList(WCHAR *modules, UINT size); + VOID ResolveCallstacks(); + + static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, + PHANDLE modulehandle); + static NTSTATUS __stdcall _LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, unicodestring_t *modulename, + PHANDLE modulehandle); + static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); +private: + //////////////////////////////////////////////////////////////////////////////// + // Private leak detection functions - see each function definition for details. + //////////////////////////////////////////////////////////////////////////////// + VOID attachToLoadedModules (ModuleSet *newmodules); + UINT32 getModuleState(ModuleSet::Iterator& it, UINT32 &moduleFlags); + LPWSTR buildSymbolSearchPath(); + VOID configure (); + BOOL enabled (); + SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); + tls_t* getTls (); + VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo); + VOID mapHeap (HANDLE heap); + VOID remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, + bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context); + VOID reportConfig (); + SIZE_T reportHeapLeaks (HANDLE heap); + SIZE_T getLeaksCount (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); + SIZE_T reportLeaks(heapinfo_t* heapinfo, bool &firstLeak, Set &aggregatedLeaks, DWORD threadId = (DWORD)-1); + VOID markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); + VOID unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context); + VOID unmapHeap (HANDLE heap); + void resolveStacks(heapinfo_t* heapinfo); + + // Static functions (callbacks) + static BOOL __stdcall addLoadedModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + static BOOL __stdcall detachFromModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + + // Utils + static bool isModuleExcluded (UINT_PTR returnaddress); + blockinfo_t* findAllocedBlock(LPCVOID, __out HANDLE& heap); + static void getCallStack( CallStack *&pcallstack, context_t &context ); + static inline void firstAllocCall(tls_t * tls); + void setupReporting(); + void checkInternalMemoryLeaks(); + bool waitForAllVLDThreads(); + + //////////////////////////////////////////////////////////////////////////////// + // IAT replacement functions - see each function definition for details. + // + // Because there are so many virtually identical CRT and MFC replacement + // functions, they are excluded from the class to reduce the amount of noise + // within this class's code. See crtmfcpatch.cpp for those functions. + //////////////////////////////////////////////////////////////////////////////// + // Win32 IAT replacement functions + static FARPROC __stdcall _GetProcAddress(HMODULE module, LPCSTR procname); + static HANDLE __stdcall _GetProcessHeap(); + + static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); + static BOOL __stdcall _HeapDestroy (HANDLE heap); + static LPVOID __stdcall _HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size); + static BOOL __stdcall _HeapFree (HANDLE heap, DWORD flags, LPVOID mem); + static LPVOID __stdcall _HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); + + static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); + static BYTE __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); + static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); + + // COM IAT replacement functions + static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); + static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); + static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); + + static void AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size); + static void ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context); + + //////////////////////////////////////////////////////////////////////////////// + // Private data + //////////////////////////////////////////////////////////////////////////////// + WCHAR m_forcedModuleList [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. + HeapMap *m_heapMap; // Map of all active heaps in the process. + IMalloc *m_iMalloc; // Pointer to the system implementation of IMalloc. + + SIZE_T m_requestCurr; // Current request number. + SIZE_T m_totalAlloc; // Grand total - sum of all allocations. + SIZE_T m_curAlloc; // Total amount currently allocated. + SIZE_T m_maxAlloc; // Largest ever allocated at once. + ModuleSet *m_loadedModules; // Contains information about all modules loaded in the process. + CriticalSection m_heapMapLock; // Serializes access to the heap and block maps. + SIZE_T m_maxDataDump; // Maximum number of user-data bytes to dump for each leaked block. + UINT32 m_maxTraceFrames; // Maximum number of frames per stack trace for each leaked block. + CriticalSection m_modulesLock; // Protects accesses to the "loaded modules" ModuleSet. + CriticalSection m_optionsLock; // Serializes access to the heap and block maps. + UINT32 m_options; // Configuration options. + + static patchentry_t m_kernelbasePatch []; + static patchentry_t m_kernel32Patch []; + static patchentry_t m_ntdllPatch []; + static patchentry_t m_ole32Patch []; + static moduleentry_t m_patchTable [50]; // Table of imports patched for attaching VLD to other modules. + FILE *m_reportFile; // File where the memory leak report may be sent to. + WCHAR m_reportFilePath [MAX_PATH]; // Full path and name of file to send memory leak report to. + const char *m_selfTestFile; // Filename where the memory leak self-test block is leaked. + int m_selfTestLine; // Line number where the memory leak self-test block is leaked. + UINT32 m_status; // Status flags: +#define VLD_STATUS_DBGHELPLINKED 0x1 // If set, the explicit dynamic link to the Debug Help Library succeeded. +#define VLD_STATUS_INSTALLED 0x2 // If set, VLD was successfully installed. +#define VLD_STATUS_NEVER_ENABLED 0x4 // If set, VLD started disabled, and has not yet been manually enabled. +#define VLD_STATUS_FORCE_REPORT_TO_FILE 0x8 // If set, the leak report is being forced to a file. + DWORD m_tlsIndex; // Thread-local storage index. + CriticalSection m_tlsLock; // Protects accesses to the Set of TLS structures. + TlsMap *m_tlsMap; // Set of all thread-local storage structures for the process. + HMODULE m_vldBase; // Visual Leak Detector's own module handle (base address). + + VOID __stdcall ChangeModuleState(HMODULE module, bool on); + static GetProcAddress_t m_GetProcAddress; + static GetProcessHeap_t m_GetProcessHeap; + static HeapCreate_t m_HeapCreate; +}; + + +// Configuration option default values +#define VLD_DEFAULT_MAX_DATA_DUMP 256 +#define VLD_DEFAULT_MAX_TRACE_FRAMES 64 +#define VLD_DEFAULT_REPORT_FILE_NAME L".\\memory_leak_report.txt" From 6edaac6cdf25b47b358b296aebf1593ba19d0c43 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 13 Mar 2014 02:01:17 +0400 Subject: [PATCH 163/321] Test fixed for static CRT --- tests/dynamic_app/LoadTests.cpp | 144 +++++++++++++++--------------- tests/dynamic_app/LoadTests.h | 4 +- tests/dynamic_app/dynamic_app.cpp | 14 +-- 3 files changed, 82 insertions(+), 80 deletions(-) diff --git a/tests/dynamic_app/LoadTests.cpp b/tests/dynamic_app/LoadTests.cpp index c6e0509f..9a6738f3 100644 --- a/tests/dynamic_app/LoadTests.cpp +++ b/tests/dynamic_app/LoadTests.cpp @@ -5,101 +5,99 @@ #include #ifdef _WIN64 - static const TCHAR* sVld_dll = _T("vld_x64.dll"); + static const TCHAR* sVld_dll = _T("vld_x64.dll"); #else - static const TCHAR* sVld_dll = _T("vld_x86.dll"); + static const TCHAR* sVld_dll = _T("vld_x86.dll"); #endif void CallVLDExportedMethod(const CHAR* function) { - HMODULE vld_module = GetModuleHandle(sVld_dll); - assert(vld_module); - typedef void (*VLDAPI_func)(); - if (vld_module != NULL) - { - VLDAPI_func func = (VLDAPI_func)GetProcAddress(vld_module, function); - assert(func); - if (func) - { - func(); - } - } + HMODULE vld_module = GetModuleHandle(sVld_dll); + assert(vld_module); + typedef void (*VLDAPI_func)(); + if (vld_module != NULL) + { + VLDAPI_func func = (VLDAPI_func)GetProcAddress(vld_module, function); + assert(func); + if (func) + { + func(); + } + } } void CallDynamicMethods(HMODULE module, const CHAR* function) { - typedef void (__cdecl *DYNAPI_FNC)(); - if (module != NULL) - { - DYNAPI_FNC func = (DYNAPI_FNC)GetProcAddress(module, function ); - //GetFormattedMessage(GetLastError()); - assert(func); - if (func) - { - func(); - } - } + typedef void (__cdecl *DYNAPI_FNC)(); + if (module != NULL) + { + DYNAPI_FNC func = (DYNAPI_FNC)GetProcAddress(module, function ); + //GetFormattedMessage(GetLastError()); + assert(func); + if (func) + { + func(); + } + } } -void RunLoaderTests( bool resolve ) +HMODULE RunLoaderTests(bool resolve) { - HMODULE hdyn = LoadLibrary(_T("dynamic.dll")); - assert(hdyn); - if (hdyn) - { - VLDEnableModule(hdyn); + HMODULE hdyn = LoadLibrary(_T("dynamic.dll")); + assert(hdyn); + if (hdyn) + { + VLDEnableModule(hdyn); - // Should leak 18 memory allocations in total - // These requires ansi, not Unicode strings - CallDynamicMethods(hdyn, "SimpleLeak_Malloc"); // leaks 6 - CallDynamicMethods(hdyn, "SimpleLeak_New"); // leaks 6 - CallDynamicMethods(hdyn, "SimpleLeak_New_Array"); // leaks 6 + // Should leak 18 memory allocations in total + // These requires ansi, not Unicode strings + CallDynamicMethods(hdyn, "SimpleLeak_Malloc"); // leaks 6 + CallDynamicMethods(hdyn, "SimpleLeak_New"); // leaks 6 + CallDynamicMethods(hdyn, "SimpleLeak_New_Array"); // leaks 6 - if (resolve) - { - CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings - } - - FreeLibrary(hdyn); - } + if (resolve) + { + CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings + } + } + return hdyn; } void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function ) { - HMODULE dynamic_module = hmfcLib; - assert(dynamic_module); - typedef void (__cdecl *DYNAPI_FNC)(); - if (dynamic_module != NULL) - { - DYNAPI_FNC func = (DYNAPI_FNC)GetProcAddress(dynamic_module, function ); - //GetFormattedMessage(GetLastError()); - assert(func); - if (func) - { - func(); - } - } + HMODULE dynamic_module = hmfcLib; + assert(dynamic_module); + typedef void (__cdecl *DYNAPI_FNC)(); + if (dynamic_module != NULL) + { + DYNAPI_FNC func = (DYNAPI_FNC)GetProcAddress(dynamic_module, function ); + //GetFormattedMessage(GetLastError()); + assert(func); + if (func) + { + func(); + } + } } -void RunMFCLoaderTests(bool resolve) +HMODULE RunMFCLoaderTests(bool resolve) { - HMODULE hmfcLib = LoadLibrary(_T("test_mfc.dll")); - assert(hmfcLib); - if (hmfcLib) - { - VLDEnableModule(hmfcLib); - // Should leak 7 memory allocations in total - // This requires ansi, not Unicode strings - CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // Leaks 4 - CallLibraryMethods(hmfcLib, "MFC_LeakArray"); // leaks 3 + HMODULE hmfcLib = LoadLibrary(_T("test_mfc.dll")); + assert(hmfcLib); + if (hmfcLib) + { + VLDEnableModule(hmfcLib); + // Should leak 7 memory allocations in total + // This requires ansi, not Unicode strings + CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // Leaks 4 + CallLibraryMethods(hmfcLib, "MFC_LeakArray"); // leaks 3 - if (resolve) - { - CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings - } - - FreeLibrary(hmfcLib); - } + if (resolve) + { + CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings + } + } + return hmfcLib; } diff --git a/tests/dynamic_app/LoadTests.h b/tests/dynamic_app/LoadTests.h index 208373c6..2ef4fd95 100644 --- a/tests/dynamic_app/LoadTests.h +++ b/tests/dynamic_app/LoadTests.h @@ -1,4 +1,4 @@ #pragma once -void RunLoaderTests( bool resolve ); -void RunMFCLoaderTests( bool resolve ); +HMODULE RunLoaderTests( bool resolve ); +HMODULE RunMFCLoaderTests( bool resolve ); diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index bc0d34b5..0e5c5a91 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -49,10 +49,11 @@ namespace tut { set_test_name("LoaderTests"); int prevleaks = (int)VLDGetLeaksCount(); - RunLoaderTests(resolve); // leaks 18 + HMODULE hmfcLib = RunLoaderTests(resolve); // leaks 18 int totalleaks = (int)VLDGetLeaksCount(); int leaks = totalleaks - prevleaks; - ensure("leaks", leaks == 18); + ensure("leaks", leaks == 18); + FreeLibrary(hmfcLib); } template<> @@ -61,10 +62,11 @@ namespace tut { set_test_name("MFCLoaderTests"); int prevleaks = (int) VLDGetLeaksCount(); - RunMFCLoaderTests(resolve); // leaks 11 + HMODULE hmfcLib = RunMFCLoaderTests(resolve); // leaks 11 int totalleaks = (int) VLDGetLeaksCount(); int leaks = totalleaks - prevleaks; ensure("leaks", leaks == 11); + FreeLibrary(hmfcLib); } template<> @@ -167,17 +169,19 @@ int _tmain(int argc, _TCHAR* argv[]) int tutleaks = (int)VLDGetLeaksCount(); int prevleaks = tutleaks; - RunLoaderTests(resolve); // leaks 18 + HMODULE hmfcLib = RunLoaderTests(resolve); // leaks 18 int totalleaks = (int)VLDGetLeaksCount(); int leaks1 = totalleaks - prevleaks; prevleaks = totalleaks; assert(leaks1 == 18); + FreeLibrary(hmfcLib); - RunMFCLoaderTests(resolve); // leaks 11 + hmfcLib = RunMFCLoaderTests(resolve); // leaks 11 totalleaks = (int)VLDGetLeaksCount(); int leaks2 = totalleaks - prevleaks; prevleaks = totalleaks; assert(leaks2 == 11); + FreeLibrary(hmfcLib); LeakDuplicateLeaks(); // leaks 6 totalleaks = (int)VLDGetLeaksCount(); From ba84cc313e8f974d41f8c34659c445b4f9665682 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 13 Mar 2014 02:31:35 +0400 Subject: [PATCH 164/321] Test fixed for mfc case --- tests/basics/basics.vcxproj | 12 ++++++------ tests/dynamic_app/ThreadTest.cpp | 3 ++- tests/dynamic_app/dynamic_app.cpp | 11 +++++++++++ tests/dynamic_app/dynamic_app.vcxproj | 12 ++++++------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index c2ea5efe..16f6de55 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -263,7 +263,7 @@ Use Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -306,7 +306,7 @@ Use Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) @@ -348,7 +348,7 @@ Use Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -391,7 +391,7 @@ Use Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) @@ -436,7 +436,7 @@ MaxSpeed true true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -481,7 +481,7 @@ MaxSpeed true true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) MultiThreaded diff --git a/tests/dynamic_app/ThreadTest.cpp b/tests/dynamic_app/ThreadTest.cpp index 828b9f2a..12630835 100644 --- a/tests/dynamic_app/ThreadTest.cpp +++ b/tests/dynamic_app/ThreadTest.cpp @@ -16,7 +16,8 @@ void RunPSApiLoaderTests() void Call_LoaderLocks(bool resolve) { RunPSApiLoaderTests(); // will not crash - RunMFCLoaderTests(resolve); // Leaks 11 allocs + HMODULE hmfcLib = RunMFCLoaderTests(resolve); // Leaks 11 allocs + FreeLibrary(hmfcLib); //HMODULE this_app = NULL; //WCHAR path_name[MAX_PATH] = {0}; diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 0e5c5a91..7b805a05 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -63,10 +63,15 @@ namespace tut set_test_name("MFCLoaderTests"); int prevleaks = (int) VLDGetLeaksCount(); HMODULE hmfcLib = RunMFCLoaderTests(resolve); // leaks 11 +#ifndef STATIC_CRT + FreeLibrary(hmfcLib); +#endif int totalleaks = (int) VLDGetLeaksCount(); int leaks = totalleaks - prevleaks; ensure("leaks", leaks == 11); +#ifdef STATIC_CRT FreeLibrary(hmfcLib); +#endif } template<> @@ -177,10 +182,16 @@ int _tmain(int argc, _TCHAR* argv[]) FreeLibrary(hmfcLib); hmfcLib = RunMFCLoaderTests(resolve); // leaks 11 +#ifndef STATIC_CRT + FreeLibrary(hmfcLib); +#endif totalleaks = (int)VLDGetLeaksCount(); int leaks2 = totalleaks - prevleaks; prevleaks = totalleaks; assert(leaks2 == 11); +#ifdef STATIC_CRT + FreeLibrary(hmfcLib); +#endif FreeLibrary(hmfcLib); LeakDuplicateLeaks(); // leaks 6 diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index 93069a7f..c5c5015a 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -283,7 +283,7 @@ exit /b 0 Level4 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -336,7 +336,7 @@ exit /b 0 Level4 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) @@ -384,7 +384,7 @@ exit /b 0 Level4 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -433,7 +433,7 @@ exit /b 0 Level4 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) @@ -487,7 +487,7 @@ exit /b 0 MaxSpeed true true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -540,7 +540,7 @@ exit /b 0 true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) MultiThreaded From 2c950e88ab23484a9680b04dcac590a6b7ee5da5 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 15 Mar 2014 00:30:21 +0400 Subject: [PATCH 165/321] `loading_modules` removed --- tests/loading_modules/loading_modules.vcxproj | 536 ------------------ .../loading_modules.vcxproj.filters | 33 -- tests/loading_modules/modules.cpp | 50 -- tests/loading_modules/stdafx.cpp | 8 - tests/loading_modules/stdafx.h | 16 - tests/loading_modules/targetver.h | 8 - 6 files changed, 651 deletions(-) delete mode 100644 tests/loading_modules/loading_modules.vcxproj delete mode 100644 tests/loading_modules/loading_modules.vcxproj.filters delete mode 100644 tests/loading_modules/modules.cpp delete mode 100644 tests/loading_modules/stdafx.cpp delete mode 100644 tests/loading_modules/stdafx.h delete mode 100644 tests/loading_modules/targetver.h diff --git a/tests/loading_modules/loading_modules.vcxproj b/tests/loading_modules/loading_modules.vcxproj deleted file mode 100644 index e0d9b21d..00000000 --- a/tests/loading_modules/loading_modules.vcxproj +++ /dev/null @@ -1,536 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {B86B0687-4C6B-454D-974E-4BDDB00B5BDC} - Win32Proj - loading_modules - loading_modules - - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - v120 - - - Application - true - Unicode - false - v120 - - - Application - true - Unicode - false - v120 - - - Application - true - Unicode - false - v120 - - - Application - true - Unicode - false - v120 - - - Application - false - true - Unicode - v120 - - - Application - false - true - Unicode - v120 - - - Application - false - true - Unicode - v120 - - - Application - false - true - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - \ No newline at end of file diff --git a/tests/loading_modules/loading_modules.vcxproj.filters b/tests/loading_modules/loading_modules.vcxproj.filters deleted file mode 100644 index 42b7c770..00000000 --- a/tests/loading_modules/loading_modules.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/tests/loading_modules/modules.cpp b/tests/loading_modules/modules.cpp deleted file mode 100644 index 0abc84ea..00000000 --- a/tests/loading_modules/modules.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "stdafx.h" -#include -#include -#include -#include - -UINT WINAPI ThreadProc1(LPVOID pParam) -{ - for (int i = 0; i < 10000; i++) - { - HMODULE hModule = ::LoadLibrary(_T("wtsapi32.dll")); - - if (NULL != hModule) - { - ::FreeLibrary(hModule); - hModule = NULL; - } - } - - return 0; -} - -UINT WINAPI ThreadProc2(LPVOID pParam) -{ - for (int i = 0; i < 10000; i++) - { - HMODULE hModule = ::LoadLibrary(_T("psapi.dll")); - - if (NULL != hModule) - { - ::FreeLibrary(hModule); - hModule = NULL; - } - } - - return 0; -} - -int _tmain(int argc, _TCHAR* argv[]) -{ - UINT nThreadID; - HANDLE hThread[2]; - - hThread[0] = (HANDLE) _beginthreadex(NULL, 0, ThreadProc1, NULL, 0, &nThreadID); - hThread[1] = (HANDLE) _beginthreadex(NULL, 0, ThreadProc2, NULL, 0, &nThreadID); - - ::WaitForMultipleObjects(2, hThread, TRUE, INFINITE); - - return 0; -} diff --git a/tests/loading_modules/stdafx.cpp b/tests/loading_modules/stdafx.cpp deleted file mode 100644 index 27f0ee01..00000000 --- a/tests/loading_modules/stdafx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// basics.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/tests/loading_modules/stdafx.h b/tests/loading_modules/stdafx.h deleted file mode 100644 index 686c8f5b..00000000 --- a/tests/loading_modules/stdafx.h +++ /dev/null @@ -1,16 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -#include "targetver.h" - -#include -#include -#include - - - -// TODO: reference additional headers your program requires here diff --git a/tests/loading_modules/targetver.h b/tests/loading_modules/targetver.h deleted file mode 100644 index 87c0086d..00000000 --- a/tests/loading_modules/targetver.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -// Including SDKDDKVer.h defines the highest available Windows platform. - -// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and -// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. - -#include From b5f982b63ae8c4bcf2aafd4c67d10e42da2fb586 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 16 Mar 2014 01:41:27 +0400 Subject: [PATCH 166/321] VS2010 solution updated --- tests/dynamic_app/ThreadTest.cpp | 2 + tests/suite/testsuite.vcxproj | 12 +- vld.vcxproj | 20 ++-- vld_vs10.sln | 193 ++++++++++++++++++++++--------- 4 files changed, 163 insertions(+), 64 deletions(-) diff --git a/tests/dynamic_app/ThreadTest.cpp b/tests/dynamic_app/ThreadTest.cpp index 12630835..c56a3c2a 100644 --- a/tests/dynamic_app/ThreadTest.cpp +++ b/tests/dynamic_app/ThreadTest.cpp @@ -17,7 +17,9 @@ void Call_LoaderLocks(bool resolve) { RunPSApiLoaderTests(); // will not crash HMODULE hmfcLib = RunMFCLoaderTests(resolve); // Leaks 11 allocs +#ifndef STATIC_CRT FreeLibrary(hmfcLib); +#endif //HMODULE this_app = NULL; //WCHAR path_name[MAX_PATH] = {0}; diff --git a/tests/suite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj index 61938799..4d5bcab6 100644 --- a/tests/suite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -53,10 +53,14 @@ {EE4A829C-5FD8-460B-8A90-B518B9BABB70} testsuite - SAK - SAK - SAK - SAK + + + + + + + + diff --git a/vld.vcxproj b/vld.vcxproj index d53c5565..64eb8534 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -21,10 +21,14 @@ {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} vld - SAK - SAK - SAK - SAK + + + + + + + + Unicode DynamicLibrary true @@ -55,7 +59,8 @@ ..\..\lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) - + + copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y @@ -179,7 +184,7 @@ - + @@ -188,5 +193,6 @@ - + + \ No newline at end of file diff --git a/vld_vs10.sln b/vld_vs10.sln index 3f2da38e..bc1d81a4 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -24,7 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "tests\dynami {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" ProjectSection(ProjectDependencies) = postProject @@ -39,126 +39,213 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" EndProject Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 5 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = https://tfs07.codeplex.com/ - SccLocalPath0 = . - SccProjectUniqueName1 = testsuite\\testsuite.vcxproj - SccProjectName1 = testsuite - SccLocalPath1 = testsuite - SccProjectUniqueName2 = vld.vcxproj - SccLocalPath2 = . - SccProjectUniqueName3 = VSIXInstaller\\VSIXInstaller.csproj - SccProjectName3 = VSIXInstaller - SccLocalPath3 = VSIXInstaller - SccProjectUniqueName4 = VLDPackage\\VLDPackage.csproj - SccProjectName4 = VLDPackage - SccLocalPath4 = VLDPackage - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug(Release)|Win32 = Debug(Release)|Win32 - Debug(Release)|x64 = Debug(Release)|x64 + Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 + Debug_StaticCrt|x64 = Debug_StaticCrt|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + DebugRelease_StaticCrt|Win32 = DebugRelease_StaticCrt|Win32 + DebugRelease_StaticCrt|x64 = DebugRelease_StaticCrt|x64 + DebugRelease|Win32 = DebugRelease|Win32 + DebugRelease|x64 = DebugRelease|x64 + Release_StaticCrt|Win32 = Release_StaticCrt|Win32 + Release_StaticCrt|x64 = Release_StaticCrt|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.Build.0 = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -166,10 +253,10 @@ Global GlobalSection(NestedProjects) = preSolution {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} EndGlobalSection From 008a187b2d099daf831a59a614ddd8ac86c0dfb2 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 16 Mar 2014 02:01:59 +0400 Subject: [PATCH 167/321] _HeapReAlloc crash fixed after d84107cda2 --- tests/basics/basics.vcxproj | 60 +++++++++++++++++++++------ tests/dynamic_app/dynamic_app.vcxproj | 12 +++--- vld_hooks.cpp | 4 -- 3 files changed, 54 insertions(+), 22 deletions(-) diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index 16f6de55..f7eef908 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -254,7 +254,10 @@ %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -276,7 +279,10 @@ %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -297,7 +303,10 @@ %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -318,7 +327,10 @@ %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -339,7 +351,10 @@ %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -361,7 +376,10 @@ %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -382,7 +400,10 @@ %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -403,7 +424,10 @@ %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -425,7 +449,10 @@ $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -448,7 +475,10 @@ $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +"$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -470,7 +500,10 @@ $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies @@ -493,7 +526,10 @@ $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +exit /b 0 Copying over Visual Leak Detector Dependencies diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index c5c5015a..ae0cd15c 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -373,7 +373,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -398,7 +398,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -422,7 +422,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -446,7 +446,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -529,7 +529,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -556,7 +556,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test +if "%processor_architecture%"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies diff --git a/vld_hooks.cpp b/vld_hooks.cpp index fb02d861..53911083 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -1699,9 +1699,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID if (firstcall) { firstAllocCall(tls); - std::unique_ptr &callStack = tls->pblockInfo->callStack; tls->pblockInfo = NULL; - callStack.reset(); } return newmem; @@ -1744,9 +1742,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S if (firstcall) { firstAllocCall(tls); - std::unique_ptr &callStack = tls->pblockInfo->callStack; tls->pblockInfo = NULL; - callStack.reset(); } return newmem; From ff9241dfd184bdeeb5062792a92db26f34b7239c Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 16 Mar 2014 02:15:39 +0400 Subject: [PATCH 168/321] Test group changed --- tests/basics/basics.cpp | 464 +++++++++--------- tests/dynamic_app/dynamic_app.cpp | 6 +- tests/suite/testsuite.cpp | 762 +++++++++++++++--------------- 3 files changed, 622 insertions(+), 610 deletions(-) diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index b04cc9cb..555f38c1 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -11,267 +11,271 @@ void LeakMemory(LeakOption type, int repeat, bool bFree) { - for (int i = 0; i < repeat; i++) - { - Alloc(type, bFree); - } + for (int i = 0; i < repeat; i++) + { + Alloc(type, bFree); + } } namespace tut { - struct test - { - virtual ~test() - { - } - }; + struct test + { + virtual ~test() + { + } + }; - typedef test_group tg; - typedef tg::object object; - tg basic_group("basic"); + typedef test_group tg; + typedef tg::object object; +#ifdef _M_IX86 + tg basic_group("basic_x86"); +#else + tg basic_group("basic_x64"); +#endif - static const int repeat = 10; + static const int repeat = 10; - template<> - template<> - void object::test<1>() - { - set_test_name("Malloc"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eMalloc,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } + template<> + template<> + void object::test<1>() + { + set_test_name("Malloc"); + int prev = (int)VLDGetLeaksCount(); + LeakMemory(eMalloc,repeat,false); + int leaks = (int)VLDGetLeaksCount() - prev; + ensure("leaks", leaks == (repeat * 2)); + } - template<> - template<> - void object::test<2>() - { - set_test_name("New"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eNew,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } + template<> + template<> + void object::test<2>() + { + set_test_name("New"); + int prev = (int)VLDGetLeaksCount(); + LeakMemory(eNew,repeat,false); + int leaks = (int)VLDGetLeaksCount() - prev; + ensure("leaks", leaks == (repeat * 2)); + } - template<> - template<> - void object::test<3>() - { - set_test_name("NewArray"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eNewArray,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } + template<> + template<> + void object::test<3>() + { + set_test_name("NewArray"); + int prev = (int)VLDGetLeaksCount(); + LeakMemory(eNewArray,repeat,false); + int leaks = (int)VLDGetLeaksCount() - prev; + ensure("leaks", leaks == (repeat * 2)); + } - template<> - template<> - void object::test<4>() - { - set_test_name("Calloc"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eCalloc,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } + template<> + template<> + void object::test<4>() + { + set_test_name("Calloc"); + int prev = (int)VLDGetLeaksCount(); + LeakMemory(eCalloc,repeat,false); + int leaks = (int)VLDGetLeaksCount() - prev; + ensure("leaks", leaks == (repeat * 2)); + } - template<> - template<> - void object::test<5>() - { - set_test_name("Realloc"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eRealloc,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } + template<> + template<> + void object::test<5>() + { + set_test_name("Realloc"); + int prev = (int)VLDGetLeaksCount(); + LeakMemory(eRealloc,repeat,false); + int leaks = (int)VLDGetLeaksCount() - prev; + ensure("leaks", leaks == (repeat * 2)); + } - template<> - template<> - void object::test<6>() - { - set_test_name("CoTaskMem"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eCoTaskMem,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 1)); - } + template<> + template<> + void object::test<6>() + { + set_test_name("CoTaskMem"); + int prev = (int)VLDGetLeaksCount(); + LeakMemory(eCoTaskMem,repeat,false); + int leaks = (int)VLDGetLeaksCount() - prev; + ensure("leaks", leaks == (repeat * 1)); + } - template<> - template<> - void object::test<7>() - { - set_test_name("AlignedMalloc"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eAlignedMalloc,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 3)); - } + template<> + template<> + void object::test<7>() + { + set_test_name("AlignedMalloc"); + int prev = (int)VLDGetLeaksCount(); + LeakMemory(eAlignedMalloc,repeat,false); + int leaks = (int)VLDGetLeaksCount() - prev; + ensure("leaks", leaks == (repeat * 3)); + } - template<> - template<> - void object::test<8>() - { - set_test_name("AlignedRealloc"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eAlignedRealloc,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 3)); - } + template<> + template<> + void object::test<8>() + { + set_test_name("AlignedRealloc"); + int prev = (int)VLDGetLeaksCount(); + LeakMemory(eAlignedRealloc,repeat,false); + int leaks = (int)VLDGetLeaksCount() - prev; + ensure("leaks", leaks == (repeat * 3)); + } - template<> - template<> - void object::test<9>() - { - set_test_name("Strdup"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eStrdup,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 4)); - } + template<> + template<> + void object::test<9>() + { + set_test_name("Strdup"); + int prev = (int)VLDGetLeaksCount(); + LeakMemory(eStrdup,repeat,false); + int leaks = (int)VLDGetLeaksCount() - prev; + ensure("leaks", leaks == (repeat * 4)); + } - test_runner_singleton runner; + test_runner_singleton runner; } int RunAllTest() { - using namespace std; - tut::console_reporter reporter(std::cout); - tut::runner.get().set_callback(&reporter); + using namespace std; + tut::console_reporter reporter(std::cout); + tut::runner.get().set_callback(&reporter); - try - { - tut::runner.get().run_tests(); - if(reporter.all_ok()) - { - return 0; - } - else - { - std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; - } - } - catch(const tut::no_such_group &ex) - { - std::cerr << "No such group: " << ex.what() << std::endl; - } - catch(const tut::no_such_test &ex) - { - std::cerr << "No such test: " << ex.what() << std::endl; - } - catch(const tut::tut_error &ex) - { - std::cout << "General error: " << ex.what() << std::endl; - } - return 1; + try + { + tut::runner.get().run_tests(); + if(reporter.all_ok()) + { + return 0; + } + else + { + std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; + } + } + catch(const tut::no_such_group &ex) + { + std::cerr << "No such group: " << ex.what() << std::endl; + } + catch(const tut::no_such_test &ex) + { + std::cerr << "No such test: " << ex.what() << std::endl; + } + catch(const tut::tut_error &ex) + { + std::cout << "General error: " << ex.what() << std::endl; + } + return 1; } void PrintUsage() { - wprintf(_T("Usage:\n")); - wprintf(_T("\ttest_basics \n")); - wprintf(_T("\t - The type of memory allocation to test with. This can be one of the following:\n")); - wprintf(_T("\t [malloc,new,new_array,calloc,realloc,CoTaskMem,AlignedMalloc,AlignedRealloc,strdup,all]\n")); - wprintf(_T("\t - The number of times to repeat each unique memory leak.\n\n")); + wprintf(_T("Usage:\n")); + wprintf(_T("\ttest_basics \n")); + wprintf(_T("\t - The type of memory allocation to test with. This can be one of the following:\n")); + wprintf(_T("\t [malloc,new,new_array,calloc,realloc,CoTaskMem,AlignedMalloc,AlignedRealloc,strdup,all]\n")); + wprintf(_T("\t - The number of times to repeat each unique memory leak.\n\n")); } int _tmain(int argc, _TCHAR* argv[]) { - if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) - return RunAllTest(); + if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) + return RunAllTest(); - wprintf(_T("======================================\n")); - wprintf(_T("==\n")); - wprintf(_T("== VLD Tests: basics\n")); - wprintf(_T("==\n")); - wprintf(_T("======================================\n")); - bool bFree = false; - if (argc >= 3) - { - bool checkAll = false; - LeakOption leak_type = eMalloc; // default - int multiplayer = 2; - - // Pick up options to determine which type of memory allocator - // to test with - if (_tcsicmp(_T("malloc"), argv[1]) == 0) - { - leak_type = eMalloc; - } - else if (_tcsicmp(_T("new"), argv[1]) == 0) - { - leak_type = eNew; - } - else if (_tcsicmp(_T("new_array"), argv[1]) == 0) - { - leak_type = eNewArray; - } - else if (_tcsicmp(_T("calloc"), argv[1]) == 0) - { - leak_type = eCalloc; - } - else if (_tcsicmp(_T("realloc"), argv[1]) == 0) - { - leak_type = eRealloc; - } - else if (_tcsicmp(_T("CoTaskMem"), argv[1]) == 0) - { - leak_type = eCoTaskMem; - multiplayer = 1; - } - else if (_tcsicmp(_T("AlignedMalloc"), argv[1]) == 0) - { - leak_type = eAlignedMalloc; - multiplayer = 3; - } - else if (_tcsicmp(_T("AlignedRealloc"), argv[1]) == 0) - { - leak_type = eAlignedRealloc; - multiplayer = 3; - } - else if (_tcsicmp(_T("strdup"), argv[1]) == 0) - { - leak_type = eStrdup; - multiplayer = 4; - } - else if (_tcsicmp(_T("all"), argv[1]) == 0) - { - checkAll = true; - multiplayer = 21; - } - else - { - wprintf(_T("Error!: Invalid arguments\n")); - PrintUsage(); - return -1; - } + wprintf(_T("======================================\n")); + wprintf(_T("==\n")); + wprintf(_T("== VLD Tests: basics\n")); + wprintf(_T("==\n")); + wprintf(_T("======================================\n")); + bool bFree = false; + if (argc >= 3) + { + bool checkAll = false; + LeakOption leak_type = eMalloc; // default + int multiplayer = 2; + + // Pick up options to determine which type of memory allocator + // to test with + if (_tcsicmp(_T("malloc"), argv[1]) == 0) + { + leak_type = eMalloc; + } + else if (_tcsicmp(_T("new"), argv[1]) == 0) + { + leak_type = eNew; + } + else if (_tcsicmp(_T("new_array"), argv[1]) == 0) + { + leak_type = eNewArray; + } + else if (_tcsicmp(_T("calloc"), argv[1]) == 0) + { + leak_type = eCalloc; + } + else if (_tcsicmp(_T("realloc"), argv[1]) == 0) + { + leak_type = eRealloc; + } + else if (_tcsicmp(_T("CoTaskMem"), argv[1]) == 0) + { + leak_type = eCoTaskMem; + multiplayer = 1; + } + else if (_tcsicmp(_T("AlignedMalloc"), argv[1]) == 0) + { + leak_type = eAlignedMalloc; + multiplayer = 3; + } + else if (_tcsicmp(_T("AlignedRealloc"), argv[1]) == 0) + { + leak_type = eAlignedRealloc; + multiplayer = 3; + } + else if (_tcsicmp(_T("strdup"), argv[1]) == 0) + { + leak_type = eStrdup; + multiplayer = 4; + } + else if (_tcsicmp(_T("all"), argv[1]) == 0) + { + checkAll = true; + multiplayer = 21; + } + else + { + wprintf(_T("Error!: Invalid arguments\n")); + PrintUsage(); + return -1; + } - if (argc >= 4 && _tcsicmp(_T("free"), argv[3]) == 0) - bFree = true; + if (argc >= 4 && _tcsicmp(_T("free"), argv[3]) == 0) + bFree = true; - wprintf(_T("Options: %s \nNumber of Leaks: %s\n"), argv[1], argv[2]); - // Convert the string into it's integer equivalent - int prevleaks = (int)VLDGetLeaksCount(); - int repeat = _tstoi(argv[2]); - if (!checkAll) - LeakMemory(leak_type,repeat,bFree); - else - { - for (int leak_type = 0; leak_type < eCount; leak_type++) - LeakMemory((LeakOption)leak_type,repeat,bFree); - } - int leaks = (int)VLDGetLeaksCount() - prevleaks; - wprintf(_T("End of test app...\n\n")); - int diff = repeat * multiplayer - leaks; - return bFree ? leaks : diff; - } - else - { - wprintf(_T("Error!: Invalid arguments\n")); - PrintUsage(); - wprintf(_T("End of test app...\n\n")); - return -1; - } + wprintf(_T("Options: %s \nNumber of Leaks: %s\n"), argv[1], argv[2]); + // Convert the string into it's integer equivalent + int prevleaks = (int)VLDGetLeaksCount(); + int repeat = _tstoi(argv[2]); + if (!checkAll) + LeakMemory(leak_type,repeat,bFree); + else + { + for (int leak_type = 0; leak_type < eCount; leak_type++) + LeakMemory((LeakOption)leak_type,repeat,bFree); + } + int leaks = (int)VLDGetLeaksCount() - prevleaks; + wprintf(_T("End of test app...\n\n")); + int diff = repeat * multiplayer - leaks; + return bFree ? leaks : diff; + } + else + { + wprintf(_T("Error!: Invalid arguments\n")); + PrintUsage(); + wprintf(_T("End of test app...\n\n")); + return -1; + } } diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 7b805a05..361a84df 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -39,7 +39,11 @@ namespace tut typedef test_group tg; typedef tg::object object; - tg dynamic_group("dynamic"); +#ifdef _M_IX86 + tg dynamic_group("dynamic_x86"); +#else + tg dynamic_group("dynamic_x64"); +#endif static const bool resolve = false; diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index b8b30e20..27b07481 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -41,15 +41,15 @@ enum action_e { - a_calloc, - a_comalloc, - a_getprocmalloc, - a_heapalloc, - a_icomalloc, - a_ignored, - a_malloc, - a_new, - numactions + a_calloc, + a_comalloc, + a_getprocmalloc, + a_heapalloc, + a_icomalloc, + a_ignored, + a_malloc, + a_new, + numactions }; // Name of the debug C Runtime Library DLL on this system @@ -90,19 +90,19 @@ static const int NUMTHREADS = 63; // Number of threads to run simulta #define ONCEINAWHILE 10 // Free a random block approx. once every... struct blockholder_t { - PVOID block; - action_e action; - bool leak; + PVOID block; + action_e action; + bool leak; }; typedef void* (__cdecl *free_t) (void* mem); typedef void* (__cdecl *malloc_t) (size_t size); struct threadcontext_t { - UINT index; - BOOL leaky; - DWORD seed; - unsigned threadid; + UINT index; + BOOL leaky; + DWORD seed; + unsigned threadid; }; __declspec(thread) blockholder_t blocks [MAXBLOCKS]; @@ -118,406 +118,410 @@ volatile LONG leaks_count = 0; ULONG random (ULONG max) { - FLOAT d; - FLOAT r; - ULONG v; - - r = ((FLOAT)rand()) / ((FLOAT)RAND_MAX); - r *= ((FLOAT)max); - d = r - ((ULONG)r); - if (d >= 0.5) { - v = ((ULONG)r) + 1; - } - else { - v = (ULONG)r; - } - - return v; + FLOAT d; + FLOAT r; + ULONG v; + + r = ((FLOAT)rand()) / ((FLOAT)RAND_MAX); + r *= ((FLOAT)max); + d = r - ((ULONG)r); + if (d >= 0.5) { + v = ((ULONG)r) + 1; + } + else { + v = (ULONG)r; + } + + return v; } VOID allocateblock (action_e action, SIZE_T size) { - HMODULE crt; - ULONG index; - ULONG index2; - LPCSTR name; - PVOID *pblock; - HRESULT status; - - // Find the first unused index. - index = freeBlock; - for (index2 = freeBlock + 1; index2 < MAXBLOCKS; index2++) { - if (blocks[index2].block == NULL) { - freeBlock = index2; - break; - } - } - blocks[index].action = action; - - // Now do the randomized allocation. - pblock = &blocks[index].block; - switch (action) { - case a_calloc: - name = "calloc"; - *pblock = calloc(1, size); - break; - - case a_comalloc: - name = "CoTaskMemAlloc"; - *pblock = CoTaskMemAlloc(size); - break; - - case a_getprocmalloc: - name = "GetProcAddress"; - if (pmalloc == NULL) { - crt = LoadLibrary(CRTDLLNAME); - assert(crt != NULL); - pmalloc = (malloc_t)GetProcAddress(crt, "malloc"); - assert(pmalloc != NULL); - } - *pblock = pmalloc(size); - break; - - case a_heapalloc: - name = "HeapAlloc"; - if (threadheap == NULL) { - threadheap = HeapCreate(0x0, 0, 0); - } - *pblock = HeapAlloc(threadheap, 0x0, size); - break; - - case a_icomalloc: - name = "IMalloc"; - if (imalloc == NULL) { - status = CoGetMalloc(1, &imalloc); - assert(status == S_OK); - } - *pblock = imalloc->Alloc(size); - break; - - case a_ignored: - name = "Ignored"; - VLDDisable(); - *pblock = malloc(size); - VLDRestore(); - break; - - case a_malloc: - name = "malloc"; - *pblock = malloc(size); - break; - - case a_new: - name = "new"; - *pblock = new BYTE [size]; - break; - - default: - assert(FALSE); - } - counts[action]++; - total_allocs++; - - strncpy_s((char*)*pblock, size, name, _TRUNCATE); + HMODULE crt; + ULONG index; + ULONG index2; + LPCSTR name; + PVOID *pblock; + HRESULT status; + + // Find the first unused index. + index = freeBlock; + for (index2 = freeBlock + 1; index2 < MAXBLOCKS; index2++) { + if (blocks[index2].block == NULL) { + freeBlock = index2; + break; + } + } + blocks[index].action = action; + + // Now do the randomized allocation. + pblock = &blocks[index].block; + switch (action) { + case a_calloc: + name = "calloc"; + *pblock = calloc(1, size); + break; + + case a_comalloc: + name = "CoTaskMemAlloc"; + *pblock = CoTaskMemAlloc(size); + break; + + case a_getprocmalloc: + name = "GetProcAddress"; + if (pmalloc == NULL) { + crt = LoadLibrary(CRTDLLNAME); + assert(crt != NULL); + pmalloc = (malloc_t)GetProcAddress(crt, "malloc"); + assert(pmalloc != NULL); + } + *pblock = pmalloc(size); + break; + + case a_heapalloc: + name = "HeapAlloc"; + if (threadheap == NULL) { + threadheap = HeapCreate(0x0, 0, 0); + } + *pblock = HeapAlloc(threadheap, 0x0, size); + break; + + case a_icomalloc: + name = "IMalloc"; + if (imalloc == NULL) { + status = CoGetMalloc(1, &imalloc); + assert(status == S_OK); + } + *pblock = imalloc->Alloc(size); + break; + + case a_ignored: + name = "Ignored"; + VLDDisable(); + *pblock = malloc(size); + VLDRestore(); + break; + + case a_malloc: + name = "malloc"; + *pblock = malloc(size); + break; + + case a_new: + name = "new"; + *pblock = new BYTE [size]; + break; + + default: + assert(FALSE); + } + counts[action]++; + total_allocs++; + + strncpy_s((char*)*pblock, size, name, _TRUNCATE); } VOID freeblock (ULONG index) { - PVOID block; - HMODULE crt; - - block = blocks[index].block; - switch (blocks[index].action) { - case a_calloc: - free(block); - break; - - case a_comalloc: - CoTaskMemFree(block); - break; - - case a_getprocmalloc: - if (pfree == NULL) { - crt = GetModuleHandle(CRTDLLNAME); - assert(crt != NULL); - pfree = (free_t)GetProcAddress(crt, "free"); - assert(pfree != NULL); - } - pfree(block); - break; - - case a_heapalloc: - HeapFree(threadheap, 0x0, block); - break; - - case a_icomalloc: - imalloc->Free(block); - break; - - case a_ignored: - free(block); - break; - - case a_malloc: - free(block); - break; - - case a_new: - delete [] block; - break; - - default: - assert(FALSE); - } - blocks[index].block = NULL; - if (index < freeBlock) - freeBlock = index; - counts[blocks[index].action]--; - total_allocs--; + PVOID block; + HMODULE crt; + + block = blocks[index].block; + switch (blocks[index].action) { + case a_calloc: + free(block); + break; + + case a_comalloc: + CoTaskMemFree(block); + break; + + case a_getprocmalloc: + if (pfree == NULL) { + crt = GetModuleHandle(CRTDLLNAME); + assert(crt != NULL); + pfree = (free_t)GetProcAddress(crt, "free"); + assert(pfree != NULL); + } + pfree(block); + break; + + case a_heapalloc: + HeapFree(threadheap, 0x0, block); + break; + + case a_icomalloc: + imalloc->Free(block); + break; + + case a_ignored: + free(block); + break; + + case a_malloc: + free(block); + break; + + case a_new: + delete [] block; + break; + + default: + assert(FALSE); + } + blocks[index].block = NULL; + if (index < freeBlock) + freeBlock = index; + counts[blocks[index].action]--; + total_allocs--; } VOID recursivelyallocate (UINT depth, action_e action, SIZE_T size) { - if (depth == 0) { - allocateblock(action, size); - } - else { - recursivelyallocate(depth - 1, action, size); - } + if (depth == 0) { + allocateblock(action, size); + } + else { + recursivelyallocate(depth - 1, action, size); + } } unsigned __stdcall threadproc_test (LPVOID param) { - threadcontext_t* context = (threadcontext_t*)param; - assert(context); - - srand(context->seed); - - for (ULONG index = 0; index < MAXBLOCKS; index++) { - blocks[index].block = NULL; - blocks[index].leak = FALSE; - } - - BOOL allocate_more = TRUE; - while (allocate_more == TRUE) { - // Select a random allocation action and a random size. - action_e action = (action_e)random(numactions - 1); - SIZE_T size = random(MAXSIZE); - if (size < MINSIZE) { - size = MINSIZE; - } - if (counts[action] == MAXALLOC) { - // We've done enough of this type of allocation. Select another. - continue; - } - - // Allocate a block, using recursion to build up a stack of random - // depth. - UINT depth = random(MAXDEPTH); - if (depth < MINDEPTH) { - depth = MINDEPTH; - } - recursivelyallocate(depth, action, size); - - // Every once in a while, free a random block. - if (random(ONCEINAWHILE) == ONCEINAWHILE) { - ULONG index = random(total_allocs); - if (blocks[index].block != NULL) { - freeblock(index); - } - } - - // See if we have allocated enough blocks using each type of action. - for (USHORT action_index = 0; action_index < numactions; action_index++) { - if (counts[action_index] < MAXALLOC) { - allocate_more = TRUE; - break; - } - allocate_more = FALSE; - } - } - - if (context->leaky == TRUE) { - // This is the leaky thread. Randomly select one block to be leaked from - // each type of allocation action. - for (USHORT action_index = 0; action_index < numactions; action_index++) { - UINT leaks_selected = 0; - do { - ULONG index = random(MAXBLOCKS); - if (!blocks[index].leak && (blocks[index].block != NULL) && (blocks[index].action == (action_e)action_index)) { - blocks[index].leak = TRUE; - leaks_selected++; - if (blocks[index].action != a_ignored) - InterlockedIncrement(&leaks_count); - } - } while (leaks_selected < (1 + NUMDUPLEAKS)); - } - } - - // Free all blocks except for those marked as leaks. - for (ULONG index = 0; index < MAXBLOCKS; index++) { - if ((blocks[index].block != NULL) && (blocks[index].leak == FALSE)) { - freeblock(index); - } - } - - // Do a sanity check. - if (context->leaky == TRUE) { - assert(total_allocs == (numactions * (1 + NUMDUPLEAKS))); - } - else { - assert(total_allocs == 0); - } - - return 0; + threadcontext_t* context = (threadcontext_t*)param; + assert(context); + + srand(context->seed); + + for (ULONG index = 0; index < MAXBLOCKS; index++) { + blocks[index].block = NULL; + blocks[index].leak = FALSE; + } + + BOOL allocate_more = TRUE; + while (allocate_more == TRUE) { + // Select a random allocation action and a random size. + action_e action = (action_e)random(numactions - 1); + SIZE_T size = random(MAXSIZE); + if (size < MINSIZE) { + size = MINSIZE; + } + if (counts[action] == MAXALLOC) { + // We've done enough of this type of allocation. Select another. + continue; + } + + // Allocate a block, using recursion to build up a stack of random + // depth. + UINT depth = random(MAXDEPTH); + if (depth < MINDEPTH) { + depth = MINDEPTH; + } + recursivelyallocate(depth, action, size); + + // Every once in a while, free a random block. + if (random(ONCEINAWHILE) == ONCEINAWHILE) { + ULONG index = random(total_allocs); + if (blocks[index].block != NULL) { + freeblock(index); + } + } + + // See if we have allocated enough blocks using each type of action. + for (USHORT action_index = 0; action_index < numactions; action_index++) { + if (counts[action_index] < MAXALLOC) { + allocate_more = TRUE; + break; + } + allocate_more = FALSE; + } + } + + if (context->leaky == TRUE) { + // This is the leaky thread. Randomly select one block to be leaked from + // each type of allocation action. + for (USHORT action_index = 0; action_index < numactions; action_index++) { + UINT leaks_selected = 0; + do { + ULONG index = random(MAXBLOCKS); + if (!blocks[index].leak && (blocks[index].block != NULL) && (blocks[index].action == (action_e)action_index)) { + blocks[index].leak = TRUE; + leaks_selected++; + if (blocks[index].action != a_ignored) + InterlockedIncrement(&leaks_count); + } + } while (leaks_selected < (1 + NUMDUPLEAKS)); + } + } + + // Free all blocks except for those marked as leaks. + for (ULONG index = 0; index < MAXBLOCKS; index++) { + if ((blocks[index].block != NULL) && (blocks[index].leak == FALSE)) { + freeblock(index); + } + } + + // Do a sanity check. + if (context->leaky == TRUE) { + assert(total_allocs == (numactions * (1 + NUMDUPLEAKS))); + } + else { + assert(total_allocs == 0); + } + + return 0; } void RunTestSuite() { - threadcontext_t contexts [NUMTHREADS]; - - // Select a random thread to be the leaker. - UINT leakythread = random(NUMTHREADS - 1); - HANDLE threads[NUMTHREADS] = {0}; - - for (UINT index = 0; index < NUMTHREADS; ++index) { - contexts[index].index = index; - if (index == leakythread) - contexts[index].leaky = TRUE; - else - contexts[index].leaky = FALSE; - contexts[index].seed = random(RAND_MAX); - HANDLE hthread = (HANDLE)_beginthreadex(NULL, 0, threadproc_test, &contexts[index], 0, &contexts[index].threadid); - threads[index] = hthread; - } - - // Wait for all threads to terminate. - BOOL wait_for_all = TRUE; - DWORD result = WaitForMultipleObjects(NUMTHREADS, threads, wait_for_all, INFINITE); - switch (result) - { - case WAIT_OBJECT_0: - _tprintf(_T("All threads finished correctly.\n")); - break; - case WAIT_ABANDONED_0: - _tprintf(_T("Abandoned mutex.\n")); - break; - case WAIT_TIMEOUT: - _tprintf(_T("All threads timed out\n")); - break; - case WAIT_FAILED: - { - _tprintf(_T("Function call to Wait failed with unknown error\n")); - TCHAR lpMsgBuf[MAX_PATH] = {0}; - FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - lpMsgBuf, - MAX_PATH, - NULL ); - - _tprintf(_T("%s"), lpMsgBuf); - } - - break; - default: - _tprintf(_T("Some other return value\n")); - break; - } + threadcontext_t contexts [NUMTHREADS]; + + // Select a random thread to be the leaker. + UINT leakythread = random(NUMTHREADS - 1); + HANDLE threads[NUMTHREADS] = {0}; + + for (UINT index = 0; index < NUMTHREADS; ++index) { + contexts[index].index = index; + if (index == leakythread) + contexts[index].leaky = TRUE; + else + contexts[index].leaky = FALSE; + contexts[index].seed = random(RAND_MAX); + HANDLE hthread = (HANDLE)_beginthreadex(NULL, 0, threadproc_test, &contexts[index], 0, &contexts[index].threadid); + threads[index] = hthread; + } + + // Wait for all threads to terminate. + BOOL wait_for_all = TRUE; + DWORD result = WaitForMultipleObjects(NUMTHREADS, threads, wait_for_all, INFINITE); + switch (result) + { + case WAIT_OBJECT_0: + _tprintf(_T("All threads finished correctly.\n")); + break; + case WAIT_ABANDONED_0: + _tprintf(_T("Abandoned mutex.\n")); + break; + case WAIT_TIMEOUT: + _tprintf(_T("All threads timed out\n")); + break; + case WAIT_FAILED: + { + _tprintf(_T("Function call to Wait failed with unknown error\n")); + TCHAR lpMsgBuf[MAX_PATH] = {0}; + FormatMessage( + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + lpMsgBuf, + MAX_PATH, + NULL ); + + _tprintf(_T("%s"), lpMsgBuf); + } + + break; + default: + _tprintf(_T("Some other return value\n")); + break; + } } namespace tut { - struct test - { - virtual ~test() - { - } - }; - - typedef test_group tg; - typedef tg::object object; - tg dynamic_group("TestSuite"); - - static const bool resolve = false; - - template<> - template<> - void object::test<1>() - { - set_test_name("MultiThread"); - int prevleaks = (int)VLDGetLeaksCount(); - RunTestSuite(); - int leaks = (int)VLDGetLeaksCount() - prevleaks; - ensure("leaks", leaks == leaks_count); - } - - test_runner_singleton runner; + struct test + { + virtual ~test() + { + } + }; + + typedef test_group tg; + typedef tg::object object; +#ifdef _M_IX86 + tg dynamic_group("TestSuite_x86"); +#else + tg dynamic_group("TestSuite_x64"); +#endif + + static const bool resolve = false; + + template<> + template<> + void object::test<1>() + { + set_test_name("MultiThread"); + int prevleaks = (int)VLDGetLeaksCount(); + RunTestSuite(); + int leaks = (int)VLDGetLeaksCount() - prevleaks; + ensure("leaks", leaks == leaks_count); + } + + test_runner_singleton runner; } int RunAllTest() { - using namespace std; - tut::console_reporter reporter(std::cout); - tut::runner.get().set_callback(&reporter); - - try - { - tut::runner.get().run_tests(); - if(reporter.all_ok()) - { - return 0; - } - else - { - std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; - } - } - catch(const tut::no_such_group &ex) - { - std::cerr << "No such group: " << ex.what() << std::endl; - } - catch(const tut::no_such_test &ex) - { - std::cerr << "No such test: " << ex.what() << std::endl; - } - catch(const tut::tut_error &ex) - { - std::cout << "General error: " << ex.what() << std::endl; - } - return 1; + using namespace std; + tut::console_reporter reporter(std::cout); + tut::runner.get().set_callback(&reporter); + + try + { + tut::runner.get().run_tests(); + if(reporter.all_ok()) + { + return 0; + } + else + { + std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; + } + } + catch(const tut::no_such_group &ex) + { + std::cerr << "No such group: " << ex.what() << std::endl; + } + catch(const tut::no_such_test &ex) + { + std::cerr << "No such test: " << ex.what() << std::endl; + } + catch(const tut::tut_error &ex) + { + std::cout << "General error: " << ex.what() << std::endl; + } + return 1; } int main (int argc, char *argv []) { - if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) - return RunAllTest(); + if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) + return RunAllTest(); - _tprintf(_T("======================================\n")); - _tprintf(_T("==\n")); - _tprintf(_T("== VLD Tests: thread suite\n")); - _tprintf(_T("==\n")); - _tprintf(_T("======================================\n")); + _tprintf(_T("======================================\n")); + _tprintf(_T("==\n")); + _tprintf(_T("== VLD Tests: thread suite\n")); + _tprintf(_T("==\n")); + _tprintf(_T("======================================\n")); - int prevleaks = (int)VLDGetLeaksCount(); - DWORD start = GetTickCount(); - srand(start); + int prevleaks = (int)VLDGetLeaksCount(); + DWORD start = GetTickCount(); + srand(start); - RunTestSuite(); + RunTestSuite(); - DWORD end = GetTickCount(); - static const int MESSAGESIZE = 512; - char message [MESSAGESIZE] = {0}; - _snprintf_s(message, MESSAGESIZE, _TRUNCATE, "Elapsed Time = %ums\n", end - start); - OutputDebugString(message); + DWORD end = GetTickCount(); + static const int MESSAGESIZE = 512; + char message [MESSAGESIZE] = {0}; + _snprintf_s(message, MESSAGESIZE, _TRUNCATE, "Elapsed Time = %ums\n", end - start); + OutputDebugString(message); - int totalleaks = (int)VLDGetLeaksCount() - prevleaks; - int diff = leaks_count - totalleaks; - assert(diff == 0); + int totalleaks = (int)VLDGetLeaksCount() - prevleaks; + int diff = leaks_count - totalleaks; + assert(diff == 0); - return diff; + return diff; } From 7d3a9d88d92e1dfb6bcbccbbba8f207676a4a110 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 16 Mar 2014 02:20:48 +0400 Subject: [PATCH 169/321] %processor_architecture% check fixed --- tests/basics/basics.vcxproj | 12 ++++++------ tests/dynamic_app/dynamic_app.vcxproj | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index f7eef908..cda1ffdb 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -353,7 +353,7 @@ exit /b 0 call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -378,7 +378,7 @@ exit /b 0 call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -402,7 +402,7 @@ exit /b 0 call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -426,7 +426,7 @@ exit /b 0 call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -502,7 +502,7 @@ exit /b 0 call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -528,7 +528,7 @@ exit /b 0 call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index ae0cd15c..fde7883e 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -373,7 +373,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -398,7 +398,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -422,7 +422,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -446,7 +446,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -529,7 +529,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies @@ -556,7 +556,7 @@ exit /b 0 copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "%processor_architecture%"=="AMD64" "$(TargetPath)" test +if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test exit /b 0 Copying over Visual Leak Detector Dependencies From c8187b11d4b229ad9bdf63d52eda036ea0d1bf16 Mon Sep 17 00:00:00 2001 From: Shapkin Arkady Date: Mon, 17 Mar 2014 12:02:35 +0400 Subject: [PATCH 170/321] Simplified CrtMfcPatch --- crtmfcpatch.h | 925 ++++++++--------------------------------------- dllspatches.cpp | 934 ++++++++++++++++++++++++------------------------ 2 files changed, 614 insertions(+), 1245 deletions(-) diff --git a/crtmfcpatch.h b/crtmfcpatch.h index fcedf081..3ccbcd0f 100755 --- a/crtmfcpatch.h +++ b/crtmfcpatch.h @@ -36,6 +36,8 @@ template class CrtMfcPatch { public: + static CrtMfcPatch data; + static void* __cdecl crtd__calloc_dbg (size_t num, size_t size, int type, char const *file, int line); static void* __cdecl crtd__malloc_dbg (size_t size, int type, const char *file, int line); static void* __cdecl crtd__realloc_dbg (void *mem, size_t size, int type, char const *file, int line); @@ -81,51 +83,57 @@ class CrtMfcPatch static void* __cdecl mfcud__scalar_new_dbg_4p (size_t size, int type, char const *file, int line); static void* __cdecl mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line); - static void* pcrtd__calloc_dbg; - static void* pcrtd__malloc_dbg; - static void* pcrtd__realloc_dbg; - static void* pcrtd__recalloc_dbg; - static void* pcrtd__strdup_dbg; - static void* pcrtd__wcsdup_dbg; - static void* pcrtd_calloc; - static void* pcrtd_malloc; - static void* pcrtd_realloc; - static void* pcrtd_recalloc; - static void* pcrtd__strdup; - static void* pcrtd__wcsdup; - static void* pcrtd__aligned_malloc_dbg; - static void* pcrtd__aligned_offset_malloc_dbg; - static void* pcrtd__aligned_realloc_dbg; - static void* pcrtd__aligned_offset_realloc_dbg; - static void* pcrtd__aligned_recalloc_dbg; - static void* pcrtd__aligned_offset_recalloc_dbg; - static void* pcrtd_aligned_malloc; - static void* pcrtd_aligned_offset_malloc; - static void* pcrtd_aligned_realloc; - static void* pcrtd_aligned_offset_realloc; - static void* pcrtd_aligned_recalloc; - static void* pcrtd_aligned_offset_recalloc; - static void* pcrtd__scalar_new_dbg; - static void* pcrtd__vector_new_dbg; - static void* pcrtd_scalar_new; - static void* pcrtd_vector_new; - - static void* pmfcd_scalar_new; - static void* pmfcd_vector_new; - static void* pmfcd__scalar_new_dbg_4p; - static void* pmfcd__vector_new_dbg_4p; - static void* pmfcd__scalar_new_dbg_3p; - static void* pmfcd__vector_new_dbg_3p; - - static void* pmfcud_scalar_new; - static void* pmfcud_vector_new; - static void* pmfcud__scalar_new_dbg_4p; - static void* pmfcud__vector_new_dbg_4p; - static void* pmfcud__scalar_new_dbg_3p; - static void* pmfcud__vector_new_dbg_3p; + union + { + void* function[40]; + struct + { + void* pcrtd__calloc_dbg; + void* pcrtd__malloc_dbg; + void* pcrtd__realloc_dbg; + void* pcrtd__recalloc_dbg; + void* pcrtd__strdup_dbg; + void* pcrtd__wcsdup_dbg; + void* pcrtd_calloc; + void* pcrtd_malloc; + void* pcrtd_realloc; + void* pcrtd_recalloc; + void* pcrtd__strdup; + void* pcrtd__wcsdup; + void* pcrtd__aligned_malloc_dbg; + void* pcrtd__aligned_offset_malloc_dbg; + void* pcrtd__aligned_realloc_dbg; + void* pcrtd__aligned_offset_realloc_dbg; + void* pcrtd__aligned_recalloc_dbg; + void* pcrtd__aligned_offset_recalloc_dbg; + void* pcrtd_aligned_malloc; + void* pcrtd_aligned_offset_malloc; + void* pcrtd_aligned_realloc; + void* pcrtd_aligned_offset_realloc; + void* pcrtd_aligned_recalloc; + void* pcrtd_aligned_offset_recalloc; + void* pcrtd__scalar_new_dbg; + void* pcrtd__vector_new_dbg; + void* pcrtd_scalar_new; + void* pcrtd_vector_new; + + void* pmfcd_scalar_new; + void* pmfcd_vector_new; + void* pmfcd__scalar_new_dbg_4p; + void* pmfcd__vector_new_dbg_4p; + void* pmfcd__scalar_new_dbg_3p; + void* pmfcd__vector_new_dbg_3p; + + void* pmfcud_scalar_new; + void* pmfcud_vector_new; + void* pmfcud__scalar_new_dbg_4p; + void* pmfcud__vector_new_dbg_4p; + void* pmfcud__scalar_new_dbg_3p; + void* pmfcud__vector_new_dbg_3p; + }; + }; }; - //////////////////////////////////////////////////////////////////////////////// // // Visual Studio DLLs @@ -157,11 +165,11 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, char const *file, int line) { - _calloc_dbg_t pcrtxxd__calloc_dbg = (_calloc_dbg_t)pcrtd__calloc_dbg; + _calloc_dbg_t pcrtxxd__calloc_dbg = (_calloc_dbg_t)data.pcrtd__calloc_dbg; assert(pcrtxxd__calloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__calloc_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__calloc_dbg); return g_vld.__calloc_dbg(pcrtxxd__calloc_dbg, context, debug, num, size, type, file, line); } @@ -188,11 +196,11 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, char const *file, int line) { - _malloc_dbg_t pcrtxxd__malloc_dbg = (_malloc_dbg_t)pcrtd__malloc_dbg; + _malloc_dbg_t pcrtxxd__malloc_dbg = (_malloc_dbg_t)data.pcrtd__malloc_dbg; assert(pcrtxxd__malloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__malloc_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__malloc_dbg); return g_vld.__malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, type, file, line); } @@ -222,11 +230,11 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, char const *file, int line) { - _realloc_dbg_t pcrtxxd__realloc_dbg = (_realloc_dbg_t)pcrtd__realloc_dbg; + _realloc_dbg_t pcrtxxd__realloc_dbg = (_realloc_dbg_t)data.pcrtd__realloc_dbg; assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__realloc_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__realloc_dbg); return g_vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, type, file, line); } @@ -257,11 +265,11 @@ void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, char const *file, int line) { - _recalloc_dbg_t pcrtxxd__recalloc_dbg = (_recalloc_dbg_t)pcrtd__recalloc_dbg; + _recalloc_dbg_t pcrtxxd__recalloc_dbg = (_recalloc_dbg_t)data.pcrtd__recalloc_dbg; assert(pcrtxxd__recalloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__recalloc_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__recalloc_dbg); return g_vld.__recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, type, file, line); } @@ -273,11 +281,11 @@ char* CrtMfcPatch::crtd__strdup_dbg (const char* src, char const *file, int line) { - _strdup_dbg_t pcrtxxd__strdup_dbg = (_strdup_dbg_t)pcrtd__strdup_dbg; + _strdup_dbg_t pcrtxxd__strdup_dbg = (_strdup_dbg_t)data.pcrtd__strdup_dbg; assert(pcrtxxd__strdup_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__strdup_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__strdup_dbg); return g_vld.__strdup_dbg(pcrtxxd__strdup_dbg, context, debug, src, type, file, line); } @@ -289,11 +297,11 @@ wchar_t* CrtMfcPatch::crtd__wcsdup_dbg (const wchar_t* src, char const *file, int line) { - _wcsdup_dbg_t pcrtxxd__wcsdup_dbg = (_wcsdup_dbg_t)pcrtd__wcsdup_dbg; + _wcsdup_dbg_t pcrtxxd__wcsdup_dbg = (_wcsdup_dbg_t)data.pcrtd__wcsdup_dbg; assert(pcrtxxd__wcsdup_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__wcsdup_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__wcsdup_dbg); return g_vld.__wcsdup_dbg(pcrtxxd__wcsdup_dbg, context, debug, src, type, file, line); } @@ -320,11 +328,11 @@ void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, char const *file, int line) { - new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)pcrtd__scalar_new_dbg; + new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)data.pcrtd__scalar_new_dbg; assert(pcrtxxd_new_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__scalar_new_dbg); + CAPTURE_CONTEXT(context, pcrtxxd_new_dbg); return g_vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); } @@ -351,11 +359,11 @@ void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, char const *file, int line) { - new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)pcrtd__vector_new_dbg; + new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)data.pcrtd__vector_new_dbg; assert(pcrtxxd_new_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__vector_new_dbg); + CAPTURE_CONTEXT(context, pcrtxxd_new_dbg); return g_vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); } @@ -376,11 +384,11 @@ void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, template void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) { - calloc_t pcrtxxd_calloc = (calloc_t)pcrtd_calloc; + calloc_t pcrtxxd_calloc = (calloc_t)data.pcrtd_calloc; assert(pcrtxxd_calloc); context_t context; - CAPTURE_CONTEXT(context, pcrtd_calloc); + CAPTURE_CONTEXT(context, pcrtxxd_calloc); return g_vld._calloc(pcrtxxd_calloc, context, debug, num, size); } @@ -399,11 +407,11 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) template void* CrtMfcPatch::crtd_malloc (size_t size) { - malloc_t pcrtxxd_malloc = (malloc_t)pcrtd_malloc; + malloc_t pcrtxxd_malloc = (malloc_t)data.pcrtd_malloc; assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context, pcrtd_malloc); + CAPTURE_CONTEXT(context, pcrtxxd_malloc); return g_vld._malloc(pcrtxxd_malloc, context, debug, size); } @@ -424,11 +432,11 @@ void* CrtMfcPatch::crtd_malloc (size_t size) template void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) { - realloc_t pcrtxxd_realloc = (realloc_t)pcrtd_realloc; + realloc_t pcrtxxd_realloc = (realloc_t)data.pcrtd_realloc; assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context, pcrtd_realloc); + CAPTURE_CONTEXT(context, pcrtxxd_realloc); return g_vld._realloc(pcrtxxd_realloc, context, debug, mem, size); } @@ -449,11 +457,11 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) template void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, size_t size) { - _recalloc_t pcrtxxd_recalloc = (_recalloc_t)pcrtd_recalloc; + _recalloc_t pcrtxxd_recalloc = (_recalloc_t)data.pcrtd_recalloc; assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context, pcrtd_recalloc); + CAPTURE_CONTEXT(context, pcrtxxd_recalloc); return g_vld.__recalloc(pcrtxxd_recalloc, context, debug, mem, num, size); } @@ -462,11 +470,11 @@ void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, siz template char* CrtMfcPatch::crtd__strdup (const char* src) { - _strdup_t pcrtxxd_strdup = (_strdup_t)pcrtd__strdup; + _strdup_t pcrtxxd_strdup = (_strdup_t)data.pcrtd__strdup; assert(pcrtxxd_strdup); context_t context; - CAPTURE_CONTEXT(context, pcrtd__strdup); + CAPTURE_CONTEXT(context, pcrtxxd_strdup); return g_vld.__strdup(pcrtxxd_strdup, context, debug, src); } @@ -474,11 +482,11 @@ char* CrtMfcPatch::crtd__strdup (const char* src) template wchar_t* CrtMfcPatch::crtd__wcsdup (const wchar_t* src) { - _wcsdup_t pcrtxxd_wcsdup = (_wcsdup_t)pcrtd__wcsdup; + _wcsdup_t pcrtxxd_wcsdup = (_wcsdup_t)data.pcrtd__wcsdup; assert(pcrtxxd_wcsdup); context_t context; - CAPTURE_CONTEXT(context, pcrtd__wcsdup); + CAPTURE_CONTEXT(context, pcrtxxd_wcsdup); return g_vld.__wcsdup(pcrtxxd_wcsdup, context, debug, src); } @@ -506,11 +514,11 @@ void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size char const *file, int line) { - _aligned_malloc_dbg_t pcrtxxd__aligned_malloc_dbg = (_aligned_malloc_dbg_t)pcrtd__aligned_malloc_dbg; + _aligned_malloc_dbg_t pcrtxxd__aligned_malloc_dbg = (_aligned_malloc_dbg_t)data.pcrtd__aligned_malloc_dbg; assert(pcrtxxd__aligned_malloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__aligned_malloc_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__aligned_malloc_dbg); return g_vld.__aligned_malloc_dbg(pcrtxxd__aligned_malloc_dbg, context, debug, size, alignment, type, file, line); } @@ -539,11 +547,11 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t char const *file, int line) { - _aligned_offset_malloc_dbg_t pcrtxxd__malloc_dbg = (_aligned_offset_malloc_dbg_t)pcrtd__aligned_offset_malloc_dbg; + _aligned_offset_malloc_dbg_t pcrtxxd__malloc_dbg = (_aligned_offset_malloc_dbg_t)data.pcrtd__aligned_offset_malloc_dbg; assert(pcrtxxd__malloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__aligned_offset_malloc_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__malloc_dbg); return g_vld.__aligned_offset_malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, alignment, offset, type, file, line); } @@ -574,11 +582,11 @@ void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem char const *file, int line) { - _aligned_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_realloc_dbg_t)pcrtd__aligned_realloc_dbg; + _aligned_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_realloc_dbg_t)data.pcrtd__aligned_realloc_dbg; assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__aligned_realloc_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__realloc_dbg); return g_vld.__aligned_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, type, file, line); } @@ -610,11 +618,11 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void char const *file, int line) { - _aligned_offset_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_offset_realloc_dbg_t)pcrtd__aligned_offset_realloc_dbg; + _aligned_offset_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_offset_realloc_dbg_t)data.pcrtd__aligned_offset_realloc_dbg; assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__aligned_offset_realloc_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__realloc_dbg); return g_vld.__aligned_offset_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, offset, type, file, line); } @@ -648,11 +656,11 @@ void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *me char const *file, int line) { - _aligned_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_recalloc_dbg_t)pcrtd__aligned_recalloc_dbg; + _aligned_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_recalloc_dbg_t)data.pcrtd__aligned_recalloc_dbg; assert(pcrtxxd__recalloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__aligned_recalloc_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__recalloc_dbg); return g_vld.__aligned_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, type, file, line); } @@ -687,11 +695,11 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void char const *file, int line) { - _aligned_offset_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_offset_recalloc_dbg_t)pcrtd__aligned_offset_recalloc_dbg; + _aligned_offset_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_offset_recalloc_dbg_t)data.pcrtd__aligned_offset_recalloc_dbg; assert(pcrtxxd__recalloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtd__aligned_offset_recalloc_dbg); + CAPTURE_CONTEXT(context, pcrtxxd__recalloc_dbg); return g_vld.__aligned_offset_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, offset, type, file, line); } @@ -710,11 +718,11 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void template void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t alignment) { - _aligned_malloc_t pcrtxxd_malloc = (_aligned_malloc_t)pcrtd_aligned_malloc; + _aligned_malloc_t pcrtxxd_malloc = (_aligned_malloc_t)data.pcrtd_aligned_malloc; assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context, pcrtd_aligned_malloc); + CAPTURE_CONTEXT(context, pcrtxxd_malloc); return g_vld.__aligned_malloc(pcrtxxd_malloc, context, debug, size, alignment); } @@ -733,11 +741,11 @@ void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t template void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset) { - _aligned_offset_malloc_t pcrtxxd_malloc = (_aligned_offset_malloc_t)pcrtd_aligned_offset_malloc; + _aligned_offset_malloc_t pcrtxxd_malloc = (_aligned_offset_malloc_t)data.pcrtd_aligned_offset_malloc; assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context, pcrtd_aligned_offset_malloc); + CAPTURE_CONTEXT(context, pcrtxxd_malloc); return g_vld.__aligned_offset_malloc(pcrtxxd_malloc, context, debug, size, alignment, offset); } @@ -758,11 +766,11 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, template void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t size, size_t alignment) { - _aligned_realloc_t pcrtxxd_realloc = (_aligned_realloc_t)pcrtd_aligned_realloc; + _aligned_realloc_t pcrtxxd_realloc = (_aligned_realloc_t)data.pcrtd_aligned_realloc; assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context, pcrtd_aligned_realloc); + CAPTURE_CONTEXT(context, pcrtxxd_realloc); return g_vld.__aligned_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment); } @@ -783,11 +791,11 @@ void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t s template void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, size_t size, size_t alignment, size_t offset) { - _aligned_offset_realloc_t pcrtxxd_realloc = (_aligned_offset_realloc_t)pcrtd_aligned_offset_realloc; + _aligned_offset_realloc_t pcrtxxd_realloc = (_aligned_offset_realloc_t)data.pcrtd_aligned_offset_realloc; assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context, pcrtd_aligned_offset_realloc); + CAPTURE_CONTEXT(context, pcrtxxd_realloc); return g_vld.__aligned_offset_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment, offset); } @@ -810,11 +818,11 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, s template void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t num, size_t size, size_t alignment) { - _aligned_recalloc_t pcrtxxd_recalloc = (_aligned_recalloc_t)pcrtd_aligned_recalloc; + _aligned_recalloc_t pcrtxxd_recalloc = (_aligned_recalloc_t)data.pcrtd_aligned_recalloc; assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context, pcrtd_aligned_recalloc); + CAPTURE_CONTEXT(context, pcrtxxd_recalloc); return g_vld.__aligned_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment); } @@ -837,11 +845,11 @@ void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t template void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, size_t num, size_t size, size_t alignment, size_t offset) { - _aligned_offset_recalloc_t pcrtxxd_recalloc = (_aligned_offset_recalloc_t)pcrtd_aligned_offset_recalloc; + _aligned_offset_recalloc_t pcrtxxd_recalloc = (_aligned_offset_recalloc_t)data.pcrtd_aligned_offset_recalloc; assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context, pcrtd_aligned_offset_recalloc); + CAPTURE_CONTEXT(context, pcrtxxd_recalloc); return g_vld.__aligned_offset_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment, offset); } @@ -858,11 +866,11 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, template void* CrtMfcPatch::crtd_scalar_new (size_t size) { - new_t pcrtxxd_scalar_new = (new_t)pcrtd_scalar_new; + new_t pcrtxxd_scalar_new = (new_t)data.pcrtd_scalar_new; assert(pcrtxxd_scalar_new); context_t context; - CAPTURE_CONTEXT(context, pcrtd_scalar_new); + CAPTURE_CONTEXT(context, pcrtxxd_scalar_new); return g_vld._new(pcrtxxd_scalar_new, context, debug, size); } @@ -879,11 +887,11 @@ void* CrtMfcPatch::crtd_scalar_new (size_t size) template void* CrtMfcPatch::crtd_vector_new (size_t size) { - new_t pcrtxxd_scalar_new = (new_t)pcrtd_vector_new; + new_t pcrtxxd_scalar_new = (new_t)data.pcrtd_vector_new; assert(pcrtxxd_scalar_new); context_t context; - CAPTURE_CONTEXT(context, pcrtd_vector_new); + CAPTURE_CONTEXT(context, pcrtxxd_scalar_new); return g_vld._new(pcrtxxd_scalar_new, context, debug, size); } @@ -916,11 +924,11 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size char const *file, int line) { - new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)pmfcd__scalar_new_dbg_4p; + new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcd__scalar_new_dbg_4p); + CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -944,11 +952,11 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size char const *file, int line) { - new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)pmfcd__scalar_new_dbg_3p; + new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcd__scalar_new_dbg_3p; assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcd__scalar_new_dbg_3p); + CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -975,11 +983,11 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size char const *file, int line) { - new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)pmfcd__scalar_new_dbg_4p; + new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcd__scalar_new_dbg_4p); + CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -1003,11 +1011,11 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size char const *file, int line) { - new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)pmfcd__vector_new_dbg_3p; + new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcd__vector_new_dbg_3p; assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcd__vector_new_dbg_3p); + CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -1024,11 +1032,11 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size template void* CrtMfcPatch::mfcd_scalar_new (size_t size) { - new_t pmfcxxd_new = (new_t)pmfcd_scalar_new; + new_t pmfcxxd_new = (new_t)data.pmfcd_scalar_new; assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context, pmfcd_scalar_new); + CAPTURE_CONTEXT(context, pmfcxxd_new); return g_vld._new(pmfcxxd_new, context, debug, size); } @@ -1045,11 +1053,11 @@ void* CrtMfcPatch::mfcd_scalar_new (size_t size) template void* CrtMfcPatch::mfcd_vector_new (size_t size) { - new_t pmfcxxd_new = (new_t)pmfcd_vector_new; + new_t pmfcxxd_new = (new_t)data.pmfcd_vector_new; assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context, pmfcd_vector_new); + CAPTURE_CONTEXT(context, pmfcxxd_new); return g_vld._new(pmfcxxd_new, context, debug, size); } @@ -1076,11 +1084,11 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size char const *file, int line) { - new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)pmfcud__scalar_new_dbg_4p; + new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcud__scalar_new_dbg_4p); + CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -1104,11 +1112,11 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size char const *file, int line) { - new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)pmfcud__scalar_new_dbg_3p; + new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcud__scalar_new_dbg_3p; assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcud__scalar_new_dbg_3p); + CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -1135,11 +1143,11 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size char const *file, int line) { - new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)pmfcud__scalar_new_dbg_4p; + new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcud__scalar_new_dbg_4p); + CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -1163,11 +1171,11 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size char const *file, int line) { - new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)pmfcud__vector_new_dbg_3p; + new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcud__vector_new_dbg_3p; assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcud__vector_new_dbg_3p); + CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -1184,11 +1192,11 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size template void* CrtMfcPatch::mfcud_scalar_new (size_t size) { - new_t pmfcxxd_new = (new_t)pmfcud_scalar_new; + new_t pmfcxxd_new = (new_t)data.pmfcud_scalar_new; assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context, pmfcud_scalar_new); + CAPTURE_CONTEXT(context, pmfcxxd_new); return g_vld._new(pmfcxxd_new, context, debug, size); } @@ -1205,11 +1213,11 @@ void* CrtMfcPatch::mfcud_scalar_new (size_t size) template void* CrtMfcPatch::mfcud_vector_new (size_t size) { - new_t pmfcxxd_new = (new_t)pmfcud_vector_new; + new_t pmfcxxd_new = (new_t)data.pmfcud_vector_new; assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context, pmfcud_vector_new); + CAPTURE_CONTEXT(context, pmfcxxd_new); return g_vld._new(pmfcxxd_new, context, debug, size); } @@ -1255,658 +1263,19 @@ typedef CrtMfcPatch<120> typedef CrtMfcPatch<120, true> VS120d; -void* VS60::pcrtd__calloc_dbg = NULL; -void* VS60::pcrtd__malloc_dbg = NULL; -void* VS60::pcrtd__realloc_dbg = NULL; -void* VS60::pcrtd__recalloc_dbg = NULL; -void* VS60::pcrtd__strdup_dbg = NULL; -void* VS60::pcrtd__wcsdup_dbg = NULL; -void* VS60::pcrtd_calloc = NULL; -void* VS60::pcrtd_malloc = NULL; -void* VS60::pcrtd_realloc = NULL; -void* VS60::pcrtd_recalloc = NULL; -void* VS60::pcrtd__strdup = NULL; -void* VS60::pcrtd__wcsdup = NULL; -void* VS60::pcrtd__aligned_malloc_dbg = NULL; -void* VS60::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS60::pcrtd__aligned_realloc_dbg = NULL; -void* VS60::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS60::pcrtd__aligned_recalloc_dbg = NULL; -void* VS60::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS60::pcrtd_aligned_malloc = NULL; -void* VS60::pcrtd_aligned_offset_malloc = NULL; -void* VS60::pcrtd_aligned_realloc = NULL; -void* VS60::pcrtd_aligned_offset_realloc = NULL; -void* VS60::pcrtd_aligned_recalloc = NULL; -void* VS60::pcrtd_aligned_offset_recalloc = NULL; -void* VS60::pcrtd__scalar_new_dbg = NULL; -void* VS60::pcrtd__vector_new_dbg = NULL; -void* VS60::pcrtd_scalar_new = NULL; -void* VS60::pcrtd_vector_new = NULL; -void* VS60::pmfcd_scalar_new = NULL; -void* VS60::pmfcd_vector_new = NULL; -void* VS60::pmfcd__scalar_new_dbg_4p = NULL; -void* VS60::pmfcd__vector_new_dbg_4p = NULL; -void* VS60::pmfcd__scalar_new_dbg_3p = NULL; -void* VS60::pmfcd__vector_new_dbg_3p = NULL; -void* VS60::pmfcud_scalar_new = NULL; -void* VS60::pmfcud_vector_new = NULL; -void* VS60::pmfcud__scalar_new_dbg_4p = NULL; -void* VS60::pmfcud__vector_new_dbg_4p = NULL; -void* VS60::pmfcud__scalar_new_dbg_3p = NULL; -void* VS60::pmfcud__vector_new_dbg_3p = NULL; - -void* VS60d::pcrtd__calloc_dbg = NULL; -void* VS60d::pcrtd__malloc_dbg = NULL; -void* VS60d::pcrtd__realloc_dbg = NULL; -void* VS60d::pcrtd__recalloc_dbg = NULL; -void* VS60d::pcrtd__strdup_dbg = NULL; -void* VS60d::pcrtd__wcsdup_dbg = NULL; -void* VS60d::pcrtd_calloc = NULL; -void* VS60d::pcrtd_malloc = NULL; -void* VS60d::pcrtd_realloc = NULL; -void* VS60d::pcrtd_recalloc = NULL; -void* VS60d::pcrtd__strdup = NULL; -void* VS60d::pcrtd__wcsdup = NULL; -void* VS60d::pcrtd__aligned_malloc_dbg = NULL; -void* VS60d::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS60d::pcrtd__aligned_realloc_dbg = NULL; -void* VS60d::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS60d::pcrtd__aligned_recalloc_dbg = NULL; -void* VS60d::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS60d::pcrtd_aligned_malloc = NULL; -void* VS60d::pcrtd_aligned_offset_malloc = NULL; -void* VS60d::pcrtd_aligned_realloc = NULL; -void* VS60d::pcrtd_aligned_offset_realloc = NULL; -void* VS60d::pcrtd_aligned_recalloc = NULL; -void* VS60d::pcrtd_aligned_offset_recalloc = NULL; -void* VS60d::pcrtd__scalar_new_dbg = NULL; -void* VS60d::pcrtd__vector_new_dbg = NULL; -void* VS60d::pcrtd_scalar_new = NULL; -void* VS60d::pcrtd_vector_new = NULL; -void* VS60d::pmfcd_scalar_new = NULL; -void* VS60d::pmfcd_vector_new = NULL; -void* VS60d::pmfcd__scalar_new_dbg_4p = NULL; -void* VS60d::pmfcd__vector_new_dbg_4p = NULL; -void* VS60d::pmfcd__scalar_new_dbg_3p = NULL; -void* VS60d::pmfcd__vector_new_dbg_3p = NULL; -void* VS60d::pmfcud_scalar_new = NULL; -void* VS60d::pmfcud_vector_new = NULL; -void* VS60d::pmfcud__scalar_new_dbg_4p = NULL; -void* VS60d::pmfcud__vector_new_dbg_4p = NULL; -void* VS60d::pmfcud__scalar_new_dbg_3p = NULL; -void* VS60d::pmfcud__vector_new_dbg_3p = NULL; - -void* VS70::pcrtd__calloc_dbg = NULL; -void* VS70::pcrtd__malloc_dbg = NULL; -void* VS70::pcrtd__realloc_dbg = NULL; -void* VS70::pcrtd__recalloc_dbg = NULL; -void* VS70::pcrtd__strdup_dbg = NULL; -void* VS70::pcrtd__wcsdup_dbg = NULL; -void* VS70::pcrtd_calloc = NULL; -void* VS70::pcrtd_malloc = NULL; -void* VS70::pcrtd_realloc = NULL; -void* VS70::pcrtd_recalloc = NULL; -void* VS70::pcrtd__strdup = NULL; -void* VS70::pcrtd__wcsdup = NULL; -void* VS70::pcrtd__aligned_malloc_dbg = NULL; -void* VS70::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS70::pcrtd__aligned_realloc_dbg = NULL; -void* VS70::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS70::pcrtd__aligned_recalloc_dbg = NULL; -void* VS70::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS70::pcrtd_aligned_malloc = NULL; -void* VS70::pcrtd_aligned_offset_malloc = NULL; -void* VS70::pcrtd_aligned_realloc = NULL; -void* VS70::pcrtd_aligned_offset_realloc = NULL; -void* VS70::pcrtd_aligned_recalloc = NULL; -void* VS70::pcrtd_aligned_offset_recalloc = NULL; -void* VS70::pcrtd__scalar_new_dbg = NULL; -void* VS70::pcrtd__vector_new_dbg = NULL; -void* VS70::pcrtd_scalar_new = NULL; -void* VS70::pcrtd_vector_new = NULL; -void* VS70::pmfcd_scalar_new = NULL; -void* VS70::pmfcd_vector_new = NULL; -void* VS70::pmfcd__scalar_new_dbg_4p = NULL; -void* VS70::pmfcd__vector_new_dbg_4p = NULL; -void* VS70::pmfcd__scalar_new_dbg_3p = NULL; -void* VS70::pmfcd__vector_new_dbg_3p = NULL; -void* VS70::pmfcud_scalar_new = NULL; -void* VS70::pmfcud_vector_new = NULL; -void* VS70::pmfcud__scalar_new_dbg_4p = NULL; -void* VS70::pmfcud__vector_new_dbg_4p = NULL; -void* VS70::pmfcud__scalar_new_dbg_3p = NULL; -void* VS70::pmfcud__vector_new_dbg_3p = NULL; - -void* VS70d::pcrtd__calloc_dbg = NULL; -void* VS70d::pcrtd__malloc_dbg = NULL; -void* VS70d::pcrtd__realloc_dbg = NULL; -void* VS70d::pcrtd__recalloc_dbg = NULL; -void* VS70d::pcrtd__strdup_dbg = NULL; -void* VS70d::pcrtd__wcsdup_dbg = NULL; -void* VS70d::pcrtd_calloc = NULL; -void* VS70d::pcrtd_malloc = NULL; -void* VS70d::pcrtd_realloc = NULL; -void* VS70d::pcrtd_recalloc = NULL; -void* VS70d::pcrtd__strdup = NULL; -void* VS70d::pcrtd__wcsdup = NULL; -void* VS70d::pcrtd__aligned_malloc_dbg = NULL; -void* VS70d::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS70d::pcrtd__aligned_realloc_dbg = NULL; -void* VS70d::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS70d::pcrtd__aligned_recalloc_dbg = NULL; -void* VS70d::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS70d::pcrtd_aligned_malloc = NULL; -void* VS70d::pcrtd_aligned_offset_malloc = NULL; -void* VS70d::pcrtd_aligned_realloc = NULL; -void* VS70d::pcrtd_aligned_offset_realloc = NULL; -void* VS70d::pcrtd_aligned_recalloc = NULL; -void* VS70d::pcrtd_aligned_offset_recalloc = NULL; -void* VS70d::pcrtd__scalar_new_dbg = NULL; -void* VS70d::pcrtd__vector_new_dbg = NULL; -void* VS70d::pcrtd_scalar_new = NULL; -void* VS70d::pcrtd_vector_new = NULL; -void* VS70d::pmfcd_scalar_new = NULL; -void* VS70d::pmfcd_vector_new = NULL; -void* VS70d::pmfcd__scalar_new_dbg_4p = NULL; -void* VS70d::pmfcd__vector_new_dbg_4p = NULL; -void* VS70d::pmfcd__scalar_new_dbg_3p = NULL; -void* VS70d::pmfcd__vector_new_dbg_3p = NULL; -void* VS70d::pmfcud_scalar_new = NULL; -void* VS70d::pmfcud_vector_new = NULL; -void* VS70d::pmfcud__scalar_new_dbg_4p = NULL; -void* VS70d::pmfcud__vector_new_dbg_4p = NULL; -void* VS70d::pmfcud__scalar_new_dbg_3p = NULL; -void* VS70d::pmfcud__vector_new_dbg_3p = NULL; - -void* VS71::pcrtd__calloc_dbg = NULL; -void* VS71::pcrtd__malloc_dbg = NULL; -void* VS71::pcrtd__realloc_dbg = NULL; -void* VS71::pcrtd__recalloc_dbg = NULL; -void* VS71::pcrtd__strdup_dbg = NULL; -void* VS71::pcrtd__wcsdup_dbg = NULL; -void* VS71::pcrtd_calloc = NULL; -void* VS71::pcrtd_malloc = NULL; -void* VS71::pcrtd_realloc = NULL; -void* VS71::pcrtd_recalloc = NULL; -void* VS71::pcrtd__strdup = NULL; -void* VS71::pcrtd__wcsdup = NULL; -void* VS71::pcrtd__aligned_malloc_dbg = NULL; -void* VS71::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS71::pcrtd__aligned_realloc_dbg = NULL; -void* VS71::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS71::pcrtd__aligned_recalloc_dbg = NULL; -void* VS71::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS71::pcrtd_aligned_malloc = NULL; -void* VS71::pcrtd_aligned_offset_malloc = NULL; -void* VS71::pcrtd_aligned_realloc = NULL; -void* VS71::pcrtd_aligned_offset_realloc = NULL; -void* VS71::pcrtd_aligned_recalloc = NULL; -void* VS71::pcrtd_aligned_offset_recalloc = NULL; -void* VS71::pcrtd__scalar_new_dbg = NULL; -void* VS71::pcrtd__vector_new_dbg = NULL; -void* VS71::pcrtd_scalar_new = NULL; -void* VS71::pcrtd_vector_new = NULL; -void* VS71::pmfcd_scalar_new = NULL; -void* VS71::pmfcd_vector_new = NULL; -void* VS71::pmfcd__scalar_new_dbg_4p = NULL; -void* VS71::pmfcd__vector_new_dbg_4p = NULL; -void* VS71::pmfcd__scalar_new_dbg_3p = NULL; -void* VS71::pmfcd__vector_new_dbg_3p = NULL; -void* VS71::pmfcud_scalar_new = NULL; -void* VS71::pmfcud_vector_new = NULL; -void* VS71::pmfcud__scalar_new_dbg_4p = NULL; -void* VS71::pmfcud__vector_new_dbg_4p = NULL; -void* VS71::pmfcud__scalar_new_dbg_3p = NULL; -void* VS71::pmfcud__vector_new_dbg_3p = NULL; - -void* VS71d::pcrtd__calloc_dbg = NULL; -void* VS71d::pcrtd__malloc_dbg = NULL; -void* VS71d::pcrtd__realloc_dbg = NULL; -void* VS71d::pcrtd__recalloc_dbg = NULL; -void* VS71d::pcrtd__strdup_dbg = NULL; -void* VS71d::pcrtd__wcsdup_dbg = NULL; -void* VS71d::pcrtd_calloc = NULL; -void* VS71d::pcrtd_malloc = NULL; -void* VS71d::pcrtd_realloc = NULL; -void* VS71d::pcrtd_recalloc = NULL; -void* VS71d::pcrtd__strdup = NULL; -void* VS71d::pcrtd__wcsdup = NULL; -void* VS71d::pcrtd__aligned_malloc_dbg = NULL; -void* VS71d::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS71d::pcrtd__aligned_realloc_dbg = NULL; -void* VS71d::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS71d::pcrtd__aligned_recalloc_dbg = NULL; -void* VS71d::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS71d::pcrtd_aligned_malloc = NULL; -void* VS71d::pcrtd_aligned_offset_malloc = NULL; -void* VS71d::pcrtd_aligned_realloc = NULL; -void* VS71d::pcrtd_aligned_offset_realloc = NULL; -void* VS71d::pcrtd_aligned_recalloc = NULL; -void* VS71d::pcrtd_aligned_offset_recalloc = NULL; -void* VS71d::pcrtd__scalar_new_dbg = NULL; -void* VS71d::pcrtd__vector_new_dbg = NULL; -void* VS71d::pcrtd_scalar_new = NULL; -void* VS71d::pcrtd_vector_new = NULL; -void* VS71d::pmfcd_scalar_new = NULL; -void* VS71d::pmfcd_vector_new = NULL; -void* VS71d::pmfcd__scalar_new_dbg_4p = NULL; -void* VS71d::pmfcd__vector_new_dbg_4p = NULL; -void* VS71d::pmfcd__scalar_new_dbg_3p = NULL; -void* VS71d::pmfcd__vector_new_dbg_3p = NULL; -void* VS71d::pmfcud_scalar_new = NULL; -void* VS71d::pmfcud_vector_new = NULL; -void* VS71d::pmfcud__scalar_new_dbg_4p = NULL; -void* VS71d::pmfcud__vector_new_dbg_4p = NULL; -void* VS71d::pmfcud__scalar_new_dbg_3p = NULL; -void* VS71d::pmfcud__vector_new_dbg_3p = NULL; - -void* VS80::pcrtd__calloc_dbg = NULL; -void* VS80::pcrtd__malloc_dbg = NULL; -void* VS80::pcrtd__realloc_dbg = NULL; -void* VS80::pcrtd__recalloc_dbg = NULL; -void* VS80::pcrtd__strdup_dbg = NULL; -void* VS80::pcrtd__wcsdup_dbg = NULL; -void* VS80::pcrtd_calloc = NULL; -void* VS80::pcrtd_malloc = NULL; -void* VS80::pcrtd_realloc = NULL; -void* VS80::pcrtd_recalloc = NULL; -void* VS80::pcrtd__strdup = NULL; -void* VS80::pcrtd__wcsdup = NULL; -void* VS80::pcrtd__aligned_malloc_dbg = NULL; -void* VS80::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS80::pcrtd__aligned_realloc_dbg = NULL; -void* VS80::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS80::pcrtd__aligned_recalloc_dbg = NULL; -void* VS80::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS80::pcrtd_aligned_malloc = NULL; -void* VS80::pcrtd_aligned_offset_malloc = NULL; -void* VS80::pcrtd_aligned_realloc = NULL; -void* VS80::pcrtd_aligned_offset_realloc = NULL; -void* VS80::pcrtd_aligned_recalloc = NULL; -void* VS80::pcrtd_aligned_offset_recalloc = NULL; -void* VS80::pcrtd__scalar_new_dbg = NULL; -void* VS80::pcrtd__vector_new_dbg = NULL; -void* VS80::pcrtd_scalar_new = NULL; -void* VS80::pcrtd_vector_new = NULL; -void* VS80::pmfcd_scalar_new = NULL; -void* VS80::pmfcd_vector_new = NULL; -void* VS80::pmfcd__scalar_new_dbg_4p = NULL; -void* VS80::pmfcd__vector_new_dbg_4p = NULL; -void* VS80::pmfcd__scalar_new_dbg_3p = NULL; -void* VS80::pmfcd__vector_new_dbg_3p = NULL; -void* VS80::pmfcud_scalar_new = NULL; -void* VS80::pmfcud_vector_new = NULL; -void* VS80::pmfcud__scalar_new_dbg_4p = NULL; -void* VS80::pmfcud__vector_new_dbg_4p = NULL; -void* VS80::pmfcud__scalar_new_dbg_3p = NULL; -void* VS80::pmfcud__vector_new_dbg_3p = NULL; - -void* VS80d::pcrtd__calloc_dbg = NULL; -void* VS80d::pcrtd__malloc_dbg = NULL; -void* VS80d::pcrtd__realloc_dbg = NULL; -void* VS80d::pcrtd__recalloc_dbg = NULL; -void* VS80d::pcrtd__strdup_dbg = NULL; -void* VS80d::pcrtd__wcsdup_dbg = NULL; -void* VS80d::pcrtd_calloc = NULL; -void* VS80d::pcrtd_malloc = NULL; -void* VS80d::pcrtd_realloc = NULL; -void* VS80d::pcrtd_recalloc = NULL; -void* VS80d::pcrtd__strdup = NULL; -void* VS80d::pcrtd__wcsdup = NULL; -void* VS80d::pcrtd__aligned_malloc_dbg = NULL; -void* VS80d::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS80d::pcrtd__aligned_realloc_dbg = NULL; -void* VS80d::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS80d::pcrtd__aligned_recalloc_dbg = NULL; -void* VS80d::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS80d::pcrtd_aligned_malloc = NULL; -void* VS80d::pcrtd_aligned_offset_malloc = NULL; -void* VS80d::pcrtd_aligned_realloc = NULL; -void* VS80d::pcrtd_aligned_offset_realloc = NULL; -void* VS80d::pcrtd_aligned_recalloc = NULL; -void* VS80d::pcrtd_aligned_offset_recalloc = NULL; -void* VS80d::pcrtd__scalar_new_dbg = NULL; -void* VS80d::pcrtd__vector_new_dbg = NULL; -void* VS80d::pcrtd_scalar_new = NULL; -void* VS80d::pcrtd_vector_new = NULL; -void* VS80d::pmfcd_scalar_new = NULL; -void* VS80d::pmfcd_vector_new = NULL; -void* VS80d::pmfcd__scalar_new_dbg_4p = NULL; -void* VS80d::pmfcd__vector_new_dbg_4p = NULL; -void* VS80d::pmfcd__scalar_new_dbg_3p = NULL; -void* VS80d::pmfcd__vector_new_dbg_3p = NULL; -void* VS80d::pmfcud_scalar_new = NULL; -void* VS80d::pmfcud_vector_new = NULL; -void* VS80d::pmfcud__scalar_new_dbg_4p = NULL; -void* VS80d::pmfcud__vector_new_dbg_4p = NULL; -void* VS80d::pmfcud__scalar_new_dbg_3p = NULL; -void* VS80d::pmfcud__vector_new_dbg_3p = NULL; - -void* VS90::pcrtd__calloc_dbg = NULL; -void* VS90::pcrtd__malloc_dbg = NULL; -void* VS90::pcrtd__realloc_dbg = NULL; -void* VS90::pcrtd__recalloc_dbg = NULL; -void* VS90::pcrtd__strdup_dbg = NULL; -void* VS90::pcrtd__wcsdup_dbg = NULL; -void* VS90::pcrtd_calloc = NULL; -void* VS90::pcrtd_malloc = NULL; -void* VS90::pcrtd_realloc = NULL; -void* VS90::pcrtd_recalloc = NULL; -void* VS90::pcrtd__strdup = NULL; -void* VS90::pcrtd__wcsdup = NULL; -void* VS90::pcrtd__aligned_malloc_dbg = NULL; -void* VS90::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS90::pcrtd__aligned_realloc_dbg = NULL; -void* VS90::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS90::pcrtd__aligned_recalloc_dbg = NULL; -void* VS90::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS90::pcrtd_aligned_malloc = NULL; -void* VS90::pcrtd_aligned_offset_malloc = NULL; -void* VS90::pcrtd_aligned_realloc = NULL; -void* VS90::pcrtd_aligned_offset_realloc = NULL; -void* VS90::pcrtd_aligned_recalloc = NULL; -void* VS90::pcrtd_aligned_offset_recalloc = NULL; -void* VS90::pcrtd__scalar_new_dbg = NULL; -void* VS90::pcrtd__vector_new_dbg = NULL; -void* VS90::pcrtd_scalar_new = NULL; -void* VS90::pcrtd_vector_new = NULL; -void* VS90::pmfcd_scalar_new = NULL; -void* VS90::pmfcd_vector_new = NULL; -void* VS90::pmfcd__scalar_new_dbg_4p = NULL; -void* VS90::pmfcd__vector_new_dbg_4p = NULL; -void* VS90::pmfcd__scalar_new_dbg_3p = NULL; -void* VS90::pmfcd__vector_new_dbg_3p = NULL; -void* VS90::pmfcud_scalar_new = NULL; -void* VS90::pmfcud_vector_new = NULL; -void* VS90::pmfcud__scalar_new_dbg_4p = NULL; -void* VS90::pmfcud__vector_new_dbg_4p = NULL; -void* VS90::pmfcud__scalar_new_dbg_3p = NULL; -void* VS90::pmfcud__vector_new_dbg_3p = NULL; - -void* VS90d::pcrtd__calloc_dbg = NULL; -void* VS90d::pcrtd__malloc_dbg = NULL; -void* VS90d::pcrtd__realloc_dbg = NULL; -void* VS90d::pcrtd__recalloc_dbg = NULL; -void* VS90d::pcrtd__strdup_dbg = NULL; -void* VS90d::pcrtd__wcsdup_dbg = NULL; -void* VS90d::pcrtd_calloc = NULL; -void* VS90d::pcrtd_malloc = NULL; -void* VS90d::pcrtd_realloc = NULL; -void* VS90d::pcrtd_recalloc = NULL; -void* VS90d::pcrtd__strdup = NULL; -void* VS90d::pcrtd__wcsdup = NULL; -void* VS90d::pcrtd__aligned_malloc_dbg = NULL; -void* VS90d::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS90d::pcrtd__aligned_realloc_dbg = NULL; -void* VS90d::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS90d::pcrtd__aligned_recalloc_dbg = NULL; -void* VS90d::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS90d::pcrtd_aligned_malloc = NULL; -void* VS90d::pcrtd_aligned_offset_malloc = NULL; -void* VS90d::pcrtd_aligned_realloc = NULL; -void* VS90d::pcrtd_aligned_offset_realloc = NULL; -void* VS90d::pcrtd_aligned_recalloc = NULL; -void* VS90d::pcrtd_aligned_offset_recalloc = NULL; -void* VS90d::pcrtd__scalar_new_dbg = NULL; -void* VS90d::pcrtd__vector_new_dbg = NULL; -void* VS90d::pcrtd_scalar_new = NULL; -void* VS90d::pcrtd_vector_new = NULL; -void* VS90d::pmfcd_scalar_new = NULL; -void* VS90d::pmfcd_vector_new = NULL; -void* VS90d::pmfcd__scalar_new_dbg_4p = NULL; -void* VS90d::pmfcd__vector_new_dbg_4p = NULL; -void* VS90d::pmfcd__scalar_new_dbg_3p = NULL; -void* VS90d::pmfcd__vector_new_dbg_3p = NULL; -void* VS90d::pmfcud_scalar_new = NULL; -void* VS90d::pmfcud_vector_new = NULL; -void* VS90d::pmfcud__scalar_new_dbg_4p = NULL; -void* VS90d::pmfcud__vector_new_dbg_4p = NULL; -void* VS90d::pmfcud__scalar_new_dbg_3p = NULL; -void* VS90d::pmfcud__vector_new_dbg_3p = NULL; - -void* VS100::pcrtd__calloc_dbg = NULL; -void* VS100::pcrtd__malloc_dbg = NULL; -void* VS100::pcrtd__realloc_dbg = NULL; -void* VS100::pcrtd__recalloc_dbg = NULL; -void* VS100::pcrtd__strdup_dbg = NULL; -void* VS100::pcrtd__wcsdup_dbg = NULL; -void* VS100::pcrtd_calloc = NULL; -void* VS100::pcrtd_malloc = NULL; -void* VS100::pcrtd_realloc = NULL; -void* VS100::pcrtd_recalloc = NULL; -void* VS100::pcrtd__strdup = NULL; -void* VS100::pcrtd__wcsdup = NULL; -void* VS100::pcrtd__aligned_malloc_dbg = NULL; -void* VS100::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS100::pcrtd__aligned_realloc_dbg = NULL; -void* VS100::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS100::pcrtd__aligned_recalloc_dbg = NULL; -void* VS100::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS100::pcrtd_aligned_malloc = NULL; -void* VS100::pcrtd_aligned_offset_malloc = NULL; -void* VS100::pcrtd_aligned_realloc = NULL; -void* VS100::pcrtd_aligned_offset_realloc = NULL; -void* VS100::pcrtd_aligned_recalloc = NULL; -void* VS100::pcrtd_aligned_offset_recalloc = NULL; -void* VS100::pcrtd__scalar_new_dbg = NULL; -void* VS100::pcrtd__vector_new_dbg = NULL; -void* VS100::pcrtd_scalar_new = NULL; -void* VS100::pcrtd_vector_new = NULL; -void* VS100::pmfcd_scalar_new = NULL; -void* VS100::pmfcd_vector_new = NULL; -void* VS100::pmfcd__scalar_new_dbg_4p = NULL; -void* VS100::pmfcd__vector_new_dbg_4p = NULL; -void* VS100::pmfcd__scalar_new_dbg_3p = NULL; -void* VS100::pmfcd__vector_new_dbg_3p = NULL; -void* VS100::pmfcud_scalar_new = NULL; -void* VS100::pmfcud_vector_new = NULL; -void* VS100::pmfcud__scalar_new_dbg_4p = NULL; -void* VS100::pmfcud__vector_new_dbg_4p = NULL; -void* VS100::pmfcud__scalar_new_dbg_3p = NULL; -void* VS100::pmfcud__vector_new_dbg_3p = NULL; - -void* VS100d::pcrtd__calloc_dbg = NULL; -void* VS100d::pcrtd__malloc_dbg = NULL; -void* VS100d::pcrtd__realloc_dbg = NULL; -void* VS100d::pcrtd__recalloc_dbg = NULL; -void* VS100d::pcrtd__strdup_dbg = NULL; -void* VS100d::pcrtd__wcsdup_dbg = NULL; -void* VS100d::pcrtd_calloc = NULL; -void* VS100d::pcrtd_malloc = NULL; -void* VS100d::pcrtd_realloc = NULL; -void* VS100d::pcrtd_recalloc = NULL; -void* VS100d::pcrtd__strdup = NULL; -void* VS100d::pcrtd__wcsdup = NULL; -void* VS100d::pcrtd__aligned_malloc_dbg = NULL; -void* VS100d::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS100d::pcrtd__aligned_realloc_dbg = NULL; -void* VS100d::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS100d::pcrtd__aligned_recalloc_dbg = NULL; -void* VS100d::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS100d::pcrtd_aligned_malloc = NULL; -void* VS100d::pcrtd_aligned_offset_malloc = NULL; -void* VS100d::pcrtd_aligned_realloc = NULL; -void* VS100d::pcrtd_aligned_offset_realloc = NULL; -void* VS100d::pcrtd_aligned_recalloc = NULL; -void* VS100d::pcrtd_aligned_offset_recalloc = NULL; -void* VS100d::pcrtd__scalar_new_dbg = NULL; -void* VS100d::pcrtd__vector_new_dbg = NULL; -void* VS100d::pcrtd_scalar_new = NULL; -void* VS100d::pcrtd_vector_new = NULL; -void* VS100d::pmfcd_scalar_new = NULL; -void* VS100d::pmfcd_vector_new = NULL; -void* VS100d::pmfcd__scalar_new_dbg_4p = NULL; -void* VS100d::pmfcd__vector_new_dbg_4p = NULL; -void* VS100d::pmfcd__scalar_new_dbg_3p = NULL; -void* VS100d::pmfcd__vector_new_dbg_3p = NULL; -void* VS100d::pmfcud_scalar_new = NULL; -void* VS100d::pmfcud_vector_new = NULL; -void* VS100d::pmfcud__scalar_new_dbg_4p = NULL; -void* VS100d::pmfcud__vector_new_dbg_4p = NULL; -void* VS100d::pmfcud__scalar_new_dbg_3p = NULL; -void* VS100d::pmfcud__vector_new_dbg_3p = NULL; - -void* VS110::pcrtd__calloc_dbg = NULL; -void* VS110::pcrtd__malloc_dbg = NULL; -void* VS110::pcrtd__realloc_dbg = NULL; -void* VS110::pcrtd__recalloc_dbg = NULL; -void* VS110::pcrtd__strdup_dbg = NULL; -void* VS110::pcrtd__wcsdup_dbg = NULL; -void* VS110::pcrtd_calloc = NULL; -void* VS110::pcrtd_malloc = NULL; -void* VS110::pcrtd_realloc = NULL; -void* VS110::pcrtd_recalloc = NULL; -void* VS110::pcrtd__strdup = NULL; -void* VS110::pcrtd__wcsdup = NULL; -void* VS110::pcrtd__aligned_malloc_dbg = NULL; -void* VS110::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS110::pcrtd__aligned_realloc_dbg = NULL; -void* VS110::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS110::pcrtd__aligned_recalloc_dbg = NULL; -void* VS110::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS110::pcrtd_aligned_malloc = NULL; -void* VS110::pcrtd_aligned_offset_malloc = NULL; -void* VS110::pcrtd_aligned_realloc = NULL; -void* VS110::pcrtd_aligned_offset_realloc = NULL; -void* VS110::pcrtd_aligned_recalloc = NULL; -void* VS110::pcrtd_aligned_offset_recalloc = NULL; -void* VS110::pcrtd__scalar_new_dbg = NULL; -void* VS110::pcrtd__vector_new_dbg = NULL; -void* VS110::pcrtd_scalar_new = NULL; -void* VS110::pcrtd_vector_new = NULL; -void* VS110::pmfcd_scalar_new = NULL; -void* VS110::pmfcd_vector_new = NULL; -void* VS110::pmfcd__scalar_new_dbg_4p = NULL; -void* VS110::pmfcd__vector_new_dbg_4p = NULL; -void* VS110::pmfcd__scalar_new_dbg_3p = NULL; -void* VS110::pmfcd__vector_new_dbg_3p = NULL; -void* VS110::pmfcud_scalar_new = NULL; -void* VS110::pmfcud_vector_new = NULL; -void* VS110::pmfcud__scalar_new_dbg_4p = NULL; -void* VS110::pmfcud__vector_new_dbg_4p = NULL; -void* VS110::pmfcud__scalar_new_dbg_3p = NULL; -void* VS110::pmfcud__vector_new_dbg_3p = NULL; - -void* VS110d::pcrtd__calloc_dbg = NULL; -void* VS110d::pcrtd__malloc_dbg = NULL; -void* VS110d::pcrtd__realloc_dbg = NULL; -void* VS110d::pcrtd__recalloc_dbg = NULL; -void* VS110d::pcrtd__strdup_dbg = NULL; -void* VS110d::pcrtd__wcsdup_dbg = NULL; -void* VS110d::pcrtd_calloc = NULL; -void* VS110d::pcrtd_malloc = NULL; -void* VS110d::pcrtd_realloc = NULL; -void* VS110d::pcrtd_recalloc = NULL; -void* VS110d::pcrtd__strdup = NULL; -void* VS110d::pcrtd__wcsdup = NULL; -void* VS110d::pcrtd__aligned_malloc_dbg = NULL; -void* VS110d::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS110d::pcrtd__aligned_realloc_dbg = NULL; -void* VS110d::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS110d::pcrtd__aligned_recalloc_dbg = NULL; -void* VS110d::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS110d::pcrtd_aligned_malloc = NULL; -void* VS110d::pcrtd_aligned_offset_malloc = NULL; -void* VS110d::pcrtd_aligned_realloc = NULL; -void* VS110d::pcrtd_aligned_offset_realloc = NULL; -void* VS110d::pcrtd_aligned_recalloc = NULL; -void* VS110d::pcrtd_aligned_offset_recalloc = NULL; -void* VS110d::pcrtd__scalar_new_dbg = NULL; -void* VS110d::pcrtd__vector_new_dbg = NULL; -void* VS110d::pcrtd_scalar_new = NULL; -void* VS110d::pcrtd_vector_new = NULL; -void* VS110d::pmfcd_scalar_new = NULL; -void* VS110d::pmfcd_vector_new = NULL; -void* VS110d::pmfcd__scalar_new_dbg_4p = NULL; -void* VS110d::pmfcd__vector_new_dbg_4p = NULL; -void* VS110d::pmfcd__scalar_new_dbg_3p = NULL; -void* VS110d::pmfcd__vector_new_dbg_3p = NULL; -void* VS110d::pmfcud_scalar_new = NULL; -void* VS110d::pmfcud_vector_new = NULL; -void* VS110d::pmfcud__scalar_new_dbg_4p = NULL; -void* VS110d::pmfcud__vector_new_dbg_4p = NULL; -void* VS110d::pmfcud__scalar_new_dbg_3p = NULL; -void* VS110d::pmfcud__vector_new_dbg_3p = NULL; - -void* VS120::pcrtd__calloc_dbg = NULL; -void* VS120::pcrtd__malloc_dbg = NULL; -void* VS120::pcrtd__realloc_dbg = NULL; -void* VS120::pcrtd__recalloc_dbg = NULL; -void* VS120::pcrtd__strdup_dbg = NULL; -void* VS120::pcrtd__wcsdup_dbg = NULL; -void* VS120::pcrtd_calloc = NULL; -void* VS120::pcrtd_malloc = NULL; -void* VS120::pcrtd_realloc = NULL; -void* VS120::pcrtd_recalloc = NULL; -void* VS120::pcrtd__strdup = NULL; -void* VS120::pcrtd__wcsdup = NULL; -void* VS120::pcrtd__aligned_malloc_dbg = NULL; -void* VS120::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS120::pcrtd__aligned_realloc_dbg = NULL; -void* VS120::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS120::pcrtd__aligned_recalloc_dbg = NULL; -void* VS120::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS120::pcrtd_aligned_malloc = NULL; -void* VS120::pcrtd_aligned_offset_malloc = NULL; -void* VS120::pcrtd_aligned_realloc = NULL; -void* VS120::pcrtd_aligned_offset_realloc = NULL; -void* VS120::pcrtd_aligned_recalloc = NULL; -void* VS120::pcrtd_aligned_offset_recalloc = NULL; -void* VS120::pcrtd__scalar_new_dbg = NULL; -void* VS120::pcrtd__vector_new_dbg = NULL; -void* VS120::pcrtd_scalar_new = NULL; -void* VS120::pcrtd_vector_new = NULL; -void* VS120::pmfcd_scalar_new = NULL; -void* VS120::pmfcd_vector_new = NULL; -void* VS120::pmfcd__scalar_new_dbg_4p = NULL; -void* VS120::pmfcd__vector_new_dbg_4p = NULL; -void* VS120::pmfcd__scalar_new_dbg_3p = NULL; -void* VS120::pmfcd__vector_new_dbg_3p = NULL; -void* VS120::pmfcud_scalar_new = NULL; -void* VS120::pmfcud_vector_new = NULL; -void* VS120::pmfcud__scalar_new_dbg_4p = NULL; -void* VS120::pmfcud__vector_new_dbg_4p = NULL; -void* VS120::pmfcud__scalar_new_dbg_3p = NULL; -void* VS120::pmfcud__vector_new_dbg_3p = NULL; - -void* VS120d::pcrtd__calloc_dbg = NULL; -void* VS120d::pcrtd__malloc_dbg = NULL; -void* VS120d::pcrtd__realloc_dbg = NULL; -void* VS120d::pcrtd__recalloc_dbg = NULL; -void* VS120d::pcrtd__strdup_dbg = NULL; -void* VS120d::pcrtd__wcsdup_dbg = NULL; -void* VS120d::pcrtd_calloc = NULL; -void* VS120d::pcrtd_malloc = NULL; -void* VS120d::pcrtd_realloc = NULL; -void* VS120d::pcrtd_recalloc = NULL; -void* VS120d::pcrtd__strdup = NULL; -void* VS120d::pcrtd__wcsdup = NULL; -void* VS120d::pcrtd__aligned_malloc_dbg = NULL; -void* VS120d::pcrtd__aligned_offset_malloc_dbg = NULL; -void* VS120d::pcrtd__aligned_realloc_dbg = NULL; -void* VS120d::pcrtd__aligned_offset_realloc_dbg = NULL; -void* VS120d::pcrtd__aligned_recalloc_dbg = NULL; -void* VS120d::pcrtd__aligned_offset_recalloc_dbg = NULL; -void* VS120d::pcrtd_aligned_malloc = NULL; -void* VS120d::pcrtd_aligned_offset_malloc = NULL; -void* VS120d::pcrtd_aligned_realloc = NULL; -void* VS120d::pcrtd_aligned_offset_realloc = NULL; -void* VS120d::pcrtd_aligned_recalloc = NULL; -void* VS120d::pcrtd_aligned_offset_recalloc = NULL; -void* VS120d::pcrtd__scalar_new_dbg = NULL; -void* VS120d::pcrtd__vector_new_dbg = NULL; -void* VS120d::pcrtd_scalar_new = NULL; -void* VS120d::pcrtd_vector_new = NULL; -void* VS120d::pmfcd_scalar_new = NULL; -void* VS120d::pmfcd_vector_new = NULL; -void* VS120d::pmfcd__scalar_new_dbg_4p = NULL; -void* VS120d::pmfcd__vector_new_dbg_4p = NULL; -void* VS120d::pmfcd__scalar_new_dbg_3p = NULL; -void* VS120d::pmfcd__vector_new_dbg_3p = NULL; -void* VS120d::pmfcud_scalar_new = NULL; -void* VS120d::pmfcud_vector_new = NULL; -void* VS120d::pmfcud__scalar_new_dbg_4p = NULL; -void* VS120d::pmfcud__vector_new_dbg_4p = NULL; -void* VS120d::pmfcud__scalar_new_dbg_3p = NULL; -void* VS120d::pmfcud__vector_new_dbg_3p = NULL; +VS60 VS60::data; +VS60d VS60d::data; +VS70 VS70::data; +VS70d VS70d::data; +VS71 VS71::data; +VS71d VS71d::data; +VS80 VS80::data; +VS80d VS80d::data; +VS90 VS90::data; +VS90d VS90d::data; +VS100 VS100::data; +VS100d VS100d::data; +VS110 VS110::data; +VS110d VS110d::data; +VS120 VS120::data; +VS120d VS120d::data; diff --git a/dllspatches.cpp b/dllspatches.cpp index 3a487422..94d783fe 100644 --- a/dllspatches.cpp +++ b/dllspatches.cpp @@ -89,570 +89,570 @@ static patchentry_t mfc42Patch [] = { static patchentry_t mfc42dPatch [] = { // XXX why are the vector new operators missing for mfc42d.dll? - ORDINAL(711), &VS60d::pmfcd_scalar_new, VS60d::mfcd_scalar_new, - ORDINAL(712), &VS60d::pmfcd__scalar_new_dbg_4p, VS60d::mfcd__scalar_new_dbg_4p, - ORDINAL(714), &VS60d::pmfcd__scalar_new_dbg_3p, VS60d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(711), &VS60d::data.pmfcd_scalar_new, VS60d::mfcd_scalar_new, + ORDINAL(712), &VS60d::data.pmfcd__scalar_new_dbg_4p, VS60d::mfcd__scalar_new_dbg_4p, + ORDINAL(714), &VS60d::data.pmfcd__scalar_new_dbg_3p, VS60d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc42uPatch [] = { // XXX why are the vector new operators missing for mfc42u.dll? - //ORDINAL(711), &VS60::pmfcud_scalar_new, VS60::mfcud_scalar_new, - NULL, NULL, NULL + //ORDINAL(711), &VS60::data.pmfcud_scalar_new, VS60::mfcud_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc42udPatch [] = { // XXX why are the vector new operators missing for mfc42ud.dll? - ORDINAL(711), &VS60d::pmfcud_scalar_new, VS60d::mfcud_scalar_new, - ORDINAL(712), &VS60d::pmfcud__scalar_new_dbg_4p, VS60d::mfcud__scalar_new_dbg_4p, - ORDINAL(714), &VS60d::pmfcud__scalar_new_dbg_3p, VS60d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(711), &VS60d::data.pmfcud_scalar_new, VS60d::mfcud_scalar_new, + ORDINAL(712), &VS60d::data.pmfcud__scalar_new_dbg_4p, VS60d::mfcud__scalar_new_dbg_4p, + ORDINAL(714), &VS60d::data.pmfcud__scalar_new_dbg_3p, VS60d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc70Patch [] = { - //ORDINAL(257), &VS70::pmfcd_vector_new, VS70::mfcd_vector_new, - //ORDINAL(832), &VS70::pmfcd_scalar_new, VS70::mfcd_scalar_new, - NULL, NULL, NULL -}; + //ORDINAL(257), &VS70::data.pmfcd_vector_new, VS70::mfcd_vector_new, + //ORDINAL(832), &VS70::data.pmfcd_scalar_new, VS70::mfcd_scalar_new, + NULL, NULL, NULL +}; -static patchentry_t mfc70dPatch [] = { - ORDINAL(257), &VS70d::pmfcd_vector_new, VS70d::mfcd_vector_new, - ORDINAL(258), &VS70d::pmfcd__vector_new_dbg_4p, VS70d::mfcd__vector_new_dbg_4p, - ORDINAL(259), &VS70d::pmfcd__vector_new_dbg_3p, VS70d::mfcd__vector_new_dbg_3p, - ORDINAL(832), &VS70d::pmfcd_scalar_new, VS70d::mfcd_scalar_new, - ORDINAL(833), &VS70d::pmfcd__scalar_new_dbg_4p, VS70d::mfcd__scalar_new_dbg_4p, - ORDINAL(834), &VS70d::pmfcd__scalar_new_dbg_3p, VS70d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; +static patchentry_t mfc70dPatch [] = { + ORDINAL(257), &VS70d::data.pmfcd_vector_new, VS70d::mfcd_vector_new, + ORDINAL(258), &VS70d::data.pmfcd__vector_new_dbg_4p, VS70d::mfcd__vector_new_dbg_4p, + ORDINAL(259), &VS70d::data.pmfcd__vector_new_dbg_3p, VS70d::mfcd__vector_new_dbg_3p, + ORDINAL(832), &VS70d::data.pmfcd_scalar_new, VS70d::mfcd_scalar_new, + ORDINAL(833), &VS70d::data.pmfcd__scalar_new_dbg_4p, VS70d::mfcd__scalar_new_dbg_4p, + ORDINAL(834), &VS70d::data.pmfcd__scalar_new_dbg_3p, VS70d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; -static patchentry_t mfc70uPatch [] = { - //ORDINAL(258), &VS70::pmfcud_vector_new, VS70::mfcud_vector_new, - //ORDINAL(833), &VS70::pmfcud_scalar_new, VS70::mfcud_scalar_new, - NULL, NULL, NULL +static patchentry_t mfc70uPatch [] = { + //ORDINAL(258), &VS70::data.pmfcud_vector_new, VS70::mfcud_vector_new, + //ORDINAL(833), &VS70::data.pmfcud_scalar_new, VS70::mfcud_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc70udPatch [] = { - ORDINAL(258), &VS70d::pmfcud_vector_new, VS70d::mfcud_vector_new, - ORDINAL(259), &VS70d::pmfcud__vector_new_dbg_4p, VS70d::mfcud__vector_new_dbg_4p, - ORDINAL(260), &VS70d::pmfcud__vector_new_dbg_3p, VS70d::mfcud__vector_new_dbg_3p, - ORDINAL(833), &VS70d::pmfcud_scalar_new, VS70d::mfcud_scalar_new, - ORDINAL(834), &VS70d::pmfcud__scalar_new_dbg_4p, VS70d::mfcud__scalar_new_dbg_4p, - ORDINAL(835), &VS70d::pmfcud__scalar_new_dbg_3p, VS70d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(258), &VS70d::data.pmfcud_vector_new, VS70d::mfcud_vector_new, + ORDINAL(259), &VS70d::data.pmfcud__vector_new_dbg_4p, VS70d::mfcud__vector_new_dbg_4p, + ORDINAL(260), &VS70d::data.pmfcud__vector_new_dbg_3p, VS70d::mfcud__vector_new_dbg_3p, + ORDINAL(833), &VS70d::data.pmfcud_scalar_new, VS70d::mfcud_scalar_new, + ORDINAL(834), &VS70d::data.pmfcud__scalar_new_dbg_4p, VS70d::mfcud__scalar_new_dbg_4p, + ORDINAL(835), &VS70d::data.pmfcud__scalar_new_dbg_3p, VS70d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc71Patch [] = { - //ORDINAL(267), &VS71::pmfcd_vector_new, VS71::mfcd_vector_new, - //ORDINAL(893), &VS71::pmfcd_scalar_new, VS71::mfcd_scalar_new, - NULL, NULL, NULL -}; + //ORDINAL(267), &VS71::data.pmfcd_vector_new, VS71::mfcd_vector_new, + //ORDINAL(893), &VS71::data.pmfcd_scalar_new, VS71::mfcd_scalar_new, + NULL, NULL, NULL +}; -static patchentry_t mfc71dPatch [] = { - ORDINAL(267), &VS71d::pmfcd_vector_new, VS71d::mfcd_vector_new, - ORDINAL(268), &VS71d::pmfcd__vector_new_dbg_4p, VS71d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS71d::pmfcd__vector_new_dbg_3p, VS71d::mfcd__vector_new_dbg_3p, - ORDINAL(893), &VS71d::pmfcd_scalar_new, VS71d::mfcd_scalar_new, - ORDINAL(894), &VS71d::pmfcd__scalar_new_dbg_4p, VS71d::mfcd__scalar_new_dbg_4p, - ORDINAL(895), &VS71d::pmfcd__scalar_new_dbg_3p, VS71d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; +static patchentry_t mfc71dPatch [] = { + ORDINAL(267), &VS71d::data.pmfcd_vector_new, VS71d::mfcd_vector_new, + ORDINAL(268), &VS71d::data.pmfcd__vector_new_dbg_4p, VS71d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS71d::data.pmfcd__vector_new_dbg_3p, VS71d::mfcd__vector_new_dbg_3p, + ORDINAL(893), &VS71d::data.pmfcd_scalar_new, VS71d::mfcd_scalar_new, + ORDINAL(894), &VS71d::data.pmfcd__scalar_new_dbg_4p, VS71d::mfcd__scalar_new_dbg_4p, + ORDINAL(895), &VS71d::data.pmfcd__scalar_new_dbg_3p, VS71d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; -static patchentry_t mfc71uPatch [] = { - //ORDINAL(267), &VS71::pmfcud_vector_new, VS71::mfcud_vector_new, - //ORDINAL(893), &VS71::pmfcud_scalar_new, VS71::mfcud_scalar_new, - NULL, NULL, NULL -}; +static patchentry_t mfc71uPatch [] = { + //ORDINAL(267), &VS71::data.pmfcud_vector_new, VS71::mfcud_vector_new, + //ORDINAL(893), &VS71::data.pmfcud_scalar_new, VS71::mfcud_scalar_new, + NULL, NULL, NULL +}; -static patchentry_t mfc71udPatch [] = { - ORDINAL(267), &VS71d::pmfcud_vector_new, VS71d::mfcud_vector_new, - ORDINAL(268), &VS71d::pmfcud__vector_new_dbg_4p, VS71d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS71d::pmfcud__vector_new_dbg_3p, VS71d::mfcud__vector_new_dbg_3p, - ORDINAL(893), &VS71d::pmfcud_scalar_new, VS71d::mfcud_scalar_new, - ORDINAL(894), &VS71d::pmfcud__scalar_new_dbg_4p, VS71d::mfcud__scalar_new_dbg_4p, - ORDINAL(895), &VS71d::pmfcud__scalar_new_dbg_3p, VS71d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL -}; +static patchentry_t mfc71udPatch [] = { + ORDINAL(267), &VS71d::data.pmfcud_vector_new, VS71d::mfcud_vector_new, + ORDINAL(268), &VS71d::data.pmfcud__vector_new_dbg_4p, VS71d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS71d::data.pmfcud__vector_new_dbg_3p, VS71d::mfcud__vector_new_dbg_3p, + ORDINAL(893), &VS71d::data.pmfcud_scalar_new, VS71d::mfcud_scalar_new, + ORDINAL(894), &VS71d::data.pmfcud__scalar_new_dbg_4p, VS71d::mfcud__scalar_new_dbg_4p, + ORDINAL(895), &VS71d::data.pmfcud__scalar_new_dbg_3p, VS71d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; -static patchentry_t mfc80Patch [] = { - //ORDINAL(267), &VS80::pmfcd_vector_new, VS80::mfcd_vector_new, - //ORDINAL2(893,907), &VS80::pmfcd_scalar_new, VS80::mfcd_scalar_new, - NULL, NULL, NULL -}; +static patchentry_t mfc80Patch [] = { + //ORDINAL(267), &VS80::data.pmfcd_vector_new, VS80::mfcd_vector_new, + //ORDINAL2(893,907), &VS80::data.pmfcd_scalar_new, VS80::mfcd_scalar_new, + NULL, NULL, NULL +}; -static patchentry_t mfc80dPatch [] = { - ORDINAL(267), &VS80d::pmfcd_vector_new, VS80d::mfcd_vector_new, - ORDINAL(268), &VS80d::pmfcd__vector_new_dbg_4p, VS80d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS80d::pmfcd__vector_new_dbg_3p, VS80d::mfcd__vector_new_dbg_3p, - ORDINAL2(893,907), &VS80d::pmfcd_scalar_new, VS80d::mfcd_scalar_new, - ORDINAL2(894,908), &VS80d::pmfcd__scalar_new_dbg_4p, VS80d::mfcd__scalar_new_dbg_4p, - ORDINAL2(895,909), &VS80d::pmfcd__scalar_new_dbg_3p, VS80d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; +static patchentry_t mfc80dPatch [] = { + ORDINAL(267), &VS80d::data.pmfcd_vector_new, VS80d::mfcd_vector_new, + ORDINAL(268), &VS80d::data.pmfcd__vector_new_dbg_4p, VS80d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS80d::data.pmfcd__vector_new_dbg_3p, VS80d::mfcd__vector_new_dbg_3p, + ORDINAL2(893,907), &VS80d::data.pmfcd_scalar_new, VS80d::mfcd_scalar_new, + ORDINAL2(894,908), &VS80d::data.pmfcd__scalar_new_dbg_4p, VS80d::mfcd__scalar_new_dbg_4p, + ORDINAL2(895,909), &VS80d::data.pmfcd__scalar_new_dbg_3p, VS80d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; -static patchentry_t mfc80uPatch [] = { - //ORDINAL(267), &VS80::pmfcud_vector_new, VS80::mfcud_vector_new, - //ORDINAL2(893,907), &VS80::pmfcud_scalar_new, VS80::mfcud_scalar_new, - NULL, NULL, NULL -}; +static patchentry_t mfc80uPatch [] = { + //ORDINAL(267), &VS80::data.pmfcud_vector_new, VS80::mfcud_vector_new, + //ORDINAL2(893,907), &VS80::data.pmfcud_scalar_new, VS80::mfcud_scalar_new, + NULL, NULL, NULL +}; -static patchentry_t mfc80udPatch [] = { - ORDINAL(267), &VS80d::pmfcud_vector_new, VS80d::mfcud_vector_new, - ORDINAL(268), &VS80d::pmfcud__vector_new_dbg_4p, VS80d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS80d::pmfcud__vector_new_dbg_3p, VS80d::mfcud__vector_new_dbg_3p, - ORDINAL2(893,907), &VS80d::pmfcud_scalar_new, VS80d::mfcud_scalar_new, - ORDINAL2(894,908), &VS80d::pmfcud__scalar_new_dbg_4p, VS80d::mfcud__scalar_new_dbg_4p, - ORDINAL2(895,909), &VS80d::pmfcud__scalar_new_dbg_3p, VS80d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL -}; +static patchentry_t mfc80udPatch [] = { + ORDINAL(267), &VS80d::data.pmfcud_vector_new, VS80d::mfcud_vector_new, + ORDINAL(268), &VS80d::data.pmfcud__vector_new_dbg_4p, VS80d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS80d::data.pmfcud__vector_new_dbg_3p, VS80d::mfcud__vector_new_dbg_3p, + ORDINAL2(893,907), &VS80d::data.pmfcud_scalar_new, VS80d::mfcud_scalar_new, + ORDINAL2(894,908), &VS80d::data.pmfcud__scalar_new_dbg_4p, VS80d::mfcud__scalar_new_dbg_4p, + ORDINAL2(895,909), &VS80d::data.pmfcud__scalar_new_dbg_3p, VS80d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; -static patchentry_t mfc90Patch [] = { - ORDINAL(265), &VS90::pmfcd_vector_new, VS90::mfcd_vector_new, - ORDINAL2(798, 776), &VS90::pmfcd_scalar_new, VS90::mfcd_scalar_new, - NULL, NULL, NULL -}; +static patchentry_t mfc90Patch [] = { + ORDINAL(265), &VS90::data.pmfcd_vector_new, VS90::mfcd_vector_new, + ORDINAL2(798, 776), &VS90::data.pmfcd_scalar_new, VS90::mfcd_scalar_new, + NULL, NULL, NULL +}; -static patchentry_t mfc90dPatch [] = { - ORDINAL(267), &VS90d::pmfcd_vector_new, VS90d::mfcd_vector_new, - ORDINAL(268), &VS90d::pmfcd__vector_new_dbg_4p, VS90d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS90d::pmfcd__vector_new_dbg_3p, VS90d::mfcd__vector_new_dbg_3p, - ORDINAL2(931, 909), &VS90d::pmfcd_scalar_new, VS90d::mfcd_scalar_new, - ORDINAL2(932, 910), &VS90d::pmfcd__scalar_new_dbg_4p, VS90d::mfcd__scalar_new_dbg_4p, - ORDINAL2(933, 911), &VS90d::pmfcd__scalar_new_dbg_3p, VS90d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL -}; +static patchentry_t mfc90dPatch [] = { + ORDINAL(267), &VS90d::data.pmfcd_vector_new, VS90d::mfcd_vector_new, + ORDINAL(268), &VS90d::data.pmfcd__vector_new_dbg_4p, VS90d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS90d::data.pmfcd__vector_new_dbg_3p, VS90d::mfcd__vector_new_dbg_3p, + ORDINAL2(931, 909), &VS90d::data.pmfcd_scalar_new, VS90d::mfcd_scalar_new, + ORDINAL2(932, 910), &VS90d::data.pmfcd__scalar_new_dbg_4p, VS90d::mfcd__scalar_new_dbg_4p, + ORDINAL2(933, 911), &VS90d::data.pmfcd__scalar_new_dbg_3p, VS90d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; -static patchentry_t mfc90uPatch [] = { - ORDINAL(265), &VS90::pmfcud_vector_new, VS90::mfcud_vector_new, - ORDINAL2(798, 776), &VS90::pmfcud_scalar_new, VS90::mfcud_scalar_new, - NULL, NULL, NULL -}; +static patchentry_t mfc90uPatch [] = { + ORDINAL(265), &VS90::data.pmfcud_vector_new, VS90::mfcud_vector_new, + ORDINAL2(798, 776), &VS90::data.pmfcud_scalar_new, VS90::mfcud_scalar_new, + NULL, NULL, NULL +}; -static patchentry_t mfc90udPatch [] = { - ORDINAL(267), &VS90d::pmfcud_vector_new, VS90d::mfcud_vector_new, - ORDINAL(268), &VS90d::pmfcud__vector_new_dbg_4p, VS90d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS90d::pmfcud__vector_new_dbg_3p, VS90d::mfcud__vector_new_dbg_3p, - ORDINAL2(935, 913), &VS90d::pmfcud_scalar_new, VS90d::mfcud_scalar_new, - ORDINAL2(936, 914), &VS90d::pmfcud__scalar_new_dbg_4p, VS90d::mfcud__scalar_new_dbg_4p, - ORDINAL2(937, 915), &VS90d::pmfcud__scalar_new_dbg_3p, VS90d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL +static patchentry_t mfc90udPatch [] = { + ORDINAL(267), &VS90d::data.pmfcud_vector_new, VS90d::mfcud_vector_new, + ORDINAL(268), &VS90d::data.pmfcud__vector_new_dbg_4p, VS90d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS90d::data.pmfcud__vector_new_dbg_3p, VS90d::mfcud__vector_new_dbg_3p, + ORDINAL2(935, 913), &VS90d::data.pmfcud_scalar_new, VS90d::mfcud_scalar_new, + ORDINAL2(936, 914), &VS90d::data.pmfcud__scalar_new_dbg_4p, VS90d::mfcud__scalar_new_dbg_4p, + ORDINAL2(937, 915), &VS90d::data.pmfcud__scalar_new_dbg_3p, VS90d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; -static patchentry_t mfc100Patch [] = { - ORDINAL(265), &VS100::pmfcd_vector_new, VS100::mfcd_vector_new, - ORDINAL2(1294, 1272), &VS100::pmfcd_scalar_new, VS100::mfcd_scalar_new, - NULL, NULL, NULL +static patchentry_t mfc100Patch [] = { + ORDINAL(265), &VS100::data.pmfcd_vector_new, VS100::mfcd_vector_new, + ORDINAL2(1294, 1272), &VS100::data.pmfcd_scalar_new, VS100::mfcd_scalar_new, + NULL, NULL, NULL }; -static patchentry_t mfc100dPatch [] = { - ORDINAL(267), &VS100d::pmfcd_vector_new, VS100d::mfcd_vector_new, - ORDINAL(268), &VS100d::pmfcd__vector_new_dbg_4p, VS100d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS100d::pmfcd__vector_new_dbg_3p, VS100d::mfcd__vector_new_dbg_3p, - ORDINAL2(1427, 1405), &VS100d::pmfcd_scalar_new, VS100d::mfcd_scalar_new, - ORDINAL2(1428, 1406), &VS100d::pmfcd__scalar_new_dbg_4p, VS100d::mfcd__scalar_new_dbg_4p, - ORDINAL2(1429, 1407), &VS100d::pmfcd__scalar_new_dbg_3p, VS100d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL +static patchentry_t mfc100dPatch [] = { + ORDINAL(267), &VS100d::data.pmfcd_vector_new, VS100d::mfcd_vector_new, + ORDINAL(268), &VS100d::data.pmfcd__vector_new_dbg_4p, VS100d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS100d::data.pmfcd__vector_new_dbg_3p, VS100d::mfcd__vector_new_dbg_3p, + ORDINAL2(1427, 1405), &VS100d::data.pmfcd_scalar_new, VS100d::mfcd_scalar_new, + ORDINAL2(1428, 1406), &VS100d::data.pmfcd__scalar_new_dbg_4p, VS100d::mfcd__scalar_new_dbg_4p, + ORDINAL2(1429, 1407), &VS100d::data.pmfcd__scalar_new_dbg_3p, VS100d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; -static patchentry_t mfc100uPatch [] = { - ORDINAL(265), &VS100::pmfcud_vector_new, VS100::mfcud_vector_new, - ORDINAL2(1298, 1276), &VS100::pmfcud_scalar_new, VS100::mfcud_scalar_new, - NULL, NULL, NULL -}; +static patchentry_t mfc100uPatch [] = { + ORDINAL(265), &VS100::data.pmfcud_vector_new, VS100::mfcud_vector_new, + ORDINAL2(1298, 1276), &VS100::data.pmfcud_scalar_new, VS100::mfcud_scalar_new, + NULL, NULL, NULL +}; -static patchentry_t mfc100udPatch [] = { - ORDINAL(267), &VS100d::pmfcud_vector_new, VS100d::mfcud_vector_new, - ORDINAL(268), &VS100d::pmfcud__vector_new_dbg_4p, VS100d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS100d::pmfcud__vector_new_dbg_3p, VS100d::mfcud__vector_new_dbg_3p, - ORDINAL2(1434, 1412), &VS100d::pmfcud_scalar_new, VS100d::mfcud_scalar_new, - ORDINAL2(1435, 1413), &VS100d::pmfcud__scalar_new_dbg_4p, VS100d::mfcud__scalar_new_dbg_4p, - ORDINAL2(1436, 1414), &VS100d::pmfcud__scalar_new_dbg_3p, VS100d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL +static patchentry_t mfc100udPatch [] = { + ORDINAL(267), &VS100d::data.pmfcud_vector_new, VS100d::mfcud_vector_new, + ORDINAL(268), &VS100d::data.pmfcud__vector_new_dbg_4p, VS100d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS100d::data.pmfcud__vector_new_dbg_3p, VS100d::mfcud__vector_new_dbg_3p, + ORDINAL2(1434, 1412), &VS100d::data.pmfcud_scalar_new, VS100d::mfcud_scalar_new, + ORDINAL2(1435, 1413), &VS100d::data.pmfcud__scalar_new_dbg_4p, VS100d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1436, 1414), &VS100d::data.pmfcud__scalar_new_dbg_3p, VS100d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; -static patchentry_t mfc110Patch [] = { - ORDINAL(265), &VS110::pmfcd_vector_new, VS110::mfcd_vector_new, - ORDINAL2(1498, 1476), &VS110::pmfcd_scalar_new, VS110::mfcd_scalar_new, - NULL, NULL, NULL +static patchentry_t mfc110Patch [] = { + ORDINAL(265), &VS110::data.pmfcd_vector_new, VS110::mfcd_vector_new, + ORDINAL2(1498, 1476), &VS110::data.pmfcd_scalar_new, VS110::mfcd_scalar_new, + NULL, NULL, NULL }; -static patchentry_t mfc110dPatch [] = { - ORDINAL(267), &VS110d::pmfcd_vector_new, VS110d::mfcd_vector_new, - ORDINAL(268), &VS110d::pmfcd__vector_new_dbg_4p, VS110d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS110d::pmfcd__vector_new_dbg_3p, VS110d::mfcd__vector_new_dbg_3p, - ORDINAL2(1629, 1607), &VS110d::pmfcd_scalar_new, VS110d::mfcd_scalar_new, - ORDINAL2(1630, 1608), &VS110d::pmfcd__scalar_new_dbg_4p, VS110d::mfcd__scalar_new_dbg_4p, - ORDINAL2(1631, 1609), &VS110d::pmfcd__scalar_new_dbg_3p, VS110d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL +static patchentry_t mfc110dPatch [] = { + ORDINAL(267), &VS110d::data.pmfcd_vector_new, VS110d::mfcd_vector_new, + ORDINAL(268), &VS110d::data.pmfcd__vector_new_dbg_4p, VS110d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS110d::data.pmfcd__vector_new_dbg_3p, VS110d::mfcd__vector_new_dbg_3p, + ORDINAL2(1629, 1607), &VS110d::data.pmfcd_scalar_new, VS110d::mfcd_scalar_new, + ORDINAL2(1630, 1608), &VS110d::data.pmfcd__scalar_new_dbg_4p, VS110d::mfcd__scalar_new_dbg_4p, + ORDINAL2(1631, 1609), &VS110d::data.pmfcd__scalar_new_dbg_3p, VS110d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; -static patchentry_t mfc110uPatch [] = { - ORDINAL(265), &VS110::pmfcud_vector_new, VS110::mfcud_vector_new, - ORDINAL2(1502, 1480), &VS110::pmfcud_scalar_new, VS110::mfcud_scalar_new, - NULL, NULL, NULL +static patchentry_t mfc110uPatch [] = { + ORDINAL(265), &VS110::data.pmfcud_vector_new, VS110::mfcud_vector_new, + ORDINAL2(1502, 1480), &VS110::data.pmfcud_scalar_new, VS110::mfcud_scalar_new, + NULL, NULL, NULL }; -static patchentry_t mfc110udPatch [] = { - ORDINAL(267), &VS110d::pmfcud_vector_new, VS110d::mfcud_vector_new, - ORDINAL(268), &VS110d::pmfcud__vector_new_dbg_4p, VS110d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS110d::pmfcud__vector_new_dbg_3p, VS110d::mfcud__vector_new_dbg_3p, - ORDINAL2(1636, 1614), &VS110d::pmfcud_scalar_new, VS110d::mfcud_scalar_new, - ORDINAL2(1637, 1615), &VS110d::pmfcud__scalar_new_dbg_4p, VS110d::mfcud__scalar_new_dbg_4p, - ORDINAL2(1638, 1616), &VS110d::pmfcud__scalar_new_dbg_3p, VS110d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL +static patchentry_t mfc110udPatch [] = { + ORDINAL(267), &VS110d::data.pmfcud_vector_new, VS110d::mfcud_vector_new, + ORDINAL(268), &VS110d::data.pmfcud__vector_new_dbg_4p, VS110d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS110d::data.pmfcud__vector_new_dbg_3p, VS110d::mfcud__vector_new_dbg_3p, + ORDINAL2(1636, 1614), &VS110d::data.pmfcud_scalar_new, VS110d::mfcud_scalar_new, + ORDINAL2(1637, 1615), &VS110d::data.pmfcud__scalar_new_dbg_4p, VS110d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1638, 1616), &VS110d::data.pmfcud__scalar_new_dbg_3p, VS110d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; -static patchentry_t mfc120uPatch [] = { - ORDINAL(265), &VS120::pmfcud_vector_new, VS120::mfcud_vector_new, - ORDINAL2(1506, 1484), &VS120::pmfcud_scalar_new, VS120::mfcud_scalar_new, - NULL, NULL, NULL +static patchentry_t mfc120uPatch [] = { + ORDINAL(265), &VS120::data.pmfcud_vector_new, VS120::mfcud_vector_new, + ORDINAL2(1506, 1484), &VS120::data.pmfcud_scalar_new, VS120::mfcud_scalar_new, + NULL, NULL, NULL }; -static patchentry_t mfc120udPatch [] = { - ORDINAL(267), &VS120d::pmfcud_vector_new, VS120d::mfcud_vector_new, - ORDINAL(268), &VS120d::pmfcud__vector_new_dbg_4p, VS120d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS120d::pmfcud__vector_new_dbg_3p, VS120d::mfcud__vector_new_dbg_3p, - ORDINAL2(1640, 1618), &VS120d::pmfcud_scalar_new, VS120d::mfcud_scalar_new, - ORDINAL2(1641, 1619), &VS120d::pmfcud__scalar_new_dbg_4p, VS120d::mfcud__scalar_new_dbg_4p, - ORDINAL2(1642, 1620), &VS120d::pmfcud__scalar_new_dbg_3p, VS120d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL +static patchentry_t mfc120udPatch [] = { + ORDINAL(267), &VS120d::data.pmfcud_vector_new, VS120d::mfcud_vector_new, + ORDINAL(268), &VS120d::data.pmfcud__vector_new_dbg_4p, VS120d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &VS120d::data.pmfcud__vector_new_dbg_3p, VS120d::mfcud__vector_new_dbg_3p, + ORDINAL2(1640, 1618), &VS120d::data.pmfcud_scalar_new, VS120d::mfcud_scalar_new, + ORDINAL2(1641, 1619), &VS120d::data.pmfcud__scalar_new_dbg_4p, VS120d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1642, 1620), &VS120d::data.pmfcud__scalar_new_dbg_3p, VS120d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t msvcrtPatch [] = { - scalar_new_dbg_name, &VS60::pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, - //vector_new_dbg_name, &VS60::pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, - "calloc", &VS60::pcrtd_calloc, VS60::crtd_calloc, - "malloc", &VS60::pcrtd_malloc, VS60::crtd_malloc, - "realloc", &VS60::pcrtd_realloc, VS60::crtd_realloc, - "_strdup", &VS60::pcrtd__strdup, VS60::crtd__strdup, - scalar_new_name, &VS60::pcrtd_scalar_new, VS60::crtd_scalar_new, - //vector_new_name, &VS60::pcrtd_vector_new, VS60::crtd_vector_new, - NULL, NULL, NULL + scalar_new_dbg_name, &VS60::data.pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, + //vector_new_dbg_name, &VS60::data.pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, + "calloc", &VS60::data.pcrtd_calloc, VS60::crtd_calloc, + "malloc", &VS60::data.pcrtd_malloc, VS60::crtd_malloc, + "realloc", &VS60::data.pcrtd_realloc, VS60::crtd_realloc, + "_strdup", &VS60::data.pcrtd__strdup, VS60::crtd__strdup, + scalar_new_name, &VS60::data.pcrtd_scalar_new, VS60::crtd_scalar_new, + //vector_new_name, &VS60::data.pcrtd_vector_new, VS60::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcrtdPatch [] = { - "_calloc_dbg", &VS60d::pcrtd__calloc_dbg, VS60d::crtd__calloc_dbg, - "_malloc_dbg", &VS60d::pcrtd__malloc_dbg, VS60d::crtd__malloc_dbg, - "_realloc_dbg", &VS60d::pcrtd__realloc_dbg, VS60d::crtd__realloc_dbg, - scalar_new_dbg_name, &VS60d::pcrtd__scalar_new_dbg, VS60d::crtd__scalar_new_dbg, - //vector_new_dbg_name, &VS60d::pcrtd__vector_new_dbg, VS60d::crtd__vector_new_dbg, - "calloc", &VS60d::pcrtd_calloc, VS60d::crtd_calloc, - "malloc", &VS60d::pcrtd_malloc, VS60d::crtd_malloc, - "realloc", &VS60d::pcrtd_realloc, VS60d::crtd_realloc, - "_strdup", &VS60d::pcrtd__strdup, VS60d::crtd__strdup, - scalar_new_name, &VS60d::pcrtd_scalar_new, VS60d::crtd_scalar_new, - //vector_new_name, &VS60d::pcrtd_vector_new, VS60d::crtd_vector_new, - NULL, NULL, NULL + "_calloc_dbg", &VS60d::data.pcrtd__calloc_dbg, VS60d::crtd__calloc_dbg, + "_malloc_dbg", &VS60d::data.pcrtd__malloc_dbg, VS60d::crtd__malloc_dbg, + "_realloc_dbg", &VS60d::data.pcrtd__realloc_dbg, VS60d::crtd__realloc_dbg, + scalar_new_dbg_name, &VS60d::data.pcrtd__scalar_new_dbg, VS60d::crtd__scalar_new_dbg, + //vector_new_dbg_name, &VS60d::data.pcrtd__vector_new_dbg, VS60d::crtd__vector_new_dbg, + "calloc", &VS60d::data.pcrtd_calloc, VS60d::crtd_calloc, + "malloc", &VS60d::data.pcrtd_malloc, VS60d::crtd_malloc, + "realloc", &VS60d::data.pcrtd_realloc, VS60d::crtd_realloc, + "_strdup", &VS60d::data.pcrtd__strdup, VS60d::crtd__strdup, + scalar_new_name, &VS60d::data.pcrtd_scalar_new, VS60d::crtd_scalar_new, + //vector_new_name, &VS60d::data.pcrtd_vector_new, VS60d::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr70Patch [] = { - scalar_new_dbg_name, &VS70::pcrtd__scalar_new_dbg, VS70::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS70::pcrtd__vector_new_dbg, VS70::crtd__vector_new_dbg, - "calloc", &VS70::pcrtd_calloc, VS70::crtd_calloc, - "malloc", &VS70::pcrtd_malloc, VS70::crtd_malloc, - "realloc", &VS70::pcrtd_realloc, VS70::crtd_realloc, - "_strdup", &VS70::pcrtd__strdup, VS70::crtd__strdup, - "_wcsdup", &VS70::pcrtd__wcsdup, VS70::crtd__wcsdup, - scalar_new_name, &VS70::pcrtd_scalar_new, VS70::crtd_scalar_new, - vector_new_name, &VS70::pcrtd_vector_new, VS70::crtd_vector_new, - NULL, NULL, NULL + scalar_new_dbg_name, &VS70::data.pcrtd__scalar_new_dbg, VS70::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS70::data.pcrtd__vector_new_dbg, VS70::crtd__vector_new_dbg, + "calloc", &VS70::data.pcrtd_calloc, VS70::crtd_calloc, + "malloc", &VS70::data.pcrtd_malloc, VS70::crtd_malloc, + "realloc", &VS70::data.pcrtd_realloc, VS70::crtd_realloc, + "_strdup", &VS70::data.pcrtd__strdup, VS70::crtd__strdup, + "_wcsdup", &VS70::data.pcrtd__wcsdup, VS70::crtd__wcsdup, + scalar_new_name, &VS70::data.pcrtd_scalar_new, VS70::crtd_scalar_new, + vector_new_name, &VS70::data.pcrtd_vector_new, VS70::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr70dPatch [] = { - "_calloc_dbg", &VS70d::pcrtd__calloc_dbg, VS70d::crtd__calloc_dbg, - "_malloc_dbg", &VS70d::pcrtd__malloc_dbg, VS70d::crtd__malloc_dbg, - "_realloc_dbg", &VS70d::pcrtd__realloc_dbg, VS70d::crtd__realloc_dbg, - scalar_new_dbg_name, &VS70d::pcrtd__scalar_new_dbg, VS70d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS70d::pcrtd__vector_new_dbg, VS70d::crtd__vector_new_dbg, - "calloc", &VS70d::pcrtd_calloc, VS70d::crtd_calloc, - "malloc", &VS70d::pcrtd_malloc, VS70d::crtd_malloc, - "realloc", &VS70d::pcrtd_realloc, VS70d::crtd_realloc, - "_strdup", &VS70d::pcrtd__strdup, VS70d::crtd__strdup, - "_wcsdup", &VS70d::pcrtd__wcsdup, VS70d::crtd__wcsdup, - scalar_new_name, &VS70d::pcrtd_scalar_new, VS70d::crtd_scalar_new, - vector_new_name, &VS70d::pcrtd_vector_new, VS70d::crtd_vector_new, - NULL, NULL, NULL + "_calloc_dbg", &VS70d::data.pcrtd__calloc_dbg, VS70d::crtd__calloc_dbg, + "_malloc_dbg", &VS70d::data.pcrtd__malloc_dbg, VS70d::crtd__malloc_dbg, + "_realloc_dbg", &VS70d::data.pcrtd__realloc_dbg, VS70d::crtd__realloc_dbg, + scalar_new_dbg_name, &VS70d::data.pcrtd__scalar_new_dbg, VS70d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS70d::data.pcrtd__vector_new_dbg, VS70d::crtd__vector_new_dbg, + "calloc", &VS70d::data.pcrtd_calloc, VS70d::crtd_calloc, + "malloc", &VS70d::data.pcrtd_malloc, VS70d::crtd_malloc, + "realloc", &VS70d::data.pcrtd_realloc, VS70d::crtd_realloc, + "_strdup", &VS70d::data.pcrtd__strdup, VS70d::crtd__strdup, + "_wcsdup", &VS70d::data.pcrtd__wcsdup, VS70d::crtd__wcsdup, + scalar_new_name, &VS70d::data.pcrtd_scalar_new, VS70d::crtd_scalar_new, + vector_new_name, &VS70d::data.pcrtd_vector_new, VS70d::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr71Patch [] = { - scalar_new_dbg_name, &VS71::pcrtd__scalar_new_dbg, VS71::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS71::pcrtd__vector_new_dbg, VS71::crtd__vector_new_dbg, - "calloc", &VS71::pcrtd_calloc, VS71::crtd_calloc, - "malloc", &VS71::pcrtd_malloc, VS71::crtd_malloc, - "realloc", &VS71::pcrtd_realloc, VS71::crtd_realloc, - "_strdup", &VS71::pcrtd__strdup, VS71::crtd__strdup, - "_wcsdup", &VS71::pcrtd__wcsdup, VS71::crtd__wcsdup, - scalar_new_name, &VS71::pcrtd_scalar_new, VS71::crtd_scalar_new, - vector_new_name, &VS71::pcrtd_vector_new, VS71::crtd_vector_new, - NULL, NULL, NULL + scalar_new_dbg_name, &VS71::data.pcrtd__scalar_new_dbg, VS71::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS71::data.pcrtd__vector_new_dbg, VS71::crtd__vector_new_dbg, + "calloc", &VS71::data.pcrtd_calloc, VS71::crtd_calloc, + "malloc", &VS71::data.pcrtd_malloc, VS71::crtd_malloc, + "realloc", &VS71::data.pcrtd_realloc, VS71::crtd_realloc, + "_strdup", &VS71::data.pcrtd__strdup, VS71::crtd__strdup, + "_wcsdup", &VS71::data.pcrtd__wcsdup, VS71::crtd__wcsdup, + scalar_new_name, &VS71::data.pcrtd_scalar_new, VS71::crtd_scalar_new, + vector_new_name, &VS71::data.pcrtd_vector_new, VS71::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr71dPatch [] = { - "_calloc_dbg", &VS71d::pcrtd__calloc_dbg, VS71d::crtd__calloc_dbg, - "_malloc_dbg", &VS71d::pcrtd__malloc_dbg, VS71d::crtd__malloc_dbg, - "_realloc_dbg", &VS71d::pcrtd__realloc_dbg, VS71d::crtd__realloc_dbg, - "_strdup_dbg", &VS71d::pcrtd__strdup_dbg, VS71d::crtd__strdup_dbg, - "_wcsdup_dbg", &VS71d::pcrtd__wcsdup_dbg, VS71d::crtd__wcsdup_dbg, - scalar_new_dbg_name, &VS71d::pcrtd__scalar_new_dbg, VS71d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS71d::pcrtd__vector_new_dbg, VS71d::crtd__vector_new_dbg, - "calloc", &VS71d::pcrtd_calloc, VS71d::crtd_calloc, - "malloc", &VS71d::pcrtd_malloc, VS71d::crtd_malloc, - "realloc", &VS71d::pcrtd_realloc, VS71d::crtd_realloc, - "_strdup", &VS71d::pcrtd__strdup, VS71d::crtd__strdup, - "_wcsdup", &VS71d::pcrtd__wcsdup, VS71d::crtd__wcsdup, - scalar_new_name, &VS71d::pcrtd_scalar_new, VS71d::crtd_scalar_new, - vector_new_name, &VS71d::pcrtd_vector_new, VS71d::crtd_vector_new, - NULL, NULL, NULL + "_calloc_dbg", &VS71d::data.pcrtd__calloc_dbg, VS71d::crtd__calloc_dbg, + "_malloc_dbg", &VS71d::data.pcrtd__malloc_dbg, VS71d::crtd__malloc_dbg, + "_realloc_dbg", &VS71d::data.pcrtd__realloc_dbg, VS71d::crtd__realloc_dbg, + "_strdup_dbg", &VS71d::data.pcrtd__strdup_dbg, VS71d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS71d::data.pcrtd__wcsdup_dbg, VS71d::crtd__wcsdup_dbg, + scalar_new_dbg_name, &VS71d::data.pcrtd__scalar_new_dbg, VS71d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS71d::data.pcrtd__vector_new_dbg, VS71d::crtd__vector_new_dbg, + "calloc", &VS71d::data.pcrtd_calloc, VS71d::crtd_calloc, + "malloc", &VS71d::data.pcrtd_malloc, VS71d::crtd_malloc, + "realloc", &VS71d::data.pcrtd_realloc, VS71d::crtd_realloc, + "_strdup", &VS71d::data.pcrtd__strdup, VS71d::crtd__strdup, + "_wcsdup", &VS71d::data.pcrtd__wcsdup, VS71d::crtd__wcsdup, + scalar_new_name, &VS71d::data.pcrtd_scalar_new, VS71d::crtd_scalar_new, + vector_new_name, &VS71d::data.pcrtd_vector_new, VS71d::crtd_vector_new, + NULL, NULL, NULL }; static patchentry_t msvcr80Patch [] = { - scalar_new_dbg_name, &VS80::pcrtd__scalar_new_dbg, VS80::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS80::pcrtd__vector_new_dbg, VS80::crtd__vector_new_dbg, - "calloc", &VS80::pcrtd_calloc, VS80::crtd_calloc, - "malloc", &VS80::pcrtd_malloc, VS80::crtd_malloc, - "realloc", &VS80::pcrtd_realloc, VS80::crtd_realloc, - "_strdup", &VS80::pcrtd__strdup, VS80::crtd__strdup, - "_wcsdup", &VS80::pcrtd__wcsdup, VS80::crtd__wcsdup, - scalar_new_name, &VS80::pcrtd_scalar_new, VS80::crtd_scalar_new, - vector_new_name, &VS80::pcrtd_vector_new, VS80::crtd_vector_new, - "_aligned_malloc", &VS80::pcrtd_aligned_malloc, VS80::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS80::pcrtd_aligned_offset_malloc, VS80::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS80::pcrtd_aligned_realloc, VS80::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS80::pcrtd_aligned_offset_realloc, VS80::crtd__aligned_offset_realloc, - NULL, NULL, NULL + scalar_new_dbg_name, &VS80::data.pcrtd__scalar_new_dbg, VS80::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS80::data.pcrtd__vector_new_dbg, VS80::crtd__vector_new_dbg, + "calloc", &VS80::data.pcrtd_calloc, VS80::crtd_calloc, + "malloc", &VS80::data.pcrtd_malloc, VS80::crtd_malloc, + "realloc", &VS80::data.pcrtd_realloc, VS80::crtd_realloc, + "_strdup", &VS80::data.pcrtd__strdup, VS80::crtd__strdup, + "_wcsdup", &VS80::data.pcrtd__wcsdup, VS80::crtd__wcsdup, + scalar_new_name, &VS80::data.pcrtd_scalar_new, VS80::crtd_scalar_new, + vector_new_name, &VS80::data.pcrtd_vector_new, VS80::crtd_vector_new, + "_aligned_malloc", &VS80::data.pcrtd_aligned_malloc, VS80::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS80::data.pcrtd_aligned_offset_malloc, VS80::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS80::data.pcrtd_aligned_realloc, VS80::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS80::data.pcrtd_aligned_offset_realloc, VS80::crtd__aligned_offset_realloc, + NULL, NULL, NULL }; static patchentry_t msvcr80dPatch [] = { - "_calloc_dbg", &VS80d::pcrtd__calloc_dbg, VS80d::crtd__calloc_dbg, - "_malloc_dbg", &VS80d::pcrtd__malloc_dbg, VS80d::crtd__malloc_dbg, - "_realloc_dbg", &VS80d::pcrtd__realloc_dbg, VS80d::crtd__realloc_dbg, - "_strdup_dbg", &VS80d::pcrtd__strdup_dbg, VS80d::crtd__strdup_dbg, - "_wcsdup_dbg", &VS80d::pcrtd__wcsdup_dbg, VS80d::crtd__wcsdup_dbg, - scalar_new_dbg_name, &VS80d::pcrtd__scalar_new_dbg, VS80d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS80d::pcrtd__vector_new_dbg, VS80d::crtd__vector_new_dbg, - "calloc", &VS80d::pcrtd_calloc, VS80d::crtd_calloc, - "malloc", &VS80d::pcrtd_malloc, VS80d::crtd_malloc, - "realloc", &VS80d::pcrtd_realloc, VS80d::crtd_realloc, - "_strdup", &VS80d::pcrtd__strdup, VS80d::crtd__strdup, - "_wcsdup", &VS80d::pcrtd__wcsdup, VS80d::crtd__wcsdup, - scalar_new_name, &VS80d::pcrtd_scalar_new, VS80d::crtd_scalar_new, - vector_new_name, &VS80d::pcrtd_vector_new, VS80d::crtd_vector_new, - "_aligned_malloc_dbg", &VS80d::pcrtd__aligned_malloc_dbg, VS80d::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS80d::pcrtd__aligned_offset_malloc_dbg, VS80d::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS80d::pcrtd__aligned_realloc_dbg, VS80d::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS80d::pcrtd__aligned_offset_realloc_dbg, VS80d::crtd__aligned_offset_realloc_dbg, - "_aligned_malloc", &VS80d::pcrtd_aligned_malloc, VS80d::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS80d::pcrtd_aligned_offset_malloc, VS80d::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS80d::pcrtd_aligned_realloc, VS80d::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS80d::pcrtd_aligned_offset_realloc, VS80d::crtd__aligned_offset_realloc, - NULL, NULL, NULL + "_calloc_dbg", &VS80d::data.pcrtd__calloc_dbg, VS80d::crtd__calloc_dbg, + "_malloc_dbg", &VS80d::data.pcrtd__malloc_dbg, VS80d::crtd__malloc_dbg, + "_realloc_dbg", &VS80d::data.pcrtd__realloc_dbg, VS80d::crtd__realloc_dbg, + "_strdup_dbg", &VS80d::data.pcrtd__strdup_dbg, VS80d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS80d::data.pcrtd__wcsdup_dbg, VS80d::crtd__wcsdup_dbg, + scalar_new_dbg_name, &VS80d::data.pcrtd__scalar_new_dbg, VS80d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS80d::data.pcrtd__vector_new_dbg, VS80d::crtd__vector_new_dbg, + "calloc", &VS80d::data.pcrtd_calloc, VS80d::crtd_calloc, + "malloc", &VS80d::data.pcrtd_malloc, VS80d::crtd_malloc, + "realloc", &VS80d::data.pcrtd_realloc, VS80d::crtd_realloc, + "_strdup", &VS80d::data.pcrtd__strdup, VS80d::crtd__strdup, + "_wcsdup", &VS80d::data.pcrtd__wcsdup, VS80d::crtd__wcsdup, + scalar_new_name, &VS80d::data.pcrtd_scalar_new, VS80d::crtd_scalar_new, + vector_new_name, &VS80d::data.pcrtd_vector_new, VS80d::crtd_vector_new, + "_aligned_malloc_dbg", &VS80d::data.pcrtd__aligned_malloc_dbg, VS80d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS80d::data.pcrtd__aligned_offset_malloc_dbg, VS80d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS80d::data.pcrtd__aligned_realloc_dbg, VS80d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS80d::data.pcrtd__aligned_offset_realloc_dbg, VS80d::crtd__aligned_offset_realloc_dbg, + "_aligned_malloc", &VS80d::data.pcrtd_aligned_malloc, VS80d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS80d::data.pcrtd_aligned_offset_malloc, VS80d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS80d::data.pcrtd_aligned_realloc, VS80d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS80d::data.pcrtd_aligned_offset_realloc, VS80d::crtd__aligned_offset_realloc, + NULL, NULL, NULL }; static patchentry_t msvcr90Patch [] = { - scalar_new_dbg_name, &VS90::pcrtd__scalar_new_dbg, VS90::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS90::pcrtd__vector_new_dbg, VS90::crtd__vector_new_dbg, - "calloc", &VS90::pcrtd_calloc, VS90::crtd_calloc, - "malloc", &VS90::pcrtd_malloc, VS90::crtd_malloc, - "realloc", &VS90::pcrtd_realloc, VS90::crtd_realloc, - "_recalloc", &VS90::pcrtd_recalloc, VS90::crtd__recalloc, - "_strdup", &VS90::pcrtd__strdup, VS90::crtd__strdup, - "_wcsdup", &VS90::pcrtd__wcsdup, VS90::crtd__wcsdup, - scalar_new_name, &VS90::pcrtd_scalar_new, VS90::crtd_scalar_new, - vector_new_name, &VS90::pcrtd_vector_new, VS90::crtd_vector_new, - "_aligned_malloc", &VS90::pcrtd_aligned_malloc, VS90::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS90::pcrtd_aligned_offset_malloc, VS90::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS90::pcrtd_aligned_realloc, VS90::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS90::pcrtd_aligned_offset_realloc, VS90::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS90::pcrtd_aligned_recalloc, VS90::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS90::pcrtd_aligned_offset_recalloc, VS90::crtd__aligned_offset_recalloc, - NULL, NULL, NULL + scalar_new_dbg_name, &VS90::data.pcrtd__scalar_new_dbg, VS90::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS90::data.pcrtd__vector_new_dbg, VS90::crtd__vector_new_dbg, + "calloc", &VS90::data.pcrtd_calloc, VS90::crtd_calloc, + "malloc", &VS90::data.pcrtd_malloc, VS90::crtd_malloc, + "realloc", &VS90::data.pcrtd_realloc, VS90::crtd_realloc, + "_recalloc", &VS90::data.pcrtd_recalloc, VS90::crtd__recalloc, + "_strdup", &VS90::data.pcrtd__strdup, VS90::crtd__strdup, + "_wcsdup", &VS90::data.pcrtd__wcsdup, VS90::crtd__wcsdup, + scalar_new_name, &VS90::data.pcrtd_scalar_new, VS90::crtd_scalar_new, + vector_new_name, &VS90::data.pcrtd_vector_new, VS90::crtd_vector_new, + "_aligned_malloc", &VS90::data.pcrtd_aligned_malloc, VS90::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS90::data.pcrtd_aligned_offset_malloc, VS90::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS90::data.pcrtd_aligned_realloc, VS90::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS90::data.pcrtd_aligned_offset_realloc, VS90::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS90::data.pcrtd_aligned_recalloc, VS90::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS90::data.pcrtd_aligned_offset_recalloc, VS90::crtd__aligned_offset_recalloc, + NULL, NULL, NULL }; static patchentry_t msvcr90dPatch [] = { - "_calloc_dbg", &VS90d::pcrtd__calloc_dbg, VS90d::crtd__calloc_dbg, - "_malloc_dbg", &VS90d::pcrtd__malloc_dbg, VS90d::crtd__malloc_dbg, - "_realloc_dbg", &VS90d::pcrtd__realloc_dbg, VS90d::crtd__realloc_dbg, - "_recalloc_dbg", &VS90d::pcrtd__recalloc_dbg, VS90d::crtd__recalloc_dbg, - "_strdup_dbg", &VS90d::pcrtd__strdup_dbg, VS90d::crtd__strdup_dbg, - "_wcsdup_dbg", &VS90d::pcrtd__wcsdup_dbg, VS90d::crtd__wcsdup_dbg, - scalar_new_dbg_name, &VS90d::pcrtd__scalar_new_dbg, VS90d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS90d::pcrtd__vector_new_dbg, VS90d::crtd__vector_new_dbg, - "calloc", &VS90d::pcrtd_calloc, VS90d::crtd_calloc, - "malloc", &VS90d::pcrtd_malloc, VS90d::crtd_malloc, - "realloc", &VS90d::pcrtd_realloc, VS90d::crtd_realloc, - "_recalloc", &VS90d::pcrtd_recalloc, VS90d::crtd__recalloc, - "_strdup", &VS90d::pcrtd__strdup, VS90d::crtd__strdup, - "_wcsdup", &VS90d::pcrtd__wcsdup, VS90d::crtd__wcsdup, - scalar_new_name, &VS90d::pcrtd_scalar_new, VS90d::crtd_scalar_new, - vector_new_name, &VS90d::pcrtd_vector_new, VS90d::crtd_vector_new, - "_aligned_malloc_dbg", &VS90d::pcrtd__aligned_malloc_dbg, VS90d::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS90d::pcrtd__aligned_offset_malloc_dbg, VS90d::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS90d::pcrtd__aligned_realloc_dbg, VS90d::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS90d::pcrtd__aligned_offset_realloc_dbg, VS90d::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", &VS90d::pcrtd__aligned_recalloc_dbg, VS90d::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", &VS90d::pcrtd__aligned_offset_recalloc_dbg, VS90d::crtd__aligned_offset_recalloc_dbg, - "_aligned_malloc", &VS90d::pcrtd_aligned_malloc, VS90d::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS90d::pcrtd_aligned_offset_malloc, VS90d::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS90d::pcrtd_aligned_realloc, VS90d::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS90d::pcrtd_aligned_offset_realloc, VS90d::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS90d::pcrtd_aligned_recalloc, VS90d::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS90d::pcrtd_aligned_offset_recalloc, VS90d::crtd__aligned_offset_recalloc, - NULL, NULL, NULL + "_calloc_dbg", &VS90d::data.pcrtd__calloc_dbg, VS90d::crtd__calloc_dbg, + "_malloc_dbg", &VS90d::data.pcrtd__malloc_dbg, VS90d::crtd__malloc_dbg, + "_realloc_dbg", &VS90d::data.pcrtd__realloc_dbg, VS90d::crtd__realloc_dbg, + "_recalloc_dbg", &VS90d::data.pcrtd__recalloc_dbg, VS90d::crtd__recalloc_dbg, + "_strdup_dbg", &VS90d::data.pcrtd__strdup_dbg, VS90d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS90d::data.pcrtd__wcsdup_dbg, VS90d::crtd__wcsdup_dbg, + scalar_new_dbg_name, &VS90d::data.pcrtd__scalar_new_dbg, VS90d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS90d::data.pcrtd__vector_new_dbg, VS90d::crtd__vector_new_dbg, + "calloc", &VS90d::data.pcrtd_calloc, VS90d::crtd_calloc, + "malloc", &VS90d::data.pcrtd_malloc, VS90d::crtd_malloc, + "realloc", &VS90d::data.pcrtd_realloc, VS90d::crtd_realloc, + "_recalloc", &VS90d::data.pcrtd_recalloc, VS90d::crtd__recalloc, + "_strdup", &VS90d::data.pcrtd__strdup, VS90d::crtd__strdup, + "_wcsdup", &VS90d::data.pcrtd__wcsdup, VS90d::crtd__wcsdup, + scalar_new_name, &VS90d::data.pcrtd_scalar_new, VS90d::crtd_scalar_new, + vector_new_name, &VS90d::data.pcrtd_vector_new, VS90d::crtd_vector_new, + "_aligned_malloc_dbg", &VS90d::data.pcrtd__aligned_malloc_dbg, VS90d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS90d::data.pcrtd__aligned_offset_malloc_dbg, VS90d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS90d::data.pcrtd__aligned_realloc_dbg, VS90d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS90d::data.pcrtd__aligned_offset_realloc_dbg, VS90d::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS90d::data.pcrtd__aligned_recalloc_dbg, VS90d::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS90d::data.pcrtd__aligned_offset_recalloc_dbg, VS90d::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS90d::data.pcrtd_aligned_malloc, VS90d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS90d::data.pcrtd_aligned_offset_malloc, VS90d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS90d::data.pcrtd_aligned_realloc, VS90d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS90d::data.pcrtd_aligned_offset_realloc, VS90d::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS90d::data.pcrtd_aligned_recalloc, VS90d::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS90d::data.pcrtd_aligned_offset_recalloc, VS90d::crtd__aligned_offset_recalloc, + NULL, NULL, NULL }; static patchentry_t msvcr100Patch [] = { - scalar_new_dbg_name, &VS100::pcrtd__scalar_new_dbg, VS100::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS100::pcrtd__vector_new_dbg, VS100::crtd__vector_new_dbg, - "calloc", &VS100::pcrtd_calloc, VS100::crtd_calloc, - "malloc", &VS100::pcrtd_malloc, VS100::crtd_malloc, - "realloc", &VS100::pcrtd_realloc, VS100::crtd_realloc, - "_recalloc", &VS100::pcrtd_recalloc, VS100::crtd__recalloc, - "_strdup", &VS100::pcrtd__strdup, VS100::crtd__strdup, - "_wcsdup", &VS100::pcrtd__wcsdup, VS100::crtd__wcsdup, - scalar_new_name, &VS100::pcrtd_scalar_new, VS100::crtd_scalar_new, - vector_new_name, &VS100::pcrtd_vector_new, VS100::crtd_vector_new, - "_aligned_malloc", &VS100::pcrtd_aligned_malloc, VS100::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS100::pcrtd_aligned_offset_malloc, VS100::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS100::pcrtd_aligned_realloc, VS100::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS100::pcrtd_aligned_offset_realloc, VS100::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS100::pcrtd_aligned_recalloc, VS100::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS100::pcrtd_aligned_offset_recalloc, VS100::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + scalar_new_dbg_name, &VS100::data.pcrtd__scalar_new_dbg, VS100::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS100::data.pcrtd__vector_new_dbg, VS100::crtd__vector_new_dbg, + "calloc", &VS100::data.pcrtd_calloc, VS100::crtd_calloc, + "malloc", &VS100::data.pcrtd_malloc, VS100::crtd_malloc, + "realloc", &VS100::data.pcrtd_realloc, VS100::crtd_realloc, + "_recalloc", &VS100::data.pcrtd_recalloc, VS100::crtd__recalloc, + "_strdup", &VS100::data.pcrtd__strdup, VS100::crtd__strdup, + "_wcsdup", &VS100::data.pcrtd__wcsdup, VS100::crtd__wcsdup, + scalar_new_name, &VS100::data.pcrtd_scalar_new, VS100::crtd_scalar_new, + vector_new_name, &VS100::data.pcrtd_vector_new, VS100::crtd_vector_new, + "_aligned_malloc", &VS100::data.pcrtd_aligned_malloc, VS100::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS100::data.pcrtd_aligned_offset_malloc, VS100::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS100::data.pcrtd_aligned_realloc, VS100::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS100::data.pcrtd_aligned_offset_realloc, VS100::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS100::data.pcrtd_aligned_recalloc, VS100::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS100::data.pcrtd_aligned_offset_recalloc, VS100::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, }; static patchentry_t msvcr100dPatch [] = { - "_calloc_dbg", &VS100d::pcrtd__calloc_dbg, VS100d::crtd__calloc_dbg, - "_malloc_dbg", &VS100d::pcrtd__malloc_dbg, VS100d::crtd__malloc_dbg, - "_realloc_dbg", &VS100d::pcrtd__realloc_dbg, VS100d::crtd__realloc_dbg, - "_recalloc_dbg", &VS100d::pcrtd__recalloc_dbg, VS100d::crtd__recalloc_dbg, - "_strdup_dbg", &VS100d::pcrtd__strdup_dbg, VS100d::crtd__strdup_dbg, - "_wcsdup_dbg", &VS100d::pcrtd__wcsdup_dbg, VS100d::crtd__wcsdup_dbg, - scalar_new_dbg_name, &VS100d::pcrtd__scalar_new_dbg, VS100d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS100d::pcrtd__vector_new_dbg, VS100d::crtd__vector_new_dbg, - "calloc", &VS100d::pcrtd_calloc, VS100d::crtd_calloc, - "malloc", &VS100d::pcrtd_malloc, VS100d::crtd_malloc, - "realloc", &VS100d::pcrtd_realloc, VS100d::crtd_realloc, - "_recalloc", &VS100d::pcrtd_recalloc, VS100d::crtd__recalloc, - "_strdup", &VS100d::pcrtd__strdup, VS100d::crtd__strdup, - "_wcsdup", &VS100d::pcrtd__wcsdup, VS100d::crtd__wcsdup, - scalar_new_name, &VS100d::pcrtd_scalar_new, VS100d::crtd_scalar_new, - vector_new_name, &VS100d::pcrtd_vector_new, VS100d::crtd_vector_new, - "_aligned_malloc_dbg", &VS100d::pcrtd__aligned_malloc_dbg, VS100d::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS100d::pcrtd__aligned_offset_malloc_dbg, VS100d::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS100d::pcrtd__aligned_realloc_dbg, VS100d::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS100d::pcrtd__aligned_offset_realloc_dbg, VS100d::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", &VS100d::pcrtd__aligned_recalloc_dbg, VS100d::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", &VS100d::pcrtd__aligned_offset_recalloc_dbg,VS100d::crtd__aligned_offset_recalloc_dbg, - "_aligned_malloc", &VS100d::pcrtd_aligned_malloc, VS100d::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS100d::pcrtd_aligned_offset_malloc, VS100d::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS100d::pcrtd_aligned_realloc, VS100d::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS100d::pcrtd_aligned_offset_realloc, VS100d::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS100d::pcrtd_aligned_recalloc, VS100d::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS100d::pcrtd_aligned_offset_recalloc, VS100d::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + "_calloc_dbg", &VS100d::data.pcrtd__calloc_dbg, VS100d::crtd__calloc_dbg, + "_malloc_dbg", &VS100d::data.pcrtd__malloc_dbg, VS100d::crtd__malloc_dbg, + "_realloc_dbg", &VS100d::data.pcrtd__realloc_dbg, VS100d::crtd__realloc_dbg, + "_recalloc_dbg", &VS100d::data.pcrtd__recalloc_dbg, VS100d::crtd__recalloc_dbg, + "_strdup_dbg", &VS100d::data.pcrtd__strdup_dbg, VS100d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS100d::data.pcrtd__wcsdup_dbg, VS100d::crtd__wcsdup_dbg, + scalar_new_dbg_name, &VS100d::data.pcrtd__scalar_new_dbg, VS100d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS100d::data.pcrtd__vector_new_dbg, VS100d::crtd__vector_new_dbg, + "calloc", &VS100d::data.pcrtd_calloc, VS100d::crtd_calloc, + "malloc", &VS100d::data.pcrtd_malloc, VS100d::crtd_malloc, + "realloc", &VS100d::data.pcrtd_realloc, VS100d::crtd_realloc, + "_recalloc", &VS100d::data.pcrtd_recalloc, VS100d::crtd__recalloc, + "_strdup", &VS100d::data.pcrtd__strdup, VS100d::crtd__strdup, + "_wcsdup", &VS100d::data.pcrtd__wcsdup, VS100d::crtd__wcsdup, + scalar_new_name, &VS100d::data.pcrtd_scalar_new, VS100d::crtd_scalar_new, + vector_new_name, &VS100d::data.pcrtd_vector_new, VS100d::crtd_vector_new, + "_aligned_malloc_dbg", &VS100d::data.pcrtd__aligned_malloc_dbg, VS100d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS100d::data.pcrtd__aligned_offset_malloc_dbg, VS100d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS100d::data.pcrtd__aligned_realloc_dbg, VS100d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS100d::data.pcrtd__aligned_offset_realloc_dbg, VS100d::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS100d::data.pcrtd__aligned_recalloc_dbg, VS100d::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS100d::data.pcrtd__aligned_offset_recalloc_dbg, VS100d::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS100d::data.pcrtd_aligned_malloc, VS100d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS100d::data.pcrtd_aligned_offset_malloc, VS100d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS100d::data.pcrtd_aligned_realloc, VS100d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS100d::data.pcrtd_aligned_offset_realloc, VS100d::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS100d::data.pcrtd_aligned_recalloc, VS100d::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS100d::data.pcrtd_aligned_offset_recalloc, VS100d::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, }; static patchentry_t msvcr110Patch [] = { - scalar_new_dbg_name, &VS110::pcrtd__scalar_new_dbg, VS110::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS110::pcrtd__vector_new_dbg, VS110::crtd__vector_new_dbg, - "calloc", &VS110::pcrtd_calloc, VS110::crtd_calloc, - "malloc", &VS110::pcrtd_malloc, VS110::crtd_malloc, - "realloc", &VS110::pcrtd_realloc, VS110::crtd_realloc, - "_recalloc", &VS110::pcrtd_recalloc, VS110::crtd__recalloc, - "_strdup", &VS110::pcrtd__strdup, VS110::crtd__strdup, - "_wcsdup", &VS110::pcrtd__wcsdup, VS110::crtd__wcsdup, - scalar_new_name, &VS110::pcrtd_scalar_new, VS110::crtd_scalar_new, - vector_new_name, &VS110::pcrtd_vector_new, VS110::crtd_vector_new, - "_aligned_malloc", &VS110::pcrtd_aligned_malloc, VS110::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS110::pcrtd_aligned_offset_malloc, VS110::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS110::pcrtd_aligned_realloc, VS110::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS110::pcrtd_aligned_offset_realloc, VS110::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS110::pcrtd_aligned_recalloc, VS110::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS110::pcrtd_aligned_offset_recalloc, VS110::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + scalar_new_dbg_name, &VS110::data.pcrtd__scalar_new_dbg, VS110::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS110::data.pcrtd__vector_new_dbg, VS110::crtd__vector_new_dbg, + "calloc", &VS110::data.pcrtd_calloc, VS110::crtd_calloc, + "malloc", &VS110::data.pcrtd_malloc, VS110::crtd_malloc, + "realloc", &VS110::data.pcrtd_realloc, VS110::crtd_realloc, + "_recalloc", &VS110::data.pcrtd_recalloc, VS110::crtd__recalloc, + "_strdup", &VS110::data.pcrtd__strdup, VS110::crtd__strdup, + "_wcsdup", &VS110::data.pcrtd__wcsdup, VS110::crtd__wcsdup, + scalar_new_name, &VS110::data.pcrtd_scalar_new, VS110::crtd_scalar_new, + vector_new_name, &VS110::data.pcrtd_vector_new, VS110::crtd_vector_new, + "_aligned_malloc", &VS110::data.pcrtd_aligned_malloc, VS110::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS110::data.pcrtd_aligned_offset_malloc, VS110::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS110::data.pcrtd_aligned_realloc, VS110::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS110::data.pcrtd_aligned_offset_realloc, VS110::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS110::data.pcrtd_aligned_recalloc, VS110::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS110::data.pcrtd_aligned_offset_recalloc, VS110::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, }; static patchentry_t msvcr110dPatch [] = { - "_calloc_dbg", &VS110d::pcrtd__calloc_dbg, VS110d::crtd__calloc_dbg, - "_malloc_dbg", &VS110d::pcrtd__malloc_dbg, VS110d::crtd__malloc_dbg, - "_realloc_dbg", &VS110d::pcrtd__realloc_dbg, VS110d::crtd__realloc_dbg, - "_recalloc_dbg", &VS110d::pcrtd__recalloc_dbg, VS110d::crtd__recalloc_dbg, - "_strdup_dbg", &VS110d::pcrtd__strdup_dbg, VS110d::crtd__strdup_dbg, - "_wcsdup_dbg", &VS110d::pcrtd__wcsdup_dbg, VS110d::crtd__wcsdup_dbg, - scalar_new_dbg_name, &VS110d::pcrtd__scalar_new_dbg, VS110d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS110d::pcrtd__vector_new_dbg, VS110d::crtd__vector_new_dbg, - "calloc", &VS110d::pcrtd_calloc, VS110d::crtd_calloc, - "malloc", &VS110d::pcrtd_malloc, VS110d::crtd_malloc, - "realloc", &VS110d::pcrtd_realloc, VS110d::crtd_realloc, - "_recalloc", &VS110d::pcrtd_recalloc, VS110d::crtd__recalloc, - "_strdup", &VS110d::pcrtd__strdup, VS110d::crtd__strdup, - "_wcsdup", &VS110d::pcrtd__wcsdup, VS110d::crtd__wcsdup, - scalar_new_name, &VS110d::pcrtd_scalar_new, VS110d::crtd_scalar_new, - vector_new_name, &VS110d::pcrtd_vector_new, VS110d::crtd_vector_new, - "_aligned_malloc_dbg", &VS110d::pcrtd__aligned_malloc_dbg, VS110d::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS110d::pcrtd__aligned_offset_malloc_dbg, VS110d::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS110d::pcrtd__aligned_realloc_dbg, VS110d::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS110d::pcrtd__aligned_offset_realloc_dbg, VS110d::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", &VS110d::pcrtd__aligned_recalloc_dbg, VS110d::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", &VS110d::pcrtd__aligned_offset_recalloc_dbg,VS110d::crtd__aligned_offset_recalloc_dbg, - "_aligned_malloc", &VS110d::pcrtd_aligned_malloc, VS110d::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS110d::pcrtd_aligned_offset_malloc, VS110d::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS110d::pcrtd_aligned_realloc, VS110d::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS110d::pcrtd_aligned_offset_realloc, VS110d::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS110d::pcrtd_aligned_recalloc, VS110d::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS110d::pcrtd_aligned_offset_recalloc, VS110d::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + "_calloc_dbg", &VS110d::data.pcrtd__calloc_dbg, VS110d::crtd__calloc_dbg, + "_malloc_dbg", &VS110d::data.pcrtd__malloc_dbg, VS110d::crtd__malloc_dbg, + "_realloc_dbg", &VS110d::data.pcrtd__realloc_dbg, VS110d::crtd__realloc_dbg, + "_recalloc_dbg", &VS110d::data.pcrtd__recalloc_dbg, VS110d::crtd__recalloc_dbg, + "_strdup_dbg", &VS110d::data.pcrtd__strdup_dbg, VS110d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS110d::data.pcrtd__wcsdup_dbg, VS110d::crtd__wcsdup_dbg, + scalar_new_dbg_name, &VS110d::data.pcrtd__scalar_new_dbg, VS110d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS110d::data.pcrtd__vector_new_dbg, VS110d::crtd__vector_new_dbg, + "calloc", &VS110d::data.pcrtd_calloc, VS110d::crtd_calloc, + "malloc", &VS110d::data.pcrtd_malloc, VS110d::crtd_malloc, + "realloc", &VS110d::data.pcrtd_realloc, VS110d::crtd_realloc, + "_recalloc", &VS110d::data.pcrtd_recalloc, VS110d::crtd__recalloc, + "_strdup", &VS110d::data.pcrtd__strdup, VS110d::crtd__strdup, + "_wcsdup", &VS110d::data.pcrtd__wcsdup, VS110d::crtd__wcsdup, + scalar_new_name, &VS110d::data.pcrtd_scalar_new, VS110d::crtd_scalar_new, + vector_new_name, &VS110d::data.pcrtd_vector_new, VS110d::crtd_vector_new, + "_aligned_malloc_dbg", &VS110d::data.pcrtd__aligned_malloc_dbg, VS110d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS110d::data.pcrtd__aligned_offset_malloc_dbg, VS110d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS110d::data.pcrtd__aligned_realloc_dbg, VS110d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS110d::data.pcrtd__aligned_offset_realloc_dbg, VS110d::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS110d::data.pcrtd__aligned_recalloc_dbg, VS110d::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS110d::data.pcrtd__aligned_offset_recalloc_dbg, VS110d::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS110d::data.pcrtd_aligned_malloc, VS110d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS110d::data.pcrtd_aligned_offset_malloc, VS110d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS110d::data.pcrtd_aligned_realloc, VS110d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS110d::data.pcrtd_aligned_offset_realloc, VS110d::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS110d::data.pcrtd_aligned_recalloc, VS110d::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS110d::data.pcrtd_aligned_offset_recalloc, VS110d::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, }; static patchentry_t msvcr120Patch [] = { - scalar_new_dbg_name, &VS120::pcrtd__scalar_new_dbg, VS120::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS120::pcrtd__vector_new_dbg, VS120::crtd__vector_new_dbg, - "calloc", &VS120::pcrtd_calloc, VS120::crtd_calloc, - "malloc", &VS120::pcrtd_malloc, VS120::crtd_malloc, - "realloc", &VS120::pcrtd_realloc, VS120::crtd_realloc, - "_recalloc", &VS120::pcrtd_recalloc, VS120::crtd__recalloc, - "_strdup", &VS120::pcrtd__strdup, VS120::crtd__strdup, - "_wcsdup", &VS120::pcrtd__wcsdup, VS120::crtd__wcsdup, - scalar_new_name, &VS120::pcrtd_scalar_new, VS120::crtd_scalar_new, - vector_new_name, &VS120::pcrtd_vector_new, VS120::crtd_vector_new, - "_aligned_malloc", &VS120::pcrtd_aligned_malloc, VS120::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS120::pcrtd_aligned_offset_malloc, VS120::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS120::pcrtd_aligned_realloc, VS120::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS120::pcrtd_aligned_offset_realloc, VS120::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS120::pcrtd_aligned_recalloc, VS120::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS120::pcrtd_aligned_offset_recalloc, VS120::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + scalar_new_dbg_name, &VS120::data.pcrtd__scalar_new_dbg, VS120::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS120::data.pcrtd__vector_new_dbg, VS120::crtd__vector_new_dbg, + "calloc", &VS120::data.pcrtd_calloc, VS120::crtd_calloc, + "malloc", &VS120::data.pcrtd_malloc, VS120::crtd_malloc, + "realloc", &VS120::data.pcrtd_realloc, VS120::crtd_realloc, + "_recalloc", &VS120::data.pcrtd_recalloc, VS120::crtd__recalloc, + "_strdup", &VS120::data.pcrtd__strdup, VS120::crtd__strdup, + "_wcsdup", &VS120::data.pcrtd__wcsdup, VS120::crtd__wcsdup, + scalar_new_name, &VS120::data.pcrtd_scalar_new, VS120::crtd_scalar_new, + vector_new_name, &VS120::data.pcrtd_vector_new, VS120::crtd_vector_new, + "_aligned_malloc", &VS120::data.pcrtd_aligned_malloc, VS120::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS120::data.pcrtd_aligned_offset_malloc, VS120::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS120::data.pcrtd_aligned_realloc, VS120::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS120::data.pcrtd_aligned_offset_realloc, VS120::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS120::data.pcrtd_aligned_recalloc, VS120::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS120::data.pcrtd_aligned_offset_recalloc, VS120::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, }; static patchentry_t msvcr120dPatch [] = { - "_calloc_dbg", &VS120d::pcrtd__calloc_dbg, VS120d::crtd__calloc_dbg, - "_malloc_dbg", &VS120d::pcrtd__malloc_dbg, VS120d::crtd__malloc_dbg, - "_realloc_dbg", &VS120d::pcrtd__realloc_dbg, VS120d::crtd__realloc_dbg, - "_recalloc_dbg", &VS120d::pcrtd__recalloc_dbg, VS120d::crtd__recalloc_dbg, - "_strdup_dbg", &VS120d::pcrtd__strdup_dbg, VS120d::crtd__strdup_dbg, - "_wcsdup_dbg", &VS120d::pcrtd__wcsdup_dbg, VS120d::crtd__wcsdup_dbg, - scalar_new_dbg_name, &VS120d::pcrtd__scalar_new_dbg, VS120d::crtd__scalar_new_dbg, - vector_new_dbg_name, &VS120d::pcrtd__vector_new_dbg, VS120d::crtd__vector_new_dbg, - "calloc", &VS120d::pcrtd_calloc, VS120d::crtd_calloc, - "malloc", &VS120d::pcrtd_malloc, VS120d::crtd_malloc, - "realloc", &VS120d::pcrtd_realloc, VS120d::crtd_realloc, - "_recalloc", &VS120d::pcrtd_recalloc, VS120d::crtd__recalloc, - "_strdup", &VS120d::pcrtd__strdup, VS120d::crtd__strdup, - "_wcsdup", &VS120d::pcrtd__wcsdup, VS120d::crtd__wcsdup, - scalar_new_name, &VS120d::pcrtd_scalar_new, VS120d::crtd_scalar_new, - vector_new_name, &VS120d::pcrtd_vector_new, VS120d::crtd_vector_new, - "_aligned_malloc_dbg", &VS120d::pcrtd__aligned_malloc_dbg, VS120d::crtd__aligned_malloc_dbg, - "_aligned_offset_malloc_dbg", &VS120d::pcrtd__aligned_offset_malloc_dbg, VS120d::crtd__aligned_offset_malloc_dbg, - "_aligned_realloc_dbg", &VS120d::pcrtd__aligned_realloc_dbg, VS120d::crtd__aligned_realloc_dbg, - "_aligned_offset_realloc_dbg", &VS120d::pcrtd__aligned_offset_realloc_dbg, VS120d::crtd__aligned_offset_realloc_dbg, - "_aligned_recalloc_dbg", &VS120d::pcrtd__aligned_recalloc_dbg, VS120d::crtd__aligned_recalloc_dbg, - "_aligned_offset_recalloc_dbg", &VS120d::pcrtd__aligned_offset_recalloc_dbg,VS120d::crtd__aligned_offset_recalloc_dbg, - "_aligned_malloc", &VS120d::pcrtd_aligned_malloc, VS120d::crtd__aligned_malloc, - "_aligned_offset_malloc", &VS120d::pcrtd_aligned_offset_malloc, VS120d::crtd__aligned_offset_malloc, - "_aligned_realloc", &VS120d::pcrtd_aligned_realloc, VS120d::crtd__aligned_realloc, - "_aligned_offset_realloc", &VS120d::pcrtd_aligned_offset_realloc, VS120d::crtd__aligned_offset_realloc, - "_aligned_recalloc", &VS120d::pcrtd_aligned_recalloc, VS120d::crtd__aligned_recalloc, - "_aligned_offset_recalloc", &VS120d::pcrtd_aligned_offset_recalloc, VS120d::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + "_calloc_dbg", &VS120d::data.pcrtd__calloc_dbg, VS120d::crtd__calloc_dbg, + "_malloc_dbg", &VS120d::data.pcrtd__malloc_dbg, VS120d::crtd__malloc_dbg, + "_realloc_dbg", &VS120d::data.pcrtd__realloc_dbg, VS120d::crtd__realloc_dbg, + "_recalloc_dbg", &VS120d::data.pcrtd__recalloc_dbg, VS120d::crtd__recalloc_dbg, + "_strdup_dbg", &VS120d::data.pcrtd__strdup_dbg, VS120d::crtd__strdup_dbg, + "_wcsdup_dbg", &VS120d::data.pcrtd__wcsdup_dbg, VS120d::crtd__wcsdup_dbg, + scalar_new_dbg_name, &VS120d::data.pcrtd__scalar_new_dbg, VS120d::crtd__scalar_new_dbg, + vector_new_dbg_name, &VS120d::data.pcrtd__vector_new_dbg, VS120d::crtd__vector_new_dbg, + "calloc", &VS120d::data.pcrtd_calloc, VS120d::crtd_calloc, + "malloc", &VS120d::data.pcrtd_malloc, VS120d::crtd_malloc, + "realloc", &VS120d::data.pcrtd_realloc, VS120d::crtd_realloc, + "_recalloc", &VS120d::data.pcrtd_recalloc, VS120d::crtd__recalloc, + "_strdup", &VS120d::data.pcrtd__strdup, VS120d::crtd__strdup, + "_wcsdup", &VS120d::data.pcrtd__wcsdup, VS120d::crtd__wcsdup, + scalar_new_name, &VS120d::data.pcrtd_scalar_new, VS120d::crtd_scalar_new, + vector_new_name, &VS120d::data.pcrtd_vector_new, VS120d::crtd_vector_new, + "_aligned_malloc_dbg", &VS120d::data.pcrtd__aligned_malloc_dbg, VS120d::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &VS120d::data.pcrtd__aligned_offset_malloc_dbg, VS120d::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &VS120d::data.pcrtd__aligned_realloc_dbg, VS120d::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &VS120d::data.pcrtd__aligned_offset_realloc_dbg, VS120d::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &VS120d::data.pcrtd__aligned_recalloc_dbg, VS120d::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &VS120d::data.pcrtd__aligned_offset_recalloc_dbg, VS120d::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &VS120d::data.pcrtd_aligned_malloc, VS120d::crtd__aligned_malloc, + "_aligned_offset_malloc", &VS120d::data.pcrtd_aligned_offset_malloc, VS120d::crtd__aligned_offset_malloc, + "_aligned_realloc", &VS120d::data.pcrtd_aligned_realloc, VS120d::crtd__aligned_realloc, + "_aligned_offset_realloc", &VS120d::data.pcrtd_aligned_offset_realloc, VS120d::crtd__aligned_offset_realloc, + "_aligned_recalloc", &VS120d::data.pcrtd_aligned_recalloc, VS120d::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &VS120d::data.pcrtd_aligned_offset_recalloc, VS120d::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, }; patchentry_t VisualLeakDetector::m_ntdllPatch [] = { "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, From 6f66d79dc506f5cf0cb1bfbf6f05db63cc6bfe4c Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Mon, 17 Mar 2014 01:44:41 +0400 Subject: [PATCH 171/321] Release static linked CRT detection improved --- vld.cpp | 108 +++++++++++++++----------------------------------- vld_def.h | 1 - vld_hooks.cpp | 87 ++++++++++++++++++++++++++++++++++------ vldint.h | 3 +- 4 files changed, 109 insertions(+), 90 deletions(-) diff --git a/vld.cpp b/vld.cpp index c1ace91a..f955ef36 100644 --- a/vld.cpp +++ b/vld.cpp @@ -1061,7 +1061,7 @@ tls_t* VisualLeakDetector::getTls () // // None. // -VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo) +VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, UINT_PTR ra) { // Record the block's information. blockinfo_t* blockinfo = new blockinfo_t(); @@ -1092,7 +1092,32 @@ VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool c } if (crtalloc) { // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + (*heapit).second->flags = VLD_HEAP_CRT_DBG; + } + else if (ra != 0 && (*heapit).second->flags == VLD_HEAP_CRT_UNKNOWN) + { + // Try to get the name of the function containing the return address. + BYTE symbolbuffer[sizeof(SYMBOL_INFO) +MAX_SYMBOL_NAME_SIZE] = { 0 }; + SYMBOL_INFO *functioninfo = (SYMBOL_INFO*) &symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; + + g_symbolLock.Enter(); + DWORD64 displacement; + DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); + VLDDisable(); + BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); + VLDRestore(); + g_symbolLock.Leave(); + if (symfound == TRUE && wcscmp(L"_heap_alloc_base", functioninfo->Name) == 0) + { + // Debug static linked CRT + (*heapit).second->flags = VLD_HEAP_CRT_DBG; + } + else + { + (*heapit).second->flags = 0; + } } BlockMap* blockmap = &(*heapit).second->blockMap; BlockMap::Iterator blockit = blockmap->insert(mem, blockinfo); @@ -1281,7 +1306,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. unmapBlock(heap, mem, context); - mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo); + mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo, 0); return; } @@ -1294,7 +1319,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // block has also not been mapped to a blockinfo_t entry yet either, // so treat this reallocation as a brand-new allocation (this will // also map the heap to a new block map). - mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo); + mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo, 0); return; } @@ -1304,7 +1329,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (blockit == blockmap->end()) { // The block hasn't been mapped to a blockinfo_t entry yet. // Treat this reallocation as a new allocation. - mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo); + mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo, 0); return; } @@ -1318,7 +1343,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (crtalloc) { // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + (*heapit).second->flags = VLD_HEAP_CRT_DBG; } if (m_totalAlloc < SIZE_MAX) @@ -1746,74 +1771,6 @@ BOOL VisualLeakDetector::detachFromModule (PCWSTR /*modulepath*/, DWORD64 module // //////////////////////////////////////////////////////////////////////////////// - -// GetProcessHeap - Calls to GetProcessHeap are patched through to this function. This -// function is just a wrapper around the real GetProcessHeap. -// -// Return Value: -// -// Returns the value returned by GetProcessHeap. -// -HANDLE VisualLeakDetector::_GetProcessHeap() -{ - // Get the return address within the calling function. - UINT_PTR ra = (UINT_PTR) _ReturnAddress(); - - // Get the process heap. - HANDLE heap = m_GetProcessHeap(); - - // Try to get the name of the function containing the return address. - BYTE symbolbuffer[sizeof(SYMBOL_INFO) +MAX_SYMBOL_NAME_SIZE] = { 0 }; - SYMBOL_INFO *functioninfo = (SYMBOL_INFO*) &symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; - - g_symbolLock.Enter(); - DWORD64 displacement; - DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); - BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); - g_symbolLock.Leave(); - if (symfound == TRUE) { - if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { - // GetProcessHeap was called by _heap_init (VS2012 and upper). This is a static CRT heap (msvcr*.dll). - CriticalSectionLocker cs(g_vld.m_heapMapLock); - HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); - if (heapit == g_vld.m_heapMap->end()) - { - g_vld.mapHeap(heap); - heapit = g_vld.m_heapMap->find(heap); - } - HMODULE hCallingModule = (HMODULE) functioninfo->ModBase; - if (hCallingModule) - { - HMODULE hCurrentModule = GetModuleHandleW(NULL); - if (hCallingModule == hCurrentModule) - { - // CRT static linking - if (!(g_vld.m_options & VLD_OPT_RELEASE_CRT_RUNTIME)) - { - // debug runtime - (*heapit).second->flags |= VLD_HEAP_CRT_DBG; - } - } - else - { - // CRT dynamic linking - WCHAR callingmodulename[MAX_PATH] = L""; - if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) - { - _wcslwr_s(callingmodulename); - if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime - (*heapit).second->flags |= VLD_HEAP_CRT_DBG; - } - } - } - } - } - - return heap; -} - // _GetProcAddress - Calls to GetProcAddress are patched through to this // function. If the requested function is a function that has been patched // through to one of VLD's handlers, then the address of VLD's handler @@ -2256,8 +2213,7 @@ void VisualLeakDetector::GlobalEnableLeakDetection () CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_INCLUDE | VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | - VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS | VLD_OPT_VALIDATE_HEAPFREE | - VLD_OPT_RELEASE_CRT_RUNTIME; + VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS | VLD_OPT_VALIDATE_HEAPFREE; UINT32 VisualLeakDetector::GetOptions() { diff --git a/vld_def.h b/vld_def.h index fccc2e68..b9d26761 100644 --- a/vld_def.h +++ b/vld_def.h @@ -39,7 +39,6 @@ #define VLD_OPT_REPORT_TO_STDOUT 0x0800 // If set, the memory leak report is sent to stdout. #define VLD_OPT_SKIP_HEAPFREE_LEAKS 0x1000 // If set, VLD skip HeapFree memory leaks. #define VLD_OPT_VALIDATE_HEAPFREE 0x2000 // If set, VLD verifies and reports heap consistency for HeapFree calls. -#define VLD_OPT_RELEASE_CRT_RUNTIME 0x4000 // If set, VLD treat CRT runtime as release version (use only with define VLD_FORCE_ENABLE). #define VLD_RPTHOOK_INSTALL 0 #define VLD_RPTHOOK_REMOVE 1 diff --git a/vld_hooks.cpp b/vld_hooks.cpp index 53911083..23ddf730 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -1386,6 +1386,71 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, return block; } +// GetProcessHeap - Calls to GetProcessHeap are patched through to this function. This +// function is just a wrapper around the real GetProcessHeap. +// +// Return Value: +// +// Returns the value returned by GetProcessHeap. +// +HANDLE VisualLeakDetector::_GetProcessHeap() +{ + // Get the return address within the calling function. + UINT_PTR ra = (UINT_PTR) _ReturnAddress(); + + // Get the process heap. + HANDLE heap = m_GetProcessHeap(); + + // Try to get the name of the function containing the return address. + BYTE symbolbuffer[sizeof(SYMBOL_INFO) +MAX_SYMBOL_NAME_SIZE] = { 0 }; + SYMBOL_INFO *functioninfo = (SYMBOL_INFO*) &symbolbuffer; + functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; + + g_symbolLock.Enter(); + DWORD64 displacement; + DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); + VLDDisable(); + BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); + VLDRestore(); + g_symbolLock.Leave(); + if (symfound == TRUE) { + if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { + // GetProcessHeap was called by _heap_init (VS2012 and upper). This is a static CRT heap (msvcr*.dll). + CriticalSectionLocker cs(g_vld.m_heapMapLock); + HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); + if (heapit == g_vld.m_heapMap->end()) + { + g_vld.mapHeap(heap); + heapit = g_vld.m_heapMap->find(heap); + } + HMODULE hCallingModule = (HMODULE) functioninfo->ModBase; + if (hCallingModule) + { + HMODULE hCurrentModule = GetModuleHandleW(NULL); + if (hCallingModule != hCurrentModule) + { + // CRT dynamic linking + WCHAR callingmodulename[MAX_PATH] = L""; + if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) + { + _wcslwr_s(callingmodulename); + if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime + (*heapit).second->flags = VLD_HEAP_CRT_DBG; + } + } + else + { + // CRT static linking + (*heapit).second->flags = VLD_HEAP_CRT_UNKNOWN; + } + } + } + } + + return heap; +} + // _HeapCreate - Calls to HeapCreate are patched through to this function. This // function is just a wrapper around the real HeapCreate that calls VLD's heap // creation tracking function after the heap has been created. @@ -1420,7 +1485,9 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m g_symbolLock.Enter(); DWORD64 displacement; DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); + VLDDisable(); BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); + VLDRestore(); g_symbolLock.Leave(); if (symfound == TRUE) { if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { @@ -1432,16 +1499,7 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m if (hCallingModule) { HMODULE hCurrentModule = GetModuleHandleW(NULL); - if (hCallingModule == hCurrentModule) - { - // CRT static linking - if (!(g_vld.m_options & VLD_OPT_RELEASE_CRT_RUNTIME)) - { - // debug runtime - (*heapit).second->flags |= VLD_HEAP_CRT_DBG; - } - } - else + if (hCallingModule != hCurrentModule) { // CRT dynamic linking WCHAR callingmodulename [MAX_PATH] = L""; @@ -1449,9 +1507,14 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m { _wcslwr_s(callingmodulename); if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime - (*heapit).second->flags |= VLD_HEAP_CRT_DBG; + (*heapit).second->flags = VLD_HEAP_CRT_DBG; } } + else + { + // CRT static linking + (*heapit).second->flags = VLD_HEAP_CRT_UNKNOWN; + } } } } @@ -1586,7 +1649,7 @@ void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SI // The module that initiated this allocation is included in leak // detection. Map this block to the specified heap. - g_vld.mapBlock(heap, block, size, crtalloc, tls->threadId, tls->pblockInfo); + g_vld.mapBlock(heap, block, size, crtalloc, tls->threadId, tls->pblockInfo, tls->context.fp[1]); } // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. diff --git a/vldint.h b/vldint.h index e3f3668f..da0f8a64 100644 --- a/vldint.h +++ b/vldint.h @@ -118,6 +118,7 @@ struct heapinfo_t { BlockMap blockMap; // Map of all blocks allocated from this heap. UINT32 flags; // Heap status flags: #define VLD_HEAP_CRT_DBG 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). +#define VLD_HEAP_CRT_UNKNOWN 0x2 // If set, this heap is a unknown CRT heap. }; // HeapMaps map heaps (via their handles) to BlockMaps. @@ -299,7 +300,7 @@ class VisualLeakDetector : public IMalloc BOOL enabled (); SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); tls_t* getTls (); - VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo); + VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, UINT_PTR ra); VOID mapHeap (HANDLE heap); VOID remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context); From 1f6333cfe220208fe5fa91157a736c92e25fdf42 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Mon, 24 Mar 2014 00:38:58 +0400 Subject: [PATCH 172/321] Change log updated --- CHANGES.txt | 7 +++++-- setup/version.h | 4 ++-- setup/vld-setup.iss | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index a92bf48e..f280f419 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,16 +3,19 @@ Visual Leak Detector (VLD) Version 2.4.0 Change Log / Release Notes -2.4 (16 December 2013) +2.4RC (23 March 2014) ---------------------------- Enhancements: + VS2013 support added. + Improved usage in C code. - + Setup rewrited to InnoSetup, autopatching common props implemented for VS2010-2013. + + Setup rewrited to InnoSetup, autopatching common props implemented for VS2008-2013. + Called allocation function added to printed callstack. + ! Memory leaks count fixed for case static/dynamic linked MFC. + ! Release static linked CRT detection improved (VLD_OPT_RELEASE_CRT_RUNTIME define removed). Bugs Fixed: + Memory leaks with static linked CRT fixed for VS2012/2013. + + Deadlock fixed and missed memory leaks when dll loading (first appear in version 2.2.2). 2.3 (29 April 2013) ---------------------------- diff --git a/setup/version.h b/setup/version.h index 33907cce..4124d722 100644 --- a/setup/version.h +++ b/setup/version.h @@ -1,9 +1,9 @@ -#define VLDVERSION L"2.4" +#define VLDVERSION L"2.4RC" #define VERSION_NUMBER 2,4,0,0 #define VERSION_STRING "2.4.0.0" #define VERSION_COPYRIGHT "Copyright (C) 2005-2014" #ifndef __FILE__ -!define VLD_VERSION "2.4" // NSIS Script +!define VLD_VERSION "2.4RC" // NSIS Script #endif diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index d6a780b5..20924ffe 100644 --- a/setup/vld-setup.iss +++ b/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.4" +#define MyAppVersion "2.4rc" #define MyAppPublisher "VLD Team" #define MyAppURL "http://vld.codeplex.com/" #define MyAppRegKey "Software\Visual Leak Detector" From 7b14c515d7f4658aeb2f32fe2da37490699b49af Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Tue, 25 Mar 2014 10:50:37 +0400 Subject: [PATCH 173/321] Check IMAGEHLP_MODULE64 size --- vld.cpp | 3 +++ vld.vcxproj | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vld.cpp b/vld.cpp index f955ef36..1d7b7e12 100644 --- a/vld.cpp +++ b/vld.cpp @@ -518,6 +518,9 @@ UINT32 VisualLeakDetector::getModuleState(ModuleSet::Iterator& it, UINT32& modul return 3; } +// dbghelp32.dll should be updated in setup folder if you update dbghelp.h +static char dbghelp32_assert[sizeof(IMAGEHLP_MODULE64) == 3256 ? 1 : -1]; + // attachtoloadedmodules - Attaches VLD to all modules contained in the provided // ModuleSet. Not all modules are in the ModuleSet will actually be included // in leak detection. Only modules that import the global VisualLeakDetector diff --git a/vld.vcxproj b/vld.vcxproj index 64eb8534..d4c6c891 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -49,14 +49,14 @@ - ..\..\lib\dbghelp\include;setup;%(AdditionalIncludeDirectories) + lib\dbghelp\include;setup;%(AdditionalIncludeDirectories) Use true 0x03200000 false - ..\..\lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) + lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) From a14ae766e9bee143120f76d2b0d098db9601c49b Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Wed, 26 Mar 2014 23:19:17 +0400 Subject: [PATCH 174/321] Path to binaries fixed --- setup/vld-setup.iss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index 20924ffe..0200e0ab 100644 --- a/setup/vld-setup.iss +++ b/setup/vld-setup.iss @@ -43,10 +43,10 @@ Source: "dbghelp\x64\dbghelp.dll"; DestDir: "{app}\dbghelp\x64"; Flags: ignoreve Source: "dbghelp\x64\Microsoft.DTfW.DHL.manifest"; DestDir: "{app}\dbghelp\x64"; Flags: ignoreversion Source: "dbghelp\x86\dbghelp.dll"; DestDir: "{app}\dbghelp\x86"; Flags: ignoreversion Source: "dbghelp\x86\Microsoft.DTfW.DHL.manifest"; DestDir: "{app}\dbghelp\x86"; Flags: ignoreversion -Source: "..\Win32\Release\vld.lib"; DestDir: "{app}\lib\Win32"; Flags: ignoreversion -Source: "..\Win32\Release\vld_x86.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion -Source: "..\x64\Release\vld.lib"; DestDir: "{app}\lib\Win64"; Flags: ignoreversion -Source: "..\x64\Release\vld_x64.dll"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion +Source: "..\bin\Win32\Release\vld.lib"; DestDir: "{app}\lib\Win32"; Flags: ignoreversion +Source: "..\bin\Win32\Release\vld_x86.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion +Source: "..\bin\x64\Release\vld.lib"; DestDir: "{app}\lib\Win64"; Flags: ignoreversion +Source: "..\bin\x64\Release\vld_x64.dll"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion Source: "..\vld.h"; DestDir: "{app}\include"; Flags: ignoreversion Source: "..\vld_def.h"; DestDir: "{app}\include"; Flags: ignoreversion Source: "..\vld.ini"; DestDir: "{app}"; Flags: ignoreversion From 747fe56e2c32c68fb1737535696ef499e6556ab3 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 6 Apr 2014 20:11:42 +0400 Subject: [PATCH 175/321] Move the DbgHelp dll & manifest to the bin\ directory --- setup/vld-setup.iss | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index 0200e0ab..922af6e6 100644 --- a/setup/vld-setup.iss +++ b/setup/vld-setup.iss @@ -39,10 +39,10 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "{group}\View Documentation"; Filename: "http://vld.codeplex.com/documentation" [Files] -Source: "dbghelp\x64\dbghelp.dll"; DestDir: "{app}\dbghelp\x64"; Flags: ignoreversion -Source: "dbghelp\x64\Microsoft.DTfW.DHL.manifest"; DestDir: "{app}\dbghelp\x64"; Flags: ignoreversion -Source: "dbghelp\x86\dbghelp.dll"; DestDir: "{app}\dbghelp\x86"; Flags: ignoreversion -Source: "dbghelp\x86\Microsoft.DTfW.DHL.manifest"; DestDir: "{app}\dbghelp\x86"; Flags: ignoreversion +Source: "dbghelp\x64\dbghelp.dll"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion +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: "..\bin\Win32\Release\vld.lib"; DestDir: "{app}\lib\Win32"; Flags: ignoreversion Source: "..\bin\Win32\Release\vld_x86.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion Source: "..\bin\x64\Release\vld.lib"; DestDir: "{app}\lib\Win64"; Flags: ignoreversion @@ -330,7 +330,7 @@ end; procedure ModifyProps(filename: string; libfolder: string); var XMLDocument: Variant; - XMLParent, XMLNode, XMLNodes: Variant; + XMLParent, IdgNode, XMLNode, XMLNodes: Variant; IncludeDirectoriesNode: Variant; AdditionalIncludeDirectories: string; LibraryDirectoriesNode: Variant; @@ -349,24 +349,24 @@ begin XMLNodes := XMLDocument.SelectNodes('//b:Project'); if XMLNodes.Length = 0 then Exit; - XMLParent := XMLNodes.Item[0]; - XMLNodes := XMLParent.SelectNodes('//b:ItemDefinitionGroup'); + IdgNode := XMLNodes.Item[0]; + XMLNodes := IdgNode.SelectNodes('//b:ItemDefinitionGroup'); if XMLNodes.Length > 0 then - XMLParent := XMLNodes.Item[0] + IdgNode := XMLNodes.Item[0] else begin XMLNode := XMLDocument.CreateNode(1, 'ItemDefinitionGroup', 'http://schemas.microsoft.com/developer/msbuild/2003'); - XMLParent := XMLParent.AppendChild(XMLNode); + IdgNode := IdgNode.AppendChild(XMLNode); end; - XMLNodes := XMLParent.SelectNodes('//b:ClCompile'); + XMLNodes := IdgNode.SelectNodes('//b:ClCompile'); if XMLNodes.Length > 0 then XMLParent := XMLNodes.Item[0] else begin XMLNode := XMLDocument.CreateNode(1, 'ClCompile', 'http://schemas.microsoft.com/developer/msbuild/2003'); - XMLParent := XMLParent.AppendChild(XMLNode); + XMLParent := IdgNode.AppendChild(XMLNode); end; XMLNodes := XMLParent.SelectNodes('//b:AdditionalIncludeDirectories'); if XMLNodes.Length > 0 then @@ -377,6 +377,15 @@ begin 'http://schemas.microsoft.com/developer/msbuild/2003'); IncludeDirectoriesNode := XMLParent.AppendChild(XMLNode); end; + XMLNodes := IdgNode.SelectNodes('//b:Link'); + if XMLNodes.Length > 0 then + XMLParent := XMLNodes.Item[0] + else + begin + XMLNode := XMLDocument.CreateNode(1, 'Link', + 'http://schemas.microsoft.com/developer/msbuild/2003'); + XMLParent := IdgNode.AppendChild(XMLNode); + end; XMLNodes := XMLParent.SelectNodes('//b:AdditionalLibraryDirectories'); if XMLNodes.Length > 0 then LibraryDirectoriesNode := XMLNodes.Item[0] From fd4ee387c9cf7e81a6a6f2aaee00e6d8885eb9a0 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 6 Apr 2014 21:29:16 +0400 Subject: [PATCH 176/321] VLD will display last internal frame --- callstack.cpp | 24 +++- tests/basics/Allocs.cpp | 241 +++++++++++++++++----------------- tests/basics/basics.cpp | 6 +- tests/basics/stdafx.h | 1 - tests/dynamic_dll/dllmain.cpp | 21 ++- vld_hooks.cpp | 28 ++-- 6 files changed, 168 insertions(+), 153 deletions(-) diff --git a/callstack.cpp b/callstack.cpp index 63b17a84..57439dd5 100644 --- a/callstack.cpp +++ b/callstack.cpp @@ -221,6 +221,11 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const const size_t max_size = MAXREPORTLENGTH + 1; + // Use static here to increase performance, and avoid heap allocs. Hopefully this won't + // prove to be an issue in thread safety. If it does, it will have to be simply non-static. + static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; + bool isPrevFrameInternal = false; + // Iterate through each frame in the call stack. for (UINT32 frame = start_frame; frame < m_size; frame++) { @@ -232,13 +237,15 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const DWORD displacement = 0; DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + bool isFrameInternal = false; if (foundline && !showInternalFrames) { wcscpy_s(lowerCaseName, sourceInfo.FileName); _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); - if (isInternalModule(lowerCaseName)) { + if (isInternalModule(lowerCaseName)) + { + isFrameInternal = true; // Don't show frames in files internal to the heap. g_symbolLock.Leave(); - continue; } } @@ -276,9 +283,10 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const moduleName = callingModuleName; } - // Use static here to increase performance, and avoid heap allocs. Hopefully this won't - // prove to be an issue in thread safety. If it does, it will have to be simply non-static. - static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; + if (!isFrameInternal && isPrevFrameInternal) + Print(stack_line); + isPrevFrameInternal = isFrameInternal; + int NumChars = -1; // Display the current stack frame's information. if (foundline) { @@ -298,7 +306,8 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const programCounter, moduleName, functionName, (DWORD)displacement64); } - Print(stack_line); + if (!isFrameInternal) + Print(stack_line); } } @@ -511,11 +520,14 @@ bool CallStack::isInternalModule( const PWSTR filename ) const wcsstr(filename, L"\\crt\\src\\dbgmalloc.c") || wcsstr(filename, L"\\crt\\src\\new.cpp") || wcsstr(filename, L"\\crt\\src\\newaop.cpp") || + wcsstr(filename, L"\\crt\\src\\dbgnew.cpp") || wcsstr(filename, L"\\crt\\src\\dbgcalloc.c") || wcsstr(filename, L"\\crt\\src\\realloc.c") || wcsstr(filename, L"\\crt\\src\\dbgrealloc.c") || wcsstr(filename, L"\\crt\\src\\dbgdel.cp") || wcsstr(filename, L"\\crt\\src\\free.c") || + wcsstr(filename, L"\\crt\\src\\strdup.c") || + wcsstr(filename, L"\\crt\\src\\wcsdup.c") || wcsstr(filename, L"\\vc\\include\\xmemory0"); } diff --git a/tests/basics/Allocs.cpp b/tests/basics/Allocs.cpp index bd5ae7be..b14aef8e 100644 --- a/tests/basics/Allocs.cpp +++ b/tests/basics/Allocs.cpp @@ -7,148 +7,153 @@ void AllocF(LeakOption type, bool bFree) { - int* leaked_memory = NULL; - int* leaked_memory_dbg = NULL; - if (type == eMalloc) - { - leaked_memory = (int*)malloc(78); - leaked_memory_dbg = (int*)_malloc_dbg(80, _NORMAL_BLOCK,__FILE__,__LINE__); - if (bFree) - { - free(leaked_memory); - _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); - } - } - else if (type == eNew) - { - leaked_memory = new int(4); - leaked_memory_dbg = new (_NORMAL_BLOCK, __FILE__, __LINE__) int(7); - if (bFree) - { - delete leaked_memory; - delete leaked_memory_dbg; - } - } - else if (type == eNewArray) - { - leaked_memory = new int[3]; - leaked_memory_dbg = new (_NORMAL_BLOCK,__FILE__,__LINE__) int[4]; + int* leaked_memory = NULL; + int* leaked_memory_dbg = NULL; + if (type == eMalloc) + { + leaked_memory = (int*)malloc(78); + leaked_memory_dbg = (int*)_malloc_dbg(80, _NORMAL_BLOCK,__FILE__,__LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + } + } + else if (type == eNew) + { + leaked_memory = new int(4); + leaked_memory_dbg = new (_NORMAL_BLOCK, __FILE__, __LINE__) int(7); + if (bFree) + { + delete leaked_memory; + delete leaked_memory_dbg; + } + } + else if (type == eNewArray) + { + leaked_memory = new int[3]; + leaked_memory_dbg = new (_NORMAL_BLOCK,__FILE__,__LINE__) int[4]; - // placement new operator - int temp[3]; - void* place = temp; - float* placed_mem = new (place) float[3]; // doesn't work. Nothing gets patched by vld - if (bFree) - { - delete [] leaked_memory; - delete [] leaked_memory_dbg; - } - } - else if (type == eCalloc) - { - leaked_memory = (int*)calloc(47,sizeof(int)); - leaked_memory_dbg = (int*)_calloc_dbg(39, sizeof(int), _NORMAL_BLOCK, __FILE__, __LINE__); - if (bFree) - { - free(leaked_memory); - _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); - } - } - else if (type == eRealloc) - { - int* temp = (int*)malloc(17); - leaked_memory = (int*)realloc(temp, 23); - leaked_memory = (int*)_recalloc(leaked_memory, 1, 31); - int* temp_dbg = (int*)malloc(9); - leaked_memory_dbg = (int*)_realloc_dbg(temp_dbg, 21, _NORMAL_BLOCK, __FILE__, __LINE__); - if (bFree) - { - free(leaked_memory); - _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); - } - } - else if (type == eCoTaskMem) - { - void* leaked = CoTaskMemAlloc(7); - void* realloced = CoTaskMemRealloc(leaked, 29); - if (bFree) - { - CoTaskMemFree(realloced); - } - } - else if (type == eAlignedMalloc) - { - void* leaked = _aligned_offset_malloc(64, 16, 1); - leaked_memory = (int*)_aligned_malloc(64, 16); - leaked_memory_dbg = (int*)_aligned_malloc_dbg(32, 16, __FILE__, __LINE__); - if (bFree) - { - _aligned_free(leaked); - _aligned_free(leaked_memory); - _aligned_free_dbg(leaked_memory_dbg); - } - } - else if (type == eAlignedRealloc) - { - void* leaked = _aligned_offset_malloc(64, 16, 1); - leaked_memory = (int*)_aligned_malloc(64, 16); - leaked_memory_dbg = (int*)_aligned_malloc_dbg(32, 16, __FILE__, __LINE__); - leaked = (int*)_aligned_offset_realloc(leaked, 48, 16, 2); - leaked_memory = (int*)_aligned_realloc(leaked_memory, 128, 16); - leaked_memory_dbg = (int*)_aligned_realloc_dbg(leaked_memory_dbg, 48, 16, __FILE__, __LINE__); - leaked = (int*)_aligned_offset_recalloc(leaked, 1, 52, 16, 2); - leaked_memory = (int*)_aligned_recalloc(leaked_memory, 1, 132, 16); - leaked_memory_dbg = (int*)_aligned_recalloc_dbg(leaked_memory_dbg, 1, 64, 16, __FILE__, __LINE__); - if (bFree) - { - _aligned_free(leaked); - _aligned_free(leaked_memory); - _aligned_free_dbg(leaked_memory_dbg); - } - } - else if (type == eStrdup) - { - leaked_memory = (int*)strdup("strdup() leaks!"); - leaked_memory_dbg = (int*)_strdup_dbg("_strdup_dbg() leaks!", _NORMAL_BLOCK,__FILE__,__LINE__); - void* leaked_wmemory = (int*)wcsdup(L"wcsdup() leaks!"); - void* leaked_wmemory_dbg = (int*)_wcsdup_dbg(L"_wcsdup_dbg() leaks!", _NORMAL_BLOCK,__FILE__,__LINE__); - if (bFree) - { - free(leaked_memory); - _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); - free(leaked_wmemory); - _free_dbg(leaked_wmemory_dbg,_NORMAL_BLOCK); - } - } + // placement new operator + int temp[3]; + void* place = temp; + float* placed_mem = new (place) float[3]; // doesn't work. Nothing gets patched by vld + if (bFree) + { + delete [] leaked_memory; + delete [] leaked_memory_dbg; + } + } + else if (type == eCalloc) + { + leaked_memory = (int*)calloc(47,sizeof(int)); + leaked_memory_dbg = (int*)_calloc_dbg(39, sizeof(int), _NORMAL_BLOCK, __FILE__, __LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + } + } + else if (type == eRealloc) + { + int* temp = (int*)malloc(17); + leaked_memory = (int*)realloc(temp, 23); + leaked_memory = (int*)_recalloc(leaked_memory, 1, 31); + int* temp_dbg = (int*)malloc(9); + leaked_memory_dbg = (int*)_realloc_dbg(temp_dbg, 21, _NORMAL_BLOCK, __FILE__, __LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + } + } + else if (type == eCoTaskMem) + { + void* leaked = CoTaskMemAlloc(7); + if (bFree) + { + CoTaskMemFree(leaked); + } + void* leaked2 = CoTaskMemAlloc(7); + void* realloced = CoTaskMemRealloc(leaked2, 29); + if (bFree) + { + CoTaskMemFree(realloced); + } + } + else if (type == eAlignedMalloc) + { + void* leaked = _aligned_offset_malloc(64, 16, 1); + leaked_memory = (int*)_aligned_malloc(64, 16); + leaked_memory_dbg = (int*)_aligned_malloc_dbg(32, 16, __FILE__, __LINE__); + if (bFree) + { + _aligned_free(leaked); + _aligned_free(leaked_memory); + _aligned_free_dbg(leaked_memory_dbg); + } + } + else if (type == eAlignedRealloc) + { + void* leaked = _aligned_offset_malloc(64, 16, 1); + leaked_memory = (int*)_aligned_malloc(64, 16); + leaked_memory_dbg = (int*)_aligned_malloc_dbg(32, 16, __FILE__, __LINE__); + leaked = (int*)_aligned_offset_realloc(leaked, 48, 16, 2); + leaked_memory = (int*)_aligned_realloc(leaked_memory, 128, 16); + leaked_memory_dbg = (int*)_aligned_realloc_dbg(leaked_memory_dbg, 48, 16, __FILE__, __LINE__); + leaked = (int*)_aligned_offset_recalloc(leaked, 1, 52, 16, 2); + leaked_memory = (int*)_aligned_recalloc(leaked_memory, 1, 132, 16); + leaked_memory_dbg = (int*)_aligned_recalloc_dbg(leaked_memory_dbg, 1, 64, 16, __FILE__, __LINE__); + if (bFree) + { + _aligned_free(leaked); + _aligned_free(leaked_memory); + _aligned_free_dbg(leaked_memory_dbg); + } + } + else if (type == eStrdup) + { + leaked_memory = (int*)strdup("strdup() leaks!"); + leaked_memory_dbg = (int*)_strdup_dbg("_strdup_dbg() leaks!", _NORMAL_BLOCK,__FILE__,__LINE__); + void* leaked_wmemory = (int*)wcsdup(L"wcsdup() leaks!"); + void* leaked_wmemory_dbg = (int*)_wcsdup_dbg(L"_wcsdup_dbg() leaks!", _NORMAL_BLOCK,__FILE__,__LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + free(leaked_wmemory); + _free_dbg(leaked_wmemory_dbg,_NORMAL_BLOCK); + } + } } void AllocE(LeakOption type, bool bFree) { - AllocF(type, bFree); + AllocF(type, bFree); } void AllocD(LeakOption type, bool bFree) { - AllocE(type, bFree); + AllocE(type, bFree); } void AllocC(LeakOption type, bool bFree) { - AllocD(type, bFree); + AllocD(type, bFree); } void AllocB(LeakOption type, bool bFree) { - AllocC(type, bFree); + AllocC(type, bFree); } void AllocA(LeakOption type, bool bFree) { - AllocB(type, bFree); + AllocB(type, bFree); } void Alloc(LeakOption type, bool bFree) { - AllocA(type, bFree); + AllocA(type, bFree); } \ No newline at end of file diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index 555f38c1..bb2d583a 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -99,7 +99,7 @@ namespace tut int prev = (int)VLDGetLeaksCount(); LeakMemory(eCoTaskMem,repeat,false); int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 1)); + ensure("leaks", leaks == (repeat * 2)); } template<> @@ -222,7 +222,7 @@ int _tmain(int argc, _TCHAR* argv[]) else if (_tcsicmp(_T("CoTaskMem"), argv[1]) == 0) { leak_type = eCoTaskMem; - multiplayer = 1; + multiplayer = 2; } else if (_tcsicmp(_T("AlignedMalloc"), argv[1]) == 0) { @@ -242,7 +242,7 @@ int _tmain(int argc, _TCHAR* argv[]) else if (_tcsicmp(_T("all"), argv[1]) == 0) { checkAll = true; - multiplayer = 21; + multiplayer = 22; } else { diff --git a/tests/basics/stdafx.h b/tests/basics/stdafx.h index 686c8f5b..b005a839 100644 --- a/tests/basics/stdafx.h +++ b/tests/basics/stdafx.h @@ -9,7 +9,6 @@ #include #include -#include diff --git a/tests/dynamic_dll/dllmain.cpp b/tests/dynamic_dll/dllmain.cpp index 69b58914..5ebd4cc1 100644 --- a/tests/dynamic_dll/dllmain.cpp +++ b/tests/dynamic_dll/dllmain.cpp @@ -4,16 +4,15 @@ BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved - ) + ) { - switch (ul_reason_for_call) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - break; - } - return TRUE; + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + return TRUE; } - diff --git a/vld_hooks.cpp b/vld_hooks.cpp index 23ddf730..45b3df16 100644 --- a/vld_hooks.cpp +++ b/vld_hooks.cpp @@ -1911,6 +1911,13 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) HMODULE ole32; tls_t *tls = g_vld.getTls(); + if (pCoTaskMemAlloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemAlloc. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoTaskMemAlloc = (CoTaskMemAlloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); + } + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. @@ -1920,13 +1927,6 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) tls->blockProcessed = FALSE; } - if (pCoTaskMemAlloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemAlloc. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemAlloc = (CoTaskMemAlloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); - } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. block = pCoTaskMemAlloc(size); @@ -1958,6 +1958,13 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) HMODULE ole32; tls_t *tls = g_vld.getTls(); + if (pCoTaskMemRealloc == NULL) { + // This is the first call to this function. Link to the real + // CoTaskMemRealloc. + ole32 = GetModuleHandleW(L"ole32.dll"); + pCoTaskMemRealloc = (CoTaskMemRealloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); + } + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. @@ -1967,13 +1974,6 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) tls->blockProcessed = FALSE; } - if (pCoTaskMemRealloc == NULL) { - // This is the first call to this function. Link to the real - // CoTaskMemRealloc. - ole32 = GetModuleHandleW(L"ole32.dll"); - pCoTaskMemRealloc = (CoTaskMemRealloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); - } - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. block = pCoTaskMemRealloc(mem, size); From 3a4e7af13da199f227c211023797a7baf792fc99 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 6 Apr 2014 22:26:34 +0400 Subject: [PATCH 177/321] Installer also add path for static library --- .editorconfig | 13 ++++-------- setup/vld-setup.iss | 51 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/.editorconfig b/.editorconfig index 9bfc71ef..dab52b85 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,16 +13,11 @@ indent_style = space indent_size = 4 # 4 space indentation -[*.c] +[*.{c,cpp,h}] indent_style = space indent_size = 4 -# 4 space indentation -[*.cpp] -indent_style = space -indent_size = 4 - -# 4 space indentation -[*.h] +# 2 space indentation +[*.iss] indent_style = space -indent_size = 4 \ No newline at end of file +indent_size = 2 \ No newline at end of file diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index 922af6e6..e248862a 100644 --- a/setup/vld-setup.iss +++ b/setup/vld-setup.iss @@ -333,8 +333,10 @@ var XMLParent, IdgNode, XMLNode, XMLNodes: Variant; IncludeDirectoriesNode: Variant; AdditionalIncludeDirectories: string; - LibraryDirectoriesNode: Variant; - AdditionalLibraryDirectories: string; + DynamicLibraryDirectoriesNode: Variant; + AdditionalDynamicLibraryDirectories: string; + StaticLibraryDirectoriesNode: Variant; + AdditionalStaticLibraryDirectories: string; begin if not FileExists(filename) then Exit; @@ -359,6 +361,7 @@ begin 'http://schemas.microsoft.com/developer/msbuild/2003'); IdgNode := IdgNode.AppendChild(XMLNode); end; + XMLNodes := IdgNode.SelectNodes('//b:ClCompile'); if XMLNodes.Length > 0 then XMLParent := XMLNodes.Item[0] @@ -368,7 +371,7 @@ begin 'http://schemas.microsoft.com/developer/msbuild/2003'); XMLParent := IdgNode.AppendChild(XMLNode); end; - XMLNodes := XMLParent.SelectNodes('//b:AdditionalIncludeDirectories'); + XMLNodes := XMLParent.SelectNodes('//b:ClCompile/b:AdditionalIncludeDirectories'); if XMLNodes.Length > 0 then IncludeDirectoriesNode := XMLNodes.Item[0] else @@ -377,6 +380,7 @@ begin 'http://schemas.microsoft.com/developer/msbuild/2003'); IncludeDirectoriesNode := XMLParent.AppendChild(XMLNode); end; + XMLNodes := IdgNode.SelectNodes('//b:Link'); if XMLNodes.Length > 0 then XMLParent := XMLNodes.Item[0] @@ -386,25 +390,50 @@ begin 'http://schemas.microsoft.com/developer/msbuild/2003'); XMLParent := IdgNode.AppendChild(XMLNode); end; - XMLNodes := XMLParent.SelectNodes('//b:AdditionalLibraryDirectories'); + XMLNodes := XMLParent.SelectNodes('//b:Link/b:AdditionalLibraryDirectories'); if XMLNodes.Length > 0 then - LibraryDirectoriesNode := XMLNodes.Item[0] + DynamicLibraryDirectoriesNode := XMLNodes.Item[0] else begin XMLNode := XMLDocument.CreateNode(1, 'AdditionalLibraryDirectories', 'http://schemas.microsoft.com/developer/msbuild/2003'); - LibraryDirectoriesNode := XMLParent.AppendChild(XMLNode); + DynamicLibraryDirectoriesNode := XMLParent.AppendChild(XMLNode); + end; + + XMLNodes := IdgNode.SelectNodes('//b:Lib'); + if XMLNodes.Length > 0 then + XMLParent := XMLNodes.Item[0] + else + begin + XMLNode := XMLDocument.CreateNode(1, 'Lib', + 'http://schemas.microsoft.com/developer/msbuild/2003'); + XMLParent := IdgNode.AppendChild(XMLNode); end; + XMLNodes := XMLParent.SelectNodes('//b:Lib/b:AdditionalLibraryDirectories'); + if XMLNodes.Length > 0 then + StaticLibraryDirectoriesNode := XMLNodes.Item[0] + else + begin + XMLNode := XMLDocument.CreateNode(1, 'AdditionalLibraryDirectories', + 'http://schemas.microsoft.com/developer/msbuild/2003'); + StaticLibraryDirectoriesNode := XMLParent.AppendChild(XMLNode); + end; + AdditionalIncludeDirectories := ''; if not VarIsNull(IncludeDirectoriesNode) then AdditionalIncludeDirectories := IncludeDirectoriesNode.Text; - AdditionalLibraryDirectories := '';; - if not VarIsNull(LibraryDirectoriesNode) then - AdditionalLibraryDirectories := LibraryDirectoriesNode.Text; + AdditionalDynamicLibraryDirectories := '';; + if not VarIsNull(DynamicLibraryDirectoriesNode) then + AdditionalDynamicLibraryDirectories := DynamicLibraryDirectoriesNode.Text; + AdditionalStaticLibraryDirectories := '';; + if not VarIsNull(StaticLibraryDirectoriesNode) then + AdditionalStaticLibraryDirectories := StaticLibraryDirectoriesNode.Text; UpdateString(AdditionalIncludeDirectories, ExpandConstant('{app}\include;'), '%(AdditionalIncludeDirectories)'); - UpdateString(AdditionalLibraryDirectories, ExpandConstant('{app}\lib\' + libfolder + ';'), '%(AdditionalLibraryDirectories)'); + UpdateString(AdditionalDynamicLibraryDirectories, ExpandConstant('{app}\lib\' + libfolder + ';'), '%(AdditionalLibraryDirectories)'); + UpdateString(AdditionalStaticLibraryDirectories, ExpandConstant('{app}\lib\' + libfolder + ';'), '%(AdditionalLibraryDirectories)'); IncludeDirectoriesNode.Text := AdditionalIncludeDirectories; - LibraryDirectoriesNode.Text := AdditionalLibraryDirectories; + DynamicLibraryDirectoriesNode.Text := AdditionalDynamicLibraryDirectories; + StaticLibraryDirectoriesNode.Text := AdditionalStaticLibraryDirectories; XMLDocument.save(filename); end; except From d18634a5181e03ad1822a16ed0dd12cb4f3f2d59 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Mon, 7 Apr 2014 00:20:59 +0400 Subject: [PATCH 178/321] Internal memory leak fixed --- vld.cpp | 34 ++++++++++------------------------ vld.vcxproj | 4 ++++ vldallocator.h | 13 +++++++++---- vldint.h | 24 +++++++++++++----------- 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/vld.cpp b/vld.cpp index 1d7b7e12..ed59b9f3 100644 --- a/vld.cpp +++ b/vld.cpp @@ -34,7 +34,6 @@ #include "ntapi.h" // Provides access to NT APIs. #include "set.h" // Provides a lightweight STL-like set template. #include "utility.h" // Provides various utility functions. -#include "vldallocator.h"// Provides internal allocator. #include "vldint.h" // Provides access to the Visual Leak Detector internals. #define BLOCK_MAP_RESERVE 64 // This should strike a balance between memory use and a desire to minimize heap hits. @@ -421,11 +420,6 @@ VisualLeakDetector::~VisualLeakDetector () } delete m_heapMap; - // Free internally allocated resources used by the loaded module set. - for (ModuleSet::Iterator moduleit = m_loadedModules->begin(); moduleit != m_loadedModules->end(); ++moduleit) { - delete [] (*moduleit).name; - delete [] (*moduleit).path; - } delete m_loadedModules; // Free internally allocated resources used for thread local storage. @@ -550,9 +544,9 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) continue; DWORD64 modulebase = (DWORD64) (*newit).addrLow; - LPCWSTR modulename = (*newit).name; - LPCWSTR modulepath = (*newit).path; - DWORD modulesize = (DWORD)((*newit).addrHigh - (*newit).addrLow) + 1; + LPCWSTR modulename = (*newit).name.c_str(); + LPCWSTR modulepath = (*newit).path.c_str(); + DWORD modulesize = (DWORD)((*newit).addrHigh - (*newit).addrLow) + 1; g_symbolLock.Enter(); if ((state == 3) && (moduleFlags & VLD_MODULE_SYMBOLSLOADED)) { @@ -1690,28 +1684,24 @@ blockinfo_t* VisualLeakDetector::findAllocedBlock(LPCVOID mem, __out HANDLE& hea // BOOL VisualLeakDetector::addLoadedModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context) { - size_t length = wcslen(modulepath) + 1; - LPWSTR modulepathw = new WCHAR [length]; - wcsncpy_s(modulepathw, length, modulepath, _TRUNCATE); + vldstring modulepathw(modulepath); // Extract just the filename and extension from the module path. WCHAR filename [_MAX_FNAME]; WCHAR extension [_MAX_EXT]; - _wsplitpath_s(modulepathw, NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); + _wsplitpath_s(modulepathw.c_str(), NULL, 0, NULL, 0, filename, _MAX_FNAME, extension, _MAX_EXT); - length = wcslen(filename) + wcslen(extension) + 1; - LPWSTR modulename = new WCHAR [length]; - wcsncpy_s(modulename, length, filename, _TRUNCATE); - wcsncat_s(modulename, length, extension, _TRUNCATE); - _wcslwr_s(modulename, length); + vldstring modulename(filename); + modulename.append(extension); + _wcslwr_s(&modulename[0], modulename.size() + 1); - if (_wcsicmp(modulename, TEXT(VLDDLL)) == 0) { + if (_wcsicmp(modulename.c_str(), TEXT(VLDDLL)) == 0) { // Record Visual Leak Detector's own base address. g_vld.m_vldBase = (HMODULE)modulebase; } else { LPSTR modulenamea; - ConvertModulePathToAscii(modulename, &modulenamea); + ConvertModulePathToAscii(modulename.c_str(), &modulenamea); // See if this is a module listed in the patch table. If it is, update // the corresponding patch table entries' module base address. @@ -1927,10 +1917,6 @@ VOID VisualLeakDetector::RefreshModules() m_modulesLock.Leave(); // Free resources used by the old module list. - for (ModuleSet::Iterator moduleit = oldmodules->begin(); moduleit != oldmodules->end(); ++moduleit) { - delete [] (*moduleit).name; - delete [] (*moduleit).path; - } delete oldmodules; } diff --git a/vld.vcxproj b/vld.vcxproj index d4c6c891..478ffa83 100644 --- a/vld.vcxproj +++ b/vld.vcxproj @@ -79,6 +79,7 @@ false EditAndContinue true + 4201;4229 psapi.lib;%(AdditionalDependencies) @@ -96,6 +97,7 @@ Level4 false ProgramDatabase + 4201;4229 MachineX64 @@ -120,6 +122,7 @@ Fast OldStyle false + 4201;4229 true @@ -143,6 +146,7 @@ OldStyle false false + 4201;4229 true diff --git a/vldallocator.h b/vldallocator.h index a026d377..50434ae0 100644 --- a/vldallocator.h +++ b/vldallocator.h @@ -25,6 +25,8 @@ #include #include "vldheap.h" // Provides internal new and delete operators. +#pragma push_macro("new") +#undef new template class vldallocator: public std::allocator { @@ -39,17 +41,20 @@ class vldallocator: public std::allocator typedef vldallocator<_Tp1> other; }; - pointer allocate(size_type n, const void *hint=0) + pointer allocate(size_type n, const void * /*hint*/ = 0) { return (pointer)::operator new(sizeof(T)*n, __FILE__, __LINE__); } - void deallocate(pointer p, size_type n) + void deallocate(pointer p, size_type /*n*/) { return ::operator delete(p); } - vldallocator() throw(): std::allocator() { } - vldallocator(const vldallocator &a) throw(): std::allocator(a) { } + vldallocator() throw() : std::allocator() { } + vldallocator(const vldallocator &a) throw() : std::allocator(a) { } + template + vldallocator(const vldallocator &a) throw() : std::allocator(a) { } ~vldallocator() throw() { } }; +#pragma pop_macro("new") diff --git a/vldint.h b/vldint.h index da0f8a64..df41d8af 100644 --- a/vldint.h +++ b/vldint.h @@ -30,19 +30,20 @@ #endif #include -#include -#include "vld_def.h" -#include "version.h" -#include "callstack.h" // Provides a custom class for handling call stacks. -#include "map.h" // Provides a custom STL-like map template. -#include "ntapi.h" // Provides access to NT APIs. -#include "set.h" // Provides a custom STL-like set template. -#include "utility.h" // Provides miscellaneous utility functions. - #pragma push_macro("new") #undef new +#include #include #pragma pop_macro("new") +#include +#include "vld_def.h" +#include "version.h" +#include "callstack.h" // Provides a custom class for handling call stacks. +#include "map.h" // Provides a custom STL-like map template. +#include "ntapi.h" // Provides access to NT APIs. +#include "set.h" // Provides a custom STL-like set template. +#include "utility.h" // Provides miscellaneous utility functions. +#include "vldallocator.h" // Provides internal allocator. #define MAXMODULELISTLENGTH 512 // Maximum module list length, in characters. #define SELFTESTTEXTA "Memory Leak Self-Test" @@ -123,6 +124,7 @@ struct heapinfo_t { // HeapMaps map heaps (via their handles) to BlockMaps. typedef Map HeapMap; +typedef std::basic_string, vldallocator > vldstring; // This structure stores information, primarily the virtual address range, about // a given module and can be used with the Set template because it supports the @@ -143,8 +145,8 @@ struct moduleinfo_t { UINT32 flags; // Module flags: #define VLD_MODULE_EXCLUDED 0x1 // If set, this module is excluded from leak detection. #define VLD_MODULE_SYMBOLSLOADED 0x2 // If set, this module's debug symbols have been loaded. - LPCWSTR name; // The module's name (e.g. "kernel32.dll"). - LPCWSTR path; // The fully qualified path from where the module was loaded. + vldstring name; // The module's name (e.g. "kernel32.dll"). + vldstring path; // The fully qualified path from where the module was loaded. }; // ModuleSets store information about modules loaded in the process. From c34c82ef4c0bdd94fdf2bae8fa4da6ff2b769279 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Mon, 7 Apr 2014 01:02:09 +0400 Subject: [PATCH 179/321] Version changed --- setup/version.h | 8 ++++---- setup/vld-setup.iss | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/setup/version.h b/setup/version.h index 4124d722..3828c96e 100644 --- a/setup/version.h +++ b/setup/version.h @@ -1,9 +1,9 @@ -#define VLDVERSION L"2.4RC" -#define VERSION_NUMBER 2,4,0,0 -#define VERSION_STRING "2.4.0.0" +#define VLDVERSION L"2.4RC2" +#define VERSION_NUMBER 2,4,1,0 +#define VERSION_STRING "2.4.1.0" #define VERSION_COPYRIGHT "Copyright (C) 2005-2014" #ifndef __FILE__ -!define VLD_VERSION "2.4RC" // NSIS Script +!define VLD_VERSION "2.4RC2" // NSIS Script #endif diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index e248862a..ae4615a4 100644 --- a/setup/vld-setup.iss +++ b/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.4rc" +#define MyAppVersion "2.4rc2" #define MyAppPublisher "VLD Team" #define MyAppURL "http://vld.codeplex.com/" #define MyAppRegKey "Software\Visual Leak Detector" From 55b4e008bf111a14e8e9cd271b3c7f6f1f4db6c4 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Mon, 7 Apr 2014 02:38:55 +0400 Subject: [PATCH 180/321] wcstombs_s error checking fixed --- utility.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/utility.cpp b/utility.cpp index 00cc7998..d02ab43c 100644 --- a/utility.cpp +++ b/utility.cpp @@ -628,14 +628,11 @@ VOID Print (LPWSTR messagew) if ( s_reportToStdOut ) fputws(messagew, stdout); - - if (s_reportToDebugger) - OutputDebugStringW(messagew); } else { size_t count = 0; CHAR messagea [MAXREPORTLENGTH + 1]; - if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) == -1) { + if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) != 0) { // Failed to convert the Unicode message to ASCII. assert(FALSE); return; @@ -649,10 +646,10 @@ VOID Print (LPWSTR messagew) if ( s_reportToStdOut ) fputs(messagea, stdout); + } - if (s_reportToDebugger) - OutputDebugStringA(messagea); - } + if (s_reportToDebugger) + OutputDebugStringW(messagew); } else if (hook_retval == 1) __debugbreak(); From bc79530a94f38c9acff8843d377dd944fbbb6216 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Wed, 9 Apr 2014 23:26:48 +0400 Subject: [PATCH 181/321] Some methods fixed in release build --- vld.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vld.h b/vld.h index 52686dcb..c9f6a5a3 100644 --- a/vld.h +++ b/vld.h @@ -323,6 +323,8 @@ __declspec(dllexport) void VLDResolveCallstacks(); #define VLDEnable() #define VLDDisable() #define VLDRestore() +#define VLDGlobalDisable() +#define VLDGlobalEnable() #define VLDReportLeaks() (0) #define VLDReportThreadLeaks() (0) #define VLDGetLeaksCount() (0) @@ -339,5 +341,6 @@ __declspec(dllexport) void VLDResolveCallstacks(); #define VLDSetModulesList(a) #define VLDGetModulesList(a, b) (FALSE) #define VLDSetReportOptions(a, b) +#define VLDResolveCallstacks() #endif // _DEBUG From f3f8594c3b9a6ae9440a10c79b9ff84e05c357ea Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 15 May 2014 21:25:31 +0400 Subject: [PATCH 182/321] Support MFC 12 MBCS https://vld.codeplex.com/workitem/10565 --- dllspatches.cpp | 142 ++++++++++++++++++++++++------------------ mfc_detect/vldmfc.cpp | 34 ++++++---- vldint.h | 2 +- 3 files changed, 104 insertions(+), 74 deletions(-) diff --git a/dllspatches.cpp b/dllspatches.cpp index 94d783fe..fdc9635b 100644 --- a/dllspatches.cpp +++ b/dllspatches.cpp @@ -113,9 +113,9 @@ static patchentry_t mfc70Patch [] = { //ORDINAL(257), &VS70::data.pmfcd_vector_new, VS70::mfcd_vector_new, //ORDINAL(832), &VS70::data.pmfcd_scalar_new, VS70::mfcd_scalar_new, NULL, NULL, NULL -}; - -static patchentry_t mfc70dPatch [] = { +}; + +static patchentry_t mfc70dPatch [] = { ORDINAL(257), &VS70d::data.pmfcd_vector_new, VS70d::mfcd_vector_new, ORDINAL(258), &VS70d::data.pmfcd__vector_new_dbg_4p, VS70d::mfcd__vector_new_dbg_4p, ORDINAL(259), &VS70d::data.pmfcd__vector_new_dbg_3p, VS70d::mfcd__vector_new_dbg_3p, @@ -123,9 +123,9 @@ static patchentry_t mfc70dPatch [] = { ORDINAL(833), &VS70d::data.pmfcd__scalar_new_dbg_4p, VS70d::mfcd__scalar_new_dbg_4p, ORDINAL(834), &VS70d::data.pmfcd__scalar_new_dbg_3p, VS70d::mfcd__scalar_new_dbg_3p, NULL, NULL, NULL -}; - -static patchentry_t mfc70uPatch [] = { +}; + +static patchentry_t mfc70uPatch [] = { //ORDINAL(258), &VS70::data.pmfcud_vector_new, VS70::mfcud_vector_new, //ORDINAL(833), &VS70::data.pmfcud_scalar_new, VS70::mfcud_scalar_new, NULL, NULL, NULL @@ -145,9 +145,9 @@ static patchentry_t mfc71Patch [] = { //ORDINAL(267), &VS71::data.pmfcd_vector_new, VS71::mfcd_vector_new, //ORDINAL(893), &VS71::data.pmfcd_scalar_new, VS71::mfcd_scalar_new, NULL, NULL, NULL -}; - -static patchentry_t mfc71dPatch [] = { +}; + +static patchentry_t mfc71dPatch [] = { ORDINAL(267), &VS71d::data.pmfcd_vector_new, VS71d::mfcd_vector_new, ORDINAL(268), &VS71d::data.pmfcd__vector_new_dbg_4p, VS71d::mfcd__vector_new_dbg_4p, ORDINAL(269), &VS71d::data.pmfcd__vector_new_dbg_3p, VS71d::mfcd__vector_new_dbg_3p, @@ -155,15 +155,15 @@ static patchentry_t mfc71dPatch [] = { ORDINAL(894), &VS71d::data.pmfcd__scalar_new_dbg_4p, VS71d::mfcd__scalar_new_dbg_4p, ORDINAL(895), &VS71d::data.pmfcd__scalar_new_dbg_3p, VS71d::mfcd__scalar_new_dbg_3p, NULL, NULL, NULL -}; - -static patchentry_t mfc71uPatch [] = { +}; + +static patchentry_t mfc71uPatch [] = { //ORDINAL(267), &VS71::data.pmfcud_vector_new, VS71::mfcud_vector_new, //ORDINAL(893), &VS71::data.pmfcud_scalar_new, VS71::mfcud_scalar_new, NULL, NULL, NULL -}; - -static patchentry_t mfc71udPatch [] = { +}; + +static patchentry_t mfc71udPatch [] = { ORDINAL(267), &VS71d::data.pmfcud_vector_new, VS71d::mfcud_vector_new, ORDINAL(268), &VS71d::data.pmfcud__vector_new_dbg_4p, VS71d::mfcud__vector_new_dbg_4p, ORDINAL(269), &VS71d::data.pmfcud__vector_new_dbg_3p, VS71d::mfcud__vector_new_dbg_3p, @@ -171,15 +171,15 @@ static patchentry_t mfc71udPatch [] = { ORDINAL(894), &VS71d::data.pmfcud__scalar_new_dbg_4p, VS71d::mfcud__scalar_new_dbg_4p, ORDINAL(895), &VS71d::data.pmfcud__scalar_new_dbg_3p, VS71d::mfcud__scalar_new_dbg_3p, NULL, NULL, NULL -}; - -static patchentry_t mfc80Patch [] = { +}; + +static patchentry_t mfc80Patch [] = { //ORDINAL(267), &VS80::data.pmfcd_vector_new, VS80::mfcd_vector_new, //ORDINAL2(893,907), &VS80::data.pmfcd_scalar_new, VS80::mfcd_scalar_new, NULL, NULL, NULL -}; - -static patchentry_t mfc80dPatch [] = { +}; + +static patchentry_t mfc80dPatch [] = { ORDINAL(267), &VS80d::data.pmfcd_vector_new, VS80d::mfcd_vector_new, ORDINAL(268), &VS80d::data.pmfcd__vector_new_dbg_4p, VS80d::mfcd__vector_new_dbg_4p, ORDINAL(269), &VS80d::data.pmfcd__vector_new_dbg_3p, VS80d::mfcd__vector_new_dbg_3p, @@ -187,15 +187,15 @@ static patchentry_t mfc80dPatch [] = { ORDINAL2(894,908), &VS80d::data.pmfcd__scalar_new_dbg_4p, VS80d::mfcd__scalar_new_dbg_4p, ORDINAL2(895,909), &VS80d::data.pmfcd__scalar_new_dbg_3p, VS80d::mfcd__scalar_new_dbg_3p, NULL, NULL, NULL -}; - -static patchentry_t mfc80uPatch [] = { +}; + +static patchentry_t mfc80uPatch [] = { //ORDINAL(267), &VS80::data.pmfcud_vector_new, VS80::mfcud_vector_new, //ORDINAL2(893,907), &VS80::data.pmfcud_scalar_new, VS80::mfcud_scalar_new, NULL, NULL, NULL -}; - -static patchentry_t mfc80udPatch [] = { +}; + +static patchentry_t mfc80udPatch [] = { ORDINAL(267), &VS80d::data.pmfcud_vector_new, VS80d::mfcud_vector_new, ORDINAL(268), &VS80d::data.pmfcud__vector_new_dbg_4p, VS80d::mfcud__vector_new_dbg_4p, ORDINAL(269), &VS80d::data.pmfcud__vector_new_dbg_3p, VS80d::mfcud__vector_new_dbg_3p, @@ -203,15 +203,15 @@ static patchentry_t mfc80udPatch [] = { ORDINAL2(894,908), &VS80d::data.pmfcud__scalar_new_dbg_4p, VS80d::mfcud__scalar_new_dbg_4p, ORDINAL2(895,909), &VS80d::data.pmfcud__scalar_new_dbg_3p, VS80d::mfcud__scalar_new_dbg_3p, NULL, NULL, NULL -}; - -static patchentry_t mfc90Patch [] = { +}; + +static patchentry_t mfc90Patch [] = { ORDINAL(265), &VS90::data.pmfcd_vector_new, VS90::mfcd_vector_new, ORDINAL2(798, 776), &VS90::data.pmfcd_scalar_new, VS90::mfcd_scalar_new, NULL, NULL, NULL -}; - -static patchentry_t mfc90dPatch [] = { +}; + +static patchentry_t mfc90dPatch [] = { ORDINAL(267), &VS90d::data.pmfcd_vector_new, VS90d::mfcd_vector_new, ORDINAL(268), &VS90d::data.pmfcd__vector_new_dbg_4p, VS90d::mfcd__vector_new_dbg_4p, ORDINAL(269), &VS90d::data.pmfcd__vector_new_dbg_3p, VS90d::mfcd__vector_new_dbg_3p, @@ -219,15 +219,15 @@ static patchentry_t mfc90dPatch [] = { ORDINAL2(932, 910), &VS90d::data.pmfcd__scalar_new_dbg_4p, VS90d::mfcd__scalar_new_dbg_4p, ORDINAL2(933, 911), &VS90d::data.pmfcd__scalar_new_dbg_3p, VS90d::mfcd__scalar_new_dbg_3p, NULL, NULL, NULL -}; - -static patchentry_t mfc90uPatch [] = { +}; + +static patchentry_t mfc90uPatch [] = { ORDINAL(265), &VS90::data.pmfcud_vector_new, VS90::mfcud_vector_new, ORDINAL2(798, 776), &VS90::data.pmfcud_scalar_new, VS90::mfcud_scalar_new, NULL, NULL, NULL -}; - -static patchentry_t mfc90udPatch [] = { +}; + +static patchentry_t mfc90udPatch [] = { ORDINAL(267), &VS90d::data.pmfcud_vector_new, VS90d::mfcud_vector_new, ORDINAL(268), &VS90d::data.pmfcud__vector_new_dbg_4p, VS90d::mfcud__vector_new_dbg_4p, ORDINAL(269), &VS90d::data.pmfcud__vector_new_dbg_3p, VS90d::mfcud__vector_new_dbg_3p, @@ -236,14 +236,14 @@ static patchentry_t mfc90udPatch [] = { ORDINAL2(937, 915), &VS90d::data.pmfcud__scalar_new_dbg_3p, VS90d::mfcud__scalar_new_dbg_3p, NULL, NULL, NULL }; - -static patchentry_t mfc100Patch [] = { + +static patchentry_t mfc100Patch [] = { ORDINAL(265), &VS100::data.pmfcd_vector_new, VS100::mfcd_vector_new, ORDINAL2(1294, 1272), &VS100::data.pmfcd_scalar_new, VS100::mfcd_scalar_new, NULL, NULL, NULL }; - -static patchentry_t mfc100dPatch [] = { + +static patchentry_t mfc100dPatch [] = { ORDINAL(267), &VS100d::data.pmfcd_vector_new, VS100d::mfcd_vector_new, ORDINAL(268), &VS100d::data.pmfcd__vector_new_dbg_4p, VS100d::mfcd__vector_new_dbg_4p, ORDINAL(269), &VS100d::data.pmfcd__vector_new_dbg_3p, VS100d::mfcd__vector_new_dbg_3p, @@ -252,14 +252,14 @@ static patchentry_t mfc100dPatch [] = { ORDINAL2(1429, 1407), &VS100d::data.pmfcd__scalar_new_dbg_3p, VS100d::mfcd__scalar_new_dbg_3p, NULL, NULL, NULL }; - -static patchentry_t mfc100uPatch [] = { + +static patchentry_t mfc100uPatch [] = { ORDINAL(265), &VS100::data.pmfcud_vector_new, VS100::mfcud_vector_new, ORDINAL2(1298, 1276), &VS100::data.pmfcud_scalar_new, VS100::mfcud_scalar_new, NULL, NULL, NULL -}; - -static patchentry_t mfc100udPatch [] = { +}; + +static patchentry_t mfc100udPatch [] = { ORDINAL(267), &VS100d::data.pmfcud_vector_new, VS100d::mfcud_vector_new, ORDINAL(268), &VS100d::data.pmfcud__vector_new_dbg_4p, VS100d::mfcud__vector_new_dbg_4p, ORDINAL(269), &VS100d::data.pmfcud__vector_new_dbg_3p, VS100d::mfcud__vector_new_dbg_3p, @@ -268,14 +268,14 @@ static patchentry_t mfc100udPatch [] = { ORDINAL2(1436, 1414), &VS100d::data.pmfcud__scalar_new_dbg_3p, VS100d::mfcud__scalar_new_dbg_3p, NULL, NULL, NULL }; - -static patchentry_t mfc110Patch [] = { + +static patchentry_t mfc110Patch [] = { ORDINAL(265), &VS110::data.pmfcd_vector_new, VS110::mfcd_vector_new, ORDINAL2(1498, 1476), &VS110::data.pmfcd_scalar_new, VS110::mfcd_scalar_new, NULL, NULL, NULL }; - -static patchentry_t mfc110dPatch [] = { + +static patchentry_t mfc110dPatch [] = { ORDINAL(267), &VS110d::data.pmfcd_vector_new, VS110d::mfcd_vector_new, ORDINAL(268), &VS110d::data.pmfcd__vector_new_dbg_4p, VS110d::mfcd__vector_new_dbg_4p, ORDINAL(269), &VS110d::data.pmfcd__vector_new_dbg_3p, VS110d::mfcd__vector_new_dbg_3p, @@ -285,13 +285,13 @@ static patchentry_t mfc110dPatch [] = { NULL, NULL, NULL }; -static patchentry_t mfc110uPatch [] = { +static patchentry_t mfc110uPatch [] = { ORDINAL(265), &VS110::data.pmfcud_vector_new, VS110::mfcud_vector_new, ORDINAL2(1502, 1480), &VS110::data.pmfcud_scalar_new, VS110::mfcud_scalar_new, NULL, NULL, NULL }; -static patchentry_t mfc110udPatch [] = { +static patchentry_t mfc110udPatch [] = { ORDINAL(267), &VS110d::data.pmfcud_vector_new, VS110d::mfcud_vector_new, ORDINAL(268), &VS110d::data.pmfcud__vector_new_dbg_4p, VS110d::mfcud__vector_new_dbg_4p, ORDINAL(269), &VS110d::data.pmfcud__vector_new_dbg_3p, VS110d::mfcud__vector_new_dbg_3p, @@ -301,13 +301,29 @@ static patchentry_t mfc110udPatch [] = { NULL, NULL, NULL }; -static patchentry_t mfc120uPatch [] = { +static patchentry_t mfc120Patch [] = { + ORDINAL(265), &VS120::data.pmfcd_vector_new, VS120::mfcd_vector_new, + ORDINAL2(1502, 1480), &VS120::data.pmfcd_scalar_new, VS120::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc120dPatch [] = { + ORDINAL(267), &VS120d::data.pmfcd_vector_new, VS120d::mfcd_vector_new, + ORDINAL(268), &VS120d::data.pmfcd__vector_new_dbg_4p, VS120d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &VS120d::data.pmfcd__vector_new_dbg_3p, VS120d::mfcd__vector_new_dbg_3p, + ORDINAL2(1633, 1611), &VS120d::data.pmfcd_scalar_new, VS120d::mfcd_scalar_new, + ORDINAL2(1634, 1612), &VS120d::data.pmfcd__scalar_new_dbg_4p, VS120d::mfcd__scalar_new_dbg_4p, + ORDINAL2(1635, 1613), &VS120d::data.pmfcd__scalar_new_dbg_3p, VS120d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc120uPatch [] = { ORDINAL(265), &VS120::data.pmfcud_vector_new, VS120::mfcud_vector_new, ORDINAL2(1506, 1484), &VS120::data.pmfcud_scalar_new, VS120::mfcud_scalar_new, NULL, NULL, NULL }; -static patchentry_t mfc120udPatch [] = { +static patchentry_t mfc120udPatch [] = { ORDINAL(267), &VS120d::data.pmfcud_vector_new, VS120d::mfcud_vector_new, ORDINAL(268), &VS120d::data.pmfcud__vector_new_dbg_4p, VS120d::mfcud__vector_new_dbg_4p, ORDINAL(269), &VS120d::data.pmfcud__vector_new_dbg_3p, VS120d::mfcud__vector_new_dbg_3p, @@ -516,7 +532,7 @@ static patchentry_t msvcr100Patch [] = { "_aligned_offset_realloc", &VS100::data.pcrtd_aligned_offset_realloc, VS100::crtd__aligned_offset_realloc, "_aligned_recalloc", &VS100::data.pcrtd_aligned_recalloc, VS100::crtd__aligned_recalloc, "_aligned_offset_recalloc", &VS100::data.pcrtd_aligned_offset_recalloc, VS100::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + NULL, NULL, NULL, }; static patchentry_t msvcr100dPatch [] = { @@ -548,7 +564,7 @@ static patchentry_t msvcr100dPatch [] = { "_aligned_offset_realloc", &VS100d::data.pcrtd_aligned_offset_realloc, VS100d::crtd__aligned_offset_realloc, "_aligned_recalloc", &VS100d::data.pcrtd_aligned_recalloc, VS100d::crtd__aligned_recalloc, "_aligned_offset_recalloc", &VS100d::data.pcrtd_aligned_offset_recalloc, VS100d::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + NULL, NULL, NULL, }; static patchentry_t msvcr110Patch [] = { @@ -568,7 +584,7 @@ static patchentry_t msvcr110Patch [] = { "_aligned_offset_realloc", &VS110::data.pcrtd_aligned_offset_realloc, VS110::crtd__aligned_offset_realloc, "_aligned_recalloc", &VS110::data.pcrtd_aligned_recalloc, VS110::crtd__aligned_recalloc, "_aligned_offset_recalloc", &VS110::data.pcrtd_aligned_offset_recalloc, VS110::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + NULL, NULL, NULL, }; static patchentry_t msvcr110dPatch [] = { @@ -600,7 +616,7 @@ static patchentry_t msvcr110dPatch [] = { "_aligned_offset_realloc", &VS110d::data.pcrtd_aligned_offset_realloc, VS110d::crtd__aligned_offset_realloc, "_aligned_recalloc", &VS110d::data.pcrtd_aligned_recalloc, VS110d::crtd__aligned_recalloc, "_aligned_offset_recalloc", &VS110d::data.pcrtd_aligned_offset_recalloc, VS110d::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + NULL, NULL, NULL, }; static patchentry_t msvcr120Patch [] = { @@ -620,7 +636,7 @@ static patchentry_t msvcr120Patch [] = { "_aligned_offset_realloc", &VS120::data.pcrtd_aligned_offset_realloc, VS120::crtd__aligned_offset_realloc, "_aligned_recalloc", &VS120::data.pcrtd_aligned_recalloc, VS120::crtd__aligned_recalloc, "_aligned_offset_recalloc", &VS120::data.pcrtd_aligned_offset_recalloc, VS120::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + NULL, NULL, NULL, }; static patchentry_t msvcr120dPatch [] = { @@ -652,7 +668,7 @@ static patchentry_t msvcr120dPatch [] = { "_aligned_offset_realloc", &VS120d::data.pcrtd_aligned_offset_realloc, VS120d::crtd__aligned_offset_realloc, "_aligned_recalloc", &VS120d::data.pcrtd_aligned_recalloc, VS120d::crtd__aligned_recalloc, "_aligned_offset_recalloc", &VS120d::data.pcrtd_aligned_offset_recalloc, VS120d::crtd__aligned_offset_recalloc, - NULL, NULL, NULL, + NULL, NULL, NULL, }; patchentry_t VisualLeakDetector::m_ntdllPatch [] = { "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, @@ -702,6 +718,8 @@ moduleentry_t VisualLeakDetector::m_patchTable [] = { "mfc110d.dll", 0x0, mfc110dPatch, "mfc110u.dll", 0x0, mfc110uPatch, "mfc110ud.dll", 0x0, mfc110udPatch, + "mfc120.dll", 0x0, mfc120Patch, + "mfc120d.dll", 0x0, mfc120dPatch, "mfc120u.dll", 0x0, mfc120uPatch, "mfc120ud.dll", 0x0, mfc120udPatch, diff --git a/mfc_detect/vldmfc.cpp b/mfc_detect/vldmfc.cpp index 419b4591..44a15777 100644 --- a/mfc_detect/vldmfc.cpp +++ b/mfc_detect/vldmfc.cpp @@ -46,7 +46,7 @@ DWORD FindNptProc (PDWORD npt, DWORD size, PBYTE base, void* proc) for (DWORD i = 0; i < size; i++) { void* p = (void*)(npt[i] + base); - if (p == proc) + if (p == proc) return i; } @@ -153,7 +153,7 @@ LPVOID FindRealCode(LPVOID pCode) pCode = *(LPVOID*) (addr); return FindRealCode(pCode); #endif - } + } else if (*(BYTE *) pCode == 0xE9) { // Relative next instruction @@ -223,9 +223,13 @@ BOOL CMFCExampleApp::InitInstance() #elif _MFC_VER == 0x0900 // VS 2008 #define MFCDLLNAME _T("mfc90d.dll") #elif _MFC_VER == 0x0A00 // VS 2010 -#define MFCDLLNAME _T("mfc100d.dll") +#define MFCDLLNAME _T("mfc100d.dll") #elif _MFC_VER == 0x0B00 // VS 2012 #define MFCDLLNAME _T("mfc110d.dll") +#elif _MFC_VER == 0x0C00 // VS 2013 +#define MFCDLLNAME _T("mfc120d.dll") +#elif _MFC_VER == 0x0D00 // VS 2015 +#define MFCDLLNAME _T("mfc130d.dll") #endif #else #if _MFC_VER == 0x0700 // VS 2003 @@ -237,9 +241,11 @@ BOOL CMFCExampleApp::InitInstance() #elif _MFC_VER == 0x0A00 // VS 2010 #define MFCDLLNAME _T("mfc100ud.dll") #elif _MFC_VER == 0x0B00 // VS 2012 -#define MFCDLLNAME _T("mfc110ud.dll") +#define MFCDLLNAME _T("mfc110ud.dll") #elif _MFC_VER == 0x0C00 // VS 2013 -#define MFCDLLNAME _T("mfc120ud.dll") +#define MFCDLLNAME _T("mfc120ud.dll") +#elif _MFC_VER == 0x0D00 // VS 2015 +#define MFCDLLNAME _T("mfc130ud.dll") #endif #endif #else @@ -254,6 +260,10 @@ BOOL CMFCExampleApp::InitInstance() #define MFCDLLNAME _T("mfc100.dll") #elif _MFC_VER == 0x0B00 // VS 2012 #define MFCDLLNAME _T("mfc110.dll") +#elif _MFC_VER == 0x0C00 // VS 2013 +#define MFCDLLNAME _T("mfc120.dll") +#elif _MFC_VER == 0x0D00 // VS 2015 +#define MFCDLLNAME _T("mfc130.dll") #endif #else #if _MFC_VER == 0x0700 // VS 2003 @@ -265,9 +275,11 @@ BOOL CMFCExampleApp::InitInstance() #elif _MFC_VER == 0x0A00 // VS 2010 #define MFCDLLNAME _T("mfc100u.dll") #elif _MFC_VER == 0x0B00 // VS 2012 -#define MFCDLLNAME _T("mfc110u.dll") +#define MFCDLLNAME _T("mfc110u.dll") #elif _MFC_VER == 0x0C00 // VS 2013 -#define MFCDLLNAME _T("mfc120u.dll") +#define MFCDLLNAME _T("mfc120u.dll") +#elif _MFC_VER == 0x0D00 // VS 2015 +#define MFCDLLNAME _T("mfc130u.dll") #endif #endif #endif @@ -286,16 +298,16 @@ BOOL CMFCExampleApp::InitInstance() int o4 = GetProcOrdinal(module, p4); int o5 = GetProcOrdinal(module, p5); #ifdef _DEBUG - int o6 = GetProcOrdinal(module, p6); + int o6 = GetProcOrdinal(module, p6); #else int o6 = -2; -#endif +#endif TCHAR msg[256]; - _stprintf(msg, _T("%d, %d, %d, %d, %d, %d"), + _stprintf(msg, _T("%d, %d, %d, %d, %d, %d"), o1, o2, o3, o4, o5, o6); SetClipboardText(msg); - MessageBox(NULL, msg, _T("MFC ordinals"), + MessageBox(NULL, msg, _T("MFC ordinals"), MB_ICONINFORMATION | MB_OK); return FALSE; diff --git a/vldint.h b/vldint.h index df41d8af..f1ae1d44 100644 --- a/vldint.h +++ b/vldint.h @@ -380,7 +380,7 @@ class VisualLeakDetector : public IMalloc static patchentry_t m_kernel32Patch []; static patchentry_t m_ntdllPatch []; static patchentry_t m_ole32Patch []; - static moduleentry_t m_patchTable [50]; // Table of imports patched for attaching VLD to other modules. + static moduleentry_t m_patchTable [52]; // Table of imports patched for attaching VLD to other modules. FILE *m_reportFile; // File where the memory leak report may be sent to. WCHAR m_reportFilePath [MAX_PATH]; // Full path and name of file to send memory leak report to. const char *m_selfTestFile; // Filename where the memory leak self-test block is leaked. From 6610f4f0bd0138d74ab40aa1e301bf73583b5811 Mon Sep 17 00:00:00 2001 From: "dmitriy.vovk" Date: Tue, 21 Jul 2015 16:42:25 +0200 Subject: [PATCH 183/321] VLD config through env. vars --- utility.cpp | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++ utility.h | 4 ++- vld.cpp | 45 ++++++++++++++-------------- 3 files changed, 108 insertions(+), 25 deletions(-) diff --git a/utility.cpp b/utility.cpp index d02ab43c..eebeb598 100644 --- a/utility.cpp +++ b/utility.cpp @@ -26,6 +26,7 @@ #include "utility.h" // Provides various utility functions and macros. #include "vldheap.h" // Provides internal new and delete operators. #include "vldint.h" +#include // Imported Global Variables extern CriticalSection g_imageLock; @@ -1084,3 +1085,86 @@ HMODULE GetCallingModule( UINT_PTR pCaller ) } return hModule; } + +// LoadBoolOption - Loads specified option from environment variables or from specified ini file, +// if env var is unavailable and converts string values (e.g. "yes", "no", "on", "off") to boolean values. +// +// - optionname (IN): Option to load. +// +// - defaultvalue (IN): Default value if optionname in unavailable. +// +// - inipath (IN): Path to configuration ini file. +// +// Return Value: +// +// Returns TRUE if the string is recognized as a "true" string. Otherwise +// returns FALSE. +// +BOOL LoadBoolOption(LPCWSTR optionname, LPCWSTR defaultvalue, LPCWSTR inipath) +{ + const UINT buffersize = 64; + WCHAR buffer[buffersize] = { 0 }; + + WCHAR envirinmentoptionname[buffersize] = L"Vld"; + wcscat_s(envirinmentoptionname, buffersize, optionname); + + if (!GetEnvironmentVariable(envirinmentoptionname, buffer, buffersize)) { + GetPrivateProfileString(L"Options", optionname, defaultvalue, buffer, buffersize, inipath); + } + + return StrToBool(buffer); +} + +// LoadIntOption - Loads specified option from environment variables or from specified ini file, +// if env var is unavailable. +// +// - optionname (IN): Option to load +// +// - defaultvalue (IN): Default value if optionname in unavailable. +// +// - inipath (IN): Path to configuration ini file. +// +// Return Value: +// +// Returns integer representation of optionname's value. +// +UINT LoadIntOption(LPCWSTR optionname, UINT defaultvalue, LPCWSTR inipath) +{ + const UINT buffersize = 64; + WCHAR buffer[buffersize] = { 0 }; + + WCHAR envirinmentoptionname[buffersize] = L"Vld"; + wcscat_s(envirinmentoptionname, buffersize, optionname); + + if (!GetEnvironmentVariable(envirinmentoptionname, buffer, buffersize)) { + return GetPrivateProfileInt(L"Options", optionname, defaultvalue, inipath); + } + + return _tstoi(buffer); +} + +// LoadStringOption - Loads specified option from environment variables or from specified ini file, +// if env var is unavailable. +// +// - optionname (IN): Option to load. +// +// - outputbuffer (OUT): A buffer to store the string. +// +// - buffersize (IN): Size of a buffer in characters. +// +// - inipath (IN): Path to configuration ini file. +// +// Return Value: +// +// None. +// +VOID LoadStringOption(LPCWSTR optionname, LPWSTR outputbuffer, UINT buffersize, LPCWSTR inipath) +{ + const UINT namebuffersize = 64; + WCHAR envirinmentoptionname[namebuffersize] = L"Vld"; + wcscat_s(envirinmentoptionname, namebuffersize, optionname); + + if (!GetEnvironmentVariable(envirinmentoptionname, outputbuffer, buffersize)) { + GetPrivateProfileString(L"Options", optionname, L"", outputbuffer, buffersize, inipath); + } +} \ No newline at end of file diff --git a/utility.h b/utility.h index a892d211..95c6da51 100644 --- a/utility.h +++ b/utility.h @@ -155,4 +155,6 @@ DWORD CalculateCRC32(UINT_PTR p, UINT startValue = 0xD202EF8D); void GetFormattedMessage(DWORD last_error); HMODULE GetCallingModule(UINT_PTR pCaller); DWORD FilterFunction(long); - +BOOL LoadBoolOption(LPCWSTR optionname, LPCWSTR defaultvalue, LPCWSTR inipath); +UINT LoadIntOption(LPCWSTR optionname, UINT defaultvalue, LPCWSTR inipath); +VOID LoadStringOption(LPCWSTR optionname, LPWSTR outputbuffer, UINT buffersize, LPCWSTR inipath); \ No newline at end of file diff --git a/vld.cpp b/vld.cpp index ed59b9f3..4bf10037 100644 --- a/vld.cpp +++ b/vld.cpp @@ -816,54 +816,52 @@ VOID VisualLeakDetector::configure () } DbgReport(L"Visual Leak Detector read settings from file: %s\n", inipath); -#define BSIZE 64 - WCHAR buffer [BSIZE] = {0}; // Read the boolean options. - GetPrivateProfileString(L"Options", L"VLD", L"on", buffer, BSIZE, inipath); + const UINT buffersize = 64; + WCHAR buffer[buffersize] = { 0 }; + + if (!GetEnvironmentVariable(L"VLD", buffer, buffersize)) { + GetPrivateProfileString(L"Options", L"VLD", L"on", buffer, buffersize, inipath); + } + if (StrToBool(buffer) == FALSE) { m_options |= VLD_OPT_VLDOFF; return; } - GetPrivateProfileString(L"Options", L"AggregateDuplicates", L"", buffer, BSIZE, inipath); - if (StrToBool(buffer) == TRUE) { + if (LoadBoolOption(L"AggregateDuplicates", L"", inipath) == TRUE) { m_options |= VLD_OPT_AGGREGATE_DUPLICATES; } - GetPrivateProfileString(L"Options", L"SelfTest", L"", buffer, BSIZE, inipath); - if (StrToBool(buffer) == TRUE) { + if (LoadBoolOption(L"SelfTest", L"", inipath) == TRUE) { m_options |= VLD_OPT_SELF_TEST; } - GetPrivateProfileString(L"Options", L"SlowDebuggerDump", L"", buffer, BSIZE, inipath); - if (StrToBool(buffer) == TRUE) { + if (LoadBoolOption(L"SlowDebuggerDump", L"", inipath) == TRUE) { m_options |= VLD_OPT_SLOW_DEBUGGER_DUMP; } - GetPrivateProfileString(L"Options", L"StartDisabled", L"", buffer, BSIZE, inipath); - if (StrToBool(buffer) == TRUE) { + if (LoadBoolOption(L"StartDisabled", L"", inipath) == TRUE) { m_options |= VLD_OPT_START_DISABLED; } - GetPrivateProfileString(L"Options", L"TraceInternalFrames", L"", buffer, BSIZE, inipath); - if (StrToBool(buffer) == TRUE) { + if (LoadBoolOption(L"TraceInternalFrames", L"", inipath) == TRUE) { m_options |= VLD_OPT_TRACE_INTERNAL_FRAMES; } - GetPrivateProfileString(L"Options", L"SkipHeapFreeLeaks", L"", buffer, BSIZE, inipath); - if (StrToBool(buffer) == TRUE) { + if (LoadBoolOption(L"SkipHeapFreeLeaks", L"", inipath) == TRUE) { m_options |= VLD_OPT_SKIP_HEAPFREE_LEAKS; } // Read the integer configuration options. - m_maxDataDump = GetPrivateProfileInt(L"Options", L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); - m_maxTraceFrames = GetPrivateProfileInt(L"Options", L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); + m_maxDataDump = LoadIntOption(L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); + m_maxTraceFrames = LoadIntOption(L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); if (m_maxTraceFrames < 1) { m_maxTraceFrames = VLD_DEFAULT_MAX_TRACE_FRAMES; } // Read the force-include module list. - GetPrivateProfileString(L"Options", L"ForceIncludeModules", L"", m_forcedModuleList, MAXMODULELISTLENGTH, inipath); + LoadStringOption(L"ForceIncludeModules", m_forcedModuleList, MAXMODULELISTLENGTH, inipath); _wcslwr_s(m_forcedModuleList, MAXMODULELISTLENGTH); if (wcscmp(m_forcedModuleList, L"*") == 0) m_forcedModuleList[0] = '\0'; @@ -872,14 +870,14 @@ VOID VisualLeakDetector::configure () // Read the report destination (debugger, file, or both). WCHAR filename [MAX_PATH] = {0}; - GetPrivateProfileString(L"Options", L"ReportFile", L"", filename, MAX_PATH, inipath); + LoadStringOption(L"ReportFile", filename, MAX_PATH, inipath); if (filename[0] == '\0') { wcsncpy_s(filename, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); } WCHAR* path = _wfullpath(m_reportFilePath, filename, MAX_PATH); assert(path); - GetPrivateProfileString(L"Options", L"ReportTo", L"", buffer, BSIZE, inipath); + LoadStringOption(L"ReportTo", buffer, buffersize, inipath); if (_wcsicmp(buffer, L"both") == 0) { m_options |= (VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE); } @@ -894,7 +892,7 @@ VOID VisualLeakDetector::configure () } // Read the report file encoding (ascii or unicode). - GetPrivateProfileString(L"Options", L"ReportEncoding", L"", buffer, BSIZE, inipath); + LoadStringOption(L"ReportEncoding", buffer, buffersize, inipath); if (_wcsicmp(buffer, L"unicode") == 0) { m_options |= VLD_OPT_UNICODE_REPORT; } @@ -907,13 +905,12 @@ VOID VisualLeakDetector::configure () } // Read the stack walking method. - GetPrivateProfileString(L"Options", L"StackWalkMethod", L"", buffer, BSIZE, inipath); + LoadStringOption(L"StackWalkMethod", buffer, buffersize, inipath); if (_wcsicmp(buffer, L"safe") == 0) { m_options |= VLD_OPT_SAFE_STACK_WALK; } - GetPrivateProfileString(L"Options", L"ValidateHeapAllocs", L"", buffer, BSIZE, inipath); - if (StrToBool(buffer) == TRUE) { + if (LoadBoolOption(L"ValidateHeapAllocs", L"", inipath) == TRUE) { m_options |= VLD_OPT_VALIDATE_HEAPFREE; } } From 4e8092c6107b498e619e0abd1de57f19fb262464 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Tue, 28 Jul 2015 00:45:40 +0300 Subject: [PATCH 184/321] Tests rewrited to GTest --- .gitignore | 1 + lib/gtest/CHANGES | 157 + lib/gtest/CMakeLists.txt | 252 + lib/gtest/CONTRIBUTORS | 37 + lib/gtest/LICENSE | 28 + lib/gtest/Makefile.am | 306 + lib/gtest/Makefile.in | 1360 ++ lib/gtest/README | 435 + lib/gtest/configure | 18222 ++++++++++++++++ lib/gtest/configure.ac | 68 + lib/gtest/include/gtest/gtest-death-test.h | 294 + lib/gtest/include/gtest/gtest-message.h | 250 + lib/gtest/include/gtest/gtest-param-test.h | 1421 ++ .../include/gtest/gtest-param-test.h.pump | 487 + lib/gtest/include/gtest/gtest-printers.h | 855 + lib/gtest/include/gtest/gtest-spi.h | 232 + lib/gtest/include/gtest/gtest-test-part.h | 179 + lib/gtest/include/gtest/gtest-typed-test.h | 259 + lib/gtest/include/gtest/gtest.h | 2291 ++ lib/gtest/include/gtest/gtest_pred_impl.h | 358 + lib/gtest/include/gtest/gtest_prod.h | 58 + .../internal/gtest-death-test-internal.h | 319 + .../include/gtest/internal/gtest-filepath.h | 206 + .../include/gtest/internal/gtest-internal.h | 1158 + .../include/gtest/internal/gtest-linked_ptr.h | 233 + .../internal/gtest-param-util-generated.h | 5143 +++++ .../gtest-param-util-generated.h.pump | 301 + .../include/gtest/internal/gtest-param-util.h | 619 + lib/gtest/include/gtest/internal/gtest-port.h | 1947 ++ .../include/gtest/internal/gtest-string.h | 167 + .../include/gtest/internal/gtest-tuple.h | 1012 + .../include/gtest/internal/gtest-tuple.h.pump | 339 + .../include/gtest/internal/gtest-type-util.h | 3331 +++ .../gtest/internal/gtest-type-util.h.pump | 297 + lib/gtest/msvc/gtest-md.sln | 45 + lib/gtest/msvc/gtest.sln | 57 + lib/gtest/msvc/gtest.vcxproj | 273 + lib/gtest/msvc/gtest.vcxproj.filters | 18 + lib/gtest/msvc/gtest_main.vcxproj | 152 + lib/gtest/msvc/gtest_main.vcxproj.filters | 18 + lib/gtest/msvc/gtest_prod_test.vcxproj | 195 + .../msvc/gtest_prod_test.vcxproj.filters | 26 + lib/gtest/msvc/gtest_unittest.vcxproj | 184 + lib/gtest/msvc/gtest_unittest.vcxproj.filters | 18 + lib/gtest/src/gtest-all.cc | 48 + lib/gtest/src/gtest-death-test.cc | 1344 ++ lib/gtest/src/gtest-filepath.cc | 382 + lib/gtest/src/gtest-internal-inl.h | 1218 ++ lib/gtest/src/gtest-port.cc | 805 + lib/gtest/src/gtest-printers.cc | 363 + lib/gtest/src/gtest-test-part.cc | 110 + lib/gtest/src/gtest-typed-test.cc | 110 + lib/gtest/src/gtest.cc | 5015 +++++ lib/gtest/src/gtest_main.cc | 38 + lib/tut-framework/include/tut.h | 2 - lib/tut-framework/include/tut/tut.hpp | 572 - lib/tut-framework/include/tut/tut_assert.hpp | 283 - lib/tut-framework/include/tut/tut_config.hpp | 6 - .../include/tut/tut_console_reporter.hpp | 305 - .../include/tut/tut_cppunit_reporter.hpp | 218 - .../include/tut/tut_exception.hpp | 237 - lib/tut-framework/include/tut/tut_fpt.hpp | 185 - lib/tut-framework/include/tut/tut_macros.hpp | 63 - lib/tut-framework/include/tut/tut_main.hpp | 111 - lib/tut-framework/include/tut/tut_posix.hpp | 485 - .../include/tut/tut_reporter.hpp | 11 - .../include/tut/tut_restartable.hpp | 410 - lib/tut-framework/include/tut/tut_result.hpp | 174 - lib/tut-framework/include/tut/tut_runner.hpp | 388 - .../include/tut/tut_xml_reporter.hpp | 305 - lib/tut-framework/include/tut_reporter.h | 5 - lib/tut-framework/include/tut_restartable.h | 2 - tests/basics/Allocs.cpp | 83 +- tests/basics/LeakOption.h | 3 + tests/basics/basics.cpp | 360 +- tests/basics/basics.vcxproj | 92 +- tests/basics/basics.vcxproj.filters | 3 + tests/basics/basics_disabled.cpp | 133 + tests/corruption/corruption.cpp | 61 +- tests/corruption/corruption.vcxproj | 21 +- tests/dynamic_app/ThreadTest.cpp | 2 +- tests/dynamic_app/dynamic_app.cpp | 222 +- tests/dynamic_app/dynamic_app.vcxproj | 115 +- tests/mfc/vldmfc.vcxproj | 16 +- tests/suite/testsuite.cpp | 106 +- tests/suite/testsuite.vcxproj | 33 +- vld.cpp | 58 +- vld_vs14.sln | 292 + 88 files changed, 53877 insertions(+), 4526 deletions(-) create mode 100644 lib/gtest/CHANGES create mode 100644 lib/gtest/CMakeLists.txt create mode 100644 lib/gtest/CONTRIBUTORS create mode 100644 lib/gtest/LICENSE create mode 100644 lib/gtest/Makefile.am create mode 100644 lib/gtest/Makefile.in create mode 100644 lib/gtest/README create mode 100644 lib/gtest/configure create mode 100644 lib/gtest/configure.ac create mode 100644 lib/gtest/include/gtest/gtest-death-test.h create mode 100644 lib/gtest/include/gtest/gtest-message.h create mode 100644 lib/gtest/include/gtest/gtest-param-test.h create mode 100644 lib/gtest/include/gtest/gtest-param-test.h.pump create mode 100644 lib/gtest/include/gtest/gtest-printers.h create mode 100644 lib/gtest/include/gtest/gtest-spi.h create mode 100644 lib/gtest/include/gtest/gtest-test-part.h create mode 100644 lib/gtest/include/gtest/gtest-typed-test.h create mode 100644 lib/gtest/include/gtest/gtest.h create mode 100644 lib/gtest/include/gtest/gtest_pred_impl.h create mode 100644 lib/gtest/include/gtest/gtest_prod.h create mode 100644 lib/gtest/include/gtest/internal/gtest-death-test-internal.h create mode 100644 lib/gtest/include/gtest/internal/gtest-filepath.h create mode 100644 lib/gtest/include/gtest/internal/gtest-internal.h create mode 100644 lib/gtest/include/gtest/internal/gtest-linked_ptr.h create mode 100644 lib/gtest/include/gtest/internal/gtest-param-util-generated.h create mode 100644 lib/gtest/include/gtest/internal/gtest-param-util-generated.h.pump create mode 100644 lib/gtest/include/gtest/internal/gtest-param-util.h create mode 100644 lib/gtest/include/gtest/internal/gtest-port.h create mode 100644 lib/gtest/include/gtest/internal/gtest-string.h create mode 100644 lib/gtest/include/gtest/internal/gtest-tuple.h create mode 100644 lib/gtest/include/gtest/internal/gtest-tuple.h.pump create mode 100644 lib/gtest/include/gtest/internal/gtest-type-util.h create mode 100644 lib/gtest/include/gtest/internal/gtest-type-util.h.pump create mode 100644 lib/gtest/msvc/gtest-md.sln create mode 100644 lib/gtest/msvc/gtest.sln create mode 100644 lib/gtest/msvc/gtest.vcxproj create mode 100644 lib/gtest/msvc/gtest.vcxproj.filters create mode 100644 lib/gtest/msvc/gtest_main.vcxproj create mode 100644 lib/gtest/msvc/gtest_main.vcxproj.filters create mode 100644 lib/gtest/msvc/gtest_prod_test.vcxproj create mode 100644 lib/gtest/msvc/gtest_prod_test.vcxproj.filters create mode 100644 lib/gtest/msvc/gtest_unittest.vcxproj create mode 100644 lib/gtest/msvc/gtest_unittest.vcxproj.filters create mode 100644 lib/gtest/src/gtest-all.cc create mode 100644 lib/gtest/src/gtest-death-test.cc create mode 100644 lib/gtest/src/gtest-filepath.cc create mode 100644 lib/gtest/src/gtest-internal-inl.h create mode 100644 lib/gtest/src/gtest-port.cc create mode 100644 lib/gtest/src/gtest-printers.cc create mode 100644 lib/gtest/src/gtest-test-part.cc create mode 100644 lib/gtest/src/gtest-typed-test.cc create mode 100644 lib/gtest/src/gtest.cc create mode 100644 lib/gtest/src/gtest_main.cc delete mode 100644 lib/tut-framework/include/tut.h delete mode 100644 lib/tut-framework/include/tut/tut.hpp delete mode 100644 lib/tut-framework/include/tut/tut_assert.hpp delete mode 100644 lib/tut-framework/include/tut/tut_config.hpp delete mode 100644 lib/tut-framework/include/tut/tut_console_reporter.hpp delete mode 100644 lib/tut-framework/include/tut/tut_cppunit_reporter.hpp delete mode 100644 lib/tut-framework/include/tut/tut_exception.hpp delete mode 100644 lib/tut-framework/include/tut/tut_fpt.hpp delete mode 100644 lib/tut-framework/include/tut/tut_macros.hpp delete mode 100644 lib/tut-framework/include/tut/tut_main.hpp delete mode 100644 lib/tut-framework/include/tut/tut_posix.hpp delete mode 100644 lib/tut-framework/include/tut/tut_reporter.hpp delete mode 100644 lib/tut-framework/include/tut/tut_restartable.hpp delete mode 100644 lib/tut-framework/include/tut/tut_result.hpp delete mode 100644 lib/tut-framework/include/tut/tut_runner.hpp delete mode 100644 lib/tut-framework/include/tut/tut_xml_reporter.hpp delete mode 100644 lib/tut-framework/include/tut_reporter.h delete mode 100644 lib/tut-framework/include/tut_restartable.h create mode 100644 tests/basics/basics_disabled.cpp create mode 100644 vld_vs14.sln diff --git a/.gitignore b/.gitignore index a8ef86e1..45291193 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ x64/ ipch/ setup/vld-*-setup.exe setup/Output/ +lib/gtest/msvc/bin/ diff --git a/lib/gtest/CHANGES b/lib/gtest/CHANGES new file mode 100644 index 00000000..05521324 --- /dev/null +++ b/lib/gtest/CHANGES @@ -0,0 +1,157 @@ +Changes for 1.7.0: + +* New feature: death tests are supported on OpenBSD and in iOS + simulator now. +* New feature: Google Test now implements a protocol to allow + a test runner to detect that a test program has exited + prematurely and report it as a failure (before it would be + falsely reported as a success if the exit code is 0). +* New feature: Test::RecordProperty() can now be used outside of the + lifespan of a test method, in which case it will be attributed to + the current test case or the test program in the XML report. +* New feature (potentially breaking): --gtest_list_tests now prints + the type parameters and value parameters for each test. +* Improvement: char pointers and char arrays are now escaped properly + in failure messages. +* Improvement: failure summary in XML reports now includes file and + line information. +* Improvement: the XML element now has a timestamp attribute. +* Improvement: When --gtest_filter is specified, XML report now doesn't + contain information about tests that are filtered out. +* Fixed the bug where long --gtest_filter flag values are truncated in + death tests. +* Potentially breaking change: RUN_ALL_TESTS() is now implemented as a + function instead of a macro in order to work better with Clang. +* Compatibility fixes with C++ 11 and various platforms. +* Bug/warning fixes. + +Changes for 1.6.0: + +* New feature: ADD_FAILURE_AT() for reporting a test failure at the + given source location -- useful for writing testing utilities. +* New feature: the universal value printer is moved from Google Mock + to Google Test. +* New feature: type parameters and value parameters are reported in + the XML report now. +* A gtest_disable_pthreads CMake option. +* Colored output works in GNU Screen sessions now. +* Parameters of value-parameterized tests are now printed in the + textual output. +* Failures from ad hoc test assertions run before RUN_ALL_TESTS() are + now correctly reported. +* Arguments of ASSERT_XY and EXPECT_XY no longer need to support << to + ostream. +* More complete handling of exceptions. +* GTEST_ASSERT_XY can be used instead of ASSERT_XY in case the latter + name is already used by another library. +* --gtest_catch_exceptions is now true by default, allowing a test + program to continue after an exception is thrown. +* Value-parameterized test fixtures can now derive from Test and + WithParamInterface separately, easing conversion of legacy tests. +* Death test messages are clearly marked to make them more + distinguishable from other messages. +* Compatibility fixes for Android, Google Native Client, MinGW, HP UX, + PowerPC, Lucid autotools, libCStd, Sun C++, Borland C++ Builder (Code Gear), + IBM XL C++ (Visual Age C++), and C++0x. +* Bug fixes and implementation clean-ups. +* Potentially incompatible changes: disables the harmful 'make install' + command in autotools. + +Changes for 1.5.0: + + * New feature: assertions can be safely called in multiple threads + where the pthreads library is available. + * New feature: predicates used inside EXPECT_TRUE() and friends + can now generate custom failure messages. + * New feature: Google Test can now be compiled as a DLL. + * New feature: fused source files are included. + * New feature: prints help when encountering unrecognized Google Test flags. + * Experimental feature: CMake build script (requires CMake 2.6.4+). + * Experimental feature: the Pump script for meta programming. + * double values streamed to an assertion are printed with enough precision + to differentiate any two different values. + * Google Test now works on Solaris and AIX. + * Build and test script improvements. + * Bug fixes and implementation clean-ups. + + Potentially breaking changes: + + * Stopped supporting VC++ 7.1 with exceptions disabled. + * Dropped support for 'make install'. + +Changes for 1.4.0: + + * New feature: the event listener API + * New feature: test shuffling + * New feature: the XML report format is closer to junitreport and can + be parsed by Hudson now. + * New feature: when a test runs under Visual Studio, its failures are + integrated in the IDE. + * New feature: /MD(d) versions of VC++ projects. + * New feature: elapsed time for the tests is printed by default. + * New feature: comes with a TR1 tuple implementation such that Boost + is no longer needed for Combine(). + * New feature: EXPECT_DEATH_IF_SUPPORTED macro and friends. + * New feature: the Xcode project can now produce static gtest + libraries in addition to a framework. + * Compatibility fixes for Solaris, Cygwin, minGW, Windows Mobile, + Symbian, gcc, and C++Builder. + * Bug fixes and implementation clean-ups. + +Changes for 1.3.0: + + * New feature: death tests on Windows, Cygwin, and Mac. + * New feature: ability to use Google Test assertions in other testing + frameworks. + * New feature: ability to run disabled test via + --gtest_also_run_disabled_tests. + * New feature: the --help flag for printing the usage. + * New feature: access to Google Test flag values in user code. + * New feature: a script that packs Google Test into one .h and one + .cc file for easy deployment. + * New feature: support for distributing test functions to multiple + machines (requires support from the test runner). + * Bug fixes and implementation clean-ups. + +Changes for 1.2.1: + + * Compatibility fixes for Linux IA-64 and IBM z/OS. + * Added support for using Boost and other TR1 implementations. + * Changes to the build scripts to support upcoming release of Google C++ + Mocking Framework. + * Added Makefile to the distribution package. + * Improved build instructions in README. + +Changes for 1.2.0: + + * New feature: value-parameterized tests. + * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS) + macros. + * Changed the XML report format to match JUnit/Ant's. + * Added tests to the Xcode project. + * Added scons/SConscript for building with SCons. + * Added src/gtest-all.cc for building Google Test from a single file. + * Fixed compatibility with Solaris and z/OS. + * Enabled running Python tests on systems with python 2.3 installed, + e.g. Mac OS X 10.4. + * Bug fixes. + +Changes for 1.1.0: + + * New feature: type-parameterized tests. + * New feature: exception assertions. + * New feature: printing elapsed time of tests. + * Improved the robustness of death tests. + * Added an Xcode project and samples. + * Adjusted the output format on Windows to be understandable by Visual Studio. + * Minor bug fixes. + +Changes for 1.0.1: + + * Added project files for Visual Studio 7.1. + * Fixed issues with compiling on Mac OS X. + * Fixed issues with compiling on Cygwin. + +Changes for 1.0.0: + + * Initial Open Source release of Google Test diff --git a/lib/gtest/CMakeLists.txt b/lib/gtest/CMakeLists.txt new file mode 100644 index 00000000..57470c84 --- /dev/null +++ b/lib/gtest/CMakeLists.txt @@ -0,0 +1,252 @@ +######################################################################## +# CMake build script for Google Test. +# +# To run the tests for Google Test itself on Linux, use 'make test' or +# ctest. You can select which tests to run using 'ctest -R regex'. +# For more options, run 'ctest --help'. + +# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to +# make it prominent in the GUI. +option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF) + +# When other libraries are using a shared version of runtime libraries, +# Google Test also has to use one. +option( + gtest_force_shared_crt + "Use shared (DLL) run-time lib even when Google Test is built as static lib." + OFF) + +option(gtest_build_tests "Build all of gtest's own tests." OFF) + +option(gtest_build_samples "Build gtest's sample programs." OFF) + +option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF) + +# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build(). +include(cmake/hermetic_build.cmake OPTIONAL) + +if (COMMAND pre_project_set_up_hermetic_build) + pre_project_set_up_hermetic_build() +endif() + +######################################################################## +# +# Project-wide settings + +# Name of the project. +# +# CMake files in this project can refer to the root source directory +# as ${gtest_SOURCE_DIR} and to the root binary directory as +# ${gtest_BINARY_DIR}. +# Language "C" is required for find_package(Threads). +project(gtest CXX C) +cmake_minimum_required(VERSION 2.6.2) + +if (COMMAND set_up_hermetic_build) + set_up_hermetic_build() +endif() + +# Define helper functions and macros used by Google Test. +include(cmake/internal_utils.cmake) + +config_compiler_and_linker() # Defined in internal_utils.cmake. + +# Where Google Test's .h files can be found. +include_directories( + ${gtest_SOURCE_DIR}/include + ${gtest_SOURCE_DIR}) + +# Where Google Test's libraries can be found. +link_directories(${gtest_BINARY_DIR}/src) + +######################################################################## +# +# Defines the gtest & gtest_main libraries. User tests should link +# with one of them. + +# Google Test libraries. We build them using more strict warnings than what +# are used for other targets, to ensure that gtest can be compiled by a user +# aggressive about warnings. +cxx_library(gtest "${cxx_strict}" src/gtest-all.cc) +cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc) +target_link_libraries(gtest_main gtest) + +######################################################################## +# +# Samples on how to link user tests with gtest or gtest_main. +# +# They are not built by default. To build them, set the +# gtest_build_samples option to ON. You can do it by running ccmake +# or specifying the -Dgtest_build_samples=ON flag when running cmake. + +if (gtest_build_samples) + cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc) + cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc) + cxx_executable(sample3_unittest samples gtest_main) + cxx_executable(sample4_unittest samples gtest_main samples/sample4.cc) + cxx_executable(sample5_unittest samples gtest_main samples/sample1.cc) + cxx_executable(sample6_unittest samples gtest_main) + cxx_executable(sample7_unittest samples gtest_main) + cxx_executable(sample8_unittest samples gtest_main) + cxx_executable(sample9_unittest samples gtest) + cxx_executable(sample10_unittest samples gtest) +endif() + +######################################################################## +# +# Google Test's own tests. +# +# You can skip this section if you aren't interested in testing +# Google Test itself. +# +# The tests are not built by default. To build them, set the +# gtest_build_tests option to ON. You can do it by running ccmake +# or specifying the -Dgtest_build_tests=ON flag when running cmake. + +if (gtest_build_tests) + # This must be set in the root directory for the tests to be run by + # 'make test' or ctest. + enable_testing() + + ############################################################ + # C++ tests built with standard compiler flags. + + cxx_test(gtest-death-test_test gtest_main) + cxx_test(gtest_environment_test gtest) + cxx_test(gtest-filepath_test gtest_main) + cxx_test(gtest-linked_ptr_test gtest_main) + cxx_test(gtest-listener_test gtest_main) + cxx_test(gtest_main_unittest gtest_main) + cxx_test(gtest-message_test gtest_main) + cxx_test(gtest_no_test_unittest gtest) + cxx_test(gtest-options_test gtest_main) + cxx_test(gtest-param-test_test gtest + test/gtest-param-test2_test.cc) + cxx_test(gtest-port_test gtest_main) + cxx_test(gtest_pred_impl_unittest gtest_main) + cxx_test(gtest_premature_exit_test gtest + test/gtest_premature_exit_test.cc) + cxx_test(gtest-printers_test gtest_main) + cxx_test(gtest_prod_test gtest_main + test/production.cc) + cxx_test(gtest_repeat_test gtest) + cxx_test(gtest_sole_header_test gtest_main) + cxx_test(gtest_stress_test gtest) + cxx_test(gtest-test-part_test gtest_main) + cxx_test(gtest_throw_on_failure_ex_test gtest) + cxx_test(gtest-typed-test_test gtest_main + test/gtest-typed-test2_test.cc) + cxx_test(gtest_unittest gtest_main) + cxx_test(gtest-unittest-api_test gtest) + + ############################################################ + # C++ tests built with non-standard compiler flags. + + # MSVC 7.1 does not support STL with exceptions disabled. + if (NOT MSVC OR MSVC_VERSION GREATER 1310) + cxx_library(gtest_no_exception "${cxx_no_exception}" + src/gtest-all.cc) + cxx_library(gtest_main_no_exception "${cxx_no_exception}" + src/gtest-all.cc src/gtest_main.cc) + endif() + cxx_library(gtest_main_no_rtti "${cxx_no_rtti}" + src/gtest-all.cc src/gtest_main.cc) + + cxx_test_with_flags(gtest-death-test_ex_nocatch_test + "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=0" + gtest test/gtest-death-test_ex_test.cc) + cxx_test_with_flags(gtest-death-test_ex_catch_test + "${cxx_exception} -DGTEST_ENABLE_CATCH_EXCEPTIONS_=1" + gtest test/gtest-death-test_ex_test.cc) + + cxx_test_with_flags(gtest_no_rtti_unittest "${cxx_no_rtti}" + gtest_main_no_rtti test/gtest_unittest.cc) + + cxx_shared_library(gtest_dll "${cxx_default}" + src/gtest-all.cc src/gtest_main.cc) + + cxx_executable_with_flags(gtest_dll_test_ "${cxx_default}" + gtest_dll test/gtest_all_test.cc) + set_target_properties(gtest_dll_test_ + PROPERTIES + COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1") + + if (NOT MSVC OR NOT MSVC_VERSION EQUAL 1600) + # The C++ Standard specifies tuple_element. + # Yet MSVC 10's declares tuple_element. + # That declaration conflicts with our own standard-conforming + # tuple implementation. Therefore using our own tuple with + # MSVC 10 doesn't compile. + cxx_library(gtest_main_use_own_tuple "${cxx_use_own_tuple}" + src/gtest-all.cc src/gtest_main.cc) + + cxx_test_with_flags(gtest-tuple_test "${cxx_use_own_tuple}" + gtest_main_use_own_tuple test/gtest-tuple_test.cc) + + cxx_test_with_flags(gtest_use_own_tuple_test "${cxx_use_own_tuple}" + gtest_main_use_own_tuple + test/gtest-param-test_test.cc test/gtest-param-test2_test.cc) + endif() + + ############################################################ + # Python tests. + + cxx_executable(gtest_break_on_failure_unittest_ test gtest) + py_test(gtest_break_on_failure_unittest) + + # MSVC 7.1 does not support STL with exceptions disabled. + if (NOT MSVC OR MSVC_VERSION GREATER 1310) + cxx_executable_with_flags( + gtest_catch_exceptions_no_ex_test_ + "${cxx_no_exception}" + gtest_main_no_exception + test/gtest_catch_exceptions_test_.cc) + endif() + + cxx_executable_with_flags( + gtest_catch_exceptions_ex_test_ + "${cxx_exception}" + gtest_main + test/gtest_catch_exceptions_test_.cc) + py_test(gtest_catch_exceptions_test) + + cxx_executable(gtest_color_test_ test gtest) + py_test(gtest_color_test) + + cxx_executable(gtest_env_var_test_ test gtest) + py_test(gtest_env_var_test) + + cxx_executable(gtest_filter_unittest_ test gtest) + py_test(gtest_filter_unittest) + + cxx_executable(gtest_help_test_ test gtest_main) + py_test(gtest_help_test) + + cxx_executable(gtest_list_tests_unittest_ test gtest) + py_test(gtest_list_tests_unittest) + + cxx_executable(gtest_output_test_ test gtest) + py_test(gtest_output_test) + + cxx_executable(gtest_shuffle_test_ test gtest) + py_test(gtest_shuffle_test) + + # MSVC 7.1 does not support STL with exceptions disabled. + if (NOT MSVC OR MSVC_VERSION GREATER 1310) + cxx_executable(gtest_throw_on_failure_test_ test gtest_no_exception) + set_target_properties(gtest_throw_on_failure_test_ + PROPERTIES + COMPILE_FLAGS "${cxx_no_exception}") + py_test(gtest_throw_on_failure_test) + endif() + + cxx_executable(gtest_uninitialized_test_ test gtest) + py_test(gtest_uninitialized_test) + + cxx_executable(gtest_xml_outfile1_test_ test gtest_main) + cxx_executable(gtest_xml_outfile2_test_ test gtest_main) + py_test(gtest_xml_outfiles_test) + + cxx_executable(gtest_xml_output_unittest_ test gtest) + py_test(gtest_xml_output_unittest) +endif() diff --git a/lib/gtest/CONTRIBUTORS b/lib/gtest/CONTRIBUTORS new file mode 100644 index 00000000..feae2fc0 --- /dev/null +++ b/lib/gtest/CONTRIBUTORS @@ -0,0 +1,37 @@ +# This file contains a list of people who've made non-trivial +# contribution to the Google C++ Testing Framework project. People +# who commit code to the project are encouraged to add their names +# here. Please keep the list sorted by first names. + +Ajay Joshi +Balázs Dán +Bharat Mediratta +Chandler Carruth +Chris Prince +Chris Taylor +Dan Egnor +Eric Roman +Hady Zalek +Jeffrey Yasskin +Jói Sigurðsson +Keir Mierle +Keith Ray +Kenton Varda +Manuel Klimek +Markus Heule +Mika Raento +Miklós Fazekas +Pasi Valminen +Patrick Hanna +Patrick Riley +Peter Kaminski +Preston Jackson +Rainer Klaffenboeck +Russ Cox +Russ Rufer +Sean Mcafee +Sigurður Ásgeirsson +Tracy Bialik +Vadim Berman +Vlad Losev +Zhanyong Wan diff --git a/lib/gtest/LICENSE b/lib/gtest/LICENSE new file mode 100644 index 00000000..1941a11f --- /dev/null +++ b/lib/gtest/LICENSE @@ -0,0 +1,28 @@ +Copyright 2008, Google Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/lib/gtest/Makefile.am b/lib/gtest/Makefile.am new file mode 100644 index 00000000..9c96b425 --- /dev/null +++ b/lib/gtest/Makefile.am @@ -0,0 +1,306 @@ +# Automake file + +ACLOCAL_AMFLAGS = -I m4 + +# Nonstandard package files for distribution +EXTRA_DIST = \ + CHANGES \ + CONTRIBUTORS \ + LICENSE \ + include/gtest/gtest-param-test.h.pump \ + include/gtest/internal/gtest-param-util-generated.h.pump \ + include/gtest/internal/gtest-tuple.h.pump \ + include/gtest/internal/gtest-type-util.h.pump \ + make/Makefile \ + scripts/fuse_gtest_files.py \ + scripts/gen_gtest_pred_impl.py \ + scripts/pump.py \ + scripts/test/Makefile + +# gtest source files that we don't compile directly. They are +# #included by gtest-all.cc. +GTEST_SRC = \ + src/gtest-death-test.cc \ + src/gtest-filepath.cc \ + src/gtest-internal-inl.h \ + src/gtest-port.cc \ + src/gtest-printers.cc \ + src/gtest-test-part.cc \ + src/gtest-typed-test.cc \ + src/gtest.cc + +EXTRA_DIST += $(GTEST_SRC) + +# Sample files that we don't compile. +EXTRA_DIST += \ + samples/prime_tables.h \ + samples/sample2_unittest.cc \ + samples/sample3_unittest.cc \ + samples/sample4_unittest.cc \ + samples/sample5_unittest.cc \ + samples/sample6_unittest.cc \ + samples/sample7_unittest.cc \ + samples/sample8_unittest.cc \ + samples/sample9_unittest.cc + +# C++ test files that we don't compile directly. +EXTRA_DIST += \ + test/gtest-death-test_ex_test.cc \ + test/gtest-death-test_test.cc \ + test/gtest-filepath_test.cc \ + test/gtest-linked_ptr_test.cc \ + test/gtest-listener_test.cc \ + test/gtest-message_test.cc \ + test/gtest-options_test.cc \ + test/gtest-param-test2_test.cc \ + test/gtest-param-test2_test.cc \ + test/gtest-param-test_test.cc \ + test/gtest-param-test_test.cc \ + test/gtest-param-test_test.h \ + test/gtest-port_test.cc \ + test/gtest_premature_exit_test.cc \ + test/gtest-printers_test.cc \ + test/gtest-test-part_test.cc \ + test/gtest-tuple_test.cc \ + test/gtest-typed-test2_test.cc \ + test/gtest-typed-test_test.cc \ + test/gtest-typed-test_test.h \ + test/gtest-unittest-api_test.cc \ + test/gtest_break_on_failure_unittest_.cc \ + test/gtest_catch_exceptions_test_.cc \ + test/gtest_color_test_.cc \ + test/gtest_env_var_test_.cc \ + test/gtest_environment_test.cc \ + test/gtest_filter_unittest_.cc \ + test/gtest_help_test_.cc \ + test/gtest_list_tests_unittest_.cc \ + test/gtest_main_unittest.cc \ + test/gtest_no_test_unittest.cc \ + test/gtest_output_test_.cc \ + test/gtest_pred_impl_unittest.cc \ + test/gtest_prod_test.cc \ + test/gtest_repeat_test.cc \ + test/gtest_shuffle_test_.cc \ + test/gtest_sole_header_test.cc \ + test/gtest_stress_test.cc \ + test/gtest_throw_on_failure_ex_test.cc \ + test/gtest_throw_on_failure_test_.cc \ + test/gtest_uninitialized_test_.cc \ + test/gtest_unittest.cc \ + test/gtest_unittest.cc \ + test/gtest_xml_outfile1_test_.cc \ + test/gtest_xml_outfile2_test_.cc \ + test/gtest_xml_output_unittest_.cc \ + test/production.cc \ + test/production.h + +# Python tests that we don't run. +EXTRA_DIST += \ + test/gtest_break_on_failure_unittest.py \ + test/gtest_catch_exceptions_test.py \ + test/gtest_color_test.py \ + test/gtest_env_var_test.py \ + test/gtest_filter_unittest.py \ + test/gtest_help_test.py \ + test/gtest_list_tests_unittest.py \ + test/gtest_output_test.py \ + test/gtest_output_test_golden_lin.txt \ + test/gtest_shuffle_test.py \ + test/gtest_test_utils.py \ + test/gtest_throw_on_failure_test.py \ + test/gtest_uninitialized_test.py \ + test/gtest_xml_outfiles_test.py \ + test/gtest_xml_output_unittest.py \ + test/gtest_xml_test_utils.py + +# CMake script +EXTRA_DIST += \ + CMakeLists.txt \ + cmake/internal_utils.cmake + +# MSVC project files +EXTRA_DIST += \ + msvc/gtest-md.sln \ + msvc/gtest-md.vcproj \ + msvc/gtest.sln \ + msvc/gtest.vcproj \ + msvc/gtest_main-md.vcproj \ + msvc/gtest_main.vcproj \ + msvc/gtest_prod_test-md.vcproj \ + msvc/gtest_prod_test.vcproj \ + msvc/gtest_unittest-md.vcproj \ + msvc/gtest_unittest.vcproj + +# xcode project files +EXTRA_DIST += \ + xcode/Config/DebugProject.xcconfig \ + xcode/Config/FrameworkTarget.xcconfig \ + xcode/Config/General.xcconfig \ + xcode/Config/ReleaseProject.xcconfig \ + xcode/Config/StaticLibraryTarget.xcconfig \ + xcode/Config/TestTarget.xcconfig \ + xcode/Resources/Info.plist \ + xcode/Scripts/runtests.sh \ + xcode/Scripts/versiongenerate.py \ + xcode/gtest.xcodeproj/project.pbxproj + +# xcode sample files +EXTRA_DIST += \ + xcode/Samples/FrameworkSample/Info.plist \ + xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj \ + xcode/Samples/FrameworkSample/runtests.sh \ + xcode/Samples/FrameworkSample/widget.cc \ + xcode/Samples/FrameworkSample/widget.h \ + xcode/Samples/FrameworkSample/widget_test.cc + +# C++Builder project files +EXTRA_DIST += \ + codegear/gtest.cbproj \ + codegear/gtest.groupproj \ + codegear/gtest_all.cc \ + codegear/gtest_link.cc \ + codegear/gtest_main.cbproj \ + codegear/gtest_unittest.cbproj + +# Distribute and install M4 macro +m4datadir = $(datadir)/aclocal +m4data_DATA = m4/gtest.m4 +EXTRA_DIST += $(m4data_DATA) + +# We define the global AM_CPPFLAGS as everything we compile includes from these +# directories. +AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include + +# Modifies compiler and linker flags for pthreads compatibility. +if HAVE_PTHREADS + AM_CXXFLAGS = @PTHREAD_CFLAGS@ -DGTEST_HAS_PTHREAD=1 + AM_LIBS = @PTHREAD_LIBS@ +else + AM_CXXFLAGS = -DGTEST_HAS_PTHREAD=0 +endif + +# Build rules for libraries. +lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la + +lib_libgtest_la_SOURCES = src/gtest-all.cc + +pkginclude_HEADERS = \ + include/gtest/gtest-death-test.h \ + include/gtest/gtest-message.h \ + include/gtest/gtest-param-test.h \ + include/gtest/gtest-printers.h \ + include/gtest/gtest-spi.h \ + include/gtest/gtest-test-part.h \ + include/gtest/gtest-typed-test.h \ + include/gtest/gtest.h \ + include/gtest/gtest_pred_impl.h \ + include/gtest/gtest_prod.h + +pkginclude_internaldir = $(pkgincludedir)/internal +pkginclude_internal_HEADERS = \ + include/gtest/internal/gtest-death-test-internal.h \ + include/gtest/internal/gtest-filepath.h \ + include/gtest/internal/gtest-internal.h \ + include/gtest/internal/gtest-linked_ptr.h \ + include/gtest/internal/gtest-param-util-generated.h \ + include/gtest/internal/gtest-param-util.h \ + include/gtest/internal/gtest-port.h \ + include/gtest/internal/gtest-string.h \ + include/gtest/internal/gtest-tuple.h \ + include/gtest/internal/gtest-type-util.h + +lib_libgtest_main_la_SOURCES = src/gtest_main.cc +lib_libgtest_main_la_LIBADD = lib/libgtest.la + +# Bulid rules for samples and tests. Automake's naming for some of +# these variables isn't terribly obvious, so this is a brief +# reference: +# +# TESTS -- Programs run automatically by "make check" +# check_PROGRAMS -- Programs built by "make check" but not necessarily run + +noinst_LTLIBRARIES = samples/libsamples.la + +samples_libsamples_la_SOURCES = \ + samples/sample1.cc \ + samples/sample1.h \ + samples/sample2.cc \ + samples/sample2.h \ + samples/sample3-inl.h \ + samples/sample4.cc \ + samples/sample4.h + +TESTS= +TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \ + GTEST_BUILD_DIR="$(top_builddir)/test" +check_PROGRAMS= + +# A simple sample on using gtest. +TESTS += samples/sample1_unittest +check_PROGRAMS += samples/sample1_unittest +samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc +samples_sample1_unittest_LDADD = lib/libgtest_main.la \ + lib/libgtest.la \ + samples/libsamples.la + +# Another sample. It also verifies that libgtest works. +TESTS += samples/sample10_unittest +check_PROGRAMS += samples/sample10_unittest +samples_sample10_unittest_SOURCES = samples/sample10_unittest.cc +samples_sample10_unittest_LDADD = lib/libgtest.la + +# This tests most constructs of gtest and verifies that libgtest_main +# and libgtest work. +TESTS += test/gtest_all_test +check_PROGRAMS += test/gtest_all_test +test_gtest_all_test_SOURCES = test/gtest_all_test.cc +test_gtest_all_test_LDADD = lib/libgtest_main.la \ + lib/libgtest.la + +# Tests that fused gtest files compile and work. +FUSED_GTEST_SRC = \ + fused-src/gtest/gtest-all.cc \ + fused-src/gtest/gtest.h \ + fused-src/gtest/gtest_main.cc + +if HAVE_PYTHON +TESTS += test/fused_gtest_test +check_PROGRAMS += test/fused_gtest_test +test_fused_gtest_test_SOURCES = $(FUSED_GTEST_SRC) \ + samples/sample1.cc samples/sample1_unittest.cc +test_fused_gtest_test_CPPFLAGS = -I"$(srcdir)/fused-src" + +# Build rules for putting fused Google Test files into the distribution +# package. The user can also create those files by manually running +# scripts/fuse_gtest_files.py. +$(test_fused_gtest_test_SOURCES): fused-gtest + +fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \ + $(GTEST_SRC) src/gtest-all.cc src/gtest_main.cc \ + scripts/fuse_gtest_files.py + mkdir -p "$(srcdir)/fused-src" + chmod -R u+w "$(srcdir)/fused-src" + rm -f "$(srcdir)/fused-src/gtest/gtest-all.cc" + rm -f "$(srcdir)/fused-src/gtest/gtest.h" + "$(srcdir)/scripts/fuse_gtest_files.py" "$(srcdir)/fused-src" + cp -f "$(srcdir)/src/gtest_main.cc" "$(srcdir)/fused-src/gtest/" + +maintainer-clean-local: + rm -rf "$(srcdir)/fused-src" +endif + +# Death tests may produce core dumps in the build directory. In case +# this happens, clean them to keep distcleancheck happy. +CLEANFILES = core + +# Disables 'make install' as installing a compiled version of Google +# Test can lead to undefined behavior due to violation of the +# One-Definition Rule. + +install-exec-local: + echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." + false + +install-data-local: + echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." + false diff --git a/lib/gtest/Makefile.in b/lib/gtest/Makefile.in new file mode 100644 index 00000000..874de747 --- /dev/null +++ b/lib/gtest/Makefile.in @@ -0,0 +1,1360 @@ +# Makefile.in generated by automake 1.11.3 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Automake file + + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +TESTS = samples/sample1_unittest$(EXEEXT) \ + samples/sample10_unittest$(EXEEXT) \ + test/gtest_all_test$(EXEEXT) $(am__EXEEXT_1) +check_PROGRAMS = samples/sample1_unittest$(EXEEXT) \ + samples/sample10_unittest$(EXEEXT) \ + test/gtest_all_test$(EXEEXT) $(am__EXEEXT_1) +@HAVE_PYTHON_TRUE@am__append_1 = test/fused_gtest_test +@HAVE_PYTHON_TRUE@am__append_2 = test/fused_gtest_test +subdir = . +DIST_COMMON = README $(am__configure_deps) $(pkginclude_HEADERS) \ + $(pkginclude_internal_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/build-aux/config.h.in \ + $(top_srcdir)/configure $(top_srcdir)/scripts/gtest-config.in \ + build-aux/config.guess build-aux/config.sub build-aux/depcomp \ + build-aux/install-sh build-aux/ltmain.sh build-aux/missing +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/build-aux/config.h +CONFIG_CLEAN_FILES = scripts/gtest-config +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(m4datadir)" \ + "$(DESTDIR)$(pkgincludedir)" \ + "$(DESTDIR)$(pkginclude_internaldir)" +LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) +lib_libgtest_la_LIBADD = +am__dirstamp = $(am__leading_dot)dirstamp +am_lib_libgtest_la_OBJECTS = src/gtest-all.lo +lib_libgtest_la_OBJECTS = $(am_lib_libgtest_la_OBJECTS) +lib_libgtest_main_la_DEPENDENCIES = lib/libgtest.la +am_lib_libgtest_main_la_OBJECTS = src/gtest_main.lo +lib_libgtest_main_la_OBJECTS = $(am_lib_libgtest_main_la_OBJECTS) +samples_libsamples_la_LIBADD = +am_samples_libsamples_la_OBJECTS = samples/sample1.lo \ + samples/sample2.lo samples/sample4.lo +samples_libsamples_la_OBJECTS = $(am_samples_libsamples_la_OBJECTS) +@HAVE_PYTHON_TRUE@am__EXEEXT_1 = test/fused_gtest_test$(EXEEXT) +am_samples_sample10_unittest_OBJECTS = \ + samples/sample10_unittest.$(OBJEXT) +samples_sample10_unittest_OBJECTS = \ + $(am_samples_sample10_unittest_OBJECTS) +samples_sample10_unittest_DEPENDENCIES = lib/libgtest.la +am_samples_sample1_unittest_OBJECTS = \ + samples/sample1_unittest.$(OBJEXT) +samples_sample1_unittest_OBJECTS = \ + $(am_samples_sample1_unittest_OBJECTS) +samples_sample1_unittest_DEPENDENCIES = lib/libgtest_main.la \ + lib/libgtest.la samples/libsamples.la +am__test_fused_gtest_test_SOURCES_DIST = fused-src/gtest/gtest-all.cc \ + fused-src/gtest/gtest.h fused-src/gtest/gtest_main.cc \ + samples/sample1.cc samples/sample1_unittest.cc +am__objects_1 = \ + fused-src/gtest/test_fused_gtest_test-gtest-all.$(OBJEXT) \ + fused-src/gtest/test_fused_gtest_test-gtest_main.$(OBJEXT) +@HAVE_PYTHON_TRUE@am_test_fused_gtest_test_OBJECTS = $(am__objects_1) \ +@HAVE_PYTHON_TRUE@ samples/test_fused_gtest_test-sample1.$(OBJEXT) \ +@HAVE_PYTHON_TRUE@ samples/test_fused_gtest_test-sample1_unittest.$(OBJEXT) +test_fused_gtest_test_OBJECTS = $(am_test_fused_gtest_test_OBJECTS) +test_fused_gtest_test_LDADD = $(LDADD) +am_test_gtest_all_test_OBJECTS = test/gtest_all_test.$(OBJEXT) +test_gtest_all_test_OBJECTS = $(am_test_gtest_all_test_OBJECTS) +test_gtest_all_test_DEPENDENCIES = lib/libgtest_main.la \ + lib/libgtest.la +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/build-aux +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(lib_libgtest_la_SOURCES) $(lib_libgtest_main_la_SOURCES) \ + $(samples_libsamples_la_SOURCES) \ + $(samples_sample10_unittest_SOURCES) \ + $(samples_sample1_unittest_SOURCES) \ + $(test_fused_gtest_test_SOURCES) \ + $(test_gtest_all_test_SOURCES) +DIST_SOURCES = $(lib_libgtest_la_SOURCES) \ + $(lib_libgtest_main_la_SOURCES) \ + $(samples_libsamples_la_SOURCES) \ + $(samples_sample10_unittest_SOURCES) \ + $(samples_sample1_unittest_SOURCES) \ + $(am__test_fused_gtest_test_SOURCES_DIST) \ + $(test_gtest_all_test_SOURCES) +DATA = $(m4data_DATA) +HEADERS = $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) +ETAGS = etags +CTAGS = ctags +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ +PYTHON = @PYTHON@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +acx_pthread_config = @acx_pthread_config@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +ACLOCAL_AMFLAGS = -I m4 + +# Nonstandard package files for distribution + +# Sample files that we don't compile. + +# C++ test files that we don't compile directly. + +# Python tests that we don't run. + +# CMake script + +# MSVC project files + +# xcode project files + +# xcode sample files + +# C++Builder project files +EXTRA_DIST = CHANGES CONTRIBUTORS LICENSE \ + include/gtest/gtest-param-test.h.pump \ + include/gtest/internal/gtest-param-util-generated.h.pump \ + include/gtest/internal/gtest-tuple.h.pump \ + include/gtest/internal/gtest-type-util.h.pump make/Makefile \ + scripts/fuse_gtest_files.py scripts/gen_gtest_pred_impl.py \ + scripts/pump.py scripts/test/Makefile $(GTEST_SRC) \ + samples/prime_tables.h samples/sample2_unittest.cc \ + samples/sample3_unittest.cc samples/sample4_unittest.cc \ + samples/sample5_unittest.cc samples/sample6_unittest.cc \ + samples/sample7_unittest.cc samples/sample8_unittest.cc \ + samples/sample9_unittest.cc test/gtest-death-test_ex_test.cc \ + test/gtest-death-test_test.cc test/gtest-filepath_test.cc \ + test/gtest-linked_ptr_test.cc test/gtest-listener_test.cc \ + test/gtest-message_test.cc test/gtest-options_test.cc \ + test/gtest-param-test2_test.cc test/gtest-param-test2_test.cc \ + test/gtest-param-test_test.cc test/gtest-param-test_test.cc \ + test/gtest-param-test_test.h test/gtest-port_test.cc \ + test/gtest_premature_exit_test.cc test/gtest-printers_test.cc \ + test/gtest-test-part_test.cc test/gtest-tuple_test.cc \ + test/gtest-typed-test2_test.cc test/gtest-typed-test_test.cc \ + test/gtest-typed-test_test.h test/gtest-unittest-api_test.cc \ + test/gtest_break_on_failure_unittest_.cc \ + test/gtest_catch_exceptions_test_.cc test/gtest_color_test_.cc \ + test/gtest_env_var_test_.cc test/gtest_environment_test.cc \ + test/gtest_filter_unittest_.cc test/gtest_help_test_.cc \ + test/gtest_list_tests_unittest_.cc test/gtest_main_unittest.cc \ + test/gtest_no_test_unittest.cc test/gtest_output_test_.cc \ + test/gtest_pred_impl_unittest.cc test/gtest_prod_test.cc \ + test/gtest_repeat_test.cc test/gtest_shuffle_test_.cc \ + test/gtest_sole_header_test.cc test/gtest_stress_test.cc \ + test/gtest_throw_on_failure_ex_test.cc \ + test/gtest_throw_on_failure_test_.cc \ + test/gtest_uninitialized_test_.cc test/gtest_unittest.cc \ + test/gtest_unittest.cc test/gtest_xml_outfile1_test_.cc \ + test/gtest_xml_outfile2_test_.cc \ + test/gtest_xml_output_unittest_.cc test/production.cc \ + test/production.h test/gtest_break_on_failure_unittest.py \ + test/gtest_catch_exceptions_test.py test/gtest_color_test.py \ + test/gtest_env_var_test.py test/gtest_filter_unittest.py \ + test/gtest_help_test.py test/gtest_list_tests_unittest.py \ + test/gtest_output_test.py \ + test/gtest_output_test_golden_lin.txt \ + test/gtest_shuffle_test.py test/gtest_test_utils.py \ + test/gtest_throw_on_failure_test.py \ + test/gtest_uninitialized_test.py \ + test/gtest_xml_outfiles_test.py \ + test/gtest_xml_output_unittest.py test/gtest_xml_test_utils.py \ + CMakeLists.txt cmake/internal_utils.cmake msvc/gtest-md.sln \ + msvc/gtest-md.vcproj msvc/gtest.sln msvc/gtest.vcproj \ + msvc/gtest_main-md.vcproj msvc/gtest_main.vcproj \ + msvc/gtest_prod_test-md.vcproj msvc/gtest_prod_test.vcproj \ + msvc/gtest_unittest-md.vcproj msvc/gtest_unittest.vcproj \ + xcode/Config/DebugProject.xcconfig \ + xcode/Config/FrameworkTarget.xcconfig \ + xcode/Config/General.xcconfig \ + xcode/Config/ReleaseProject.xcconfig \ + xcode/Config/StaticLibraryTarget.xcconfig \ + xcode/Config/TestTarget.xcconfig xcode/Resources/Info.plist \ + xcode/Scripts/runtests.sh xcode/Scripts/versiongenerate.py \ + xcode/gtest.xcodeproj/project.pbxproj \ + xcode/Samples/FrameworkSample/Info.plist \ + xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj \ + xcode/Samples/FrameworkSample/runtests.sh \ + xcode/Samples/FrameworkSample/widget.cc \ + xcode/Samples/FrameworkSample/widget.h \ + xcode/Samples/FrameworkSample/widget_test.cc \ + codegear/gtest.cbproj codegear/gtest.groupproj \ + codegear/gtest_all.cc codegear/gtest_link.cc \ + codegear/gtest_main.cbproj codegear/gtest_unittest.cbproj \ + $(m4data_DATA) + +# gtest source files that we don't compile directly. They are +# #included by gtest-all.cc. +GTEST_SRC = \ + src/gtest-death-test.cc \ + src/gtest-filepath.cc \ + src/gtest-internal-inl.h \ + src/gtest-port.cc \ + src/gtest-printers.cc \ + src/gtest-test-part.cc \ + src/gtest-typed-test.cc \ + src/gtest.cc + + +# Distribute and install M4 macro +m4datadir = $(datadir)/aclocal +m4data_DATA = m4/gtest.m4 + +# We define the global AM_CPPFLAGS as everything we compile includes from these +# directories. +AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include +@HAVE_PTHREADS_FALSE@AM_CXXFLAGS = -DGTEST_HAS_PTHREAD=0 + +# Modifies compiler and linker flags for pthreads compatibility. +@HAVE_PTHREADS_TRUE@AM_CXXFLAGS = @PTHREAD_CFLAGS@ -DGTEST_HAS_PTHREAD=1 +@HAVE_PTHREADS_TRUE@AM_LIBS = @PTHREAD_LIBS@ + +# Build rules for libraries. +lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la +lib_libgtest_la_SOURCES = src/gtest-all.cc +pkginclude_HEADERS = \ + include/gtest/gtest-death-test.h \ + include/gtest/gtest-message.h \ + include/gtest/gtest-param-test.h \ + include/gtest/gtest-printers.h \ + include/gtest/gtest-spi.h \ + include/gtest/gtest-test-part.h \ + include/gtest/gtest-typed-test.h \ + include/gtest/gtest.h \ + include/gtest/gtest_pred_impl.h \ + include/gtest/gtest_prod.h + +pkginclude_internaldir = $(pkgincludedir)/internal +pkginclude_internal_HEADERS = \ + include/gtest/internal/gtest-death-test-internal.h \ + include/gtest/internal/gtest-filepath.h \ + include/gtest/internal/gtest-internal.h \ + include/gtest/internal/gtest-linked_ptr.h \ + include/gtest/internal/gtest-param-util-generated.h \ + include/gtest/internal/gtest-param-util.h \ + include/gtest/internal/gtest-port.h \ + include/gtest/internal/gtest-string.h \ + include/gtest/internal/gtest-tuple.h \ + include/gtest/internal/gtest-type-util.h + +lib_libgtest_main_la_SOURCES = src/gtest_main.cc +lib_libgtest_main_la_LIBADD = lib/libgtest.la + +# Bulid rules for samples and tests. Automake's naming for some of +# these variables isn't terribly obvious, so this is a brief +# reference: +# +# TESTS -- Programs run automatically by "make check" +# check_PROGRAMS -- Programs built by "make check" but not necessarily run +noinst_LTLIBRARIES = samples/libsamples.la +samples_libsamples_la_SOURCES = \ + samples/sample1.cc \ + samples/sample1.h \ + samples/sample2.cc \ + samples/sample2.h \ + samples/sample3-inl.h \ + samples/sample4.cc \ + samples/sample4.h + +TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \ + GTEST_BUILD_DIR="$(top_builddir)/test" + +samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc +samples_sample1_unittest_LDADD = lib/libgtest_main.la \ + lib/libgtest.la \ + samples/libsamples.la + +samples_sample10_unittest_SOURCES = samples/sample10_unittest.cc +samples_sample10_unittest_LDADD = lib/libgtest.la +test_gtest_all_test_SOURCES = test/gtest_all_test.cc +test_gtest_all_test_LDADD = lib/libgtest_main.la \ + lib/libgtest.la + + +# Tests that fused gtest files compile and work. +FUSED_GTEST_SRC = \ + fused-src/gtest/gtest-all.cc \ + fused-src/gtest/gtest.h \ + fused-src/gtest/gtest_main.cc + +@HAVE_PYTHON_TRUE@test_fused_gtest_test_SOURCES = $(FUSED_GTEST_SRC) \ +@HAVE_PYTHON_TRUE@ samples/sample1.cc samples/sample1_unittest.cc + +@HAVE_PYTHON_TRUE@test_fused_gtest_test_CPPFLAGS = -I"$(srcdir)/fused-src" + +# Death tests may produce core dumps in the build directory. In case +# this happens, clean them to keep distcleancheck happy. +CLEANFILES = core +all: all-am + +.SUFFIXES: +.SUFFIXES: .cc .lo .o .obj +am--refresh: Makefile + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: $(am__configure_deps) + $(am__cd) $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): + +build-aux/config.h: build-aux/stamp-h1 + @if test ! -f $@; then rm -f build-aux/stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) build-aux/stamp-h1; else :; fi + +build-aux/stamp-h1: $(top_srcdir)/build-aux/config.h.in $(top_builddir)/config.status + @rm -f build-aux/stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status build-aux/config.h +$(top_srcdir)/build-aux/config.h.in: $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f build-aux/stamp-h1 + touch $@ + +distclean-hdr: + -rm -f build-aux/config.h build-aux/stamp-h1 +scripts/gtest-config: $(top_builddir)/config.status $(top_srcdir)/scripts/gtest-config.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +src/$(am__dirstamp): + @$(MKDIR_P) src + @: > src/$(am__dirstamp) +src/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) src/$(DEPDIR) + @: > src/$(DEPDIR)/$(am__dirstamp) +src/gtest-all.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) +lib/$(am__dirstamp): + @$(MKDIR_P) lib + @: > lib/$(am__dirstamp) +lib/libgtest.la: $(lib_libgtest_la_OBJECTS) $(lib_libgtest_la_DEPENDENCIES) $(EXTRA_lib_libgtest_la_DEPENDENCIES) lib/$(am__dirstamp) + $(CXXLINK) -rpath $(libdir) $(lib_libgtest_la_OBJECTS) $(lib_libgtest_la_LIBADD) $(LIBS) +src/gtest_main.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) +lib/libgtest_main.la: $(lib_libgtest_main_la_OBJECTS) $(lib_libgtest_main_la_DEPENDENCIES) $(EXTRA_lib_libgtest_main_la_DEPENDENCIES) lib/$(am__dirstamp) + $(CXXLINK) -rpath $(libdir) $(lib_libgtest_main_la_OBJECTS) $(lib_libgtest_main_la_LIBADD) $(LIBS) +samples/$(am__dirstamp): + @$(MKDIR_P) samples + @: > samples/$(am__dirstamp) +samples/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) samples/$(DEPDIR) + @: > samples/$(DEPDIR)/$(am__dirstamp) +samples/sample1.lo: samples/$(am__dirstamp) \ + samples/$(DEPDIR)/$(am__dirstamp) +samples/sample2.lo: samples/$(am__dirstamp) \ + samples/$(DEPDIR)/$(am__dirstamp) +samples/sample4.lo: samples/$(am__dirstamp) \ + samples/$(DEPDIR)/$(am__dirstamp) +samples/libsamples.la: $(samples_libsamples_la_OBJECTS) $(samples_libsamples_la_DEPENDENCIES) $(EXTRA_samples_libsamples_la_DEPENDENCIES) samples/$(am__dirstamp) + $(CXXLINK) $(samples_libsamples_la_OBJECTS) $(samples_libsamples_la_LIBADD) $(LIBS) + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +samples/sample10_unittest.$(OBJEXT): samples/$(am__dirstamp) \ + samples/$(DEPDIR)/$(am__dirstamp) +samples/sample10_unittest$(EXEEXT): $(samples_sample10_unittest_OBJECTS) $(samples_sample10_unittest_DEPENDENCIES) $(EXTRA_samples_sample10_unittest_DEPENDENCIES) samples/$(am__dirstamp) + @rm -f samples/sample10_unittest$(EXEEXT) + $(CXXLINK) $(samples_sample10_unittest_OBJECTS) $(samples_sample10_unittest_LDADD) $(LIBS) +samples/sample1_unittest.$(OBJEXT): samples/$(am__dirstamp) \ + samples/$(DEPDIR)/$(am__dirstamp) +samples/sample1_unittest$(EXEEXT): $(samples_sample1_unittest_OBJECTS) $(samples_sample1_unittest_DEPENDENCIES) $(EXTRA_samples_sample1_unittest_DEPENDENCIES) samples/$(am__dirstamp) + @rm -f samples/sample1_unittest$(EXEEXT) + $(CXXLINK) $(samples_sample1_unittest_OBJECTS) $(samples_sample1_unittest_LDADD) $(LIBS) +fused-src/gtest/$(am__dirstamp): + @$(MKDIR_P) fused-src/gtest + @: > fused-src/gtest/$(am__dirstamp) +fused-src/gtest/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) fused-src/gtest/$(DEPDIR) + @: > fused-src/gtest/$(DEPDIR)/$(am__dirstamp) +fused-src/gtest/test_fused_gtest_test-gtest-all.$(OBJEXT): \ + fused-src/gtest/$(am__dirstamp) \ + fused-src/gtest/$(DEPDIR)/$(am__dirstamp) +fused-src/gtest/test_fused_gtest_test-gtest_main.$(OBJEXT): \ + fused-src/gtest/$(am__dirstamp) \ + fused-src/gtest/$(DEPDIR)/$(am__dirstamp) +samples/test_fused_gtest_test-sample1.$(OBJEXT): \ + samples/$(am__dirstamp) samples/$(DEPDIR)/$(am__dirstamp) +samples/test_fused_gtest_test-sample1_unittest.$(OBJEXT): \ + samples/$(am__dirstamp) samples/$(DEPDIR)/$(am__dirstamp) +test/$(am__dirstamp): + @$(MKDIR_P) test + @: > test/$(am__dirstamp) +test/fused_gtest_test$(EXEEXT): $(test_fused_gtest_test_OBJECTS) $(test_fused_gtest_test_DEPENDENCIES) $(EXTRA_test_fused_gtest_test_DEPENDENCIES) test/$(am__dirstamp) + @rm -f test/fused_gtest_test$(EXEEXT) + $(CXXLINK) $(test_fused_gtest_test_OBJECTS) $(test_fused_gtest_test_LDADD) $(LIBS) +test/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) test/$(DEPDIR) + @: > test/$(DEPDIR)/$(am__dirstamp) +test/gtest_all_test.$(OBJEXT): test/$(am__dirstamp) \ + test/$(DEPDIR)/$(am__dirstamp) +test/gtest_all_test$(EXEEXT): $(test_gtest_all_test_OBJECTS) $(test_gtest_all_test_DEPENDENCIES) $(EXTRA_test_gtest_all_test_DEPENDENCIES) test/$(am__dirstamp) + @rm -f test/gtest_all_test$(EXEEXT) + $(CXXLINK) $(test_gtest_all_test_OBJECTS) $(test_gtest_all_test_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + -rm -f fused-src/gtest/test_fused_gtest_test-gtest-all.$(OBJEXT) + -rm -f fused-src/gtest/test_fused_gtest_test-gtest_main.$(OBJEXT) + -rm -f samples/sample1.$(OBJEXT) + -rm -f samples/sample1.lo + -rm -f samples/sample10_unittest.$(OBJEXT) + -rm -f samples/sample1_unittest.$(OBJEXT) + -rm -f samples/sample2.$(OBJEXT) + -rm -f samples/sample2.lo + -rm -f samples/sample4.$(OBJEXT) + -rm -f samples/sample4.lo + -rm -f samples/test_fused_gtest_test-sample1.$(OBJEXT) + -rm -f samples/test_fused_gtest_test-sample1_unittest.$(OBJEXT) + -rm -f src/gtest-all.$(OBJEXT) + -rm -f src/gtest-all.lo + -rm -f src/gtest_main.$(OBJEXT) + -rm -f src/gtest_main.lo + -rm -f test/gtest_all_test.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@samples/$(DEPDIR)/sample1.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@samples/$(DEPDIR)/sample10_unittest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@samples/$(DEPDIR)/sample1_unittest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@samples/$(DEPDIR)/sample2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@samples/$(DEPDIR)/sample4.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@samples/$(DEPDIR)/test_fused_gtest_test-sample1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gtest-all.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gtest_main.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/gtest_all_test.Po@am__quote@ + +.cc.o: +@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cc.lo: +@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +fused-src/gtest/test_fused_gtest_test-gtest-all.o: fused-src/gtest/gtest-all.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest-all.o -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.o `test -f 'fused-src/gtest/gtest-all.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest-all.cc +@am__fastdepCXX_TRUE@ $(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fused-src/gtest/gtest-all.cc' object='fused-src/gtest/test_fused_gtest_test-gtest-all.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.o `test -f 'fused-src/gtest/gtest-all.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest-all.cc + +fused-src/gtest/test_fused_gtest_test-gtest-all.obj: fused-src/gtest/gtest-all.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest-all.obj -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.obj `if test -f 'fused-src/gtest/gtest-all.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest-all.cc'; fi` +@am__fastdepCXX_TRUE@ $(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fused-src/gtest/gtest-all.cc' object='fused-src/gtest/test_fused_gtest_test-gtest-all.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.obj `if test -f 'fused-src/gtest/gtest-all.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest-all.cc'; fi` + +fused-src/gtest/test_fused_gtest_test-gtest_main.o: fused-src/gtest/gtest_main.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest_main.o -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.o `test -f 'fused-src/gtest/gtest_main.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest_main.cc +@am__fastdepCXX_TRUE@ $(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fused-src/gtest/gtest_main.cc' object='fused-src/gtest/test_fused_gtest_test-gtest_main.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.o `test -f 'fused-src/gtest/gtest_main.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest_main.cc + +fused-src/gtest/test_fused_gtest_test-gtest_main.obj: fused-src/gtest/gtest_main.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest_main.obj -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.obj `if test -f 'fused-src/gtest/gtest_main.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest_main.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest_main.cc'; fi` +@am__fastdepCXX_TRUE@ $(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fused-src/gtest/gtest_main.cc' object='fused-src/gtest/test_fused_gtest_test-gtest_main.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.obj `if test -f 'fused-src/gtest/gtest_main.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest_main.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest_main.cc'; fi` + +samples/test_fused_gtest_test-sample1.o: samples/sample1.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1.o -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo -c -o samples/test_fused_gtest_test-sample1.o `test -f 'samples/sample1.cc' || echo '$(srcdir)/'`samples/sample1.cc +@am__fastdepCXX_TRUE@ $(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='samples/sample1.cc' object='samples/test_fused_gtest_test-sample1.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1.o `test -f 'samples/sample1.cc' || echo '$(srcdir)/'`samples/sample1.cc + +samples/test_fused_gtest_test-sample1.obj: samples/sample1.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1.obj -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo -c -o samples/test_fused_gtest_test-sample1.obj `if test -f 'samples/sample1.cc'; then $(CYGPATH_W) 'samples/sample1.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1.cc'; fi` +@am__fastdepCXX_TRUE@ $(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='samples/sample1.cc' object='samples/test_fused_gtest_test-sample1.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1.obj `if test -f 'samples/sample1.cc'; then $(CYGPATH_W) 'samples/sample1.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1.cc'; fi` + +samples/test_fused_gtest_test-sample1_unittest.o: samples/sample1_unittest.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1_unittest.o -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo -c -o samples/test_fused_gtest_test-sample1_unittest.o `test -f 'samples/sample1_unittest.cc' || echo '$(srcdir)/'`samples/sample1_unittest.cc +@am__fastdepCXX_TRUE@ $(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='samples/sample1_unittest.cc' object='samples/test_fused_gtest_test-sample1_unittest.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1_unittest.o `test -f 'samples/sample1_unittest.cc' || echo '$(srcdir)/'`samples/sample1_unittest.cc + +samples/test_fused_gtest_test-sample1_unittest.obj: samples/sample1_unittest.cc +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1_unittest.obj -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo -c -o samples/test_fused_gtest_test-sample1_unittest.obj `if test -f 'samples/sample1_unittest.cc'; then $(CYGPATH_W) 'samples/sample1_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1_unittest.cc'; fi` +@am__fastdepCXX_TRUE@ $(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='samples/sample1_unittest.cc' object='samples/test_fused_gtest_test-sample1_unittest.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1_unittest.obj `if test -f 'samples/sample1_unittest.cc'; then $(CYGPATH_W) 'samples/sample1_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1_unittest.cc'; fi` + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + -rm -rf lib/.libs lib/_libs + -rm -rf samples/.libs samples/_libs + -rm -rf src/.libs src/_libs + -rm -rf test/.libs test/_libs + +distclean-libtool: + -rm -f libtool config.lt +install-m4dataDATA: $(m4data_DATA) + @$(NORMAL_INSTALL) + test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)" + @list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(m4datadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(m4datadir)" || exit $$?; \ + done + +uninstall-m4dataDATA: + @$(NORMAL_UNINSTALL) + @list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(m4datadir)'; $(am__uninstall_files_from_dir) +install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" + @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ + done + +uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir) +install-pkginclude_internalHEADERS: $(pkginclude_internal_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(pkginclude_internaldir)" || $(MKDIR_P) "$(DESTDIR)$(pkginclude_internaldir)" + @list='$(pkginclude_internal_HEADERS)'; test -n "$(pkginclude_internaldir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkginclude_internaldir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkginclude_internaldir)" || exit $$?; \ + done + +uninstall-pkginclude_internalHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(pkginclude_internal_HEADERS)'; test -n "$(pkginclude_internaldir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pkginclude_internaldir)'; $(am__uninstall_files_from_dir) + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + col=$$red; res=XPASS; \ + ;; \ + *) \ + col=$$grn; res=PASS; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + col=$$lgn; res=XFAIL; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + col=$$red; res=FAIL; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + col=$$blu; res=SKIP; \ + fi; \ + echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ + All=""; \ + else \ + tests="tests"; \ + All="All "; \ + fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="$$All$$all $$tests passed"; \ + else \ + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all $$tests failed"; \ + else \ + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + if test "$$skip" -eq 1; then \ + skipped="($$skip test was not run)"; \ + else \ + skipped="($$skip tests were not run)"; \ + fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + if test "$$failed" -eq 0; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + fi; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ + test "$$failed" -eq 0; \ + else :; fi + +distdir: $(DISTFILES) + $(am__remove_distdir) + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__remove_distdir) + +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS +check: check-am +all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkginclude_internaldir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f fused-src/gtest/$(DEPDIR)/$(am__dirstamp) + -rm -f fused-src/gtest/$(am__dirstamp) + -rm -f lib/$(am__dirstamp) + -rm -f samples/$(DEPDIR)/$(am__dirstamp) + -rm -f samples/$(am__dirstamp) + -rm -f src/$(DEPDIR)/$(am__dirstamp) + -rm -f src/$(am__dirstamp) + -rm -f test/$(DEPDIR)/$(am__dirstamp) + -rm -f test/$(am__dirstamp) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +@HAVE_PYTHON_FALSE@maintainer-clean-local: +clean: clean-am + +clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstLTLIBRARIES mostlyclean-am + +distclean: distclean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf fused-src/gtest/$(DEPDIR) samples/$(DEPDIR) src/$(DEPDIR) test/$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-data-local install-m4dataDATA \ + install-pkgincludeHEADERS install-pkginclude_internalHEADERS + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-exec-local install-libLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -rf fused-src/gtest/$(DEPDIR) samples/$(DEPDIR) src/$(DEPDIR) test/$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-libLTLIBRARIES uninstall-m4dataDATA \ + uninstall-pkgincludeHEADERS \ + uninstall-pkginclude_internalHEADERS + +.MAKE: check-am install-am install-strip + +.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ + clean clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstLTLIBRARIES ctags dist dist-all \ + dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-compile \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-exec-local \ + install-html install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-m4dataDATA install-man \ + install-pdf install-pdf-am install-pkgincludeHEADERS \ + install-pkginclude_internalHEADERS install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + uninstall-m4dataDATA uninstall-pkgincludeHEADERS \ + uninstall-pkginclude_internalHEADERS + + +# Build rules for putting fused Google Test files into the distribution +# package. The user can also create those files by manually running +# scripts/fuse_gtest_files.py. +@HAVE_PYTHON_TRUE@$(test_fused_gtest_test_SOURCES): fused-gtest + +@HAVE_PYTHON_TRUE@fused-gtest: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \ +@HAVE_PYTHON_TRUE@ $(GTEST_SRC) src/gtest-all.cc src/gtest_main.cc \ +@HAVE_PYTHON_TRUE@ scripts/fuse_gtest_files.py +@HAVE_PYTHON_TRUE@ mkdir -p "$(srcdir)/fused-src" +@HAVE_PYTHON_TRUE@ chmod -R u+w "$(srcdir)/fused-src" +@HAVE_PYTHON_TRUE@ rm -f "$(srcdir)/fused-src/gtest/gtest-all.cc" +@HAVE_PYTHON_TRUE@ rm -f "$(srcdir)/fused-src/gtest/gtest.h" +@HAVE_PYTHON_TRUE@ "$(srcdir)/scripts/fuse_gtest_files.py" "$(srcdir)/fused-src" +@HAVE_PYTHON_TRUE@ cp -f "$(srcdir)/src/gtest_main.cc" "$(srcdir)/fused-src/gtest/" + +@HAVE_PYTHON_TRUE@maintainer-clean-local: +@HAVE_PYTHON_TRUE@ rm -rf "$(srcdir)/fused-src" + +# Disables 'make install' as installing a compiled version of Google +# Test can lead to undefined behavior due to violation of the +# One-Definition Rule. + +install-exec-local: + echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." + false + +install-data-local: + echo "'make install' is dangerous and not supported. Instead, see README for how to integrate Google Test into your build system." + false + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/lib/gtest/README b/lib/gtest/README new file mode 100644 index 00000000..26f35a84 --- /dev/null +++ b/lib/gtest/README @@ -0,0 +1,435 @@ +Google C++ Testing Framework +============================ + +http://code.google.com/p/googletest/ + +Overview +-------- + +Google's framework for writing C++ tests on a variety of platforms +(Linux, Mac OS X, Windows, Windows CE, Symbian, etc). Based on the +xUnit architecture. Supports automatic test discovery, a rich set of +assertions, user-defined assertions, death tests, fatal and non-fatal +failures, various options for running the tests, and XML test report +generation. + +Please see the project page above for more information as well as the +mailing list for questions, discussions, and development. There is +also an IRC channel on OFTC (irc.oftc.net) #gtest available. Please +join us! + +Requirements for End Users +-------------------------- + +Google Test is designed to have fairly minimal requirements to build +and use with your projects, but there are some. Currently, we support +Linux, Windows, Mac OS X, and Cygwin. We will also make our best +effort to support other platforms (e.g. Solaris, AIX, and z/OS). +However, since core members of the Google Test project have no access +to these platforms, Google Test may have outstanding issues there. If +you notice any problems on your platform, please notify +googletestframework@googlegroups.com. Patches for fixing them are +even more welcome! + +### Linux Requirements ### + +These are the base requirements to build and use Google Test from a source +package (as described below): + * GNU-compatible Make or gmake + * POSIX-standard shell + * POSIX(-2) Regular Expressions (regex.h) + * A C++98-standard-compliant compiler + +### Windows Requirements ### + + * Microsoft Visual C++ 7.1 or newer + +### Cygwin Requirements ### + + * Cygwin 1.5.25-14 or newer + +### Mac OS X Requirements ### + + * Mac OS X 10.4 Tiger or newer + * Developer Tools Installed + +Also, you'll need CMake 2.6.4 or higher if you want to build the +samples using the provided CMake script, regardless of the platform. + +Requirements for Contributors +----------------------------- + +We welcome patches. If you plan to contribute a patch, you need to +build Google Test and its own tests from an SVN checkout (described +below), which has further requirements: + + * Python version 2.3 or newer (for running some of the tests and + re-generating certain source files from templates) + * CMake 2.6.4 or newer + +Getting the Source +------------------ + +There are two primary ways of getting Google Test's source code: you +can download a stable source release in your preferred archive format, +or directly check out the source from our Subversion (SVN) repositary. +The SVN checkout requires a few extra steps and some extra software +packages on your system, but lets you track the latest development and +make patches much more easily, so we highly encourage it. + +### Source Package ### + +Google Test is released in versioned source packages which can be +downloaded from the download page [1]. Several different archive +formats are provided, but the only difference is the tools used to +manipulate them, and the size of the resulting file. Download +whichever you are most comfortable with. + + [1] http://code.google.com/p/googletest/downloads/list + +Once the package is downloaded, expand it using whichever tools you +prefer for that type. This will result in a new directory with the +name "gtest-X.Y.Z" which contains all of the source code. Here are +some examples on Linux: + + tar -xvzf gtest-X.Y.Z.tar.gz + tar -xvjf gtest-X.Y.Z.tar.bz2 + unzip gtest-X.Y.Z.zip + +### SVN Checkout ### + +To check out the main branch (also known as the "trunk") of Google +Test, run the following Subversion command: + + svn checkout http://googletest.googlecode.com/svn/trunk/ gtest-svn + +Setting up the Build +-------------------- + +To build Google Test and your tests that use it, you need to tell your +build system where to find its headers and source files. The exact +way to do it depends on which build system you use, and is usually +straightforward. + +### Generic Build Instructions ### + +Suppose you put Google Test in directory ${GTEST_DIR}. To build it, +create a library build target (or a project as called by Visual Studio +and Xcode) to compile + + ${GTEST_DIR}/src/gtest-all.cc + +with ${GTEST_DIR}/include in the system header search path and ${GTEST_DIR} +in the normal header search path. Assuming a Linux-like system and gcc, +something like the following will do: + + g++ -isystem ${GTEST_DIR}/include -I${GTEST_DIR} \ + -pthread -c ${GTEST_DIR}/src/gtest-all.cc + ar -rv libgtest.a gtest-all.o + +(We need -pthread as Google Test uses threads.) + +Next, you should compile your test source file with +${GTEST_DIR}/include in the system header search path, and link it +with gtest and any other necessary libraries: + + g++ -isystem ${GTEST_DIR}/include -pthread path/to/your_test.cc libgtest.a \ + -o your_test + +As an example, the make/ directory contains a Makefile that you can +use to build Google Test on systems where GNU make is available +(e.g. Linux, Mac OS X, and Cygwin). It doesn't try to build Google +Test's own tests. Instead, it just builds the Google Test library and +a sample test. You can use it as a starting point for your own build +script. + +If the default settings are correct for your environment, the +following commands should succeed: + + cd ${GTEST_DIR}/make + make + ./sample1_unittest + +If you see errors, try to tweak the contents of make/Makefile to make +them go away. There are instructions in make/Makefile on how to do +it. + +### Using CMake ### + +Google Test comes with a CMake build script (CMakeLists.txt) that can +be used on a wide range of platforms ("C" stands for cross-platofrm.). +If you don't have CMake installed already, you can download it for +free from http://www.cmake.org/. + +CMake works by generating native makefiles or build projects that can +be used in the compiler environment of your choice. The typical +workflow starts with: + + mkdir mybuild # Create a directory to hold the build output. + cd mybuild + cmake ${GTEST_DIR} # Generate native build scripts. + +If you want to build Google Test's samples, you should replace the +last command with + + cmake -Dgtest_build_samples=ON ${GTEST_DIR} + +If you are on a *nix system, you should now see a Makefile in the +current directory. Just type 'make' to build gtest. + +If you use Windows and have Vistual Studio installed, a gtest.sln file +and several .vcproj files will be created. You can then build them +using Visual Studio. + +On Mac OS X with Xcode installed, a .xcodeproj file will be generated. + +### Legacy Build Scripts ### + +Before settling on CMake, we have been providing hand-maintained build +projects/scripts for Visual Studio, Xcode, and Autotools. While we +continue to provide them for convenience, they are not actively +maintained any more. We highly recommend that you follow the +instructions in the previous two sections to integrate Google Test +with your existing build system. + +If you still need to use the legacy build scripts, here's how: + +The msvc\ folder contains two solutions with Visual C++ projects. +Open the gtest.sln or gtest-md.sln file using Visual Studio, and you +are ready to build Google Test the same way you build any Visual +Studio project. Files that have names ending with -md use DLL +versions of Microsoft runtime libraries (the /MD or the /MDd compiler +option). Files without that suffix use static versions of the runtime +libraries (the /MT or the /MTd option). Please note that one must use +the same option to compile both gtest and the test code. If you use +Visual Studio 2005 or above, we recommend the -md version as /MD is +the default for new projects in these versions of Visual Studio. + +On Mac OS X, open the gtest.xcodeproj in the xcode/ folder using +Xcode. Build the "gtest" target. The universal binary framework will +end up in your selected build directory (selected in the Xcode +"Preferences..." -> "Building" pane and defaults to xcode/build). +Alternatively, at the command line, enter: + + xcodebuild + +This will build the "Release" configuration of gtest.framework in your +default build location. See the "xcodebuild" man page for more +information about building different configurations and building in +different locations. + +If you wish to use the Google Test Xcode project with Xcode 4.x and +above, you need to either: + * update the SDK configuration options in xcode/Config/General.xconfig. + Comment options SDKROOT, MACOS_DEPLOYMENT_TARGET, and GCC_VERSION. If + you choose this route you lose the ability to target earlier versions + of MacOS X. + * Install an SDK for an earlier version. This doesn't appear to be + supported by Apple, but has been reported to work + (http://stackoverflow.com/questions/5378518). + +Tweaking Google Test +-------------------- + +Google Test can be used in diverse environments. The default +configuration may not work (or may not work well) out of the box in +some environments. However, you can easily tweak Google Test by +defining control macros on the compiler command line. Generally, +these macros are named like GTEST_XYZ and you define them to either 1 +or 0 to enable or disable a certain feature. + +We list the most frequently used macros below. For a complete list, +see file include/gtest/internal/gtest-port.h. + +### Choosing a TR1 Tuple Library ### + +Some Google Test features require the C++ Technical Report 1 (TR1) +tuple library, which is not yet available with all compilers. The +good news is that Google Test implements a subset of TR1 tuple that's +enough for its own need, and will automatically use this when the +compiler doesn't provide TR1 tuple. + +Usually you don't need to care about which tuple library Google Test +uses. However, if your project already uses TR1 tuple, you need to +tell Google Test to use the same TR1 tuple library the rest of your +project uses, or the two tuple implementations will clash. To do +that, add + + -DGTEST_USE_OWN_TR1_TUPLE=0 + +to the compiler flags while compiling Google Test and your tests. If +you want to force Google Test to use its own tuple library, just add + + -DGTEST_USE_OWN_TR1_TUPLE=1 + +to the compiler flags instead. + +If you don't want Google Test to use tuple at all, add + + -DGTEST_HAS_TR1_TUPLE=0 + +and all features using tuple will be disabled. + +### Multi-threaded Tests ### + +Google Test is thread-safe where the pthread library is available. +After #include "gtest/gtest.h", you can check the GTEST_IS_THREADSAFE +macro to see whether this is the case (yes if the macro is #defined to +1, no if it's undefined.). + +If Google Test doesn't correctly detect whether pthread is available +in your environment, you can force it with + + -DGTEST_HAS_PTHREAD=1 + +or + + -DGTEST_HAS_PTHREAD=0 + +When Google Test uses pthread, you may need to add flags to your +compiler and/or linker to select the pthread library, or you'll get +link errors. If you use the CMake script or the deprecated Autotools +script, this is taken care of for you. If you use your own build +script, you'll need to read your compiler and linker's manual to +figure out what flags to add. + +### As a Shared Library (DLL) ### + +Google Test is compact, so most users can build and link it as a +static library for the simplicity. You can choose to use Google Test +as a shared library (known as a DLL on Windows) if you prefer. + +To compile *gtest* as a shared library, add + + -DGTEST_CREATE_SHARED_LIBRARY=1 + +to the compiler flags. You'll also need to tell the linker to produce +a shared library instead - consult your linker's manual for how to do +it. + +To compile your *tests* that use the gtest shared library, add + + -DGTEST_LINKED_AS_SHARED_LIBRARY=1 + +to the compiler flags. + +Note: while the above steps aren't technically necessary today when +using some compilers (e.g. GCC), they may become necessary in the +future, if we decide to improve the speed of loading the library (see +http://gcc.gnu.org/wiki/Visibility for details). Therefore you are +recommended to always add the above flags when using Google Test as a +shared library. Otherwise a future release of Google Test may break +your build script. + +### Avoiding Macro Name Clashes ### + +In C++, macros don't obey namespaces. Therefore two libraries that +both define a macro of the same name will clash if you #include both +definitions. In case a Google Test macro clashes with another +library, you can force Google Test to rename its macro to avoid the +conflict. + +Specifically, if both Google Test and some other code define macro +FOO, you can add + + -DGTEST_DONT_DEFINE_FOO=1 + +to the compiler flags to tell Google Test to change the macro's name +from FOO to GTEST_FOO. Currently FOO can be FAIL, SUCCEED, or TEST. +For example, with -DGTEST_DONT_DEFINE_TEST=1, you'll need to write + + GTEST_TEST(SomeTest, DoesThis) { ... } + +instead of + + TEST(SomeTest, DoesThis) { ... } + +in order to define a test. + +Upgrating from an Earlier Version +--------------------------------- + +We strive to keep Google Test releases backward compatible. +Sometimes, though, we have to make some breaking changes for the +users' long-term benefits. This section describes what you'll need to +do if you are upgrading from an earlier version of Google Test. + +### Upgrading from 1.3.0 or Earlier ### + +You may need to explicitly enable or disable Google Test's own TR1 +tuple library. See the instructions in section "Choosing a TR1 Tuple +Library". + +### Upgrading from 1.4.0 or Earlier ### + +The Autotools build script (configure + make) is no longer officially +supportted. You are encouraged to migrate to your own build system or +use CMake. If you still need to use Autotools, you can find +instructions in the README file from Google Test 1.4.0. + +On platforms where the pthread library is available, Google Test uses +it in order to be thread-safe. See the "Multi-threaded Tests" section +for what this means to your build script. + +If you use Microsoft Visual C++ 7.1 with exceptions disabled, Google +Test will no longer compile. This should affect very few people, as a +large portion of STL (including ) doesn't compile in this mode +anyway. We decided to stop supporting it in order to greatly simplify +Google Test's implementation. + +Developing Google Test +---------------------- + +This section discusses how to make your own changes to Google Test. + +### Testing Google Test Itself ### + +To make sure your changes work as intended and don't break existing +functionality, you'll want to compile and run Google Test's own tests. +For that you can use CMake: + + mkdir mybuild + cd mybuild + cmake -Dgtest_build_tests=ON ${GTEST_DIR} + +Make sure you have Python installed, as some of Google Test's tests +are written in Python. If the cmake command complains about not being +able to find Python ("Could NOT find PythonInterp (missing: +PYTHON_EXECUTABLE)"), try telling it explicitly where your Python +executable can be found: + + cmake -DPYTHON_EXECUTABLE=path/to/python -Dgtest_build_tests=ON ${GTEST_DIR} + +Next, you can build Google Test and all of its own tests. On *nix, +this is usually done by 'make'. To run the tests, do + + make test + +All tests should pass. + +### Regenerating Source Files ### + +Some of Google Test's source files are generated from templates (not +in the C++ sense) using a script. A template file is named FOO.pump, +where FOO is the name of the file it will generate. For example, the +file include/gtest/internal/gtest-type-util.h.pump is used to generate +gtest-type-util.h in the same directory. + +Normally you don't need to worry about regenerating the source files, +unless you need to modify them. In that case, you should modify the +corresponding .pump files instead and run the pump.py Python script to +regenerate them. You can find pump.py in the scripts/ directory. +Read the Pump manual [2] for how to use it. + + [2] http://code.google.com/p/googletest/wiki/PumpManual + +### Contributing a Patch ### + +We welcome patches. Please read the Google Test developer's guide [3] +for how you can contribute. In particular, make sure you have signed +the Contributor License Agreement, or we won't be able to accept the +patch. + + [3] http://code.google.com/p/googletest/wiki/GoogleTestDevGuide + +Happy testing! diff --git a/lib/gtest/configure b/lib/gtest/configure new file mode 100644 index 00000000..582a9a05 --- /dev/null +++ b/lib/gtest/configure @@ -0,0 +1,18222 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.68 for Google C++ Testing Framework 1.7.0. +# +# Report bugs to . +# +# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: googletestframework@googlegroups.com about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + +SHELL=${CONFIG_SHELL-/bin/sh} + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME='Google C++ Testing Framework' +PACKAGE_TARNAME='gtest' +PACKAGE_VERSION='1.7.0' +PACKAGE_STRING='Google C++ Testing Framework 1.7.0' +PACKAGE_BUGREPORT='googletestframework@googlegroups.com' +PACKAGE_URL='' + +ac_unique_file="./LICENSE" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS +LIBOBJS +HAVE_PTHREADS_FALSE +HAVE_PTHREADS_TRUE +PTHREAD_CFLAGS +PTHREAD_LIBS +PTHREAD_CC +acx_pthread_config +HAVE_PYTHON_FALSE +HAVE_PYTHON_TRUE +PYTHON +CXXCPP +CPP +OTOOL64 +OTOOL +LIPO +NMEDIT +DSYMUTIL +MANIFEST_TOOL +RANLIB +ac_ct_AR +AR +DLLTOOL +OBJDUMP +LN_S +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP +EGREP +GREP +SED +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +LIBTOOL +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE +ac_ct_CXX +CXXFLAGS +CXX +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_dependency_tracking +enable_shared +enable_static +with_pic +enable_fast_install +with_gnu_ld +with_sysroot +enable_libtool_lock +with_pthreads +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CXX +CXXFLAGS +CCC +CPP +CXXCPP' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures Google C++ Testing Framework 1.7.0 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/gtest] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of Google C++ Testing Framework 1.7.0:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + --with-pthreads use pthreads (default is yes) + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CXX C++ compiler command + CXXFLAGS C++ compiler flags + CPP C preprocessor + CXXCPP C++ preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +Google C++ Testing Framework configure 1.7.0 +generated by GNU Autoconf 2.68 + +Copyright (C) 2010 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_cxx_try_compile LINENO +# ---------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_cxx_try_cpp LINENO +# ------------------------ +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_cpp + +# ac_fn_cxx_try_link LINENO +# ------------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_cxx_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_cxx_try_link +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by Google C++ Testing Framework $as_me 1.7.0, which was +generated by GNU Autoconf 2.68. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +# Provide various options to initialize the Autoconf and configure processes. + + + +ac_aux_dir= +for ac_dir in build-aux "$srcdir"/build-aux; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +ac_config_headers="$ac_config_headers build-aux/config.h" + +ac_config_files="$ac_config_files Makefile" + +ac_config_files="$ac_config_files scripts/gtest-config" + + +# Initialize Automake with various options. We require at least v1.9, prevent +# pedantic complaints about package files, and enable various distribution +# targets. +am__api_version='1.11' + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; +esac + +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 + fi + + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='gtest' + VERSION='1.7.0' + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + + +# Check for programs used in building Google Test. +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +else + CXXFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + +else + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_prog_cxx_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +depcc="$CXX" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac + + + +macro_version='2.4.2' +macro_revision='1.3337' + + + + + + + + + + + + + +ltmain="$ac_aux_dir/ltmain.sh" + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_FGREP=$FGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +test -z "$GREP" && GREP=grep + + + + + + + + + + + + + + + + + + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$DUMPBIN" && break + done +fi +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in dumpbin "link -dump" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_DUMPBIN" && break +done + + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DUMPBIN=$ac_ct_DUMPBIN + fi +fi + + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi + + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi + +# find the maximum length of command line arguments +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 +else + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac + +fi + +if test -n $lt_cv_sys_max_cmd_len ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } +fi +max_cmd_len=$lt_cv_sys_max_cmd_len + + + + + + +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +lt_shell_append=no +( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } + + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi + + + + + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + +test -z "$OBJDUMP" && OBJDUMP=objdump + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. + +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +beos*) + lt_cv_deplibs_check_method=pass_all + ;; + +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + + + + + + + + + + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} +: ${AR_FLAGS=cru} + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +test -z "$STRIP" && STRIP=: + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +test -z "$RANLIB" && RANLIB=: + + + + + + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# Check for command to grab the raw symbol name followed by C symbol from nm. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 +else + +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[BCDEGRST]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[BCDT]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[ABCDEGRST]' + fi + ;; +irix* | nonstopux*) + symcode='[BCDEGRST]' + ;; +osf*) + symcode='[BCDEGQRST]' + ;; +solaris*) + symcode='[BDRT]' + ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; +sysv4) + symcode='[DFNSTU]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 + fi + else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done + +fi + +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes +else + lt_cv_cc_needs_belf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks="$enable_libtool_lock" + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +set dummy ${ac_tool_prefix}lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_LIPO="lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_LIPO" = x; then + LIPO=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LIPO=$ac_ct_LIPO + fi +else + LIPO="$ac_cv_prog_LIPO" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL="otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL=$ac_ct_OTOOL + fi +else + OTOOL="$ac_cv_prog_OTOOL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OTOOL64="otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL64=$ac_ct_OTOOL64 + fi +else + OTOOL64="$ac_cv_prog_OTOOL64" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes +else + lt_cv_ld_exported_symbols_list=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF + +fi + +done + + + +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf + + + + + +# Set options + + + + enable_dlopen=no + + + enable_win32_dll=no + + + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_shared=yes +fi + + + + + + + + + + # Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=yes +fi + + + + + + + + + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + pic_mode=default +fi + + +test -z "$pic_mode" && pic_mode=default + + + + + + + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_fast_install=yes +fi + + + + + + + + + + + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +test -z "$LN_S" && LN_S="ln -s" + + + + + + + + + + + + + + +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir + + + + + +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF + + + + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + + +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + else + MAGIC_CMD=: + fi +fi + + fi + ;; +esac + +# Use C for the default configuration in the libtool script + +lt_save_CC="$CC" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +objext=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* + + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + +lt_prog_compiler_no_builtin_flag= + +if test "$GCC" = yes; then + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +else + : +fi + +fi + + + + + + + lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= + + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; + + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; + + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; + + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi + +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac +else + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no +fi + +fi + + + + + + + + + + + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } + +if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= +fi + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; + esac + + ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + ld_shlibs=no + fi + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; + + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='${wl}-f,' + + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac + ;; + + darwin* | rhapsody*) + + + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec='' + fi + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + + else + ld_shlibs=no + fi + + ;; + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; + + *nto* | *qnx*) + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + else + ld_shlibs=no + fi + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; + + solaris*) + no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; + esac + link_all_deplibs=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + ;; + esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' + ;; + esac + fi + fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no + +with_gnu_ld=$with_gnu_ld + + + + + + + + + + + + + + + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + ;; + esac + fi + ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[4-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[23].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[3-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } + +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + + + + + + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes +else + ac_cv_lib_dld_shl_load=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes +else + ac_cv_lib_svld_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes +else + ac_cv_lib_dld_dld_link=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + + + + + + + + + + + + + + + + +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac +fi + + + + + + + + + + + + + # Report which library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } + + + + +fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +CC="$lt_save_CC" + + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +if test -z "$CXXCPP"; then + if ${ac_cv_prog_CXXCPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_cxx_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +else + _lt_caught_CXX_error=yes +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +archive_cmds_need_lc_CXX=no +allow_undefined_flag_CXX= +always_export_symbols_CXX=no +archive_expsym_cmds_CXX= +compiler_needs_object_CXX=no +export_dynamic_flag_spec_CXX= +hardcode_direct_CXX=no +hardcode_direct_absolute_CXX=no +hardcode_libdir_flag_spec_CXX= +hardcode_libdir_separator_CXX= +hardcode_minus_L_CXX=no +hardcode_shlibpath_var_CXX=unsupported +hardcode_automatic_CXX=no +inherit_rpath_CXX=no +module_cmds_CXX= +module_expsym_cmds_CXX= +link_all_deplibs_CXX=unknown +old_archive_cmds_CXX=$old_archive_cmds +reload_flag_CXX=$reload_flag +reload_cmds_CXX=$reload_cmds +no_undefined_flag_CXX= +whole_archive_flag_spec_CXX= +enable_shared_with_static_runtimes_CXX=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +objext_CXX=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + + # save warnings/boilerplate of simple test code + ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* + + ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* + + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS + compiler=$CC + compiler_CXX=$CC + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` + + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' + else + lt_prog_compiler_no_builtin_flag_CXX= + fi + + if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld + + + + + + + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_CXX= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds_CXX='' + hardcode_direct_CXX=yes + hardcode_direct_absolute_CXX=yes + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + file_list_spec_CXX='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct_CXX=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L_CXX=yes + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_libdir_separator_CXX= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + export_dynamic_flag_spec_CXX='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + always_export_symbols_CXX=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag_CXX='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath__CXX +fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + + archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_CXX="-z nodefs" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath__CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath__CXX"; then + lt_cv_aix_libpath__CXX="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath__CXX +fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag_CXX=' ${wl}-bernotok' + allow_undefined_flag_CXX=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' + fi + archive_cmds_need_lc_CXX=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_CXX=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_CXX=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_CXX=' ' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=yes + file_list_spec_CXX='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true' + enable_shared_with_static_runtimes_CXX=yes + # Don't use ranlib + old_postinstall_cmds_CXX='chmod 644 $oldlib' + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi + ;; + esac + ;; + darwin* | rhapsody*) + + + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec_CXX='' + fi + link_all_deplibs_CXX=yes + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + if test "$lt_cv_apple_cc_single_mod" != "yes"; then + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi + + else + ld_shlibs_CXX=no + fi + + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + ld_shlibs_CXX=no + ;; + + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes + ;; + + gnu*) + ;; + + haiku*) + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs_CXX=yes + ;; + + hpux9*) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_direct_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + export_dynamic_flag_spec_CXX='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + ;; + *) + hardcode_direct_CXX=yes + hardcode_direct_absolute_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + + interix[3-9]*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + link_all_deplibs_CXX=yes + ;; + esac + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + inherit_rpath_CXX=yes + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + archive_cmds_need_lc_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [1-5].* | *pgcpp\ [1-5].*) + prelink_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + old_archive_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + archive_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + hardcode_libdir_flag_spec_CXX='-R$libdir' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + compiler_needs_object_CXX=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + ld_shlibs_CXX=yes + ;; + + openbsd2*) + # C++ shared libraries are fairly broken + ld_shlibs_CXX=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + hardcode_direct_absolute_CXX=yes + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else + ld_shlibs_CXX=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_separator_CXX=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + cxx*) + case $host in + osf3*) + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + ;; + *) + allow_undefined_flag_CXX=' -expect_unresolved \*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + ;; + esac + + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + archive_cmds_need_lc_CXX=yes + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_shlibpath_var_CXX=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' + ;; + esac + link_all_deplibs_CXX=yes + + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_CXX='${wl}-z,text' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_CXX='${wl}-z,text' + allow_undefined_flag_CXX='${wl}-z,nodefs' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + export_dynamic_flag_spec_CXX='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~ + '"$old_archive_cmds_CXX" + reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~ + '"$reload_cmds_CXX" + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + GCC_CXX="$GXX" + LD_CXX="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + # Dependencies to place before and after the object being linked: +predep_objects_CXX= +postdep_objects_CXX= +predeps_CXX= +postdeps_CXX= +compiler_lib_search_path_CXX= + +cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF + + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + fi + + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + if test "$pre_test_object_deps_done" = no; then + case ${prev} in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$compiler_lib_search_path_CXX"; then + compiler_lib_search_path_CXX="${prev}${p}" + else + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$postdeps_CXX"; then + postdeps_CXX="${prev}${p}" + else + postdeps_CXX="${postdeps_CXX} ${prev}${p}" + fi + fi + prev= + ;; + + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$predep_objects_CXX"; then + predep_objects_CXX="$p" + else + predep_objects_CXX="$predep_objects_CXX $p" + fi + else + if test -z "$postdep_objects_CXX"; then + postdep_objects_CXX="$p" + else + postdep_objects_CXX="$postdep_objects_CXX $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling CXX test program" +fi + +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +case $host_os in +interix[3-9]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= + postdep_objects_CXX= + postdeps_CXX= + ;; + +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac + + +case " $postdeps_CXX " in +*" -lc "*) archive_cmds_need_lc_CXX=no ;; +esac + compiler_lib_search_dirs_CXX= +if test -n "${compiler_lib_search_path_CXX}"; then + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + lt_prog_compiler_wl_CXX= +lt_prog_compiler_pic_CXX= +lt_prog_compiler_static_CXX= + + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic_CXX='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_CXX='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static_CXX= + ;; + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_CXX=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic_CXX='-fPIC -shared' + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + else + case $host_os in + aix[4-9]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + else + lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + dgux*) + case $cc_basename in + ec++*) + lt_prog_compiler_pic_CXX='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + lt_prog_compiler_pic_CXX='+Z' + fi + ;; + aCC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_CXX='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler + lt_prog_compiler_wl_CXX='--backend -Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + lt_prog_compiler_static_CXX='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fpic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + xlc* | xlC* | bgxl[cC]* | mpixl[cC]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-qpic' + lt_prog_compiler_static_CXX='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + lt_prog_compiler_pic_CXX='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic_CXX='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + lt_prog_compiler_wl_CXX='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + lt_prog_compiler_pic_CXX='-pic' + ;; + cxx*) + # Digital/Compaq C++ + lt_prog_compiler_wl_CXX='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + lt_prog_compiler_pic_CXX='-pic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + lcc*) + # Lucid + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + lt_prog_compiler_pic_CXX='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + lt_prog_compiler_can_build_shared_CXX=no + ;; + esac + fi + +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_CXX= + ;; + *) + lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" + ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works_CXX=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } + +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; + esac +else + lt_prog_compiler_pic_CXX= + lt_prog_compiler_can_build_shared_CXX=no +fi + +fi + + + + + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works_CXX=yes + fi + else + lt_cv_prog_compiler_static_works_CXX=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } + +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then + : +else + lt_prog_compiler_static_CXX= +fi + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } + + + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + case $host_os in + aix[4-9]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + export_symbols_cmds_CXX="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) + exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + ;; + esac + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } +test "$ld_shlibs_CXX" = no && can_build_shared=no + +with_gnu_ld_CXX=$with_gnu_ld + + + + + + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc_CXX" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_CXX=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_CXX in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc_CXX=no + else + lt_cv_archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } + archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX + ;; + esac + fi + ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[4-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[23].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[3-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || + test -n "$runpath_var_CXX" || + test "X$hardcode_automatic_CXX" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 +$as_echo "$hardcode_action_CXX" >&6; } + +if test "$hardcode_action_CXX" = relink || + test "$inherit_rpath_CXX" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + + + + + + + fi # test -n "$compiler" + + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + + + + + + + + + + + + + + ac_config_commands="$ac_config_commands libtool" + + + + +# Only expand once: + + + +# TODO(chandlerc@google.com): Currently we aren't running the Python tests +# against the interpreter detected by AM_PATH_PYTHON, and so we condition +# HAVE_PYTHON by requiring "python" to be in the PATH, and that interpreter's +# version to be >= 2.3. This will allow the scripts to use a "/usr/bin/env" +# hashbang. +PYTHON= # We *do not* allow the user to specify a python interpreter +# Extract the first word of "python", so it can be a program name with args. +set dummy python; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PYTHON in + [\\/]* | ?:[\\/]*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON=":" + ;; +esac +fi +PYTHON=$ac_cv_path_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test "$PYTHON" != ":"; then : + prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0] +minverhex = 0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] +sys.exit(sys.hexversion < minverhex)" + if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 + ($PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then : + : +else + PYTHON=":" +fi +fi + if test "$PYTHON" != ":"; then + HAVE_PYTHON_TRUE= + HAVE_PYTHON_FALSE='#' +else + HAVE_PYTHON_TRUE='#' + HAVE_PYTHON_FALSE= +fi + + +# Configure pthreads. + +# Check whether --with-pthreads was given. +if test "${with_pthreads+set}" = set; then : + withval=$with_pthreads; with_pthreads=$withval +else + with_pthreads=check +fi + + +have_pthreads=no +if test "x$with_pthreads" != "xno"; then : + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +acx_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on True64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 +$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_join (); +int +main () +{ +return pthread_join (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + acx_pthread_ok=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } + if test x"$acx_pthread_ok" = xno; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) +# -pthreads: Solaris/gcc +# -mthreads: Mingw32/gcc, Lynx/gcc +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads too; +# also defines -D_REENTRANT) +# ... -mt is also the pthreads flag for HP/aCC +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case "${host_cpu}-${host_os}" in + *solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (We need to link with -pthreads/-mt/ + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather + # a function called by this macro, so we could check for that, but + # who knows whether they'll stub that too in a future libc.) So, + # we'll just look for -pthreads and -lpthread first: + + acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" + ;; +esac + +if test x"$acx_pthread_ok" = xno; then +for flag in $acx_pthread_flags; do + + case $flag in + none) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +$as_echo_n "checking whether pthreads work without any flags... " >&6; } + ;; + + -*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 +$as_echo_n "checking whether pthreads work with $flag... " >&6; } + PTHREAD_CFLAGS="$flag" + ;; + + pthread-config) + # Extract the first word of "pthread-config", so it can be a program name with args. +set dummy pthread-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_acx_pthread_config+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$acx_pthread_config"; then + ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_acx_pthread_config="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" +fi +fi +acx_pthread_config=$ac_cv_prog_acx_pthread_config +if test -n "$acx_pthread_config"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 +$as_echo "$acx_pthread_config" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test x"$acx_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 +$as_echo_n "checking for the pthreads library -l$flag... " >&6; } + PTHREAD_LIBS="-l$flag" + ;; + esac + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + acx_pthread_ok=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 +$as_echo "$acx_pthread_ok" >&6; } + if test "x$acx_pthread_ok" = xyes; then + break; + fi + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Various other checks: +if test "x$acx_pthread_ok" = xyes; then + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +$as_echo_n "checking for joinable pthread attribute... " >&6; } + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +int attr=$attr; return attr; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + attr_name=$attr; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 +$as_echo "$attr_name" >&6; } + if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then + +cat >>confdefs.h <<_ACEOF +#define PTHREAD_CREATE_JOINABLE $attr_name +_ACEOF + + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 +$as_echo_n "checking if more special flags are required for pthreads... " >&6; } + flag=no + case "${host_cpu}-${host_os}" in + *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; + *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 +$as_echo "${flag}" >&6; } + if test "x$flag" != xno; then + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" + fi + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + # More AIX lossage: must compile with xlc_r or cc_r + if test x"$GCC" != xyes; then + for ac_prog in xlc_r cc_r +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PTHREAD_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PTHREAD_CC"; then + ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PTHREAD_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PTHREAD_CC=$ac_cv_prog_PTHREAD_CC +if test -n "$PTHREAD_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +$as_echo "$PTHREAD_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$PTHREAD_CC" && break +done +test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" + + else + PTHREAD_CC=$CC + fi + + # The next part tries to detect GCC inconsistency with -shared on some + # architectures and systems. The problem is that in certain + # configurations, when -shared is specified, GCC "forgets" to + # internally use various flags which are still necessary. + + # + # Prepare the flags + # + save_CFLAGS="$CFLAGS" + save_LIBS="$LIBS" + save_CC="$CC" + + # Try with the flags determined by the earlier checks. + # + # -Wl,-z,defs forces link-time symbol resolution, so that the + # linking checks with -shared actually have any value + # + # FIXME: -fPIC is required for -shared on many architectures, + # so we specify it here, but the right way would probably be to + # properly detect whether it is actually required. + CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + CC="$PTHREAD_CC" + + # In order not to create several levels of indentation, we test + # the value of "$done" until we find the cure or run out of ideas. + done="no" + + # First, make sure the CFLAGS we added are actually accepted by our + # compiler. If not (and OS X's ld, for instance, does not accept -z), + # then we can't do this test. + if test x"$done" = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to check for GCC pthread/shared inconsistencies" >&5 +$as_echo_n "checking whether to check for GCC pthread/shared inconsistencies... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + +else + done=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + if test "x$done" = xyes ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi + fi + + if test x"$done" = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -pthread is sufficient with -shared" >&5 +$as_echo_n "checking whether -pthread is sufficient with -shared... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + done=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + if test "x$done" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi + + # + # Linux gcc on some architectures such as mips/mipsel forgets + # about -lpthread + # + if test x"$done" = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lpthread fixes that" >&5 +$as_echo_n "checking whether -lpthread fixes that... " >&6; } + LIBS="-lpthread $PTHREAD_LIBS $save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + done=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + if test "x$done" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + PTHREAD_LIBS="-lpthread $PTHREAD_LIBS" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi + # + # FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc + # + if test x"$done" = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc_r fixes that" >&5 +$as_echo_n "checking whether -lc_r fixes that... " >&6; } + LIBS="-lc_r $PTHREAD_LIBS $save_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +pthread_t th; pthread_join(th, 0); + pthread_attr_init(0); pthread_cleanup_push(0, 0); + pthread_create(0,0,0,0); pthread_cleanup_pop(0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + done=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + if test "x$done" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + PTHREAD_LIBS="-lc_r $PTHREAD_LIBS" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi + if test x"$done" = xno; then + # OK, we have run out of ideas + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Impossible to determine how to use pthreads with shared libraries" >&5 +$as_echo "$as_me: WARNING: Impossible to determine how to use pthreads with shared libraries" >&2;} + + # so it's not safe to assume that we may use pthreads + acx_pthread_ok=no + fi + + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS" + CC="$save_CC" +else + PTHREAD_CC="$CC" +fi + + + + + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$acx_pthread_ok" = xyes; then + +$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h + + : +else + acx_pthread_ok=no + if test "x$with_pthreads" != "xcheck"; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "--with-pthreads was specified, but unable to be used +See \`config.log' for more details" "$LINENO" 5; } +fi +fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + have_pthreads="$acx_pthread_ok" +fi + if test "x$have_pthreads" = "xyes"; then + HAVE_PTHREADS_TRUE= + HAVE_PTHREADS_FALSE='#' +else + HAVE_PTHREADS_TRUE='#' + HAVE_PTHREADS_FALSE= +fi + + + + +# TODO(chandlerc@google.com) Check for the necessary system headers. + +# TODO(chandlerc@google.com) Check the types, structures, and other compiler +# and architecture characteristics. + +# Output the generated files. No further autoconf macros may be used. +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +DEFS=-DHAVE_CONFIG_H + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then + as_fn_error $? "conditional \"HAVE_PYTHON\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_PTHREADS_TRUE}" && test -z "${HAVE_PTHREADS_FALSE}"; then + as_fn_error $? "conditional \"HAVE_PTHREADS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by Google C++ Testing Framework $as_me 1.7.0, which was +generated by GNU Autoconf 2.68. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to ." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +Google C++ Testing Framework config.status 1.7.0 +configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2010 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' +predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' +predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' +postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' +reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' +reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' + +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in SHELL \ +ECHO \ +PATH_SEPARATOR \ +SED \ +GREP \ +EGREP \ +FGREP \ +LD \ +NM \ +LN_S \ +lt_SP2NL \ +lt_NL2SP \ +reload_flag \ +OBJDUMP \ +deplibs_check_method \ +file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ +AR \ +AR_FLAGS \ +archiver_list_spec \ +STRIP \ +RANLIB \ +CC \ +CFLAGS \ +compiler \ +lt_cv_sys_global_symbol_pipe \ +lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_c_name_address \ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +nm_file_list_spec \ +lt_prog_compiler_no_builtin_flag \ +lt_prog_compiler_pic \ +lt_prog_compiler_wl \ +lt_prog_compiler_static \ +lt_cv_prog_compiler_c_o \ +need_locks \ +MANIFEST_TOOL \ +DSYMUTIL \ +NMEDIT \ +LIPO \ +OTOOL \ +OTOOL64 \ +shrext_cmds \ +export_dynamic_flag_spec \ +whole_archive_flag_spec \ +compiler_needs_object \ +with_gnu_ld \ +allow_undefined_flag \ +no_undefined_flag \ +hardcode_libdir_flag_spec \ +hardcode_libdir_separator \ +exclude_expsyms \ +include_expsyms \ +file_list_spec \ +variables_saved_for_relink \ +libname_spec \ +library_names_spec \ +soname_spec \ +install_override_mode \ +finish_eval \ +old_striplib \ +striplib \ +compiler_lib_search_dirs \ +predep_objects \ +postdep_objects \ +predeps \ +postdeps \ +compiler_lib_search_path \ +LD_CXX \ +reload_flag_CXX \ +compiler_CXX \ +lt_prog_compiler_no_builtin_flag_CXX \ +lt_prog_compiler_pic_CXX \ +lt_prog_compiler_wl_CXX \ +lt_prog_compiler_static_CXX \ +lt_cv_prog_compiler_c_o_CXX \ +export_dynamic_flag_spec_CXX \ +whole_archive_flag_spec_CXX \ +compiler_needs_object_CXX \ +with_gnu_ld_CXX \ +allow_undefined_flag_CXX \ +no_undefined_flag_CXX \ +hardcode_libdir_flag_spec_CXX \ +hardcode_libdir_separator_CXX \ +exclude_expsyms_CXX \ +include_expsyms_CXX \ +file_list_spec_CXX \ +compiler_lib_search_dirs_CXX \ +predep_objects_CXX \ +postdep_objects_CXX \ +predeps_CXX \ +postdeps_CXX \ +compiler_lib_search_path_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in reload_cmds \ +old_postinstall_cmds \ +old_postuninstall_cmds \ +old_archive_cmds \ +extract_expsyms_cmds \ +old_archive_from_new_cmds \ +old_archive_from_expsyms_cmds \ +archive_cmds \ +archive_expsym_cmds \ +module_cmds \ +module_expsym_cmds \ +export_symbols_cmds \ +prelink_cmds \ +postlink_cmds \ +postinstall_cmds \ +postuninstall_cmds \ +finish_cmds \ +sys_lib_search_path_spec \ +sys_lib_dlsearch_path_spec \ +reload_cmds_CXX \ +old_archive_cmds_CXX \ +old_archive_from_new_cmds_CXX \ +old_archive_from_expsyms_cmds_CXX \ +archive_cmds_CXX \ +archive_expsym_cmds_CXX \ +module_cmds_CXX \ +module_expsym_cmds_CXX \ +export_symbols_cmds_CXX \ +prelink_cmds_CXX \ +postlink_cmds_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +ac_aux_dir='$ac_aux_dir' +xsi_shell='$xsi_shell' +lt_shell_append='$lt_shell_append' + +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi + + + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile' + + + + + + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "build-aux/config.h") CONFIG_HEADERS="$CONFIG_HEADERS build-aux/config.h" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "scripts/gtest-config") CONFIG_FILES="$CONFIG_FILES scripts/gtest-config" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + + + case $ac_file$ac_mode in + "scripts/gtest-config":F) chmod +x scripts/gtest-config ;; + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} + ;; + "libtool":C) + + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + +# The names of the tagged configurations supported by this script. +available_tags="CXX " + +# ### BEGIN LIBTOOL CONFIG + +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# What type of objects to build. +pic_mode=$pic_mode + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# A sed program that does not truncate output. +SED=$lt_SED + +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="\$SED -e 1s/^X//" + +# A grep program that handles long lines. +GREP=$lt_GREP + +# An ERE matcher. +EGREP=$lt_EGREP + +# A literal string matcher. +FGREP=$lt_FGREP + +# A BSD- or MS-compatible name lister. +NM=$lt_NM + +# Whether we need soft or hard links. +LN_S=$lt_LN_S + +# What is the maximum length of a command? +max_cmd_len=$max_cmd_len + +# Object file suffix (normally "o"). +objext=$ac_objext + +# Executable file suffix (normally ""). +exeext=$exeext + +# whether the shell understands "unset". +lt_unset=$lt_unset + +# turn spaces into newlines. +SP2NL=$lt_lt_SP2NL + +# turn newlines into spaces. +NL2SP=$lt_lt_NL2SP + +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method = "file_magic". +file_magic_cmd=$lt_file_magic_cmd + +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + +# The archiver. +AR=$lt_AR + +# Flags to create an archive. +AR_FLAGS=$lt_AR_FLAGS + +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + +# A symbol stripping program. +STRIP=$lt_STRIP + +# Commands used to install an old-style archive. +RANLIB=$lt_RANLIB +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + +# A C compiler. +LTCC=$lt_CC + +# LTCC compiler flags. +LTCFLAGS=$lt_CFLAGS + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration. +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair. +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# Transform the output of nm in a C name address pair when lib prefix is needed. +global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec + +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# Used to examine libraries when file_magic_cmd begins with "file". +MAGIC_CMD=$MAGIC_CMD + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + +# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +DSYMUTIL=$lt_DSYMUTIL + +# Tool to change global to local symbols on Mac OS X. +NMEDIT=$lt_NMEDIT + +# Tool to manipulate fat objects and archives on Mac OS X. +LIPO=$lt_LIPO + +# ldd/readelf like tool for Mach-O binaries on Mac OS X. +OTOOL=$lt_OTOOL + +# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +OTOOL64=$lt_OTOOL64 + +# Old archive suffix (normally "a"). +libext=$libext + +# Shared library suffix (normally ".so"). +shrext_cmds=$lt_shrext_cmds + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at link time. +variables_saved_for_relink=$lt_variables_saved_for_relink + +# Do we need the "lib" prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Library versioning type. +version_type=$version_type + +# Shared library runtime path variable. +runpath_var=$runpath_var + +# Shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + +# Command to use after installation of a shared archive. +postinstall_cmds=$lt_postinstall_cmds + +# Command to use after uninstallation of a shared archive. +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# As "finish_cmds", except a single script fragment to be evaled but +# not shown. +finish_eval=$lt_finish_eval + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Compile-time system search path for libraries. +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + + +# The linker used to build libraries. +LD=$lt_LD + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds + +# A language specific compiler. +CC=$lt_compiler + +# Is the compiler the GNU compiler? +with_gcc=$GCC + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc + +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec + +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds + +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds + +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag + +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec + +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute + +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L + +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var + +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic + +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs + +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms + +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds + +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action + +# The directories searched by this compiler when creating a shared library. +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs + +# Dependencies to place before and after the objects being linked to +# create a shared library. +predep_objects=$lt_predep_objects +postdep_objects=$lt_postdep_objects +predeps=$lt_predeps +postdeps=$lt_postdeps + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path + +# ### END LIBTOOL CONFIG + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + +ltmain="$ac_aux_dir/ltmain.sh" + + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi + + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + + + cat <<_LT_EOF >> "$ofile" + +# ### BEGIN LIBTOOL TAG CONFIG: CXX + +# The linker used to build libraries. +LD=$lt_LD_CXX + +# How to create reloadable object files. +reload_flag=$lt_reload_flag_CXX +reload_cmds=$lt_reload_cmds_CXX + +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds_CXX + +# A language specific compiler. +CC=$lt_compiler_CXX + +# Is the compiler the GNU compiler? +with_gcc=$GCC_CXX + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX + +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX + +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object_CXX + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX + +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds_CXX +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX + +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds_CXX +module_expsym_cmds=$lt_module_expsym_cmds_CXX + +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld_CXX + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_CXX + +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_CXX + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX + +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct_CXX + +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute_CXX + +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L_CXX + +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX + +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic_CXX + +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath_CXX + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_CXX + +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols_CXX + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_CXX + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_CXX + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_CXX + +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds_CXX + +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds_CXX + +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec_CXX + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_CXX + +# The directories searched by this compiler when creating a shared library. +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX + +# Dependencies to place before and after the objects being linked to +# create a shared library. +predep_objects=$lt_predep_objects_CXX +postdep_objects=$lt_postdep_objects_CXX +predeps=$lt_predeps_CXX +postdeps=$lt_postdeps_CXX + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX + +# ### END LIBTOOL TAG CONFIG: CXX +_LT_EOF + + ;; + + esac +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + diff --git a/lib/gtest/configure.ac b/lib/gtest/configure.ac new file mode 100644 index 00000000..cc592e15 --- /dev/null +++ b/lib/gtest/configure.ac @@ -0,0 +1,68 @@ +m4_include(m4/acx_pthread.m4) + +# At this point, the Xcode project assumes the version string will be three +# integers separated by periods and surrounded by square brackets (e.g. +# "[1.0.1]"). It also asumes that there won't be any closing parenthesis +# between "AC_INIT(" and the closing ")" including comments and strings. +AC_INIT([Google C++ Testing Framework], + [1.7.0], + [googletestframework@googlegroups.com], + [gtest]) + +# Provide various options to initialize the Autoconf and configure processes. +AC_PREREQ([2.59]) +AC_CONFIG_SRCDIR([./LICENSE]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_HEADERS([build-aux/config.h]) +AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([scripts/gtest-config], [chmod +x scripts/gtest-config]) + +# Initialize Automake with various options. We require at least v1.9, prevent +# pedantic complaints about package files, and enable various distribution +# targets. +AM_INIT_AUTOMAKE([1.9 dist-bzip2 dist-zip foreign subdir-objects]) + +# Check for programs used in building Google Test. +AC_PROG_CC +AC_PROG_CXX +AC_LANG([C++]) +AC_PROG_LIBTOOL + +# TODO(chandlerc@google.com): Currently we aren't running the Python tests +# against the interpreter detected by AM_PATH_PYTHON, and so we condition +# HAVE_PYTHON by requiring "python" to be in the PATH, and that interpreter's +# version to be >= 2.3. This will allow the scripts to use a "/usr/bin/env" +# hashbang. +PYTHON= # We *do not* allow the user to specify a python interpreter +AC_PATH_PROG([PYTHON],[python],[:]) +AS_IF([test "$PYTHON" != ":"], + [AM_PYTHON_CHECK_VERSION([$PYTHON],[2.3],[:],[PYTHON=":"])]) +AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != ":"]) + +# Configure pthreads. +AC_ARG_WITH([pthreads], + [AS_HELP_STRING([--with-pthreads], + [use pthreads (default is yes)])], + [with_pthreads=$withval], + [with_pthreads=check]) + +have_pthreads=no +AS_IF([test "x$with_pthreads" != "xno"], + [ACX_PTHREAD( + [], + [AS_IF([test "x$with_pthreads" != "xcheck"], + [AC_MSG_FAILURE( + [--with-pthreads was specified, but unable to be used])])]) + have_pthreads="$acx_pthread_ok"]) +AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" = "xyes"]) +AC_SUBST(PTHREAD_CFLAGS) +AC_SUBST(PTHREAD_LIBS) + +# TODO(chandlerc@google.com) Check for the necessary system headers. + +# TODO(chandlerc@google.com) Check the types, structures, and other compiler +# and architecture characteristics. + +# Output the generated files. No further autoconf macros may be used. +AC_OUTPUT diff --git a/lib/gtest/include/gtest/gtest-death-test.h b/lib/gtest/include/gtest/gtest-death-test.h new file mode 100644 index 00000000..957a69c6 --- /dev/null +++ b/lib/gtest/include/gtest/gtest-death-test.h @@ -0,0 +1,294 @@ +// Copyright 2005, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) +// +// The Google C++ Testing Framework (Google Test) +// +// This header file defines the public API for death tests. It is +// #included by gtest.h so a user doesn't need to include this +// directly. + +#ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_ +#define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_ + +#include "gtest/internal/gtest-death-test-internal.h" + +namespace testing { + +// This flag controls the style of death tests. Valid values are "threadsafe", +// meaning that the death test child process will re-execute the test binary +// from the start, running only a single death test, or "fast", +// meaning that the child process will execute the test logic immediately +// after forking. +GTEST_DECLARE_string_(death_test_style); + +#if GTEST_HAS_DEATH_TEST + +namespace internal { + +// Returns a Boolean value indicating whether the caller is currently +// executing in the context of the death test child process. Tools such as +// Valgrind heap checkers may need this to modify their behavior in death +// tests. IMPORTANT: This is an internal utility. Using it may break the +// implementation of death tests. User code MUST NOT use it. +GTEST_API_ bool InDeathTestChild(); + +} // namespace internal + +// The following macros are useful for writing death tests. + +// Here's what happens when an ASSERT_DEATH* or EXPECT_DEATH* is +// executed: +// +// 1. It generates a warning if there is more than one active +// thread. This is because it's safe to fork() or clone() only +// when there is a single thread. +// +// 2. The parent process clone()s a sub-process and runs the death +// test in it; the sub-process exits with code 0 at the end of the +// death test, if it hasn't exited already. +// +// 3. The parent process waits for the sub-process to terminate. +// +// 4. The parent process checks the exit code and error message of +// the sub-process. +// +// Examples: +// +// ASSERT_DEATH(server.SendMessage(56, "Hello"), "Invalid port number"); +// for (int i = 0; i < 5; i++) { +// EXPECT_DEATH(server.ProcessRequest(i), +// "Invalid request .* in ProcessRequest()") +// << "Failed to die on request " << i; +// } +// +// ASSERT_EXIT(server.ExitNow(), ::testing::ExitedWithCode(0), "Exiting"); +// +// bool KilledBySIGHUP(int exit_code) { +// return WIFSIGNALED(exit_code) && WTERMSIG(exit_code) == SIGHUP; +// } +// +// ASSERT_EXIT(client.HangUpServer(), KilledBySIGHUP, "Hanging up!"); +// +// On the regular expressions used in death tests: +// +// On POSIX-compliant systems (*nix), we use the library, +// which uses the POSIX extended regex syntax. +// +// On other platforms (e.g. Windows), we only support a simple regex +// syntax implemented as part of Google Test. This limited +// implementation should be enough most of the time when writing +// death tests; though it lacks many features you can find in PCRE +// or POSIX extended regex syntax. For example, we don't support +// union ("x|y"), grouping ("(xy)"), brackets ("[xy]"), and +// repetition count ("x{5,7}"), among others. +// +// Below is the syntax that we do support. We chose it to be a +// subset of both PCRE and POSIX extended regex, so it's easy to +// learn wherever you come from. In the following: 'A' denotes a +// literal character, period (.), or a single \\ escape sequence; +// 'x' and 'y' denote regular expressions; 'm' and 'n' are for +// natural numbers. +// +// c matches any literal character c +// \\d matches any decimal digit +// \\D matches any character that's not a decimal digit +// \\f matches \f +// \\n matches \n +// \\r matches \r +// \\s matches any ASCII whitespace, including \n +// \\S matches any character that's not a whitespace +// \\t matches \t +// \\v matches \v +// \\w matches any letter, _, or decimal digit +// \\W matches any character that \\w doesn't match +// \\c matches any literal character c, which must be a punctuation +// . matches any single character except \n +// A? matches 0 or 1 occurrences of A +// A* matches 0 or many occurrences of A +// A+ matches 1 or many occurrences of A +// ^ matches the beginning of a string (not that of each line) +// $ matches the end of a string (not that of each line) +// xy matches x followed by y +// +// If you accidentally use PCRE or POSIX extended regex features +// not implemented by us, you will get a run-time failure. In that +// case, please try to rewrite your regular expression within the +// above syntax. +// +// This implementation is *not* meant to be as highly tuned or robust +// as a compiled regex library, but should perform well enough for a +// death test, which already incurs significant overhead by launching +// a child process. +// +// Known caveats: +// +// A "threadsafe" style death test obtains the path to the test +// program from argv[0] and re-executes it in the sub-process. For +// simplicity, the current implementation doesn't search the PATH +// when launching the sub-process. This means that the user must +// invoke the test program via a path that contains at least one +// path separator (e.g. path/to/foo_test and +// /absolute/path/to/bar_test are fine, but foo_test is not). This +// is rarely a problem as people usually don't put the test binary +// directory in PATH. +// +// TODO(wan@google.com): make thread-safe death tests search the PATH. + +// Asserts that a given statement causes the program to exit, with an +// integer exit status that satisfies predicate, and emitting error output +// that matches regex. +# define ASSERT_EXIT(statement, predicate, regex) \ + GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_FATAL_FAILURE_) + +// Like ASSERT_EXIT, but continues on to successive tests in the +// test case, if any: +# define EXPECT_EXIT(statement, predicate, regex) \ + GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_NONFATAL_FAILURE_) + +// Asserts that a given statement causes the program to exit, either by +// explicitly exiting with a nonzero exit code or being killed by a +// signal, and emitting error output that matches regex. +# define ASSERT_DEATH(statement, regex) \ + ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex) + +// Like ASSERT_DEATH, but continues on to successive tests in the +// test case, if any: +# define EXPECT_DEATH(statement, regex) \ + EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex) + +// Two predicate classes that can be used in {ASSERT,EXPECT}_EXIT*: + +// Tests that an exit code describes a normal exit with a given exit code. +class GTEST_API_ ExitedWithCode { + public: + explicit ExitedWithCode(int exit_code); + bool operator()(int exit_status) const; + private: + // No implementation - assignment is unsupported. + void operator=(const ExitedWithCode& other); + + const int exit_code_; +}; + +# if !GTEST_OS_WINDOWS +// Tests that an exit code describes an exit due to termination by a +// given signal. +class GTEST_API_ KilledBySignal { + public: + explicit KilledBySignal(int signum); + bool operator()(int exit_status) const; + private: + const int signum_; +}; +# endif // !GTEST_OS_WINDOWS + +// EXPECT_DEBUG_DEATH asserts that the given statements die in debug mode. +// The death testing framework causes this to have interesting semantics, +// since the sideeffects of the call are only visible in opt mode, and not +// in debug mode. +// +// In practice, this can be used to test functions that utilize the +// LOG(DFATAL) macro using the following style: +// +// int DieInDebugOr12(int* sideeffect) { +// if (sideeffect) { +// *sideeffect = 12; +// } +// LOG(DFATAL) << "death"; +// return 12; +// } +// +// TEST(TestCase, TestDieOr12WorksInDgbAndOpt) { +// int sideeffect = 0; +// // Only asserts in dbg. +// EXPECT_DEBUG_DEATH(DieInDebugOr12(&sideeffect), "death"); +// +// #ifdef NDEBUG +// // opt-mode has sideeffect visible. +// EXPECT_EQ(12, sideeffect); +// #else +// // dbg-mode no visible sideeffect. +// EXPECT_EQ(0, sideeffect); +// #endif +// } +// +// This will assert that DieInDebugReturn12InOpt() crashes in debug +// mode, usually due to a DCHECK or LOG(DFATAL), but returns the +// appropriate fallback value (12 in this case) in opt mode. If you +// need to test that a function has appropriate side-effects in opt +// mode, include assertions against the side-effects. A general +// pattern for this is: +// +// EXPECT_DEBUG_DEATH({ +// // Side-effects here will have an effect after this statement in +// // opt mode, but none in debug mode. +// EXPECT_EQ(12, DieInDebugOr12(&sideeffect)); +// }, "death"); +// +# ifdef NDEBUG + +# define EXPECT_DEBUG_DEATH(statement, regex) \ + GTEST_EXECUTE_STATEMENT_(statement, regex) + +# define ASSERT_DEBUG_DEATH(statement, regex) \ + GTEST_EXECUTE_STATEMENT_(statement, regex) + +# else + +# define EXPECT_DEBUG_DEATH(statement, regex) \ + EXPECT_DEATH(statement, regex) + +# define ASSERT_DEBUG_DEATH(statement, regex) \ + ASSERT_DEATH(statement, regex) + +# endif // NDEBUG for EXPECT_DEBUG_DEATH +#endif // GTEST_HAS_DEATH_TEST + +// EXPECT_DEATH_IF_SUPPORTED(statement, regex) and +// ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if +// death tests are supported; otherwise they just issue a warning. This is +// useful when you are combining death test assertions with normal test +// assertions in one test. +#if GTEST_HAS_DEATH_TEST +# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \ + EXPECT_DEATH(statement, regex) +# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \ + ASSERT_DEATH(statement, regex) +#else +# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \ + GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, ) +# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \ + GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, return) +#endif + +} // namespace testing + +#endif // GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_ diff --git a/lib/gtest/include/gtest/gtest-message.h b/lib/gtest/include/gtest/gtest-message.h new file mode 100644 index 00000000..fe879bca --- /dev/null +++ b/lib/gtest/include/gtest/gtest-message.h @@ -0,0 +1,250 @@ +// Copyright 2005, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) +// +// The Google C++ Testing Framework (Google Test) +// +// This header file defines the Message class. +// +// IMPORTANT NOTE: Due to limitation of the C++ language, we have to +// leave some internal implementation details in this header file. +// They are clearly marked by comments like this: +// +// // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +// +// Such code is NOT meant to be used by a user directly, and is subject +// to CHANGE WITHOUT NOTICE. Therefore DO NOT DEPEND ON IT in a user +// program! + +#ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ +#define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ + +#include + +#include "gtest/internal/gtest-port.h" + +// Ensures that there is at least one operator<< in the global namespace. +// See Message& operator<<(...) below for why. +void operator<<(const testing::internal::Secret&, int); + +namespace testing { + +// The Message class works like an ostream repeater. +// +// Typical usage: +// +// 1. You stream a bunch of values to a Message object. +// It will remember the text in a stringstream. +// 2. Then you stream the Message object to an ostream. +// This causes the text in the Message to be streamed +// to the ostream. +// +// For example; +// +// testing::Message foo; +// foo << 1 << " != " << 2; +// std::cout << foo; +// +// will print "1 != 2". +// +// Message is not intended to be inherited from. In particular, its +// destructor is not virtual. +// +// Note that stringstream behaves differently in gcc and in MSVC. You +// can stream a NULL char pointer to it in the former, but not in the +// latter (it causes an access violation if you do). The Message +// class hides this difference by treating a NULL char pointer as +// "(null)". +class GTEST_API_ Message { + private: + // The type of basic IO manipulators (endl, ends, and flush) for + // narrow streams. + typedef std::ostream& (*BasicNarrowIoManip)(std::ostream&); + + public: + // Constructs an empty Message. + Message(); + + // Copy constructor. + Message(const Message& msg) : ss_(new ::std::stringstream) { // NOLINT + *ss_ << msg.GetString(); + } + + // Constructs a Message from a C-string. + explicit Message(const char* str) : ss_(new ::std::stringstream) { + *ss_ << str; + } + +#if GTEST_OS_SYMBIAN + // Streams a value (either a pointer or not) to this object. + template + inline Message& operator <<(const T& value) { + StreamHelper(typename internal::is_pointer::type(), value); + return *this; + } +#else + // Streams a non-pointer value to this object. + template + inline Message& operator <<(const T& val) { + // Some libraries overload << for STL containers. These + // overloads are defined in the global namespace instead of ::std. + // + // C++'s symbol lookup rule (i.e. Koenig lookup) says that these + // overloads are visible in either the std namespace or the global + // namespace, but not other namespaces, including the testing + // namespace which Google Test's Message class is in. + // + // To allow STL containers (and other types that has a << operator + // defined in the global namespace) to be used in Google Test + // assertions, testing::Message must access the custom << operator + // from the global namespace. With this using declaration, + // overloads of << defined in the global namespace and those + // visible via Koenig lookup are both exposed in this function. + using ::operator <<; + *ss_ << val; + return *this; + } + + // Streams a pointer value to this object. + // + // This function is an overload of the previous one. When you + // stream a pointer to a Message, this definition will be used as it + // is more specialized. (The C++ Standard, section + // [temp.func.order].) If you stream a non-pointer, then the + // previous definition will be used. + // + // The reason for this overload is that streaming a NULL pointer to + // ostream is undefined behavior. Depending on the compiler, you + // may get "0", "(nil)", "(null)", or an access violation. To + // ensure consistent result across compilers, we always treat NULL + // as "(null)". + template + inline Message& operator <<(T* const& pointer) { // NOLINT + if (pointer == NULL) { + *ss_ << "(null)"; + } else { + *ss_ << pointer; + } + return *this; + } +#endif // GTEST_OS_SYMBIAN + + // Since the basic IO manipulators are overloaded for both narrow + // and wide streams, we have to provide this specialized definition + // of operator <<, even though its body is the same as the + // templatized version above. Without this definition, streaming + // endl or other basic IO manipulators to Message will confuse the + // compiler. + Message& operator <<(BasicNarrowIoManip val) { + *ss_ << val; + return *this; + } + + // Instead of 1/0, we want to see true/false for bool values. + Message& operator <<(bool b) { + return *this << (b ? "true" : "false"); + } + + // These two overloads allow streaming a wide C string to a Message + // using the UTF-8 encoding. + Message& operator <<(const wchar_t* wide_c_str); + Message& operator <<(wchar_t* wide_c_str); + +#if GTEST_HAS_STD_WSTRING + // Converts the given wide string to a narrow string using the UTF-8 + // encoding, and streams the result to this Message object. + Message& operator <<(const ::std::wstring& wstr); +#endif // GTEST_HAS_STD_WSTRING + +#if GTEST_HAS_GLOBAL_WSTRING + // Converts the given wide string to a narrow string using the UTF-8 + // encoding, and streams the result to this Message object. + Message& operator <<(const ::wstring& wstr); +#endif // GTEST_HAS_GLOBAL_WSTRING + + // Gets the text streamed to this object so far as an std::string. + // Each '\0' character in the buffer is replaced with "\\0". + // + // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. + std::string GetString() const; + + private: + +#if GTEST_OS_SYMBIAN + // These are needed as the Nokia Symbian Compiler cannot decide between + // const T& and const T* in a function template. The Nokia compiler _can_ + // decide between class template specializations for T and T*, so a + // tr1::type_traits-like is_pointer works, and we can overload on that. + template + inline void StreamHelper(internal::true_type /*is_pointer*/, T* pointer) { + if (pointer == NULL) { + *ss_ << "(null)"; + } else { + *ss_ << pointer; + } + } + template + inline void StreamHelper(internal::false_type /*is_pointer*/, + const T& value) { + // See the comments in Message& operator <<(const T&) above for why + // we need this using statement. + using ::operator <<; + *ss_ << value; + } +#endif // GTEST_OS_SYMBIAN + + // We'll hold the text streamed to this object here. + const internal::scoped_ptr< ::std::stringstream> ss_; + + // We declare (but don't implement) this to prevent the compiler + // from implementing the assignment operator. + void operator=(const Message&); +}; + +// Streams a Message to an ostream. +inline std::ostream& operator <<(std::ostream& os, const Message& sb) { + return os << sb.GetString(); +} + +namespace internal { + +// Converts a streamable value to an std::string. A NULL pointer is +// converted to "(null)". When the input value is a ::string, +// ::std::string, ::wstring, or ::std::wstring object, each NUL +// character in it is replaced with "\\0". +template +std::string StreamableToString(const T& streamable) { + return (Message() << streamable).GetString(); +} + +} // namespace internal +} // namespace testing + +#endif // GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ diff --git a/lib/gtest/include/gtest/gtest-param-test.h b/lib/gtest/include/gtest/gtest-param-test.h new file mode 100644 index 00000000..d6702c8f --- /dev/null +++ b/lib/gtest/include/gtest/gtest-param-test.h @@ -0,0 +1,1421 @@ +// This file was GENERATED by command: +// pump.py gtest-param-test.h.pump +// DO NOT EDIT BY HAND!!! + +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Authors: vladl@google.com (Vlad Losev) +// +// Macros and functions for implementing parameterized tests +// in Google C++ Testing Framework (Google Test) +// +// This file is generated by a SCRIPT. DO NOT EDIT BY HAND! +// +#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ +#define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ + + +// Value-parameterized tests allow you to test your code with different +// parameters without writing multiple copies of the same test. +// +// Here is how you use value-parameterized tests: + +#if 0 + +// To write value-parameterized tests, first you should define a fixture +// class. It is usually derived from testing::TestWithParam (see below for +// another inheritance scheme that's sometimes useful in more complicated +// class hierarchies), where the type of your parameter values. +// TestWithParam is itself derived from testing::Test. T can be any +// copyable type. If it's a raw pointer, you are responsible for managing the +// lifespan of the pointed values. + +class FooTest : public ::testing::TestWithParam { + // You can implement all the usual class fixture members here. +}; + +// Then, use the TEST_P macro to define as many parameterized tests +// for this fixture as you want. The _P suffix is for "parameterized" +// or "pattern", whichever you prefer to think. + +TEST_P(FooTest, DoesBlah) { + // Inside a test, access the test parameter with the GetParam() method + // of the TestWithParam class: + EXPECT_TRUE(foo.Blah(GetParam())); + ... +} + +TEST_P(FooTest, HasBlahBlah) { + ... +} + +// Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test +// case with any set of parameters you want. Google Test defines a number +// of functions for generating test parameters. They return what we call +// (surprise!) parameter generators. Here is a summary of them, which +// are all in the testing namespace: +// +// +// Range(begin, end [, step]) - Yields values {begin, begin+step, +// begin+step+step, ...}. The values do not +// include end. step defaults to 1. +// Values(v1, v2, ..., vN) - Yields values {v1, v2, ..., vN}. +// ValuesIn(container) - Yields values from a C-style array, an STL +// ValuesIn(begin,end) container, or an iterator range [begin, end). +// Bool() - Yields sequence {false, true}. +// Combine(g1, g2, ..., gN) - Yields all combinations (the Cartesian product +// for the math savvy) of the values generated +// by the N generators. +// +// For more details, see comments at the definitions of these functions below +// in this file. +// +// The following statement will instantiate tests from the FooTest test case +// each with parameter values "meeny", "miny", and "moe". + +INSTANTIATE_TEST_CASE_P(InstantiationName, + FooTest, + Values("meeny", "miny", "moe")); + +// To distinguish different instances of the pattern, (yes, you +// can instantiate it more then once) the first argument to the +// INSTANTIATE_TEST_CASE_P macro is a prefix that will be added to the +// actual test case name. Remember to pick unique prefixes for different +// instantiations. The tests from the instantiation above will have +// these names: +// +// * InstantiationName/FooTest.DoesBlah/0 for "meeny" +// * InstantiationName/FooTest.DoesBlah/1 for "miny" +// * InstantiationName/FooTest.DoesBlah/2 for "moe" +// * InstantiationName/FooTest.HasBlahBlah/0 for "meeny" +// * InstantiationName/FooTest.HasBlahBlah/1 for "miny" +// * InstantiationName/FooTest.HasBlahBlah/2 for "moe" +// +// You can use these names in --gtest_filter. +// +// This statement will instantiate all tests from FooTest again, each +// with parameter values "cat" and "dog": + +const char* pets[] = {"cat", "dog"}; +INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets)); + +// The tests from the instantiation above will have these names: +// +// * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat" +// * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog" +// * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat" +// * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog" +// +// Please note that INSTANTIATE_TEST_CASE_P will instantiate all tests +// in the given test case, whether their definitions come before or +// AFTER the INSTANTIATE_TEST_CASE_P statement. +// +// Please also note that generator expressions (including parameters to the +// generators) are evaluated in InitGoogleTest(), after main() has started. +// This allows the user on one hand, to adjust generator parameters in order +// to dynamically determine a set of tests to run and on the other hand, +// give the user a chance to inspect the generated tests with Google Test +// reflection API before RUN_ALL_TESTS() is executed. +// +// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc +// for more examples. +// +// In the future, we plan to publish the API for defining new parameter +// generators. But for now this interface remains part of the internal +// implementation and is subject to change. +// +// +// A parameterized test fixture must be derived from testing::Test and from +// testing::WithParamInterface, where T is the type of the parameter +// values. Inheriting from TestWithParam satisfies that requirement because +// TestWithParam inherits from both Test and WithParamInterface. In more +// complicated hierarchies, however, it is occasionally useful to inherit +// separately from Test and WithParamInterface. For example: + +class BaseTest : public ::testing::Test { + // You can inherit all the usual members for a non-parameterized test + // fixture here. +}; + +class DerivedTest : public BaseTest, public ::testing::WithParamInterface { + // The usual test fixture members go here too. +}; + +TEST_F(BaseTest, HasFoo) { + // This is an ordinary non-parameterized test. +} + +TEST_P(DerivedTest, DoesBlah) { + // GetParam works just the same here as if you inherit from TestWithParam. + EXPECT_TRUE(foo.Blah(GetParam())); +} + +#endif // 0 + +#include "gtest/internal/gtest-port.h" + +#if !GTEST_OS_SYMBIAN +# include +#endif + +// scripts/fuse_gtest.py depends on gtest's own header being #included +// *unconditionally*. Therefore these #includes cannot be moved +// inside #if GTEST_HAS_PARAM_TEST. +#include "gtest/internal/gtest-internal.h" +#include "gtest/internal/gtest-param-util.h" +#include "gtest/internal/gtest-param-util-generated.h" + +#if GTEST_HAS_PARAM_TEST + +namespace testing { + +// Functions producing parameter generators. +// +// Google Test uses these generators to produce parameters for value- +// parameterized tests. When a parameterized test case is instantiated +// with a particular generator, Google Test creates and runs tests +// for each element in the sequence produced by the generator. +// +// In the following sample, tests from test case FooTest are instantiated +// each three times with parameter values 3, 5, and 8: +// +// class FooTest : public TestWithParam { ... }; +// +// TEST_P(FooTest, TestThis) { +// } +// TEST_P(FooTest, TestThat) { +// } +// INSTANTIATE_TEST_CASE_P(TestSequence, FooTest, Values(3, 5, 8)); +// + +// Range() returns generators providing sequences of values in a range. +// +// Synopsis: +// Range(start, end) +// - returns a generator producing a sequence of values {start, start+1, +// start+2, ..., }. +// Range(start, end, step) +// - returns a generator producing a sequence of values {start, start+step, +// start+step+step, ..., }. +// Notes: +// * The generated sequences never include end. For example, Range(1, 5) +// returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2) +// returns a generator producing {1, 3, 5, 7}. +// * start and end must have the same type. That type may be any integral or +// floating-point type or a user defined type satisfying these conditions: +// * It must be assignable (have operator=() defined). +// * It must have operator+() (operator+(int-compatible type) for +// two-operand version). +// * It must have operator<() defined. +// Elements in the resulting sequences will also have that type. +// * Condition start < end must be satisfied in order for resulting sequences +// to contain any elements. +// +template +internal::ParamGenerator Range(T start, T end, IncrementT step) { + return internal::ParamGenerator( + new internal::RangeGenerator(start, end, step)); +} + +template +internal::ParamGenerator Range(T start, T end) { + return Range(start, end, 1); +} + +// ValuesIn() function allows generation of tests with parameters coming from +// a container. +// +// Synopsis: +// ValuesIn(const T (&array)[N]) +// - returns a generator producing sequences with elements from +// a C-style array. +// ValuesIn(const Container& container) +// - returns a generator producing sequences with elements from +// an STL-style container. +// ValuesIn(Iterator begin, Iterator end) +// - returns a generator producing sequences with elements from +// a range [begin, end) defined by a pair of STL-style iterators. These +// iterators can also be plain C pointers. +// +// Please note that ValuesIn copies the values from the containers +// passed in and keeps them to generate tests in RUN_ALL_TESTS(). +// +// Examples: +// +// This instantiates tests from test case StringTest +// each with C-string values of "foo", "bar", and "baz": +// +// const char* strings[] = {"foo", "bar", "baz"}; +// INSTANTIATE_TEST_CASE_P(StringSequence, SrtingTest, ValuesIn(strings)); +// +// This instantiates tests from test case StlStringTest +// each with STL strings with values "a" and "b": +// +// ::std::vector< ::std::string> GetParameterStrings() { +// ::std::vector< ::std::string> v; +// v.push_back("a"); +// v.push_back("b"); +// return v; +// } +// +// INSTANTIATE_TEST_CASE_P(CharSequence, +// StlStringTest, +// ValuesIn(GetParameterStrings())); +// +// +// This will also instantiate tests from CharTest +// each with parameter values 'a' and 'b': +// +// ::std::list GetParameterChars() { +// ::std::list list; +// list.push_back('a'); +// list.push_back('b'); +// return list; +// } +// ::std::list l = GetParameterChars(); +// INSTANTIATE_TEST_CASE_P(CharSequence2, +// CharTest, +// ValuesIn(l.begin(), l.end())); +// +template +internal::ParamGenerator< + typename ::testing::internal::IteratorTraits::value_type> +ValuesIn(ForwardIterator begin, ForwardIterator end) { + typedef typename ::testing::internal::IteratorTraits + ::value_type ParamType; + return internal::ParamGenerator( + new internal::ValuesInIteratorRangeGenerator(begin, end)); +} + +template +internal::ParamGenerator ValuesIn(const T (&array)[N]) { + return ValuesIn(array, array + N); +} + +template +internal::ParamGenerator ValuesIn( + const Container& container) { + return ValuesIn(container.begin(), container.end()); +} + +// Values() allows generating tests from explicitly specified list of +// parameters. +// +// Synopsis: +// Values(T v1, T v2, ..., T vN) +// - returns a generator producing sequences with elements v1, v2, ..., vN. +// +// For example, this instantiates tests from test case BarTest each +// with values "one", "two", and "three": +// +// INSTANTIATE_TEST_CASE_P(NumSequence, BarTest, Values("one", "two", "three")); +// +// This instantiates tests from test case BazTest each with values 1, 2, 3.5. +// The exact type of values will depend on the type of parameter in BazTest. +// +// INSTANTIATE_TEST_CASE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5)); +// +// Currently, Values() supports from 1 to 50 parameters. +// +template +internal::ValueArray1 Values(T1 v1) { + return internal::ValueArray1(v1); +} + +template +internal::ValueArray2 Values(T1 v1, T2 v2) { + return internal::ValueArray2(v1, v2); +} + +template +internal::ValueArray3 Values(T1 v1, T2 v2, T3 v3) { + return internal::ValueArray3(v1, v2, v3); +} + +template +internal::ValueArray4 Values(T1 v1, T2 v2, T3 v3, T4 v4) { + return internal::ValueArray4(v1, v2, v3, v4); +} + +template +internal::ValueArray5 Values(T1 v1, T2 v2, T3 v3, T4 v4, + T5 v5) { + return internal::ValueArray5(v1, v2, v3, v4, v5); +} + +template +internal::ValueArray6 Values(T1 v1, T2 v2, T3 v3, + T4 v4, T5 v5, T6 v6) { + return internal::ValueArray6(v1, v2, v3, v4, v5, v6); +} + +template +internal::ValueArray7 Values(T1 v1, T2 v2, T3 v3, + T4 v4, T5 v5, T6 v6, T7 v7) { + return internal::ValueArray7(v1, v2, v3, v4, v5, + v6, v7); +} + +template +internal::ValueArray8 Values(T1 v1, T2 v2, + T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8) { + return internal::ValueArray8(v1, v2, v3, v4, + v5, v6, v7, v8); +} + +template +internal::ValueArray9 Values(T1 v1, T2 v2, + T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9) { + return internal::ValueArray9(v1, v2, v3, + v4, v5, v6, v7, v8, v9); +} + +template +internal::ValueArray10 Values(T1 v1, + T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10) { + return internal::ValueArray10(v1, + v2, v3, v4, v5, v6, v7, v8, v9, v10); +} + +template +internal::ValueArray11 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11) { + return internal::ValueArray11(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11); +} + +template +internal::ValueArray12 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12) { + return internal::ValueArray12(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12); +} + +template +internal::ValueArray13 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13) { + return internal::ValueArray13(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13); +} + +template +internal::ValueArray14 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14) { + return internal::ValueArray14(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, + v14); +} + +template +internal::ValueArray15 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, + T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15) { + return internal::ValueArray15(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, + v13, v14, v15); +} + +template +internal::ValueArray16 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, + T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, + T16 v16) { + return internal::ValueArray16(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, + v12, v13, v14, v15, v16); +} + +template +internal::ValueArray17 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, + T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, + T16 v16, T17 v17) { + return internal::ValueArray17(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, + v11, v12, v13, v14, v15, v16, v17); +} + +template +internal::ValueArray18 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, + T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, + T16 v16, T17 v17, T18 v18) { + return internal::ValueArray18(v1, v2, v3, v4, v5, v6, v7, v8, v9, + v10, v11, v12, v13, v14, v15, v16, v17, v18); +} + +template +internal::ValueArray19 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, + T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, + T15 v15, T16 v16, T17 v17, T18 v18, T19 v19) { + return internal::ValueArray19(v1, v2, v3, v4, v5, v6, v7, v8, + v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19); +} + +template +internal::ValueArray20 Values(T1 v1, T2 v2, T3 v3, T4 v4, + T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, + T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20) { + return internal::ValueArray20(v1, v2, v3, v4, v5, v6, v7, + v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20); +} + +template +internal::ValueArray21 Values(T1 v1, T2 v2, T3 v3, T4 v4, + T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, + T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21) { + return internal::ValueArray21(v1, v2, v3, v4, v5, v6, + v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21); +} + +template +internal::ValueArray22 Values(T1 v1, T2 v2, T3 v3, + T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, + T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, + T21 v21, T22 v22) { + return internal::ValueArray22(v1, v2, v3, v4, + v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, + v20, v21, v22); +} + +template +internal::ValueArray23 Values(T1 v1, T2 v2, + T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, + T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, + T21 v21, T22 v22, T23 v23) { + return internal::ValueArray23(v1, v2, v3, + v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, + v20, v21, v22, v23); +} + +template +internal::ValueArray24 Values(T1 v1, T2 v2, + T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, + T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, + T21 v21, T22 v22, T23 v23, T24 v24) { + return internal::ValueArray24(v1, v2, + v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, + v19, v20, v21, v22, v23, v24); +} + +template +internal::ValueArray25 Values(T1 v1, + T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, + T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, + T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25) { + return internal::ValueArray25(v1, + v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, + v18, v19, v20, v21, v22, v23, v24, v25); +} + +template +internal::ValueArray26 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26) { + return internal::ValueArray26(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, + v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26); +} + +template +internal::ValueArray27 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27) { + return internal::ValueArray27(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, + v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27); +} + +template +internal::ValueArray28 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28) { + return internal::ValueArray28(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, + v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, + v28); +} + +template +internal::ValueArray29 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29) { + return internal::ValueArray29(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, + v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, + v27, v28, v29); +} + +template +internal::ValueArray30 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, + T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, + T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, + T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30) { + return internal::ValueArray30(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, + v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, + v26, v27, v28, v29, v30); +} + +template +internal::ValueArray31 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, + T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, + T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, + T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31) { + return internal::ValueArray31(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, + v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, + v25, v26, v27, v28, v29, v30, v31); +} + +template +internal::ValueArray32 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, + T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, + T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, + T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, + T32 v32) { + return internal::ValueArray32(v1, v2, v3, v4, v5, v6, v7, v8, v9, + v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, + v24, v25, v26, v27, v28, v29, v30, v31, v32); +} + +template +internal::ValueArray33 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, + T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, + T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, + T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, + T32 v32, T33 v33) { + return internal::ValueArray33(v1, v2, v3, v4, v5, v6, v7, v8, + v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, + v24, v25, v26, v27, v28, v29, v30, v31, v32, v33); +} + +template +internal::ValueArray34 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, + T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, + T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, + T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, + T31 v31, T32 v32, T33 v33, T34 v34) { + return internal::ValueArray34(v1, v2, v3, v4, v5, v6, v7, + v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, + v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34); +} + +template +internal::ValueArray35 Values(T1 v1, T2 v2, T3 v3, T4 v4, + T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, + T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, + T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, + T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35) { + return internal::ValueArray35(v1, v2, v3, v4, v5, v6, + v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, + v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35); +} + +template +internal::ValueArray36 Values(T1 v1, T2 v2, T3 v3, T4 v4, + T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, + T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, + T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, + T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36) { + return internal::ValueArray36(v1, v2, v3, v4, + v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, + v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, + v34, v35, v36); +} + +template +internal::ValueArray37 Values(T1 v1, T2 v2, T3 v3, + T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, + T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, + T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, + T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, + T37 v37) { + return internal::ValueArray37(v1, v2, v3, + v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, + v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, + v34, v35, v36, v37); +} + +template +internal::ValueArray38 Values(T1 v1, T2 v2, + T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, + T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, + T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, + T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, + T37 v37, T38 v38) { + return internal::ValueArray38(v1, v2, + v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, + v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, + v33, v34, v35, v36, v37, v38); +} + +template +internal::ValueArray39 Values(T1 v1, T2 v2, + T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, + T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, + T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, + T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, + T37 v37, T38 v38, T39 v39) { + return internal::ValueArray39(v1, + v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, + v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, + v32, v33, v34, v35, v36, v37, v38, v39); +} + +template +internal::ValueArray40 Values(T1 v1, + T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, + T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, + T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, + T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, + T36 v36, T37 v37, T38 v38, T39 v39, T40 v40) { + return internal::ValueArray40(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, + v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, + v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40); +} + +template +internal::ValueArray41 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41) { + return internal::ValueArray41(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, + v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, + v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41); +} + +template +internal::ValueArray42 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42) { + return internal::ValueArray42(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, + v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, + v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, + v42); +} + +template +internal::ValueArray43 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42, T43 v43) { + return internal::ValueArray43(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, + v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, + v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, + v41, v42, v43); +} + +template +internal::ValueArray44 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42, T43 v43, T44 v44) { + return internal::ValueArray44(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, + v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, + v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, + v40, v41, v42, v43, v44); +} + +template +internal::ValueArray45 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, + T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, + T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, + T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, + T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, + T41 v41, T42 v42, T43 v43, T44 v44, T45 v45) { + return internal::ValueArray45(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, + v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, + v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, + v39, v40, v41, v42, v43, v44, v45); +} + +template +internal::ValueArray46 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, + T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, + T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, + T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, + T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, + T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46) { + return internal::ValueArray46(v1, v2, v3, v4, v5, v6, v7, v8, v9, + v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, + v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, + v38, v39, v40, v41, v42, v43, v44, v45, v46); +} + +template +internal::ValueArray47 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, + T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, + T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, + T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, + T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, + T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47) { + return internal::ValueArray47(v1, v2, v3, v4, v5, v6, v7, v8, + v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, + v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, + v38, v39, v40, v41, v42, v43, v44, v45, v46, v47); +} + +template +internal::ValueArray48 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, + T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, + T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, + T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, + T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, + T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, + T48 v48) { + return internal::ValueArray48(v1, v2, v3, v4, v5, v6, v7, + v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, + v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, + v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48); +} + +template +internal::ValueArray49 Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, + T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, + T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, + T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, + T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, + T39 v39, T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, + T47 v47, T48 v48, T49 v49) { + return internal::ValueArray49(v1, v2, v3, v4, v5, v6, + v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, + v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, + v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49); +} + +template +internal::ValueArray50 Values(T1 v1, T2 v2, T3 v3, T4 v4, + T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, + T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, + T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, + T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, + T38 v38, T39 v39, T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, + T46 v46, T47 v47, T48 v48, T49 v49, T50 v50) { + return internal::ValueArray50(v1, v2, v3, v4, + v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, + v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, + v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, + v48, v49, v50); +} + +// Bool() allows generating tests with parameters in a set of (false, true). +// +// Synopsis: +// Bool() +// - returns a generator producing sequences with elements {false, true}. +// +// It is useful when testing code that depends on Boolean flags. Combinations +// of multiple flags can be tested when several Bool()'s are combined using +// Combine() function. +// +// In the following example all tests in the test case FlagDependentTest +// will be instantiated twice with parameters false and true. +// +// class FlagDependentTest : public testing::TestWithParam { +// virtual void SetUp() { +// external_flag = GetParam(); +// } +// } +// INSTANTIATE_TEST_CASE_P(BoolSequence, FlagDependentTest, Bool()); +// +inline internal::ParamGenerator Bool() { + return Values(false, true); +} + +# if GTEST_HAS_COMBINE +// Combine() allows the user to combine two or more sequences to produce +// values of a Cartesian product of those sequences' elements. +// +// Synopsis: +// Combine(gen1, gen2, ..., genN) +// - returns a generator producing sequences with elements coming from +// the Cartesian product of elements from the sequences generated by +// gen1, gen2, ..., genN. The sequence elements will have a type of +// tuple where T1, T2, ..., TN are the types +// of elements from sequences produces by gen1, gen2, ..., genN. +// +// Combine can have up to 10 arguments. This number is currently limited +// by the maximum number of elements in the tuple implementation used by Google +// Test. +// +// Example: +// +// This will instantiate tests in test case AnimalTest each one with +// the parameter values tuple("cat", BLACK), tuple("cat", WHITE), +// tuple("dog", BLACK), and tuple("dog", WHITE): +// +// enum Color { BLACK, GRAY, WHITE }; +// class AnimalTest +// : public testing::TestWithParam > {...}; +// +// TEST_P(AnimalTest, AnimalLooksNice) {...} +// +// INSTANTIATE_TEST_CASE_P(AnimalVariations, AnimalTest, +// Combine(Values("cat", "dog"), +// Values(BLACK, WHITE))); +// +// This will instantiate tests in FlagDependentTest with all variations of two +// Boolean flags: +// +// class FlagDependentTest +// : public testing::TestWithParam > { +// virtual void SetUp() { +// // Assigns external_flag_1 and external_flag_2 values from the tuple. +// tie(external_flag_1, external_flag_2) = GetParam(); +// } +// }; +// +// TEST_P(FlagDependentTest, TestFeature1) { +// // Test your code using external_flag_1 and external_flag_2 here. +// } +// INSTANTIATE_TEST_CASE_P(TwoBoolSequence, FlagDependentTest, +// Combine(Bool(), Bool())); +// +template +internal::CartesianProductHolder2 Combine( + const Generator1& g1, const Generator2& g2) { + return internal::CartesianProductHolder2( + g1, g2); +} + +template +internal::CartesianProductHolder3 Combine( + const Generator1& g1, const Generator2& g2, const Generator3& g3) { + return internal::CartesianProductHolder3( + g1, g2, g3); +} + +template +internal::CartesianProductHolder4 Combine( + const Generator1& g1, const Generator2& g2, const Generator3& g3, + const Generator4& g4) { + return internal::CartesianProductHolder4( + g1, g2, g3, g4); +} + +template +internal::CartesianProductHolder5 Combine( + const Generator1& g1, const Generator2& g2, const Generator3& g3, + const Generator4& g4, const Generator5& g5) { + return internal::CartesianProductHolder5( + g1, g2, g3, g4, g5); +} + +template +internal::CartesianProductHolder6 Combine( + const Generator1& g1, const Generator2& g2, const Generator3& g3, + const Generator4& g4, const Generator5& g5, const Generator6& g6) { + return internal::CartesianProductHolder6( + g1, g2, g3, g4, g5, g6); +} + +template +internal::CartesianProductHolder7 Combine( + const Generator1& g1, const Generator2& g2, const Generator3& g3, + const Generator4& g4, const Generator5& g5, const Generator6& g6, + const Generator7& g7) { + return internal::CartesianProductHolder7( + g1, g2, g3, g4, g5, g6, g7); +} + +template +internal::CartesianProductHolder8 Combine( + const Generator1& g1, const Generator2& g2, const Generator3& g3, + const Generator4& g4, const Generator5& g5, const Generator6& g6, + const Generator7& g7, const Generator8& g8) { + return internal::CartesianProductHolder8( + g1, g2, g3, g4, g5, g6, g7, g8); +} + +template +internal::CartesianProductHolder9 Combine( + const Generator1& g1, const Generator2& g2, const Generator3& g3, + const Generator4& g4, const Generator5& g5, const Generator6& g6, + const Generator7& g7, const Generator8& g8, const Generator9& g9) { + return internal::CartesianProductHolder9( + g1, g2, g3, g4, g5, g6, g7, g8, g9); +} + +template +internal::CartesianProductHolder10 Combine( + const Generator1& g1, const Generator2& g2, const Generator3& g3, + const Generator4& g4, const Generator5& g5, const Generator6& g6, + const Generator7& g7, const Generator8& g8, const Generator9& g9, + const Generator10& g10) { + return internal::CartesianProductHolder10( + g1, g2, g3, g4, g5, g6, g7, g8, g9, g10); +} +# endif // GTEST_HAS_COMBINE + + + +# define TEST_P(test_case_name, test_name) \ + class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \ + : public test_case_name { \ + public: \ + GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \ + virtual void TestBody(); \ + private: \ + static int AddToRegistry() { \ + ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ + GetTestCasePatternHolder(\ + #test_case_name, __FILE__, __LINE__)->AddTestPattern(\ + #test_case_name, \ + #test_name, \ + new ::testing::internal::TestMetaFactory< \ + GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \ + return 0; \ + } \ + static int gtest_registering_dummy_; \ + GTEST_DISALLOW_COPY_AND_ASSIGN_(\ + GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \ + }; \ + int GTEST_TEST_CLASS_NAME_(test_case_name, \ + test_name)::gtest_registering_dummy_ = \ + GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \ + void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() + +# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \ + ::testing::internal::ParamGenerator \ + gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \ + int gtest_##prefix##test_case_name##_dummy_ = \ + ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ + GetTestCasePatternHolder(\ + #test_case_name, __FILE__, __LINE__)->AddTestCaseInstantiation(\ + #prefix, \ + >est_##prefix##test_case_name##_EvalGenerator_, \ + __FILE__, __LINE__) + +} // namespace testing + +#endif // GTEST_HAS_PARAM_TEST + +#endif // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ diff --git a/lib/gtest/include/gtest/gtest-param-test.h.pump b/lib/gtest/include/gtest/gtest-param-test.h.pump new file mode 100644 index 00000000..2dc9303b --- /dev/null +++ b/lib/gtest/include/gtest/gtest-param-test.h.pump @@ -0,0 +1,487 @@ +$$ -*- mode: c++; -*- +$var n = 50 $$ Maximum length of Values arguments we want to support. +$var maxtuple = 10 $$ Maximum number of Combine arguments we want to support. +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Authors: vladl@google.com (Vlad Losev) +// +// Macros and functions for implementing parameterized tests +// in Google C++ Testing Framework (Google Test) +// +// This file is generated by a SCRIPT. DO NOT EDIT BY HAND! +// +#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ +#define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ + + +// Value-parameterized tests allow you to test your code with different +// parameters without writing multiple copies of the same test. +// +// Here is how you use value-parameterized tests: + +#if 0 + +// To write value-parameterized tests, first you should define a fixture +// class. It is usually derived from testing::TestWithParam (see below for +// another inheritance scheme that's sometimes useful in more complicated +// class hierarchies), where the type of your parameter values. +// TestWithParam is itself derived from testing::Test. T can be any +// copyable type. If it's a raw pointer, you are responsible for managing the +// lifespan of the pointed values. + +class FooTest : public ::testing::TestWithParam { + // You can implement all the usual class fixture members here. +}; + +// Then, use the TEST_P macro to define as many parameterized tests +// for this fixture as you want. The _P suffix is for "parameterized" +// or "pattern", whichever you prefer to think. + +TEST_P(FooTest, DoesBlah) { + // Inside a test, access the test parameter with the GetParam() method + // of the TestWithParam class: + EXPECT_TRUE(foo.Blah(GetParam())); + ... +} + +TEST_P(FooTest, HasBlahBlah) { + ... +} + +// Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test +// case with any set of parameters you want. Google Test defines a number +// of functions for generating test parameters. They return what we call +// (surprise!) parameter generators. Here is a summary of them, which +// are all in the testing namespace: +// +// +// Range(begin, end [, step]) - Yields values {begin, begin+step, +// begin+step+step, ...}. The values do not +// include end. step defaults to 1. +// Values(v1, v2, ..., vN) - Yields values {v1, v2, ..., vN}. +// ValuesIn(container) - Yields values from a C-style array, an STL +// ValuesIn(begin,end) container, or an iterator range [begin, end). +// Bool() - Yields sequence {false, true}. +// Combine(g1, g2, ..., gN) - Yields all combinations (the Cartesian product +// for the math savvy) of the values generated +// by the N generators. +// +// For more details, see comments at the definitions of these functions below +// in this file. +// +// The following statement will instantiate tests from the FooTest test case +// each with parameter values "meeny", "miny", and "moe". + +INSTANTIATE_TEST_CASE_P(InstantiationName, + FooTest, + Values("meeny", "miny", "moe")); + +// To distinguish different instances of the pattern, (yes, you +// can instantiate it more then once) the first argument to the +// INSTANTIATE_TEST_CASE_P macro is a prefix that will be added to the +// actual test case name. Remember to pick unique prefixes for different +// instantiations. The tests from the instantiation above will have +// these names: +// +// * InstantiationName/FooTest.DoesBlah/0 for "meeny" +// * InstantiationName/FooTest.DoesBlah/1 for "miny" +// * InstantiationName/FooTest.DoesBlah/2 for "moe" +// * InstantiationName/FooTest.HasBlahBlah/0 for "meeny" +// * InstantiationName/FooTest.HasBlahBlah/1 for "miny" +// * InstantiationName/FooTest.HasBlahBlah/2 for "moe" +// +// You can use these names in --gtest_filter. +// +// This statement will instantiate all tests from FooTest again, each +// with parameter values "cat" and "dog": + +const char* pets[] = {"cat", "dog"}; +INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets)); + +// The tests from the instantiation above will have these names: +// +// * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat" +// * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog" +// * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat" +// * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog" +// +// Please note that INSTANTIATE_TEST_CASE_P will instantiate all tests +// in the given test case, whether their definitions come before or +// AFTER the INSTANTIATE_TEST_CASE_P statement. +// +// Please also note that generator expressions (including parameters to the +// generators) are evaluated in InitGoogleTest(), after main() has started. +// This allows the user on one hand, to adjust generator parameters in order +// to dynamically determine a set of tests to run and on the other hand, +// give the user a chance to inspect the generated tests with Google Test +// reflection API before RUN_ALL_TESTS() is executed. +// +// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc +// for more examples. +// +// In the future, we plan to publish the API for defining new parameter +// generators. But for now this interface remains part of the internal +// implementation and is subject to change. +// +// +// A parameterized test fixture must be derived from testing::Test and from +// testing::WithParamInterface, where T is the type of the parameter +// values. Inheriting from TestWithParam satisfies that requirement because +// TestWithParam inherits from both Test and WithParamInterface. In more +// complicated hierarchies, however, it is occasionally useful to inherit +// separately from Test and WithParamInterface. For example: + +class BaseTest : public ::testing::Test { + // You can inherit all the usual members for a non-parameterized test + // fixture here. +}; + +class DerivedTest : public BaseTest, public ::testing::WithParamInterface { + // The usual test fixture members go here too. +}; + +TEST_F(BaseTest, HasFoo) { + // This is an ordinary non-parameterized test. +} + +TEST_P(DerivedTest, DoesBlah) { + // GetParam works just the same here as if you inherit from TestWithParam. + EXPECT_TRUE(foo.Blah(GetParam())); +} + +#endif // 0 + +#include "gtest/internal/gtest-port.h" + +#if !GTEST_OS_SYMBIAN +# include +#endif + +// scripts/fuse_gtest.py depends on gtest's own header being #included +// *unconditionally*. Therefore these #includes cannot be moved +// inside #if GTEST_HAS_PARAM_TEST. +#include "gtest/internal/gtest-internal.h" +#include "gtest/internal/gtest-param-util.h" +#include "gtest/internal/gtest-param-util-generated.h" + +#if GTEST_HAS_PARAM_TEST + +namespace testing { + +// Functions producing parameter generators. +// +// Google Test uses these generators to produce parameters for value- +// parameterized tests. When a parameterized test case is instantiated +// with a particular generator, Google Test creates and runs tests +// for each element in the sequence produced by the generator. +// +// In the following sample, tests from test case FooTest are instantiated +// each three times with parameter values 3, 5, and 8: +// +// class FooTest : public TestWithParam { ... }; +// +// TEST_P(FooTest, TestThis) { +// } +// TEST_P(FooTest, TestThat) { +// } +// INSTANTIATE_TEST_CASE_P(TestSequence, FooTest, Values(3, 5, 8)); +// + +// Range() returns generators providing sequences of values in a range. +// +// Synopsis: +// Range(start, end) +// - returns a generator producing a sequence of values {start, start+1, +// start+2, ..., }. +// Range(start, end, step) +// - returns a generator producing a sequence of values {start, start+step, +// start+step+step, ..., }. +// Notes: +// * The generated sequences never include end. For example, Range(1, 5) +// returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2) +// returns a generator producing {1, 3, 5, 7}. +// * start and end must have the same type. That type may be any integral or +// floating-point type or a user defined type satisfying these conditions: +// * It must be assignable (have operator=() defined). +// * It must have operator+() (operator+(int-compatible type) for +// two-operand version). +// * It must have operator<() defined. +// Elements in the resulting sequences will also have that type. +// * Condition start < end must be satisfied in order for resulting sequences +// to contain any elements. +// +template +internal::ParamGenerator Range(T start, T end, IncrementT step) { + return internal::ParamGenerator( + new internal::RangeGenerator(start, end, step)); +} + +template +internal::ParamGenerator Range(T start, T end) { + return Range(start, end, 1); +} + +// ValuesIn() function allows generation of tests with parameters coming from +// a container. +// +// Synopsis: +// ValuesIn(const T (&array)[N]) +// - returns a generator producing sequences with elements from +// a C-style array. +// ValuesIn(const Container& container) +// - returns a generator producing sequences with elements from +// an STL-style container. +// ValuesIn(Iterator begin, Iterator end) +// - returns a generator producing sequences with elements from +// a range [begin, end) defined by a pair of STL-style iterators. These +// iterators can also be plain C pointers. +// +// Please note that ValuesIn copies the values from the containers +// passed in and keeps them to generate tests in RUN_ALL_TESTS(). +// +// Examples: +// +// This instantiates tests from test case StringTest +// each with C-string values of "foo", "bar", and "baz": +// +// const char* strings[] = {"foo", "bar", "baz"}; +// INSTANTIATE_TEST_CASE_P(StringSequence, SrtingTest, ValuesIn(strings)); +// +// This instantiates tests from test case StlStringTest +// each with STL strings with values "a" and "b": +// +// ::std::vector< ::std::string> GetParameterStrings() { +// ::std::vector< ::std::string> v; +// v.push_back("a"); +// v.push_back("b"); +// return v; +// } +// +// INSTANTIATE_TEST_CASE_P(CharSequence, +// StlStringTest, +// ValuesIn(GetParameterStrings())); +// +// +// This will also instantiate tests from CharTest +// each with parameter values 'a' and 'b': +// +// ::std::list GetParameterChars() { +// ::std::list list; +// list.push_back('a'); +// list.push_back('b'); +// return list; +// } +// ::std::list l = GetParameterChars(); +// INSTANTIATE_TEST_CASE_P(CharSequence2, +// CharTest, +// ValuesIn(l.begin(), l.end())); +// +template +internal::ParamGenerator< + typename ::testing::internal::IteratorTraits::value_type> +ValuesIn(ForwardIterator begin, ForwardIterator end) { + typedef typename ::testing::internal::IteratorTraits + ::value_type ParamType; + return internal::ParamGenerator( + new internal::ValuesInIteratorRangeGenerator(begin, end)); +} + +template +internal::ParamGenerator ValuesIn(const T (&array)[N]) { + return ValuesIn(array, array + N); +} + +template +internal::ParamGenerator ValuesIn( + const Container& container) { + return ValuesIn(container.begin(), container.end()); +} + +// Values() allows generating tests from explicitly specified list of +// parameters. +// +// Synopsis: +// Values(T v1, T v2, ..., T vN) +// - returns a generator producing sequences with elements v1, v2, ..., vN. +// +// For example, this instantiates tests from test case BarTest each +// with values "one", "two", and "three": +// +// INSTANTIATE_TEST_CASE_P(NumSequence, BarTest, Values("one", "two", "three")); +// +// This instantiates tests from test case BazTest each with values 1, 2, 3.5. +// The exact type of values will depend on the type of parameter in BazTest. +// +// INSTANTIATE_TEST_CASE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5)); +// +// Currently, Values() supports from 1 to $n parameters. +// +$range i 1..n +$for i [[ +$range j 1..i + +template <$for j, [[typename T$j]]> +internal::ValueArray$i<$for j, [[T$j]]> Values($for j, [[T$j v$j]]) { + return internal::ValueArray$i<$for j, [[T$j]]>($for j, [[v$j]]); +} + +]] + +// Bool() allows generating tests with parameters in a set of (false, true). +// +// Synopsis: +// Bool() +// - returns a generator producing sequences with elements {false, true}. +// +// It is useful when testing code that depends on Boolean flags. Combinations +// of multiple flags can be tested when several Bool()'s are combined using +// Combine() function. +// +// In the following example all tests in the test case FlagDependentTest +// will be instantiated twice with parameters false and true. +// +// class FlagDependentTest : public testing::TestWithParam { +// virtual void SetUp() { +// external_flag = GetParam(); +// } +// } +// INSTANTIATE_TEST_CASE_P(BoolSequence, FlagDependentTest, Bool()); +// +inline internal::ParamGenerator Bool() { + return Values(false, true); +} + +# if GTEST_HAS_COMBINE +// Combine() allows the user to combine two or more sequences to produce +// values of a Cartesian product of those sequences' elements. +// +// Synopsis: +// Combine(gen1, gen2, ..., genN) +// - returns a generator producing sequences with elements coming from +// the Cartesian product of elements from the sequences generated by +// gen1, gen2, ..., genN. The sequence elements will have a type of +// tuple where T1, T2, ..., TN are the types +// of elements from sequences produces by gen1, gen2, ..., genN. +// +// Combine can have up to $maxtuple arguments. This number is currently limited +// by the maximum number of elements in the tuple implementation used by Google +// Test. +// +// Example: +// +// This will instantiate tests in test case AnimalTest each one with +// the parameter values tuple("cat", BLACK), tuple("cat", WHITE), +// tuple("dog", BLACK), and tuple("dog", WHITE): +// +// enum Color { BLACK, GRAY, WHITE }; +// class AnimalTest +// : public testing::TestWithParam > {...}; +// +// TEST_P(AnimalTest, AnimalLooksNice) {...} +// +// INSTANTIATE_TEST_CASE_P(AnimalVariations, AnimalTest, +// Combine(Values("cat", "dog"), +// Values(BLACK, WHITE))); +// +// This will instantiate tests in FlagDependentTest with all variations of two +// Boolean flags: +// +// class FlagDependentTest +// : public testing::TestWithParam > { +// virtual void SetUp() { +// // Assigns external_flag_1 and external_flag_2 values from the tuple. +// tie(external_flag_1, external_flag_2) = GetParam(); +// } +// }; +// +// TEST_P(FlagDependentTest, TestFeature1) { +// // Test your code using external_flag_1 and external_flag_2 here. +// } +// INSTANTIATE_TEST_CASE_P(TwoBoolSequence, FlagDependentTest, +// Combine(Bool(), Bool())); +// +$range i 2..maxtuple +$for i [[ +$range j 1..i + +template <$for j, [[typename Generator$j]]> +internal::CartesianProductHolder$i<$for j, [[Generator$j]]> Combine( + $for j, [[const Generator$j& g$j]]) { + return internal::CartesianProductHolder$i<$for j, [[Generator$j]]>( + $for j, [[g$j]]); +} + +]] +# endif // GTEST_HAS_COMBINE + + + +# define TEST_P(test_case_name, test_name) \ + class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \ + : public test_case_name { \ + public: \ + GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \ + virtual void TestBody(); \ + private: \ + static int AddToRegistry() { \ + ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ + GetTestCasePatternHolder(\ + #test_case_name, __FILE__, __LINE__)->AddTestPattern(\ + #test_case_name, \ + #test_name, \ + new ::testing::internal::TestMetaFactory< \ + GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>()); \ + return 0; \ + } \ + static int gtest_registering_dummy_; \ + GTEST_DISALLOW_COPY_AND_ASSIGN_(\ + GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \ + }; \ + int GTEST_TEST_CLASS_NAME_(test_case_name, \ + test_name)::gtest_registering_dummy_ = \ + GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \ + void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() + +# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator) \ + ::testing::internal::ParamGenerator \ + gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \ + int gtest_##prefix##test_case_name##_dummy_ = \ + ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ + GetTestCasePatternHolder(\ + #test_case_name, __FILE__, __LINE__)->AddTestCaseInstantiation(\ + #prefix, \ + >est_##prefix##test_case_name##_EvalGenerator_, \ + __FILE__, __LINE__) + +} // namespace testing + +#endif // GTEST_HAS_PARAM_TEST + +#endif // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ diff --git a/lib/gtest/include/gtest/gtest-printers.h b/lib/gtest/include/gtest/gtest-printers.h new file mode 100644 index 00000000..0639d9f5 --- /dev/null +++ b/lib/gtest/include/gtest/gtest-printers.h @@ -0,0 +1,855 @@ +// Copyright 2007, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) + +// Google Test - The Google C++ Testing Framework +// +// This file implements a universal value printer that can print a +// value of any type T: +// +// void ::testing::internal::UniversalPrinter::Print(value, ostream_ptr); +// +// A user can teach this function how to print a class type T by +// defining either operator<<() or PrintTo() in the namespace that +// defines T. More specifically, the FIRST defined function in the +// following list will be used (assuming T is defined in namespace +// foo): +// +// 1. foo::PrintTo(const T&, ostream*) +// 2. operator<<(ostream&, const T&) defined in either foo or the +// global namespace. +// +// If none of the above is defined, it will print the debug string of +// the value if it is a protocol buffer, or print the raw bytes in the +// value otherwise. +// +// To aid debugging: when T is a reference type, the address of the +// value is also printed; when T is a (const) char pointer, both the +// pointer value and the NUL-terminated string it points to are +// printed. +// +// We also provide some convenient wrappers: +// +// // Prints a value to a string. For a (const or not) char +// // pointer, the NUL-terminated string (but not the pointer) is +// // printed. +// std::string ::testing::PrintToString(const T& value); +// +// // Prints a value tersely: for a reference type, the referenced +// // value (but not the address) is printed; for a (const or not) char +// // pointer, the NUL-terminated string (but not the pointer) is +// // printed. +// void ::testing::internal::UniversalTersePrint(const T& value, ostream*); +// +// // Prints value using the type inferred by the compiler. The difference +// // from UniversalTersePrint() is that this function prints both the +// // pointer and the NUL-terminated string for a (const or not) char pointer. +// void ::testing::internal::UniversalPrint(const T& value, ostream*); +// +// // Prints the fields of a tuple tersely to a string vector, one +// // element for each field. Tuple support must be enabled in +// // gtest-port.h. +// std::vector UniversalTersePrintTupleFieldsToStrings( +// const Tuple& value); +// +// Known limitation: +// +// The print primitives print the elements of an STL-style container +// using the compiler-inferred type of *iter where iter is a +// const_iterator of the container. When const_iterator is an input +// iterator but not a forward iterator, this inferred type may not +// match value_type, and the print output may be incorrect. In +// practice, this is rarely a problem as for most containers +// const_iterator is a forward iterator. We'll fix this if there's an +// actual need for it. Note that this fix cannot rely on value_type +// being defined as many user-defined container types don't have +// value_type. + +#ifndef GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_ +#define GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_ + +#include // NOLINT +#include +#include +#include +#include +#include "gtest/internal/gtest-port.h" +#include "gtest/internal/gtest-internal.h" + +namespace testing { + +// Definitions in the 'internal' and 'internal2' name spaces are +// subject to change without notice. DO NOT USE THEM IN USER CODE! +namespace internal2 { + +// Prints the given number of bytes in the given object to the given +// ostream. +GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes, + size_t count, + ::std::ostream* os); + +// For selecting which printer to use when a given type has neither << +// nor PrintTo(). +enum TypeKind { + kProtobuf, // a protobuf type + kConvertibleToInteger, // a type implicitly convertible to BiggestInt + // (e.g. a named or unnamed enum type) + kOtherType // anything else +}; + +// TypeWithoutFormatter::PrintValue(value, os) is called +// by the universal printer to print a value of type T when neither +// operator<< nor PrintTo() is defined for T, where kTypeKind is the +// "kind" of T as defined by enum TypeKind. +template +class TypeWithoutFormatter { + public: + // This default version is called when kTypeKind is kOtherType. + static void PrintValue(const T& value, ::std::ostream* os) { + PrintBytesInObjectTo(reinterpret_cast(&value), + sizeof(value), os); + } +}; + +// We print a protobuf using its ShortDebugString() when the string +// doesn't exceed this many characters; otherwise we print it using +// DebugString() for better readability. +const size_t kProtobufOneLinerMaxLength = 50; + +template +class TypeWithoutFormatter { + public: + static void PrintValue(const T& value, ::std::ostream* os) { + const ::testing::internal::string short_str = value.ShortDebugString(); + const ::testing::internal::string pretty_str = + short_str.length() <= kProtobufOneLinerMaxLength ? + short_str : ("\n" + value.DebugString()); + *os << ("<" + pretty_str + ">"); + } +}; + +template +class TypeWithoutFormatter { + public: + // Since T has no << operator or PrintTo() but can be implicitly + // converted to BiggestInt, we print it as a BiggestInt. + // + // Most likely T is an enum type (either named or unnamed), in which + // case printing it as an integer is the desired behavior. In case + // T is not an enum, printing it as an integer is the best we can do + // given that it has no user-defined printer. + static void PrintValue(const T& value, ::std::ostream* os) { + const internal::BiggestInt kBigInt = value; + *os << kBigInt; + } +}; + +// Prints the given value to the given ostream. If the value is a +// protocol message, its debug string is printed; if it's an enum or +// of a type implicitly convertible to BiggestInt, it's printed as an +// integer; otherwise the bytes in the value are printed. This is +// what UniversalPrinter::Print() does when it knows nothing about +// type T and T has neither << operator nor PrintTo(). +// +// A user can override this behavior for a class type Foo by defining +// a << operator in the namespace where Foo is defined. +// +// We put this operator in namespace 'internal2' instead of 'internal' +// to simplify the implementation, as much code in 'internal' needs to +// use << in STL, which would conflict with our own << were it defined +// in 'internal'. +// +// Note that this operator<< takes a generic std::basic_ostream type instead of the more restricted std::ostream. If +// we define it to take an std::ostream instead, we'll get an +// "ambiguous overloads" compiler error when trying to print a type +// Foo that supports streaming to std::basic_ostream, as the compiler cannot tell whether +// operator<<(std::ostream&, const T&) or +// operator<<(std::basic_stream, const Foo&) is more +// specific. +template +::std::basic_ostream& operator<<( + ::std::basic_ostream& os, const T& x) { + TypeWithoutFormatter::value ? kProtobuf : + internal::ImplicitlyConvertible::value ? + kConvertibleToInteger : kOtherType)>::PrintValue(x, &os); + return os; +} + +} // namespace internal2 +} // namespace testing + +// This namespace MUST NOT BE NESTED IN ::testing, or the name look-up +// magic needed for implementing UniversalPrinter won't work. +namespace testing_internal { + +// Used to print a value that is not an STL-style container when the +// user doesn't define PrintTo() for it. +template +void DefaultPrintNonContainerTo(const T& value, ::std::ostream* os) { + // With the following statement, during unqualified name lookup, + // testing::internal2::operator<< appears as if it was declared in + // the nearest enclosing namespace that contains both + // ::testing_internal and ::testing::internal2, i.e. the global + // namespace. For more details, refer to the C++ Standard section + // 7.3.4-1 [namespace.udir]. This allows us to fall back onto + // testing::internal2::operator<< in case T doesn't come with a << + // operator. + // + // We cannot write 'using ::testing::internal2::operator<<;', which + // gcc 3.3 fails to compile due to a compiler bug. + using namespace ::testing::internal2; // NOLINT + + // Assuming T is defined in namespace foo, in the next statement, + // the compiler will consider all of: + // + // 1. foo::operator<< (thanks to Koenig look-up), + // 2. ::operator<< (as the current namespace is enclosed in ::), + // 3. testing::internal2::operator<< (thanks to the using statement above). + // + // The operator<< whose type matches T best will be picked. + // + // We deliberately allow #2 to be a candidate, as sometimes it's + // impossible to define #1 (e.g. when foo is ::std, defining + // anything in it is undefined behavior unless you are a compiler + // vendor.). + *os << value; +} + +} // namespace testing_internal + +namespace testing { +namespace internal { + +// UniversalPrinter::Print(value, ostream_ptr) prints the given +// value to the given ostream. The caller must ensure that +// 'ostream_ptr' is not NULL, or the behavior is undefined. +// +// We define UniversalPrinter as a class template (as opposed to a +// function template), as we need to partially specialize it for +// reference types, which cannot be done with function templates. +template +class UniversalPrinter; + +template +void UniversalPrint(const T& value, ::std::ostream* os); + +// Used to print an STL-style container when the user doesn't define +// a PrintTo() for it. +template +void DefaultPrintTo(IsContainer /* dummy */, + false_type /* is not a pointer */, + const C& container, ::std::ostream* os) { + const size_t kMaxCount = 32; // The maximum number of elements to print. + *os << '{'; + size_t count = 0; + for (typename C::const_iterator it = container.begin(); + it != container.end(); ++it, ++count) { + if (count > 0) { + *os << ','; + if (count == kMaxCount) { // Enough has been printed. + *os << " ..."; + break; + } + } + *os << ' '; + // We cannot call PrintTo(*it, os) here as PrintTo() doesn't + // handle *it being a native array. + internal::UniversalPrint(*it, os); + } + + if (count > 0) { + *os << ' '; + } + *os << '}'; +} + +// Used to print a pointer that is neither a char pointer nor a member +// pointer, when the user doesn't define PrintTo() for it. (A member +// variable pointer or member function pointer doesn't really point to +// a location in the address space. Their representation is +// implementation-defined. Therefore they will be printed as raw +// bytes.) +template +void DefaultPrintTo(IsNotContainer /* dummy */, + true_type /* is a pointer */, + T* p, ::std::ostream* os) { + if (p == NULL) { + *os << "NULL"; + } else { + // C++ doesn't allow casting from a function pointer to any object + // pointer. + // + // IsTrue() silences warnings: "Condition is always true", + // "unreachable code". + if (IsTrue(ImplicitlyConvertible::value)) { + // T is not a function type. We just call << to print p, + // relying on ADL to pick up user-defined << for their pointer + // types, if any. + *os << p; + } else { + // T is a function type, so '*os << p' doesn't do what we want + // (it just prints p as bool). We want to print p as a const + // void*. However, we cannot cast it to const void* directly, + // even using reinterpret_cast, as earlier versions of gcc + // (e.g. 3.4.5) cannot compile the cast when p is a function + // pointer. Casting to UInt64 first solves the problem. + *os << reinterpret_cast( + reinterpret_cast(p)); + } + } +} + +// Used to print a non-container, non-pointer value when the user +// doesn't define PrintTo() for it. +template +void DefaultPrintTo(IsNotContainer /* dummy */, + false_type /* is not a pointer */, + const T& value, ::std::ostream* os) { + ::testing_internal::DefaultPrintNonContainerTo(value, os); +} + +// Prints the given value using the << operator if it has one; +// otherwise prints the bytes in it. This is what +// UniversalPrinter::Print() does when PrintTo() is not specialized +// or overloaded for type T. +// +// A user can override this behavior for a class type Foo by defining +// an overload of PrintTo() in the namespace where Foo is defined. We +// give the user this option as sometimes defining a << operator for +// Foo is not desirable (e.g. the coding style may prevent doing it, +// or there is already a << operator but it doesn't do what the user +// wants). +template +void PrintTo(const T& value, ::std::ostream* os) { + // DefaultPrintTo() is overloaded. The type of its first two + // arguments determine which version will be picked. If T is an + // STL-style container, the version for container will be called; if + // T is a pointer, the pointer version will be called; otherwise the + // generic version will be called. + // + // Note that we check for container types here, prior to we check + // for protocol message types in our operator<<. The rationale is: + // + // For protocol messages, we want to give people a chance to + // override Google Mock's format by defining a PrintTo() or + // operator<<. For STL containers, other formats can be + // incompatible with Google Mock's format for the container + // elements; therefore we check for container types here to ensure + // that our format is used. + // + // The second argument of DefaultPrintTo() is needed to bypass a bug + // in Symbian's C++ compiler that prevents it from picking the right + // overload between: + // + // PrintTo(const T& x, ...); + // PrintTo(T* x, ...); + DefaultPrintTo(IsContainerTest(0), is_pointer(), value, os); +} + +// The following list of PrintTo() overloads tells +// UniversalPrinter::Print() how to print standard types (built-in +// types, strings, plain arrays, and pointers). + +// Overloads for various char types. +GTEST_API_ void PrintTo(unsigned char c, ::std::ostream* os); +GTEST_API_ void PrintTo(signed char c, ::std::ostream* os); +inline void PrintTo(char c, ::std::ostream* os) { + // When printing a plain char, we always treat it as unsigned. This + // way, the output won't be affected by whether the compiler thinks + // char is signed or not. + PrintTo(static_cast(c), os); +} + +// Overloads for other simple built-in types. +inline void PrintTo(bool x, ::std::ostream* os) { + *os << (x ? "true" : "false"); +} + +// Overload for wchar_t type. +// Prints a wchar_t as a symbol if it is printable or as its internal +// code otherwise and also as its decimal code (except for L'\0'). +// The L'\0' char is printed as "L'\\0'". The decimal code is printed +// as signed integer when wchar_t is implemented by the compiler +// as a signed type and is printed as an unsigned integer when wchar_t +// is implemented as an unsigned type. +GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os); + +// Overloads for C strings. +GTEST_API_ void PrintTo(const char* s, ::std::ostream* os); +inline void PrintTo(char* s, ::std::ostream* os) { + PrintTo(ImplicitCast_(s), os); +} + +// signed/unsigned char is often used for representing binary data, so +// we print pointers to it as void* to be safe. +inline void PrintTo(const signed char* s, ::std::ostream* os) { + PrintTo(ImplicitCast_(s), os); +} +inline void PrintTo(signed char* s, ::std::ostream* os) { + PrintTo(ImplicitCast_(s), os); +} +inline void PrintTo(const unsigned char* s, ::std::ostream* os) { + PrintTo(ImplicitCast_(s), os); +} +inline void PrintTo(unsigned char* s, ::std::ostream* os) { + PrintTo(ImplicitCast_(s), os); +} + +// MSVC can be configured to define wchar_t as a typedef of unsigned +// short. It defines _NATIVE_WCHAR_T_DEFINED when wchar_t is a native +// type. When wchar_t is a typedef, defining an overload for const +// wchar_t* would cause unsigned short* be printed as a wide string, +// possibly causing invalid memory accesses. +#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) +// Overloads for wide C strings +GTEST_API_ void PrintTo(const wchar_t* s, ::std::ostream* os); +inline void PrintTo(wchar_t* s, ::std::ostream* os) { + PrintTo(ImplicitCast_(s), os); +} +#endif + +// Overload for C arrays. Multi-dimensional arrays are printed +// properly. + +// Prints the given number of elements in an array, without printing +// the curly braces. +template +void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) { + UniversalPrint(a[0], os); + for (size_t i = 1; i != count; i++) { + *os << ", "; + UniversalPrint(a[i], os); + } +} + +// Overloads for ::string and ::std::string. +#if GTEST_HAS_GLOBAL_STRING +GTEST_API_ void PrintStringTo(const ::string&s, ::std::ostream* os); +inline void PrintTo(const ::string& s, ::std::ostream* os) { + PrintStringTo(s, os); +} +#endif // GTEST_HAS_GLOBAL_STRING + +GTEST_API_ void PrintStringTo(const ::std::string&s, ::std::ostream* os); +inline void PrintTo(const ::std::string& s, ::std::ostream* os) { + PrintStringTo(s, os); +} + +// Overloads for ::wstring and ::std::wstring. +#if GTEST_HAS_GLOBAL_WSTRING +GTEST_API_ void PrintWideStringTo(const ::wstring&s, ::std::ostream* os); +inline void PrintTo(const ::wstring& s, ::std::ostream* os) { + PrintWideStringTo(s, os); +} +#endif // GTEST_HAS_GLOBAL_WSTRING + +#if GTEST_HAS_STD_WSTRING +GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os); +inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) { + PrintWideStringTo(s, os); +} +#endif // GTEST_HAS_STD_WSTRING + +#if GTEST_HAS_TR1_TUPLE +// Overload for ::std::tr1::tuple. Needed for printing function arguments, +// which are packed as tuples. + +// Helper function for printing a tuple. T must be instantiated with +// a tuple type. +template +void PrintTupleTo(const T& t, ::std::ostream* os); + +// Overloaded PrintTo() for tuples of various arities. We support +// tuples of up-to 10 fields. The following implementation works +// regardless of whether tr1::tuple is implemented using the +// non-standard variadic template feature or not. + +inline void PrintTo(const ::std::tr1::tuple<>& t, ::std::ostream* os) { + PrintTupleTo(t, os); +} + +template +void PrintTo(const ::std::tr1::tuple& t, ::std::ostream* os) { + PrintTupleTo(t, os); +} + +template +void PrintTo(const ::std::tr1::tuple& t, ::std::ostream* os) { + PrintTupleTo(t, os); +} + +template +void PrintTo(const ::std::tr1::tuple& t, ::std::ostream* os) { + PrintTupleTo(t, os); +} + +template +void PrintTo(const ::std::tr1::tuple& t, ::std::ostream* os) { + PrintTupleTo(t, os); +} + +template +void PrintTo(const ::std::tr1::tuple& t, + ::std::ostream* os) { + PrintTupleTo(t, os); +} + +template +void PrintTo(const ::std::tr1::tuple& t, + ::std::ostream* os) { + PrintTupleTo(t, os); +} + +template +void PrintTo(const ::std::tr1::tuple& t, + ::std::ostream* os) { + PrintTupleTo(t, os); +} + +template +void PrintTo(const ::std::tr1::tuple& t, + ::std::ostream* os) { + PrintTupleTo(t, os); +} + +template +void PrintTo(const ::std::tr1::tuple& t, + ::std::ostream* os) { + PrintTupleTo(t, os); +} + +template +void PrintTo( + const ::std::tr1::tuple& t, + ::std::ostream* os) { + PrintTupleTo(t, os); +} +#endif // GTEST_HAS_TR1_TUPLE + +// Overload for std::pair. +template +void PrintTo(const ::std::pair& value, ::std::ostream* os) { + *os << '('; + // We cannot use UniversalPrint(value.first, os) here, as T1 may be + // a reference type. The same for printing value.second. + UniversalPrinter::Print(value.first, os); + *os << ", "; + UniversalPrinter::Print(value.second, os); + *os << ')'; +} + +// Implements printing a non-reference type T by letting the compiler +// pick the right overload of PrintTo() for T. +template +class UniversalPrinter { + public: + // MSVC warns about adding const to a function type, so we want to + // disable the warning. +#ifdef _MSC_VER +# pragma warning(push) // Saves the current warning state. +# pragma warning(disable:4180) // Temporarily disables warning 4180. +#endif // _MSC_VER + + // Note: we deliberately don't call this PrintTo(), as that name + // conflicts with ::testing::internal::PrintTo in the body of the + // function. + static void Print(const T& value, ::std::ostream* os) { + // By default, ::testing::internal::PrintTo() is used for printing + // the value. + // + // Thanks to Koenig look-up, if T is a class and has its own + // PrintTo() function defined in its namespace, that function will + // be visible here. Since it is more specific than the generic ones + // in ::testing::internal, it will be picked by the compiler in the + // following statement - exactly what we want. + PrintTo(value, os); + } + +#ifdef _MSC_VER +# pragma warning(pop) // Restores the warning state. +#endif // _MSC_VER +}; + +// UniversalPrintArray(begin, len, os) prints an array of 'len' +// elements, starting at address 'begin'. +template +void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) { + if (len == 0) { + *os << "{}"; + } else { + *os << "{ "; + const size_t kThreshold = 18; + const size_t kChunkSize = 8; + // If the array has more than kThreshold elements, we'll have to + // omit some details by printing only the first and the last + // kChunkSize elements. + // TODO(wan@google.com): let the user control the threshold using a flag. + if (len <= kThreshold) { + PrintRawArrayTo(begin, len, os); + } else { + PrintRawArrayTo(begin, kChunkSize, os); + *os << ", ..., "; + PrintRawArrayTo(begin + len - kChunkSize, kChunkSize, os); + } + *os << " }"; + } +} +// This overload prints a (const) char array compactly. +GTEST_API_ void UniversalPrintArray( + const char* begin, size_t len, ::std::ostream* os); + +// This overload prints a (const) wchar_t array compactly. +GTEST_API_ void UniversalPrintArray( + const wchar_t* begin, size_t len, ::std::ostream* os); + +// Implements printing an array type T[N]. +template +class UniversalPrinter { + public: + // Prints the given array, omitting some elements when there are too + // many. + static void Print(const T (&a)[N], ::std::ostream* os) { + UniversalPrintArray(a, N, os); + } +}; + +// Implements printing a reference type T&. +template +class UniversalPrinter { + public: + // MSVC warns about adding const to a function type, so we want to + // disable the warning. +#ifdef _MSC_VER +# pragma warning(push) // Saves the current warning state. +# pragma warning(disable:4180) // Temporarily disables warning 4180. +#endif // _MSC_VER + + static void Print(const T& value, ::std::ostream* os) { + // Prints the address of the value. We use reinterpret_cast here + // as static_cast doesn't compile when T is a function type. + *os << "@" << reinterpret_cast(&value) << " "; + + // Then prints the value itself. + UniversalPrint(value, os); + } + +#ifdef _MSC_VER +# pragma warning(pop) // Restores the warning state. +#endif // _MSC_VER +}; + +// Prints a value tersely: for a reference type, the referenced value +// (but not the address) is printed; for a (const) char pointer, the +// NUL-terminated string (but not the pointer) is printed. + +template +class UniversalTersePrinter { + public: + static void Print(const T& value, ::std::ostream* os) { + UniversalPrint(value, os); + } +}; +template +class UniversalTersePrinter { + public: + static void Print(const T& value, ::std::ostream* os) { + UniversalPrint(value, os); + } +}; +template +class UniversalTersePrinter { + public: + static void Print(const T (&value)[N], ::std::ostream* os) { + UniversalPrinter::Print(value, os); + } +}; +template <> +class UniversalTersePrinter { + public: + static void Print(const char* str, ::std::ostream* os) { + if (str == NULL) { + *os << "NULL"; + } else { + UniversalPrint(string(str), os); + } + } +}; +template <> +class UniversalTersePrinter { + public: + static void Print(char* str, ::std::ostream* os) { + UniversalTersePrinter::Print(str, os); + } +}; + +#if GTEST_HAS_STD_WSTRING +template <> +class UniversalTersePrinter { + public: + static void Print(const wchar_t* str, ::std::ostream* os) { + if (str == NULL) { + *os << "NULL"; + } else { + UniversalPrint(::std::wstring(str), os); + } + } +}; +#endif + +template <> +class UniversalTersePrinter { + public: + static void Print(wchar_t* str, ::std::ostream* os) { + UniversalTersePrinter::Print(str, os); + } +}; + +template +void UniversalTersePrint(const T& value, ::std::ostream* os) { + UniversalTersePrinter::Print(value, os); +} + +// Prints a value using the type inferred by the compiler. The +// difference between this and UniversalTersePrint() is that for a +// (const) char pointer, this prints both the pointer and the +// NUL-terminated string. +template +void UniversalPrint(const T& value, ::std::ostream* os) { + // A workarond for the bug in VC++ 7.1 that prevents us from instantiating + // UniversalPrinter with T directly. + typedef T T1; + UniversalPrinter::Print(value, os); +} + +#if GTEST_HAS_TR1_TUPLE +typedef ::std::vector Strings; + +// This helper template allows PrintTo() for tuples and +// UniversalTersePrintTupleFieldsToStrings() to be defined by +// induction on the number of tuple fields. The idea is that +// TuplePrefixPrinter::PrintPrefixTo(t, os) prints the first N +// fields in tuple t, and can be defined in terms of +// TuplePrefixPrinter. + +// The inductive case. +template +struct TuplePrefixPrinter { + // Prints the first N fields of a tuple. + template + static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) { + TuplePrefixPrinter::PrintPrefixTo(t, os); + *os << ", "; + UniversalPrinter::type> + ::Print(::std::tr1::get(t), os); + } + + // Tersely prints the first N fields of a tuple to a string vector, + // one element for each field. + template + static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) { + TuplePrefixPrinter::TersePrintPrefixToStrings(t, strings); + ::std::stringstream ss; + UniversalTersePrint(::std::tr1::get(t), &ss); + strings->push_back(ss.str()); + } +}; + +// Base cases. +template <> +struct TuplePrefixPrinter<0> { + template + static void PrintPrefixTo(const Tuple&, ::std::ostream*) {} + + template + static void TersePrintPrefixToStrings(const Tuple&, Strings*) {} +}; +// We have to specialize the entire TuplePrefixPrinter<> class +// template here, even though the definition of +// TersePrintPrefixToStrings() is the same as the generic version, as +// Embarcadero (formerly CodeGear, formerly Borland) C++ doesn't +// support specializing a method template of a class template. +template <> +struct TuplePrefixPrinter<1> { + template + static void PrintPrefixTo(const Tuple& t, ::std::ostream* os) { + UniversalPrinter::type>:: + Print(::std::tr1::get<0>(t), os); + } + + template + static void TersePrintPrefixToStrings(const Tuple& t, Strings* strings) { + ::std::stringstream ss; + UniversalTersePrint(::std::tr1::get<0>(t), &ss); + strings->push_back(ss.str()); + } +}; + +// Helper function for printing a tuple. T must be instantiated with +// a tuple type. +template +void PrintTupleTo(const T& t, ::std::ostream* os) { + *os << "("; + TuplePrefixPrinter< ::std::tr1::tuple_size::value>:: + PrintPrefixTo(t, os); + *os << ")"; +} + +// Prints the fields of a tuple tersely to a string vector, one +// element for each field. See the comment before +// UniversalTersePrint() for how we define "tersely". +template +Strings UniversalTersePrintTupleFieldsToStrings(const Tuple& value) { + Strings result; + TuplePrefixPrinter< ::std::tr1::tuple_size::value>:: + TersePrintPrefixToStrings(value, &result); + return result; +} +#endif // GTEST_HAS_TR1_TUPLE + +} // namespace internal + +template +::std::string PrintToString(const T& value) { + ::std::stringstream ss; + internal::UniversalTersePrinter::Print(value, &ss); + return ss.str(); +} + +} // namespace testing + +#endif // GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_ diff --git a/lib/gtest/include/gtest/gtest-spi.h b/lib/gtest/include/gtest/gtest-spi.h new file mode 100644 index 00000000..f63fa9a1 --- /dev/null +++ b/lib/gtest/include/gtest/gtest-spi.h @@ -0,0 +1,232 @@ +// Copyright 2007, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) +// +// Utilities for testing Google Test itself and code that uses Google Test +// (e.g. frameworks built on top of Google Test). + +#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_ +#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_ + +#include "gtest/gtest.h" + +namespace testing { + +// This helper class can be used to mock out Google Test failure reporting +// so that we can test Google Test or code that builds on Google Test. +// +// An object of this class appends a TestPartResult object to the +// TestPartResultArray object given in the constructor whenever a Google Test +// failure is reported. It can either intercept only failures that are +// generated in the same thread that created this object or it can intercept +// all generated failures. The scope of this mock object can be controlled with +// the second argument to the two arguments constructor. +class GTEST_API_ ScopedFakeTestPartResultReporter + : public TestPartResultReporterInterface { + public: + // The two possible mocking modes of this object. + enum InterceptMode { + INTERCEPT_ONLY_CURRENT_THREAD, // Intercepts only thread local failures. + INTERCEPT_ALL_THREADS // Intercepts all failures. + }; + + // The c'tor sets this object as the test part result reporter used + // by Google Test. The 'result' parameter specifies where to report the + // results. This reporter will only catch failures generated in the current + // thread. DEPRECATED + explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result); + + // Same as above, but you can choose the interception scope of this object. + ScopedFakeTestPartResultReporter(InterceptMode intercept_mode, + TestPartResultArray* result); + + // The d'tor restores the previous test part result reporter. + virtual ~ScopedFakeTestPartResultReporter(); + + // Appends the TestPartResult object to the TestPartResultArray + // received in the constructor. + // + // This method is from the TestPartResultReporterInterface + // interface. + virtual void ReportTestPartResult(const TestPartResult& result); + private: + void Init(); + + const InterceptMode intercept_mode_; + TestPartResultReporterInterface* old_reporter_; + TestPartResultArray* const result_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter); +}; + +namespace internal { + +// A helper class for implementing EXPECT_FATAL_FAILURE() and +// EXPECT_NONFATAL_FAILURE(). Its destructor verifies that the given +// TestPartResultArray contains exactly one failure that has the given +// type and contains the given substring. If that's not the case, a +// non-fatal failure will be generated. +class GTEST_API_ SingleFailureChecker { + public: + // The constructor remembers the arguments. + SingleFailureChecker(const TestPartResultArray* results, + TestPartResult::Type type, + const string& substr); + ~SingleFailureChecker(); + private: + const TestPartResultArray* const results_; + const TestPartResult::Type type_; + const string substr_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker); +}; + +} // namespace internal + +} // namespace testing + +// A set of macros for testing Google Test assertions or code that's expected +// to generate Google Test fatal failures. It verifies that the given +// statement will cause exactly one fatal Google Test failure with 'substr' +// being part of the failure message. +// +// There are two different versions of this macro. EXPECT_FATAL_FAILURE only +// affects and considers failures generated in the current thread and +// EXPECT_FATAL_FAILURE_ON_ALL_THREADS does the same but for all threads. +// +// The verification of the assertion is done correctly even when the statement +// throws an exception or aborts the current function. +// +// Known restrictions: +// - 'statement' cannot reference local non-static variables or +// non-static members of the current object. +// - 'statement' cannot return a value. +// - You cannot stream a failure message to this macro. +// +// Note that even though the implementations of the following two +// macros are much alike, we cannot refactor them to use a common +// helper macro, due to some peculiarity in how the preprocessor +// works. The AcceptsMacroThatExpandsToUnprotectedComma test in +// gtest_unittest.cc will fail to compile if we do that. +#define EXPECT_FATAL_FAILURE(statement, substr) \ + do { \ + class GTestExpectFatalFailureHelper {\ + public:\ + static void Execute() { statement; }\ + };\ + ::testing::TestPartResultArray gtest_failures;\ + ::testing::internal::SingleFailureChecker gtest_checker(\ + >est_failures, ::testing::TestPartResult::kFatalFailure, (substr));\ + {\ + ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ + ::testing::ScopedFakeTestPartResultReporter:: \ + INTERCEPT_ONLY_CURRENT_THREAD, >est_failures);\ + GTestExpectFatalFailureHelper::Execute();\ + }\ + } while (::testing::internal::AlwaysFalse()) + +#define EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substr) \ + do { \ + class GTestExpectFatalFailureHelper {\ + public:\ + static void Execute() { statement; }\ + };\ + ::testing::TestPartResultArray gtest_failures;\ + ::testing::internal::SingleFailureChecker gtest_checker(\ + >est_failures, ::testing::TestPartResult::kFatalFailure, (substr));\ + {\ + ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ + ::testing::ScopedFakeTestPartResultReporter:: \ + INTERCEPT_ALL_THREADS, >est_failures);\ + GTestExpectFatalFailureHelper::Execute();\ + }\ + } while (::testing::internal::AlwaysFalse()) + +// A macro for testing Google Test assertions or code that's expected to +// generate Google Test non-fatal failures. It asserts that the given +// statement will cause exactly one non-fatal Google Test failure with 'substr' +// being part of the failure message. +// +// There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only +// affects and considers failures generated in the current thread and +// EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS does the same but for all threads. +// +// 'statement' is allowed to reference local variables and members of +// the current object. +// +// The verification of the assertion is done correctly even when the statement +// throws an exception or aborts the current function. +// +// Known restrictions: +// - You cannot stream a failure message to this macro. +// +// Note that even though the implementations of the following two +// macros are much alike, we cannot refactor them to use a common +// helper macro, due to some peculiarity in how the preprocessor +// works. If we do that, the code won't compile when the user gives +// EXPECT_NONFATAL_FAILURE() a statement that contains a macro that +// expands to code containing an unprotected comma. The +// AcceptsMacroThatExpandsToUnprotectedComma test in gtest_unittest.cc +// catches that. +// +// For the same reason, we have to write +// if (::testing::internal::AlwaysTrue()) { statement; } +// instead of +// GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) +// to avoid an MSVC warning on unreachable code. +#define EXPECT_NONFATAL_FAILURE(statement, substr) \ + do {\ + ::testing::TestPartResultArray gtest_failures;\ + ::testing::internal::SingleFailureChecker gtest_checker(\ + >est_failures, ::testing::TestPartResult::kNonFatalFailure, \ + (substr));\ + {\ + ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ + ::testing::ScopedFakeTestPartResultReporter:: \ + INTERCEPT_ONLY_CURRENT_THREAD, >est_failures);\ + if (::testing::internal::AlwaysTrue()) { statement; }\ + }\ + } while (::testing::internal::AlwaysFalse()) + +#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \ + do {\ + ::testing::TestPartResultArray gtest_failures;\ + ::testing::internal::SingleFailureChecker gtest_checker(\ + >est_failures, ::testing::TestPartResult::kNonFatalFailure, \ + (substr));\ + {\ + ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ + ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \ + >est_failures);\ + if (::testing::internal::AlwaysTrue()) { statement; }\ + }\ + } while (::testing::internal::AlwaysFalse()) + +#endif // GTEST_INCLUDE_GTEST_GTEST_SPI_H_ diff --git a/lib/gtest/include/gtest/gtest-test-part.h b/lib/gtest/include/gtest/gtest-test-part.h new file mode 100644 index 00000000..77eb8448 --- /dev/null +++ b/lib/gtest/include/gtest/gtest-test-part.h @@ -0,0 +1,179 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: mheule@google.com (Markus Heule) +// + +#ifndef GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ +#define GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ + +#include +#include +#include "gtest/internal/gtest-internal.h" +#include "gtest/internal/gtest-string.h" + +namespace testing { + +// A copyable object representing the result of a test part (i.e. an +// assertion or an explicit FAIL(), ADD_FAILURE(), or SUCCESS()). +// +// Don't inherit from TestPartResult as its destructor is not virtual. +class GTEST_API_ TestPartResult { + public: + // The possible outcomes of a test part (i.e. an assertion or an + // explicit SUCCEED(), FAIL(), or ADD_FAILURE()). + enum Type { + kSuccess, // Succeeded. + kNonFatalFailure, // Failed but the test can continue. + kFatalFailure // Failed and the test should be terminated. + }; + + // C'tor. TestPartResult does NOT have a default constructor. + // Always use this constructor (with parameters) to create a + // TestPartResult object. + TestPartResult(Type a_type, + const char* a_file_name, + int a_line_number, + const char* a_message) + : type_(a_type), + file_name_(a_file_name == NULL ? "" : a_file_name), + line_number_(a_line_number), + summary_(ExtractSummary(a_message)), + message_(a_message) { + } + + // Gets the outcome of the test part. + Type type() const { return type_; } + + // Gets the name of the source file where the test part took place, or + // NULL if it's unknown. + const char* file_name() const { + return file_name_.empty() ? NULL : file_name_.c_str(); + } + + // Gets the line in the source file where the test part took place, + // or -1 if it's unknown. + int line_number() const { return line_number_; } + + // Gets the summary of the failure message. + const char* summary() const { return summary_.c_str(); } + + // Gets the message associated with the test part. + const char* message() const { return message_.c_str(); } + + // Returns true iff the test part passed. + bool passed() const { return type_ == kSuccess; } + + // Returns true iff the test part failed. + bool failed() const { return type_ != kSuccess; } + + // Returns true iff the test part non-fatally failed. + bool nonfatally_failed() const { return type_ == kNonFatalFailure; } + + // Returns true iff the test part fatally failed. + bool fatally_failed() const { return type_ == kFatalFailure; } + + private: + Type type_; + + // Gets the summary of the failure message by omitting the stack + // trace in it. + static std::string ExtractSummary(const char* message); + + // The name of the source file where the test part took place, or + // "" if the source file is unknown. + std::string file_name_; + // The line in the source file where the test part took place, or -1 + // if the line number is unknown. + int line_number_; + std::string summary_; // The test failure summary. + std::string message_; // The test failure message. +}; + +// Prints a TestPartResult object. +std::ostream& operator<<(std::ostream& os, const TestPartResult& result); + +// An array of TestPartResult objects. +// +// Don't inherit from TestPartResultArray as its destructor is not +// virtual. +class GTEST_API_ TestPartResultArray { + public: + TestPartResultArray() {} + + // Appends the given TestPartResult to the array. + void Append(const TestPartResult& result); + + // Returns the TestPartResult at the given index (0-based). + const TestPartResult& GetTestPartResult(int index) const; + + // Returns the number of TestPartResult objects in the array. + int size() const; + + private: + std::vector array_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(TestPartResultArray); +}; + +// This interface knows how to report a test part result. +class TestPartResultReporterInterface { + public: + virtual ~TestPartResultReporterInterface() {} + + virtual void ReportTestPartResult(const TestPartResult& result) = 0; +}; + +namespace internal { + +// This helper class is used by {ASSERT|EXPECT}_NO_FATAL_FAILURE to check if a +// statement generates new fatal failures. To do so it registers itself as the +// current test part result reporter. Besides checking if fatal failures were +// reported, it only delegates the reporting to the former result reporter. +// The original result reporter is restored in the destructor. +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +class GTEST_API_ HasNewFatalFailureHelper + : public TestPartResultReporterInterface { + public: + HasNewFatalFailureHelper(); + virtual ~HasNewFatalFailureHelper(); + virtual void ReportTestPartResult(const TestPartResult& result); + bool has_new_fatal_failure() const { return has_new_fatal_failure_; } + private: + bool has_new_fatal_failure_; + TestPartResultReporterInterface* original_reporter_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(HasNewFatalFailureHelper); +}; + +} // namespace internal + +} // namespace testing + +#endif // GTEST_INCLUDE_GTEST_GTEST_TEST_PART_H_ diff --git a/lib/gtest/include/gtest/gtest-typed-test.h b/lib/gtest/include/gtest/gtest-typed-test.h new file mode 100644 index 00000000..fe1e83b2 --- /dev/null +++ b/lib/gtest/include/gtest/gtest-typed-test.h @@ -0,0 +1,259 @@ +// Copyright 2008 Google Inc. +// All Rights Reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) + +#ifndef GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_ +#define GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_ + +// This header implements typed tests and type-parameterized tests. + +// Typed (aka type-driven) tests repeat the same test for types in a +// list. You must know which types you want to test with when writing +// typed tests. Here's how you do it: + +#if 0 + +// First, define a fixture class template. It should be parameterized +// by a type. Remember to derive it from testing::Test. +template +class FooTest : public testing::Test { + public: + ... + typedef std::list List; + static T shared_; + T value_; +}; + +// Next, associate a list of types with the test case, which will be +// repeated for each type in the list. The typedef is necessary for +// the macro to parse correctly. +typedef testing::Types MyTypes; +TYPED_TEST_CASE(FooTest, MyTypes); + +// If the type list contains only one type, you can write that type +// directly without Types<...>: +// TYPED_TEST_CASE(FooTest, int); + +// Then, use TYPED_TEST() instead of TEST_F() to define as many typed +// tests for this test case as you want. +TYPED_TEST(FooTest, DoesBlah) { + // Inside a test, refer to TypeParam to get the type parameter. + // Since we are inside a derived class template, C++ requires use to + // visit the members of FooTest via 'this'. + TypeParam n = this->value_; + + // To visit static members of the fixture, add the TestFixture:: + // prefix. + n += TestFixture::shared_; + + // To refer to typedefs in the fixture, add the "typename + // TestFixture::" prefix. + typename TestFixture::List values; + values.push_back(n); + ... +} + +TYPED_TEST(FooTest, HasPropertyA) { ... } + +#endif // 0 + +// Type-parameterized tests are abstract test patterns parameterized +// by a type. Compared with typed tests, type-parameterized tests +// allow you to define the test pattern without knowing what the type +// parameters are. The defined pattern can be instantiated with +// different types any number of times, in any number of translation +// units. +// +// If you are designing an interface or concept, you can define a +// suite of type-parameterized tests to verify properties that any +// valid implementation of the interface/concept should have. Then, +// each implementation can easily instantiate the test suite to verify +// that it conforms to the requirements, without having to write +// similar tests repeatedly. Here's an example: + +#if 0 + +// First, define a fixture class template. It should be parameterized +// by a type. Remember to derive it from testing::Test. +template +class FooTest : public testing::Test { + ... +}; + +// Next, declare that you will define a type-parameterized test case +// (the _P suffix is for "parameterized" or "pattern", whichever you +// prefer): +TYPED_TEST_CASE_P(FooTest); + +// Then, use TYPED_TEST_P() to define as many type-parameterized tests +// for this type-parameterized test case as you want. +TYPED_TEST_P(FooTest, DoesBlah) { + // Inside a test, refer to TypeParam to get the type parameter. + TypeParam n = 0; + ... +} + +TYPED_TEST_P(FooTest, HasPropertyA) { ... } + +// Now the tricky part: you need to register all test patterns before +// you can instantiate them. The first argument of the macro is the +// test case name; the rest are the names of the tests in this test +// case. +REGISTER_TYPED_TEST_CASE_P(FooTest, + DoesBlah, HasPropertyA); + +// Finally, you are free to instantiate the pattern with the types you +// want. If you put the above code in a header file, you can #include +// it in multiple C++ source files and instantiate it multiple times. +// +// To distinguish different instances of the pattern, the first +// argument to the INSTANTIATE_* macro is a prefix that will be added +// to the actual test case name. Remember to pick unique prefixes for +// different instances. +typedef testing::Types MyTypes; +INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, MyTypes); + +// If the type list contains only one type, you can write that type +// directly without Types<...>: +// INSTANTIATE_TYPED_TEST_CASE_P(My, FooTest, int); + +#endif // 0 + +#include "gtest/internal/gtest-port.h" +#include "gtest/internal/gtest-type-util.h" + +// Implements typed tests. + +#if GTEST_HAS_TYPED_TEST + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// Expands to the name of the typedef for the type parameters of the +// given test case. +# define GTEST_TYPE_PARAMS_(TestCaseName) gtest_type_params_##TestCaseName##_ + +// The 'Types' template argument below must have spaces around it +// since some compilers may choke on '>>' when passing a template +// instance (e.g. Types) +# define TYPED_TEST_CASE(CaseName, Types) \ + typedef ::testing::internal::TypeList< Types >::type \ + GTEST_TYPE_PARAMS_(CaseName) + +# define TYPED_TEST(CaseName, TestName) \ + template \ + class GTEST_TEST_CLASS_NAME_(CaseName, TestName) \ + : public CaseName { \ + private: \ + typedef CaseName TestFixture; \ + typedef gtest_TypeParam_ TypeParam; \ + virtual void TestBody(); \ + }; \ + bool gtest_##CaseName##_##TestName##_registered_ GTEST_ATTRIBUTE_UNUSED_ = \ + ::testing::internal::TypeParameterizedTest< \ + CaseName, \ + ::testing::internal::TemplateSel< \ + GTEST_TEST_CLASS_NAME_(CaseName, TestName)>, \ + GTEST_TYPE_PARAMS_(CaseName)>::Register(\ + "", #CaseName, #TestName, 0); \ + template \ + void GTEST_TEST_CLASS_NAME_(CaseName, TestName)::TestBody() + +#endif // GTEST_HAS_TYPED_TEST + +// Implements type-parameterized tests. + +#if GTEST_HAS_TYPED_TEST_P + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// Expands to the namespace name that the type-parameterized tests for +// the given type-parameterized test case are defined in. The exact +// name of the namespace is subject to change without notice. +# define GTEST_CASE_NAMESPACE_(TestCaseName) \ + gtest_case_##TestCaseName##_ + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// Expands to the name of the variable used to remember the names of +// the defined tests in the given test case. +# define GTEST_TYPED_TEST_CASE_P_STATE_(TestCaseName) \ + gtest_typed_test_case_p_state_##TestCaseName##_ + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE DIRECTLY. +// +// Expands to the name of the variable used to remember the names of +// the registered tests in the given test case. +# define GTEST_REGISTERED_TEST_NAMES_(TestCaseName) \ + gtest_registered_test_names_##TestCaseName##_ + +// The variables defined in the type-parameterized test macros are +// static as typically these macros are used in a .h file that can be +// #included in multiple translation units linked together. +# define TYPED_TEST_CASE_P(CaseName) \ + static ::testing::internal::TypedTestCasePState \ + GTEST_TYPED_TEST_CASE_P_STATE_(CaseName) + +# define TYPED_TEST_P(CaseName, TestName) \ + namespace GTEST_CASE_NAMESPACE_(CaseName) { \ + template \ + class TestName : public CaseName { \ + private: \ + typedef CaseName TestFixture; \ + typedef gtest_TypeParam_ TypeParam; \ + virtual void TestBody(); \ + }; \ + static bool gtest_##TestName##_defined_ GTEST_ATTRIBUTE_UNUSED_ = \ + GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).AddTestName(\ + __FILE__, __LINE__, #CaseName, #TestName); \ + } \ + template \ + void GTEST_CASE_NAMESPACE_(CaseName)::TestName::TestBody() + +# define REGISTER_TYPED_TEST_CASE_P(CaseName, ...) \ + namespace GTEST_CASE_NAMESPACE_(CaseName) { \ + typedef ::testing::internal::Templates<__VA_ARGS__>::type gtest_AllTests_; \ + } \ + static const char* const GTEST_REGISTERED_TEST_NAMES_(CaseName) = \ + GTEST_TYPED_TEST_CASE_P_STATE_(CaseName).VerifyRegisteredTestNames(\ + __FILE__, __LINE__, #__VA_ARGS__) + +// The 'Types' template argument below must have spaces around it +// since some compilers may choke on '>>' when passing a template +// instance (e.g. Types) +# define INSTANTIATE_TYPED_TEST_CASE_P(Prefix, CaseName, Types) \ + bool gtest_##Prefix##_##CaseName GTEST_ATTRIBUTE_UNUSED_ = \ + ::testing::internal::TypeParameterizedTestCase::type>::Register(\ + #Prefix, #CaseName, GTEST_REGISTERED_TEST_NAMES_(CaseName)) + +#endif // GTEST_HAS_TYPED_TEST_P + +#endif // GTEST_INCLUDE_GTEST_GTEST_TYPED_TEST_H_ diff --git a/lib/gtest/include/gtest/gtest.h b/lib/gtest/include/gtest/gtest.h new file mode 100644 index 00000000..6fa0a392 --- /dev/null +++ b/lib/gtest/include/gtest/gtest.h @@ -0,0 +1,2291 @@ +// Copyright 2005, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) +// +// The Google C++ Testing Framework (Google Test) +// +// This header file defines the public API for Google Test. It should be +// included by any test program that uses Google Test. +// +// IMPORTANT NOTE: Due to limitation of the C++ language, we have to +// leave some internal implementation details in this header file. +// They are clearly marked by comments like this: +// +// // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +// +// Such code is NOT meant to be used by a user directly, and is subject +// to CHANGE WITHOUT NOTICE. Therefore DO NOT DEPEND ON IT in a user +// program! +// +// Acknowledgment: Google Test borrowed the idea of automatic test +// registration from Barthelemy Dagenais' (barthelemy@prologique.com) +// easyUnit framework. + +#ifndef GTEST_INCLUDE_GTEST_GTEST_H_ +#define GTEST_INCLUDE_GTEST_GTEST_H_ + +#include +#include +#include + +#include "gtest/internal/gtest-internal.h" +#include "gtest/internal/gtest-string.h" +#include "gtest/gtest-death-test.h" +#include "gtest/gtest-message.h" +#include "gtest/gtest-param-test.h" +#include "gtest/gtest-printers.h" +#include "gtest/gtest_prod.h" +#include "gtest/gtest-test-part.h" +#include "gtest/gtest-typed-test.h" + +// Depending on the platform, different string classes are available. +// On Linux, in addition to ::std::string, Google also makes use of +// class ::string, which has the same interface as ::std::string, but +// has a different implementation. +// +// The user can define GTEST_HAS_GLOBAL_STRING to 1 to indicate that +// ::string is available AND is a distinct type to ::std::string, or +// define it to 0 to indicate otherwise. +// +// If the user's ::std::string and ::string are the same class due to +// aliasing, he should define GTEST_HAS_GLOBAL_STRING to 0. +// +// If the user doesn't define GTEST_HAS_GLOBAL_STRING, it is defined +// heuristically. + +namespace testing { + +// Declares the flags. + +// This flag temporary enables the disabled tests. +GTEST_DECLARE_bool_(also_run_disabled_tests); + +// This flag brings the debugger on an assertion failure. +GTEST_DECLARE_bool_(break_on_failure); + +// This flag controls whether Google Test catches all test-thrown exceptions +// and logs them as failures. +GTEST_DECLARE_bool_(catch_exceptions); + +// This flag enables using colors in terminal output. Available values are +// "yes" to enable colors, "no" (disable colors), or "auto" (the default) +// to let Google Test decide. +GTEST_DECLARE_string_(color); + +// This flag sets up the filter to select by name using a glob pattern +// the tests to run. If the filter is not given all tests are executed. +GTEST_DECLARE_string_(filter); + +// This flag causes the Google Test to list tests. None of the tests listed +// are actually run if the flag is provided. +GTEST_DECLARE_bool_(list_tests); + +// This flag controls whether Google Test emits a detailed XML report to a file +// in addition to its normal textual output. +GTEST_DECLARE_string_(output); + +// This flags control whether Google Test prints the elapsed time for each +// test. +GTEST_DECLARE_bool_(print_time); + +// This flag specifies the random number seed. +GTEST_DECLARE_int32_(random_seed); + +// This flag sets how many times the tests are repeated. The default value +// is 1. If the value is -1 the tests are repeating forever. +GTEST_DECLARE_int32_(repeat); + +// This flag controls whether Google Test includes Google Test internal +// stack frames in failure stack traces. +GTEST_DECLARE_bool_(show_internal_stack_frames); + +// When this flag is specified, tests' order is randomized on every iteration. +GTEST_DECLARE_bool_(shuffle); + +// This flag specifies the maximum number of stack frames to be +// printed in a failure message. +GTEST_DECLARE_int32_(stack_trace_depth); + +// When this flag is specified, a failed assertion will throw an +// exception if exceptions are enabled, or exit the program with a +// non-zero code otherwise. +GTEST_DECLARE_bool_(throw_on_failure); + +// When this flag is set with a "host:port" string, on supported +// platforms test results are streamed to the specified port on +// the specified host machine. +GTEST_DECLARE_string_(stream_result_to); + +// The upper limit for valid stack trace depths. +const int kMaxStackTraceDepth = 100; + +namespace internal { + +class AssertHelper; +class DefaultGlobalTestPartResultReporter; +class ExecDeathTest; +class NoExecDeathTest; +class FinalSuccessChecker; +class GTestFlagSaver; +class StreamingListenerTest; +class TestResultAccessor; +class TestEventListenersAccessor; +class TestEventRepeater; +class UnitTestRecordPropertyTestHelper; +class WindowsDeathTest; +class UnitTestImpl* GetUnitTestImpl(); +void ReportFailureInUnknownLocation(TestPartResult::Type result_type, + const std::string& message); + +} // namespace internal + +// The friend relationship of some of these classes is cyclic. +// If we don't forward declare them the compiler might confuse the classes +// in friendship clauses with same named classes on the scope. +class Test; +class TestCase; +class TestInfo; +class UnitTest; + +// A class for indicating whether an assertion was successful. When +// the assertion wasn't successful, the AssertionResult object +// remembers a non-empty message that describes how it failed. +// +// To create an instance of this class, use one of the factory functions +// (AssertionSuccess() and AssertionFailure()). +// +// This class is useful for two purposes: +// 1. Defining predicate functions to be used with Boolean test assertions +// EXPECT_TRUE/EXPECT_FALSE and their ASSERT_ counterparts +// 2. Defining predicate-format functions to be +// used with predicate assertions (ASSERT_PRED_FORMAT*, etc). +// +// For example, if you define IsEven predicate: +// +// testing::AssertionResult IsEven(int n) { +// if ((n % 2) == 0) +// return testing::AssertionSuccess(); +// else +// return testing::AssertionFailure() << n << " is odd"; +// } +// +// Then the failed expectation EXPECT_TRUE(IsEven(Fib(5))) +// will print the message +// +// Value of: IsEven(Fib(5)) +// Actual: false (5 is odd) +// Expected: true +// +// instead of a more opaque +// +// Value of: IsEven(Fib(5)) +// Actual: false +// Expected: true +// +// in case IsEven is a simple Boolean predicate. +// +// If you expect your predicate to be reused and want to support informative +// messages in EXPECT_FALSE and ASSERT_FALSE (negative assertions show up +// about half as often as positive ones in our tests), supply messages for +// both success and failure cases: +// +// testing::AssertionResult IsEven(int n) { +// if ((n % 2) == 0) +// return testing::AssertionSuccess() << n << " is even"; +// else +// return testing::AssertionFailure() << n << " is odd"; +// } +// +// Then a statement EXPECT_FALSE(IsEven(Fib(6))) will print +// +// Value of: IsEven(Fib(6)) +// Actual: true (8 is even) +// Expected: false +// +// NB: Predicates that support negative Boolean assertions have reduced +// performance in positive ones so be careful not to use them in tests +// that have lots (tens of thousands) of positive Boolean assertions. +// +// To use this class with EXPECT_PRED_FORMAT assertions such as: +// +// // Verifies that Foo() returns an even number. +// EXPECT_PRED_FORMAT1(IsEven, Foo()); +// +// you need to define: +// +// testing::AssertionResult IsEven(const char* expr, int n) { +// if ((n % 2) == 0) +// return testing::AssertionSuccess(); +// else +// return testing::AssertionFailure() +// << "Expected: " << expr << " is even\n Actual: it's " << n; +// } +// +// If Foo() returns 5, you will see the following message: +// +// Expected: Foo() is even +// Actual: it's 5 +// +class GTEST_API_ AssertionResult { + public: + // Copy constructor. + // Used in EXPECT_TRUE/FALSE(assertion_result). + AssertionResult(const AssertionResult& other); + // Used in the EXPECT_TRUE/FALSE(bool_expression). + explicit AssertionResult(bool success) : success_(success) {} + + // Returns true iff the assertion succeeded. + operator bool() const { return success_; } // NOLINT + + // Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE. + AssertionResult operator!() const; + + // Returns the text streamed into this AssertionResult. Test assertions + // use it when they fail (i.e., the predicate's outcome doesn't match the + // assertion's expectation). When nothing has been streamed into the + // object, returns an empty string. + const char* message() const { + return message_.get() != NULL ? message_->c_str() : ""; + } + // TODO(vladl@google.com): Remove this after making sure no clients use it. + // Deprecated; please use message() instead. + const char* failure_message() const { return message(); } + + // Streams a custom failure message into this object. + template AssertionResult& operator<<(const T& value) { + AppendMessage(Message() << value); + return *this; + } + + // Allows streaming basic output manipulators such as endl or flush into + // this object. + AssertionResult& operator<<( + ::std::ostream& (*basic_manipulator)(::std::ostream& stream)) { + AppendMessage(Message() << basic_manipulator); + return *this; + } + + private: + // Appends the contents of message to message_. + void AppendMessage(const Message& a_message) { + if (message_.get() == NULL) + message_.reset(new ::std::string); + message_->append(a_message.GetString().c_str()); + } + + // Stores result of the assertion predicate. + bool success_; + // Stores the message describing the condition in case the expectation + // construct is not satisfied with the predicate's outcome. + // Referenced via a pointer to avoid taking too much stack frame space + // with test assertions. + internal::scoped_ptr< ::std::string> message_; + + GTEST_DISALLOW_ASSIGN_(AssertionResult); +}; + +// Makes a successful assertion result. +GTEST_API_ AssertionResult AssertionSuccess(); + +// Makes a failed assertion result. +GTEST_API_ AssertionResult AssertionFailure(); + +// Makes a failed assertion result with the given failure message. +// Deprecated; use AssertionFailure() << msg. +GTEST_API_ AssertionResult AssertionFailure(const Message& msg); + +// The abstract class that all tests inherit from. +// +// In Google Test, a unit test program contains one or many TestCases, and +// each TestCase contains one or many Tests. +// +// When you define a test using the TEST macro, you don't need to +// explicitly derive from Test - the TEST macro automatically does +// this for you. +// +// The only time you derive from Test is when defining a test fixture +// to be used a TEST_F. For example: +// +// class FooTest : public testing::Test { +// protected: +// virtual void SetUp() { ... } +// virtual void TearDown() { ... } +// ... +// }; +// +// TEST_F(FooTest, Bar) { ... } +// TEST_F(FooTest, Baz) { ... } +// +// Test is not copyable. +class GTEST_API_ Test { + public: + friend class TestInfo; + + // Defines types for pointers to functions that set up and tear down + // a test case. + typedef internal::SetUpTestCaseFunc SetUpTestCaseFunc; + typedef internal::TearDownTestCaseFunc TearDownTestCaseFunc; + + // The d'tor is virtual as we intend to inherit from Test. + virtual ~Test(); + + // Sets up the stuff shared by all tests in this test case. + // + // Google Test will call Foo::SetUpTestCase() before running the first + // test in test case Foo. Hence a sub-class can define its own + // SetUpTestCase() method to shadow the one defined in the super + // class. + static void SetUpTestCase() {} + + // Tears down the stuff shared by all tests in this test case. + // + // Google Test will call Foo::TearDownTestCase() after running the last + // test in test case Foo. Hence a sub-class can define its own + // TearDownTestCase() method to shadow the one defined in the super + // class. + static void TearDownTestCase() {} + + // Returns true iff the current test has a fatal failure. + static bool HasFatalFailure(); + + // Returns true iff the current test has a non-fatal failure. + static bool HasNonfatalFailure(); + + // Returns true iff the current test has a (either fatal or + // non-fatal) failure. + static bool HasFailure() { return HasFatalFailure() || HasNonfatalFailure(); } + + // Logs a property for the current test, test case, or for the entire + // invocation of the test program when used outside of the context of a + // test case. Only the last value for a given key is remembered. These + // are public static so they can be called from utility functions that are + // not members of the test fixture. Calls to RecordProperty made during + // lifespan of the test (from the moment its constructor starts to the + // moment its destructor finishes) will be output in XML as attributes of + // the element. Properties recorded from fixture's + // SetUpTestCase or TearDownTestCase are logged as attributes of the + // corresponding element. Calls to RecordProperty made in the + // global context (before or after invocation of RUN_ALL_TESTS and from + // SetUp/TearDown method of Environment objects registered with Google + // Test) will be output as attributes of the element. + static void RecordProperty(const std::string& key, const std::string& value); + static void RecordProperty(const std::string& key, int value); + + protected: + // Creates a Test object. + Test(); + + // Sets up the test fixture. + virtual void SetUp(); + + // Tears down the test fixture. + virtual void TearDown(); + + private: + // Returns true iff the current test has the same fixture class as + // the first test in the current test case. + static bool HasSameFixtureClass(); + + // Runs the test after the test fixture has been set up. + // + // A sub-class must implement this to define the test logic. + // + // DO NOT OVERRIDE THIS FUNCTION DIRECTLY IN A USER PROGRAM. + // Instead, use the TEST or TEST_F macro. + virtual void TestBody() = 0; + + // Sets up, executes, and tears down the test. + void Run(); + + // Deletes self. We deliberately pick an unusual name for this + // internal method to avoid clashing with names used in user TESTs. + void DeleteSelf_() { delete this; } + + // Uses a GTestFlagSaver to save and restore all Google Test flags. + const internal::GTestFlagSaver* const gtest_flag_saver_; + + // Often a user mis-spells SetUp() as Setup() and spends a long time + // wondering why it is never called by Google Test. The declaration of + // the following method is solely for catching such an error at + // compile time: + // + // - The return type is deliberately chosen to be not void, so it + // will be a conflict if a user declares void Setup() in his test + // fixture. + // + // - This method is private, so it will be another compiler error + // if a user calls it from his test fixture. + // + // DO NOT OVERRIDE THIS FUNCTION. + // + // If you see an error about overriding the following function or + // about it being private, you have mis-spelled SetUp() as Setup(). + struct Setup_should_be_spelled_SetUp {}; + virtual Setup_should_be_spelled_SetUp* Setup() { return NULL; } + + // We disallow copying Tests. + GTEST_DISALLOW_COPY_AND_ASSIGN_(Test); +}; + +typedef internal::TimeInMillis TimeInMillis; + +// A copyable object representing a user specified test property which can be +// output as a key/value string pair. +// +// Don't inherit from TestProperty as its destructor is not virtual. +class TestProperty { + public: + // C'tor. TestProperty does NOT have a default constructor. + // Always use this constructor (with parameters) to create a + // TestProperty object. + TestProperty(const std::string& a_key, const std::string& a_value) : + key_(a_key), value_(a_value) { + } + + // Gets the user supplied key. + const char* key() const { + return key_.c_str(); + } + + // Gets the user supplied value. + const char* value() const { + return value_.c_str(); + } + + // Sets a new value, overriding the one supplied in the constructor. + void SetValue(const std::string& new_value) { + value_ = new_value; + } + + private: + // The key supplied by the user. + std::string key_; + // The value supplied by the user. + std::string value_; +}; + +// The result of a single Test. This includes a list of +// TestPartResults, a list of TestProperties, a count of how many +// death tests there are in the Test, and how much time it took to run +// the Test. +// +// TestResult is not copyable. +class GTEST_API_ TestResult { + public: + // Creates an empty TestResult. + TestResult(); + + // D'tor. Do not inherit from TestResult. + ~TestResult(); + + // Gets the number of all test parts. This is the sum of the number + // of successful test parts and the number of failed test parts. + int total_part_count() const; + + // Returns the number of the test properties. + int test_property_count() const; + + // Returns true iff the test passed (i.e. no test part failed). + bool Passed() const { return !Failed(); } + + // Returns true iff the test failed. + bool Failed() const; + + // Returns true iff the test fatally failed. + bool HasFatalFailure() const; + + // Returns true iff the test has a non-fatal failure. + bool HasNonfatalFailure() const; + + // Returns the elapsed time, in milliseconds. + TimeInMillis elapsed_time() const { return elapsed_time_; } + + // Returns the i-th test part result among all the results. i can range + // from 0 to test_property_count() - 1. If i is not in that range, aborts + // the program. + const TestPartResult& GetTestPartResult(int i) const; + + // Returns the i-th test property. i can range from 0 to + // test_property_count() - 1. If i is not in that range, aborts the + // program. + const TestProperty& GetTestProperty(int i) const; + + private: + friend class TestInfo; + friend class TestCase; + friend class UnitTest; + friend class internal::DefaultGlobalTestPartResultReporter; + friend class internal::ExecDeathTest; + friend class internal::TestResultAccessor; + friend class internal::UnitTestImpl; + friend class internal::WindowsDeathTest; + + // Gets the vector of TestPartResults. + const std::vector& test_part_results() const { + return test_part_results_; + } + + // Gets the vector of TestProperties. + const std::vector& test_properties() const { + return test_properties_; + } + + // Sets the elapsed time. + void set_elapsed_time(TimeInMillis elapsed) { elapsed_time_ = elapsed; } + + // Adds a test property to the list. The property is validated and may add + // a non-fatal failure if invalid (e.g., if it conflicts with reserved + // key names). If a property is already recorded for the same key, the + // value will be updated, rather than storing multiple values for the same + // key. xml_element specifies the element for which the property is being + // recorded and is used for validation. + void RecordProperty(const std::string& xml_element, + const TestProperty& test_property); + + // Adds a failure if the key is a reserved attribute of Google Test + // testcase tags. Returns true if the property is valid. + // TODO(russr): Validate attribute names are legal and human readable. + static bool ValidateTestProperty(const std::string& xml_element, + const TestProperty& test_property); + + // Adds a test part result to the list. + void AddTestPartResult(const TestPartResult& test_part_result); + + // Returns the death test count. + int death_test_count() const { return death_test_count_; } + + // Increments the death test count, returning the new count. + int increment_death_test_count() { return ++death_test_count_; } + + // Clears the test part results. + void ClearTestPartResults(); + + // Clears the object. + void Clear(); + + // Protects mutable state of the property vector and of owned + // properties, whose values may be updated. + internal::Mutex test_properites_mutex_; + + // The vector of TestPartResults + std::vector test_part_results_; + // The vector of TestProperties + std::vector test_properties_; + // Running count of death tests. + int death_test_count_; + // The elapsed time, in milliseconds. + TimeInMillis elapsed_time_; + + // We disallow copying TestResult. + GTEST_DISALLOW_COPY_AND_ASSIGN_(TestResult); +}; // class TestResult + +// A TestInfo object stores the following information about a test: +// +// Test case name +// Test name +// Whether the test should be run +// A function pointer that creates the test object when invoked +// Test result +// +// The constructor of TestInfo registers itself with the UnitTest +// singleton such that the RUN_ALL_TESTS() macro knows which tests to +// run. +class GTEST_API_ TestInfo { + public: + // Destructs a TestInfo object. This function is not virtual, so + // don't inherit from TestInfo. + ~TestInfo(); + + // Returns the test case name. + const char* test_case_name() const { return test_case_name_.c_str(); } + + // Returns the test name. + const char* name() const { return name_.c_str(); } + + // Returns the name of the parameter type, or NULL if this is not a typed + // or a type-parameterized test. + const char* type_param() const { + if (type_param_.get() != NULL) + return type_param_->c_str(); + return NULL; + } + + // Returns the text representation of the value parameter, or NULL if this + // is not a value-parameterized test. + const char* value_param() const { + if (value_param_.get() != NULL) + return value_param_->c_str(); + return NULL; + } + + // Returns true if this test should run, that is if the test is not + // disabled (or it is disabled but the also_run_disabled_tests flag has + // been specified) and its full name matches the user-specified filter. + // + // Google Test allows the user to filter the tests by their full names. + // The full name of a test Bar in test case Foo is defined as + // "Foo.Bar". Only the tests that match the filter will run. + // + // A filter is a colon-separated list of glob (not regex) patterns, + // optionally followed by a '-' and a colon-separated list of + // negative patterns (tests to exclude). A test is run if it + // matches one of the positive patterns and does not match any of + // the negative patterns. + // + // For example, *A*:Foo.* is a filter that matches any string that + // contains the character 'A' or starts with "Foo.". + bool should_run() const { return should_run_; } + + // Returns true iff this test will appear in the XML report. + bool is_reportable() const { + // For now, the XML report includes all tests matching the filter. + // In the future, we may trim tests that are excluded because of + // sharding. + return matches_filter_; + } + + // Returns the result of the test. + const TestResult* result() const { return &result_; } + + private: +#if GTEST_HAS_DEATH_TEST + friend class internal::DefaultDeathTestFactory; +#endif // GTEST_HAS_DEATH_TEST + friend class Test; + friend class TestCase; + friend class internal::UnitTestImpl; + friend class internal::StreamingListenerTest; + friend TestInfo* internal::MakeAndRegisterTestInfo( + const char* test_case_name, + const char* name, + const char* type_param, + const char* value_param, + internal::TypeId fixture_class_id, + Test::SetUpTestCaseFunc set_up_tc, + Test::TearDownTestCaseFunc tear_down_tc, + internal::TestFactoryBase* factory); + + // Constructs a TestInfo object. The newly constructed instance assumes + // ownership of the factory object. + TestInfo(const std::string& test_case_name, + const std::string& name, + const char* a_type_param, // NULL if not a type-parameterized test + const char* a_value_param, // NULL if not a value-parameterized test + internal::TypeId fixture_class_id, + internal::TestFactoryBase* factory); + + // Increments the number of death tests encountered in this test so + // far. + int increment_death_test_count() { + return result_.increment_death_test_count(); + } + + // Creates the test object, runs it, records its result, and then + // deletes it. + void Run(); + + static void ClearTestResult(TestInfo* test_info) { + test_info->result_.Clear(); + } + + // These fields are immutable properties of the test. + const std::string test_case_name_; // Test case name + const std::string name_; // Test name + // Name of the parameter type, or NULL if this is not a typed or a + // type-parameterized test. + const internal::scoped_ptr type_param_; + // Text representation of the value parameter, or NULL if this is not a + // value-parameterized test. + const internal::scoped_ptr value_param_; + const internal::TypeId fixture_class_id_; // ID of the test fixture class + bool should_run_; // True iff this test should run + bool is_disabled_; // True iff this test is disabled + bool matches_filter_; // True if this test matches the + // user-specified filter. + internal::TestFactoryBase* const factory_; // The factory that creates + // the test object + + // This field is mutable and needs to be reset before running the + // test for the second time. + TestResult result_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(TestInfo); +}; + +// A test case, which consists of a vector of TestInfos. +// +// TestCase is not copyable. +class GTEST_API_ TestCase { + public: + // Creates a TestCase with the given name. + // + // TestCase does NOT have a default constructor. Always use this + // constructor to create a TestCase object. + // + // Arguments: + // + // name: name of the test case + // a_type_param: the name of the test's type parameter, or NULL if + // this is not a type-parameterized test. + // set_up_tc: pointer to the function that sets up the test case + // tear_down_tc: pointer to the function that tears down the test case + TestCase(const char* name, const char* a_type_param, + Test::SetUpTestCaseFunc set_up_tc, + Test::TearDownTestCaseFunc tear_down_tc); + + // Destructor of TestCase. + virtual ~TestCase(); + + // Gets the name of the TestCase. + const char* name() const { return name_.c_str(); } + + // Returns the name of the parameter type, or NULL if this is not a + // type-parameterized test case. + const char* type_param() const { + if (type_param_.get() != NULL) + return type_param_->c_str(); + return NULL; + } + + // Returns true if any test in this test case should run. + bool should_run() const { return should_run_; } + + // Gets the number of successful tests in this test case. + int successful_test_count() const; + + // Gets the number of failed tests in this test case. + int failed_test_count() const; + + // Gets the number of disabled tests that will be reported in the XML report. + int reportable_disabled_test_count() const; + + // Gets the number of disabled tests in this test case. + int disabled_test_count() const; + + // Gets the number of tests to be printed in the XML report. + int reportable_test_count() const; + + // Get the number of tests in this test case that should run. + int test_to_run_count() const; + + // Gets the number of all tests in this test case. + int total_test_count() const; + + // Returns true iff the test case passed. + bool Passed() const { return !Failed(); } + + // Returns true iff the test case failed. + bool Failed() const { return failed_test_count() > 0; } + + // Returns the elapsed time, in milliseconds. + TimeInMillis elapsed_time() const { return elapsed_time_; } + + // Returns the i-th test among all the tests. i can range from 0 to + // total_test_count() - 1. If i is not in that range, returns NULL. + const TestInfo* GetTestInfo(int i) const; + + // Returns the TestResult that holds test properties recorded during + // execution of SetUpTestCase and TearDownTestCase. + const TestResult& ad_hoc_test_result() const { return ad_hoc_test_result_; } + + private: + friend class Test; + friend class internal::UnitTestImpl; + + // Gets the (mutable) vector of TestInfos in this TestCase. + std::vector& test_info_list() { return test_info_list_; } + + // Gets the (immutable) vector of TestInfos in this TestCase. + const std::vector& test_info_list() const { + return test_info_list_; + } + + // Returns the i-th test among all the tests. i can range from 0 to + // total_test_count() - 1. If i is not in that range, returns NULL. + TestInfo* GetMutableTestInfo(int i); + + // Sets the should_run member. + void set_should_run(bool should) { should_run_ = should; } + + // Adds a TestInfo to this test case. Will delete the TestInfo upon + // destruction of the TestCase object. + void AddTestInfo(TestInfo * test_info); + + // Clears the results of all tests in this test case. + void ClearResult(); + + // Clears the results of all tests in the given test case. + static void ClearTestCaseResult(TestCase* test_case) { + test_case->ClearResult(); + } + + // Runs every test in this TestCase. + void Run(); + + // Runs SetUpTestCase() for this TestCase. This wrapper is needed + // for catching exceptions thrown from SetUpTestCase(). + void RunSetUpTestCase() { (*set_up_tc_)(); } + + // Runs TearDownTestCase() for this TestCase. This wrapper is + // needed for catching exceptions thrown from TearDownTestCase(). + void RunTearDownTestCase() { (*tear_down_tc_)(); } + + // Returns true iff test passed. + static bool TestPassed(const TestInfo* test_info) { + return test_info->should_run() && test_info->result()->Passed(); + } + + // Returns true iff test failed. + static bool TestFailed(const TestInfo* test_info) { + return test_info->should_run() && test_info->result()->Failed(); + } + + // Returns true iff the test is disabled and will be reported in the XML + // report. + static bool TestReportableDisabled(const TestInfo* test_info) { + return test_info->is_reportable() && test_info->is_disabled_; + } + + // Returns true iff test is disabled. + static bool TestDisabled(const TestInfo* test_info) { + return test_info->is_disabled_; + } + + // Returns true iff this test will appear in the XML report. + static bool TestReportable(const TestInfo* test_info) { + return test_info->is_reportable(); + } + + // Returns true if the given test should run. + static bool ShouldRunTest(const TestInfo* test_info) { + return test_info->should_run(); + } + + // Shuffles the tests in this test case. + void ShuffleTests(internal::Random* random); + + // Restores the test order to before the first shuffle. + void UnshuffleTests(); + + // Name of the test case. + std::string name_; + // Name of the parameter type, or NULL if this is not a typed or a + // type-parameterized test. + const internal::scoped_ptr type_param_; + // The vector of TestInfos in their original order. It owns the + // elements in the vector. + std::vector test_info_list_; + // Provides a level of indirection for the test list to allow easy + // shuffling and restoring the test order. The i-th element in this + // vector is the index of the i-th test in the shuffled test list. + std::vector test_indices_; + // Pointer to the function that sets up the test case. + Test::SetUpTestCaseFunc set_up_tc_; + // Pointer to the function that tears down the test case. + Test::TearDownTestCaseFunc tear_down_tc_; + // True iff any test in this test case should run. + bool should_run_; + // Elapsed time, in milliseconds. + TimeInMillis elapsed_time_; + // Holds test properties recorded during execution of SetUpTestCase and + // TearDownTestCase. + TestResult ad_hoc_test_result_; + + // We disallow copying TestCases. + GTEST_DISALLOW_COPY_AND_ASSIGN_(TestCase); +}; + +// An Environment object is capable of setting up and tearing down an +// environment. The user should subclass this to define his own +// environment(s). +// +// An Environment object does the set-up and tear-down in virtual +// methods SetUp() and TearDown() instead of the constructor and the +// destructor, as: +// +// 1. You cannot safely throw from a destructor. This is a problem +// as in some cases Google Test is used where exceptions are enabled, and +// we may want to implement ASSERT_* using exceptions where they are +// available. +// 2. You cannot use ASSERT_* directly in a constructor or +// destructor. +class Environment { + public: + // The d'tor is virtual as we need to subclass Environment. + virtual ~Environment() {} + + // Override this to define how to set up the environment. + virtual void SetUp() {} + + // Override this to define how to tear down the environment. + virtual void TearDown() {} + private: + // If you see an error about overriding the following function or + // about it being private, you have mis-spelled SetUp() as Setup(). + struct Setup_should_be_spelled_SetUp {}; + virtual Setup_should_be_spelled_SetUp* Setup() { return NULL; } +}; + +// The interface for tracing execution of tests. The methods are organized in +// the order the corresponding events are fired. +class TestEventListener { + public: + virtual ~TestEventListener() {} + + // Fired before any test activity starts. + virtual void OnTestProgramStart(const UnitTest& unit_test) = 0; + + // Fired before each iteration of tests starts. There may be more than + // one iteration if GTEST_FLAG(repeat) is set. iteration is the iteration + // index, starting from 0. + virtual void OnTestIterationStart(const UnitTest& unit_test, + int iteration) = 0; + + // Fired before environment set-up for each iteration of tests starts. + virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test) = 0; + + // Fired after environment set-up for each iteration of tests ends. + virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test) = 0; + + // Fired before the test case starts. + virtual void OnTestCaseStart(const TestCase& test_case) = 0; + + // Fired before the test starts. + virtual void OnTestStart(const TestInfo& test_info) = 0; + + // Fired after a failed assertion or a SUCCEED() invocation. + virtual void OnTestPartResult(const TestPartResult& test_part_result) = 0; + + // Fired after the test ends. + virtual void OnTestEnd(const TestInfo& test_info) = 0; + + // Fired after the test case ends. + virtual void OnTestCaseEnd(const TestCase& test_case) = 0; + + // Fired before environment tear-down for each iteration of tests starts. + virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test) = 0; + + // Fired after environment tear-down for each iteration of tests ends. + virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test) = 0; + + // Fired after each iteration of tests finishes. + virtual void OnTestIterationEnd(const UnitTest& unit_test, + int iteration) = 0; + + // Fired after all test activities have ended. + virtual void OnTestProgramEnd(const UnitTest& unit_test) = 0; +}; + +// The convenience class for users who need to override just one or two +// methods and are not concerned that a possible change to a signature of +// the methods they override will not be caught during the build. For +// comments about each method please see the definition of TestEventListener +// above. +class EmptyTestEventListener : public TestEventListener { + public: + virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {} + virtual void OnTestIterationStart(const UnitTest& /*unit_test*/, + int /*iteration*/) {} + virtual void OnEnvironmentsSetUpStart(const UnitTest& /*unit_test*/) {} + virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {} + virtual void OnTestCaseStart(const TestCase& /*test_case*/) {} + virtual void OnTestStart(const TestInfo& /*test_info*/) {} + virtual void OnTestPartResult(const TestPartResult& /*test_part_result*/) {} + virtual void OnTestEnd(const TestInfo& /*test_info*/) {} + virtual void OnTestCaseEnd(const TestCase& /*test_case*/) {} + virtual void OnEnvironmentsTearDownStart(const UnitTest& /*unit_test*/) {} + virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {} + virtual void OnTestIterationEnd(const UnitTest& /*unit_test*/, + int /*iteration*/) {} + virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {} +}; + +// TestEventListeners lets users add listeners to track events in Google Test. +class GTEST_API_ TestEventListeners { + public: + TestEventListeners(); + ~TestEventListeners(); + + // Appends an event listener to the end of the list. Google Test assumes + // the ownership of the listener (i.e. it will delete the listener when + // the test program finishes). + void Append(TestEventListener* listener); + + // Removes the given event listener from the list and returns it. It then + // becomes the caller's responsibility to delete the listener. Returns + // NULL if the listener is not found in the list. + TestEventListener* Release(TestEventListener* listener); + + // Returns the standard listener responsible for the default console + // output. Can be removed from the listeners list to shut down default + // console output. Note that removing this object from the listener list + // with Release transfers its ownership to the caller and makes this + // function return NULL the next time. + TestEventListener* default_result_printer() const { + return default_result_printer_; + } + + // Returns the standard listener responsible for the default XML output + // controlled by the --gtest_output=xml flag. Can be removed from the + // listeners list by users who want to shut down the default XML output + // controlled by this flag and substitute it with custom one. Note that + // removing this object from the listener list with Release transfers its + // ownership to the caller and makes this function return NULL the next + // time. + TestEventListener* default_xml_generator() const { + return default_xml_generator_; + } + + private: + friend class TestCase; + friend class TestInfo; + friend class internal::DefaultGlobalTestPartResultReporter; + friend class internal::NoExecDeathTest; + friend class internal::TestEventListenersAccessor; + friend class internal::UnitTestImpl; + + // Returns repeater that broadcasts the TestEventListener events to all + // subscribers. + TestEventListener* repeater(); + + // Sets the default_result_printer attribute to the provided listener. + // The listener is also added to the listener list and previous + // default_result_printer is removed from it and deleted. The listener can + // also be NULL in which case it will not be added to the list. Does + // nothing if the previous and the current listener objects are the same. + void SetDefaultResultPrinter(TestEventListener* listener); + + // Sets the default_xml_generator attribute to the provided listener. The + // listener is also added to the listener list and previous + // default_xml_generator is removed from it and deleted. The listener can + // also be NULL in which case it will not be added to the list. Does + // nothing if the previous and the current listener objects are the same. + void SetDefaultXmlGenerator(TestEventListener* listener); + + // Controls whether events will be forwarded by the repeater to the + // listeners in the list. + bool EventForwardingEnabled() const; + void SuppressEventForwarding(); + + // The actual list of listeners. + internal::TestEventRepeater* repeater_; + // Listener responsible for the standard result output. + TestEventListener* default_result_printer_; + // Listener responsible for the creation of the XML output file. + TestEventListener* default_xml_generator_; + + // We disallow copying TestEventListeners. + GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventListeners); +}; + +// A UnitTest consists of a vector of TestCases. +// +// This is a singleton class. The only instance of UnitTest is +// created when UnitTest::GetInstance() is first called. This +// instance is never deleted. +// +// UnitTest is not copyable. +// +// This class is thread-safe as long as the methods are called +// according to their specification. +class GTEST_API_ UnitTest { + public: + // Gets the singleton UnitTest object. The first time this method + // is called, a UnitTest object is constructed and returned. + // Consecutive calls will return the same object. + static UnitTest* GetInstance(); + + // Runs all tests in this UnitTest object and prints the result. + // Returns 0 if successful, or 1 otherwise. + // + // This method can only be called from the main thread. + // + // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. + int Run() GTEST_MUST_USE_RESULT_; + + // Returns the working directory when the first TEST() or TEST_F() + // was executed. The UnitTest object owns the string. + const char* original_working_dir() const; + + // Returns the TestCase object for the test that's currently running, + // or NULL if no test is running. + const TestCase* current_test_case() const + GTEST_LOCK_EXCLUDED_(mutex_); + + // Returns the TestInfo object for the test that's currently running, + // or NULL if no test is running. + const TestInfo* current_test_info() const + GTEST_LOCK_EXCLUDED_(mutex_); + + // Returns the random seed used at the start of the current test run. + int random_seed() const; + +#if GTEST_HAS_PARAM_TEST + // Returns the ParameterizedTestCaseRegistry object used to keep track of + // value-parameterized tests and instantiate and register them. + // + // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. + internal::ParameterizedTestCaseRegistry& parameterized_test_registry() + GTEST_LOCK_EXCLUDED_(mutex_); +#endif // GTEST_HAS_PARAM_TEST + + // Gets the number of successful test cases. + int successful_test_case_count() const; + + // Gets the number of failed test cases. + int failed_test_case_count() const; + + // Gets the number of all test cases. + int total_test_case_count() const; + + // Gets the number of all test cases that contain at least one test + // that should run. + int test_case_to_run_count() const; + + // Gets the number of successful tests. + int successful_test_count() const; + + // Gets the number of failed tests. + int failed_test_count() const; + + // Gets the number of disabled tests that will be reported in the XML report. + int reportable_disabled_test_count() const; + + // Gets the number of disabled tests. + int disabled_test_count() const; + + // Gets the number of tests to be printed in the XML report. + int reportable_test_count() const; + + // Gets the number of all tests. + int total_test_count() const; + + // Gets the number of tests that should run. + int test_to_run_count() const; + + // Gets the time of the test program start, in ms from the start of the + // UNIX epoch. + TimeInMillis start_timestamp() const; + + // Gets the elapsed time, in milliseconds. + TimeInMillis elapsed_time() const; + + // Returns true iff the unit test passed (i.e. all test cases passed). + bool Passed() const; + + // Returns true iff the unit test failed (i.e. some test case failed + // or something outside of all tests failed). + bool Failed() const; + + // Gets the i-th test case among all the test cases. i can range from 0 to + // total_test_case_count() - 1. If i is not in that range, returns NULL. + const TestCase* GetTestCase(int i) const; + + // Returns the TestResult containing information on test failures and + // properties logged outside of individual test cases. + const TestResult& ad_hoc_test_result() const; + + // Returns the list of event listeners that can be used to track events + // inside Google Test. + TestEventListeners& listeners(); + + private: + // Registers and returns a global test environment. When a test + // program is run, all global test environments will be set-up in + // the order they were registered. After all tests in the program + // have finished, all global test environments will be torn-down in + // the *reverse* order they were registered. + // + // The UnitTest object takes ownership of the given environment. + // + // This method can only be called from the main thread. + Environment* AddEnvironment(Environment* env); + + // Adds a TestPartResult to the current TestResult object. All + // Google Test assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) + // eventually call this to report their results. The user code + // should use the assertion macros instead of calling this directly. + void AddTestPartResult(TestPartResult::Type result_type, + const char* file_name, + int line_number, + const std::string& message, + const std::string& os_stack_trace) + GTEST_LOCK_EXCLUDED_(mutex_); + + // Adds a TestProperty to the current TestResult object when invoked from + // inside a test, to current TestCase's ad_hoc_test_result_ when invoked + // from SetUpTestCase or TearDownTestCase, or to the global property set + // when invoked elsewhere. If the result already contains a property with + // the same key, the value will be updated. + void RecordProperty(const std::string& key, const std::string& value); + + // Gets the i-th test case among all the test cases. i can range from 0 to + // total_test_case_count() - 1. If i is not in that range, returns NULL. + TestCase* GetMutableTestCase(int i); + + // Accessors for the implementation object. + internal::UnitTestImpl* impl() { return impl_; } + const internal::UnitTestImpl* impl() const { return impl_; } + + // These classes and funcions are friends as they need to access private + // members of UnitTest. + friend class Test; + friend class internal::AssertHelper; + friend class internal::ScopedTrace; + friend class internal::StreamingListenerTest; + friend class internal::UnitTestRecordPropertyTestHelper; + friend Environment* AddGlobalTestEnvironment(Environment* env); + friend internal::UnitTestImpl* internal::GetUnitTestImpl(); + friend void internal::ReportFailureInUnknownLocation( + TestPartResult::Type result_type, + const std::string& message); + + // Creates an empty UnitTest. + UnitTest(); + + // D'tor + virtual ~UnitTest(); + + // Pushes a trace defined by SCOPED_TRACE() on to the per-thread + // Google Test trace stack. + void PushGTestTrace(const internal::TraceInfo& trace) + GTEST_LOCK_EXCLUDED_(mutex_); + + // Pops a trace from the per-thread Google Test trace stack. + void PopGTestTrace() + GTEST_LOCK_EXCLUDED_(mutex_); + + // Protects mutable state in *impl_. This is mutable as some const + // methods need to lock it too. + mutable internal::Mutex mutex_; + + // Opaque implementation object. This field is never changed once + // the object is constructed. We don't mark it as const here, as + // doing so will cause a warning in the constructor of UnitTest. + // Mutable state in *impl_ is protected by mutex_. + internal::UnitTestImpl* impl_; + + // We disallow copying UnitTest. + GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTest); +}; + +// A convenient wrapper for adding an environment for the test +// program. +// +// You should call this before RUN_ALL_TESTS() is called, probably in +// main(). If you use gtest_main, you need to call this before main() +// starts for it to take effect. For example, you can define a global +// variable like this: +// +// testing::Environment* const foo_env = +// testing::AddGlobalTestEnvironment(new FooEnvironment); +// +// However, we strongly recommend you to write your own main() and +// call AddGlobalTestEnvironment() there, as relying on initialization +// of global variables makes the code harder to read and may cause +// problems when you register multiple environments from different +// translation units and the environments have dependencies among them +// (remember that the compiler doesn't guarantee the order in which +// global variables from different translation units are initialized). +inline Environment* AddGlobalTestEnvironment(Environment* env) { + return UnitTest::GetInstance()->AddEnvironment(env); +} + +// Initializes Google Test. This must be called before calling +// RUN_ALL_TESTS(). In particular, it parses a command line for the +// flags that Google Test recognizes. Whenever a Google Test flag is +// seen, it is removed from argv, and *argc is decremented. +// +// No value is returned. Instead, the Google Test flag variables are +// updated. +// +// Calling the function for the second time has no user-visible effect. +GTEST_API_ void InitGoogleTest(int* argc, char** argv); + +// This overloaded version can be used in Windows programs compiled in +// UNICODE mode. +GTEST_API_ void InitGoogleTest(int* argc, wchar_t** argv); + +namespace internal { + +// FormatForComparison::Format(value) formats a +// value of type ToPrint that is an operand of a comparison assertion +// (e.g. ASSERT_EQ). OtherOperand is the type of the other operand in +// the comparison, and is used to help determine the best way to +// format the value. In particular, when the value is a C string +// (char pointer) and the other operand is an STL string object, we +// want to format the C string as a string, since we know it is +// compared by value with the string object. If the value is a char +// pointer but the other operand is not an STL string object, we don't +// know whether the pointer is supposed to point to a NUL-terminated +// string, and thus want to print it as a pointer to be safe. +// +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. + +// The default case. +template +class FormatForComparison { + public: + static ::std::string Format(const ToPrint& value) { + return ::testing::PrintToString(value); + } +}; + +// Array. +template +class FormatForComparison { + public: + static ::std::string Format(const ToPrint* value) { + return FormatForComparison::Format(value); + } +}; + +// By default, print C string as pointers to be safe, as we don't know +// whether they actually point to a NUL-terminated string. + +#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType) \ + template \ + class FormatForComparison { \ + public: \ + static ::std::string Format(CharType* value) { \ + return ::testing::PrintToString(static_cast(value)); \ + } \ + } + +GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char); +GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char); +GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t); +GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t); + +#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_ + +// If a C string is compared with an STL string object, we know it's meant +// to point to a NUL-terminated string, and thus can print it as a string. + +#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \ + template <> \ + class FormatForComparison { \ + public: \ + static ::std::string Format(CharType* value) { \ + return ::testing::PrintToString(value); \ + } \ + } + +GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string); +GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string); + +#if GTEST_HAS_GLOBAL_STRING +GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::string); +GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::string); +#endif + +#if GTEST_HAS_GLOBAL_WSTRING +GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::wstring); +GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::wstring); +#endif + +#if GTEST_HAS_STD_WSTRING +GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring); +GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring); +#endif + +#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_ + +// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc) +// operand to be used in a failure message. The type (but not value) +// of the other operand may affect the format. This allows us to +// print a char* as a raw pointer when it is compared against another +// char* or void*, and print it as a C string when it is compared +// against an std::string object, for example. +// +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +template +std::string FormatForComparisonFailureMessage( + const T1& value, const T2& /* other_operand */) { + return FormatForComparison::Format(value); +} + +// The helper function for {ASSERT|EXPECT}_EQ. +template +AssertionResult CmpHelperEQ(const char* expected_expression, + const char* actual_expression, + const T1& expected, + const T2& actual) { +#ifdef _MSC_VER +# pragma warning(push) // Saves the current warning state. +# pragma warning(disable:4389) // Temporarily disables warning on + // signed/unsigned mismatch. +#endif + + if (expected == actual) { + return AssertionSuccess(); + } + +#ifdef _MSC_VER +# pragma warning(pop) // Restores the warning state. +#endif + + return EqFailure(expected_expression, + actual_expression, + FormatForComparisonFailureMessage(expected, actual), + FormatForComparisonFailureMessage(actual, expected), + false); +} + +// With this overloaded version, we allow anonymous enums to be used +// in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous enums +// can be implicitly cast to BiggestInt. +GTEST_API_ AssertionResult CmpHelperEQ(const char* expected_expression, + const char* actual_expression, + BiggestInt expected, + BiggestInt actual); + +// The helper class for {ASSERT|EXPECT}_EQ. The template argument +// lhs_is_null_literal is true iff the first argument to ASSERT_EQ() +// is a null pointer literal. The following default implementation is +// for lhs_is_null_literal being false. +template +class EqHelper { + public: + // This templatized version is for the general case. + template + static AssertionResult Compare(const char* expected_expression, + const char* actual_expression, + const T1& expected, + const T2& actual) { + return CmpHelperEQ(expected_expression, actual_expression, expected, + actual); + } + + // With this overloaded version, we allow anonymous enums to be used + // in {ASSERT|EXPECT}_EQ when compiled with gcc 4, as anonymous + // enums can be implicitly cast to BiggestInt. + // + // Even though its body looks the same as the above version, we + // cannot merge the two, as it will make anonymous enums unhappy. + static AssertionResult Compare(const char* expected_expression, + const char* actual_expression, + BiggestInt expected, + BiggestInt actual) { + return CmpHelperEQ(expected_expression, actual_expression, expected, + actual); + } +}; + +// This specialization is used when the first argument to ASSERT_EQ() +// is a null pointer literal, like NULL, false, or 0. +template <> +class EqHelper { + public: + // We define two overloaded versions of Compare(). The first + // version will be picked when the second argument to ASSERT_EQ() is + // NOT a pointer, e.g. ASSERT_EQ(0, AnIntFunction()) or + // EXPECT_EQ(false, a_bool). + template + static AssertionResult Compare( + const char* expected_expression, + const char* actual_expression, + const T1& expected, + const T2& actual, + // The following line prevents this overload from being considered if T2 + // is not a pointer type. We need this because ASSERT_EQ(NULL, my_ptr) + // expands to Compare("", "", NULL, my_ptr), which requires a conversion + // to match the Secret* in the other overload, which would otherwise make + // this template match better. + typename EnableIf::value>::type* = 0) { + return CmpHelperEQ(expected_expression, actual_expression, expected, + actual); + } + + // This version will be picked when the second argument to ASSERT_EQ() is a + // pointer, e.g. ASSERT_EQ(NULL, a_pointer). + template + static AssertionResult Compare( + const char* expected_expression, + const char* actual_expression, + // We used to have a second template parameter instead of Secret*. That + // template parameter would deduce to 'long', making this a better match + // than the first overload even without the first overload's EnableIf. + // Unfortunately, gcc with -Wconversion-null warns when "passing NULL to + // non-pointer argument" (even a deduced integral argument), so the old + // implementation caused warnings in user code. + Secret* /* expected (NULL) */, + T* actual) { + // We already know that 'expected' is a null pointer. + return CmpHelperEQ(expected_expression, actual_expression, + static_cast(NULL), actual); + } +}; + +// A macro for implementing the helper functions needed to implement +// ASSERT_?? and EXPECT_??. It is here just to avoid copy-and-paste +// of similar code. +// +// For each templatized helper function, we also define an overloaded +// version for BiggestInt in order to reduce code bloat and allow +// anonymous enums to be used with {ASSERT|EXPECT}_?? when compiled +// with gcc 4. +// +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +#define GTEST_IMPL_CMP_HELPER_(op_name, op)\ +template \ +AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \ + const T1& val1, const T2& val2) {\ + if (val1 op val2) {\ + return AssertionSuccess();\ + } else {\ + return AssertionFailure() \ + << "Expected: (" << expr1 << ") " #op " (" << expr2\ + << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\ + << " vs " << FormatForComparisonFailureMessage(val2, val1);\ + }\ +}\ +GTEST_API_ AssertionResult CmpHelper##op_name(\ + const char* expr1, const char* expr2, BiggestInt val1, BiggestInt val2) + +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. + +// Implements the helper function for {ASSERT|EXPECT}_NE +GTEST_IMPL_CMP_HELPER_(NE, !=); +// Implements the helper function for {ASSERT|EXPECT}_LE +GTEST_IMPL_CMP_HELPER_(LE, <=); +// Implements the helper function for {ASSERT|EXPECT}_LT +GTEST_IMPL_CMP_HELPER_(LT, <); +// Implements the helper function for {ASSERT|EXPECT}_GE +GTEST_IMPL_CMP_HELPER_(GE, >=); +// Implements the helper function for {ASSERT|EXPECT}_GT +GTEST_IMPL_CMP_HELPER_(GT, >); + +#undef GTEST_IMPL_CMP_HELPER_ + +// The helper function for {ASSERT|EXPECT}_STREQ. +// +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +GTEST_API_ AssertionResult CmpHelperSTREQ(const char* expected_expression, + const char* actual_expression, + const char* expected, + const char* actual); + +// The helper function for {ASSERT|EXPECT}_STRCASEEQ. +// +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +GTEST_API_ AssertionResult CmpHelperSTRCASEEQ(const char* expected_expression, + const char* actual_expression, + const char* expected, + const char* actual); + +// The helper function for {ASSERT|EXPECT}_STRNE. +// +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression, + const char* s2_expression, + const char* s1, + const char* s2); + +// The helper function for {ASSERT|EXPECT}_STRCASENE. +// +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +GTEST_API_ AssertionResult CmpHelperSTRCASENE(const char* s1_expression, + const char* s2_expression, + const char* s1, + const char* s2); + + +// Helper function for *_STREQ on wide strings. +// +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +GTEST_API_ AssertionResult CmpHelperSTREQ(const char* expected_expression, + const char* actual_expression, + const wchar_t* expected, + const wchar_t* actual); + +// Helper function for *_STRNE on wide strings. +// +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +GTEST_API_ AssertionResult CmpHelperSTRNE(const char* s1_expression, + const char* s2_expression, + const wchar_t* s1, + const wchar_t* s2); + +} // namespace internal + +// IsSubstring() and IsNotSubstring() are intended to be used as the +// first argument to {EXPECT,ASSERT}_PRED_FORMAT2(), not by +// themselves. They check whether needle is a substring of haystack +// (NULL is considered a substring of itself only), and return an +// appropriate error message when they fail. +// +// The {needle,haystack}_expr arguments are the stringified +// expressions that generated the two real arguments. +GTEST_API_ AssertionResult IsSubstring( + const char* needle_expr, const char* haystack_expr, + const char* needle, const char* haystack); +GTEST_API_ AssertionResult IsSubstring( + const char* needle_expr, const char* haystack_expr, + const wchar_t* needle, const wchar_t* haystack); +GTEST_API_ AssertionResult IsNotSubstring( + const char* needle_expr, const char* haystack_expr, + const char* needle, const char* haystack); +GTEST_API_ AssertionResult IsNotSubstring( + const char* needle_expr, const char* haystack_expr, + const wchar_t* needle, const wchar_t* haystack); +GTEST_API_ AssertionResult IsSubstring( + const char* needle_expr, const char* haystack_expr, + const ::std::string& needle, const ::std::string& haystack); +GTEST_API_ AssertionResult IsNotSubstring( + const char* needle_expr, const char* haystack_expr, + const ::std::string& needle, const ::std::string& haystack); + +#if GTEST_HAS_STD_WSTRING +GTEST_API_ AssertionResult IsSubstring( + const char* needle_expr, const char* haystack_expr, + const ::std::wstring& needle, const ::std::wstring& haystack); +GTEST_API_ AssertionResult IsNotSubstring( + const char* needle_expr, const char* haystack_expr, + const ::std::wstring& needle, const ::std::wstring& haystack); +#endif // GTEST_HAS_STD_WSTRING + +namespace internal { + +// Helper template function for comparing floating-points. +// +// Template parameter: +// +// RawType: the raw floating-point type (either float or double) +// +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +template +AssertionResult CmpHelperFloatingPointEQ(const char* expected_expression, + const char* actual_expression, + RawType expected, + RawType actual) { + const FloatingPoint lhs(expected), rhs(actual); + + if (lhs.AlmostEquals(rhs)) { + return AssertionSuccess(); + } + + ::std::stringstream expected_ss; + expected_ss << std::setprecision(std::numeric_limits::digits10 + 2) + << expected; + + ::std::stringstream actual_ss; + actual_ss << std::setprecision(std::numeric_limits::digits10 + 2) + << actual; + + return EqFailure(expected_expression, + actual_expression, + StringStreamToString(&expected_ss), + StringStreamToString(&actual_ss), + false); +} + +// Helper function for implementing ASSERT_NEAR. +// +// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM. +GTEST_API_ AssertionResult DoubleNearPredFormat(const char* expr1, + const char* expr2, + const char* abs_error_expr, + double val1, + double val2, + double abs_error); + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// A class that enables one to stream messages to assertion macros +class GTEST_API_ AssertHelper { + public: + // Constructor. + AssertHelper(TestPartResult::Type type, + const char* file, + int line, + const char* message); + ~AssertHelper(); + + // Message assignment is a semantic trick to enable assertion + // streaming; see the GTEST_MESSAGE_ macro below. + void operator=(const Message& message) const; + + private: + // We put our data in a struct so that the size of the AssertHelper class can + // be as small as possible. This is important because gcc is incapable of + // re-using stack space even for temporary variables, so every EXPECT_EQ + // reserves stack space for another AssertHelper. + struct AssertHelperData { + AssertHelperData(TestPartResult::Type t, + const char* srcfile, + int line_num, + const char* msg) + : type(t), file(srcfile), line(line_num), message(msg) { } + + TestPartResult::Type const type; + const char* const file; + int const line; + std::string const message; + + private: + GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelperData); + }; + + AssertHelperData* const data_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper); +}; + +} // namespace internal + +#if GTEST_HAS_PARAM_TEST +// The pure interface class that all value-parameterized tests inherit from. +// A value-parameterized class must inherit from both ::testing::Test and +// ::testing::WithParamInterface. In most cases that just means inheriting +// from ::testing::TestWithParam, but more complicated test hierarchies +// may need to inherit from Test and WithParamInterface at different levels. +// +// This interface has support for accessing the test parameter value via +// the GetParam() method. +// +// Use it with one of the parameter generator defining functions, like Range(), +// Values(), ValuesIn(), Bool(), and Combine(). +// +// class FooTest : public ::testing::TestWithParam { +// protected: +// FooTest() { +// // Can use GetParam() here. +// } +// virtual ~FooTest() { +// // Can use GetParam() here. +// } +// virtual void SetUp() { +// // Can use GetParam() here. +// } +// virtual void TearDown { +// // Can use GetParam() here. +// } +// }; +// TEST_P(FooTest, DoesBar) { +// // Can use GetParam() method here. +// Foo foo; +// ASSERT_TRUE(foo.DoesBar(GetParam())); +// } +// INSTANTIATE_TEST_CASE_P(OneToTenRange, FooTest, ::testing::Range(1, 10)); + +template +class WithParamInterface { + public: + typedef T ParamType; + virtual ~WithParamInterface() {} + + // The current parameter value. Is also available in the test fixture's + // constructor. This member function is non-static, even though it only + // references static data, to reduce the opportunity for incorrect uses + // like writing 'WithParamInterface::GetParam()' for a test that + // uses a fixture whose parameter type is int. + const ParamType& GetParam() const { + GTEST_CHECK_(parameter_ != NULL) + << "GetParam() can only be called inside a value-parameterized test " + << "-- did you intend to write TEST_P instead of TEST_F?"; + return *parameter_; + } + + private: + // Sets parameter value. The caller is responsible for making sure the value + // remains alive and unchanged throughout the current test. + static void SetParam(const ParamType* parameter) { + parameter_ = parameter; + } + + // Static value used for accessing parameter during a test lifetime. + static const ParamType* parameter_; + + // TestClass must be a subclass of WithParamInterface and Test. + template friend class internal::ParameterizedTestFactory; +}; + +template +const T* WithParamInterface::parameter_ = NULL; + +// Most value-parameterized classes can ignore the existence of +// WithParamInterface, and can just inherit from ::testing::TestWithParam. + +template +class TestWithParam : public Test, public WithParamInterface { +}; + +#endif // GTEST_HAS_PARAM_TEST + +// Macros for indicating success/failure in test code. + +// ADD_FAILURE unconditionally adds a failure to the current test. +// SUCCEED generates a success - it doesn't automatically make the +// current test successful, as a test is only successful when it has +// no failure. +// +// EXPECT_* verifies that a certain condition is satisfied. If not, +// it behaves like ADD_FAILURE. In particular: +// +// EXPECT_TRUE verifies that a Boolean condition is true. +// EXPECT_FALSE verifies that a Boolean condition is false. +// +// FAIL and ASSERT_* are similar to ADD_FAILURE and EXPECT_*, except +// that they will also abort the current function on failure. People +// usually want the fail-fast behavior of FAIL and ASSERT_*, but those +// writing data-driven tests often find themselves using ADD_FAILURE +// and EXPECT_* more. + +// Generates a nonfatal failure with a generic message. +#define ADD_FAILURE() GTEST_NONFATAL_FAILURE_("Failed") + +// Generates a nonfatal failure at the given source file location with +// a generic message. +#define ADD_FAILURE_AT(file, line) \ + GTEST_MESSAGE_AT_(file, line, "Failed", \ + ::testing::TestPartResult::kNonFatalFailure) + +// Generates a fatal failure with a generic message. +#define GTEST_FAIL() GTEST_FATAL_FAILURE_("Failed") + +// Define this macro to 1 to omit the definition of FAIL(), which is a +// generic name and clashes with some other libraries. +#if !GTEST_DONT_DEFINE_FAIL +# define FAIL() GTEST_FAIL() +#endif + +// Generates a success with a generic message. +#define GTEST_SUCCEED() GTEST_SUCCESS_("Succeeded") + +// Define this macro to 1 to omit the definition of SUCCEED(), which +// is a generic name and clashes with some other libraries. +#if !GTEST_DONT_DEFINE_SUCCEED +# define SUCCEED() GTEST_SUCCEED() +#endif + +// Macros for testing exceptions. +// +// * {ASSERT|EXPECT}_THROW(statement, expected_exception): +// Tests that the statement throws the expected exception. +// * {ASSERT|EXPECT}_NO_THROW(statement): +// Tests that the statement doesn't throw any exception. +// * {ASSERT|EXPECT}_ANY_THROW(statement): +// Tests that the statement throws an exception. + +#define EXPECT_THROW(statement, expected_exception) \ + GTEST_TEST_THROW_(statement, expected_exception, GTEST_NONFATAL_FAILURE_) +#define EXPECT_NO_THROW(statement) \ + GTEST_TEST_NO_THROW_(statement, GTEST_NONFATAL_FAILURE_) +#define EXPECT_ANY_THROW(statement) \ + GTEST_TEST_ANY_THROW_(statement, GTEST_NONFATAL_FAILURE_) +#define ASSERT_THROW(statement, expected_exception) \ + GTEST_TEST_THROW_(statement, expected_exception, GTEST_FATAL_FAILURE_) +#define ASSERT_NO_THROW(statement) \ + GTEST_TEST_NO_THROW_(statement, GTEST_FATAL_FAILURE_) +#define ASSERT_ANY_THROW(statement) \ + GTEST_TEST_ANY_THROW_(statement, GTEST_FATAL_FAILURE_) + +// Boolean assertions. Condition can be either a Boolean expression or an +// AssertionResult. For more information on how to use AssertionResult with +// these macros see comments on that class. +#define EXPECT_TRUE(condition) \ + GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \ + GTEST_NONFATAL_FAILURE_) +#define EXPECT_FALSE(condition) \ + GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ + GTEST_NONFATAL_FAILURE_) +#define ASSERT_TRUE(condition) \ + GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \ + GTEST_FATAL_FAILURE_) +#define ASSERT_FALSE(condition) \ + GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ + GTEST_FATAL_FAILURE_) + +// Includes the auto-generated header that implements a family of +// generic predicate assertion macros. +#include "gtest/gtest_pred_impl.h" + +// Macros for testing equalities and inequalities. +// +// * {ASSERT|EXPECT}_EQ(expected, actual): Tests that expected == actual +// * {ASSERT|EXPECT}_NE(v1, v2): Tests that v1 != v2 +// * {ASSERT|EXPECT}_LT(v1, v2): Tests that v1 < v2 +// * {ASSERT|EXPECT}_LE(v1, v2): Tests that v1 <= v2 +// * {ASSERT|EXPECT}_GT(v1, v2): Tests that v1 > v2 +// * {ASSERT|EXPECT}_GE(v1, v2): Tests that v1 >= v2 +// +// When they are not, Google Test prints both the tested expressions and +// their actual values. The values must be compatible built-in types, +// or you will get a compiler error. By "compatible" we mean that the +// values can be compared by the respective operator. +// +// Note: +// +// 1. It is possible to make a user-defined type work with +// {ASSERT|EXPECT}_??(), but that requires overloading the +// comparison operators and is thus discouraged by the Google C++ +// Usage Guide. Therefore, you are advised to use the +// {ASSERT|EXPECT}_TRUE() macro to assert that two objects are +// equal. +// +// 2. The {ASSERT|EXPECT}_??() macros do pointer comparisons on +// pointers (in particular, C strings). Therefore, if you use it +// with two C strings, you are testing how their locations in memory +// are related, not how their content is related. To compare two C +// strings by content, use {ASSERT|EXPECT}_STR*(). +// +// 3. {ASSERT|EXPECT}_EQ(expected, actual) is preferred to +// {ASSERT|EXPECT}_TRUE(expected == actual), as the former tells you +// what the actual value is when it fails, and similarly for the +// other comparisons. +// +// 4. Do not depend on the order in which {ASSERT|EXPECT}_??() +// evaluate their arguments, which is undefined. +// +// 5. These macros evaluate their arguments exactly once. +// +// Examples: +// +// EXPECT_NE(5, Foo()); +// EXPECT_EQ(NULL, a_pointer); +// ASSERT_LT(i, array_size); +// ASSERT_GT(records.size(), 0) << "There is no record left."; + +#define EXPECT_EQ(expected, actual) \ + EXPECT_PRED_FORMAT2(::testing::internal:: \ + EqHelper::Compare, \ + expected, actual) +#define EXPECT_NE(expected, actual) \ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, expected, actual) +#define EXPECT_LE(val1, val2) \ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2) +#define EXPECT_LT(val1, val2) \ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2) +#define EXPECT_GE(val1, val2) \ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2) +#define EXPECT_GT(val1, val2) \ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2) + +#define GTEST_ASSERT_EQ(expected, actual) \ + ASSERT_PRED_FORMAT2(::testing::internal:: \ + EqHelper::Compare, \ + expected, actual) +#define GTEST_ASSERT_NE(val1, val2) \ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2) +#define GTEST_ASSERT_LE(val1, val2) \ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2) +#define GTEST_ASSERT_LT(val1, val2) \ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2) +#define GTEST_ASSERT_GE(val1, val2) \ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2) +#define GTEST_ASSERT_GT(val1, val2) \ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2) + +// Define macro GTEST_DONT_DEFINE_ASSERT_XY to 1 to omit the definition of +// ASSERT_XY(), which clashes with some users' own code. + +#if !GTEST_DONT_DEFINE_ASSERT_EQ +# define ASSERT_EQ(val1, val2) GTEST_ASSERT_EQ(val1, val2) +#endif + +#if !GTEST_DONT_DEFINE_ASSERT_NE +# define ASSERT_NE(val1, val2) GTEST_ASSERT_NE(val1, val2) +#endif + +#if !GTEST_DONT_DEFINE_ASSERT_LE +# define ASSERT_LE(val1, val2) GTEST_ASSERT_LE(val1, val2) +#endif + +#if !GTEST_DONT_DEFINE_ASSERT_LT +# define ASSERT_LT(val1, val2) GTEST_ASSERT_LT(val1, val2) +#endif + +#if !GTEST_DONT_DEFINE_ASSERT_GE +# define ASSERT_GE(val1, val2) GTEST_ASSERT_GE(val1, val2) +#endif + +#if !GTEST_DONT_DEFINE_ASSERT_GT +# define ASSERT_GT(val1, val2) GTEST_ASSERT_GT(val1, val2) +#endif + +// C-string Comparisons. All tests treat NULL and any non-NULL string +// as different. Two NULLs are equal. +// +// * {ASSERT|EXPECT}_STREQ(s1, s2): Tests that s1 == s2 +// * {ASSERT|EXPECT}_STRNE(s1, s2): Tests that s1 != s2 +// * {ASSERT|EXPECT}_STRCASEEQ(s1, s2): Tests that s1 == s2, ignoring case +// * {ASSERT|EXPECT}_STRCASENE(s1, s2): Tests that s1 != s2, ignoring case +// +// For wide or narrow string objects, you can use the +// {ASSERT|EXPECT}_??() macros. +// +// Don't depend on the order in which the arguments are evaluated, +// which is undefined. +// +// These macros evaluate their arguments exactly once. + +#define EXPECT_STREQ(expected, actual) \ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, expected, actual) +#define EXPECT_STRNE(s1, s2) \ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2) +#define EXPECT_STRCASEEQ(expected, actual) \ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, expected, actual) +#define EXPECT_STRCASENE(s1, s2)\ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2) + +#define ASSERT_STREQ(expected, actual) \ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTREQ, expected, actual) +#define ASSERT_STRNE(s1, s2) \ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRNE, s1, s2) +#define ASSERT_STRCASEEQ(expected, actual) \ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASEEQ, expected, actual) +#define ASSERT_STRCASENE(s1, s2)\ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperSTRCASENE, s1, s2) + +// Macros for comparing floating-point numbers. +// +// * {ASSERT|EXPECT}_FLOAT_EQ(expected, actual): +// Tests that two float values are almost equal. +// * {ASSERT|EXPECT}_DOUBLE_EQ(expected, actual): +// Tests that two double values are almost equal. +// * {ASSERT|EXPECT}_NEAR(v1, v2, abs_error): +// Tests that v1 and v2 are within the given distance to each other. +// +// Google Test uses ULP-based comparison to automatically pick a default +// error bound that is appropriate for the operands. See the +// FloatingPoint template class in gtest-internal.h if you are +// interested in the implementation details. + +#define EXPECT_FLOAT_EQ(expected, actual)\ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ, \ + expected, actual) + +#define EXPECT_DOUBLE_EQ(expected, actual)\ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ, \ + expected, actual) + +#define ASSERT_FLOAT_EQ(expected, actual)\ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ, \ + expected, actual) + +#define ASSERT_DOUBLE_EQ(expected, actual)\ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperFloatingPointEQ, \ + expected, actual) + +#define EXPECT_NEAR(val1, val2, abs_error)\ + EXPECT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \ + val1, val2, abs_error) + +#define ASSERT_NEAR(val1, val2, abs_error)\ + ASSERT_PRED_FORMAT3(::testing::internal::DoubleNearPredFormat, \ + val1, val2, abs_error) + +// These predicate format functions work on floating-point values, and +// can be used in {ASSERT|EXPECT}_PRED_FORMAT2*(), e.g. +// +// EXPECT_PRED_FORMAT2(testing::DoubleLE, Foo(), 5.0); + +// Asserts that val1 is less than, or almost equal to, val2. Fails +// otherwise. In particular, it fails if either val1 or val2 is NaN. +GTEST_API_ AssertionResult FloatLE(const char* expr1, const char* expr2, + float val1, float val2); +GTEST_API_ AssertionResult DoubleLE(const char* expr1, const char* expr2, + double val1, double val2); + + +#if GTEST_OS_WINDOWS + +// Macros that test for HRESULT failure and success, these are only useful +// on Windows, and rely on Windows SDK macros and APIs to compile. +// +// * {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED}(expr) +// +// When expr unexpectedly fails or succeeds, Google Test prints the +// expected result and the actual result with both a human-readable +// string representation of the error, if available, as well as the +// hex result code. +# define EXPECT_HRESULT_SUCCEEDED(expr) \ + EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr)) + +# define ASSERT_HRESULT_SUCCEEDED(expr) \ + ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTSuccess, (expr)) + +# define EXPECT_HRESULT_FAILED(expr) \ + EXPECT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr)) + +# define ASSERT_HRESULT_FAILED(expr) \ + ASSERT_PRED_FORMAT1(::testing::internal::IsHRESULTFailure, (expr)) + +#endif // GTEST_OS_WINDOWS + +// Macros that execute statement and check that it doesn't generate new fatal +// failures in the current thread. +// +// * {ASSERT|EXPECT}_NO_FATAL_FAILURE(statement); +// +// Examples: +// +// EXPECT_NO_FATAL_FAILURE(Process()); +// ASSERT_NO_FATAL_FAILURE(Process()) << "Process() failed"; +// +#define ASSERT_NO_FATAL_FAILURE(statement) \ + GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_FATAL_FAILURE_) +#define EXPECT_NO_FATAL_FAILURE(statement) \ + GTEST_TEST_NO_FATAL_FAILURE_(statement, GTEST_NONFATAL_FAILURE_) + +// Causes a trace (including the source file path, the current line +// number, and the given message) to be included in every test failure +// message generated by code in the current scope. The effect is +// undone when the control leaves the current scope. +// +// The message argument can be anything streamable to std::ostream. +// +// In the implementation, we include the current line number as part +// of the dummy variable name, thus allowing multiple SCOPED_TRACE()s +// to appear in the same block - as long as they are on different +// lines. +#define SCOPED_TRACE(message) \ + ::testing::internal::ScopedTrace GTEST_CONCAT_TOKEN_(gtest_trace_, __LINE__)(\ + __FILE__, __LINE__, ::testing::Message() << (message)) + +// Compile-time assertion for type equality. +// StaticAssertTypeEq() compiles iff type1 and type2 are +// the same type. The value it returns is not interesting. +// +// Instead of making StaticAssertTypeEq a class template, we make it a +// function template that invokes a helper class template. This +// prevents a user from misusing StaticAssertTypeEq by +// defining objects of that type. +// +// CAVEAT: +// +// When used inside a method of a class template, +// StaticAssertTypeEq() is effective ONLY IF the method is +// instantiated. For example, given: +// +// template class Foo { +// public: +// void Bar() { testing::StaticAssertTypeEq(); } +// }; +// +// the code: +// +// void Test1() { Foo foo; } +// +// will NOT generate a compiler error, as Foo::Bar() is never +// actually instantiated. Instead, you need: +// +// void Test2() { Foo foo; foo.Bar(); } +// +// to cause a compiler error. +template +bool StaticAssertTypeEq() { + (void)internal::StaticAssertTypeEqHelper(); + return true; +} + +// Defines a test. +// +// The first parameter is the name of the test case, and the second +// parameter is the name of the test within the test case. +// +// The convention is to end the test case name with "Test". For +// example, a test case for the Foo class can be named FooTest. +// +// The user should put his test code between braces after using this +// macro. Example: +// +// TEST(FooTest, InitializesCorrectly) { +// Foo foo; +// EXPECT_TRUE(foo.StatusIsOK()); +// } + +// Note that we call GetTestTypeId() instead of GetTypeId< +// ::testing::Test>() here to get the type ID of testing::Test. This +// is to work around a suspected linker bug when using Google Test as +// a framework on Mac OS X. The bug causes GetTypeId< +// ::testing::Test>() to return different values depending on whether +// the call is from the Google Test framework itself or from user test +// code. GetTestTypeId() is guaranteed to always return the same +// value, as it always calls GetTypeId<>() from the Google Test +// framework. +#define GTEST_TEST(test_case_name, test_name)\ + GTEST_TEST_(test_case_name, test_name, \ + ::testing::Test, ::testing::internal::GetTestTypeId()) + +// Define this macro to 1 to omit the definition of TEST(), which +// is a generic name and clashes with some other libraries. +#if !GTEST_DONT_DEFINE_TEST +# define TEST(test_case_name, test_name) GTEST_TEST(test_case_name, test_name) +#endif + +// Defines a test that uses a test fixture. +// +// The first parameter is the name of the test fixture class, which +// also doubles as the test case name. The second parameter is the +// name of the test within the test case. +// +// A test fixture class must be declared earlier. The user should put +// his test code between braces after using this macro. Example: +// +// class FooTest : public testing::Test { +// protected: +// virtual void SetUp() { b_.AddElement(3); } +// +// Foo a_; +// Foo b_; +// }; +// +// TEST_F(FooTest, InitializesCorrectly) { +// EXPECT_TRUE(a_.StatusIsOK()); +// } +// +// TEST_F(FooTest, ReturnsElementCountCorrectly) { +// EXPECT_EQ(0, a_.size()); +// EXPECT_EQ(1, b_.size()); +// } + +#define TEST_F(test_fixture, test_name)\ + GTEST_TEST_(test_fixture, test_name, test_fixture, \ + ::testing::internal::GetTypeId()) + +} // namespace testing + +// Use this function in main() to run all tests. It returns 0 if all +// tests are successful, or 1 otherwise. +// +// RUN_ALL_TESTS() should be invoked after the command line has been +// parsed by InitGoogleTest(). +// +// This function was formerly a macro; thus, it is in the global +// namespace and has an all-caps name. +int RUN_ALL_TESTS() GTEST_MUST_USE_RESULT_; + +inline int RUN_ALL_TESTS() { + return ::testing::UnitTest::GetInstance()->Run(); +} + +#endif // GTEST_INCLUDE_GTEST_GTEST_H_ diff --git a/lib/gtest/include/gtest/gtest_pred_impl.h b/lib/gtest/include/gtest/gtest_pred_impl.h new file mode 100644 index 00000000..30ae712f --- /dev/null +++ b/lib/gtest/include/gtest/gtest_pred_impl.h @@ -0,0 +1,358 @@ +// Copyright 2006, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// This file is AUTOMATICALLY GENERATED on 10/31/2011 by command +// 'gen_gtest_pred_impl.py 5'. DO NOT EDIT BY HAND! +// +// Implements a family of generic predicate assertion macros. + +#ifndef GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ +#define GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ + +// Makes sure this header is not included before gtest.h. +#ifndef GTEST_INCLUDE_GTEST_GTEST_H_ +# error Do not include gtest_pred_impl.h directly. Include gtest.h instead. +#endif // GTEST_INCLUDE_GTEST_GTEST_H_ + +// This header implements a family of generic predicate assertion +// macros: +// +// ASSERT_PRED_FORMAT1(pred_format, v1) +// ASSERT_PRED_FORMAT2(pred_format, v1, v2) +// ... +// +// where pred_format is a function or functor that takes n (in the +// case of ASSERT_PRED_FORMATn) values and their source expression +// text, and returns a testing::AssertionResult. See the definition +// of ASSERT_EQ in gtest.h for an example. +// +// If you don't care about formatting, you can use the more +// restrictive version: +// +// ASSERT_PRED1(pred, v1) +// ASSERT_PRED2(pred, v1, v2) +// ... +// +// where pred is an n-ary function or functor that returns bool, +// and the values v1, v2, ..., must support the << operator for +// streaming to std::ostream. +// +// We also define the EXPECT_* variations. +// +// For now we only support predicates whose arity is at most 5. +// Please email googletestframework@googlegroups.com if you need +// support for higher arities. + +// GTEST_ASSERT_ is the basic statement to which all of the assertions +// in this file reduce. Don't use this in your code. + +#define GTEST_ASSERT_(expression, on_failure) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (const ::testing::AssertionResult gtest_ar = (expression)) \ + ; \ + else \ + on_failure(gtest_ar.failure_message()) + + +// Helper function for implementing {EXPECT|ASSERT}_PRED1. Don't use +// this in your code. +template +AssertionResult AssertPred1Helper(const char* pred_text, + const char* e1, + Pred pred, + const T1& v1) { + if (pred(v1)) return AssertionSuccess(); + + return AssertionFailure() << pred_text << "(" + << e1 << ") evaluates to false, where" + << "\n" << e1 << " evaluates to " << v1; +} + +// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT1. +// Don't use this in your code. +#define GTEST_PRED_FORMAT1_(pred_format, v1, on_failure)\ + GTEST_ASSERT_(pred_format(#v1, v1), \ + on_failure) + +// Internal macro for implementing {EXPECT|ASSERT}_PRED1. Don't use +// this in your code. +#define GTEST_PRED1_(pred, v1, on_failure)\ + GTEST_ASSERT_(::testing::AssertPred1Helper(#pred, \ + #v1, \ + pred, \ + v1), on_failure) + +// Unary predicate assertion macros. +#define EXPECT_PRED_FORMAT1(pred_format, v1) \ + GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_NONFATAL_FAILURE_) +#define EXPECT_PRED1(pred, v1) \ + GTEST_PRED1_(pred, v1, GTEST_NONFATAL_FAILURE_) +#define ASSERT_PRED_FORMAT1(pred_format, v1) \ + GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_FATAL_FAILURE_) +#define ASSERT_PRED1(pred, v1) \ + GTEST_PRED1_(pred, v1, GTEST_FATAL_FAILURE_) + + + +// Helper function for implementing {EXPECT|ASSERT}_PRED2. Don't use +// this in your code. +template +AssertionResult AssertPred2Helper(const char* pred_text, + const char* e1, + const char* e2, + Pred pred, + const T1& v1, + const T2& v2) { + if (pred(v1, v2)) return AssertionSuccess(); + + return AssertionFailure() << pred_text << "(" + << e1 << ", " + << e2 << ") evaluates to false, where" + << "\n" << e1 << " evaluates to " << v1 + << "\n" << e2 << " evaluates to " << v2; +} + +// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT2. +// Don't use this in your code. +#define GTEST_PRED_FORMAT2_(pred_format, v1, v2, on_failure)\ + GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), \ + on_failure) + +// Internal macro for implementing {EXPECT|ASSERT}_PRED2. Don't use +// this in your code. +#define GTEST_PRED2_(pred, v1, v2, on_failure)\ + GTEST_ASSERT_(::testing::AssertPred2Helper(#pred, \ + #v1, \ + #v2, \ + pred, \ + v1, \ + v2), on_failure) + +// Binary predicate assertion macros. +#define EXPECT_PRED_FORMAT2(pred_format, v1, v2) \ + GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_NONFATAL_FAILURE_) +#define EXPECT_PRED2(pred, v1, v2) \ + GTEST_PRED2_(pred, v1, v2, GTEST_NONFATAL_FAILURE_) +#define ASSERT_PRED_FORMAT2(pred_format, v1, v2) \ + GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_) +#define ASSERT_PRED2(pred, v1, v2) \ + GTEST_PRED2_(pred, v1, v2, GTEST_FATAL_FAILURE_) + + + +// Helper function for implementing {EXPECT|ASSERT}_PRED3. Don't use +// this in your code. +template +AssertionResult AssertPred3Helper(const char* pred_text, + const char* e1, + const char* e2, + const char* e3, + Pred pred, + const T1& v1, + const T2& v2, + const T3& v3) { + if (pred(v1, v2, v3)) return AssertionSuccess(); + + return AssertionFailure() << pred_text << "(" + << e1 << ", " + << e2 << ", " + << e3 << ") evaluates to false, where" + << "\n" << e1 << " evaluates to " << v1 + << "\n" << e2 << " evaluates to " << v2 + << "\n" << e3 << " evaluates to " << v3; +} + +// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT3. +// Don't use this in your code. +#define GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, on_failure)\ + GTEST_ASSERT_(pred_format(#v1, #v2, #v3, v1, v2, v3), \ + on_failure) + +// Internal macro for implementing {EXPECT|ASSERT}_PRED3. Don't use +// this in your code. +#define GTEST_PRED3_(pred, v1, v2, v3, on_failure)\ + GTEST_ASSERT_(::testing::AssertPred3Helper(#pred, \ + #v1, \ + #v2, \ + #v3, \ + pred, \ + v1, \ + v2, \ + v3), on_failure) + +// Ternary predicate assertion macros. +#define EXPECT_PRED_FORMAT3(pred_format, v1, v2, v3) \ + GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_NONFATAL_FAILURE_) +#define EXPECT_PRED3(pred, v1, v2, v3) \ + GTEST_PRED3_(pred, v1, v2, v3, GTEST_NONFATAL_FAILURE_) +#define ASSERT_PRED_FORMAT3(pred_format, v1, v2, v3) \ + GTEST_PRED_FORMAT3_(pred_format, v1, v2, v3, GTEST_FATAL_FAILURE_) +#define ASSERT_PRED3(pred, v1, v2, v3) \ + GTEST_PRED3_(pred, v1, v2, v3, GTEST_FATAL_FAILURE_) + + + +// Helper function for implementing {EXPECT|ASSERT}_PRED4. Don't use +// this in your code. +template +AssertionResult AssertPred4Helper(const char* pred_text, + const char* e1, + const char* e2, + const char* e3, + const char* e4, + Pred pred, + const T1& v1, + const T2& v2, + const T3& v3, + const T4& v4) { + if (pred(v1, v2, v3, v4)) return AssertionSuccess(); + + return AssertionFailure() << pred_text << "(" + << e1 << ", " + << e2 << ", " + << e3 << ", " + << e4 << ") evaluates to false, where" + << "\n" << e1 << " evaluates to " << v1 + << "\n" << e2 << " evaluates to " << v2 + << "\n" << e3 << " evaluates to " << v3 + << "\n" << e4 << " evaluates to " << v4; +} + +// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT4. +// Don't use this in your code. +#define GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, on_failure)\ + GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, v1, v2, v3, v4), \ + on_failure) + +// Internal macro for implementing {EXPECT|ASSERT}_PRED4. Don't use +// this in your code. +#define GTEST_PRED4_(pred, v1, v2, v3, v4, on_failure)\ + GTEST_ASSERT_(::testing::AssertPred4Helper(#pred, \ + #v1, \ + #v2, \ + #v3, \ + #v4, \ + pred, \ + v1, \ + v2, \ + v3, \ + v4), on_failure) + +// 4-ary predicate assertion macros. +#define EXPECT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \ + GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_) +#define EXPECT_PRED4(pred, v1, v2, v3, v4) \ + GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_NONFATAL_FAILURE_) +#define ASSERT_PRED_FORMAT4(pred_format, v1, v2, v3, v4) \ + GTEST_PRED_FORMAT4_(pred_format, v1, v2, v3, v4, GTEST_FATAL_FAILURE_) +#define ASSERT_PRED4(pred, v1, v2, v3, v4) \ + GTEST_PRED4_(pred, v1, v2, v3, v4, GTEST_FATAL_FAILURE_) + + + +// Helper function for implementing {EXPECT|ASSERT}_PRED5. Don't use +// this in your code. +template +AssertionResult AssertPred5Helper(const char* pred_text, + const char* e1, + const char* e2, + const char* e3, + const char* e4, + const char* e5, + Pred pred, + const T1& v1, + const T2& v2, + const T3& v3, + const T4& v4, + const T5& v5) { + if (pred(v1, v2, v3, v4, v5)) return AssertionSuccess(); + + return AssertionFailure() << pred_text << "(" + << e1 << ", " + << e2 << ", " + << e3 << ", " + << e4 << ", " + << e5 << ") evaluates to false, where" + << "\n" << e1 << " evaluates to " << v1 + << "\n" << e2 << " evaluates to " << v2 + << "\n" << e3 << " evaluates to " << v3 + << "\n" << e4 << " evaluates to " << v4 + << "\n" << e5 << " evaluates to " << v5; +} + +// Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT5. +// Don't use this in your code. +#define GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, on_failure)\ + GTEST_ASSERT_(pred_format(#v1, #v2, #v3, #v4, #v5, v1, v2, v3, v4, v5), \ + on_failure) + +// Internal macro for implementing {EXPECT|ASSERT}_PRED5. Don't use +// this in your code. +#define GTEST_PRED5_(pred, v1, v2, v3, v4, v5, on_failure)\ + GTEST_ASSERT_(::testing::AssertPred5Helper(#pred, \ + #v1, \ + #v2, \ + #v3, \ + #v4, \ + #v5, \ + pred, \ + v1, \ + v2, \ + v3, \ + v4, \ + v5), on_failure) + +// 5-ary predicate assertion macros. +#define EXPECT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \ + GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_) +#define EXPECT_PRED5(pred, v1, v2, v3, v4, v5) \ + GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_NONFATAL_FAILURE_) +#define ASSERT_PRED_FORMAT5(pred_format, v1, v2, v3, v4, v5) \ + GTEST_PRED_FORMAT5_(pred_format, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_) +#define ASSERT_PRED5(pred, v1, v2, v3, v4, v5) \ + GTEST_PRED5_(pred, v1, v2, v3, v4, v5, GTEST_FATAL_FAILURE_) + + + +#endif // GTEST_INCLUDE_GTEST_GTEST_PRED_IMPL_H_ diff --git a/lib/gtest/include/gtest/gtest_prod.h b/lib/gtest/include/gtest/gtest_prod.h new file mode 100644 index 00000000..da80ddc6 --- /dev/null +++ b/lib/gtest/include/gtest/gtest_prod.h @@ -0,0 +1,58 @@ +// Copyright 2006, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) +// +// Google C++ Testing Framework definitions useful in production code. + +#ifndef GTEST_INCLUDE_GTEST_GTEST_PROD_H_ +#define GTEST_INCLUDE_GTEST_GTEST_PROD_H_ + +// When you need to test the private or protected members of a class, +// use the FRIEND_TEST macro to declare your tests as friends of the +// class. For example: +// +// class MyClass { +// private: +// void MyMethod(); +// FRIEND_TEST(MyClassTest, MyMethod); +// }; +// +// class MyClassTest : public testing::Test { +// // ... +// }; +// +// TEST_F(MyClassTest, MyMethod) { +// // Can call MyClass::MyMethod() here. +// } + +#define FRIEND_TEST(test_case_name, test_name)\ +friend class test_case_name##_##test_name##_Test + +#endif // GTEST_INCLUDE_GTEST_GTEST_PROD_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-death-test-internal.h b/lib/gtest/include/gtest/internal/gtest-death-test-internal.h new file mode 100644 index 00000000..2b3a78f5 --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-death-test-internal.h @@ -0,0 +1,319 @@ +// Copyright 2005, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee) +// +// The Google C++ Testing Framework (Google Test) +// +// This header file defines internal utilities needed for implementing +// death tests. They are subject to change without notice. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_ + +#include "gtest/internal/gtest-internal.h" + +#include + +namespace testing { +namespace internal { + +GTEST_DECLARE_string_(internal_run_death_test); + +// Names of the flags (needed for parsing Google Test flags). +const char kDeathTestStyleFlag[] = "death_test_style"; +const char kDeathTestUseFork[] = "death_test_use_fork"; +const char kInternalRunDeathTestFlag[] = "internal_run_death_test"; + +#if GTEST_HAS_DEATH_TEST + +// DeathTest is a class that hides much of the complexity of the +// GTEST_DEATH_TEST_ macro. It is abstract; its static Create method +// returns a concrete class that depends on the prevailing death test +// style, as defined by the --gtest_death_test_style and/or +// --gtest_internal_run_death_test flags. + +// In describing the results of death tests, these terms are used with +// the corresponding definitions: +// +// exit status: The integer exit information in the format specified +// by wait(2) +// exit code: The integer code passed to exit(3), _exit(2), or +// returned from main() +class GTEST_API_ DeathTest { + public: + // Create returns false if there was an error determining the + // appropriate action to take for the current death test; for example, + // if the gtest_death_test_style flag is set to an invalid value. + // The LastMessage method will return a more detailed message in that + // case. Otherwise, the DeathTest pointer pointed to by the "test" + // argument is set. If the death test should be skipped, the pointer + // is set to NULL; otherwise, it is set to the address of a new concrete + // DeathTest object that controls the execution of the current test. + static bool Create(const char* statement, const RE* regex, + const char* file, int line, DeathTest** test); + DeathTest(); + virtual ~DeathTest() { } + + // A helper class that aborts a death test when it's deleted. + class ReturnSentinel { + public: + explicit ReturnSentinel(DeathTest* test) : test_(test) { } + ~ReturnSentinel() { test_->Abort(TEST_ENCOUNTERED_RETURN_STATEMENT); } + private: + DeathTest* const test_; + GTEST_DISALLOW_COPY_AND_ASSIGN_(ReturnSentinel); + } GTEST_ATTRIBUTE_UNUSED_; + + // An enumeration of possible roles that may be taken when a death + // test is encountered. EXECUTE means that the death test logic should + // be executed immediately. OVERSEE means that the program should prepare + // the appropriate environment for a child process to execute the death + // test, then wait for it to complete. + enum TestRole { OVERSEE_TEST, EXECUTE_TEST }; + + // An enumeration of the three reasons that a test might be aborted. + enum AbortReason { + TEST_ENCOUNTERED_RETURN_STATEMENT, + TEST_THREW_EXCEPTION, + TEST_DID_NOT_DIE + }; + + // Assumes one of the above roles. + virtual TestRole AssumeRole() = 0; + + // Waits for the death test to finish and returns its status. + virtual int Wait() = 0; + + // Returns true if the death test passed; that is, the test process + // exited during the test, its exit status matches a user-supplied + // predicate, and its stderr output matches a user-supplied regular + // expression. + // The user-supplied predicate may be a macro expression rather + // than a function pointer or functor, or else Wait and Passed could + // be combined. + virtual bool Passed(bool exit_status_ok) = 0; + + // Signals that the death test did not die as expected. + virtual void Abort(AbortReason reason) = 0; + + // Returns a human-readable outcome message regarding the outcome of + // the last death test. + static const char* LastMessage(); + + static void set_last_death_test_message(const std::string& message); + + private: + // A string containing a description of the outcome of the last death test. + static std::string last_death_test_message_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(DeathTest); +}; + +// Factory interface for death tests. May be mocked out for testing. +class DeathTestFactory { + public: + virtual ~DeathTestFactory() { } + virtual bool Create(const char* statement, const RE* regex, + const char* file, int line, DeathTest** test) = 0; +}; + +// A concrete DeathTestFactory implementation for normal use. +class DefaultDeathTestFactory : public DeathTestFactory { + public: + virtual bool Create(const char* statement, const RE* regex, + const char* file, int line, DeathTest** test); +}; + +// Returns true if exit_status describes a process that was terminated +// by a signal, or exited normally with a nonzero exit code. +GTEST_API_ bool ExitedUnsuccessfully(int exit_status); + +// Traps C++ exceptions escaping statement and reports them as test +// failures. Note that trapping SEH exceptions is not implemented here. +# if GTEST_HAS_EXCEPTIONS +# define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \ + try { \ + GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ + } catch (const ::std::exception& gtest_exception) { \ + fprintf(\ + stderr, \ + "\n%s: Caught std::exception-derived exception escaping the " \ + "death test statement. Exception message: %s\n", \ + ::testing::internal::FormatFileLocation(__FILE__, __LINE__).c_str(), \ + gtest_exception.what()); \ + fflush(stderr); \ + death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \ + } catch (...) { \ + death_test->Abort(::testing::internal::DeathTest::TEST_THREW_EXCEPTION); \ + } + +# else +# define GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, death_test) \ + GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) + +# endif + +// This macro is for implementing ASSERT_DEATH*, EXPECT_DEATH*, +// ASSERT_EXIT*, and EXPECT_EXIT*. +# define GTEST_DEATH_TEST_(statement, predicate, regex, fail) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (::testing::internal::AlwaysTrue()) { \ + const ::testing::internal::RE& gtest_regex = (regex); \ + ::testing::internal::DeathTest* gtest_dt; \ + if (!::testing::internal::DeathTest::Create(#statement, >est_regex, \ + __FILE__, __LINE__, >est_dt)) { \ + goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \ + } \ + if (gtest_dt != NULL) { \ + ::testing::internal::scoped_ptr< ::testing::internal::DeathTest> \ + gtest_dt_ptr(gtest_dt); \ + switch (gtest_dt->AssumeRole()) { \ + case ::testing::internal::DeathTest::OVERSEE_TEST: \ + if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) { \ + goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__); \ + } \ + break; \ + case ::testing::internal::DeathTest::EXECUTE_TEST: { \ + ::testing::internal::DeathTest::ReturnSentinel \ + gtest_sentinel(gtest_dt); \ + GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt); \ + gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE); \ + break; \ + } \ + default: \ + break; \ + } \ + } \ + } else \ + GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__): \ + fail(::testing::internal::DeathTest::LastMessage()) +// The symbol "fail" here expands to something into which a message +// can be streamed. + +// This macro is for implementing ASSERT/EXPECT_DEBUG_DEATH when compiled in +// NDEBUG mode. In this case we need the statements to be executed, the regex is +// ignored, and the macro must accept a streamed message even though the message +// is never printed. +# define GTEST_EXECUTE_STATEMENT_(statement, regex) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (::testing::internal::AlwaysTrue()) { \ + GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ + } else \ + ::testing::Message() + +// A class representing the parsed contents of the +// --gtest_internal_run_death_test flag, as it existed when +// RUN_ALL_TESTS was called. +class InternalRunDeathTestFlag { + public: + InternalRunDeathTestFlag(const std::string& a_file, + int a_line, + int an_index, + int a_write_fd) + : file_(a_file), line_(a_line), index_(an_index), + write_fd_(a_write_fd) {} + + ~InternalRunDeathTestFlag() { + if (write_fd_ >= 0) + posix::Close(write_fd_); + } + + const std::string& file() const { return file_; } + int line() const { return line_; } + int index() const { return index_; } + int write_fd() const { return write_fd_; } + + private: + std::string file_; + int line_; + int index_; + int write_fd_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(InternalRunDeathTestFlag); +}; + +// Returns a newly created InternalRunDeathTestFlag object with fields +// initialized from the GTEST_FLAG(internal_run_death_test) flag if +// the flag is specified; otherwise returns NULL. +InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag(); + +#else // GTEST_HAS_DEATH_TEST + +// This macro is used for implementing macros such as +// EXPECT_DEATH_IF_SUPPORTED and ASSERT_DEATH_IF_SUPPORTED on systems where +// death tests are not supported. Those macros must compile on such systems +// iff EXPECT_DEATH and ASSERT_DEATH compile with the same parameters on +// systems that support death tests. This allows one to write such a macro +// on a system that does not support death tests and be sure that it will +// compile on a death-test supporting system. +// +// Parameters: +// statement - A statement that a macro such as EXPECT_DEATH would test +// for program termination. This macro has to make sure this +// statement is compiled but not executed, to ensure that +// EXPECT_DEATH_IF_SUPPORTED compiles with a certain +// parameter iff EXPECT_DEATH compiles with it. +// regex - A regex that a macro such as EXPECT_DEATH would use to test +// the output of statement. This parameter has to be +// compiled but not evaluated by this macro, to ensure that +// this macro only accepts expressions that a macro such as +// EXPECT_DEATH would accept. +// terminator - Must be an empty statement for EXPECT_DEATH_IF_SUPPORTED +// and a return statement for ASSERT_DEATH_IF_SUPPORTED. +// This ensures that ASSERT_DEATH_IF_SUPPORTED will not +// compile inside functions where ASSERT_DEATH doesn't +// compile. +// +// The branch that has an always false condition is used to ensure that +// statement and regex are compiled (and thus syntactically correct) but +// never executed. The unreachable code macro protects the terminator +// statement from generating an 'unreachable code' warning in case +// statement unconditionally returns or throws. The Message constructor at +// the end allows the syntax of streaming additional messages into the +// macro, for compilational compatibility with EXPECT_DEATH/ASSERT_DEATH. +# define GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, terminator) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (::testing::internal::AlwaysTrue()) { \ + GTEST_LOG_(WARNING) \ + << "Death tests are not supported on this platform.\n" \ + << "Statement '" #statement "' cannot be verified."; \ + } else if (::testing::internal::AlwaysFalse()) { \ + ::testing::internal::RE::PartialMatch(".*", (regex)); \ + GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ + terminator; \ + } else \ + ::testing::Message() + +#endif // GTEST_HAS_DEATH_TEST + +} // namespace internal +} // namespace testing + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_DEATH_TEST_INTERNAL_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-filepath.h b/lib/gtest/include/gtest/internal/gtest-filepath.h new file mode 100644 index 00000000..7a13b4b0 --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-filepath.h @@ -0,0 +1,206 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: keith.ray@gmail.com (Keith Ray) +// +// Google Test filepath utilities +// +// This header file declares classes and functions used internally by +// Google Test. They are subject to change without notice. +// +// This file is #included in . +// Do not include this header file separately! + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_ + +#include "gtest/internal/gtest-string.h" + +namespace testing { +namespace internal { + +// FilePath - a class for file and directory pathname manipulation which +// handles platform-specific conventions (like the pathname separator). +// Used for helper functions for naming files in a directory for xml output. +// Except for Set methods, all methods are const or static, which provides an +// "immutable value object" -- useful for peace of mind. +// A FilePath with a value ending in a path separator ("like/this/") represents +// a directory, otherwise it is assumed to represent a file. In either case, +// it may or may not represent an actual file or directory in the file system. +// Names are NOT checked for syntax correctness -- no checking for illegal +// characters, malformed paths, etc. + +class GTEST_API_ FilePath { + public: + FilePath() : pathname_("") { } + FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) { } + + explicit FilePath(const std::string& pathname) : pathname_(pathname) { + Normalize(); + } + + FilePath& operator=(const FilePath& rhs) { + Set(rhs); + return *this; + } + + void Set(const FilePath& rhs) { + pathname_ = rhs.pathname_; + } + + const std::string& string() const { return pathname_; } + const char* c_str() const { return pathname_.c_str(); } + + // Returns the current working directory, or "" if unsuccessful. + static FilePath GetCurrentDir(); + + // Given directory = "dir", base_name = "test", number = 0, + // extension = "xml", returns "dir/test.xml". If number is greater + // than zero (e.g., 12), returns "dir/test_12.xml". + // On Windows platform, uses \ as the separator rather than /. + static FilePath MakeFileName(const FilePath& directory, + const FilePath& base_name, + int number, + const char* extension); + + // Given directory = "dir", relative_path = "test.xml", + // returns "dir/test.xml". + // On Windows, uses \ as the separator rather than /. + static FilePath ConcatPaths(const FilePath& directory, + const FilePath& relative_path); + + // Returns a pathname for a file that does not currently exist. The pathname + // will be directory/base_name.extension or + // directory/base_name_.extension if directory/base_name.extension + // already exists. The number will be incremented until a pathname is found + // that does not already exist. + // Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'. + // There could be a race condition if two or more processes are calling this + // function at the same time -- they could both pick the same filename. + static FilePath GenerateUniqueFileName(const FilePath& directory, + const FilePath& base_name, + const char* extension); + + // Returns true iff the path is "". + bool IsEmpty() const { return pathname_.empty(); } + + // If input name has a trailing separator character, removes it and returns + // the name, otherwise return the name string unmodified. + // On Windows platform, uses \ as the separator, other platforms use /. + FilePath RemoveTrailingPathSeparator() const; + + // Returns a copy of the FilePath with the directory part removed. + // Example: FilePath("path/to/file").RemoveDirectoryName() returns + // FilePath("file"). If there is no directory part ("just_a_file"), it returns + // the FilePath unmodified. If there is no file part ("just_a_dir/") it + // returns an empty FilePath (""). + // On Windows platform, '\' is the path separator, otherwise it is '/'. + FilePath RemoveDirectoryName() const; + + // RemoveFileName returns the directory path with the filename removed. + // Example: FilePath("path/to/file").RemoveFileName() returns "path/to/". + // If the FilePath is "a_file" or "/a_file", RemoveFileName returns + // FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does + // not have a file, like "just/a/dir/", it returns the FilePath unmodified. + // On Windows platform, '\' is the path separator, otherwise it is '/'. + FilePath RemoveFileName() const; + + // Returns a copy of the FilePath with the case-insensitive extension removed. + // Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns + // FilePath("dir/file"). If a case-insensitive extension is not + // found, returns a copy of the original FilePath. + FilePath RemoveExtension(const char* extension) const; + + // Creates directories so that path exists. Returns true if successful or if + // the directories already exist; returns false if unable to create + // directories for any reason. Will also return false if the FilePath does + // not represent a directory (that is, it doesn't end with a path separator). + bool CreateDirectoriesRecursively() const; + + // Create the directory so that path exists. Returns true if successful or + // if the directory already exists; returns false if unable to create the + // directory for any reason, including if the parent directory does not + // exist. Not named "CreateDirectory" because that's a macro on Windows. + bool CreateFolder() const; + + // Returns true if FilePath describes something in the file-system, + // either a file, directory, or whatever, and that something exists. + bool FileOrDirectoryExists() const; + + // Returns true if pathname describes a directory in the file-system + // that exists. + bool DirectoryExists() const; + + // Returns true if FilePath ends with a path separator, which indicates that + // it is intended to represent a directory. Returns false otherwise. + // This does NOT check that a directory (or file) actually exists. + bool IsDirectory() const; + + // Returns true if pathname describes a root directory. (Windows has one + // root directory per disk drive.) + bool IsRootDirectory() const; + + // Returns true if pathname describes an absolute path. + bool IsAbsolutePath() const; + + private: + // Replaces multiple consecutive separators with a single separator. + // For example, "bar///foo" becomes "bar/foo". Does not eliminate other + // redundancies that might be in a pathname involving "." or "..". + // + // A pathname with multiple consecutive separators may occur either through + // user error or as a result of some scripts or APIs that generate a pathname + // with a trailing separator. On other platforms the same API or script + // may NOT generate a pathname with a trailing "/". Then elsewhere that + // pathname may have another "/" and pathname components added to it, + // without checking for the separator already being there. + // The script language and operating system may allow paths like "foo//bar" + // but some of the functions in FilePath will not handle that correctly. In + // particular, RemoveTrailingPathSeparator() only removes one separator, and + // it is called in CreateDirectoriesRecursively() assuming that it will change + // a pathname from directory syntax (trailing separator) to filename syntax. + // + // On Windows this method also replaces the alternate path separator '/' with + // the primary path separator '\\', so that for example "bar\\/\\foo" becomes + // "bar\\foo". + + void Normalize(); + + // Returns a pointer to the last occurence of a valid path separator in + // the FilePath. On Windows, for example, both '/' and '\' are valid path + // separators. Returns NULL if no path separator was found. + const char* FindLastPathSeparator() const; + + std::string pathname_; +}; // class FilePath + +} // namespace internal +} // namespace testing + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_FILEPATH_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-internal.h b/lib/gtest/include/gtest/internal/gtest-internal.h new file mode 100644 index 00000000..0dcc3a31 --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-internal.h @@ -0,0 +1,1158 @@ +// Copyright 2005, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee) +// +// The Google C++ Testing Framework (Google Test) +// +// This header file declares functions and macros used internally by +// Google Test. They are subject to change without notice. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_ + +#include "gtest/internal/gtest-port.h" + +#if GTEST_OS_LINUX +# include +# include +# include +# include +#endif // GTEST_OS_LINUX + +#if GTEST_HAS_EXCEPTIONS +# include +#endif + +#include +#include +#include +#include +#include +#include + +#include "gtest/gtest-message.h" +#include "gtest/internal/gtest-string.h" +#include "gtest/internal/gtest-filepath.h" +#include "gtest/internal/gtest-type-util.h" + +// Due to C++ preprocessor weirdness, we need double indirection to +// concatenate two tokens when one of them is __LINE__. Writing +// +// foo ## __LINE__ +// +// will result in the token foo__LINE__, instead of foo followed by +// the current line number. For more details, see +// http://www.parashift.com/c++-faq-lite/misc-technical-issues.html#faq-39.6 +#define GTEST_CONCAT_TOKEN_(foo, bar) GTEST_CONCAT_TOKEN_IMPL_(foo, bar) +#define GTEST_CONCAT_TOKEN_IMPL_(foo, bar) foo ## bar + +class ProtocolMessage; +namespace proto2 { class Message; } + +namespace testing { + +// Forward declarations. + +class AssertionResult; // Result of an assertion. +class Message; // Represents a failure message. +class Test; // Represents a test. +class TestInfo; // Information about a test. +class TestPartResult; // Result of a test part. +class UnitTest; // A collection of test cases. + +template +::std::string PrintToString(const T& value); + +namespace internal { + +struct TraceInfo; // Information about a trace point. +class ScopedTrace; // Implements scoped trace. +class TestInfoImpl; // Opaque implementation of TestInfo +class UnitTestImpl; // Opaque implementation of UnitTest + +// How many times InitGoogleTest() has been called. +GTEST_API_ extern int g_init_gtest_count; + +// The text used in failure messages to indicate the start of the +// stack trace. +GTEST_API_ extern const char kStackTraceMarker[]; + +// Two overloaded helpers for checking at compile time whether an +// expression is a null pointer literal (i.e. NULL or any 0-valued +// compile-time integral constant). Their return values have +// different sizes, so we can use sizeof() to test which version is +// picked by the compiler. These helpers have no implementations, as +// we only need their signatures. +// +// Given IsNullLiteralHelper(x), the compiler will pick the first +// version if x can be implicitly converted to Secret*, and pick the +// second version otherwise. Since Secret is a secret and incomplete +// type, the only expression a user can write that has type Secret* is +// a null pointer literal. Therefore, we know that x is a null +// pointer literal if and only if the first version is picked by the +// compiler. +char IsNullLiteralHelper(Secret* p); +char (&IsNullLiteralHelper(...))[2]; // NOLINT + +// A compile-time bool constant that is true if and only if x is a +// null pointer literal (i.e. NULL or any 0-valued compile-time +// integral constant). +#ifdef GTEST_ELLIPSIS_NEEDS_POD_ +// We lose support for NULL detection where the compiler doesn't like +// passing non-POD classes through ellipsis (...). +# define GTEST_IS_NULL_LITERAL_(x) false +#else +# define GTEST_IS_NULL_LITERAL_(x) \ + (sizeof(::testing::internal::IsNullLiteralHelper(x)) == 1) +#endif // GTEST_ELLIPSIS_NEEDS_POD_ + +// Appends the user-supplied message to the Google-Test-generated message. +GTEST_API_ std::string AppendUserMessage( + const std::string& gtest_msg, const Message& user_msg); + +#if GTEST_HAS_EXCEPTIONS + +// This exception is thrown by (and only by) a failed Google Test +// assertion when GTEST_FLAG(throw_on_failure) is true (if exceptions +// are enabled). We derive it from std::runtime_error, which is for +// errors presumably detectable only at run time. Since +// std::runtime_error inherits from std::exception, many testing +// frameworks know how to extract and print the message inside it. +class GTEST_API_ GoogleTestFailureException : public ::std::runtime_error { + public: + explicit GoogleTestFailureException(const TestPartResult& failure); +}; + +#endif // GTEST_HAS_EXCEPTIONS + +// A helper class for creating scoped traces in user programs. +class GTEST_API_ ScopedTrace { + public: + // The c'tor pushes the given source file location and message onto + // a trace stack maintained by Google Test. + ScopedTrace(const char* file, int line, const Message& message); + + // The d'tor pops the info pushed by the c'tor. + // + // Note that the d'tor is not virtual in order to be efficient. + // Don't inherit from ScopedTrace! + ~ScopedTrace(); + + private: + GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedTrace); +} GTEST_ATTRIBUTE_UNUSED_; // A ScopedTrace object does its job in its + // c'tor and d'tor. Therefore it doesn't + // need to be used otherwise. + +// Constructs and returns the message for an equality assertion +// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure. +// +// The first four parameters are the expressions used in the assertion +// and their values, as strings. For example, for ASSERT_EQ(foo, bar) +// where foo is 5 and bar is 6, we have: +// +// expected_expression: "foo" +// actual_expression: "bar" +// expected_value: "5" +// actual_value: "6" +// +// The ignoring_case parameter is true iff the assertion is a +// *_STRCASEEQ*. When it's true, the string " (ignoring case)" will +// be inserted into the message. +GTEST_API_ AssertionResult EqFailure(const char* expected_expression, + const char* actual_expression, + const std::string& expected_value, + const std::string& actual_value, + bool ignoring_case); + +// Constructs a failure message for Boolean assertions such as EXPECT_TRUE. +GTEST_API_ std::string GetBoolAssertionFailureMessage( + const AssertionResult& assertion_result, + const char* expression_text, + const char* actual_predicate_value, + const char* expected_predicate_value); + +// This template class represents an IEEE floating-point number +// (either single-precision or double-precision, depending on the +// template parameters). +// +// The purpose of this class is to do more sophisticated number +// comparison. (Due to round-off error, etc, it's very unlikely that +// two floating-points will be equal exactly. Hence a naive +// comparison by the == operation often doesn't work.) +// +// Format of IEEE floating-point: +// +// The most-significant bit being the leftmost, an IEEE +// floating-point looks like +// +// sign_bit exponent_bits fraction_bits +// +// Here, sign_bit is a single bit that designates the sign of the +// number. +// +// For float, there are 8 exponent bits and 23 fraction bits. +// +// For double, there are 11 exponent bits and 52 fraction bits. +// +// More details can be found at +// http://en.wikipedia.org/wiki/IEEE_floating-point_standard. +// +// Template parameter: +// +// RawType: the raw floating-point type (either float or double) +template +class FloatingPoint { + public: + // Defines the unsigned integer type that has the same size as the + // floating point number. + typedef typename TypeWithSize::UInt Bits; + + // Constants. + + // # of bits in a number. + static const size_t kBitCount = 8*sizeof(RawType); + + // # of fraction bits in a number. + static const size_t kFractionBitCount = + std::numeric_limits::digits - 1; + + // # of exponent bits in a number. + static const size_t kExponentBitCount = kBitCount - 1 - kFractionBitCount; + + // The mask for the sign bit. + static const Bits kSignBitMask = static_cast(1) << (kBitCount - 1); + + // The mask for the fraction bits. + static const Bits kFractionBitMask = + ~static_cast(0) >> (kExponentBitCount + 1); + + // The mask for the exponent bits. + static const Bits kExponentBitMask = ~(kSignBitMask | kFractionBitMask); + + // How many ULP's (Units in the Last Place) we want to tolerate when + // comparing two numbers. The larger the value, the more error we + // allow. A 0 value means that two numbers must be exactly the same + // to be considered equal. + // + // The maximum error of a single floating-point operation is 0.5 + // units in the last place. On Intel CPU's, all floating-point + // calculations are done with 80-bit precision, while double has 64 + // bits. Therefore, 4 should be enough for ordinary use. + // + // See the following article for more details on ULP: + // http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/ + static const size_t kMaxUlps = 4; + + // Constructs a FloatingPoint from a raw floating-point number. + // + // On an Intel CPU, passing a non-normalized NAN (Not a Number) + // around may change its bits, although the new value is guaranteed + // to be also a NAN. Therefore, don't expect this constructor to + // preserve the bits in x when x is a NAN. + explicit FloatingPoint(const RawType& x) { u_.value_ = x; } + + // Static methods + + // Reinterprets a bit pattern as a floating-point number. + // + // This function is needed to test the AlmostEquals() method. + static RawType ReinterpretBits(const Bits bits) { + FloatingPoint fp(0); + fp.u_.bits_ = bits; + return fp.u_.value_; + } + + // Returns the floating-point number that represent positive infinity. + static RawType Infinity() { + return ReinterpretBits(kExponentBitMask); + } + + // Returns the maximum representable finite floating-point number. + static RawType Max(); + + // Non-static methods + + // Returns the bits that represents this number. + const Bits &bits() const { return u_.bits_; } + + // Returns the exponent bits of this number. + Bits exponent_bits() const { return kExponentBitMask & u_.bits_; } + + // Returns the fraction bits of this number. + Bits fraction_bits() const { return kFractionBitMask & u_.bits_; } + + // Returns the sign bit of this number. + Bits sign_bit() const { return kSignBitMask & u_.bits_; } + + // Returns true iff this is NAN (not a number). + bool is_nan() const { + // It's a NAN if the exponent bits are all ones and the fraction + // bits are not entirely zeros. + return (exponent_bits() == kExponentBitMask) && (fraction_bits() != 0); + } + + // Returns true iff this number is at most kMaxUlps ULP's away from + // rhs. In particular, this function: + // + // - returns false if either number is (or both are) NAN. + // - treats really large numbers as almost equal to infinity. + // - thinks +0.0 and -0.0 are 0 DLP's apart. + bool AlmostEquals(const FloatingPoint& rhs) const { + // The IEEE standard says that any comparison operation involving + // a NAN must return false. + if (is_nan() || rhs.is_nan()) return false; + + return DistanceBetweenSignAndMagnitudeNumbers(u_.bits_, rhs.u_.bits_) + <= kMaxUlps; + } + + private: + // The data type used to store the actual floating-point number. + union FloatingPointUnion { + RawType value_; // The raw floating-point number. + Bits bits_; // The bits that represent the number. + }; + + // Converts an integer from the sign-and-magnitude representation to + // the biased representation. More precisely, let N be 2 to the + // power of (kBitCount - 1), an integer x is represented by the + // unsigned number x + N. + // + // For instance, + // + // -N + 1 (the most negative number representable using + // sign-and-magnitude) is represented by 1; + // 0 is represented by N; and + // N - 1 (the biggest number representable using + // sign-and-magnitude) is represented by 2N - 1. + // + // Read http://en.wikipedia.org/wiki/Signed_number_representations + // for more details on signed number representations. + static Bits SignAndMagnitudeToBiased(const Bits &sam) { + if (kSignBitMask & sam) { + // sam represents a negative number. + return ~sam + 1; + } else { + // sam represents a positive number. + return kSignBitMask | sam; + } + } + + // Given two numbers in the sign-and-magnitude representation, + // returns the distance between them as an unsigned number. + static Bits DistanceBetweenSignAndMagnitudeNumbers(const Bits &sam1, + const Bits &sam2) { + const Bits biased1 = SignAndMagnitudeToBiased(sam1); + const Bits biased2 = SignAndMagnitudeToBiased(sam2); + return (biased1 >= biased2) ? (biased1 - biased2) : (biased2 - biased1); + } + + FloatingPointUnion u_; +}; + +// We cannot use std::numeric_limits::max() as it clashes with the max() +// macro defined by . +template <> +inline float FloatingPoint::Max() { return FLT_MAX; } +template <> +inline double FloatingPoint::Max() { return DBL_MAX; } + +// Typedefs the instances of the FloatingPoint template class that we +// care to use. +typedef FloatingPoint Float; +typedef FloatingPoint Double; + +// In order to catch the mistake of putting tests that use different +// test fixture classes in the same test case, we need to assign +// unique IDs to fixture classes and compare them. The TypeId type is +// used to hold such IDs. The user should treat TypeId as an opaque +// type: the only operation allowed on TypeId values is to compare +// them for equality using the == operator. +typedef const void* TypeId; + +template +class TypeIdHelper { + public: + // dummy_ must not have a const type. Otherwise an overly eager + // compiler (e.g. MSVC 7.1 & 8.0) may try to merge + // TypeIdHelper::dummy_ for different Ts as an "optimization". + static bool dummy_; +}; + +template +bool TypeIdHelper::dummy_ = false; + +// GetTypeId() returns the ID of type T. Different values will be +// returned for different types. Calling the function twice with the +// same type argument is guaranteed to return the same ID. +template +TypeId GetTypeId() { + // The compiler is required to allocate a different + // TypeIdHelper::dummy_ variable for each T used to instantiate + // the template. Therefore, the address of dummy_ is guaranteed to + // be unique. + return &(TypeIdHelper::dummy_); +} + +// Returns the type ID of ::testing::Test. Always call this instead +// of GetTypeId< ::testing::Test>() to get the type ID of +// ::testing::Test, as the latter may give the wrong result due to a +// suspected linker bug when compiling Google Test as a Mac OS X +// framework. +GTEST_API_ TypeId GetTestTypeId(); + +// Defines the abstract factory interface that creates instances +// of a Test object. +class TestFactoryBase { + public: + virtual ~TestFactoryBase() {} + + // Creates a test instance to run. The instance is both created and destroyed + // within TestInfoImpl::Run() + virtual Test* CreateTest() = 0; + + protected: + TestFactoryBase() {} + + private: + GTEST_DISALLOW_COPY_AND_ASSIGN_(TestFactoryBase); +}; + +// This class provides implementation of TeastFactoryBase interface. +// It is used in TEST and TEST_F macros. +template +class TestFactoryImpl : public TestFactoryBase { + public: + virtual Test* CreateTest() { return new TestClass; } +}; + +#if GTEST_OS_WINDOWS + +// Predicate-formatters for implementing the HRESULT checking macros +// {ASSERT|EXPECT}_HRESULT_{SUCCEEDED|FAILED} +// We pass a long instead of HRESULT to avoid causing an +// include dependency for the HRESULT type. +GTEST_API_ AssertionResult IsHRESULTSuccess(const char* expr, + long hr); // NOLINT +GTEST_API_ AssertionResult IsHRESULTFailure(const char* expr, + long hr); // NOLINT + +#endif // GTEST_OS_WINDOWS + +// Types of SetUpTestCase() and TearDownTestCase() functions. +typedef void (*SetUpTestCaseFunc)(); +typedef void (*TearDownTestCaseFunc)(); + +// Creates a new TestInfo object and registers it with Google Test; +// returns the created object. +// +// Arguments: +// +// test_case_name: name of the test case +// name: name of the test +// type_param the name of the test's type parameter, or NULL if +// this is not a typed or a type-parameterized test. +// value_param text representation of the test's value parameter, +// or NULL if this is not a type-parameterized test. +// fixture_class_id: ID of the test fixture class +// set_up_tc: pointer to the function that sets up the test case +// tear_down_tc: pointer to the function that tears down the test case +// factory: pointer to the factory that creates a test object. +// The newly created TestInfo instance will assume +// ownership of the factory object. +GTEST_API_ TestInfo* MakeAndRegisterTestInfo( + const char* test_case_name, + const char* name, + const char* type_param, + const char* value_param, + TypeId fixture_class_id, + SetUpTestCaseFunc set_up_tc, + TearDownTestCaseFunc tear_down_tc, + TestFactoryBase* factory); + +// If *pstr starts with the given prefix, modifies *pstr to be right +// past the prefix and returns true; otherwise leaves *pstr unchanged +// and returns false. None of pstr, *pstr, and prefix can be NULL. +GTEST_API_ bool SkipPrefix(const char* prefix, const char** pstr); + +#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P + +// State of the definition of a type-parameterized test case. +class GTEST_API_ TypedTestCasePState { + public: + TypedTestCasePState() : registered_(false) {} + + // Adds the given test name to defined_test_names_ and return true + // if the test case hasn't been registered; otherwise aborts the + // program. + bool AddTestName(const char* file, int line, const char* case_name, + const char* test_name) { + if (registered_) { + fprintf(stderr, "%s Test %s must be defined before " + "REGISTER_TYPED_TEST_CASE_P(%s, ...).\n", + FormatFileLocation(file, line).c_str(), test_name, case_name); + fflush(stderr); + posix::Abort(); + } + defined_test_names_.insert(test_name); + return true; + } + + // Verifies that registered_tests match the test names in + // defined_test_names_; returns registered_tests if successful, or + // aborts the program otherwise. + const char* VerifyRegisteredTestNames( + const char* file, int line, const char* registered_tests); + + private: + bool registered_; + ::std::set defined_test_names_; +}; + +// Skips to the first non-space char after the first comma in 'str'; +// returns NULL if no comma is found in 'str'. +inline const char* SkipComma(const char* str) { + const char* comma = strchr(str, ','); + if (comma == NULL) { + return NULL; + } + while (IsSpace(*(++comma))) {} + return comma; +} + +// Returns the prefix of 'str' before the first comma in it; returns +// the entire string if it contains no comma. +inline std::string GetPrefixUntilComma(const char* str) { + const char* comma = strchr(str, ','); + return comma == NULL ? str : std::string(str, comma); +} + +// TypeParameterizedTest::Register() +// registers a list of type-parameterized tests with Google Test. The +// return value is insignificant - we just need to return something +// such that we can call this function in a namespace scope. +// +// Implementation note: The GTEST_TEMPLATE_ macro declares a template +// template parameter. It's defined in gtest-type-util.h. +template +class TypeParameterizedTest { + public: + // 'index' is the index of the test in the type list 'Types' + // specified in INSTANTIATE_TYPED_TEST_CASE_P(Prefix, TestCase, + // Types). Valid values for 'index' are [0, N - 1] where N is the + // length of Types. + static bool Register(const char* prefix, const char* case_name, + const char* test_names, int index) { + typedef typename Types::Head Type; + typedef Fixture FixtureClass; + typedef typename GTEST_BIND_(TestSel, Type) TestClass; + + // First, registers the first type-parameterized test in the type + // list. + MakeAndRegisterTestInfo( + (std::string(prefix) + (prefix[0] == '\0' ? "" : "/") + case_name + "/" + + StreamableToString(index)).c_str(), + GetPrefixUntilComma(test_names).c_str(), + GetTypeName().c_str(), + NULL, // No value parameter. + GetTypeId(), + TestClass::SetUpTestCase, + TestClass::TearDownTestCase, + new TestFactoryImpl); + + // Next, recurses (at compile time) with the tail of the type list. + return TypeParameterizedTest + ::Register(prefix, case_name, test_names, index + 1); + } +}; + +// The base case for the compile time recursion. +template +class TypeParameterizedTest { + public: + static bool Register(const char* /*prefix*/, const char* /*case_name*/, + const char* /*test_names*/, int /*index*/) { + return true; + } +}; + +// TypeParameterizedTestCase::Register() +// registers *all combinations* of 'Tests' and 'Types' with Google +// Test. The return value is insignificant - we just need to return +// something such that we can call this function in a namespace scope. +template +class TypeParameterizedTestCase { + public: + static bool Register(const char* prefix, const char* case_name, + const char* test_names) { + typedef typename Tests::Head Head; + + // First, register the first test in 'Test' for each type in 'Types'. + TypeParameterizedTest::Register( + prefix, case_name, test_names, 0); + + // Next, recurses (at compile time) with the tail of the test list. + return TypeParameterizedTestCase + ::Register(prefix, case_name, SkipComma(test_names)); + } +}; + +// The base case for the compile time recursion. +template +class TypeParameterizedTestCase { + public: + static bool Register(const char* /*prefix*/, const char* /*case_name*/, + const char* /*test_names*/) { + return true; + } +}; + +#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P + +// Returns the current OS stack trace as an std::string. +// +// The maximum number of stack frames to be included is specified by +// the gtest_stack_trace_depth flag. The skip_count parameter +// specifies the number of top frames to be skipped, which doesn't +// count against the number of frames to be included. +// +// For example, if Foo() calls Bar(), which in turn calls +// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in +// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't. +GTEST_API_ std::string GetCurrentOsStackTraceExceptTop( + UnitTest* unit_test, int skip_count); + +// Helpers for suppressing warnings on unreachable code or constant +// condition. + +// Always returns true. +GTEST_API_ bool AlwaysTrue(); + +// Always returns false. +inline bool AlwaysFalse() { return !AlwaysTrue(); } + +// Helper for suppressing false warning from Clang on a const char* +// variable declared in a conditional expression always being NULL in +// the else branch. +struct GTEST_API_ ConstCharPtr { + ConstCharPtr(const char* str) : value(str) {} + operator bool() const { return true; } + const char* value; +}; + +// A simple Linear Congruential Generator for generating random +// numbers with a uniform distribution. Unlike rand() and srand(), it +// doesn't use global state (and therefore can't interfere with user +// code). Unlike rand_r(), it's portable. An LCG isn't very random, +// but it's good enough for our purposes. +class GTEST_API_ Random { + public: + static const UInt32 kMaxRange = 1u << 31; + + explicit Random(UInt32 seed) : state_(seed) {} + + void Reseed(UInt32 seed) { state_ = seed; } + + // Generates a random number from [0, range). Crashes if 'range' is + // 0 or greater than kMaxRange. + UInt32 Generate(UInt32 range); + + private: + UInt32 state_; + GTEST_DISALLOW_COPY_AND_ASSIGN_(Random); +}; + +// Defining a variable of type CompileAssertTypesEqual will cause a +// compiler error iff T1 and T2 are different types. +template +struct CompileAssertTypesEqual; + +template +struct CompileAssertTypesEqual { +}; + +// Removes the reference from a type if it is a reference type, +// otherwise leaves it unchanged. This is the same as +// tr1::remove_reference, which is not widely available yet. +template +struct RemoveReference { typedef T type; }; // NOLINT +template +struct RemoveReference { typedef T type; }; // NOLINT + +// A handy wrapper around RemoveReference that works when the argument +// T depends on template parameters. +#define GTEST_REMOVE_REFERENCE_(T) \ + typename ::testing::internal::RemoveReference::type + +// Removes const from a type if it is a const type, otherwise leaves +// it unchanged. This is the same as tr1::remove_const, which is not +// widely available yet. +template +struct RemoveConst { typedef T type; }; // NOLINT +template +struct RemoveConst { typedef T type; }; // NOLINT + +// MSVC 8.0, Sun C++, and IBM XL C++ have a bug which causes the above +// definition to fail to remove the const in 'const int[3]' and 'const +// char[3][4]'. The following specialization works around the bug. +template +struct RemoveConst { + typedef typename RemoveConst::type type[N]; +}; + +#if defined(_MSC_VER) && _MSC_VER < 1400 +// This is the only specialization that allows VC++ 7.1 to remove const in +// 'const int[3] and 'const int[3][4]'. However, it causes trouble with GCC +// and thus needs to be conditionally compiled. +template +struct RemoveConst { + typedef typename RemoveConst::type type[N]; +}; +#endif + +// A handy wrapper around RemoveConst that works when the argument +// T depends on template parameters. +#define GTEST_REMOVE_CONST_(T) \ + typename ::testing::internal::RemoveConst::type + +// Turns const U&, U&, const U, and U all into U. +#define GTEST_REMOVE_REFERENCE_AND_CONST_(T) \ + GTEST_REMOVE_CONST_(GTEST_REMOVE_REFERENCE_(T)) + +// Adds reference to a type if it is not a reference type, +// otherwise leaves it unchanged. This is the same as +// tr1::add_reference, which is not widely available yet. +template +struct AddReference { typedef T& type; }; // NOLINT +template +struct AddReference { typedef T& type; }; // NOLINT + +// A handy wrapper around AddReference that works when the argument T +// depends on template parameters. +#define GTEST_ADD_REFERENCE_(T) \ + typename ::testing::internal::AddReference::type + +// Adds a reference to const on top of T as necessary. For example, +// it transforms +// +// char ==> const char& +// const char ==> const char& +// char& ==> const char& +// const char& ==> const char& +// +// The argument T must depend on some template parameters. +#define GTEST_REFERENCE_TO_CONST_(T) \ + GTEST_ADD_REFERENCE_(const GTEST_REMOVE_REFERENCE_(T)) + +// ImplicitlyConvertible::value is a compile-time bool +// constant that's true iff type From can be implicitly converted to +// type To. +template +class ImplicitlyConvertible { + private: + // We need the following helper functions only for their types. + // They have no implementations. + + // MakeFrom() is an expression whose type is From. We cannot simply + // use From(), as the type From may not have a public default + // constructor. + static From MakeFrom(); + + // These two functions are overloaded. Given an expression + // Helper(x), the compiler will pick the first version if x can be + // implicitly converted to type To; otherwise it will pick the + // second version. + // + // The first version returns a value of size 1, and the second + // version returns a value of size 2. Therefore, by checking the + // size of Helper(x), which can be done at compile time, we can tell + // which version of Helper() is used, and hence whether x can be + // implicitly converted to type To. + static char Helper(To); + static char (&Helper(...))[2]; // NOLINT + + // We have to put the 'public' section after the 'private' section, + // or MSVC refuses to compile the code. + public: + // MSVC warns about implicitly converting from double to int for + // possible loss of data, so we need to temporarily disable the + // warning. +#ifdef _MSC_VER +# pragma warning(push) // Saves the current warning state. +# pragma warning(disable:4244) // Temporarily disables warning 4244. + + static const bool value = + sizeof(Helper(ImplicitlyConvertible::MakeFrom())) == 1; +# pragma warning(pop) // Restores the warning state. +#elif defined(__BORLANDC__) + // C++Builder cannot use member overload resolution during template + // instantiation. The simplest workaround is to use its C++0x type traits + // functions (C++Builder 2009 and above only). + static const bool value = __is_convertible(From, To); +#else + static const bool value = + sizeof(Helper(ImplicitlyConvertible::MakeFrom())) == 1; +#endif // _MSV_VER +}; +template +const bool ImplicitlyConvertible::value; + +// IsAProtocolMessage::value is a compile-time bool constant that's +// true iff T is type ProtocolMessage, proto2::Message, or a subclass +// of those. +template +struct IsAProtocolMessage + : public bool_constant< + ImplicitlyConvertible::value || + ImplicitlyConvertible::value> { +}; + +// When the compiler sees expression IsContainerTest(0), if C is an +// STL-style container class, the first overload of IsContainerTest +// will be viable (since both C::iterator* and C::const_iterator* are +// valid types and NULL can be implicitly converted to them). It will +// be picked over the second overload as 'int' is a perfect match for +// the type of argument 0. If C::iterator or C::const_iterator is not +// a valid type, the first overload is not viable, and the second +// overload will be picked. Therefore, we can determine whether C is +// a container class by checking the type of IsContainerTest(0). +// The value of the expression is insignificant. +// +// Note that we look for both C::iterator and C::const_iterator. The +// reason is that C++ injects the name of a class as a member of the +// class itself (e.g. you can refer to class iterator as either +// 'iterator' or 'iterator::iterator'). If we look for C::iterator +// only, for example, we would mistakenly think that a class named +// iterator is an STL container. +// +// Also note that the simpler approach of overloading +// IsContainerTest(typename C::const_iterator*) and +// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++. +typedef int IsContainer; +template +IsContainer IsContainerTest(int /* dummy */, + typename C::iterator* /* it */ = NULL, + typename C::const_iterator* /* const_it */ = NULL) { + return 0; +} + +typedef char IsNotContainer; +template +IsNotContainer IsContainerTest(long /* dummy */) { return '\0'; } + +// EnableIf::type is void when 'Cond' is true, and +// undefined when 'Cond' is false. To use SFINAE to make a function +// overload only apply when a particular expression is true, add +// "typename EnableIf::type* = 0" as the last parameter. +template struct EnableIf; +template<> struct EnableIf { typedef void type; }; // NOLINT + +// Utilities for native arrays. + +// ArrayEq() compares two k-dimensional native arrays using the +// elements' operator==, where k can be any integer >= 0. When k is +// 0, ArrayEq() degenerates into comparing a single pair of values. + +template +bool ArrayEq(const T* lhs, size_t size, const U* rhs); + +// This generic version is used when k is 0. +template +inline bool ArrayEq(const T& lhs, const U& rhs) { return lhs == rhs; } + +// This overload is used when k >= 1. +template +inline bool ArrayEq(const T(&lhs)[N], const U(&rhs)[N]) { + return internal::ArrayEq(lhs, N, rhs); +} + +// This helper reduces code bloat. If we instead put its logic inside +// the previous ArrayEq() function, arrays with different sizes would +// lead to different copies of the template code. +template +bool ArrayEq(const T* lhs, size_t size, const U* rhs) { + for (size_t i = 0; i != size; i++) { + if (!internal::ArrayEq(lhs[i], rhs[i])) + return false; + } + return true; +} + +// Finds the first element in the iterator range [begin, end) that +// equals elem. Element may be a native array type itself. +template +Iter ArrayAwareFind(Iter begin, Iter end, const Element& elem) { + for (Iter it = begin; it != end; ++it) { + if (internal::ArrayEq(*it, elem)) + return it; + } + return end; +} + +// CopyArray() copies a k-dimensional native array using the elements' +// operator=, where k can be any integer >= 0. When k is 0, +// CopyArray() degenerates into copying a single value. + +template +void CopyArray(const T* from, size_t size, U* to); + +// This generic version is used when k is 0. +template +inline void CopyArray(const T& from, U* to) { *to = from; } + +// This overload is used when k >= 1. +template +inline void CopyArray(const T(&from)[N], U(*to)[N]) { + internal::CopyArray(from, N, *to); +} + +// This helper reduces code bloat. If we instead put its logic inside +// the previous CopyArray() function, arrays with different sizes +// would lead to different copies of the template code. +template +void CopyArray(const T* from, size_t size, U* to) { + for (size_t i = 0; i != size; i++) { + internal::CopyArray(from[i], to + i); + } +} + +// The relation between an NativeArray object (see below) and the +// native array it represents. +enum RelationToSource { + kReference, // The NativeArray references the native array. + kCopy // The NativeArray makes a copy of the native array and + // owns the copy. +}; + +// Adapts a native array to a read-only STL-style container. Instead +// of the complete STL container concept, this adaptor only implements +// members useful for Google Mock's container matchers. New members +// should be added as needed. To simplify the implementation, we only +// support Element being a raw type (i.e. having no top-level const or +// reference modifier). It's the client's responsibility to satisfy +// this requirement. Element can be an array type itself (hence +// multi-dimensional arrays are supported). +template +class NativeArray { + public: + // STL-style container typedefs. + typedef Element value_type; + typedef Element* iterator; + typedef const Element* const_iterator; + + // Constructs from a native array. + NativeArray(const Element* array, size_t count, RelationToSource relation) { + Init(array, count, relation); + } + + // Copy constructor. + NativeArray(const NativeArray& rhs) { + Init(rhs.array_, rhs.size_, rhs.relation_to_source_); + } + + ~NativeArray() { + // Ensures that the user doesn't instantiate NativeArray with a + // const or reference type. + static_cast(StaticAssertTypeEqHelper()); + if (relation_to_source_ == kCopy) + delete[] array_; + } + + // STL-style container methods. + size_t size() const { return size_; } + const_iterator begin() const { return array_; } + const_iterator end() const { return array_ + size_; } + bool operator==(const NativeArray& rhs) const { + return size() == rhs.size() && + ArrayEq(begin(), size(), rhs.begin()); + } + + private: + // Initializes this object; makes a copy of the input array if + // 'relation' is kCopy. + void Init(const Element* array, size_t a_size, RelationToSource relation) { + if (relation == kReference) { + array_ = array; + } else { + Element* const copy = new Element[a_size]; + CopyArray(array, a_size, copy); + array_ = copy; + } + size_ = a_size; + relation_to_source_ = relation; + } + + const Element* array_; + size_t size_; + RelationToSource relation_to_source_; + + GTEST_DISALLOW_ASSIGN_(NativeArray); +}; + +} // namespace internal +} // namespace testing + +#define GTEST_MESSAGE_AT_(file, line, message, result_type) \ + ::testing::internal::AssertHelper(result_type, file, line, message) \ + = ::testing::Message() + +#define GTEST_MESSAGE_(message, result_type) \ + GTEST_MESSAGE_AT_(__FILE__, __LINE__, message, result_type) + +#define GTEST_FATAL_FAILURE_(message) \ + return GTEST_MESSAGE_(message, ::testing::TestPartResult::kFatalFailure) + +#define GTEST_NONFATAL_FAILURE_(message) \ + GTEST_MESSAGE_(message, ::testing::TestPartResult::kNonFatalFailure) + +#define GTEST_SUCCESS_(message) \ + GTEST_MESSAGE_(message, ::testing::TestPartResult::kSuccess) + +// Suppresses MSVC warnings 4072 (unreachable code) for the code following +// statement if it returns or throws (or doesn't return or throw in some +// situations). +#define GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) \ + if (::testing::internal::AlwaysTrue()) { statement; } + +#define GTEST_TEST_THROW_(statement, expected_exception, fail) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (::testing::internal::ConstCharPtr gtest_msg = "") { \ + bool gtest_caught_expected = false; \ + try { \ + GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ + } \ + catch (expected_exception const&) { \ + gtest_caught_expected = true; \ + } \ + catch (...) { \ + gtest_msg.value = \ + "Expected: " #statement " throws an exception of type " \ + #expected_exception ".\n Actual: it throws a different type."; \ + goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ + } \ + if (!gtest_caught_expected) { \ + gtest_msg.value = \ + "Expected: " #statement " throws an exception of type " \ + #expected_exception ".\n Actual: it throws nothing."; \ + goto GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__); \ + } \ + } else \ + GTEST_CONCAT_TOKEN_(gtest_label_testthrow_, __LINE__): \ + fail(gtest_msg.value) + +#define GTEST_TEST_NO_THROW_(statement, fail) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (::testing::internal::AlwaysTrue()) { \ + try { \ + GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ + } \ + catch (...) { \ + goto GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__); \ + } \ + } else \ + GTEST_CONCAT_TOKEN_(gtest_label_testnothrow_, __LINE__): \ + fail("Expected: " #statement " doesn't throw an exception.\n" \ + " Actual: it throws.") + +#define GTEST_TEST_ANY_THROW_(statement, fail) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (::testing::internal::AlwaysTrue()) { \ + bool gtest_caught_any = false; \ + try { \ + GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ + } \ + catch (...) { \ + gtest_caught_any = true; \ + } \ + if (!gtest_caught_any) { \ + goto GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__); \ + } \ + } else \ + GTEST_CONCAT_TOKEN_(gtest_label_testanythrow_, __LINE__): \ + fail("Expected: " #statement " throws an exception.\n" \ + " Actual: it doesn't.") + + +// Implements Boolean test assertions such as EXPECT_TRUE. expression can be +// either a boolean expression or an AssertionResult. text is a textual +// represenation of expression as it was passed into the EXPECT_TRUE. +#define GTEST_TEST_BOOLEAN_(expression, text, actual, expected, fail) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (const ::testing::AssertionResult gtest_ar_ = \ + ::testing::AssertionResult(expression)) \ + ; \ + else \ + fail(::testing::internal::GetBoolAssertionFailureMessage(\ + gtest_ar_, text, #actual, #expected).c_str()) + +#define GTEST_TEST_NO_FATAL_FAILURE_(statement, fail) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (::testing::internal::AlwaysTrue()) { \ + ::testing::internal::HasNewFatalFailureHelper gtest_fatal_failure_checker; \ + GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement); \ + if (gtest_fatal_failure_checker.has_new_fatal_failure()) { \ + goto GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__); \ + } \ + } else \ + GTEST_CONCAT_TOKEN_(gtest_label_testnofatal_, __LINE__): \ + fail("Expected: " #statement " doesn't generate new fatal " \ + "failures in the current thread.\n" \ + " Actual: it does.") + +// Expands to the name of the class that implements the given test. +#define GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \ + test_case_name##_##test_name##_Test + +// Helper macro for defining tests. +#define GTEST_TEST_(test_case_name, test_name, parent_class, parent_id)\ +class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\ + public:\ + GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\ + private:\ + virtual void TestBody();\ + static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\ + GTEST_DISALLOW_COPY_AND_ASSIGN_(\ + GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\ +};\ +\ +::testing::TestInfo* const GTEST_TEST_CLASS_NAME_(test_case_name, test_name)\ + ::test_info_ =\ + ::testing::internal::MakeAndRegisterTestInfo(\ + #test_case_name, #test_name, NULL, NULL, \ + (parent_id), \ + parent_class::SetUpTestCase, \ + parent_class::TearDownTestCase, \ + new ::testing::internal::TestFactoryImpl<\ + GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\ +void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_INTERNAL_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-linked_ptr.h b/lib/gtest/include/gtest/internal/gtest-linked_ptr.h new file mode 100644 index 00000000..b1362cd0 --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-linked_ptr.h @@ -0,0 +1,233 @@ +// Copyright 2003 Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Authors: Dan Egnor (egnor@google.com) +// +// A "smart" pointer type with reference tracking. Every pointer to a +// particular object is kept on a circular linked list. When the last pointer +// to an object is destroyed or reassigned, the object is deleted. +// +// Used properly, this deletes the object when the last reference goes away. +// There are several caveats: +// - Like all reference counting schemes, cycles lead to leaks. +// - Each smart pointer is actually two pointers (8 bytes instead of 4). +// - Every time a pointer is assigned, the entire list of pointers to that +// object is traversed. This class is therefore NOT SUITABLE when there +// will often be more than two or three pointers to a particular object. +// - References are only tracked as long as linked_ptr<> objects are copied. +// If a linked_ptr<> is converted to a raw pointer and back, BAD THINGS +// will happen (double deletion). +// +// A good use of this class is storing object references in STL containers. +// You can safely put linked_ptr<> in a vector<>. +// Other uses may not be as good. +// +// Note: If you use an incomplete type with linked_ptr<>, the class +// *containing* linked_ptr<> must have a constructor and destructor (even +// if they do nothing!). +// +// Bill Gibbons suggested we use something like this. +// +// Thread Safety: +// Unlike other linked_ptr implementations, in this implementation +// a linked_ptr object is thread-safe in the sense that: +// - it's safe to copy linked_ptr objects concurrently, +// - it's safe to copy *from* a linked_ptr and read its underlying +// raw pointer (e.g. via get()) concurrently, and +// - it's safe to write to two linked_ptrs that point to the same +// shared object concurrently. +// TODO(wan@google.com): rename this to safe_linked_ptr to avoid +// confusion with normal linked_ptr. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_ + +#include +#include + +#include "gtest/internal/gtest-port.h" + +namespace testing { +namespace internal { + +// Protects copying of all linked_ptr objects. +GTEST_API_ GTEST_DECLARE_STATIC_MUTEX_(g_linked_ptr_mutex); + +// This is used internally by all instances of linked_ptr<>. It needs to be +// a non-template class because different types of linked_ptr<> can refer to +// the same object (linked_ptr(obj) vs linked_ptr(obj)). +// So, it needs to be possible for different types of linked_ptr to participate +// in the same circular linked list, so we need a single class type here. +// +// DO NOT USE THIS CLASS DIRECTLY YOURSELF. Use linked_ptr. +class linked_ptr_internal { + public: + // Create a new circle that includes only this instance. + void join_new() { + next_ = this; + } + + // Many linked_ptr operations may change p.link_ for some linked_ptr + // variable p in the same circle as this object. Therefore we need + // to prevent two such operations from occurring concurrently. + // + // Note that different types of linked_ptr objects can coexist in a + // circle (e.g. linked_ptr, linked_ptr, and + // linked_ptr). Therefore we must use a single mutex to + // protect all linked_ptr objects. This can create serious + // contention in production code, but is acceptable in a testing + // framework. + + // Join an existing circle. + void join(linked_ptr_internal const* ptr) + GTEST_LOCK_EXCLUDED_(g_linked_ptr_mutex) { + MutexLock lock(&g_linked_ptr_mutex); + + linked_ptr_internal const* p = ptr; + while (p->next_ != ptr) p = p->next_; + p->next_ = this; + next_ = ptr; + } + + // Leave whatever circle we're part of. Returns true if we were the + // last member of the circle. Once this is done, you can join() another. + bool depart() + GTEST_LOCK_EXCLUDED_(g_linked_ptr_mutex) { + MutexLock lock(&g_linked_ptr_mutex); + + if (next_ == this) return true; + linked_ptr_internal const* p = next_; + while (p->next_ != this) p = p->next_; + p->next_ = next_; + return false; + } + + private: + mutable linked_ptr_internal const* next_; +}; + +template +class linked_ptr { + public: + typedef T element_type; + + // Take over ownership of a raw pointer. This should happen as soon as + // possible after the object is created. + explicit linked_ptr(T* ptr = NULL) { capture(ptr); } + ~linked_ptr() { depart(); } + + // Copy an existing linked_ptr<>, adding ourselves to the list of references. + template linked_ptr(linked_ptr const& ptr) { copy(&ptr); } + linked_ptr(linked_ptr const& ptr) { // NOLINT + assert(&ptr != this); + copy(&ptr); + } + + // Assignment releases the old value and acquires the new. + template linked_ptr& operator=(linked_ptr const& ptr) { + depart(); + copy(&ptr); + return *this; + } + + linked_ptr& operator=(linked_ptr const& ptr) { + if (&ptr != this) { + depart(); + copy(&ptr); + } + return *this; + } + + // Smart pointer members. + void reset(T* ptr = NULL) { + depart(); + capture(ptr); + } + T* get() const { return value_; } + T* operator->() const { return value_; } + T& operator*() const { return *value_; } + + bool operator==(T* p) const { return value_ == p; } + bool operator!=(T* p) const { return value_ != p; } + template + bool operator==(linked_ptr const& ptr) const { + return value_ == ptr.get(); + } + template + bool operator!=(linked_ptr const& ptr) const { + return value_ != ptr.get(); + } + + private: + template + friend class linked_ptr; + + T* value_; + linked_ptr_internal link_; + + void depart() { + if (link_.depart()) delete value_; + } + + void capture(T* ptr) { + value_ = ptr; + link_.join_new(); + } + + template void copy(linked_ptr const* ptr) { + value_ = ptr->get(); + if (value_) + link_.join(&ptr->link_); + else + link_.join_new(); + } +}; + +template inline +bool operator==(T* ptr, const linked_ptr& x) { + return ptr == x.get(); +} + +template inline +bool operator!=(T* ptr, const linked_ptr& x) { + return ptr != x.get(); +} + +// A function to convert T* into linked_ptr +// Doing e.g. make_linked_ptr(new FooBarBaz(arg)) is a shorter notation +// for linked_ptr >(new FooBarBaz(arg)) +template +linked_ptr make_linked_ptr(T* ptr) { + return linked_ptr(ptr); +} + +} // namespace internal +} // namespace testing + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-param-util-generated.h b/lib/gtest/include/gtest/internal/gtest-param-util-generated.h new file mode 100644 index 00000000..e8054859 --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-param-util-generated.h @@ -0,0 +1,5143 @@ +// This file was GENERATED by command: +// pump.py gtest-param-util-generated.h.pump +// DO NOT EDIT BY HAND!!! + +// Copyright 2008 Google Inc. +// All Rights Reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: vladl@google.com (Vlad Losev) + +// Type and function utilities for implementing parameterized tests. +// This file is generated by a SCRIPT. DO NOT EDIT BY HAND! +// +// Currently Google Test supports at most 50 arguments in Values, +// and at most 10 arguments in Combine. Please contact +// googletestframework@googlegroups.com if you need more. +// Please note that the number of arguments to Combine is limited +// by the maximum arity of the implementation of tr1::tuple which is +// currently set at 10. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ + +// scripts/fuse_gtest.py depends on gtest's own header being #included +// *unconditionally*. Therefore these #includes cannot be moved +// inside #if GTEST_HAS_PARAM_TEST. +#include "gtest/internal/gtest-param-util.h" +#include "gtest/internal/gtest-port.h" + +#if GTEST_HAS_PARAM_TEST + +namespace testing { + +// Forward declarations of ValuesIn(), which is implemented in +// include/gtest/gtest-param-test.h. +template +internal::ParamGenerator< + typename ::testing::internal::IteratorTraits::value_type> +ValuesIn(ForwardIterator begin, ForwardIterator end); + +template +internal::ParamGenerator ValuesIn(const T (&array)[N]); + +template +internal::ParamGenerator ValuesIn( + const Container& container); + +namespace internal { + +// Used in the Values() function to provide polymorphic capabilities. +template +class ValueArray1 { + public: + explicit ValueArray1(T1 v1) : v1_(v1) {} + + template + operator ParamGenerator() const { return ValuesIn(&v1_, &v1_ + 1); } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray1& other); + + const T1 v1_; +}; + +template +class ValueArray2 { + public: + ValueArray2(T1 v1, T2 v2) : v1_(v1), v2_(v2) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray2& other); + + const T1 v1_; + const T2 v2_; +}; + +template +class ValueArray3 { + public: + ValueArray3(T1 v1, T2 v2, T3 v3) : v1_(v1), v2_(v2), v3_(v3) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray3& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; +}; + +template +class ValueArray4 { + public: + ValueArray4(T1 v1, T2 v2, T3 v3, T4 v4) : v1_(v1), v2_(v2), v3_(v3), + v4_(v4) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray4& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; +}; + +template +class ValueArray5 { + public: + ValueArray5(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5) : v1_(v1), v2_(v2), v3_(v3), + v4_(v4), v5_(v5) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray5& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; +}; + +template +class ValueArray6 { + public: + ValueArray6(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6) : v1_(v1), v2_(v2), + v3_(v3), v4_(v4), v5_(v5), v6_(v6) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray6& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; +}; + +template +class ValueArray7 { + public: + ValueArray7(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7) : v1_(v1), + v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray7& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; +}; + +template +class ValueArray8 { + public: + ValueArray8(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, + T8 v8) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray8& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; +}; + +template +class ValueArray9 { + public: + ValueArray9(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, + T9 v9) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray9& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; +}; + +template +class ValueArray10 { + public: + ValueArray10(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9), v10_(v10) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray10& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; +}; + +template +class ValueArray11 { + public: + ValueArray11(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), + v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray11& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; +}; + +template +class ValueArray12 { + public: + ValueArray12(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), + v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray12& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; +}; + +template +class ValueArray13 { + public: + ValueArray13(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), + v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), + v12_(v12), v13_(v13) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray13& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; +}; + +template +class ValueArray14 { + public: + ValueArray14(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14) : v1_(v1), v2_(v2), v3_(v3), + v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), + v11_(v11), v12_(v12), v13_(v13), v14_(v14) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray14& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; +}; + +template +class ValueArray15 { + public: + ValueArray15(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15) : v1_(v1), v2_(v2), + v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), + v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray15& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; +}; + +template +class ValueArray16 { + public: + ValueArray16(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16) : v1_(v1), + v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), + v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), + v16_(v16) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray16& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; +}; + +template +class ValueArray17 { + public: + ValueArray17(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, + T17 v17) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), + v15_(v15), v16_(v16), v17_(v17) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray17& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; +}; + +template +class ValueArray18 { + public: + ValueArray18(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), + v15_(v15), v16_(v16), v17_(v17), v18_(v18) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray18& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; +}; + +template +class ValueArray19 { + public: + ValueArray19(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), + v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), + v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray19& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; +}; + +template +class ValueArray20 { + public: + ValueArray20(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), + v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), + v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), + v19_(v19), v20_(v20) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray20& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; +}; + +template +class ValueArray21 { + public: + ValueArray21(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), + v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), + v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), + v18_(v18), v19_(v19), v20_(v20), v21_(v21) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray21& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; +}; + +template +class ValueArray22 { + public: + ValueArray22(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22) : v1_(v1), v2_(v2), v3_(v3), + v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), + v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), + v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray22& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; +}; + +template +class ValueArray23 { + public: + ValueArray23(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23) : v1_(v1), v2_(v2), + v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), + v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), + v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), + v23_(v23) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray23& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; +}; + +template +class ValueArray24 { + public: + ValueArray24(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24) : v1_(v1), + v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), + v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), + v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), + v22_(v22), v23_(v23), v24_(v24) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray24& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; +}; + +template +class ValueArray25 { + public: + ValueArray25(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, + T25 v25) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), + v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), + v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray25& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; +}; + +template +class ValueArray26 { + public: + ValueArray26(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), + v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), + v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray26& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; +}; + +template +class ValueArray27 { + public: + ValueArray27(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), + v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), + v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), + v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), + v26_(v26), v27_(v27) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray27& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; +}; + +template +class ValueArray28 { + public: + ValueArray28(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), + v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), + v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), + v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), + v25_(v25), v26_(v26), v27_(v27), v28_(v28) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray28& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; +}; + +template +class ValueArray29 { + public: + ValueArray29(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), + v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), + v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), + v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), + v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray29& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; +}; + +template +class ValueArray30 { + public: + ValueArray30(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30) : v1_(v1), v2_(v2), v3_(v3), + v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), + v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), + v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), + v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), + v29_(v29), v30_(v30) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray30& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; +}; + +template +class ValueArray31 { + public: + ValueArray31(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31) : v1_(v1), v2_(v2), + v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), + v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), + v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), + v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), + v29_(v29), v30_(v30), v31_(v31) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray31& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; +}; + +template +class ValueArray32 { + public: + ValueArray32(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32) : v1_(v1), + v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), + v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), + v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), + v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), + v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray32& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; +}; + +template +class ValueArray33 { + public: + ValueArray33(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, + T33 v33) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), + v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), + v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), + v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), + v33_(v33) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray33& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; +}; + +template +class ValueArray34 { + public: + ValueArray34(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), + v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), + v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), + v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), + v33_(v33), v34_(v34) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray34& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; +}; + +template +class ValueArray35 { + public: + ValueArray35(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), + v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), + v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), + v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), + v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), + v32_(v32), v33_(v33), v34_(v34), v35_(v35) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray35& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; +}; + +template +class ValueArray36 { + public: + ValueArray36(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), + v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), + v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), + v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), + v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), + v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray36& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; +}; + +template +class ValueArray37 { + public: + ValueArray37(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), + v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), + v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), + v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), + v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), + v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), + v36_(v36), v37_(v37) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray37& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; +}; + +template +class ValueArray38 { + public: + ValueArray38(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38) : v1_(v1), v2_(v2), v3_(v3), + v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), + v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), + v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), + v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), + v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), + v35_(v35), v36_(v36), v37_(v37), v38_(v38) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray38& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; +}; + +template +class ValueArray39 { + public: + ValueArray39(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39) : v1_(v1), v2_(v2), + v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), + v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), + v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), + v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), + v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), + v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray39& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; +}; + +template +class ValueArray40 { + public: + ValueArray40(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40) : v1_(v1), + v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), + v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), + v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), + v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), + v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), + v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), + v40_(v40) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_), static_cast(v40_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray40& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; + const T40 v40_; +}; + +template +class ValueArray41 { + public: + ValueArray41(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, + T41 v41) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), + v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), + v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), + v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), + v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), + v39_(v39), v40_(v40), v41_(v41) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_), static_cast(v40_), static_cast(v41_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray41& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; + const T40 v40_; + const T41 v41_; +}; + +template +class ValueArray42 { + public: + ValueArray42(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), + v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), + v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), + v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), + v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), + v39_(v39), v40_(v40), v41_(v41), v42_(v42) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_), static_cast(v40_), static_cast(v41_), + static_cast(v42_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray42& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; + const T40 v40_; + const T41 v41_; + const T42 v42_; +}; + +template +class ValueArray43 { + public: + ValueArray43(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42, T43 v43) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), + v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), + v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), + v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), + v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), + v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), + v38_(v38), v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_), static_cast(v40_), static_cast(v41_), + static_cast(v42_), static_cast(v43_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray43& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; + const T40 v40_; + const T41 v41_; + const T42 v42_; + const T43 v43_; +}; + +template +class ValueArray44 { + public: + ValueArray44(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42, T43 v43, T44 v44) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), + v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), + v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), v18_(v18), + v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), v24_(v24), + v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), v30_(v30), + v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), v36_(v36), + v37_(v37), v38_(v38), v39_(v39), v40_(v40), v41_(v41), v42_(v42), + v43_(v43), v44_(v44) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_), static_cast(v40_), static_cast(v41_), + static_cast(v42_), static_cast(v43_), static_cast(v44_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray44& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; + const T40 v40_; + const T41 v41_; + const T42 v42_; + const T43 v43_; + const T44 v44_; +}; + +template +class ValueArray45 { + public: + ValueArray45(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42, T43 v43, T44 v44, T45 v45) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), + v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), v11_(v11), + v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), v17_(v17), + v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), v23_(v23), + v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), v29_(v29), + v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), v35_(v35), + v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40), v41_(v41), + v42_(v42), v43_(v43), v44_(v44), v45_(v45) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_), static_cast(v40_), static_cast(v41_), + static_cast(v42_), static_cast(v43_), static_cast(v44_), + static_cast(v45_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray45& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; + const T40 v40_; + const T41 v41_; + const T42 v42_; + const T43 v43_; + const T44 v44_; + const T45 v45_; +}; + +template +class ValueArray46 { + public: + ValueArray46(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42, T43 v43, T44 v44, T45 v45, T46 v46) : v1_(v1), v2_(v2), v3_(v3), + v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), + v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), + v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), + v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), + v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), + v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40), + v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45), v46_(v46) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_), static_cast(v40_), static_cast(v41_), + static_cast(v42_), static_cast(v43_), static_cast(v44_), + static_cast(v45_), static_cast(v46_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray46& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; + const T40 v40_; + const T41 v41_; + const T42 v42_; + const T43 v43_; + const T44 v44_; + const T45 v45_; + const T46 v46_; +}; + +template +class ValueArray47 { + public: + ValueArray47(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47) : v1_(v1), v2_(v2), + v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), v10_(v10), + v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), v16_(v16), + v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), v22_(v22), + v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), v28_(v28), + v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), v34_(v34), + v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), v40_(v40), + v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45), v46_(v46), + v47_(v47) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_), static_cast(v40_), static_cast(v41_), + static_cast(v42_), static_cast(v43_), static_cast(v44_), + static_cast(v45_), static_cast(v46_), static_cast(v47_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray47& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; + const T40 v40_; + const T41 v41_; + const T42 v42_; + const T43 v43_; + const T44 v44_; + const T45 v45_; + const T46 v46_; + const T47 v47_; +}; + +template +class ValueArray48 { + public: + ValueArray48(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48) : v1_(v1), + v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), v8_(v8), v9_(v9), + v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), v15_(v15), + v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), v21_(v21), + v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), v27_(v27), + v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), v33_(v33), + v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), v39_(v39), + v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44), v45_(v45), + v46_(v46), v47_(v47), v48_(v48) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_), static_cast(v40_), static_cast(v41_), + static_cast(v42_), static_cast(v43_), static_cast(v44_), + static_cast(v45_), static_cast(v46_), static_cast(v47_), + static_cast(v48_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray48& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; + const T40 v40_; + const T41 v41_; + const T42 v42_; + const T43 v43_; + const T44 v44_; + const T45 v45_; + const T46 v46_; + const T47 v47_; + const T48 v48_; +}; + +template +class ValueArray49 { + public: + ValueArray49(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48, + T49 v49) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), + v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), + v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), + v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), + v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), + v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44), + v45_(v45), v46_(v46), v47_(v47), v48_(v48), v49_(v49) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_), static_cast(v40_), static_cast(v41_), + static_cast(v42_), static_cast(v43_), static_cast(v44_), + static_cast(v45_), static_cast(v46_), static_cast(v47_), + static_cast(v48_), static_cast(v49_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray49& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; + const T40 v40_; + const T41 v41_; + const T42 v42_; + const T43 v43_; + const T44 v44_; + const T45 v45_; + const T46 v46_; + const T47 v47_; + const T48 v48_; + const T49 v49_; +}; + +template +class ValueArray50 { + public: + ValueArray50(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, + T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, + T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, + T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, + T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41, + T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47, T48 v48, T49 v49, + T50 v50) : v1_(v1), v2_(v2), v3_(v3), v4_(v4), v5_(v5), v6_(v6), v7_(v7), + v8_(v8), v9_(v9), v10_(v10), v11_(v11), v12_(v12), v13_(v13), v14_(v14), + v15_(v15), v16_(v16), v17_(v17), v18_(v18), v19_(v19), v20_(v20), + v21_(v21), v22_(v22), v23_(v23), v24_(v24), v25_(v25), v26_(v26), + v27_(v27), v28_(v28), v29_(v29), v30_(v30), v31_(v31), v32_(v32), + v33_(v33), v34_(v34), v35_(v35), v36_(v36), v37_(v37), v38_(v38), + v39_(v39), v40_(v40), v41_(v41), v42_(v42), v43_(v43), v44_(v44), + v45_(v45), v46_(v46), v47_(v47), v48_(v48), v49_(v49), v50_(v50) {} + + template + operator ParamGenerator() const { + const T array[] = {static_cast(v1_), static_cast(v2_), + static_cast(v3_), static_cast(v4_), static_cast(v5_), + static_cast(v6_), static_cast(v7_), static_cast(v8_), + static_cast(v9_), static_cast(v10_), static_cast(v11_), + static_cast(v12_), static_cast(v13_), static_cast(v14_), + static_cast(v15_), static_cast(v16_), static_cast(v17_), + static_cast(v18_), static_cast(v19_), static_cast(v20_), + static_cast(v21_), static_cast(v22_), static_cast(v23_), + static_cast(v24_), static_cast(v25_), static_cast(v26_), + static_cast(v27_), static_cast(v28_), static_cast(v29_), + static_cast(v30_), static_cast(v31_), static_cast(v32_), + static_cast(v33_), static_cast(v34_), static_cast(v35_), + static_cast(v36_), static_cast(v37_), static_cast(v38_), + static_cast(v39_), static_cast(v40_), static_cast(v41_), + static_cast(v42_), static_cast(v43_), static_cast(v44_), + static_cast(v45_), static_cast(v46_), static_cast(v47_), + static_cast(v48_), static_cast(v49_), static_cast(v50_)}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray50& other); + + const T1 v1_; + const T2 v2_; + const T3 v3_; + const T4 v4_; + const T5 v5_; + const T6 v6_; + const T7 v7_; + const T8 v8_; + const T9 v9_; + const T10 v10_; + const T11 v11_; + const T12 v12_; + const T13 v13_; + const T14 v14_; + const T15 v15_; + const T16 v16_; + const T17 v17_; + const T18 v18_; + const T19 v19_; + const T20 v20_; + const T21 v21_; + const T22 v22_; + const T23 v23_; + const T24 v24_; + const T25 v25_; + const T26 v26_; + const T27 v27_; + const T28 v28_; + const T29 v29_; + const T30 v30_; + const T31 v31_; + const T32 v32_; + const T33 v33_; + const T34 v34_; + const T35 v35_; + const T36 v36_; + const T37 v37_; + const T38 v38_; + const T39 v39_; + const T40 v40_; + const T41 v41_; + const T42 v42_; + const T43 v43_; + const T44 v44_; + const T45 v45_; + const T46 v46_; + const T47 v47_; + const T48 v48_; + const T49 v49_; + const T50 v50_; +}; + +# if GTEST_HAS_COMBINE +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// Generates values from the Cartesian product of values produced +// by the argument generators. +// +template +class CartesianProductGenerator2 + : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: + typedef ::std::tr1::tuple ParamType; + + CartesianProductGenerator2(const ParamGenerator& g1, + const ParamGenerator& g2) + : g1_(g1), g2_(g2) {} + virtual ~CartesianProductGenerator2() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin()); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, g1_, g1_.end(), g2_, g2_.end()); + } + + private: + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, + const ParamGenerator& g1, + const typename ParamGenerator::iterator& current1, + const ParamGenerator& g2, + const typename ParamGenerator::iterator& current2) + : base_(base), + begin1_(g1.begin()), end1_(g1.end()), current1_(current1), + begin2_(g2.begin()), end2_(g2.end()), current2_(current2) { + ComputeCurrentValue(); + } + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + // Advance should not be called on beyond-of-range iterators + // so no component iterators must be beyond end of range, either. + virtual void Advance() { + assert(!AtEnd()); + ++current2_; + if (current2_ == end2_) { + current2_ = begin2_; + ++current1_; + } + ComputeCurrentValue(); + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + virtual const ParamType* Current() const { return ¤t_value_; } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + const Iterator* typed_other = + CheckedDowncastToActualType(&other); + // We must report iterators equal if they both point beyond their + // respective ranges. That can happen in a variety of fashions, + // so we have to consult AtEnd(). + return (AtEnd() && typed_other->AtEnd()) || + ( + current1_ == typed_other->current1_ && + current2_ == typed_other->current2_); + } + + private: + Iterator(const Iterator& other) + : base_(other.base_), + begin1_(other.begin1_), + end1_(other.end1_), + current1_(other.current1_), + begin2_(other.begin2_), + end2_(other.end2_), + current2_(other.current2_) { + ComputeCurrentValue(); + } + + void ComputeCurrentValue() { + if (!AtEnd()) + current_value_ = ParamType(*current1_, *current2_); + } + bool AtEnd() const { + // We must report iterator past the end of the range when either of the + // component iterators has reached the end of its range. + return + current1_ == end1_ || + current2_ == end2_; + } + + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + + const ParamGeneratorInterface* const base_; + // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. + // current[i]_ is the actual traversing iterator. + const typename ParamGenerator::iterator begin1_; + const typename ParamGenerator::iterator end1_; + typename ParamGenerator::iterator current1_; + const typename ParamGenerator::iterator begin2_; + const typename ParamGenerator::iterator end2_; + typename ParamGenerator::iterator current2_; + ParamType current_value_; + }; // class CartesianProductGenerator2::Iterator + + // No implementation - assignment is unsupported. + void operator=(const CartesianProductGenerator2& other); + + const ParamGenerator g1_; + const ParamGenerator g2_; +}; // class CartesianProductGenerator2 + + +template +class CartesianProductGenerator3 + : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: + typedef ::std::tr1::tuple ParamType; + + CartesianProductGenerator3(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3) + : g1_(g1), g2_(g2), g3_(g3) {} + virtual ~CartesianProductGenerator3() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, + g3_.begin()); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end()); + } + + private: + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, + const ParamGenerator& g1, + const typename ParamGenerator::iterator& current1, + const ParamGenerator& g2, + const typename ParamGenerator::iterator& current2, + const ParamGenerator& g3, + const typename ParamGenerator::iterator& current3) + : base_(base), + begin1_(g1.begin()), end1_(g1.end()), current1_(current1), + begin2_(g2.begin()), end2_(g2.end()), current2_(current2), + begin3_(g3.begin()), end3_(g3.end()), current3_(current3) { + ComputeCurrentValue(); + } + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + // Advance should not be called on beyond-of-range iterators + // so no component iterators must be beyond end of range, either. + virtual void Advance() { + assert(!AtEnd()); + ++current3_; + if (current3_ == end3_) { + current3_ = begin3_; + ++current2_; + } + if (current2_ == end2_) { + current2_ = begin2_; + ++current1_; + } + ComputeCurrentValue(); + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + virtual const ParamType* Current() const { return ¤t_value_; } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + const Iterator* typed_other = + CheckedDowncastToActualType(&other); + // We must report iterators equal if they both point beyond their + // respective ranges. That can happen in a variety of fashions, + // so we have to consult AtEnd(). + return (AtEnd() && typed_other->AtEnd()) || + ( + current1_ == typed_other->current1_ && + current2_ == typed_other->current2_ && + current3_ == typed_other->current3_); + } + + private: + Iterator(const Iterator& other) + : base_(other.base_), + begin1_(other.begin1_), + end1_(other.end1_), + current1_(other.current1_), + begin2_(other.begin2_), + end2_(other.end2_), + current2_(other.current2_), + begin3_(other.begin3_), + end3_(other.end3_), + current3_(other.current3_) { + ComputeCurrentValue(); + } + + void ComputeCurrentValue() { + if (!AtEnd()) + current_value_ = ParamType(*current1_, *current2_, *current3_); + } + bool AtEnd() const { + // We must report iterator past the end of the range when either of the + // component iterators has reached the end of its range. + return + current1_ == end1_ || + current2_ == end2_ || + current3_ == end3_; + } + + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + + const ParamGeneratorInterface* const base_; + // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. + // current[i]_ is the actual traversing iterator. + const typename ParamGenerator::iterator begin1_; + const typename ParamGenerator::iterator end1_; + typename ParamGenerator::iterator current1_; + const typename ParamGenerator::iterator begin2_; + const typename ParamGenerator::iterator end2_; + typename ParamGenerator::iterator current2_; + const typename ParamGenerator::iterator begin3_; + const typename ParamGenerator::iterator end3_; + typename ParamGenerator::iterator current3_; + ParamType current_value_; + }; // class CartesianProductGenerator3::Iterator + + // No implementation - assignment is unsupported. + void operator=(const CartesianProductGenerator3& other); + + const ParamGenerator g1_; + const ParamGenerator g2_; + const ParamGenerator g3_; +}; // class CartesianProductGenerator3 + + +template +class CartesianProductGenerator4 + : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: + typedef ::std::tr1::tuple ParamType; + + CartesianProductGenerator4(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, + const ParamGenerator& g4) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {} + virtual ~CartesianProductGenerator4() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, + g3_.begin(), g4_, g4_.begin()); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), + g4_, g4_.end()); + } + + private: + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, + const ParamGenerator& g1, + const typename ParamGenerator::iterator& current1, + const ParamGenerator& g2, + const typename ParamGenerator::iterator& current2, + const ParamGenerator& g3, + const typename ParamGenerator::iterator& current3, + const ParamGenerator& g4, + const typename ParamGenerator::iterator& current4) + : base_(base), + begin1_(g1.begin()), end1_(g1.end()), current1_(current1), + begin2_(g2.begin()), end2_(g2.end()), current2_(current2), + begin3_(g3.begin()), end3_(g3.end()), current3_(current3), + begin4_(g4.begin()), end4_(g4.end()), current4_(current4) { + ComputeCurrentValue(); + } + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + // Advance should not be called on beyond-of-range iterators + // so no component iterators must be beyond end of range, either. + virtual void Advance() { + assert(!AtEnd()); + ++current4_; + if (current4_ == end4_) { + current4_ = begin4_; + ++current3_; + } + if (current3_ == end3_) { + current3_ = begin3_; + ++current2_; + } + if (current2_ == end2_) { + current2_ = begin2_; + ++current1_; + } + ComputeCurrentValue(); + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + virtual const ParamType* Current() const { return ¤t_value_; } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + const Iterator* typed_other = + CheckedDowncastToActualType(&other); + // We must report iterators equal if they both point beyond their + // respective ranges. That can happen in a variety of fashions, + // so we have to consult AtEnd(). + return (AtEnd() && typed_other->AtEnd()) || + ( + current1_ == typed_other->current1_ && + current2_ == typed_other->current2_ && + current3_ == typed_other->current3_ && + current4_ == typed_other->current4_); + } + + private: + Iterator(const Iterator& other) + : base_(other.base_), + begin1_(other.begin1_), + end1_(other.end1_), + current1_(other.current1_), + begin2_(other.begin2_), + end2_(other.end2_), + current2_(other.current2_), + begin3_(other.begin3_), + end3_(other.end3_), + current3_(other.current3_), + begin4_(other.begin4_), + end4_(other.end4_), + current4_(other.current4_) { + ComputeCurrentValue(); + } + + void ComputeCurrentValue() { + if (!AtEnd()) + current_value_ = ParamType(*current1_, *current2_, *current3_, + *current4_); + } + bool AtEnd() const { + // We must report iterator past the end of the range when either of the + // component iterators has reached the end of its range. + return + current1_ == end1_ || + current2_ == end2_ || + current3_ == end3_ || + current4_ == end4_; + } + + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + + const ParamGeneratorInterface* const base_; + // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. + // current[i]_ is the actual traversing iterator. + const typename ParamGenerator::iterator begin1_; + const typename ParamGenerator::iterator end1_; + typename ParamGenerator::iterator current1_; + const typename ParamGenerator::iterator begin2_; + const typename ParamGenerator::iterator end2_; + typename ParamGenerator::iterator current2_; + const typename ParamGenerator::iterator begin3_; + const typename ParamGenerator::iterator end3_; + typename ParamGenerator::iterator current3_; + const typename ParamGenerator::iterator begin4_; + const typename ParamGenerator::iterator end4_; + typename ParamGenerator::iterator current4_; + ParamType current_value_; + }; // class CartesianProductGenerator4::Iterator + + // No implementation - assignment is unsupported. + void operator=(const CartesianProductGenerator4& other); + + const ParamGenerator g1_; + const ParamGenerator g2_; + const ParamGenerator g3_; + const ParamGenerator g4_; +}; // class CartesianProductGenerator4 + + +template +class CartesianProductGenerator5 + : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: + typedef ::std::tr1::tuple ParamType; + + CartesianProductGenerator5(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, + const ParamGenerator& g4, const ParamGenerator& g5) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {} + virtual ~CartesianProductGenerator5() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, + g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin()); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), + g4_, g4_.end(), g5_, g5_.end()); + } + + private: + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, + const ParamGenerator& g1, + const typename ParamGenerator::iterator& current1, + const ParamGenerator& g2, + const typename ParamGenerator::iterator& current2, + const ParamGenerator& g3, + const typename ParamGenerator::iterator& current3, + const ParamGenerator& g4, + const typename ParamGenerator::iterator& current4, + const ParamGenerator& g5, + const typename ParamGenerator::iterator& current5) + : base_(base), + begin1_(g1.begin()), end1_(g1.end()), current1_(current1), + begin2_(g2.begin()), end2_(g2.end()), current2_(current2), + begin3_(g3.begin()), end3_(g3.end()), current3_(current3), + begin4_(g4.begin()), end4_(g4.end()), current4_(current4), + begin5_(g5.begin()), end5_(g5.end()), current5_(current5) { + ComputeCurrentValue(); + } + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + // Advance should not be called on beyond-of-range iterators + // so no component iterators must be beyond end of range, either. + virtual void Advance() { + assert(!AtEnd()); + ++current5_; + if (current5_ == end5_) { + current5_ = begin5_; + ++current4_; + } + if (current4_ == end4_) { + current4_ = begin4_; + ++current3_; + } + if (current3_ == end3_) { + current3_ = begin3_; + ++current2_; + } + if (current2_ == end2_) { + current2_ = begin2_; + ++current1_; + } + ComputeCurrentValue(); + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + virtual const ParamType* Current() const { return ¤t_value_; } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + const Iterator* typed_other = + CheckedDowncastToActualType(&other); + // We must report iterators equal if they both point beyond their + // respective ranges. That can happen in a variety of fashions, + // so we have to consult AtEnd(). + return (AtEnd() && typed_other->AtEnd()) || + ( + current1_ == typed_other->current1_ && + current2_ == typed_other->current2_ && + current3_ == typed_other->current3_ && + current4_ == typed_other->current4_ && + current5_ == typed_other->current5_); + } + + private: + Iterator(const Iterator& other) + : base_(other.base_), + begin1_(other.begin1_), + end1_(other.end1_), + current1_(other.current1_), + begin2_(other.begin2_), + end2_(other.end2_), + current2_(other.current2_), + begin3_(other.begin3_), + end3_(other.end3_), + current3_(other.current3_), + begin4_(other.begin4_), + end4_(other.end4_), + current4_(other.current4_), + begin5_(other.begin5_), + end5_(other.end5_), + current5_(other.current5_) { + ComputeCurrentValue(); + } + + void ComputeCurrentValue() { + if (!AtEnd()) + current_value_ = ParamType(*current1_, *current2_, *current3_, + *current4_, *current5_); + } + bool AtEnd() const { + // We must report iterator past the end of the range when either of the + // component iterators has reached the end of its range. + return + current1_ == end1_ || + current2_ == end2_ || + current3_ == end3_ || + current4_ == end4_ || + current5_ == end5_; + } + + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + + const ParamGeneratorInterface* const base_; + // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. + // current[i]_ is the actual traversing iterator. + const typename ParamGenerator::iterator begin1_; + const typename ParamGenerator::iterator end1_; + typename ParamGenerator::iterator current1_; + const typename ParamGenerator::iterator begin2_; + const typename ParamGenerator::iterator end2_; + typename ParamGenerator::iterator current2_; + const typename ParamGenerator::iterator begin3_; + const typename ParamGenerator::iterator end3_; + typename ParamGenerator::iterator current3_; + const typename ParamGenerator::iterator begin4_; + const typename ParamGenerator::iterator end4_; + typename ParamGenerator::iterator current4_; + const typename ParamGenerator::iterator begin5_; + const typename ParamGenerator::iterator end5_; + typename ParamGenerator::iterator current5_; + ParamType current_value_; + }; // class CartesianProductGenerator5::Iterator + + // No implementation - assignment is unsupported. + void operator=(const CartesianProductGenerator5& other); + + const ParamGenerator g1_; + const ParamGenerator g2_; + const ParamGenerator g3_; + const ParamGenerator g4_; + const ParamGenerator g5_; +}; // class CartesianProductGenerator5 + + +template +class CartesianProductGenerator6 + : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: + typedef ::std::tr1::tuple ParamType; + + CartesianProductGenerator6(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, + const ParamGenerator& g4, const ParamGenerator& g5, + const ParamGenerator& g6) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {} + virtual ~CartesianProductGenerator6() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, + g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin()); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), + g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end()); + } + + private: + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, + const ParamGenerator& g1, + const typename ParamGenerator::iterator& current1, + const ParamGenerator& g2, + const typename ParamGenerator::iterator& current2, + const ParamGenerator& g3, + const typename ParamGenerator::iterator& current3, + const ParamGenerator& g4, + const typename ParamGenerator::iterator& current4, + const ParamGenerator& g5, + const typename ParamGenerator::iterator& current5, + const ParamGenerator& g6, + const typename ParamGenerator::iterator& current6) + : base_(base), + begin1_(g1.begin()), end1_(g1.end()), current1_(current1), + begin2_(g2.begin()), end2_(g2.end()), current2_(current2), + begin3_(g3.begin()), end3_(g3.end()), current3_(current3), + begin4_(g4.begin()), end4_(g4.end()), current4_(current4), + begin5_(g5.begin()), end5_(g5.end()), current5_(current5), + begin6_(g6.begin()), end6_(g6.end()), current6_(current6) { + ComputeCurrentValue(); + } + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + // Advance should not be called on beyond-of-range iterators + // so no component iterators must be beyond end of range, either. + virtual void Advance() { + assert(!AtEnd()); + ++current6_; + if (current6_ == end6_) { + current6_ = begin6_; + ++current5_; + } + if (current5_ == end5_) { + current5_ = begin5_; + ++current4_; + } + if (current4_ == end4_) { + current4_ = begin4_; + ++current3_; + } + if (current3_ == end3_) { + current3_ = begin3_; + ++current2_; + } + if (current2_ == end2_) { + current2_ = begin2_; + ++current1_; + } + ComputeCurrentValue(); + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + virtual const ParamType* Current() const { return ¤t_value_; } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + const Iterator* typed_other = + CheckedDowncastToActualType(&other); + // We must report iterators equal if they both point beyond their + // respective ranges. That can happen in a variety of fashions, + // so we have to consult AtEnd(). + return (AtEnd() && typed_other->AtEnd()) || + ( + current1_ == typed_other->current1_ && + current2_ == typed_other->current2_ && + current3_ == typed_other->current3_ && + current4_ == typed_other->current4_ && + current5_ == typed_other->current5_ && + current6_ == typed_other->current6_); + } + + private: + Iterator(const Iterator& other) + : base_(other.base_), + begin1_(other.begin1_), + end1_(other.end1_), + current1_(other.current1_), + begin2_(other.begin2_), + end2_(other.end2_), + current2_(other.current2_), + begin3_(other.begin3_), + end3_(other.end3_), + current3_(other.current3_), + begin4_(other.begin4_), + end4_(other.end4_), + current4_(other.current4_), + begin5_(other.begin5_), + end5_(other.end5_), + current5_(other.current5_), + begin6_(other.begin6_), + end6_(other.end6_), + current6_(other.current6_) { + ComputeCurrentValue(); + } + + void ComputeCurrentValue() { + if (!AtEnd()) + current_value_ = ParamType(*current1_, *current2_, *current3_, + *current4_, *current5_, *current6_); + } + bool AtEnd() const { + // We must report iterator past the end of the range when either of the + // component iterators has reached the end of its range. + return + current1_ == end1_ || + current2_ == end2_ || + current3_ == end3_ || + current4_ == end4_ || + current5_ == end5_ || + current6_ == end6_; + } + + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + + const ParamGeneratorInterface* const base_; + // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. + // current[i]_ is the actual traversing iterator. + const typename ParamGenerator::iterator begin1_; + const typename ParamGenerator::iterator end1_; + typename ParamGenerator::iterator current1_; + const typename ParamGenerator::iterator begin2_; + const typename ParamGenerator::iterator end2_; + typename ParamGenerator::iterator current2_; + const typename ParamGenerator::iterator begin3_; + const typename ParamGenerator::iterator end3_; + typename ParamGenerator::iterator current3_; + const typename ParamGenerator::iterator begin4_; + const typename ParamGenerator::iterator end4_; + typename ParamGenerator::iterator current4_; + const typename ParamGenerator::iterator begin5_; + const typename ParamGenerator::iterator end5_; + typename ParamGenerator::iterator current5_; + const typename ParamGenerator::iterator begin6_; + const typename ParamGenerator::iterator end6_; + typename ParamGenerator::iterator current6_; + ParamType current_value_; + }; // class CartesianProductGenerator6::Iterator + + // No implementation - assignment is unsupported. + void operator=(const CartesianProductGenerator6& other); + + const ParamGenerator g1_; + const ParamGenerator g2_; + const ParamGenerator g3_; + const ParamGenerator g4_; + const ParamGenerator g5_; + const ParamGenerator g6_; +}; // class CartesianProductGenerator6 + + +template +class CartesianProductGenerator7 + : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: + typedef ::std::tr1::tuple ParamType; + + CartesianProductGenerator7(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, + const ParamGenerator& g4, const ParamGenerator& g5, + const ParamGenerator& g6, const ParamGenerator& g7) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {} + virtual ~CartesianProductGenerator7() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, + g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_, + g7_.begin()); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), + g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end()); + } + + private: + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, + const ParamGenerator& g1, + const typename ParamGenerator::iterator& current1, + const ParamGenerator& g2, + const typename ParamGenerator::iterator& current2, + const ParamGenerator& g3, + const typename ParamGenerator::iterator& current3, + const ParamGenerator& g4, + const typename ParamGenerator::iterator& current4, + const ParamGenerator& g5, + const typename ParamGenerator::iterator& current5, + const ParamGenerator& g6, + const typename ParamGenerator::iterator& current6, + const ParamGenerator& g7, + const typename ParamGenerator::iterator& current7) + : base_(base), + begin1_(g1.begin()), end1_(g1.end()), current1_(current1), + begin2_(g2.begin()), end2_(g2.end()), current2_(current2), + begin3_(g3.begin()), end3_(g3.end()), current3_(current3), + begin4_(g4.begin()), end4_(g4.end()), current4_(current4), + begin5_(g5.begin()), end5_(g5.end()), current5_(current5), + begin6_(g6.begin()), end6_(g6.end()), current6_(current6), + begin7_(g7.begin()), end7_(g7.end()), current7_(current7) { + ComputeCurrentValue(); + } + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + // Advance should not be called on beyond-of-range iterators + // so no component iterators must be beyond end of range, either. + virtual void Advance() { + assert(!AtEnd()); + ++current7_; + if (current7_ == end7_) { + current7_ = begin7_; + ++current6_; + } + if (current6_ == end6_) { + current6_ = begin6_; + ++current5_; + } + if (current5_ == end5_) { + current5_ = begin5_; + ++current4_; + } + if (current4_ == end4_) { + current4_ = begin4_; + ++current3_; + } + if (current3_ == end3_) { + current3_ = begin3_; + ++current2_; + } + if (current2_ == end2_) { + current2_ = begin2_; + ++current1_; + } + ComputeCurrentValue(); + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + virtual const ParamType* Current() const { return ¤t_value_; } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + const Iterator* typed_other = + CheckedDowncastToActualType(&other); + // We must report iterators equal if they both point beyond their + // respective ranges. That can happen in a variety of fashions, + // so we have to consult AtEnd(). + return (AtEnd() && typed_other->AtEnd()) || + ( + current1_ == typed_other->current1_ && + current2_ == typed_other->current2_ && + current3_ == typed_other->current3_ && + current4_ == typed_other->current4_ && + current5_ == typed_other->current5_ && + current6_ == typed_other->current6_ && + current7_ == typed_other->current7_); + } + + private: + Iterator(const Iterator& other) + : base_(other.base_), + begin1_(other.begin1_), + end1_(other.end1_), + current1_(other.current1_), + begin2_(other.begin2_), + end2_(other.end2_), + current2_(other.current2_), + begin3_(other.begin3_), + end3_(other.end3_), + current3_(other.current3_), + begin4_(other.begin4_), + end4_(other.end4_), + current4_(other.current4_), + begin5_(other.begin5_), + end5_(other.end5_), + current5_(other.current5_), + begin6_(other.begin6_), + end6_(other.end6_), + current6_(other.current6_), + begin7_(other.begin7_), + end7_(other.end7_), + current7_(other.current7_) { + ComputeCurrentValue(); + } + + void ComputeCurrentValue() { + if (!AtEnd()) + current_value_ = ParamType(*current1_, *current2_, *current3_, + *current4_, *current5_, *current6_, *current7_); + } + bool AtEnd() const { + // We must report iterator past the end of the range when either of the + // component iterators has reached the end of its range. + return + current1_ == end1_ || + current2_ == end2_ || + current3_ == end3_ || + current4_ == end4_ || + current5_ == end5_ || + current6_ == end6_ || + current7_ == end7_; + } + + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + + const ParamGeneratorInterface* const base_; + // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. + // current[i]_ is the actual traversing iterator. + const typename ParamGenerator::iterator begin1_; + const typename ParamGenerator::iterator end1_; + typename ParamGenerator::iterator current1_; + const typename ParamGenerator::iterator begin2_; + const typename ParamGenerator::iterator end2_; + typename ParamGenerator::iterator current2_; + const typename ParamGenerator::iterator begin3_; + const typename ParamGenerator::iterator end3_; + typename ParamGenerator::iterator current3_; + const typename ParamGenerator::iterator begin4_; + const typename ParamGenerator::iterator end4_; + typename ParamGenerator::iterator current4_; + const typename ParamGenerator::iterator begin5_; + const typename ParamGenerator::iterator end5_; + typename ParamGenerator::iterator current5_; + const typename ParamGenerator::iterator begin6_; + const typename ParamGenerator::iterator end6_; + typename ParamGenerator::iterator current6_; + const typename ParamGenerator::iterator begin7_; + const typename ParamGenerator::iterator end7_; + typename ParamGenerator::iterator current7_; + ParamType current_value_; + }; // class CartesianProductGenerator7::Iterator + + // No implementation - assignment is unsupported. + void operator=(const CartesianProductGenerator7& other); + + const ParamGenerator g1_; + const ParamGenerator g2_; + const ParamGenerator g3_; + const ParamGenerator g4_; + const ParamGenerator g5_; + const ParamGenerator g6_; + const ParamGenerator g7_; +}; // class CartesianProductGenerator7 + + +template +class CartesianProductGenerator8 + : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: + typedef ::std::tr1::tuple ParamType; + + CartesianProductGenerator8(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, + const ParamGenerator& g4, const ParamGenerator& g5, + const ParamGenerator& g6, const ParamGenerator& g7, + const ParamGenerator& g8) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), + g8_(g8) {} + virtual ~CartesianProductGenerator8() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, + g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_, + g7_.begin(), g8_, g8_.begin()); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), + g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_, + g8_.end()); + } + + private: + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, + const ParamGenerator& g1, + const typename ParamGenerator::iterator& current1, + const ParamGenerator& g2, + const typename ParamGenerator::iterator& current2, + const ParamGenerator& g3, + const typename ParamGenerator::iterator& current3, + const ParamGenerator& g4, + const typename ParamGenerator::iterator& current4, + const ParamGenerator& g5, + const typename ParamGenerator::iterator& current5, + const ParamGenerator& g6, + const typename ParamGenerator::iterator& current6, + const ParamGenerator& g7, + const typename ParamGenerator::iterator& current7, + const ParamGenerator& g8, + const typename ParamGenerator::iterator& current8) + : base_(base), + begin1_(g1.begin()), end1_(g1.end()), current1_(current1), + begin2_(g2.begin()), end2_(g2.end()), current2_(current2), + begin3_(g3.begin()), end3_(g3.end()), current3_(current3), + begin4_(g4.begin()), end4_(g4.end()), current4_(current4), + begin5_(g5.begin()), end5_(g5.end()), current5_(current5), + begin6_(g6.begin()), end6_(g6.end()), current6_(current6), + begin7_(g7.begin()), end7_(g7.end()), current7_(current7), + begin8_(g8.begin()), end8_(g8.end()), current8_(current8) { + ComputeCurrentValue(); + } + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + // Advance should not be called on beyond-of-range iterators + // so no component iterators must be beyond end of range, either. + virtual void Advance() { + assert(!AtEnd()); + ++current8_; + if (current8_ == end8_) { + current8_ = begin8_; + ++current7_; + } + if (current7_ == end7_) { + current7_ = begin7_; + ++current6_; + } + if (current6_ == end6_) { + current6_ = begin6_; + ++current5_; + } + if (current5_ == end5_) { + current5_ = begin5_; + ++current4_; + } + if (current4_ == end4_) { + current4_ = begin4_; + ++current3_; + } + if (current3_ == end3_) { + current3_ = begin3_; + ++current2_; + } + if (current2_ == end2_) { + current2_ = begin2_; + ++current1_; + } + ComputeCurrentValue(); + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + virtual const ParamType* Current() const { return ¤t_value_; } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + const Iterator* typed_other = + CheckedDowncastToActualType(&other); + // We must report iterators equal if they both point beyond their + // respective ranges. That can happen in a variety of fashions, + // so we have to consult AtEnd(). + return (AtEnd() && typed_other->AtEnd()) || + ( + current1_ == typed_other->current1_ && + current2_ == typed_other->current2_ && + current3_ == typed_other->current3_ && + current4_ == typed_other->current4_ && + current5_ == typed_other->current5_ && + current6_ == typed_other->current6_ && + current7_ == typed_other->current7_ && + current8_ == typed_other->current8_); + } + + private: + Iterator(const Iterator& other) + : base_(other.base_), + begin1_(other.begin1_), + end1_(other.end1_), + current1_(other.current1_), + begin2_(other.begin2_), + end2_(other.end2_), + current2_(other.current2_), + begin3_(other.begin3_), + end3_(other.end3_), + current3_(other.current3_), + begin4_(other.begin4_), + end4_(other.end4_), + current4_(other.current4_), + begin5_(other.begin5_), + end5_(other.end5_), + current5_(other.current5_), + begin6_(other.begin6_), + end6_(other.end6_), + current6_(other.current6_), + begin7_(other.begin7_), + end7_(other.end7_), + current7_(other.current7_), + begin8_(other.begin8_), + end8_(other.end8_), + current8_(other.current8_) { + ComputeCurrentValue(); + } + + void ComputeCurrentValue() { + if (!AtEnd()) + current_value_ = ParamType(*current1_, *current2_, *current3_, + *current4_, *current5_, *current6_, *current7_, *current8_); + } + bool AtEnd() const { + // We must report iterator past the end of the range when either of the + // component iterators has reached the end of its range. + return + current1_ == end1_ || + current2_ == end2_ || + current3_ == end3_ || + current4_ == end4_ || + current5_ == end5_ || + current6_ == end6_ || + current7_ == end7_ || + current8_ == end8_; + } + + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + + const ParamGeneratorInterface* const base_; + // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. + // current[i]_ is the actual traversing iterator. + const typename ParamGenerator::iterator begin1_; + const typename ParamGenerator::iterator end1_; + typename ParamGenerator::iterator current1_; + const typename ParamGenerator::iterator begin2_; + const typename ParamGenerator::iterator end2_; + typename ParamGenerator::iterator current2_; + const typename ParamGenerator::iterator begin3_; + const typename ParamGenerator::iterator end3_; + typename ParamGenerator::iterator current3_; + const typename ParamGenerator::iterator begin4_; + const typename ParamGenerator::iterator end4_; + typename ParamGenerator::iterator current4_; + const typename ParamGenerator::iterator begin5_; + const typename ParamGenerator::iterator end5_; + typename ParamGenerator::iterator current5_; + const typename ParamGenerator::iterator begin6_; + const typename ParamGenerator::iterator end6_; + typename ParamGenerator::iterator current6_; + const typename ParamGenerator::iterator begin7_; + const typename ParamGenerator::iterator end7_; + typename ParamGenerator::iterator current7_; + const typename ParamGenerator::iterator begin8_; + const typename ParamGenerator::iterator end8_; + typename ParamGenerator::iterator current8_; + ParamType current_value_; + }; // class CartesianProductGenerator8::Iterator + + // No implementation - assignment is unsupported. + void operator=(const CartesianProductGenerator8& other); + + const ParamGenerator g1_; + const ParamGenerator g2_; + const ParamGenerator g3_; + const ParamGenerator g4_; + const ParamGenerator g5_; + const ParamGenerator g6_; + const ParamGenerator g7_; + const ParamGenerator g8_; +}; // class CartesianProductGenerator8 + + +template +class CartesianProductGenerator9 + : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: + typedef ::std::tr1::tuple ParamType; + + CartesianProductGenerator9(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, + const ParamGenerator& g4, const ParamGenerator& g5, + const ParamGenerator& g6, const ParamGenerator& g7, + const ParamGenerator& g8, const ParamGenerator& g9) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8), + g9_(g9) {} + virtual ~CartesianProductGenerator9() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, + g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_, + g7_.begin(), g8_, g8_.begin(), g9_, g9_.begin()); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), + g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_, + g8_.end(), g9_, g9_.end()); + } + + private: + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, + const ParamGenerator& g1, + const typename ParamGenerator::iterator& current1, + const ParamGenerator& g2, + const typename ParamGenerator::iterator& current2, + const ParamGenerator& g3, + const typename ParamGenerator::iterator& current3, + const ParamGenerator& g4, + const typename ParamGenerator::iterator& current4, + const ParamGenerator& g5, + const typename ParamGenerator::iterator& current5, + const ParamGenerator& g6, + const typename ParamGenerator::iterator& current6, + const ParamGenerator& g7, + const typename ParamGenerator::iterator& current7, + const ParamGenerator& g8, + const typename ParamGenerator::iterator& current8, + const ParamGenerator& g9, + const typename ParamGenerator::iterator& current9) + : base_(base), + begin1_(g1.begin()), end1_(g1.end()), current1_(current1), + begin2_(g2.begin()), end2_(g2.end()), current2_(current2), + begin3_(g3.begin()), end3_(g3.end()), current3_(current3), + begin4_(g4.begin()), end4_(g4.end()), current4_(current4), + begin5_(g5.begin()), end5_(g5.end()), current5_(current5), + begin6_(g6.begin()), end6_(g6.end()), current6_(current6), + begin7_(g7.begin()), end7_(g7.end()), current7_(current7), + begin8_(g8.begin()), end8_(g8.end()), current8_(current8), + begin9_(g9.begin()), end9_(g9.end()), current9_(current9) { + ComputeCurrentValue(); + } + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + // Advance should not be called on beyond-of-range iterators + // so no component iterators must be beyond end of range, either. + virtual void Advance() { + assert(!AtEnd()); + ++current9_; + if (current9_ == end9_) { + current9_ = begin9_; + ++current8_; + } + if (current8_ == end8_) { + current8_ = begin8_; + ++current7_; + } + if (current7_ == end7_) { + current7_ = begin7_; + ++current6_; + } + if (current6_ == end6_) { + current6_ = begin6_; + ++current5_; + } + if (current5_ == end5_) { + current5_ = begin5_; + ++current4_; + } + if (current4_ == end4_) { + current4_ = begin4_; + ++current3_; + } + if (current3_ == end3_) { + current3_ = begin3_; + ++current2_; + } + if (current2_ == end2_) { + current2_ = begin2_; + ++current1_; + } + ComputeCurrentValue(); + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + virtual const ParamType* Current() const { return ¤t_value_; } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + const Iterator* typed_other = + CheckedDowncastToActualType(&other); + // We must report iterators equal if they both point beyond their + // respective ranges. That can happen in a variety of fashions, + // so we have to consult AtEnd(). + return (AtEnd() && typed_other->AtEnd()) || + ( + current1_ == typed_other->current1_ && + current2_ == typed_other->current2_ && + current3_ == typed_other->current3_ && + current4_ == typed_other->current4_ && + current5_ == typed_other->current5_ && + current6_ == typed_other->current6_ && + current7_ == typed_other->current7_ && + current8_ == typed_other->current8_ && + current9_ == typed_other->current9_); + } + + private: + Iterator(const Iterator& other) + : base_(other.base_), + begin1_(other.begin1_), + end1_(other.end1_), + current1_(other.current1_), + begin2_(other.begin2_), + end2_(other.end2_), + current2_(other.current2_), + begin3_(other.begin3_), + end3_(other.end3_), + current3_(other.current3_), + begin4_(other.begin4_), + end4_(other.end4_), + current4_(other.current4_), + begin5_(other.begin5_), + end5_(other.end5_), + current5_(other.current5_), + begin6_(other.begin6_), + end6_(other.end6_), + current6_(other.current6_), + begin7_(other.begin7_), + end7_(other.end7_), + current7_(other.current7_), + begin8_(other.begin8_), + end8_(other.end8_), + current8_(other.current8_), + begin9_(other.begin9_), + end9_(other.end9_), + current9_(other.current9_) { + ComputeCurrentValue(); + } + + void ComputeCurrentValue() { + if (!AtEnd()) + current_value_ = ParamType(*current1_, *current2_, *current3_, + *current4_, *current5_, *current6_, *current7_, *current8_, + *current9_); + } + bool AtEnd() const { + // We must report iterator past the end of the range when either of the + // component iterators has reached the end of its range. + return + current1_ == end1_ || + current2_ == end2_ || + current3_ == end3_ || + current4_ == end4_ || + current5_ == end5_ || + current6_ == end6_ || + current7_ == end7_ || + current8_ == end8_ || + current9_ == end9_; + } + + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + + const ParamGeneratorInterface* const base_; + // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. + // current[i]_ is the actual traversing iterator. + const typename ParamGenerator::iterator begin1_; + const typename ParamGenerator::iterator end1_; + typename ParamGenerator::iterator current1_; + const typename ParamGenerator::iterator begin2_; + const typename ParamGenerator::iterator end2_; + typename ParamGenerator::iterator current2_; + const typename ParamGenerator::iterator begin3_; + const typename ParamGenerator::iterator end3_; + typename ParamGenerator::iterator current3_; + const typename ParamGenerator::iterator begin4_; + const typename ParamGenerator::iterator end4_; + typename ParamGenerator::iterator current4_; + const typename ParamGenerator::iterator begin5_; + const typename ParamGenerator::iterator end5_; + typename ParamGenerator::iterator current5_; + const typename ParamGenerator::iterator begin6_; + const typename ParamGenerator::iterator end6_; + typename ParamGenerator::iterator current6_; + const typename ParamGenerator::iterator begin7_; + const typename ParamGenerator::iterator end7_; + typename ParamGenerator::iterator current7_; + const typename ParamGenerator::iterator begin8_; + const typename ParamGenerator::iterator end8_; + typename ParamGenerator::iterator current8_; + const typename ParamGenerator::iterator begin9_; + const typename ParamGenerator::iterator end9_; + typename ParamGenerator::iterator current9_; + ParamType current_value_; + }; // class CartesianProductGenerator9::Iterator + + // No implementation - assignment is unsupported. + void operator=(const CartesianProductGenerator9& other); + + const ParamGenerator g1_; + const ParamGenerator g2_; + const ParamGenerator g3_; + const ParamGenerator g4_; + const ParamGenerator g5_; + const ParamGenerator g6_; + const ParamGenerator g7_; + const ParamGenerator g8_; + const ParamGenerator g9_; +}; // class CartesianProductGenerator9 + + +template +class CartesianProductGenerator10 + : public ParamGeneratorInterface< ::std::tr1::tuple > { + public: + typedef ::std::tr1::tuple ParamType; + + CartesianProductGenerator10(const ParamGenerator& g1, + const ParamGenerator& g2, const ParamGenerator& g3, + const ParamGenerator& g4, const ParamGenerator& g5, + const ParamGenerator& g6, const ParamGenerator& g7, + const ParamGenerator& g8, const ParamGenerator& g9, + const ParamGenerator& g10) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8), + g9_(g9), g10_(g10) {} + virtual ~CartesianProductGenerator10() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, g1_, g1_.begin(), g2_, g2_.begin(), g3_, + g3_.begin(), g4_, g4_.begin(), g5_, g5_.begin(), g6_, g6_.begin(), g7_, + g7_.begin(), g8_, g8_.begin(), g9_, g9_.begin(), g10_, g10_.begin()); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, g1_, g1_.end(), g2_, g2_.end(), g3_, g3_.end(), + g4_, g4_.end(), g5_, g5_.end(), g6_, g6_.end(), g7_, g7_.end(), g8_, + g8_.end(), g9_, g9_.end(), g10_, g10_.end()); + } + + private: + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, + const ParamGenerator& g1, + const typename ParamGenerator::iterator& current1, + const ParamGenerator& g2, + const typename ParamGenerator::iterator& current2, + const ParamGenerator& g3, + const typename ParamGenerator::iterator& current3, + const ParamGenerator& g4, + const typename ParamGenerator::iterator& current4, + const ParamGenerator& g5, + const typename ParamGenerator::iterator& current5, + const ParamGenerator& g6, + const typename ParamGenerator::iterator& current6, + const ParamGenerator& g7, + const typename ParamGenerator::iterator& current7, + const ParamGenerator& g8, + const typename ParamGenerator::iterator& current8, + const ParamGenerator& g9, + const typename ParamGenerator::iterator& current9, + const ParamGenerator& g10, + const typename ParamGenerator::iterator& current10) + : base_(base), + begin1_(g1.begin()), end1_(g1.end()), current1_(current1), + begin2_(g2.begin()), end2_(g2.end()), current2_(current2), + begin3_(g3.begin()), end3_(g3.end()), current3_(current3), + begin4_(g4.begin()), end4_(g4.end()), current4_(current4), + begin5_(g5.begin()), end5_(g5.end()), current5_(current5), + begin6_(g6.begin()), end6_(g6.end()), current6_(current6), + begin7_(g7.begin()), end7_(g7.end()), current7_(current7), + begin8_(g8.begin()), end8_(g8.end()), current8_(current8), + begin9_(g9.begin()), end9_(g9.end()), current9_(current9), + begin10_(g10.begin()), end10_(g10.end()), current10_(current10) { + ComputeCurrentValue(); + } + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + // Advance should not be called on beyond-of-range iterators + // so no component iterators must be beyond end of range, either. + virtual void Advance() { + assert(!AtEnd()); + ++current10_; + if (current10_ == end10_) { + current10_ = begin10_; + ++current9_; + } + if (current9_ == end9_) { + current9_ = begin9_; + ++current8_; + } + if (current8_ == end8_) { + current8_ = begin8_; + ++current7_; + } + if (current7_ == end7_) { + current7_ = begin7_; + ++current6_; + } + if (current6_ == end6_) { + current6_ = begin6_; + ++current5_; + } + if (current5_ == end5_) { + current5_ = begin5_; + ++current4_; + } + if (current4_ == end4_) { + current4_ = begin4_; + ++current3_; + } + if (current3_ == end3_) { + current3_ = begin3_; + ++current2_; + } + if (current2_ == end2_) { + current2_ = begin2_; + ++current1_; + } + ComputeCurrentValue(); + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + virtual const ParamType* Current() const { return ¤t_value_; } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + const Iterator* typed_other = + CheckedDowncastToActualType(&other); + // We must report iterators equal if they both point beyond their + // respective ranges. That can happen in a variety of fashions, + // so we have to consult AtEnd(). + return (AtEnd() && typed_other->AtEnd()) || + ( + current1_ == typed_other->current1_ && + current2_ == typed_other->current2_ && + current3_ == typed_other->current3_ && + current4_ == typed_other->current4_ && + current5_ == typed_other->current5_ && + current6_ == typed_other->current6_ && + current7_ == typed_other->current7_ && + current8_ == typed_other->current8_ && + current9_ == typed_other->current9_ && + current10_ == typed_other->current10_); + } + + private: + Iterator(const Iterator& other) + : base_(other.base_), + begin1_(other.begin1_), + end1_(other.end1_), + current1_(other.current1_), + begin2_(other.begin2_), + end2_(other.end2_), + current2_(other.current2_), + begin3_(other.begin3_), + end3_(other.end3_), + current3_(other.current3_), + begin4_(other.begin4_), + end4_(other.end4_), + current4_(other.current4_), + begin5_(other.begin5_), + end5_(other.end5_), + current5_(other.current5_), + begin6_(other.begin6_), + end6_(other.end6_), + current6_(other.current6_), + begin7_(other.begin7_), + end7_(other.end7_), + current7_(other.current7_), + begin8_(other.begin8_), + end8_(other.end8_), + current8_(other.current8_), + begin9_(other.begin9_), + end9_(other.end9_), + current9_(other.current9_), + begin10_(other.begin10_), + end10_(other.end10_), + current10_(other.current10_) { + ComputeCurrentValue(); + } + + void ComputeCurrentValue() { + if (!AtEnd()) + current_value_ = ParamType(*current1_, *current2_, *current3_, + *current4_, *current5_, *current6_, *current7_, *current8_, + *current9_, *current10_); + } + bool AtEnd() const { + // We must report iterator past the end of the range when either of the + // component iterators has reached the end of its range. + return + current1_ == end1_ || + current2_ == end2_ || + current3_ == end3_ || + current4_ == end4_ || + current5_ == end5_ || + current6_ == end6_ || + current7_ == end7_ || + current8_ == end8_ || + current9_ == end9_ || + current10_ == end10_; + } + + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + + const ParamGeneratorInterface* const base_; + // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. + // current[i]_ is the actual traversing iterator. + const typename ParamGenerator::iterator begin1_; + const typename ParamGenerator::iterator end1_; + typename ParamGenerator::iterator current1_; + const typename ParamGenerator::iterator begin2_; + const typename ParamGenerator::iterator end2_; + typename ParamGenerator::iterator current2_; + const typename ParamGenerator::iterator begin3_; + const typename ParamGenerator::iterator end3_; + typename ParamGenerator::iterator current3_; + const typename ParamGenerator::iterator begin4_; + const typename ParamGenerator::iterator end4_; + typename ParamGenerator::iterator current4_; + const typename ParamGenerator::iterator begin5_; + const typename ParamGenerator::iterator end5_; + typename ParamGenerator::iterator current5_; + const typename ParamGenerator::iterator begin6_; + const typename ParamGenerator::iterator end6_; + typename ParamGenerator::iterator current6_; + const typename ParamGenerator::iterator begin7_; + const typename ParamGenerator::iterator end7_; + typename ParamGenerator::iterator current7_; + const typename ParamGenerator::iterator begin8_; + const typename ParamGenerator::iterator end8_; + typename ParamGenerator::iterator current8_; + const typename ParamGenerator::iterator begin9_; + const typename ParamGenerator::iterator end9_; + typename ParamGenerator::iterator current9_; + const typename ParamGenerator::iterator begin10_; + const typename ParamGenerator::iterator end10_; + typename ParamGenerator::iterator current10_; + ParamType current_value_; + }; // class CartesianProductGenerator10::Iterator + + // No implementation - assignment is unsupported. + void operator=(const CartesianProductGenerator10& other); + + const ParamGenerator g1_; + const ParamGenerator g2_; + const ParamGenerator g3_; + const ParamGenerator g4_; + const ParamGenerator g5_; + const ParamGenerator g6_; + const ParamGenerator g7_; + const ParamGenerator g8_; + const ParamGenerator g9_; + const ParamGenerator g10_; +}; // class CartesianProductGenerator10 + + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// Helper classes providing Combine() with polymorphic features. They allow +// casting CartesianProductGeneratorN to ParamGenerator if T is +// convertible to U. +// +template +class CartesianProductHolder2 { + public: +CartesianProductHolder2(const Generator1& g1, const Generator2& g2) + : g1_(g1), g2_(g2) {} + template + operator ParamGenerator< ::std::tr1::tuple >() const { + return ParamGenerator< ::std::tr1::tuple >( + new CartesianProductGenerator2( + static_cast >(g1_), + static_cast >(g2_))); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const CartesianProductHolder2& other); + + const Generator1 g1_; + const Generator2 g2_; +}; // class CartesianProductHolder2 + +template +class CartesianProductHolder3 { + public: +CartesianProductHolder3(const Generator1& g1, const Generator2& g2, + const Generator3& g3) + : g1_(g1), g2_(g2), g3_(g3) {} + template + operator ParamGenerator< ::std::tr1::tuple >() const { + return ParamGenerator< ::std::tr1::tuple >( + new CartesianProductGenerator3( + static_cast >(g1_), + static_cast >(g2_), + static_cast >(g3_))); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const CartesianProductHolder3& other); + + const Generator1 g1_; + const Generator2 g2_; + const Generator3 g3_; +}; // class CartesianProductHolder3 + +template +class CartesianProductHolder4 { + public: +CartesianProductHolder4(const Generator1& g1, const Generator2& g2, + const Generator3& g3, const Generator4& g4) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4) {} + template + operator ParamGenerator< ::std::tr1::tuple >() const { + return ParamGenerator< ::std::tr1::tuple >( + new CartesianProductGenerator4( + static_cast >(g1_), + static_cast >(g2_), + static_cast >(g3_), + static_cast >(g4_))); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const CartesianProductHolder4& other); + + const Generator1 g1_; + const Generator2 g2_; + const Generator3 g3_; + const Generator4 g4_; +}; // class CartesianProductHolder4 + +template +class CartesianProductHolder5 { + public: +CartesianProductHolder5(const Generator1& g1, const Generator2& g2, + const Generator3& g3, const Generator4& g4, const Generator5& g5) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5) {} + template + operator ParamGenerator< ::std::tr1::tuple >() const { + return ParamGenerator< ::std::tr1::tuple >( + new CartesianProductGenerator5( + static_cast >(g1_), + static_cast >(g2_), + static_cast >(g3_), + static_cast >(g4_), + static_cast >(g5_))); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const CartesianProductHolder5& other); + + const Generator1 g1_; + const Generator2 g2_; + const Generator3 g3_; + const Generator4 g4_; + const Generator5 g5_; +}; // class CartesianProductHolder5 + +template +class CartesianProductHolder6 { + public: +CartesianProductHolder6(const Generator1& g1, const Generator2& g2, + const Generator3& g3, const Generator4& g4, const Generator5& g5, + const Generator6& g6) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6) {} + template + operator ParamGenerator< ::std::tr1::tuple >() const { + return ParamGenerator< ::std::tr1::tuple >( + new CartesianProductGenerator6( + static_cast >(g1_), + static_cast >(g2_), + static_cast >(g3_), + static_cast >(g4_), + static_cast >(g5_), + static_cast >(g6_))); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const CartesianProductHolder6& other); + + const Generator1 g1_; + const Generator2 g2_; + const Generator3 g3_; + const Generator4 g4_; + const Generator5 g5_; + const Generator6 g6_; +}; // class CartesianProductHolder6 + +template +class CartesianProductHolder7 { + public: +CartesianProductHolder7(const Generator1& g1, const Generator2& g2, + const Generator3& g3, const Generator4& g4, const Generator5& g5, + const Generator6& g6, const Generator7& g7) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7) {} + template + operator ParamGenerator< ::std::tr1::tuple >() const { + return ParamGenerator< ::std::tr1::tuple >( + new CartesianProductGenerator7( + static_cast >(g1_), + static_cast >(g2_), + static_cast >(g3_), + static_cast >(g4_), + static_cast >(g5_), + static_cast >(g6_), + static_cast >(g7_))); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const CartesianProductHolder7& other); + + const Generator1 g1_; + const Generator2 g2_; + const Generator3 g3_; + const Generator4 g4_; + const Generator5 g5_; + const Generator6 g6_; + const Generator7 g7_; +}; // class CartesianProductHolder7 + +template +class CartesianProductHolder8 { + public: +CartesianProductHolder8(const Generator1& g1, const Generator2& g2, + const Generator3& g3, const Generator4& g4, const Generator5& g5, + const Generator6& g6, const Generator7& g7, const Generator8& g8) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), + g8_(g8) {} + template + operator ParamGenerator< ::std::tr1::tuple >() const { + return ParamGenerator< ::std::tr1::tuple >( + new CartesianProductGenerator8( + static_cast >(g1_), + static_cast >(g2_), + static_cast >(g3_), + static_cast >(g4_), + static_cast >(g5_), + static_cast >(g6_), + static_cast >(g7_), + static_cast >(g8_))); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const CartesianProductHolder8& other); + + const Generator1 g1_; + const Generator2 g2_; + const Generator3 g3_; + const Generator4 g4_; + const Generator5 g5_; + const Generator6 g6_; + const Generator7 g7_; + const Generator8 g8_; +}; // class CartesianProductHolder8 + +template +class CartesianProductHolder9 { + public: +CartesianProductHolder9(const Generator1& g1, const Generator2& g2, + const Generator3& g3, const Generator4& g4, const Generator5& g5, + const Generator6& g6, const Generator7& g7, const Generator8& g8, + const Generator9& g9) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8), + g9_(g9) {} + template + operator ParamGenerator< ::std::tr1::tuple >() const { + return ParamGenerator< ::std::tr1::tuple >( + new CartesianProductGenerator9( + static_cast >(g1_), + static_cast >(g2_), + static_cast >(g3_), + static_cast >(g4_), + static_cast >(g5_), + static_cast >(g6_), + static_cast >(g7_), + static_cast >(g8_), + static_cast >(g9_))); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const CartesianProductHolder9& other); + + const Generator1 g1_; + const Generator2 g2_; + const Generator3 g3_; + const Generator4 g4_; + const Generator5 g5_; + const Generator6 g6_; + const Generator7 g7_; + const Generator8 g8_; + const Generator9 g9_; +}; // class CartesianProductHolder9 + +template +class CartesianProductHolder10 { + public: +CartesianProductHolder10(const Generator1& g1, const Generator2& g2, + const Generator3& g3, const Generator4& g4, const Generator5& g5, + const Generator6& g6, const Generator7& g7, const Generator8& g8, + const Generator9& g9, const Generator10& g10) + : g1_(g1), g2_(g2), g3_(g3), g4_(g4), g5_(g5), g6_(g6), g7_(g7), g8_(g8), + g9_(g9), g10_(g10) {} + template + operator ParamGenerator< ::std::tr1::tuple >() const { + return ParamGenerator< ::std::tr1::tuple >( + new CartesianProductGenerator10( + static_cast >(g1_), + static_cast >(g2_), + static_cast >(g3_), + static_cast >(g4_), + static_cast >(g5_), + static_cast >(g6_), + static_cast >(g7_), + static_cast >(g8_), + static_cast >(g9_), + static_cast >(g10_))); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const CartesianProductHolder10& other); + + const Generator1 g1_; + const Generator2 g2_; + const Generator3 g3_; + const Generator4 g4_; + const Generator5 g5_; + const Generator6 g6_; + const Generator7 g7_; + const Generator8 g8_; + const Generator9 g9_; + const Generator10 g10_; +}; // class CartesianProductHolder10 + +# endif // GTEST_HAS_COMBINE + +} // namespace internal +} // namespace testing + +#endif // GTEST_HAS_PARAM_TEST + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-param-util-generated.h.pump b/lib/gtest/include/gtest/internal/gtest-param-util-generated.h.pump new file mode 100644 index 00000000..009206fd --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-param-util-generated.h.pump @@ -0,0 +1,301 @@ +$$ -*- mode: c++; -*- +$var n = 50 $$ Maximum length of Values arguments we want to support. +$var maxtuple = 10 $$ Maximum number of Combine arguments we want to support. +// Copyright 2008 Google Inc. +// All Rights Reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: vladl@google.com (Vlad Losev) + +// Type and function utilities for implementing parameterized tests. +// This file is generated by a SCRIPT. DO NOT EDIT BY HAND! +// +// Currently Google Test supports at most $n arguments in Values, +// and at most $maxtuple arguments in Combine. Please contact +// googletestframework@googlegroups.com if you need more. +// Please note that the number of arguments to Combine is limited +// by the maximum arity of the implementation of tr1::tuple which is +// currently set at $maxtuple. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ + +// scripts/fuse_gtest.py depends on gtest's own header being #included +// *unconditionally*. Therefore these #includes cannot be moved +// inside #if GTEST_HAS_PARAM_TEST. +#include "gtest/internal/gtest-param-util.h" +#include "gtest/internal/gtest-port.h" + +#if GTEST_HAS_PARAM_TEST + +namespace testing { + +// Forward declarations of ValuesIn(), which is implemented in +// include/gtest/gtest-param-test.h. +template +internal::ParamGenerator< + typename ::testing::internal::IteratorTraits::value_type> +ValuesIn(ForwardIterator begin, ForwardIterator end); + +template +internal::ParamGenerator ValuesIn(const T (&array)[N]); + +template +internal::ParamGenerator ValuesIn( + const Container& container); + +namespace internal { + +// Used in the Values() function to provide polymorphic capabilities. +template +class ValueArray1 { + public: + explicit ValueArray1(T1 v1) : v1_(v1) {} + + template + operator ParamGenerator() const { return ValuesIn(&v1_, &v1_ + 1); } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray1& other); + + const T1 v1_; +}; + +$range i 2..n +$for i [[ +$range j 1..i + +template <$for j, [[typename T$j]]> +class ValueArray$i { + public: + ValueArray$i($for j, [[T$j v$j]]) : $for j, [[v$(j)_(v$j)]] {} + + template + operator ParamGenerator() const { + const T array[] = {$for j, [[static_cast(v$(j)_)]]}; + return ValuesIn(array); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray$i& other); + +$for j [[ + + const T$j v$(j)_; +]] + +}; + +]] + +# if GTEST_HAS_COMBINE +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// Generates values from the Cartesian product of values produced +// by the argument generators. +// +$range i 2..maxtuple +$for i [[ +$range j 1..i +$range k 2..i + +template <$for j, [[typename T$j]]> +class CartesianProductGenerator$i + : public ParamGeneratorInterface< ::std::tr1::tuple<$for j, [[T$j]]> > { + public: + typedef ::std::tr1::tuple<$for j, [[T$j]]> ParamType; + + CartesianProductGenerator$i($for j, [[const ParamGenerator& g$j]]) + : $for j, [[g$(j)_(g$j)]] {} + virtual ~CartesianProductGenerator$i() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, $for j, [[g$(j)_, g$(j)_.begin()]]); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, $for j, [[g$(j)_, g$(j)_.end()]]); + } + + private: + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, $for j, [[ + + const ParamGenerator& g$j, + const typename ParamGenerator::iterator& current$(j)]]) + : base_(base), +$for j, [[ + + begin$(j)_(g$j.begin()), end$(j)_(g$j.end()), current$(j)_(current$j) +]] { + ComputeCurrentValue(); + } + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + // Advance should not be called on beyond-of-range iterators + // so no component iterators must be beyond end of range, either. + virtual void Advance() { + assert(!AtEnd()); + ++current$(i)_; + +$for k [[ + if (current$(i+2-k)_ == end$(i+2-k)_) { + current$(i+2-k)_ = begin$(i+2-k)_; + ++current$(i+2-k-1)_; + } + +]] + ComputeCurrentValue(); + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + virtual const ParamType* Current() const { return ¤t_value_; } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + const Iterator* typed_other = + CheckedDowncastToActualType(&other); + // We must report iterators equal if they both point beyond their + // respective ranges. That can happen in a variety of fashions, + // so we have to consult AtEnd(). + return (AtEnd() && typed_other->AtEnd()) || + ($for j && [[ + + current$(j)_ == typed_other->current$(j)_ +]]); + } + + private: + Iterator(const Iterator& other) + : base_(other.base_), $for j, [[ + + begin$(j)_(other.begin$(j)_), + end$(j)_(other.end$(j)_), + current$(j)_(other.current$(j)_) +]] { + ComputeCurrentValue(); + } + + void ComputeCurrentValue() { + if (!AtEnd()) + current_value_ = ParamType($for j, [[*current$(j)_]]); + } + bool AtEnd() const { + // We must report iterator past the end of the range when either of the + // component iterators has reached the end of its range. + return +$for j || [[ + + current$(j)_ == end$(j)_ +]]; + } + + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + + const ParamGeneratorInterface* const base_; + // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. + // current[i]_ is the actual traversing iterator. +$for j [[ + + const typename ParamGenerator::iterator begin$(j)_; + const typename ParamGenerator::iterator end$(j)_; + typename ParamGenerator::iterator current$(j)_; +]] + + ParamType current_value_; + }; // class CartesianProductGenerator$i::Iterator + + // No implementation - assignment is unsupported. + void operator=(const CartesianProductGenerator$i& other); + + +$for j [[ + const ParamGenerator g$(j)_; + +]] +}; // class CartesianProductGenerator$i + + +]] + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// Helper classes providing Combine() with polymorphic features. They allow +// casting CartesianProductGeneratorN to ParamGenerator if T is +// convertible to U. +// +$range i 2..maxtuple +$for i [[ +$range j 1..i + +template <$for j, [[class Generator$j]]> +class CartesianProductHolder$i { + public: +CartesianProductHolder$i($for j, [[const Generator$j& g$j]]) + : $for j, [[g$(j)_(g$j)]] {} + template <$for j, [[typename T$j]]> + operator ParamGenerator< ::std::tr1::tuple<$for j, [[T$j]]> >() const { + return ParamGenerator< ::std::tr1::tuple<$for j, [[T$j]]> >( + new CartesianProductGenerator$i<$for j, [[T$j]]>( +$for j,[[ + + static_cast >(g$(j)_) +]])); + } + + private: + // No implementation - assignment is unsupported. + void operator=(const CartesianProductHolder$i& other); + + +$for j [[ + const Generator$j g$(j)_; + +]] +}; // class CartesianProductHolder$i + +]] + +# endif // GTEST_HAS_COMBINE + +} // namespace internal +} // namespace testing + +#endif // GTEST_HAS_PARAM_TEST + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-param-util.h b/lib/gtest/include/gtest/internal/gtest-param-util.h new file mode 100644 index 00000000..d5e1028b --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-param-util.h @@ -0,0 +1,619 @@ +// Copyright 2008 Google Inc. +// All Rights Reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: vladl@google.com (Vlad Losev) + +// Type and function utilities for implementing parameterized tests. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_ + +#include +#include +#include + +// scripts/fuse_gtest.py depends on gtest's own header being #included +// *unconditionally*. Therefore these #includes cannot be moved +// inside #if GTEST_HAS_PARAM_TEST. +#include "gtest/internal/gtest-internal.h" +#include "gtest/internal/gtest-linked_ptr.h" +#include "gtest/internal/gtest-port.h" +#include "gtest/gtest-printers.h" + +#if GTEST_HAS_PARAM_TEST + +namespace testing { +namespace internal { + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// Outputs a message explaining invalid registration of different +// fixture class for the same test case. This may happen when +// TEST_P macro is used to define two tests with the same name +// but in different namespaces. +GTEST_API_ void ReportInvalidTestCaseType(const char* test_case_name, + const char* file, int line); + +template class ParamGeneratorInterface; +template class ParamGenerator; + +// Interface for iterating over elements provided by an implementation +// of ParamGeneratorInterface. +template +class ParamIteratorInterface { + public: + virtual ~ParamIteratorInterface() {} + // A pointer to the base generator instance. + // Used only for the purposes of iterator comparison + // to make sure that two iterators belong to the same generator. + virtual const ParamGeneratorInterface* BaseGenerator() const = 0; + // Advances iterator to point to the next element + // provided by the generator. The caller is responsible + // for not calling Advance() on an iterator equal to + // BaseGenerator()->End(). + virtual void Advance() = 0; + // Clones the iterator object. Used for implementing copy semantics + // of ParamIterator. + virtual ParamIteratorInterface* Clone() const = 0; + // Dereferences the current iterator and provides (read-only) access + // to the pointed value. It is the caller's responsibility not to call + // Current() on an iterator equal to BaseGenerator()->End(). + // Used for implementing ParamGenerator::operator*(). + virtual const T* Current() const = 0; + // Determines whether the given iterator and other point to the same + // element in the sequence generated by the generator. + // Used for implementing ParamGenerator::operator==(). + virtual bool Equals(const ParamIteratorInterface& other) const = 0; +}; + +// Class iterating over elements provided by an implementation of +// ParamGeneratorInterface. It wraps ParamIteratorInterface +// and implements the const forward iterator concept. +template +class ParamIterator { + public: + typedef T value_type; + typedef const T& reference; + typedef ptrdiff_t difference_type; + + // ParamIterator assumes ownership of the impl_ pointer. + ParamIterator(const ParamIterator& other) : impl_(other.impl_->Clone()) {} + ParamIterator& operator=(const ParamIterator& other) { + if (this != &other) + impl_.reset(other.impl_->Clone()); + return *this; + } + + const T& operator*() const { return *impl_->Current(); } + const T* operator->() const { return impl_->Current(); } + // Prefix version of operator++. + ParamIterator& operator++() { + impl_->Advance(); + return *this; + } + // Postfix version of operator++. + ParamIterator operator++(int /*unused*/) { + ParamIteratorInterface* clone = impl_->Clone(); + impl_->Advance(); + return ParamIterator(clone); + } + bool operator==(const ParamIterator& other) const { + return impl_.get() == other.impl_.get() || impl_->Equals(*other.impl_); + } + bool operator!=(const ParamIterator& other) const { + return !(*this == other); + } + + private: + friend class ParamGenerator; + explicit ParamIterator(ParamIteratorInterface* impl) : impl_(impl) {} + scoped_ptr > impl_; +}; + +// ParamGeneratorInterface is the binary interface to access generators +// defined in other translation units. +template +class ParamGeneratorInterface { + public: + typedef T ParamType; + + virtual ~ParamGeneratorInterface() {} + + // Generator interface definition + virtual ParamIteratorInterface* Begin() const = 0; + virtual ParamIteratorInterface* End() const = 0; +}; + +// Wraps ParamGeneratorInterface and provides general generator syntax +// compatible with the STL Container concept. +// This class implements copy initialization semantics and the contained +// ParamGeneratorInterface instance is shared among all copies +// of the original object. This is possible because that instance is immutable. +template +class ParamGenerator { + public: + typedef ParamIterator iterator; + + explicit ParamGenerator(ParamGeneratorInterface* impl) : impl_(impl) {} + ParamGenerator(const ParamGenerator& other) : impl_(other.impl_) {} + + ParamGenerator& operator=(const ParamGenerator& other) { + impl_ = other.impl_; + return *this; + } + + iterator begin() const { return iterator(impl_->Begin()); } + iterator end() const { return iterator(impl_->End()); } + + private: + linked_ptr > impl_; +}; + +// Generates values from a range of two comparable values. Can be used to +// generate sequences of user-defined types that implement operator+() and +// operator<(). +// This class is used in the Range() function. +template +class RangeGenerator : public ParamGeneratorInterface { + public: + RangeGenerator(T begin, T end, IncrementT step) + : begin_(begin), end_(end), + step_(step), end_index_(CalculateEndIndex(begin, end, step)) {} + virtual ~RangeGenerator() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, begin_, 0, step_); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, end_, end_index_, step_); + } + + private: + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, T value, int index, + IncrementT step) + : base_(base), value_(value), index_(index), step_(step) {} + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + virtual void Advance() { + value_ = value_ + step_; + index_++; + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + virtual const T* Current() const { return &value_; } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + const int other_index = + CheckedDowncastToActualType(&other)->index_; + return index_ == other_index; + } + + private: + Iterator(const Iterator& other) + : ParamIteratorInterface(), + base_(other.base_), value_(other.value_), index_(other.index_), + step_(other.step_) {} + + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + + const ParamGeneratorInterface* const base_; + T value_; + int index_; + const IncrementT step_; + }; // class RangeGenerator::Iterator + + static int CalculateEndIndex(const T& begin, + const T& end, + const IncrementT& step) { + int end_index = 0; + for (T i = begin; i < end; i = i + step) + end_index++; + return end_index; + } + + // No implementation - assignment is unsupported. + void operator=(const RangeGenerator& other); + + const T begin_; + const T end_; + const IncrementT step_; + // The index for the end() iterator. All the elements in the generated + // sequence are indexed (0-based) to aid iterator comparison. + const int end_index_; +}; // class RangeGenerator + + +// Generates values from a pair of STL-style iterators. Used in the +// ValuesIn() function. The elements are copied from the source range +// since the source can be located on the stack, and the generator +// is likely to persist beyond that stack frame. +template +class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface { + public: + template + ValuesInIteratorRangeGenerator(ForwardIterator begin, ForwardIterator end) + : container_(begin, end) {} + virtual ~ValuesInIteratorRangeGenerator() {} + + virtual ParamIteratorInterface* Begin() const { + return new Iterator(this, container_.begin()); + } + virtual ParamIteratorInterface* End() const { + return new Iterator(this, container_.end()); + } + + private: + typedef typename ::std::vector ContainerType; + + class Iterator : public ParamIteratorInterface { + public: + Iterator(const ParamGeneratorInterface* base, + typename ContainerType::const_iterator iterator) + : base_(base), iterator_(iterator) {} + virtual ~Iterator() {} + + virtual const ParamGeneratorInterface* BaseGenerator() const { + return base_; + } + virtual void Advance() { + ++iterator_; + value_.reset(); + } + virtual ParamIteratorInterface* Clone() const { + return new Iterator(*this); + } + // We need to use cached value referenced by iterator_ because *iterator_ + // can return a temporary object (and of type other then T), so just + // having "return &*iterator_;" doesn't work. + // value_ is updated here and not in Advance() because Advance() + // can advance iterator_ beyond the end of the range, and we cannot + // detect that fact. The client code, on the other hand, is + // responsible for not calling Current() on an out-of-range iterator. + virtual const T* Current() const { + if (value_.get() == NULL) + value_.reset(new T(*iterator_)); + return value_.get(); + } + virtual bool Equals(const ParamIteratorInterface& other) const { + // Having the same base generator guarantees that the other + // iterator is of the same type and we can downcast. + GTEST_CHECK_(BaseGenerator() == other.BaseGenerator()) + << "The program attempted to compare iterators " + << "from different generators." << std::endl; + return iterator_ == + CheckedDowncastToActualType(&other)->iterator_; + } + + private: + Iterator(const Iterator& other) + // The explicit constructor call suppresses a false warning + // emitted by gcc when supplied with the -Wextra option. + : ParamIteratorInterface(), + base_(other.base_), + iterator_(other.iterator_) {} + + const ParamGeneratorInterface* const base_; + typename ContainerType::const_iterator iterator_; + // A cached value of *iterator_. We keep it here to allow access by + // pointer in the wrapping iterator's operator->(). + // value_ needs to be mutable to be accessed in Current(). + // Use of scoped_ptr helps manage cached value's lifetime, + // which is bound by the lifespan of the iterator itself. + mutable scoped_ptr value_; + }; // class ValuesInIteratorRangeGenerator::Iterator + + // No implementation - assignment is unsupported. + void operator=(const ValuesInIteratorRangeGenerator& other); + + const ContainerType container_; +}; // class ValuesInIteratorRangeGenerator + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// Stores a parameter value and later creates tests parameterized with that +// value. +template +class ParameterizedTestFactory : public TestFactoryBase { + public: + typedef typename TestClass::ParamType ParamType; + explicit ParameterizedTestFactory(ParamType parameter) : + parameter_(parameter) {} + virtual Test* CreateTest() { + TestClass::SetParam(¶meter_); + return new TestClass(); + } + + private: + const ParamType parameter_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestFactory); +}; + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// TestMetaFactoryBase is a base class for meta-factories that create +// test factories for passing into MakeAndRegisterTestInfo function. +template +class TestMetaFactoryBase { + public: + virtual ~TestMetaFactoryBase() {} + + virtual TestFactoryBase* CreateTestFactory(ParamType parameter) = 0; +}; + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// TestMetaFactory creates test factories for passing into +// MakeAndRegisterTestInfo function. Since MakeAndRegisterTestInfo receives +// ownership of test factory pointer, same factory object cannot be passed +// into that method twice. But ParameterizedTestCaseInfo is going to call +// it for each Test/Parameter value combination. Thus it needs meta factory +// creator class. +template +class TestMetaFactory + : public TestMetaFactoryBase { + public: + typedef typename TestCase::ParamType ParamType; + + TestMetaFactory() {} + + virtual TestFactoryBase* CreateTestFactory(ParamType parameter) { + return new ParameterizedTestFactory(parameter); + } + + private: + GTEST_DISALLOW_COPY_AND_ASSIGN_(TestMetaFactory); +}; + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// ParameterizedTestCaseInfoBase is a generic interface +// to ParameterizedTestCaseInfo classes. ParameterizedTestCaseInfoBase +// accumulates test information provided by TEST_P macro invocations +// and generators provided by INSTANTIATE_TEST_CASE_P macro invocations +// and uses that information to register all resulting test instances +// in RegisterTests method. The ParameterizeTestCaseRegistry class holds +// a collection of pointers to the ParameterizedTestCaseInfo objects +// and calls RegisterTests() on each of them when asked. +class ParameterizedTestCaseInfoBase { + public: + virtual ~ParameterizedTestCaseInfoBase() {} + + // Base part of test case name for display purposes. + virtual const string& GetTestCaseName() const = 0; + // Test case id to verify identity. + virtual TypeId GetTestCaseTypeId() const = 0; + // UnitTest class invokes this method to register tests in this + // test case right before running them in RUN_ALL_TESTS macro. + // This method should not be called more then once on any single + // instance of a ParameterizedTestCaseInfoBase derived class. + virtual void RegisterTests() = 0; + + protected: + ParameterizedTestCaseInfoBase() {} + + private: + GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseInfoBase); +}; + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// ParameterizedTestCaseInfo accumulates tests obtained from TEST_P +// macro invocations for a particular test case and generators +// obtained from INSTANTIATE_TEST_CASE_P macro invocations for that +// test case. It registers tests with all values generated by all +// generators when asked. +template +class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase { + public: + // ParamType and GeneratorCreationFunc are private types but are required + // for declarations of public methods AddTestPattern() and + // AddTestCaseInstantiation(). + typedef typename TestCase::ParamType ParamType; + // A function that returns an instance of appropriate generator type. + typedef ParamGenerator(GeneratorCreationFunc)(); + + explicit ParameterizedTestCaseInfo(const char* name) + : test_case_name_(name) {} + + // Test case base name for display purposes. + virtual const string& GetTestCaseName() const { return test_case_name_; } + // Test case id to verify identity. + virtual TypeId GetTestCaseTypeId() const { return GetTypeId(); } + // TEST_P macro uses AddTestPattern() to record information + // about a single test in a LocalTestInfo structure. + // test_case_name is the base name of the test case (without invocation + // prefix). test_base_name is the name of an individual test without + // parameter index. For the test SequenceA/FooTest.DoBar/1 FooTest is + // test case base name and DoBar is test base name. + void AddTestPattern(const char* test_case_name, + const char* test_base_name, + TestMetaFactoryBase* meta_factory) { + tests_.push_back(linked_ptr(new TestInfo(test_case_name, + test_base_name, + meta_factory))); + } + // INSTANTIATE_TEST_CASE_P macro uses AddGenerator() to record information + // about a generator. + int AddTestCaseInstantiation(const string& instantiation_name, + GeneratorCreationFunc* func, + const char* /* file */, + int /* line */) { + instantiations_.push_back(::std::make_pair(instantiation_name, func)); + return 0; // Return value used only to run this method in namespace scope. + } + // UnitTest class invokes this method to register tests in this test case + // test cases right before running tests in RUN_ALL_TESTS macro. + // This method should not be called more then once on any single + // instance of a ParameterizedTestCaseInfoBase derived class. + // UnitTest has a guard to prevent from calling this method more then once. + virtual void RegisterTests() { + for (typename TestInfoContainer::iterator test_it = tests_.begin(); + test_it != tests_.end(); ++test_it) { + linked_ptr test_info = *test_it; + for (typename InstantiationContainer::iterator gen_it = + instantiations_.begin(); gen_it != instantiations_.end(); + ++gen_it) { + const string& instantiation_name = gen_it->first; + ParamGenerator generator((*gen_it->second)()); + + string test_case_name; + if ( !instantiation_name.empty() ) + test_case_name = instantiation_name + "/"; + test_case_name += test_info->test_case_base_name; + + int i = 0; + for (typename ParamGenerator::iterator param_it = + generator.begin(); + param_it != generator.end(); ++param_it, ++i) { + Message test_name_stream; + test_name_stream << test_info->test_base_name << "/" << i; + MakeAndRegisterTestInfo( + test_case_name.c_str(), + test_name_stream.GetString().c_str(), + NULL, // No type parameter. + PrintToString(*param_it).c_str(), + GetTestCaseTypeId(), + TestCase::SetUpTestCase, + TestCase::TearDownTestCase, + test_info->test_meta_factory->CreateTestFactory(*param_it)); + } // for param_it + } // for gen_it + } // for test_it + } // RegisterTests + + private: + // LocalTestInfo structure keeps information about a single test registered + // with TEST_P macro. + struct TestInfo { + TestInfo(const char* a_test_case_base_name, + const char* a_test_base_name, + TestMetaFactoryBase* a_test_meta_factory) : + test_case_base_name(a_test_case_base_name), + test_base_name(a_test_base_name), + test_meta_factory(a_test_meta_factory) {} + + const string test_case_base_name; + const string test_base_name; + const scoped_ptr > test_meta_factory; + }; + typedef ::std::vector > TestInfoContainer; + // Keeps pairs of + // received from INSTANTIATE_TEST_CASE_P macros. + typedef ::std::vector > + InstantiationContainer; + + const string test_case_name_; + TestInfoContainer tests_; + InstantiationContainer instantiations_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseInfo); +}; // class ParameterizedTestCaseInfo + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// ParameterizedTestCaseRegistry contains a map of ParameterizedTestCaseInfoBase +// classes accessed by test case names. TEST_P and INSTANTIATE_TEST_CASE_P +// macros use it to locate their corresponding ParameterizedTestCaseInfo +// descriptors. +class ParameterizedTestCaseRegistry { + public: + ParameterizedTestCaseRegistry() {} + ~ParameterizedTestCaseRegistry() { + for (TestCaseInfoContainer::iterator it = test_case_infos_.begin(); + it != test_case_infos_.end(); ++it) { + delete *it; + } + } + + // Looks up or creates and returns a structure containing information about + // tests and instantiations of a particular test case. + template + ParameterizedTestCaseInfo* GetTestCasePatternHolder( + const char* test_case_name, + const char* file, + int line) { + ParameterizedTestCaseInfo* typed_test_info = NULL; + for (TestCaseInfoContainer::iterator it = test_case_infos_.begin(); + it != test_case_infos_.end(); ++it) { + if ((*it)->GetTestCaseName() == test_case_name) { + if ((*it)->GetTestCaseTypeId() != GetTypeId()) { + // Complain about incorrect usage of Google Test facilities + // and terminate the program since we cannot guaranty correct + // test case setup and tear-down in this case. + ReportInvalidTestCaseType(test_case_name, file, line); + posix::Abort(); + } else { + // At this point we are sure that the object we found is of the same + // type we are looking for, so we downcast it to that type + // without further checks. + typed_test_info = CheckedDowncastToActualType< + ParameterizedTestCaseInfo >(*it); + } + break; + } + } + if (typed_test_info == NULL) { + typed_test_info = new ParameterizedTestCaseInfo(test_case_name); + test_case_infos_.push_back(typed_test_info); + } + return typed_test_info; + } + void RegisterTests() { + for (TestCaseInfoContainer::iterator it = test_case_infos_.begin(); + it != test_case_infos_.end(); ++it) { + (*it)->RegisterTests(); + } + } + + private: + typedef ::std::vector TestCaseInfoContainer; + + TestCaseInfoContainer test_case_infos_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(ParameterizedTestCaseRegistry); +}; + +} // namespace internal +} // namespace testing + +#endif // GTEST_HAS_PARAM_TEST + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-port.h b/lib/gtest/include/gtest/internal/gtest-port.h new file mode 100644 index 00000000..dc4fe0cb --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-port.h @@ -0,0 +1,1947 @@ +// Copyright 2005, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Authors: wan@google.com (Zhanyong Wan) +// +// Low-level types and utilities for porting Google Test to various +// platforms. They are subject to change without notice. DO NOT USE +// THEM IN USER CODE. +// +// This file is fundamental to Google Test. All other Google Test source +// files are expected to #include this. Therefore, it cannot #include +// any other Google Test header. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ + +// The user can define the following macros in the build script to +// control Google Test's behavior. If the user doesn't define a macro +// in this list, Google Test will define it. +// +// GTEST_HAS_CLONE - Define it to 1/0 to indicate that clone(2) +// is/isn't available. +// GTEST_HAS_EXCEPTIONS - Define it to 1/0 to indicate that exceptions +// are enabled. +// GTEST_HAS_GLOBAL_STRING - Define it to 1/0 to indicate that ::string +// is/isn't available (some systems define +// ::string, which is different to std::string). +// GTEST_HAS_GLOBAL_WSTRING - Define it to 1/0 to indicate that ::string +// is/isn't available (some systems define +// ::wstring, which is different to std::wstring). +// GTEST_HAS_POSIX_RE - Define it to 1/0 to indicate that POSIX regular +// expressions are/aren't available. +// GTEST_HAS_PTHREAD - Define it to 1/0 to indicate that +// is/isn't available. +// GTEST_HAS_RTTI - Define it to 1/0 to indicate that RTTI is/isn't +// enabled. +// GTEST_HAS_STD_WSTRING - Define it to 1/0 to indicate that +// std::wstring does/doesn't work (Google Test can +// be used where std::wstring is unavailable). +// GTEST_HAS_TR1_TUPLE - Define it to 1/0 to indicate tr1::tuple +// is/isn't available. +// GTEST_HAS_SEH - Define it to 1/0 to indicate whether the +// compiler supports Microsoft's "Structured +// Exception Handling". +// GTEST_HAS_STREAM_REDIRECTION +// - Define it to 1/0 to indicate whether the +// platform supports I/O stream redirection using +// dup() and dup2(). +// GTEST_USE_OWN_TR1_TUPLE - Define it to 1/0 to indicate whether Google +// Test's own tr1 tuple implementation should be +// used. Unused when the user sets +// GTEST_HAS_TR1_TUPLE to 0. +// GTEST_LANG_CXX11 - Define it to 1/0 to indicate that Google Test +// is building in C++11/C++98 mode. +// GTEST_LINKED_AS_SHARED_LIBRARY +// - Define to 1 when compiling tests that use +// Google Test as a shared library (known as +// DLL on Windows). +// GTEST_CREATE_SHARED_LIBRARY +// - Define to 1 when compiling Google Test itself +// as a shared library. + +// This header defines the following utilities: +// +// Macros indicating the current platform (defined to 1 if compiled on +// the given platform; otherwise undefined): +// GTEST_OS_AIX - IBM AIX +// GTEST_OS_CYGWIN - Cygwin +// GTEST_OS_HPUX - HP-UX +// GTEST_OS_LINUX - Linux +// GTEST_OS_LINUX_ANDROID - Google Android +// GTEST_OS_MAC - Mac OS X +// GTEST_OS_IOS - iOS +// GTEST_OS_IOS_SIMULATOR - iOS simulator +// GTEST_OS_NACL - Google Native Client (NaCl) +// GTEST_OS_OPENBSD - OpenBSD +// GTEST_OS_QNX - QNX +// GTEST_OS_SOLARIS - Sun Solaris +// GTEST_OS_SYMBIAN - Symbian +// GTEST_OS_WINDOWS - Windows (Desktop, MinGW, or Mobile) +// GTEST_OS_WINDOWS_DESKTOP - Windows Desktop +// GTEST_OS_WINDOWS_MINGW - MinGW +// GTEST_OS_WINDOWS_MOBILE - Windows Mobile +// GTEST_OS_ZOS - z/OS +// +// Among the platforms, Cygwin, Linux, Max OS X, and Windows have the +// most stable support. Since core members of the Google Test project +// don't have access to other platforms, support for them may be less +// stable. If you notice any problems on your platform, please notify +// googletestframework@googlegroups.com (patches for fixing them are +// even more welcome!). +// +// Note that it is possible that none of the GTEST_OS_* macros are defined. +// +// Macros indicating available Google Test features (defined to 1 if +// the corresponding feature is supported; otherwise undefined): +// GTEST_HAS_COMBINE - the Combine() function (for value-parameterized +// tests) +// GTEST_HAS_DEATH_TEST - death tests +// GTEST_HAS_PARAM_TEST - value-parameterized tests +// GTEST_HAS_TYPED_TEST - typed tests +// GTEST_HAS_TYPED_TEST_P - type-parameterized tests +// GTEST_USES_POSIX_RE - enhanced POSIX regex is used. Do not confuse with +// GTEST_HAS_POSIX_RE (see above) which users can +// define themselves. +// GTEST_USES_SIMPLE_RE - our own simple regex is used; +// the above two are mutually exclusive. +// GTEST_CAN_COMPARE_NULL - accepts untyped NULL in EXPECT_EQ(). +// +// Macros for basic C++ coding: +// GTEST_AMBIGUOUS_ELSE_BLOCKER_ - for disabling a gcc warning. +// GTEST_ATTRIBUTE_UNUSED_ - declares that a class' instances or a +// variable don't have to be used. +// GTEST_DISALLOW_ASSIGN_ - disables operator=. +// GTEST_DISALLOW_COPY_AND_ASSIGN_ - disables copy ctor and operator=. +// GTEST_MUST_USE_RESULT_ - declares that a function's result must be used. +// +// Synchronization: +// Mutex, MutexLock, ThreadLocal, GetThreadCount() +// - synchronization primitives. +// GTEST_IS_THREADSAFE - defined to 1 to indicate that the above +// synchronization primitives have real implementations +// and Google Test is thread-safe; or 0 otherwise. +// +// Template meta programming: +// is_pointer - as in TR1; needed on Symbian and IBM XL C/C++ only. +// IteratorTraits - partial implementation of std::iterator_traits, which +// is not available in libCstd when compiled with Sun C++. +// +// Smart pointers: +// scoped_ptr - as in TR2. +// +// Regular expressions: +// RE - a simple regular expression class using the POSIX +// Extended Regular Expression syntax on UNIX-like +// platforms, or a reduced regular exception syntax on +// other platforms, including Windows. +// +// Logging: +// GTEST_LOG_() - logs messages at the specified severity level. +// LogToStderr() - directs all log messages to stderr. +// FlushInfoLog() - flushes informational log messages. +// +// Stdout and stderr capturing: +// CaptureStdout() - starts capturing stdout. +// GetCapturedStdout() - stops capturing stdout and returns the captured +// string. +// CaptureStderr() - starts capturing stderr. +// GetCapturedStderr() - stops capturing stderr and returns the captured +// string. +// +// Integer types: +// TypeWithSize - maps an integer to a int type. +// Int32, UInt32, Int64, UInt64, TimeInMillis +// - integers of known sizes. +// BiggestInt - the biggest signed integer type. +// +// Command-line utilities: +// GTEST_FLAG() - references a flag. +// GTEST_DECLARE_*() - declares a flag. +// GTEST_DEFINE_*() - defines a flag. +// GetInjectableArgvs() - returns the command line as a vector of strings. +// +// Environment variable utilities: +// GetEnv() - gets the value of an environment variable. +// BoolFromGTestEnv() - parses a bool environment variable. +// Int32FromGTestEnv() - parses an Int32 environment variable. +// StringFromGTestEnv() - parses a string environment variable. + +#include // for isspace, etc +#include // for ptrdiff_t +#include +#include +#include +#ifndef _WIN32_WCE +# include +# include +#endif // !_WIN32_WCE + +#if defined __APPLE__ +# include +# include +#endif + +#include // NOLINT +#include // NOLINT +#include // NOLINT + +#define GTEST_DEV_EMAIL_ "googletestframework@@googlegroups.com" +#define GTEST_FLAG_PREFIX_ "gtest_" +#define GTEST_FLAG_PREFIX_DASH_ "gtest-" +#define GTEST_FLAG_PREFIX_UPPER_ "GTEST_" +#define GTEST_NAME_ "Google Test" +#define GTEST_PROJECT_URL_ "http://code.google.com/p/googletest/" + +// Determines the version of gcc that is used to compile this. +#ifdef __GNUC__ +// 40302 means version 4.3.2. +# define GTEST_GCC_VER_ \ + (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__) +#endif // __GNUC__ + +// Determines the platform on which Google Test is compiled. +#ifdef __CYGWIN__ +# define GTEST_OS_CYGWIN 1 +#elif defined __SYMBIAN32__ +# define GTEST_OS_SYMBIAN 1 +#elif defined _WIN32 +# define GTEST_OS_WINDOWS 1 +# ifdef _WIN32_WCE +# define GTEST_OS_WINDOWS_MOBILE 1 +# elif defined(__MINGW__) || defined(__MINGW32__) +# define GTEST_OS_WINDOWS_MINGW 1 +# else +# define GTEST_OS_WINDOWS_DESKTOP 1 +# endif // _WIN32_WCE +#elif defined __APPLE__ +# define GTEST_OS_MAC 1 +# if TARGET_OS_IPHONE +# define GTEST_OS_IOS 1 +# if TARGET_IPHONE_SIMULATOR +# define GTEST_OS_IOS_SIMULATOR 1 +# endif +# endif +#elif defined __linux__ +# define GTEST_OS_LINUX 1 +# if defined __ANDROID__ +# define GTEST_OS_LINUX_ANDROID 1 +# endif +#elif defined __MVS__ +# define GTEST_OS_ZOS 1 +#elif defined(__sun) && defined(__SVR4) +# define GTEST_OS_SOLARIS 1 +#elif defined(_AIX) +# define GTEST_OS_AIX 1 +#elif defined(__hpux) +# define GTEST_OS_HPUX 1 +#elif defined __native_client__ +# define GTEST_OS_NACL 1 +#elif defined __OpenBSD__ +# define GTEST_OS_OPENBSD 1 +#elif defined __QNX__ +# define GTEST_OS_QNX 1 +#endif // __CYGWIN__ + +#ifndef GTEST_LANG_CXX11 +// gcc and clang define __GXX_EXPERIMENTAL_CXX0X__ when +// -std={c,gnu}++{0x,11} is passed. The C++11 standard specifies a +// value for __cplusplus, and recent versions of clang, gcc, and +// probably other compilers set that too in C++11 mode. +# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L +// Compiling in at least C++11 mode. +# define GTEST_LANG_CXX11 1 +# else +# define GTEST_LANG_CXX11 0 +# endif +#endif + +// Brings in definitions for functions used in the testing::internal::posix +// namespace (read, write, close, chdir, isatty, stat). We do not currently +// use them on Windows Mobile. +#if !GTEST_OS_WINDOWS +// This assumes that non-Windows OSes provide unistd.h. For OSes where this +// is not the case, we need to include headers that provide the functions +// mentioned above. +# include +# include +#elif !GTEST_OS_WINDOWS_MOBILE +# include +# include +#endif + +#if GTEST_OS_LINUX_ANDROID +// Used to define __ANDROID_API__ matching the target NDK API level. +# include // NOLINT +#endif + +// Defines this to true iff Google Test can use POSIX regular expressions. +#ifndef GTEST_HAS_POSIX_RE +# if GTEST_OS_LINUX_ANDROID +// On Android, is only available starting with Gingerbread. +# define GTEST_HAS_POSIX_RE (__ANDROID_API__ >= 9) +# else +# define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS) +# endif +#endif + +#if GTEST_HAS_POSIX_RE + +// On some platforms, needs someone to define size_t, and +// won't compile otherwise. We can #include it here as we already +// included , which is guaranteed to define size_t through +// . +# include // NOLINT + +# define GTEST_USES_POSIX_RE 1 + +#elif GTEST_OS_WINDOWS + +// is not available on Windows. Use our own simple regex +// implementation instead. +# define GTEST_USES_SIMPLE_RE 1 + +#else + +// may not be available on this platform. Use our own +// simple regex implementation instead. +# define GTEST_USES_SIMPLE_RE 1 + +#endif // GTEST_HAS_POSIX_RE + +#ifndef GTEST_HAS_EXCEPTIONS +// The user didn't tell us whether exceptions are enabled, so we need +// to figure it out. +# if defined(_MSC_VER) || defined(__BORLANDC__) +// MSVC's and C++Builder's implementations of the STL use the _HAS_EXCEPTIONS +// macro to enable exceptions, so we'll do the same. +// Assumes that exceptions are enabled by default. +# ifndef _HAS_EXCEPTIONS +# define _HAS_EXCEPTIONS 1 +# endif // _HAS_EXCEPTIONS +# define GTEST_HAS_EXCEPTIONS _HAS_EXCEPTIONS +# elif defined(__GNUC__) && __EXCEPTIONS +// gcc defines __EXCEPTIONS to 1 iff exceptions are enabled. +# define GTEST_HAS_EXCEPTIONS 1 +# elif defined(__SUNPRO_CC) +// Sun Pro CC supports exceptions. However, there is no compile-time way of +// detecting whether they are enabled or not. Therefore, we assume that +// they are enabled unless the user tells us otherwise. +# define GTEST_HAS_EXCEPTIONS 1 +# elif defined(__IBMCPP__) && __EXCEPTIONS +// xlC defines __EXCEPTIONS to 1 iff exceptions are enabled. +# define GTEST_HAS_EXCEPTIONS 1 +# elif defined(__HP_aCC) +// Exception handling is in effect by default in HP aCC compiler. It has to +// be turned of by +noeh compiler option if desired. +# define GTEST_HAS_EXCEPTIONS 1 +# else +// For other compilers, we assume exceptions are disabled to be +// conservative. +# define GTEST_HAS_EXCEPTIONS 0 +# endif // defined(_MSC_VER) || defined(__BORLANDC__) +#endif // GTEST_HAS_EXCEPTIONS + +#if !defined(GTEST_HAS_STD_STRING) +// Even though we don't use this macro any longer, we keep it in case +// some clients still depend on it. +# define GTEST_HAS_STD_STRING 1 +#elif !GTEST_HAS_STD_STRING +// The user told us that ::std::string isn't available. +# error "Google Test cannot be used where ::std::string isn't available." +#endif // !defined(GTEST_HAS_STD_STRING) + +#ifndef GTEST_HAS_GLOBAL_STRING +// The user didn't tell us whether ::string is available, so we need +// to figure it out. + +# define GTEST_HAS_GLOBAL_STRING 0 + +#endif // GTEST_HAS_GLOBAL_STRING + +#ifndef GTEST_HAS_STD_WSTRING +// The user didn't tell us whether ::std::wstring is available, so we need +// to figure it out. +// TODO(wan@google.com): uses autoconf to detect whether ::std::wstring +// is available. + +// Cygwin 1.7 and below doesn't support ::std::wstring. +// Solaris' libc++ doesn't support it either. Android has +// no support for it at least as recent as Froyo (2.2). +# define GTEST_HAS_STD_WSTRING \ + (!(GTEST_OS_LINUX_ANDROID || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS)) + +#endif // GTEST_HAS_STD_WSTRING + +#ifndef GTEST_HAS_GLOBAL_WSTRING +// The user didn't tell us whether ::wstring is available, so we need +// to figure it out. +# define GTEST_HAS_GLOBAL_WSTRING \ + (GTEST_HAS_STD_WSTRING && GTEST_HAS_GLOBAL_STRING) +#endif // GTEST_HAS_GLOBAL_WSTRING + +// Determines whether RTTI is available. +#ifndef GTEST_HAS_RTTI +// The user didn't tell us whether RTTI is enabled, so we need to +// figure it out. + +# ifdef _MSC_VER + +# ifdef _CPPRTTI // MSVC defines this macro iff RTTI is enabled. +# define GTEST_HAS_RTTI 1 +# else +# define GTEST_HAS_RTTI 0 +# endif + +// Starting with version 4.3.2, gcc defines __GXX_RTTI iff RTTI is enabled. +# elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40302) + +# ifdef __GXX_RTTI +// When building against STLport with the Android NDK and with +// -frtti -fno-exceptions, the build fails at link time with undefined +// references to __cxa_bad_typeid. Note sure if STL or toolchain bug, +// so disable RTTI when detected. +# if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) && \ + !defined(__EXCEPTIONS) +# define GTEST_HAS_RTTI 0 +# else +# define GTEST_HAS_RTTI 1 +# endif // GTEST_OS_LINUX_ANDROID && __STLPORT_MAJOR && !__EXCEPTIONS +# else +# define GTEST_HAS_RTTI 0 +# endif // __GXX_RTTI + +// Clang defines __GXX_RTTI starting with version 3.0, but its manual recommends +// using has_feature instead. has_feature(cxx_rtti) is supported since 2.7, the +// first version with C++ support. +# elif defined(__clang__) + +# define GTEST_HAS_RTTI __has_feature(cxx_rtti) + +// Starting with version 9.0 IBM Visual Age defines __RTTI_ALL__ to 1 if +// both the typeid and dynamic_cast features are present. +# elif defined(__IBMCPP__) && (__IBMCPP__ >= 900) + +# ifdef __RTTI_ALL__ +# define GTEST_HAS_RTTI 1 +# else +# define GTEST_HAS_RTTI 0 +# endif + +# else + +// For all other compilers, we assume RTTI is enabled. +# define GTEST_HAS_RTTI 1 + +# endif // _MSC_VER + +#endif // GTEST_HAS_RTTI + +// It's this header's responsibility to #include when RTTI +// is enabled. +#if GTEST_HAS_RTTI +# include +#endif + +// Determines whether Google Test can use the pthreads library. +#ifndef GTEST_HAS_PTHREAD +// The user didn't tell us explicitly, so we assume pthreads support is +// available on Linux and Mac. +// +// To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0 +// to your compiler flags. +# define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \ + || GTEST_OS_QNX) +#endif // GTEST_HAS_PTHREAD + +#if GTEST_HAS_PTHREAD +// gtest-port.h guarantees to #include when GTEST_HAS_PTHREAD is +// true. +# include // NOLINT + +// For timespec and nanosleep, used below. +# include // NOLINT +#endif + +// Determines whether Google Test can use tr1/tuple. You can define +// this macro to 0 to prevent Google Test from using tuple (any +// feature depending on tuple with be disabled in this mode). +#ifndef GTEST_HAS_TR1_TUPLE +# if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR) +// STLport, provided with the Android NDK, has neither or . +# define GTEST_HAS_TR1_TUPLE 0 +# else +// The user didn't tell us not to do it, so we assume it's OK. +# define GTEST_HAS_TR1_TUPLE 1 +# endif +#endif // GTEST_HAS_TR1_TUPLE + +// Determines whether Google Test's own tr1 tuple implementation +// should be used. +#ifndef GTEST_USE_OWN_TR1_TUPLE +// The user didn't tell us, so we need to figure it out. + +// We use our own TR1 tuple if we aren't sure the user has an +// implementation of it already. At this time, libstdc++ 4.0.0+ and +// MSVC 2010 are the only mainstream standard libraries that come +// with a TR1 tuple implementation. NVIDIA's CUDA NVCC compiler +// pretends to be GCC by defining __GNUC__ and friends, but cannot +// compile GCC's tuple implementation. MSVC 2008 (9.0) provides TR1 +// tuple in a 323 MB Feature Pack download, which we cannot assume the +// user has. QNX's QCC compiler is a modified GCC but it doesn't +// support TR1 tuple. libc++ only provides std::tuple, in C++11 mode, +// and it can be used with some compilers that define __GNUC__. +# if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000) \ + && !GTEST_OS_QNX && !defined(_LIBCPP_VERSION)) || _MSC_VER >= 1600 +# define GTEST_ENV_HAS_TR1_TUPLE_ 1 +# endif + +// C++11 specifies that provides std::tuple. Use that if gtest is used +// in C++11 mode and libstdc++ isn't very old (binaries targeting OS X 10.6 +// can build with clang but need to use gcc4.2's libstdc++). +# if GTEST_LANG_CXX11 && (!defined(__GLIBCXX__) || __GLIBCXX__ > 20110325) +# define GTEST_ENV_HAS_STD_TUPLE_ 1 +# endif + +# if GTEST_ENV_HAS_TR1_TUPLE_ || GTEST_ENV_HAS_STD_TUPLE_ +# define GTEST_USE_OWN_TR1_TUPLE 0 +# else +# define GTEST_USE_OWN_TR1_TUPLE 1 +# endif + +#endif // GTEST_USE_OWN_TR1_TUPLE + +// To avoid conditional compilation everywhere, we make it +// gtest-port.h's responsibility to #include the header implementing +// tr1/tuple. +#if GTEST_HAS_TR1_TUPLE + +# if GTEST_USE_OWN_TR1_TUPLE +# include "gtest/internal/gtest-tuple.h" +# elif GTEST_ENV_HAS_STD_TUPLE_ +# include +// C++11 puts its tuple into the ::std namespace rather than +// ::std::tr1. gtest expects tuple to live in ::std::tr1, so put it there. +// This causes undefined behavior, but supported compilers react in +// the way we intend. +namespace std { +namespace tr1 { +using ::std::get; +using ::std::make_tuple; +using ::std::tuple; +using ::std::tuple_element; +using ::std::tuple_size; +} +} + +# elif GTEST_OS_SYMBIAN + +// On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to +// use STLport's tuple implementation, which unfortunately doesn't +// work as the copy of STLport distributed with Symbian is incomplete. +// By making sure BOOST_HAS_TR1_TUPLE is undefined, we force Boost to +// use its own tuple implementation. +# ifdef BOOST_HAS_TR1_TUPLE +# undef BOOST_HAS_TR1_TUPLE +# endif // BOOST_HAS_TR1_TUPLE + +// This prevents , which defines +// BOOST_HAS_TR1_TUPLE, from being #included by Boost's . +# define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED +# include + +# elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000) +// GCC 4.0+ implements tr1/tuple in the header. This does +// not conform to the TR1 spec, which requires the header to be . + +# if !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 +// Until version 4.3.2, gcc has a bug that causes , +// which is #included by , to not compile when RTTI is +// disabled. _TR1_FUNCTIONAL is the header guard for +// . Hence the following #define is a hack to prevent +// from being included. +# define _TR1_FUNCTIONAL 1 +# include +# undef _TR1_FUNCTIONAL // Allows the user to #include + // if he chooses to. +# else +# include // NOLINT +# endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302 + +# else +// If the compiler is not GCC 4.0+, we assume the user is using a +// spec-conforming TR1 implementation. +# include // NOLINT +# endif // GTEST_USE_OWN_TR1_TUPLE + +#endif // GTEST_HAS_TR1_TUPLE + +// Determines whether clone(2) is supported. +// Usually it will only be available on Linux, excluding +// Linux on the Itanium architecture. +// Also see http://linux.die.net/man/2/clone. +#ifndef GTEST_HAS_CLONE +// The user didn't tell us, so we need to figure it out. + +# if GTEST_OS_LINUX && !defined(__ia64__) +# if GTEST_OS_LINUX_ANDROID +// On Android, clone() is only available on ARM starting with Gingerbread. +# if defined(__arm__) && __ANDROID_API__ >= 9 +# define GTEST_HAS_CLONE 1 +# else +# define GTEST_HAS_CLONE 0 +# endif +# else +# define GTEST_HAS_CLONE 1 +# endif +# else +# define GTEST_HAS_CLONE 0 +# endif // GTEST_OS_LINUX && !defined(__ia64__) + +#endif // GTEST_HAS_CLONE + +// Determines whether to support stream redirection. This is used to test +// output correctness and to implement death tests. +#ifndef GTEST_HAS_STREAM_REDIRECTION +// By default, we assume that stream redirection is supported on all +// platforms except known mobile ones. +# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN +# define GTEST_HAS_STREAM_REDIRECTION 0 +# else +# define GTEST_HAS_STREAM_REDIRECTION 1 +# endif // !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_SYMBIAN +#endif // GTEST_HAS_STREAM_REDIRECTION + +// Determines whether to support death tests. +// Google Test does not support death tests for VC 7.1 and earlier as +// abort() in a VC 7.1 application compiled as GUI in debug config +// pops up a dialog window that cannot be suppressed programmatically. +#if (GTEST_OS_LINUX || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ + (GTEST_OS_MAC && !GTEST_OS_IOS) || GTEST_OS_IOS_SIMULATOR || \ + (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ + GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ + GTEST_OS_OPENBSD || GTEST_OS_QNX) +# define GTEST_HAS_DEATH_TEST 1 +# include // NOLINT +#endif + +// We don't support MSVC 7.1 with exceptions disabled now. Therefore +// all the compilers we care about are adequate for supporting +// value-parameterized tests. +#define GTEST_HAS_PARAM_TEST 1 + +// Determines whether to support type-driven tests. + +// Typed tests need and variadic macros, which GCC, VC++ 8.0, +// Sun Pro CC, IBM Visual Age, and HP aCC support. +#if defined(__GNUC__) || (_MSC_VER >= 1400) || defined(__SUNPRO_CC) || \ + defined(__IBMCPP__) || defined(__HP_aCC) +# define GTEST_HAS_TYPED_TEST 1 +# define GTEST_HAS_TYPED_TEST_P 1 +#endif + +// Determines whether to support Combine(). This only makes sense when +// value-parameterized tests are enabled. The implementation doesn't +// work on Sun Studio since it doesn't understand templated conversion +// operators. +#if GTEST_HAS_PARAM_TEST && GTEST_HAS_TR1_TUPLE && !defined(__SUNPRO_CC) +# define GTEST_HAS_COMBINE 1 +#endif + +// Determines whether the system compiler uses UTF-16 for encoding wide strings. +#define GTEST_WIDE_STRING_USES_UTF16_ \ + (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_SYMBIAN || GTEST_OS_AIX) + +// Determines whether test results can be streamed to a socket. +#if GTEST_OS_LINUX +# define GTEST_CAN_STREAM_RESULTS_ 1 +#endif + +// Defines some utility macros. + +// The GNU compiler emits a warning if nested "if" statements are followed by +// an "else" statement and braces are not used to explicitly disambiguate the +// "else" binding. This leads to problems with code like: +// +// if (gate) +// ASSERT_*(condition) << "Some message"; +// +// The "switch (0) case 0:" idiom is used to suppress this. +#ifdef __INTEL_COMPILER +# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ +#else +# define GTEST_AMBIGUOUS_ELSE_BLOCKER_ switch (0) case 0: default: // NOLINT +#endif + +// Use this annotation at the end of a struct/class definition to +// prevent the compiler from optimizing away instances that are never +// used. This is useful when all interesting logic happens inside the +// c'tor and / or d'tor. Example: +// +// struct Foo { +// Foo() { ... } +// } GTEST_ATTRIBUTE_UNUSED_; +// +// Also use it after a variable or parameter declaration to tell the +// compiler the variable/parameter does not have to be used. +#if defined(__GNUC__) && !defined(COMPILER_ICC) +# define GTEST_ATTRIBUTE_UNUSED_ __attribute__ ((unused)) +#else +# define GTEST_ATTRIBUTE_UNUSED_ +#endif + +// A macro to disallow operator= +// This should be used in the private: declarations for a class. +#define GTEST_DISALLOW_ASSIGN_(type)\ + void operator=(type const &) + +// A macro to disallow copy constructor and operator= +// This should be used in the private: declarations for a class. +#define GTEST_DISALLOW_COPY_AND_ASSIGN_(type)\ + type(type const &);\ + GTEST_DISALLOW_ASSIGN_(type) + +// Tell the compiler to warn about unused return values for functions declared +// with this macro. The macro should be used on function declarations +// following the argument list: +// +// Sprocket* AllocateSprocket() GTEST_MUST_USE_RESULT_; +#if defined(__GNUC__) && (GTEST_GCC_VER_ >= 30400) && !defined(COMPILER_ICC) +# define GTEST_MUST_USE_RESULT_ __attribute__ ((warn_unused_result)) +#else +# define GTEST_MUST_USE_RESULT_ +#endif // __GNUC__ && (GTEST_GCC_VER_ >= 30400) && !COMPILER_ICC + +// Determine whether the compiler supports Microsoft's Structured Exception +// Handling. This is supported by several Windows compilers but generally +// does not exist on any other system. +#ifndef GTEST_HAS_SEH +// The user didn't tell us, so we need to figure it out. + +# if defined(_MSC_VER) || defined(__BORLANDC__) +// These two compilers are known to support SEH. +# define GTEST_HAS_SEH 1 +# else +// Assume no SEH. +# define GTEST_HAS_SEH 0 +# endif + +#endif // GTEST_HAS_SEH + +#ifdef _MSC_VER + +# if GTEST_LINKED_AS_SHARED_LIBRARY +# define GTEST_API_ __declspec(dllimport) +# elif GTEST_CREATE_SHARED_LIBRARY +# define GTEST_API_ __declspec(dllexport) +# endif + +#endif // _MSC_VER + +#ifndef GTEST_API_ +# define GTEST_API_ +#endif + +#ifdef __GNUC__ +// Ask the compiler to never inline a given function. +# define GTEST_NO_INLINE_ __attribute__((noinline)) +#else +# define GTEST_NO_INLINE_ +#endif + +// _LIBCPP_VERSION is defined by the libc++ library from the LLVM project. +#if defined(__GLIBCXX__) || defined(_LIBCPP_VERSION) +# define GTEST_HAS_CXXABI_H_ 1 +#else +# define GTEST_HAS_CXXABI_H_ 0 +#endif + +namespace testing { + +class Message; + +namespace internal { + +// A secret type that Google Test users don't know about. It has no +// definition on purpose. Therefore it's impossible to create a +// Secret object, which is what we want. +class Secret; + +// The GTEST_COMPILE_ASSERT_ macro can be used to verify that a compile time +// expression is true. For example, you could use it to verify the +// size of a static array: +// +// GTEST_COMPILE_ASSERT_(ARRAYSIZE(content_type_names) == CONTENT_NUM_TYPES, +// content_type_names_incorrect_size); +// +// or to make sure a struct is smaller than a certain size: +// +// GTEST_COMPILE_ASSERT_(sizeof(foo) < 128, foo_too_large); +// +// The second argument to the macro is the name of the variable. If +// the expression is false, most compilers will issue a warning/error +// containing the name of the variable. + +template +struct CompileAssert { +}; + +#define GTEST_COMPILE_ASSERT_(expr, msg) \ + typedef ::testing::internal::CompileAssert<(static_cast(expr))> \ + msg[static_cast(expr) ? 1 : -1] GTEST_ATTRIBUTE_UNUSED_ + +// Implementation details of GTEST_COMPILE_ASSERT_: +// +// - GTEST_COMPILE_ASSERT_ works by defining an array type that has -1 +// elements (and thus is invalid) when the expression is false. +// +// - The simpler definition +// +// #define GTEST_COMPILE_ASSERT_(expr, msg) typedef char msg[(expr) ? 1 : -1] +// +// does not work, as gcc supports variable-length arrays whose sizes +// are determined at run-time (this is gcc's extension and not part +// of the C++ standard). As a result, gcc fails to reject the +// following code with the simple definition: +// +// int foo; +// GTEST_COMPILE_ASSERT_(foo, msg); // not supposed to compile as foo is +// // not a compile-time constant. +// +// - By using the type CompileAssert<(bool(expr))>, we ensures that +// expr is a compile-time constant. (Template arguments must be +// determined at compile-time.) +// +// - The outter parentheses in CompileAssert<(bool(expr))> are necessary +// to work around a bug in gcc 3.4.4 and 4.0.1. If we had written +// +// CompileAssert +// +// instead, these compilers will refuse to compile +// +// GTEST_COMPILE_ASSERT_(5 > 0, some_message); +// +// (They seem to think the ">" in "5 > 0" marks the end of the +// template argument list.) +// +// - The array size is (bool(expr) ? 1 : -1), instead of simply +// +// ((expr) ? 1 : -1). +// +// This is to avoid running into a bug in MS VC 7.1, which +// causes ((0.0) ? 1 : -1) to incorrectly evaluate to 1. + +// StaticAssertTypeEqHelper is used by StaticAssertTypeEq defined in gtest.h. +// +// This template is declared, but intentionally undefined. +template +struct StaticAssertTypeEqHelper; + +template +struct StaticAssertTypeEqHelper {}; + +#if GTEST_HAS_GLOBAL_STRING +typedef ::string string; +#else +typedef ::std::string string; +#endif // GTEST_HAS_GLOBAL_STRING + +#if GTEST_HAS_GLOBAL_WSTRING +typedef ::wstring wstring; +#elif GTEST_HAS_STD_WSTRING +typedef ::std::wstring wstring; +#endif // GTEST_HAS_GLOBAL_WSTRING + +// A helper for suppressing warnings on constant condition. It just +// returns 'condition'. +GTEST_API_ bool IsTrue(bool condition); + +// Defines scoped_ptr. + +// This implementation of scoped_ptr is PARTIAL - it only contains +// enough stuff to satisfy Google Test's need. +template +class scoped_ptr { + public: + typedef T element_type; + + explicit scoped_ptr(T* p = NULL) : ptr_(p) {} + ~scoped_ptr() { reset(); } + + T& operator*() const { return *ptr_; } + T* operator->() const { return ptr_; } + T* get() const { return ptr_; } + + T* release() { + T* const ptr = ptr_; + ptr_ = NULL; + return ptr; + } + + void reset(T* p = NULL) { + if (p != ptr_) { + if (IsTrue(sizeof(T) > 0)) { // Makes sure T is a complete type. + delete ptr_; + } + ptr_ = p; + } + } + + private: + T* ptr_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(scoped_ptr); +}; + +// Defines RE. + +// A simple C++ wrapper for . It uses the POSIX Extended +// Regular Expression syntax. +class GTEST_API_ RE { + public: + // A copy constructor is required by the Standard to initialize object + // references from r-values. + RE(const RE& other) { Init(other.pattern()); } + + // Constructs an RE from a string. + RE(const ::std::string& regex) { Init(regex.c_str()); } // NOLINT + +#if GTEST_HAS_GLOBAL_STRING + + RE(const ::string& regex) { Init(regex.c_str()); } // NOLINT + +#endif // GTEST_HAS_GLOBAL_STRING + + RE(const char* regex) { Init(regex); } // NOLINT + ~RE(); + + // Returns the string representation of the regex. + const char* pattern() const { return pattern_; } + + // FullMatch(str, re) returns true iff regular expression re matches + // the entire str. + // PartialMatch(str, re) returns true iff regular expression re + // matches a substring of str (including str itself). + // + // TODO(wan@google.com): make FullMatch() and PartialMatch() work + // when str contains NUL characters. + static bool FullMatch(const ::std::string& str, const RE& re) { + return FullMatch(str.c_str(), re); + } + static bool PartialMatch(const ::std::string& str, const RE& re) { + return PartialMatch(str.c_str(), re); + } + +#if GTEST_HAS_GLOBAL_STRING + + static bool FullMatch(const ::string& str, const RE& re) { + return FullMatch(str.c_str(), re); + } + static bool PartialMatch(const ::string& str, const RE& re) { + return PartialMatch(str.c_str(), re); + } + +#endif // GTEST_HAS_GLOBAL_STRING + + static bool FullMatch(const char* str, const RE& re); + static bool PartialMatch(const char* str, const RE& re); + + private: + void Init(const char* regex); + + // We use a const char* instead of an std::string, as Google Test used to be + // used where std::string is not available. TODO(wan@google.com): change to + // std::string. + const char* pattern_; + bool is_valid_; + +#if GTEST_USES_POSIX_RE + + regex_t full_regex_; // For FullMatch(). + regex_t partial_regex_; // For PartialMatch(). + +#else // GTEST_USES_SIMPLE_RE + + const char* full_pattern_; // For FullMatch(); + +#endif + + GTEST_DISALLOW_ASSIGN_(RE); +}; + +// Formats a source file path and a line number as they would appear +// in an error message from the compiler used to compile this code. +GTEST_API_ ::std::string FormatFileLocation(const char* file, int line); + +// Formats a file location for compiler-independent XML output. +// Although this function is not platform dependent, we put it next to +// FormatFileLocation in order to contrast the two functions. +GTEST_API_ ::std::string FormatCompilerIndependentFileLocation(const char* file, + int line); + +// Defines logging utilities: +// GTEST_LOG_(severity) - logs messages at the specified severity level. The +// message itself is streamed into the macro. +// LogToStderr() - directs all log messages to stderr. +// FlushInfoLog() - flushes informational log messages. + +enum GTestLogSeverity { + GTEST_INFO, + GTEST_WARNING, + GTEST_ERROR, + GTEST_FATAL +}; + +// Formats log entry severity, provides a stream object for streaming the +// log message, and terminates the message with a newline when going out of +// scope. +class GTEST_API_ GTestLog { + public: + GTestLog(GTestLogSeverity severity, const char* file, int line); + + // Flushes the buffers and, if severity is GTEST_FATAL, aborts the program. + ~GTestLog(); + + ::std::ostream& GetStream() { return ::std::cerr; } + + private: + const GTestLogSeverity severity_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestLog); +}; + +#define GTEST_LOG_(severity) \ + ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \ + __FILE__, __LINE__).GetStream() + +inline void LogToStderr() {} +inline void FlushInfoLog() { fflush(NULL); } + +// INTERNAL IMPLEMENTATION - DO NOT USE. +// +// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition +// is not satisfied. +// Synopsys: +// GTEST_CHECK_(boolean_condition); +// or +// GTEST_CHECK_(boolean_condition) << "Additional message"; +// +// This checks the condition and if the condition is not satisfied +// it prints message about the condition violation, including the +// condition itself, plus additional message streamed into it, if any, +// and then it aborts the program. It aborts the program irrespective of +// whether it is built in the debug mode or not. +#define GTEST_CHECK_(condition) \ + GTEST_AMBIGUOUS_ELSE_BLOCKER_ \ + if (::testing::internal::IsTrue(condition)) \ + ; \ + else \ + GTEST_LOG_(FATAL) << "Condition " #condition " failed. " + +// An all-mode assert to verify that the given POSIX-style function +// call returns 0 (indicating success). Known limitation: this +// doesn't expand to a balanced 'if' statement, so enclose the macro +// in {} if you need to use it as the only statement in an 'if' +// branch. +#define GTEST_CHECK_POSIX_SUCCESS_(posix_call) \ + if (const int gtest_error = (posix_call)) \ + GTEST_LOG_(FATAL) << #posix_call << "failed with error " \ + << gtest_error + +// INTERNAL IMPLEMENTATION - DO NOT USE IN USER CODE. +// +// Use ImplicitCast_ as a safe version of static_cast for upcasting in +// the type hierarchy (e.g. casting a Foo* to a SuperclassOfFoo* or a +// const Foo*). When you use ImplicitCast_, the compiler checks that +// the cast is safe. Such explicit ImplicitCast_s are necessary in +// surprisingly many situations where C++ demands an exact type match +// instead of an argument type convertable to a target type. +// +// The syntax for using ImplicitCast_ is the same as for static_cast: +// +// ImplicitCast_(expr) +// +// ImplicitCast_ would have been part of the C++ standard library, +// but the proposal was submitted too late. It will probably make +// its way into the language in the future. +// +// This relatively ugly name is intentional. It prevents clashes with +// similar functions users may have (e.g., implicit_cast). The internal +// namespace alone is not enough because the function can be found by ADL. +template +inline To ImplicitCast_(To x) { return x; } + +// When you upcast (that is, cast a pointer from type Foo to type +// SuperclassOfFoo), it's fine to use ImplicitCast_<>, since upcasts +// always succeed. When you downcast (that is, cast a pointer from +// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because +// how do you know the pointer is really of type SubclassOfFoo? It +// could be a bare Foo, or of type DifferentSubclassOfFoo. Thus, +// when you downcast, you should use this macro. In debug mode, we +// use dynamic_cast<> to double-check the downcast is legal (we die +// if it's not). In normal mode, we do the efficient static_cast<> +// instead. Thus, it's important to test in debug mode to make sure +// the cast is legal! +// This is the only place in the code we should use dynamic_cast<>. +// In particular, you SHOULDN'T be using dynamic_cast<> in order to +// do RTTI (eg code like this: +// if (dynamic_cast(foo)) HandleASubclass1Object(foo); +// if (dynamic_cast(foo)) HandleASubclass2Object(foo); +// You should design the code some other way not to need this. +// +// This relatively ugly name is intentional. It prevents clashes with +// similar functions users may have (e.g., down_cast). The internal +// namespace alone is not enough because the function can be found by ADL. +template // use like this: DownCast_(foo); +inline To DownCast_(From* f) { // so we only accept pointers + // Ensures that To is a sub-type of From *. This test is here only + // for compile-time type checking, and has no overhead in an + // optimized build at run-time, as it will be optimized away + // completely. + if (false) { + const To to = NULL; + ::testing::internal::ImplicitCast_(to); + } + +#if GTEST_HAS_RTTI + // RTTI: debug mode only! + GTEST_CHECK_(f == NULL || dynamic_cast(f) != NULL); +#endif + return static_cast(f); +} + +// Downcasts the pointer of type Base to Derived. +// Derived must be a subclass of Base. The parameter MUST +// point to a class of type Derived, not any subclass of it. +// When RTTI is available, the function performs a runtime +// check to enforce this. +template +Derived* CheckedDowncastToActualType(Base* base) { +#if GTEST_HAS_RTTI + GTEST_CHECK_(typeid(*base) == typeid(Derived)); + return dynamic_cast(base); // NOLINT +#else + return static_cast(base); // Poor man's downcast. +#endif +} + +#if GTEST_HAS_STREAM_REDIRECTION + +// Defines the stderr capturer: +// CaptureStdout - starts capturing stdout. +// GetCapturedStdout - stops capturing stdout and returns the captured string. +// CaptureStderr - starts capturing stderr. +// GetCapturedStderr - stops capturing stderr and returns the captured string. +// +GTEST_API_ void CaptureStdout(); +GTEST_API_ std::string GetCapturedStdout(); +GTEST_API_ void CaptureStderr(); +GTEST_API_ std::string GetCapturedStderr(); + +#endif // GTEST_HAS_STREAM_REDIRECTION + + +#if GTEST_HAS_DEATH_TEST + +const ::std::vector& GetInjectableArgvs(); +void SetInjectableArgvs(const ::std::vector* + new_argvs); + +// A copy of all command line arguments. Set by InitGoogleTest(). +extern ::std::vector g_argvs; + +#endif // GTEST_HAS_DEATH_TEST + +// Defines synchronization primitives. + +#if GTEST_HAS_PTHREAD + +// Sleeps for (roughly) n milli-seconds. This function is only for +// testing Google Test's own constructs. Don't use it in user tests, +// either directly or indirectly. +inline void SleepMilliseconds(int n) { + const timespec time = { + 0, // 0 seconds. + n * 1000L * 1000L, // And n ms. + }; + nanosleep(&time, NULL); +} + +// Allows a controller thread to pause execution of newly created +// threads until notified. Instances of this class must be created +// and destroyed in the controller thread. +// +// This class is only for testing Google Test's own constructs. Do not +// use it in user tests, either directly or indirectly. +class Notification { + public: + Notification() : notified_(false) { + GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL)); + } + ~Notification() { + pthread_mutex_destroy(&mutex_); + } + + // Notifies all threads created with this notification to start. Must + // be called from the controller thread. + void Notify() { + pthread_mutex_lock(&mutex_); + notified_ = true; + pthread_mutex_unlock(&mutex_); + } + + // Blocks until the controller thread notifies. Must be called from a test + // thread. + void WaitForNotification() { + for (;;) { + pthread_mutex_lock(&mutex_); + const bool notified = notified_; + pthread_mutex_unlock(&mutex_); + if (notified) + break; + SleepMilliseconds(10); + } + } + + private: + pthread_mutex_t mutex_; + bool notified_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(Notification); +}; + +// As a C-function, ThreadFuncWithCLinkage cannot be templated itself. +// Consequently, it cannot select a correct instantiation of ThreadWithParam +// in order to call its Run(). Introducing ThreadWithParamBase as a +// non-templated base class for ThreadWithParam allows us to bypass this +// problem. +class ThreadWithParamBase { + public: + virtual ~ThreadWithParamBase() {} + virtual void Run() = 0; +}; + +// pthread_create() accepts a pointer to a function type with the C linkage. +// According to the Standard (7.5/1), function types with different linkages +// are different even if they are otherwise identical. Some compilers (for +// example, SunStudio) treat them as different types. Since class methods +// cannot be defined with C-linkage we need to define a free C-function to +// pass into pthread_create(). +extern "C" inline void* ThreadFuncWithCLinkage(void* thread) { + static_cast(thread)->Run(); + return NULL; +} + +// Helper class for testing Google Test's multi-threading constructs. +// To use it, write: +// +// void ThreadFunc(int param) { /* Do things with param */ } +// Notification thread_can_start; +// ... +// // The thread_can_start parameter is optional; you can supply NULL. +// ThreadWithParam thread(&ThreadFunc, 5, &thread_can_start); +// thread_can_start.Notify(); +// +// These classes are only for testing Google Test's own constructs. Do +// not use them in user tests, either directly or indirectly. +template +class ThreadWithParam : public ThreadWithParamBase { + public: + typedef void (*UserThreadFunc)(T); + + ThreadWithParam( + UserThreadFunc func, T param, Notification* thread_can_start) + : func_(func), + param_(param), + thread_can_start_(thread_can_start), + finished_(false) { + ThreadWithParamBase* const base = this; + // The thread can be created only after all fields except thread_ + // have been initialized. + GTEST_CHECK_POSIX_SUCCESS_( + pthread_create(&thread_, 0, &ThreadFuncWithCLinkage, base)); + } + ~ThreadWithParam() { Join(); } + + void Join() { + if (!finished_) { + GTEST_CHECK_POSIX_SUCCESS_(pthread_join(thread_, 0)); + finished_ = true; + } + } + + virtual void Run() { + if (thread_can_start_ != NULL) + thread_can_start_->WaitForNotification(); + func_(param_); + } + + private: + const UserThreadFunc func_; // User-supplied thread function. + const T param_; // User-supplied parameter to the thread function. + // When non-NULL, used to block execution until the controller thread + // notifies. + Notification* const thread_can_start_; + bool finished_; // true iff we know that the thread function has finished. + pthread_t thread_; // The native thread object. + + GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParam); +}; + +// MutexBase and Mutex implement mutex on pthreads-based platforms. They +// are used in conjunction with class MutexLock: +// +// Mutex mutex; +// ... +// MutexLock lock(&mutex); // Acquires the mutex and releases it at the end +// // of the current scope. +// +// MutexBase implements behavior for both statically and dynamically +// allocated mutexes. Do not use MutexBase directly. Instead, write +// the following to define a static mutex: +// +// GTEST_DEFINE_STATIC_MUTEX_(g_some_mutex); +// +// You can forward declare a static mutex like this: +// +// GTEST_DECLARE_STATIC_MUTEX_(g_some_mutex); +// +// To create a dynamic mutex, just define an object of type Mutex. +class MutexBase { + public: + // Acquires this mutex. + void Lock() { + GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_)); + owner_ = pthread_self(); + has_owner_ = true; + } + + // Releases this mutex. + void Unlock() { + // Since the lock is being released the owner_ field should no longer be + // considered valid. We don't protect writing to has_owner_ here, as it's + // the caller's responsibility to ensure that the current thread holds the + // mutex when this is called. + has_owner_ = false; + GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_)); + } + + // Does nothing if the current thread holds the mutex. Otherwise, crashes + // with high probability. + void AssertHeld() const { + GTEST_CHECK_(has_owner_ && pthread_equal(owner_, pthread_self())) + << "The current thread is not holding the mutex @" << this; + } + + // A static mutex may be used before main() is entered. It may even + // be used before the dynamic initialization stage. Therefore we + // must be able to initialize a static mutex object at link time. + // This means MutexBase has to be a POD and its member variables + // have to be public. + public: + pthread_mutex_t mutex_; // The underlying pthread mutex. + // has_owner_ indicates whether the owner_ field below contains a valid thread + // ID and is therefore safe to inspect (e.g., to use in pthread_equal()). All + // accesses to the owner_ field should be protected by a check of this field. + // An alternative might be to memset() owner_ to all zeros, but there's no + // guarantee that a zero'd pthread_t is necessarily invalid or even different + // from pthread_self(). + bool has_owner_; + pthread_t owner_; // The thread holding the mutex. +}; + +// Forward-declares a static mutex. +# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \ + extern ::testing::internal::MutexBase mutex + +// Defines and statically (i.e. at link time) initializes a static mutex. +// The initialization list here does not explicitly initialize each field, +// instead relying on default initialization for the unspecified fields. In +// particular, the owner_ field (a pthread_t) is not explicitly initialized. +// This allows initialization to work whether pthread_t is a scalar or struct. +// The flag -Wmissing-field-initializers must not be specified for this to work. +# define GTEST_DEFINE_STATIC_MUTEX_(mutex) \ + ::testing::internal::MutexBase mutex = { PTHREAD_MUTEX_INITIALIZER, false } + +// The Mutex class can only be used for mutexes created at runtime. It +// shares its API with MutexBase otherwise. +class Mutex : public MutexBase { + public: + Mutex() { + GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_init(&mutex_, NULL)); + has_owner_ = false; + } + ~Mutex() { + GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_destroy(&mutex_)); + } + + private: + GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex); +}; + +// We cannot name this class MutexLock as the ctor declaration would +// conflict with a macro named MutexLock, which is defined on some +// platforms. Hence the typedef trick below. +class GTestMutexLock { + public: + explicit GTestMutexLock(MutexBase* mutex) + : mutex_(mutex) { mutex_->Lock(); } + + ~GTestMutexLock() { mutex_->Unlock(); } + + private: + MutexBase* const mutex_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(GTestMutexLock); +}; + +typedef GTestMutexLock MutexLock; + +// Helpers for ThreadLocal. + +// pthread_key_create() requires DeleteThreadLocalValue() to have +// C-linkage. Therefore it cannot be templatized to access +// ThreadLocal. Hence the need for class +// ThreadLocalValueHolderBase. +class ThreadLocalValueHolderBase { + public: + virtual ~ThreadLocalValueHolderBase() {} +}; + +// Called by pthread to delete thread-local data stored by +// pthread_setspecific(). +extern "C" inline void DeleteThreadLocalValue(void* value_holder) { + delete static_cast(value_holder); +} + +// Implements thread-local storage on pthreads-based systems. +// +// // Thread 1 +// ThreadLocal tl(100); // 100 is the default value for each thread. +// +// // Thread 2 +// tl.set(150); // Changes the value for thread 2 only. +// EXPECT_EQ(150, tl.get()); +// +// // Thread 1 +// EXPECT_EQ(100, tl.get()); // In thread 1, tl has the original value. +// tl.set(200); +// EXPECT_EQ(200, tl.get()); +// +// The template type argument T must have a public copy constructor. +// In addition, the default ThreadLocal constructor requires T to have +// a public default constructor. +// +// An object managed for a thread by a ThreadLocal instance is deleted +// when the thread exits. Or, if the ThreadLocal instance dies in +// that thread, when the ThreadLocal dies. It's the user's +// responsibility to ensure that all other threads using a ThreadLocal +// have exited when it dies, or the per-thread objects for those +// threads will not be deleted. +// +// Google Test only uses global ThreadLocal objects. That means they +// will die after main() has returned. Therefore, no per-thread +// object managed by Google Test will be leaked as long as all threads +// using Google Test have exited when main() returns. +template +class ThreadLocal { + public: + ThreadLocal() : key_(CreateKey()), + default_() {} + explicit ThreadLocal(const T& value) : key_(CreateKey()), + default_(value) {} + + ~ThreadLocal() { + // Destroys the managed object for the current thread, if any. + DeleteThreadLocalValue(pthread_getspecific(key_)); + + // Releases resources associated with the key. This will *not* + // delete managed objects for other threads. + GTEST_CHECK_POSIX_SUCCESS_(pthread_key_delete(key_)); + } + + T* pointer() { return GetOrCreateValue(); } + const T* pointer() const { return GetOrCreateValue(); } + const T& get() const { return *pointer(); } + void set(const T& value) { *pointer() = value; } + + private: + // Holds a value of type T. + class ValueHolder : public ThreadLocalValueHolderBase { + public: + explicit ValueHolder(const T& value) : value_(value) {} + + T* pointer() { return &value_; } + + private: + T value_; + GTEST_DISALLOW_COPY_AND_ASSIGN_(ValueHolder); + }; + + static pthread_key_t CreateKey() { + pthread_key_t key; + // When a thread exits, DeleteThreadLocalValue() will be called on + // the object managed for that thread. + GTEST_CHECK_POSIX_SUCCESS_( + pthread_key_create(&key, &DeleteThreadLocalValue)); + return key; + } + + T* GetOrCreateValue() const { + ThreadLocalValueHolderBase* const holder = + static_cast(pthread_getspecific(key_)); + if (holder != NULL) { + return CheckedDowncastToActualType(holder)->pointer(); + } + + ValueHolder* const new_holder = new ValueHolder(default_); + ThreadLocalValueHolderBase* const holder_base = new_holder; + GTEST_CHECK_POSIX_SUCCESS_(pthread_setspecific(key_, holder_base)); + return new_holder->pointer(); + } + + // A key pthreads uses for looking up per-thread values. + const pthread_key_t key_; + const T default_; // The default value for each thread. + + GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal); +}; + +# define GTEST_IS_THREADSAFE 1 + +#else // GTEST_HAS_PTHREAD + +// A dummy implementation of synchronization primitives (mutex, lock, +// and thread-local variable). Necessary for compiling Google Test where +// mutex is not supported - using Google Test in multiple threads is not +// supported on such platforms. + +class Mutex { + public: + Mutex() {} + void Lock() {} + void Unlock() {} + void AssertHeld() const {} +}; + +# define GTEST_DECLARE_STATIC_MUTEX_(mutex) \ + extern ::testing::internal::Mutex mutex + +# define GTEST_DEFINE_STATIC_MUTEX_(mutex) ::testing::internal::Mutex mutex + +class GTestMutexLock { + public: + explicit GTestMutexLock(Mutex*) {} // NOLINT +}; + +typedef GTestMutexLock MutexLock; + +template +class ThreadLocal { + public: + ThreadLocal() : value_() {} + explicit ThreadLocal(const T& value) : value_(value) {} + T* pointer() { return &value_; } + const T* pointer() const { return &value_; } + const T& get() const { return value_; } + void set(const T& value) { value_ = value; } + private: + T value_; +}; + +// The above synchronization primitives have dummy implementations. +// Therefore Google Test is not thread-safe. +# define GTEST_IS_THREADSAFE 0 + +#endif // GTEST_HAS_PTHREAD + +// Returns the number of threads running in the process, or 0 to indicate that +// we cannot detect it. +GTEST_API_ size_t GetThreadCount(); + +// Passing non-POD classes through ellipsis (...) crashes the ARM +// compiler and generates a warning in Sun Studio. The Nokia Symbian +// and the IBM XL C/C++ compiler try to instantiate a copy constructor +// for objects passed through ellipsis (...), failing for uncopyable +// objects. We define this to ensure that only POD is passed through +// ellipsis on these systems. +#if defined(__SYMBIAN32__) || defined(__IBMCPP__) || defined(__SUNPRO_CC) +// We lose support for NULL detection where the compiler doesn't like +// passing non-POD classes through ellipsis (...). +# define GTEST_ELLIPSIS_NEEDS_POD_ 1 +#else +# define GTEST_CAN_COMPARE_NULL 1 +#endif + +// The Nokia Symbian and IBM XL C/C++ compilers cannot decide between +// const T& and const T* in a function template. These compilers +// _can_ decide between class template specializations for T and T*, +// so a tr1::type_traits-like is_pointer works. +#if defined(__SYMBIAN32__) || defined(__IBMCPP__) +# define GTEST_NEEDS_IS_POINTER_ 1 +#endif + +template +struct bool_constant { + typedef bool_constant type; + static const bool value = bool_value; +}; +template const bool bool_constant::value; + +typedef bool_constant false_type; +typedef bool_constant true_type; + +template +struct is_pointer : public false_type {}; + +template +struct is_pointer : public true_type {}; + +template +struct IteratorTraits { + typedef typename Iterator::value_type value_type; +}; + +template +struct IteratorTraits { + typedef T value_type; +}; + +template +struct IteratorTraits { + typedef T value_type; +}; + +#if GTEST_OS_WINDOWS +# define GTEST_PATH_SEP_ "\\" +# define GTEST_HAS_ALT_PATH_SEP_ 1 +// The biggest signed integer type the compiler supports. +typedef __int64 BiggestInt; +#else +# define GTEST_PATH_SEP_ "/" +# define GTEST_HAS_ALT_PATH_SEP_ 0 +typedef long long BiggestInt; // NOLINT +#endif // GTEST_OS_WINDOWS + +// Utilities for char. + +// isspace(int ch) and friends accept an unsigned char or EOF. char +// may be signed, depending on the compiler (or compiler flags). +// Therefore we need to cast a char to unsigned char before calling +// isspace(), etc. + +inline bool IsAlpha(char ch) { + return isalpha(static_cast(ch)) != 0; +} +inline bool IsAlNum(char ch) { + return isalnum(static_cast(ch)) != 0; +} +inline bool IsDigit(char ch) { + return isdigit(static_cast(ch)) != 0; +} +inline bool IsLower(char ch) { + return islower(static_cast(ch)) != 0; +} +inline bool IsSpace(char ch) { + return isspace(static_cast(ch)) != 0; +} +inline bool IsUpper(char ch) { + return isupper(static_cast(ch)) != 0; +} +inline bool IsXDigit(char ch) { + return isxdigit(static_cast(ch)) != 0; +} +inline bool IsXDigit(wchar_t ch) { + const unsigned char low_byte = static_cast(ch); + return ch == low_byte && isxdigit(low_byte) != 0; +} + +inline char ToLower(char ch) { + return static_cast(tolower(static_cast(ch))); +} +inline char ToUpper(char ch) { + return static_cast(toupper(static_cast(ch))); +} + +// The testing::internal::posix namespace holds wrappers for common +// POSIX functions. These wrappers hide the differences between +// Windows/MSVC and POSIX systems. Since some compilers define these +// standard functions as macros, the wrapper cannot have the same name +// as the wrapped function. + +namespace posix { + +// Functions with a different name on Windows. + +#if GTEST_OS_WINDOWS + +typedef struct _stat StatStruct; + +# ifdef __BORLANDC__ +inline int IsATTY(int fd) { return isatty(fd); } +inline int StrCaseCmp(const char* s1, const char* s2) { + return stricmp(s1, s2); +} +inline char* StrDup(const char* src) { return strdup(src); } +# else // !__BORLANDC__ +# if GTEST_OS_WINDOWS_MOBILE +inline int IsATTY(int /* fd */) { return 0; } +# else +inline int IsATTY(int fd) { return _isatty(fd); } +# endif // GTEST_OS_WINDOWS_MOBILE +inline int StrCaseCmp(const char* s1, const char* s2) { + return _stricmp(s1, s2); +} +inline char* StrDup(const char* src) { return _strdup(src); } +# endif // __BORLANDC__ + +# if GTEST_OS_WINDOWS_MOBILE +inline int FileNo(FILE* file) { return reinterpret_cast(_fileno(file)); } +// Stat(), RmDir(), and IsDir() are not needed on Windows CE at this +// time and thus not defined there. +# else +inline int FileNo(FILE* file) { return _fileno(file); } +inline int Stat(const char* path, StatStruct* buf) { return _stat(path, buf); } +inline int RmDir(const char* dir) { return _rmdir(dir); } +inline bool IsDir(const StatStruct& st) { + return (_S_IFDIR & st.st_mode) != 0; +} +# endif // GTEST_OS_WINDOWS_MOBILE + +#else + +typedef struct stat StatStruct; + +inline int FileNo(FILE* file) { return fileno(file); } +inline int IsATTY(int fd) { return isatty(fd); } +inline int Stat(const char* path, StatStruct* buf) { return stat(path, buf); } +inline int StrCaseCmp(const char* s1, const char* s2) { + return strcasecmp(s1, s2); +} +inline char* StrDup(const char* src) { return strdup(src); } +inline int RmDir(const char* dir) { return rmdir(dir); } +inline bool IsDir(const StatStruct& st) { return S_ISDIR(st.st_mode); } + +#endif // GTEST_OS_WINDOWS + +// Functions deprecated by MSVC 8.0. + +#ifdef _MSC_VER +// Temporarily disable warning 4996 (deprecated function). +# pragma warning(push) +# pragma warning(disable:4996) +#endif + +inline const char* StrNCpy(char* dest, const char* src, size_t n) { + return strncpy(dest, src, n); +} + +// ChDir(), FReopen(), FDOpen(), Read(), Write(), Close(), and +// StrError() aren't needed on Windows CE at this time and thus not +// defined there. + +#if !GTEST_OS_WINDOWS_MOBILE +inline int ChDir(const char* dir) { return chdir(dir); } +#endif +inline FILE* FOpen(const char* path, const char* mode) { + return fopen(path, mode); +} +#if !GTEST_OS_WINDOWS_MOBILE +inline FILE *FReopen(const char* path, const char* mode, FILE* stream) { + return freopen(path, mode, stream); +} +inline FILE* FDOpen(int fd, const char* mode) { return fdopen(fd, mode); } +#endif +inline int FClose(FILE* fp) { return fclose(fp); } +#if !GTEST_OS_WINDOWS_MOBILE +inline int Read(int fd, void* buf, unsigned int count) { + return static_cast(read(fd, buf, count)); +} +inline int Write(int fd, const void* buf, unsigned int count) { + return static_cast(write(fd, buf, count)); +} +inline int Close(int fd) { return close(fd); } +inline const char* StrError(int errnum) { return strerror(errnum); } +#endif +inline const char* GetEnv(const char* name) { +#if GTEST_OS_WINDOWS_MOBILE + // We are on Windows CE, which has no environment variables. + return NULL; +#elif defined(__BORLANDC__) || defined(__SunOS_5_8) || defined(__SunOS_5_9) + // Environment variables which we programmatically clear will be set to the + // empty string rather than unset (NULL). Handle that case. + const char* const env = getenv(name); + return (env != NULL && env[0] != '\0') ? env : NULL; +#else + return getenv(name); +#endif +} + +#ifdef _MSC_VER +# pragma warning(pop) // Restores the warning state. +#endif + +#if GTEST_OS_WINDOWS_MOBILE +// Windows CE has no C library. The abort() function is used in +// several places in Google Test. This implementation provides a reasonable +// imitation of standard behaviour. +void Abort(); +#else +inline void Abort() { abort(); } +#endif // GTEST_OS_WINDOWS_MOBILE + +} // namespace posix + +// MSVC "deprecates" snprintf and issues warnings wherever it is used. In +// order to avoid these warnings, we need to use _snprintf or _snprintf_s on +// MSVC-based platforms. We map the GTEST_SNPRINTF_ macro to the appropriate +// function in order to achieve that. We use macro definition here because +// snprintf is a variadic function. +#if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE +// MSVC 2005 and above support variadic macros. +# define GTEST_SNPRINTF_(buffer, size, format, ...) \ + _snprintf_s(buffer, size, size, format, __VA_ARGS__) +#elif defined(_MSC_VER) +// Windows CE does not define _snprintf_s and MSVC prior to 2005 doesn't +// complain about _snprintf. +# define GTEST_SNPRINTF_ _snprintf +#else +# define GTEST_SNPRINTF_ snprintf +#endif + +// The maximum number a BiggestInt can represent. This definition +// works no matter BiggestInt is represented in one's complement or +// two's complement. +// +// We cannot rely on numeric_limits in STL, as __int64 and long long +// are not part of standard C++ and numeric_limits doesn't need to be +// defined for them. +const BiggestInt kMaxBiggestInt = + ~(static_cast(1) << (8*sizeof(BiggestInt) - 1)); + +// This template class serves as a compile-time function from size to +// type. It maps a size in bytes to a primitive type with that +// size. e.g. +// +// TypeWithSize<4>::UInt +// +// is typedef-ed to be unsigned int (unsigned integer made up of 4 +// bytes). +// +// Such functionality should belong to STL, but I cannot find it +// there. +// +// Google Test uses this class in the implementation of floating-point +// comparison. +// +// For now it only handles UInt (unsigned int) as that's all Google Test +// needs. Other types can be easily added in the future if need +// arises. +template +class TypeWithSize { + public: + // This prevents the user from using TypeWithSize with incorrect + // values of N. + typedef void UInt; +}; + +// The specialization for size 4. +template <> +class TypeWithSize<4> { + public: + // unsigned int has size 4 in both gcc and MSVC. + // + // As base/basictypes.h doesn't compile on Windows, we cannot use + // uint32, uint64, and etc here. + typedef int Int; + typedef unsigned int UInt; +}; + +// The specialization for size 8. +template <> +class TypeWithSize<8> { + public: +#if GTEST_OS_WINDOWS + typedef __int64 Int; + typedef unsigned __int64 UInt; +#else + typedef long long Int; // NOLINT + typedef unsigned long long UInt; // NOLINT +#endif // GTEST_OS_WINDOWS +}; + +// Integer types of known sizes. +typedef TypeWithSize<4>::Int Int32; +typedef TypeWithSize<4>::UInt UInt32; +typedef TypeWithSize<8>::Int Int64; +typedef TypeWithSize<8>::UInt UInt64; +typedef TypeWithSize<8>::Int TimeInMillis; // Represents time in milliseconds. + +// Utilities for command line flags and environment variables. + +// Macro for referencing flags. +#define GTEST_FLAG(name) FLAGS_gtest_##name + +// Macros for declaring flags. +#define GTEST_DECLARE_bool_(name) GTEST_API_ extern bool GTEST_FLAG(name) +#define GTEST_DECLARE_int32_(name) \ + GTEST_API_ extern ::testing::internal::Int32 GTEST_FLAG(name) +#define GTEST_DECLARE_string_(name) \ + GTEST_API_ extern ::std::string GTEST_FLAG(name) + +// Macros for defining flags. +#define GTEST_DEFINE_bool_(name, default_val, doc) \ + GTEST_API_ bool GTEST_FLAG(name) = (default_val) +#define GTEST_DEFINE_int32_(name, default_val, doc) \ + GTEST_API_ ::testing::internal::Int32 GTEST_FLAG(name) = (default_val) +#define GTEST_DEFINE_string_(name, default_val, doc) \ + GTEST_API_ ::std::string GTEST_FLAG(name) = (default_val) + +// Thread annotations +#define GTEST_EXCLUSIVE_LOCK_REQUIRED_(locks) +#define GTEST_LOCK_EXCLUDED_(locks) + +// Parses 'str' for a 32-bit signed integer. If successful, writes the result +// to *value and returns true; otherwise leaves *value unchanged and returns +// false. +// TODO(chandlerc): Find a better way to refactor flag and environment parsing +// out of both gtest-port.cc and gtest.cc to avoid exporting this utility +// function. +bool ParseInt32(const Message& src_text, const char* str, Int32* value); + +// Parses a bool/Int32/string from the environment variable +// corresponding to the given Google Test flag. +bool BoolFromGTestEnv(const char* flag, bool default_val); +GTEST_API_ Int32 Int32FromGTestEnv(const char* flag, Int32 default_val); +const char* StringFromGTestEnv(const char* flag, const char* default_val); + +} // namespace internal +} // namespace testing + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-string.h b/lib/gtest/include/gtest/internal/gtest-string.h new file mode 100644 index 00000000..97f1a7fd --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-string.h @@ -0,0 +1,167 @@ +// Copyright 2005, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee) +// +// The Google C++ Testing Framework (Google Test) +// +// This header file declares the String class and functions used internally by +// Google Test. They are subject to change without notice. They should not used +// by code external to Google Test. +// +// This header file is #included by . +// It should not be #included by other files. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ + +#ifdef __BORLANDC__ +// string.h is not guaranteed to provide strcpy on C++ Builder. +# include +#endif + +#include +#include + +#include "gtest/internal/gtest-port.h" + +namespace testing { +namespace internal { + +// String - an abstract class holding static string utilities. +class GTEST_API_ String { + public: + // Static utility methods + + // Clones a 0-terminated C string, allocating memory using new. The + // caller is responsible for deleting the return value using + // delete[]. Returns the cloned string, or NULL if the input is + // NULL. + // + // This is different from strdup() in string.h, which allocates + // memory using malloc(). + static const char* CloneCString(const char* c_str); + +#if GTEST_OS_WINDOWS_MOBILE + // Windows CE does not have the 'ANSI' versions of Win32 APIs. To be + // able to pass strings to Win32 APIs on CE we need to convert them + // to 'Unicode', UTF-16. + + // Creates a UTF-16 wide string from the given ANSI string, allocating + // memory using new. The caller is responsible for deleting the return + // value using delete[]. Returns the wide string, or NULL if the + // input is NULL. + // + // The wide string is created using the ANSI codepage (CP_ACP) to + // match the behaviour of the ANSI versions of Win32 calls and the + // C runtime. + static LPCWSTR AnsiToUtf16(const char* c_str); + + // Creates an ANSI string from the given wide string, allocating + // memory using new. The caller is responsible for deleting the return + // value using delete[]. Returns the ANSI string, or NULL if the + // input is NULL. + // + // The returned string is created using the ANSI codepage (CP_ACP) to + // match the behaviour of the ANSI versions of Win32 calls and the + // C runtime. + static const char* Utf16ToAnsi(LPCWSTR utf16_str); +#endif + + // Compares two C strings. Returns true iff they have the same content. + // + // Unlike strcmp(), this function can handle NULL argument(s). A + // NULL C string is considered different to any non-NULL C string, + // including the empty string. + static bool CStringEquals(const char* lhs, const char* rhs); + + // Converts a wide C string to a String using the UTF-8 encoding. + // NULL will be converted to "(null)". If an error occurred during + // the conversion, "(failed to convert from wide string)" is + // returned. + static std::string ShowWideCString(const wchar_t* wide_c_str); + + // Compares two wide C strings. Returns true iff they have the same + // content. + // + // Unlike wcscmp(), this function can handle NULL argument(s). A + // NULL C string is considered different to any non-NULL C string, + // including the empty string. + static bool WideCStringEquals(const wchar_t* lhs, const wchar_t* rhs); + + // Compares two C strings, ignoring case. Returns true iff they + // have the same content. + // + // Unlike strcasecmp(), this function can handle NULL argument(s). + // A NULL C string is considered different to any non-NULL C string, + // including the empty string. + static bool CaseInsensitiveCStringEquals(const char* lhs, + const char* rhs); + + // Compares two wide C strings, ignoring case. Returns true iff they + // have the same content. + // + // Unlike wcscasecmp(), this function can handle NULL argument(s). + // A NULL C string is considered different to any non-NULL wide C string, + // including the empty string. + // NB: The implementations on different platforms slightly differ. + // On windows, this method uses _wcsicmp which compares according to LC_CTYPE + // environment variable. On GNU platform this method uses wcscasecmp + // which compares according to LC_CTYPE category of the current locale. + // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the + // current locale. + static bool CaseInsensitiveWideCStringEquals(const wchar_t* lhs, + const wchar_t* rhs); + + // Returns true iff the given string ends with the given suffix, ignoring + // case. Any string is considered to end with an empty suffix. + static bool EndsWithCaseInsensitive( + const std::string& str, const std::string& suffix); + + // Formats an int value as "%02d". + static std::string FormatIntWidth2(int value); // "%02d" for width == 2 + + // Formats an int value as "%X". + static std::string FormatHexInt(int value); + + // Formats a byte as "%02X". + static std::string FormatByte(unsigned char value); + + private: + String(); // Not meant to be instantiated. +}; // class String + +// Gets the content of the stringstream's buffer as an std::string. Each '\0' +// character in the buffer is replaced with "\\0". +GTEST_API_ std::string StringStreamToString(::std::stringstream* stream); + +} // namespace internal +} // namespace testing + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-tuple.h b/lib/gtest/include/gtest/internal/gtest-tuple.h new file mode 100644 index 00000000..7b3dfc31 --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-tuple.h @@ -0,0 +1,1012 @@ +// This file was GENERATED by command: +// pump.py gtest-tuple.h.pump +// DO NOT EDIT BY HAND!!! + +// Copyright 2009 Google Inc. +// All Rights Reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) + +// Implements a subset of TR1 tuple needed by Google Test and Google Mock. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ + +#include // For ::std::pair. + +// The compiler used in Symbian has a bug that prevents us from declaring the +// tuple template as a friend (it complains that tuple is redefined). This +// hack bypasses the bug by declaring the members that should otherwise be +// private as public. +// Sun Studio versions < 12 also have the above bug. +#if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590) +# define GTEST_DECLARE_TUPLE_AS_FRIEND_ public: +#else +# define GTEST_DECLARE_TUPLE_AS_FRIEND_ \ + template friend class tuple; \ + private: +#endif + +// GTEST_n_TUPLE_(T) is the type of an n-tuple. +#define GTEST_0_TUPLE_(T) tuple<> +#define GTEST_1_TUPLE_(T) tuple +#define GTEST_2_TUPLE_(T) tuple +#define GTEST_3_TUPLE_(T) tuple +#define GTEST_4_TUPLE_(T) tuple +#define GTEST_5_TUPLE_(T) tuple +#define GTEST_6_TUPLE_(T) tuple +#define GTEST_7_TUPLE_(T) tuple +#define GTEST_8_TUPLE_(T) tuple +#define GTEST_9_TUPLE_(T) tuple +#define GTEST_10_TUPLE_(T) tuple + +// GTEST_n_TYPENAMES_(T) declares a list of n typenames. +#define GTEST_0_TYPENAMES_(T) +#define GTEST_1_TYPENAMES_(T) typename T##0 +#define GTEST_2_TYPENAMES_(T) typename T##0, typename T##1 +#define GTEST_3_TYPENAMES_(T) typename T##0, typename T##1, typename T##2 +#define GTEST_4_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ + typename T##3 +#define GTEST_5_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ + typename T##3, typename T##4 +#define GTEST_6_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ + typename T##3, typename T##4, typename T##5 +#define GTEST_7_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ + typename T##3, typename T##4, typename T##5, typename T##6 +#define GTEST_8_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ + typename T##3, typename T##4, typename T##5, typename T##6, typename T##7 +#define GTEST_9_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ + typename T##3, typename T##4, typename T##5, typename T##6, \ + typename T##7, typename T##8 +#define GTEST_10_TYPENAMES_(T) typename T##0, typename T##1, typename T##2, \ + typename T##3, typename T##4, typename T##5, typename T##6, \ + typename T##7, typename T##8, typename T##9 + +// In theory, defining stuff in the ::std namespace is undefined +// behavior. We can do this as we are playing the role of a standard +// library vendor. +namespace std { +namespace tr1 { + +template +class tuple; + +// Anything in namespace gtest_internal is Google Test's INTERNAL +// IMPLEMENTATION DETAIL and MUST NOT BE USED DIRECTLY in user code. +namespace gtest_internal { + +// ByRef::type is T if T is a reference; otherwise it's const T&. +template +struct ByRef { typedef const T& type; }; // NOLINT +template +struct ByRef { typedef T& type; }; // NOLINT + +// A handy wrapper for ByRef. +#define GTEST_BY_REF_(T) typename ::std::tr1::gtest_internal::ByRef::type + +// AddRef::type is T if T is a reference; otherwise it's T&. This +// is the same as tr1::add_reference::type. +template +struct AddRef { typedef T& type; }; // NOLINT +template +struct AddRef { typedef T& type; }; // NOLINT + +// A handy wrapper for AddRef. +#define GTEST_ADD_REF_(T) typename ::std::tr1::gtest_internal::AddRef::type + +// A helper for implementing get(). +template class Get; + +// A helper for implementing tuple_element. kIndexValid is true +// iff k < the number of fields in tuple type T. +template +struct TupleElement; + +template +struct TupleElement { + typedef T0 type; +}; + +template +struct TupleElement { + typedef T1 type; +}; + +template +struct TupleElement { + typedef T2 type; +}; + +template +struct TupleElement { + typedef T3 type; +}; + +template +struct TupleElement { + typedef T4 type; +}; + +template +struct TupleElement { + typedef T5 type; +}; + +template +struct TupleElement { + typedef T6 type; +}; + +template +struct TupleElement { + typedef T7 type; +}; + +template +struct TupleElement { + typedef T8 type; +}; + +template +struct TupleElement { + typedef T9 type; +}; + +} // namespace gtest_internal + +template <> +class tuple<> { + public: + tuple() {} + tuple(const tuple& /* t */) {} + tuple& operator=(const tuple& /* t */) { return *this; } +}; + +template +class GTEST_1_TUPLE_(T) { + public: + template friend class gtest_internal::Get; + + tuple() : f0_() {} + + explicit tuple(GTEST_BY_REF_(T0) f0) : f0_(f0) {} + + tuple(const tuple& t) : f0_(t.f0_) {} + + template + tuple(const GTEST_1_TUPLE_(U)& t) : f0_(t.f0_) {} + + tuple& operator=(const tuple& t) { return CopyFrom(t); } + + template + tuple& operator=(const GTEST_1_TUPLE_(U)& t) { + return CopyFrom(t); + } + + GTEST_DECLARE_TUPLE_AS_FRIEND_ + + template + tuple& CopyFrom(const GTEST_1_TUPLE_(U)& t) { + f0_ = t.f0_; + return *this; + } + + T0 f0_; +}; + +template +class GTEST_2_TUPLE_(T) { + public: + template friend class gtest_internal::Get; + + tuple() : f0_(), f1_() {} + + explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1) : f0_(f0), + f1_(f1) {} + + tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_) {} + + template + tuple(const GTEST_2_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_) {} + template + tuple(const ::std::pair& p) : f0_(p.first), f1_(p.second) {} + + tuple& operator=(const tuple& t) { return CopyFrom(t); } + + template + tuple& operator=(const GTEST_2_TUPLE_(U)& t) { + return CopyFrom(t); + } + template + tuple& operator=(const ::std::pair& p) { + f0_ = p.first; + f1_ = p.second; + return *this; + } + + GTEST_DECLARE_TUPLE_AS_FRIEND_ + + template + tuple& CopyFrom(const GTEST_2_TUPLE_(U)& t) { + f0_ = t.f0_; + f1_ = t.f1_; + return *this; + } + + T0 f0_; + T1 f1_; +}; + +template +class GTEST_3_TUPLE_(T) { + public: + template friend class gtest_internal::Get; + + tuple() : f0_(), f1_(), f2_() {} + + explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, + GTEST_BY_REF_(T2) f2) : f0_(f0), f1_(f1), f2_(f2) {} + + tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_) {} + + template + tuple(const GTEST_3_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_) {} + + tuple& operator=(const tuple& t) { return CopyFrom(t); } + + template + tuple& operator=(const GTEST_3_TUPLE_(U)& t) { + return CopyFrom(t); + } + + GTEST_DECLARE_TUPLE_AS_FRIEND_ + + template + tuple& CopyFrom(const GTEST_3_TUPLE_(U)& t) { + f0_ = t.f0_; + f1_ = t.f1_; + f2_ = t.f2_; + return *this; + } + + T0 f0_; + T1 f1_; + T2 f2_; +}; + +template +class GTEST_4_TUPLE_(T) { + public: + template friend class gtest_internal::Get; + + tuple() : f0_(), f1_(), f2_(), f3_() {} + + explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, + GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3) : f0_(f0), f1_(f1), f2_(f2), + f3_(f3) {} + + tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_) {} + + template + tuple(const GTEST_4_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), + f3_(t.f3_) {} + + tuple& operator=(const tuple& t) { return CopyFrom(t); } + + template + tuple& operator=(const GTEST_4_TUPLE_(U)& t) { + return CopyFrom(t); + } + + GTEST_DECLARE_TUPLE_AS_FRIEND_ + + template + tuple& CopyFrom(const GTEST_4_TUPLE_(U)& t) { + f0_ = t.f0_; + f1_ = t.f1_; + f2_ = t.f2_; + f3_ = t.f3_; + return *this; + } + + T0 f0_; + T1 f1_; + T2 f2_; + T3 f3_; +}; + +template +class GTEST_5_TUPLE_(T) { + public: + template friend class gtest_internal::Get; + + tuple() : f0_(), f1_(), f2_(), f3_(), f4_() {} + + explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, + GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, + GTEST_BY_REF_(T4) f4) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4) {} + + tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), + f4_(t.f4_) {} + + template + tuple(const GTEST_5_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), + f3_(t.f3_), f4_(t.f4_) {} + + tuple& operator=(const tuple& t) { return CopyFrom(t); } + + template + tuple& operator=(const GTEST_5_TUPLE_(U)& t) { + return CopyFrom(t); + } + + GTEST_DECLARE_TUPLE_AS_FRIEND_ + + template + tuple& CopyFrom(const GTEST_5_TUPLE_(U)& t) { + f0_ = t.f0_; + f1_ = t.f1_; + f2_ = t.f2_; + f3_ = t.f3_; + f4_ = t.f4_; + return *this; + } + + T0 f0_; + T1 f1_; + T2 f2_; + T3 f3_; + T4 f4_; +}; + +template +class GTEST_6_TUPLE_(T) { + public: + template friend class gtest_internal::Get; + + tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_() {} + + explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, + GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4, + GTEST_BY_REF_(T5) f5) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4), + f5_(f5) {} + + tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), + f4_(t.f4_), f5_(t.f5_) {} + + template + tuple(const GTEST_6_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), + f3_(t.f3_), f4_(t.f4_), f5_(t.f5_) {} + + tuple& operator=(const tuple& t) { return CopyFrom(t); } + + template + tuple& operator=(const GTEST_6_TUPLE_(U)& t) { + return CopyFrom(t); + } + + GTEST_DECLARE_TUPLE_AS_FRIEND_ + + template + tuple& CopyFrom(const GTEST_6_TUPLE_(U)& t) { + f0_ = t.f0_; + f1_ = t.f1_; + f2_ = t.f2_; + f3_ = t.f3_; + f4_ = t.f4_; + f5_ = t.f5_; + return *this; + } + + T0 f0_; + T1 f1_; + T2 f2_; + T3 f3_; + T4 f4_; + T5 f5_; +}; + +template +class GTEST_7_TUPLE_(T) { + public: + template friend class gtest_internal::Get; + + tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_() {} + + explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, + GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4, + GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6) : f0_(f0), f1_(f1), f2_(f2), + f3_(f3), f4_(f4), f5_(f5), f6_(f6) {} + + tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), + f4_(t.f4_), f5_(t.f5_), f6_(t.f6_) {} + + template + tuple(const GTEST_7_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), + f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_) {} + + tuple& operator=(const tuple& t) { return CopyFrom(t); } + + template + tuple& operator=(const GTEST_7_TUPLE_(U)& t) { + return CopyFrom(t); + } + + GTEST_DECLARE_TUPLE_AS_FRIEND_ + + template + tuple& CopyFrom(const GTEST_7_TUPLE_(U)& t) { + f0_ = t.f0_; + f1_ = t.f1_; + f2_ = t.f2_; + f3_ = t.f3_; + f4_ = t.f4_; + f5_ = t.f5_; + f6_ = t.f6_; + return *this; + } + + T0 f0_; + T1 f1_; + T2 f2_; + T3 f3_; + T4 f4_; + T5 f5_; + T6 f6_; +}; + +template +class GTEST_8_TUPLE_(T) { + public: + template friend class gtest_internal::Get; + + tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_() {} + + explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, + GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4, + GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6, + GTEST_BY_REF_(T7) f7) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4), + f5_(f5), f6_(f6), f7_(f7) {} + + tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), + f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_) {} + + template + tuple(const GTEST_8_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), + f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_) {} + + tuple& operator=(const tuple& t) { return CopyFrom(t); } + + template + tuple& operator=(const GTEST_8_TUPLE_(U)& t) { + return CopyFrom(t); + } + + GTEST_DECLARE_TUPLE_AS_FRIEND_ + + template + tuple& CopyFrom(const GTEST_8_TUPLE_(U)& t) { + f0_ = t.f0_; + f1_ = t.f1_; + f2_ = t.f2_; + f3_ = t.f3_; + f4_ = t.f4_; + f5_ = t.f5_; + f6_ = t.f6_; + f7_ = t.f7_; + return *this; + } + + T0 f0_; + T1 f1_; + T2 f2_; + T3 f3_; + T4 f4_; + T5 f5_; + T6 f6_; + T7 f7_; +}; + +template +class GTEST_9_TUPLE_(T) { + public: + template friend class gtest_internal::Get; + + tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_(), f8_() {} + + explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, + GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4, + GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6, GTEST_BY_REF_(T7) f7, + GTEST_BY_REF_(T8) f8) : f0_(f0), f1_(f1), f2_(f2), f3_(f3), f4_(f4), + f5_(f5), f6_(f6), f7_(f7), f8_(f8) {} + + tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), + f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_) {} + + template + tuple(const GTEST_9_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), + f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_) {} + + tuple& operator=(const tuple& t) { return CopyFrom(t); } + + template + tuple& operator=(const GTEST_9_TUPLE_(U)& t) { + return CopyFrom(t); + } + + GTEST_DECLARE_TUPLE_AS_FRIEND_ + + template + tuple& CopyFrom(const GTEST_9_TUPLE_(U)& t) { + f0_ = t.f0_; + f1_ = t.f1_; + f2_ = t.f2_; + f3_ = t.f3_; + f4_ = t.f4_; + f5_ = t.f5_; + f6_ = t.f6_; + f7_ = t.f7_; + f8_ = t.f8_; + return *this; + } + + T0 f0_; + T1 f1_; + T2 f2_; + T3 f3_; + T4 f4_; + T5 f5_; + T6 f6_; + T7 f7_; + T8 f8_; +}; + +template +class tuple { + public: + template friend class gtest_internal::Get; + + tuple() : f0_(), f1_(), f2_(), f3_(), f4_(), f5_(), f6_(), f7_(), f8_(), + f9_() {} + + explicit tuple(GTEST_BY_REF_(T0) f0, GTEST_BY_REF_(T1) f1, + GTEST_BY_REF_(T2) f2, GTEST_BY_REF_(T3) f3, GTEST_BY_REF_(T4) f4, + GTEST_BY_REF_(T5) f5, GTEST_BY_REF_(T6) f6, GTEST_BY_REF_(T7) f7, + GTEST_BY_REF_(T8) f8, GTEST_BY_REF_(T9) f9) : f0_(f0), f1_(f1), f2_(f2), + f3_(f3), f4_(f4), f5_(f5), f6_(f6), f7_(f7), f8_(f8), f9_(f9) {} + + tuple(const tuple& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), f3_(t.f3_), + f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_), f9_(t.f9_) {} + + template + tuple(const GTEST_10_TUPLE_(U)& t) : f0_(t.f0_), f1_(t.f1_), f2_(t.f2_), + f3_(t.f3_), f4_(t.f4_), f5_(t.f5_), f6_(t.f6_), f7_(t.f7_), f8_(t.f8_), + f9_(t.f9_) {} + + tuple& operator=(const tuple& t) { return CopyFrom(t); } + + template + tuple& operator=(const GTEST_10_TUPLE_(U)& t) { + return CopyFrom(t); + } + + GTEST_DECLARE_TUPLE_AS_FRIEND_ + + template + tuple& CopyFrom(const GTEST_10_TUPLE_(U)& t) { + f0_ = t.f0_; + f1_ = t.f1_; + f2_ = t.f2_; + f3_ = t.f3_; + f4_ = t.f4_; + f5_ = t.f5_; + f6_ = t.f6_; + f7_ = t.f7_; + f8_ = t.f8_; + f9_ = t.f9_; + return *this; + } + + T0 f0_; + T1 f1_; + T2 f2_; + T3 f3_; + T4 f4_; + T5 f5_; + T6 f6_; + T7 f7_; + T8 f8_; + T9 f9_; +}; + +// 6.1.3.2 Tuple creation functions. + +// Known limitations: we don't support passing an +// std::tr1::reference_wrapper to make_tuple(). And we don't +// implement tie(). + +inline tuple<> make_tuple() { return tuple<>(); } + +template +inline GTEST_1_TUPLE_(T) make_tuple(const T0& f0) { + return GTEST_1_TUPLE_(T)(f0); +} + +template +inline GTEST_2_TUPLE_(T) make_tuple(const T0& f0, const T1& f1) { + return GTEST_2_TUPLE_(T)(f0, f1); +} + +template +inline GTEST_3_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2) { + return GTEST_3_TUPLE_(T)(f0, f1, f2); +} + +template +inline GTEST_4_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, + const T3& f3) { + return GTEST_4_TUPLE_(T)(f0, f1, f2, f3); +} + +template +inline GTEST_5_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, + const T3& f3, const T4& f4) { + return GTEST_5_TUPLE_(T)(f0, f1, f2, f3, f4); +} + +template +inline GTEST_6_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, + const T3& f3, const T4& f4, const T5& f5) { + return GTEST_6_TUPLE_(T)(f0, f1, f2, f3, f4, f5); +} + +template +inline GTEST_7_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, + const T3& f3, const T4& f4, const T5& f5, const T6& f6) { + return GTEST_7_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6); +} + +template +inline GTEST_8_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, + const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7) { + return GTEST_8_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7); +} + +template +inline GTEST_9_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, + const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7, + const T8& f8) { + return GTEST_9_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7, f8); +} + +template +inline GTEST_10_TUPLE_(T) make_tuple(const T0& f0, const T1& f1, const T2& f2, + const T3& f3, const T4& f4, const T5& f5, const T6& f6, const T7& f7, + const T8& f8, const T9& f9) { + return GTEST_10_TUPLE_(T)(f0, f1, f2, f3, f4, f5, f6, f7, f8, f9); +} + +// 6.1.3.3 Tuple helper classes. + +template struct tuple_size; + +template +struct tuple_size { + static const int value = 0; +}; + +template +struct tuple_size { + static const int value = 1; +}; + +template +struct tuple_size { + static const int value = 2; +}; + +template +struct tuple_size { + static const int value = 3; +}; + +template +struct tuple_size { + static const int value = 4; +}; + +template +struct tuple_size { + static const int value = 5; +}; + +template +struct tuple_size { + static const int value = 6; +}; + +template +struct tuple_size { + static const int value = 7; +}; + +template +struct tuple_size { + static const int value = 8; +}; + +template +struct tuple_size { + static const int value = 9; +}; + +template +struct tuple_size { + static const int value = 10; +}; + +template +struct tuple_element { + typedef typename gtest_internal::TupleElement< + k < (tuple_size::value), k, Tuple>::type type; +}; + +#define GTEST_TUPLE_ELEMENT_(k, Tuple) typename tuple_element::type + +// 6.1.3.4 Element access. + +namespace gtest_internal { + +template <> +class Get<0> { + public: + template + static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(0, Tuple)) + Field(Tuple& t) { return t.f0_; } // NOLINT + + template + static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(0, Tuple)) + ConstField(const Tuple& t) { return t.f0_; } +}; + +template <> +class Get<1> { + public: + template + static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(1, Tuple)) + Field(Tuple& t) { return t.f1_; } // NOLINT + + template + static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(1, Tuple)) + ConstField(const Tuple& t) { return t.f1_; } +}; + +template <> +class Get<2> { + public: + template + static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(2, Tuple)) + Field(Tuple& t) { return t.f2_; } // NOLINT + + template + static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(2, Tuple)) + ConstField(const Tuple& t) { return t.f2_; } +}; + +template <> +class Get<3> { + public: + template + static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(3, Tuple)) + Field(Tuple& t) { return t.f3_; } // NOLINT + + template + static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(3, Tuple)) + ConstField(const Tuple& t) { return t.f3_; } +}; + +template <> +class Get<4> { + public: + template + static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(4, Tuple)) + Field(Tuple& t) { return t.f4_; } // NOLINT + + template + static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(4, Tuple)) + ConstField(const Tuple& t) { return t.f4_; } +}; + +template <> +class Get<5> { + public: + template + static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(5, Tuple)) + Field(Tuple& t) { return t.f5_; } // NOLINT + + template + static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(5, Tuple)) + ConstField(const Tuple& t) { return t.f5_; } +}; + +template <> +class Get<6> { + public: + template + static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(6, Tuple)) + Field(Tuple& t) { return t.f6_; } // NOLINT + + template + static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(6, Tuple)) + ConstField(const Tuple& t) { return t.f6_; } +}; + +template <> +class Get<7> { + public: + template + static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(7, Tuple)) + Field(Tuple& t) { return t.f7_; } // NOLINT + + template + static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(7, Tuple)) + ConstField(const Tuple& t) { return t.f7_; } +}; + +template <> +class Get<8> { + public: + template + static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(8, Tuple)) + Field(Tuple& t) { return t.f8_; } // NOLINT + + template + static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(8, Tuple)) + ConstField(const Tuple& t) { return t.f8_; } +}; + +template <> +class Get<9> { + public: + template + static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(9, Tuple)) + Field(Tuple& t) { return t.f9_; } // NOLINT + + template + static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(9, Tuple)) + ConstField(const Tuple& t) { return t.f9_; } +}; + +} // namespace gtest_internal + +template +GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_10_TUPLE_(T))) +get(GTEST_10_TUPLE_(T)& t) { + return gtest_internal::Get::Field(t); +} + +template +GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_10_TUPLE_(T))) +get(const GTEST_10_TUPLE_(T)& t) { + return gtest_internal::Get::ConstField(t); +} + +// 6.1.3.5 Relational operators + +// We only implement == and !=, as we don't have a need for the rest yet. + +namespace gtest_internal { + +// SameSizeTuplePrefixComparator::Eq(t1, t2) returns true if the +// first k fields of t1 equals the first k fields of t2. +// SameSizeTuplePrefixComparator(k1, k2) would be a compiler error if +// k1 != k2. +template +struct SameSizeTuplePrefixComparator; + +template <> +struct SameSizeTuplePrefixComparator<0, 0> { + template + static bool Eq(const Tuple1& /* t1 */, const Tuple2& /* t2 */) { + return true; + } +}; + +template +struct SameSizeTuplePrefixComparator { + template + static bool Eq(const Tuple1& t1, const Tuple2& t2) { + return SameSizeTuplePrefixComparator::Eq(t1, t2) && + ::std::tr1::get(t1) == ::std::tr1::get(t2); + } +}; + +} // namespace gtest_internal + +template +inline bool operator==(const GTEST_10_TUPLE_(T)& t, + const GTEST_10_TUPLE_(U)& u) { + return gtest_internal::SameSizeTuplePrefixComparator< + tuple_size::value, + tuple_size::value>::Eq(t, u); +} + +template +inline bool operator!=(const GTEST_10_TUPLE_(T)& t, + const GTEST_10_TUPLE_(U)& u) { return !(t == u); } + +// 6.1.4 Pairs. +// Unimplemented. + +} // namespace tr1 +} // namespace std + +#undef GTEST_0_TUPLE_ +#undef GTEST_1_TUPLE_ +#undef GTEST_2_TUPLE_ +#undef GTEST_3_TUPLE_ +#undef GTEST_4_TUPLE_ +#undef GTEST_5_TUPLE_ +#undef GTEST_6_TUPLE_ +#undef GTEST_7_TUPLE_ +#undef GTEST_8_TUPLE_ +#undef GTEST_9_TUPLE_ +#undef GTEST_10_TUPLE_ + +#undef GTEST_0_TYPENAMES_ +#undef GTEST_1_TYPENAMES_ +#undef GTEST_2_TYPENAMES_ +#undef GTEST_3_TYPENAMES_ +#undef GTEST_4_TYPENAMES_ +#undef GTEST_5_TYPENAMES_ +#undef GTEST_6_TYPENAMES_ +#undef GTEST_7_TYPENAMES_ +#undef GTEST_8_TYPENAMES_ +#undef GTEST_9_TYPENAMES_ +#undef GTEST_10_TYPENAMES_ + +#undef GTEST_DECLARE_TUPLE_AS_FRIEND_ +#undef GTEST_BY_REF_ +#undef GTEST_ADD_REF_ +#undef GTEST_TUPLE_ELEMENT_ + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-tuple.h.pump b/lib/gtest/include/gtest/internal/gtest-tuple.h.pump new file mode 100644 index 00000000..c7d9e039 --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-tuple.h.pump @@ -0,0 +1,339 @@ +$$ -*- mode: c++; -*- +$var n = 10 $$ Maximum number of tuple fields we want to support. +$$ This meta comment fixes auto-indentation in Emacs. }} +// Copyright 2009 Google Inc. +// All Rights Reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) + +// Implements a subset of TR1 tuple needed by Google Test and Google Mock. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ + +#include // For ::std::pair. + +// The compiler used in Symbian has a bug that prevents us from declaring the +// tuple template as a friend (it complains that tuple is redefined). This +// hack bypasses the bug by declaring the members that should otherwise be +// private as public. +// Sun Studio versions < 12 also have the above bug. +#if defined(__SYMBIAN32__) || (defined(__SUNPRO_CC) && __SUNPRO_CC < 0x590) +# define GTEST_DECLARE_TUPLE_AS_FRIEND_ public: +#else +# define GTEST_DECLARE_TUPLE_AS_FRIEND_ \ + template friend class tuple; \ + private: +#endif + + +$range i 0..n-1 +$range j 0..n +$range k 1..n +// GTEST_n_TUPLE_(T) is the type of an n-tuple. +#define GTEST_0_TUPLE_(T) tuple<> + +$for k [[ +$range m 0..k-1 +$range m2 k..n-1 +#define GTEST_$(k)_TUPLE_(T) tuple<$for m, [[T##$m]]$for m2 [[, void]]> + +]] + +// GTEST_n_TYPENAMES_(T) declares a list of n typenames. + +$for j [[ +$range m 0..j-1 +#define GTEST_$(j)_TYPENAMES_(T) $for m, [[typename T##$m]] + + +]] + +// In theory, defining stuff in the ::std namespace is undefined +// behavior. We can do this as we are playing the role of a standard +// library vendor. +namespace std { +namespace tr1 { + +template <$for i, [[typename T$i = void]]> +class tuple; + +// Anything in namespace gtest_internal is Google Test's INTERNAL +// IMPLEMENTATION DETAIL and MUST NOT BE USED DIRECTLY in user code. +namespace gtest_internal { + +// ByRef::type is T if T is a reference; otherwise it's const T&. +template +struct ByRef { typedef const T& type; }; // NOLINT +template +struct ByRef { typedef T& type; }; // NOLINT + +// A handy wrapper for ByRef. +#define GTEST_BY_REF_(T) typename ::std::tr1::gtest_internal::ByRef::type + +// AddRef::type is T if T is a reference; otherwise it's T&. This +// is the same as tr1::add_reference::type. +template +struct AddRef { typedef T& type; }; // NOLINT +template +struct AddRef { typedef T& type; }; // NOLINT + +// A handy wrapper for AddRef. +#define GTEST_ADD_REF_(T) typename ::std::tr1::gtest_internal::AddRef::type + +// A helper for implementing get(). +template class Get; + +// A helper for implementing tuple_element. kIndexValid is true +// iff k < the number of fields in tuple type T. +template +struct TupleElement; + + +$for i [[ +template +struct TupleElement { + typedef T$i type; +}; + + +]] +} // namespace gtest_internal + +template <> +class tuple<> { + public: + tuple() {} + tuple(const tuple& /* t */) {} + tuple& operator=(const tuple& /* t */) { return *this; } +}; + + +$for k [[ +$range m 0..k-1 +template +class $if k < n [[GTEST_$(k)_TUPLE_(T)]] $else [[tuple]] { + public: + template friend class gtest_internal::Get; + + tuple() : $for m, [[f$(m)_()]] {} + + explicit tuple($for m, [[GTEST_BY_REF_(T$m) f$m]]) : [[]] +$for m, [[f$(m)_(f$m)]] {} + + tuple(const tuple& t) : $for m, [[f$(m)_(t.f$(m)_)]] {} + + template + tuple(const GTEST_$(k)_TUPLE_(U)& t) : $for m, [[f$(m)_(t.f$(m)_)]] {} + +$if k == 2 [[ + template + tuple(const ::std::pair& p) : f0_(p.first), f1_(p.second) {} + +]] + + tuple& operator=(const tuple& t) { return CopyFrom(t); } + + template + tuple& operator=(const GTEST_$(k)_TUPLE_(U)& t) { + return CopyFrom(t); + } + +$if k == 2 [[ + template + tuple& operator=(const ::std::pair& p) { + f0_ = p.first; + f1_ = p.second; + return *this; + } + +]] + + GTEST_DECLARE_TUPLE_AS_FRIEND_ + + template + tuple& CopyFrom(const GTEST_$(k)_TUPLE_(U)& t) { + +$for m [[ + f$(m)_ = t.f$(m)_; + +]] + return *this; + } + + +$for m [[ + T$m f$(m)_; + +]] +}; + + +]] +// 6.1.3.2 Tuple creation functions. + +// Known limitations: we don't support passing an +// std::tr1::reference_wrapper to make_tuple(). And we don't +// implement tie(). + +inline tuple<> make_tuple() { return tuple<>(); } + +$for k [[ +$range m 0..k-1 + +template +inline GTEST_$(k)_TUPLE_(T) make_tuple($for m, [[const T$m& f$m]]) { + return GTEST_$(k)_TUPLE_(T)($for m, [[f$m]]); +} + +]] + +// 6.1.3.3 Tuple helper classes. + +template struct tuple_size; + + +$for j [[ +template +struct tuple_size { + static const int value = $j; +}; + + +]] +template +struct tuple_element { + typedef typename gtest_internal::TupleElement< + k < (tuple_size::value), k, Tuple>::type type; +}; + +#define GTEST_TUPLE_ELEMENT_(k, Tuple) typename tuple_element::type + +// 6.1.3.4 Element access. + +namespace gtest_internal { + + +$for i [[ +template <> +class Get<$i> { + public: + template + static GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_($i, Tuple)) + Field(Tuple& t) { return t.f$(i)_; } // NOLINT + + template + static GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_($i, Tuple)) + ConstField(const Tuple& t) { return t.f$(i)_; } +}; + + +]] +} // namespace gtest_internal + +template +GTEST_ADD_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_$(n)_TUPLE_(T))) +get(GTEST_$(n)_TUPLE_(T)& t) { + return gtest_internal::Get::Field(t); +} + +template +GTEST_BY_REF_(GTEST_TUPLE_ELEMENT_(k, GTEST_$(n)_TUPLE_(T))) +get(const GTEST_$(n)_TUPLE_(T)& t) { + return gtest_internal::Get::ConstField(t); +} + +// 6.1.3.5 Relational operators + +// We only implement == and !=, as we don't have a need for the rest yet. + +namespace gtest_internal { + +// SameSizeTuplePrefixComparator::Eq(t1, t2) returns true if the +// first k fields of t1 equals the first k fields of t2. +// SameSizeTuplePrefixComparator(k1, k2) would be a compiler error if +// k1 != k2. +template +struct SameSizeTuplePrefixComparator; + +template <> +struct SameSizeTuplePrefixComparator<0, 0> { + template + static bool Eq(const Tuple1& /* t1 */, const Tuple2& /* t2 */) { + return true; + } +}; + +template +struct SameSizeTuplePrefixComparator { + template + static bool Eq(const Tuple1& t1, const Tuple2& t2) { + return SameSizeTuplePrefixComparator::Eq(t1, t2) && + ::std::tr1::get(t1) == ::std::tr1::get(t2); + } +}; + +} // namespace gtest_internal + +template +inline bool operator==(const GTEST_$(n)_TUPLE_(T)& t, + const GTEST_$(n)_TUPLE_(U)& u) { + return gtest_internal::SameSizeTuplePrefixComparator< + tuple_size::value, + tuple_size::value>::Eq(t, u); +} + +template +inline bool operator!=(const GTEST_$(n)_TUPLE_(T)& t, + const GTEST_$(n)_TUPLE_(U)& u) { return !(t == u); } + +// 6.1.4 Pairs. +// Unimplemented. + +} // namespace tr1 +} // namespace std + + +$for j [[ +#undef GTEST_$(j)_TUPLE_ + +]] + + +$for j [[ +#undef GTEST_$(j)_TYPENAMES_ + +]] + +#undef GTEST_DECLARE_TUPLE_AS_FRIEND_ +#undef GTEST_BY_REF_ +#undef GTEST_ADD_REF_ +#undef GTEST_TUPLE_ELEMENT_ + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TUPLE_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-type-util.h b/lib/gtest/include/gtest/internal/gtest-type-util.h new file mode 100644 index 00000000..e46f7cfc --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-type-util.h @@ -0,0 +1,3331 @@ +// This file was GENERATED by command: +// pump.py gtest-type-util.h.pump +// DO NOT EDIT BY HAND!!! + +// Copyright 2008 Google Inc. +// All Rights Reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) + +// Type utilities needed for implementing typed and type-parameterized +// tests. This file is generated by a SCRIPT. DO NOT EDIT BY HAND! +// +// Currently we support at most 50 types in a list, and at most 50 +// type-parameterized tests in one type-parameterized test case. +// Please contact googletestframework@googlegroups.com if you need +// more. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ + +#include "gtest/internal/gtest-port.h" + +// #ifdef __GNUC__ is too general here. It is possible to use gcc without using +// libstdc++ (which is where cxxabi.h comes from). +# if GTEST_HAS_CXXABI_H_ +# include +# elif defined(__HP_aCC) +# include +# endif // GTEST_HASH_CXXABI_H_ + +namespace testing { +namespace internal { + +// GetTypeName() returns a human-readable name of type T. +// NB: This function is also used in Google Mock, so don't move it inside of +// the typed-test-only section below. +template +std::string GetTypeName() { +# if GTEST_HAS_RTTI + + const char* const name = typeid(T).name(); +# if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC) + int status = 0; + // gcc's implementation of typeid(T).name() mangles the type name, + // so we have to demangle it. +# if GTEST_HAS_CXXABI_H_ + using abi::__cxa_demangle; +# endif // GTEST_HAS_CXXABI_H_ + char* const readable_name = __cxa_demangle(name, 0, 0, &status); + const std::string name_str(status == 0 ? readable_name : name); + free(readable_name); + return name_str; +# else + return name; +# endif // GTEST_HAS_CXXABI_H_ || __HP_aCC + +# else + + return ""; + +# endif // GTEST_HAS_RTTI +} + +#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P + +// AssertyTypeEq::type is defined iff T1 and T2 are the same +// type. This can be used as a compile-time assertion to ensure that +// two types are equal. + +template +struct AssertTypeEq; + +template +struct AssertTypeEq { + typedef bool type; +}; + +// A unique type used as the default value for the arguments of class +// template Types. This allows us to simulate variadic templates +// (e.g. Types, Type, and etc), which C++ doesn't +// support directly. +struct None {}; + +// The following family of struct and struct templates are used to +// represent type lists. In particular, TypesN +// represents a type list with N types (T1, T2, ..., and TN) in it. +// Except for Types0, every struct in the family has two member types: +// Head for the first type in the list, and Tail for the rest of the +// list. + +// The empty type list. +struct Types0 {}; + +// Type lists of length 1, 2, 3, and so on. + +template +struct Types1 { + typedef T1 Head; + typedef Types0 Tail; +}; +template +struct Types2 { + typedef T1 Head; + typedef Types1 Tail; +}; + +template +struct Types3 { + typedef T1 Head; + typedef Types2 Tail; +}; + +template +struct Types4 { + typedef T1 Head; + typedef Types3 Tail; +}; + +template +struct Types5 { + typedef T1 Head; + typedef Types4 Tail; +}; + +template +struct Types6 { + typedef T1 Head; + typedef Types5 Tail; +}; + +template +struct Types7 { + typedef T1 Head; + typedef Types6 Tail; +}; + +template +struct Types8 { + typedef T1 Head; + typedef Types7 Tail; +}; + +template +struct Types9 { + typedef T1 Head; + typedef Types8 Tail; +}; + +template +struct Types10 { + typedef T1 Head; + typedef Types9 Tail; +}; + +template +struct Types11 { + typedef T1 Head; + typedef Types10 Tail; +}; + +template +struct Types12 { + typedef T1 Head; + typedef Types11 Tail; +}; + +template +struct Types13 { + typedef T1 Head; + typedef Types12 Tail; +}; + +template +struct Types14 { + typedef T1 Head; + typedef Types13 Tail; +}; + +template +struct Types15 { + typedef T1 Head; + typedef Types14 Tail; +}; + +template +struct Types16 { + typedef T1 Head; + typedef Types15 Tail; +}; + +template +struct Types17 { + typedef T1 Head; + typedef Types16 Tail; +}; + +template +struct Types18 { + typedef T1 Head; + typedef Types17 Tail; +}; + +template +struct Types19 { + typedef T1 Head; + typedef Types18 Tail; +}; + +template +struct Types20 { + typedef T1 Head; + typedef Types19 Tail; +}; + +template +struct Types21 { + typedef T1 Head; + typedef Types20 Tail; +}; + +template +struct Types22 { + typedef T1 Head; + typedef Types21 Tail; +}; + +template +struct Types23 { + typedef T1 Head; + typedef Types22 Tail; +}; + +template +struct Types24 { + typedef T1 Head; + typedef Types23 Tail; +}; + +template +struct Types25 { + typedef T1 Head; + typedef Types24 Tail; +}; + +template +struct Types26 { + typedef T1 Head; + typedef Types25 Tail; +}; + +template +struct Types27 { + typedef T1 Head; + typedef Types26 Tail; +}; + +template +struct Types28 { + typedef T1 Head; + typedef Types27 Tail; +}; + +template +struct Types29 { + typedef T1 Head; + typedef Types28 Tail; +}; + +template +struct Types30 { + typedef T1 Head; + typedef Types29 Tail; +}; + +template +struct Types31 { + typedef T1 Head; + typedef Types30 Tail; +}; + +template +struct Types32 { + typedef T1 Head; + typedef Types31 Tail; +}; + +template +struct Types33 { + typedef T1 Head; + typedef Types32 Tail; +}; + +template +struct Types34 { + typedef T1 Head; + typedef Types33 Tail; +}; + +template +struct Types35 { + typedef T1 Head; + typedef Types34 Tail; +}; + +template +struct Types36 { + typedef T1 Head; + typedef Types35 Tail; +}; + +template +struct Types37 { + typedef T1 Head; + typedef Types36 Tail; +}; + +template +struct Types38 { + typedef T1 Head; + typedef Types37 Tail; +}; + +template +struct Types39 { + typedef T1 Head; + typedef Types38 Tail; +}; + +template +struct Types40 { + typedef T1 Head; + typedef Types39 Tail; +}; + +template +struct Types41 { + typedef T1 Head; + typedef Types40 Tail; +}; + +template +struct Types42 { + typedef T1 Head; + typedef Types41 Tail; +}; + +template +struct Types43 { + typedef T1 Head; + typedef Types42 Tail; +}; + +template +struct Types44 { + typedef T1 Head; + typedef Types43 Tail; +}; + +template +struct Types45 { + typedef T1 Head; + typedef Types44 Tail; +}; + +template +struct Types46 { + typedef T1 Head; + typedef Types45 Tail; +}; + +template +struct Types47 { + typedef T1 Head; + typedef Types46 Tail; +}; + +template +struct Types48 { + typedef T1 Head; + typedef Types47 Tail; +}; + +template +struct Types49 { + typedef T1 Head; + typedef Types48 Tail; +}; + +template +struct Types50 { + typedef T1 Head; + typedef Types49 Tail; +}; + + +} // namespace internal + +// We don't want to require the users to write TypesN<...> directly, +// as that would require them to count the length. Types<...> is much +// easier to write, but generates horrible messages when there is a +// compiler error, as gcc insists on printing out each template +// argument, even if it has the default value (this means Types +// will appear as Types in the compiler +// errors). +// +// Our solution is to combine the best part of the two approaches: a +// user would write Types, and Google Test will translate +// that to TypesN internally to make error messages +// readable. The translation is done by the 'type' member of the +// Types template. +template +struct Types { + typedef internal::Types50 type; +}; + +template <> +struct Types { + typedef internal::Types0 type; +}; +template +struct Types { + typedef internal::Types1 type; +}; +template +struct Types { + typedef internal::Types2 type; +}; +template +struct Types { + typedef internal::Types3 type; +}; +template +struct Types { + typedef internal::Types4 type; +}; +template +struct Types { + typedef internal::Types5 type; +}; +template +struct Types { + typedef internal::Types6 type; +}; +template +struct Types { + typedef internal::Types7 type; +}; +template +struct Types { + typedef internal::Types8 type; +}; +template +struct Types { + typedef internal::Types9 type; +}; +template +struct Types { + typedef internal::Types10 type; +}; +template +struct Types { + typedef internal::Types11 type; +}; +template +struct Types { + typedef internal::Types12 type; +}; +template +struct Types { + typedef internal::Types13 type; +}; +template +struct Types { + typedef internal::Types14 type; +}; +template +struct Types { + typedef internal::Types15 type; +}; +template +struct Types { + typedef internal::Types16 type; +}; +template +struct Types { + typedef internal::Types17 type; +}; +template +struct Types { + typedef internal::Types18 type; +}; +template +struct Types { + typedef internal::Types19 type; +}; +template +struct Types { + typedef internal::Types20 type; +}; +template +struct Types { + typedef internal::Types21 type; +}; +template +struct Types { + typedef internal::Types22 type; +}; +template +struct Types { + typedef internal::Types23 type; +}; +template +struct Types { + typedef internal::Types24 type; +}; +template +struct Types { + typedef internal::Types25 type; +}; +template +struct Types { + typedef internal::Types26 type; +}; +template +struct Types { + typedef internal::Types27 type; +}; +template +struct Types { + typedef internal::Types28 type; +}; +template +struct Types { + typedef internal::Types29 type; +}; +template +struct Types { + typedef internal::Types30 type; +}; +template +struct Types { + typedef internal::Types31 type; +}; +template +struct Types { + typedef internal::Types32 type; +}; +template +struct Types { + typedef internal::Types33 type; +}; +template +struct Types { + typedef internal::Types34 type; +}; +template +struct Types { + typedef internal::Types35 type; +}; +template +struct Types { + typedef internal::Types36 type; +}; +template +struct Types { + typedef internal::Types37 type; +}; +template +struct Types { + typedef internal::Types38 type; +}; +template +struct Types { + typedef internal::Types39 type; +}; +template +struct Types { + typedef internal::Types40 type; +}; +template +struct Types { + typedef internal::Types41 type; +}; +template +struct Types { + typedef internal::Types42 type; +}; +template +struct Types { + typedef internal::Types43 type; +}; +template +struct Types { + typedef internal::Types44 type; +}; +template +struct Types { + typedef internal::Types45 type; +}; +template +struct Types { + typedef internal::Types46 type; +}; +template +struct Types { + typedef internal::Types47 type; +}; +template +struct Types { + typedef internal::Types48 type; +}; +template +struct Types { + typedef internal::Types49 type; +}; + +namespace internal { + +# define GTEST_TEMPLATE_ template class + +// The template "selector" struct TemplateSel is used to +// represent Tmpl, which must be a class template with one type +// parameter, as a type. TemplateSel::Bind::type is defined +// as the type Tmpl. This allows us to actually instantiate the +// template "selected" by TemplateSel. +// +// This trick is necessary for simulating typedef for class templates, +// which C++ doesn't support directly. +template +struct TemplateSel { + template + struct Bind { + typedef Tmpl type; + }; +}; + +# define GTEST_BIND_(TmplSel, T) \ + TmplSel::template Bind::type + +// A unique struct template used as the default value for the +// arguments of class template Templates. This allows us to simulate +// variadic templates (e.g. Templates, Templates, +// and etc), which C++ doesn't support directly. +template +struct NoneT {}; + +// The following family of struct and struct templates are used to +// represent template lists. In particular, TemplatesN represents a list of N templates (T1, T2, ..., and TN). Except +// for Templates0, every struct in the family has two member types: +// Head for the selector of the first template in the list, and Tail +// for the rest of the list. + +// The empty template list. +struct Templates0 {}; + +// Template lists of length 1, 2, 3, and so on. + +template +struct Templates1 { + typedef TemplateSel Head; + typedef Templates0 Tail; +}; +template +struct Templates2 { + typedef TemplateSel Head; + typedef Templates1 Tail; +}; + +template +struct Templates3 { + typedef TemplateSel Head; + typedef Templates2 Tail; +}; + +template +struct Templates4 { + typedef TemplateSel Head; + typedef Templates3 Tail; +}; + +template +struct Templates5 { + typedef TemplateSel Head; + typedef Templates4 Tail; +}; + +template +struct Templates6 { + typedef TemplateSel Head; + typedef Templates5 Tail; +}; + +template +struct Templates7 { + typedef TemplateSel Head; + typedef Templates6 Tail; +}; + +template +struct Templates8 { + typedef TemplateSel Head; + typedef Templates7 Tail; +}; + +template +struct Templates9 { + typedef TemplateSel Head; + typedef Templates8 Tail; +}; + +template +struct Templates10 { + typedef TemplateSel Head; + typedef Templates9 Tail; +}; + +template +struct Templates11 { + typedef TemplateSel Head; + typedef Templates10 Tail; +}; + +template +struct Templates12 { + typedef TemplateSel Head; + typedef Templates11 Tail; +}; + +template +struct Templates13 { + typedef TemplateSel Head; + typedef Templates12 Tail; +}; + +template +struct Templates14 { + typedef TemplateSel Head; + typedef Templates13 Tail; +}; + +template +struct Templates15 { + typedef TemplateSel Head; + typedef Templates14 Tail; +}; + +template +struct Templates16 { + typedef TemplateSel Head; + typedef Templates15 Tail; +}; + +template +struct Templates17 { + typedef TemplateSel Head; + typedef Templates16 Tail; +}; + +template +struct Templates18 { + typedef TemplateSel Head; + typedef Templates17 Tail; +}; + +template +struct Templates19 { + typedef TemplateSel Head; + typedef Templates18 Tail; +}; + +template +struct Templates20 { + typedef TemplateSel Head; + typedef Templates19 Tail; +}; + +template +struct Templates21 { + typedef TemplateSel Head; + typedef Templates20 Tail; +}; + +template +struct Templates22 { + typedef TemplateSel Head; + typedef Templates21 Tail; +}; + +template +struct Templates23 { + typedef TemplateSel Head; + typedef Templates22 Tail; +}; + +template +struct Templates24 { + typedef TemplateSel Head; + typedef Templates23 Tail; +}; + +template +struct Templates25 { + typedef TemplateSel Head; + typedef Templates24 Tail; +}; + +template +struct Templates26 { + typedef TemplateSel Head; + typedef Templates25 Tail; +}; + +template +struct Templates27 { + typedef TemplateSel Head; + typedef Templates26 Tail; +}; + +template +struct Templates28 { + typedef TemplateSel Head; + typedef Templates27 Tail; +}; + +template +struct Templates29 { + typedef TemplateSel Head; + typedef Templates28 Tail; +}; + +template +struct Templates30 { + typedef TemplateSel Head; + typedef Templates29 Tail; +}; + +template +struct Templates31 { + typedef TemplateSel Head; + typedef Templates30 Tail; +}; + +template +struct Templates32 { + typedef TemplateSel Head; + typedef Templates31 Tail; +}; + +template +struct Templates33 { + typedef TemplateSel Head; + typedef Templates32 Tail; +}; + +template +struct Templates34 { + typedef TemplateSel Head; + typedef Templates33 Tail; +}; + +template +struct Templates35 { + typedef TemplateSel Head; + typedef Templates34 Tail; +}; + +template +struct Templates36 { + typedef TemplateSel Head; + typedef Templates35 Tail; +}; + +template +struct Templates37 { + typedef TemplateSel Head; + typedef Templates36 Tail; +}; + +template +struct Templates38 { + typedef TemplateSel Head; + typedef Templates37 Tail; +}; + +template +struct Templates39 { + typedef TemplateSel Head; + typedef Templates38 Tail; +}; + +template +struct Templates40 { + typedef TemplateSel Head; + typedef Templates39 Tail; +}; + +template +struct Templates41 { + typedef TemplateSel Head; + typedef Templates40 Tail; +}; + +template +struct Templates42 { + typedef TemplateSel Head; + typedef Templates41 Tail; +}; + +template +struct Templates43 { + typedef TemplateSel Head; + typedef Templates42 Tail; +}; + +template +struct Templates44 { + typedef TemplateSel Head; + typedef Templates43 Tail; +}; + +template +struct Templates45 { + typedef TemplateSel Head; + typedef Templates44 Tail; +}; + +template +struct Templates46 { + typedef TemplateSel Head; + typedef Templates45 Tail; +}; + +template +struct Templates47 { + typedef TemplateSel Head; + typedef Templates46 Tail; +}; + +template +struct Templates48 { + typedef TemplateSel Head; + typedef Templates47 Tail; +}; + +template +struct Templates49 { + typedef TemplateSel Head; + typedef Templates48 Tail; +}; + +template +struct Templates50 { + typedef TemplateSel Head; + typedef Templates49 Tail; +}; + + +// We don't want to require the users to write TemplatesN<...> directly, +// as that would require them to count the length. Templates<...> is much +// easier to write, but generates horrible messages when there is a +// compiler error, as gcc insists on printing out each template +// argument, even if it has the default value (this means Templates +// will appear as Templates in the compiler +// errors). +// +// Our solution is to combine the best part of the two approaches: a +// user would write Templates, and Google Test will translate +// that to TemplatesN internally to make error messages +// readable. The translation is done by the 'type' member of the +// Templates template. +template +struct Templates { + typedef Templates50 type; +}; + +template <> +struct Templates { + typedef Templates0 type; +}; +template +struct Templates { + typedef Templates1 type; +}; +template +struct Templates { + typedef Templates2 type; +}; +template +struct Templates { + typedef Templates3 type; +}; +template +struct Templates { + typedef Templates4 type; +}; +template +struct Templates { + typedef Templates5 type; +}; +template +struct Templates { + typedef Templates6 type; +}; +template +struct Templates { + typedef Templates7 type; +}; +template +struct Templates { + typedef Templates8 type; +}; +template +struct Templates { + typedef Templates9 type; +}; +template +struct Templates { + typedef Templates10 type; +}; +template +struct Templates { + typedef Templates11 type; +}; +template +struct Templates { + typedef Templates12 type; +}; +template +struct Templates { + typedef Templates13 type; +}; +template +struct Templates { + typedef Templates14 type; +}; +template +struct Templates { + typedef Templates15 type; +}; +template +struct Templates { + typedef Templates16 type; +}; +template +struct Templates { + typedef Templates17 type; +}; +template +struct Templates { + typedef Templates18 type; +}; +template +struct Templates { + typedef Templates19 type; +}; +template +struct Templates { + typedef Templates20 type; +}; +template +struct Templates { + typedef Templates21 type; +}; +template +struct Templates { + typedef Templates22 type; +}; +template +struct Templates { + typedef Templates23 type; +}; +template +struct Templates { + typedef Templates24 type; +}; +template +struct Templates { + typedef Templates25 type; +}; +template +struct Templates { + typedef Templates26 type; +}; +template +struct Templates { + typedef Templates27 type; +}; +template +struct Templates { + typedef Templates28 type; +}; +template +struct Templates { + typedef Templates29 type; +}; +template +struct Templates { + typedef Templates30 type; +}; +template +struct Templates { + typedef Templates31 type; +}; +template +struct Templates { + typedef Templates32 type; +}; +template +struct Templates { + typedef Templates33 type; +}; +template +struct Templates { + typedef Templates34 type; +}; +template +struct Templates { + typedef Templates35 type; +}; +template +struct Templates { + typedef Templates36 type; +}; +template +struct Templates { + typedef Templates37 type; +}; +template +struct Templates { + typedef Templates38 type; +}; +template +struct Templates { + typedef Templates39 type; +}; +template +struct Templates { + typedef Templates40 type; +}; +template +struct Templates { + typedef Templates41 type; +}; +template +struct Templates { + typedef Templates42 type; +}; +template +struct Templates { + typedef Templates43 type; +}; +template +struct Templates { + typedef Templates44 type; +}; +template +struct Templates { + typedef Templates45 type; +}; +template +struct Templates { + typedef Templates46 type; +}; +template +struct Templates { + typedef Templates47 type; +}; +template +struct Templates { + typedef Templates48 type; +}; +template +struct Templates { + typedef Templates49 type; +}; + +// The TypeList template makes it possible to use either a single type +// or a Types<...> list in TYPED_TEST_CASE() and +// INSTANTIATE_TYPED_TEST_CASE_P(). + +template +struct TypeList { + typedef Types1 type; +}; + +template +struct TypeList > { + typedef typename Types::type type; +}; + +#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P + +} // namespace internal +} // namespace testing + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ diff --git a/lib/gtest/include/gtest/internal/gtest-type-util.h.pump b/lib/gtest/include/gtest/internal/gtest-type-util.h.pump new file mode 100644 index 00000000..251fdf02 --- /dev/null +++ b/lib/gtest/include/gtest/internal/gtest-type-util.h.pump @@ -0,0 +1,297 @@ +$$ -*- mode: c++; -*- +$var n = 50 $$ Maximum length of type lists we want to support. +// Copyright 2008 Google Inc. +// All Rights Reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) + +// Type utilities needed for implementing typed and type-parameterized +// tests. This file is generated by a SCRIPT. DO NOT EDIT BY HAND! +// +// Currently we support at most $n types in a list, and at most $n +// type-parameterized tests in one type-parameterized test case. +// Please contact googletestframework@googlegroups.com if you need +// more. + +#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ +#define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ + +#include "gtest/internal/gtest-port.h" + +// #ifdef __GNUC__ is too general here. It is possible to use gcc without using +// libstdc++ (which is where cxxabi.h comes from). +# if GTEST_HAS_CXXABI_H_ +# include +# elif defined(__HP_aCC) +# include +# endif // GTEST_HASH_CXXABI_H_ + +namespace testing { +namespace internal { + +// GetTypeName() returns a human-readable name of type T. +// NB: This function is also used in Google Mock, so don't move it inside of +// the typed-test-only section below. +template +std::string GetTypeName() { +# if GTEST_HAS_RTTI + + const char* const name = typeid(T).name(); +# if GTEST_HAS_CXXABI_H_ || defined(__HP_aCC) + int status = 0; + // gcc's implementation of typeid(T).name() mangles the type name, + // so we have to demangle it. +# if GTEST_HAS_CXXABI_H_ + using abi::__cxa_demangle; +# endif // GTEST_HAS_CXXABI_H_ + char* const readable_name = __cxa_demangle(name, 0, 0, &status); + const std::string name_str(status == 0 ? readable_name : name); + free(readable_name); + return name_str; +# else + return name; +# endif // GTEST_HAS_CXXABI_H_ || __HP_aCC + +# else + + return ""; + +# endif // GTEST_HAS_RTTI +} + +#if GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P + +// AssertyTypeEq::type is defined iff T1 and T2 are the same +// type. This can be used as a compile-time assertion to ensure that +// two types are equal. + +template +struct AssertTypeEq; + +template +struct AssertTypeEq { + typedef bool type; +}; + +// A unique type used as the default value for the arguments of class +// template Types. This allows us to simulate variadic templates +// (e.g. Types, Type, and etc), which C++ doesn't +// support directly. +struct None {}; + +// The following family of struct and struct templates are used to +// represent type lists. In particular, TypesN +// represents a type list with N types (T1, T2, ..., and TN) in it. +// Except for Types0, every struct in the family has two member types: +// Head for the first type in the list, and Tail for the rest of the +// list. + +// The empty type list. +struct Types0 {}; + +// Type lists of length 1, 2, 3, and so on. + +template +struct Types1 { + typedef T1 Head; + typedef Types0 Tail; +}; + +$range i 2..n + +$for i [[ +$range j 1..i +$range k 2..i +template <$for j, [[typename T$j]]> +struct Types$i { + typedef T1 Head; + typedef Types$(i-1)<$for k, [[T$k]]> Tail; +}; + + +]] + +} // namespace internal + +// We don't want to require the users to write TypesN<...> directly, +// as that would require them to count the length. Types<...> is much +// easier to write, but generates horrible messages when there is a +// compiler error, as gcc insists on printing out each template +// argument, even if it has the default value (this means Types +// will appear as Types in the compiler +// errors). +// +// Our solution is to combine the best part of the two approaches: a +// user would write Types, and Google Test will translate +// that to TypesN internally to make error messages +// readable. The translation is done by the 'type' member of the +// Types template. + +$range i 1..n +template <$for i, [[typename T$i = internal::None]]> +struct Types { + typedef internal::Types$n<$for i, [[T$i]]> type; +}; + +template <> +struct Types<$for i, [[internal::None]]> { + typedef internal::Types0 type; +}; + +$range i 1..n-1 +$for i [[ +$range j 1..i +$range k i+1..n +template <$for j, [[typename T$j]]> +struct Types<$for j, [[T$j]]$for k[[, internal::None]]> { + typedef internal::Types$i<$for j, [[T$j]]> type; +}; + +]] + +namespace internal { + +# define GTEST_TEMPLATE_ template class + +// The template "selector" struct TemplateSel is used to +// represent Tmpl, which must be a class template with one type +// parameter, as a type. TemplateSel::Bind::type is defined +// as the type Tmpl. This allows us to actually instantiate the +// template "selected" by TemplateSel. +// +// This trick is necessary for simulating typedef for class templates, +// which C++ doesn't support directly. +template +struct TemplateSel { + template + struct Bind { + typedef Tmpl type; + }; +}; + +# define GTEST_BIND_(TmplSel, T) \ + TmplSel::template Bind::type + +// A unique struct template used as the default value for the +// arguments of class template Templates. This allows us to simulate +// variadic templates (e.g. Templates, Templates, +// and etc), which C++ doesn't support directly. +template +struct NoneT {}; + +// The following family of struct and struct templates are used to +// represent template lists. In particular, TemplatesN represents a list of N templates (T1, T2, ..., and TN). Except +// for Templates0, every struct in the family has two member types: +// Head for the selector of the first template in the list, and Tail +// for the rest of the list. + +// The empty template list. +struct Templates0 {}; + +// Template lists of length 1, 2, 3, and so on. + +template +struct Templates1 { + typedef TemplateSel Head; + typedef Templates0 Tail; +}; + +$range i 2..n + +$for i [[ +$range j 1..i +$range k 2..i +template <$for j, [[GTEST_TEMPLATE_ T$j]]> +struct Templates$i { + typedef TemplateSel Head; + typedef Templates$(i-1)<$for k, [[T$k]]> Tail; +}; + + +]] + +// We don't want to require the users to write TemplatesN<...> directly, +// as that would require them to count the length. Templates<...> is much +// easier to write, but generates horrible messages when there is a +// compiler error, as gcc insists on printing out each template +// argument, even if it has the default value (this means Templates +// will appear as Templates in the compiler +// errors). +// +// Our solution is to combine the best part of the two approaches: a +// user would write Templates, and Google Test will translate +// that to TemplatesN internally to make error messages +// readable. The translation is done by the 'type' member of the +// Templates template. + +$range i 1..n +template <$for i, [[GTEST_TEMPLATE_ T$i = NoneT]]> +struct Templates { + typedef Templates$n<$for i, [[T$i]]> type; +}; + +template <> +struct Templates<$for i, [[NoneT]]> { + typedef Templates0 type; +}; + +$range i 1..n-1 +$for i [[ +$range j 1..i +$range k i+1..n +template <$for j, [[GTEST_TEMPLATE_ T$j]]> +struct Templates<$for j, [[T$j]]$for k[[, NoneT]]> { + typedef Templates$i<$for j, [[T$j]]> type; +}; + +]] + +// The TypeList template makes it possible to use either a single type +// or a Types<...> list in TYPED_TEST_CASE() and +// INSTANTIATE_TYPED_TEST_CASE_P(). + +template +struct TypeList { + typedef Types1 type; +}; + + +$range i 1..n +template <$for i, [[typename T$i]]> +struct TypeList > { + typedef typename Types<$for i, [[T$i]]>::type type; +}; + +#endif // GTEST_HAS_TYPED_TEST || GTEST_HAS_TYPED_TEST_P + +} // namespace internal +} // namespace testing + +#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_TYPE_UTIL_H_ diff --git a/lib/gtest/msvc/gtest-md.sln b/lib/gtest/msvc/gtest-md.sln new file mode 100644 index 00000000..829b4019 --- /dev/null +++ b/lib/gtest/msvc/gtest-md.sln @@ -0,0 +1,45 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "gtest-md.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main-md", "gtest_main-md.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862033}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test-md", "gtest_prod_test-md.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest-md", "gtest_unittest-md.vcproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.Build.0 = Release|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.ActiveCfg = Debug|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.Build.0 = Debug|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.ActiveCfg = Release|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.Build.0 = Release|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.ActiveCfg = Debug|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.Build.0 = Debug|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.ActiveCfg = Release|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.Build.0 = Release|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.ActiveCfg = Debug|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.Build.0 = Debug|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.ActiveCfg = Release|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/lib/gtest/msvc/gtest.sln b/lib/gtest/msvc/gtest.sln new file mode 100644 index 00000000..4f0e9015 --- /dev/null +++ b/lib/gtest/msvc/gtest.sln @@ -0,0 +1,57 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcxproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_unittest.vcxproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcxproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x86.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x86.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x86.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x86.Build.0 = Release|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x64.ActiveCfg = Debug|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x64.Build.0 = Debug|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x86.ActiveCfg = Debug|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug|x86.Build.0 = Debug|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x64.ActiveCfg = Release|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x64.Build.0 = Release|x64 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x86.ActiveCfg = Release|Win32 + {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release|x86.Build.0 = Release|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x64.ActiveCfg = Debug|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x64.Build.0 = Debug|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x86.ActiveCfg = Debug|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug|x86.Build.0 = Debug|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x64.ActiveCfg = Release|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x64.Build.0 = Release|x64 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x86.ActiveCfg = Release|Win32 + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release|x86.Build.0 = Release|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x64.ActiveCfg = Debug|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x64.Build.0 = Debug|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x86.ActiveCfg = Debug|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug|x86.Build.0 = Debug|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x64.ActiveCfg = Release|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x64.Build.0 = Release|x64 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x86.ActiveCfg = Release|Win32 + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/lib/gtest/msvc/gtest.vcxproj b/lib/gtest/msvc/gtest.vcxproj new file mode 100644 index 00000000..537f4048 --- /dev/null +++ b/lib/gtest/msvc/gtest.vcxproj @@ -0,0 +1,273 @@ + + + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} + Win32Proj + libgtest + + + + StaticLibrary + v100 + MultiByte + + + StaticLibrary + v100 + MultiByte + + + StaticLibrary + v100 + MultiByte + + + StaticLibrary + v100 + MultiByte + + + StaticLibrary + v100 + MultiByte + + + StaticLibrary + v100 + MultiByte + + + StaticLibrary + v100 + MultiByte + + + StaticLibrary + v100 + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + $(OutDir)gtestd.lib + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + $(OutDir)gtestd.lib + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)gtestd.lib + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + $(OutDir)gtestd.lib + + + + + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + $(OutDir)gtest.lib + + + + + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + $(OutDir)gtest.lib + + + + + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + $(OutDir)gtest.lib + + + + + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + $(OutDir)gtest.lib + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/lib/gtest/msvc/gtest.vcxproj.filters b/lib/gtest/msvc/gtest.vcxproj.filters new file mode 100644 index 00000000..b566f891 --- /dev/null +++ b/lib/gtest/msvc/gtest.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_main.vcxproj b/lib/gtest/msvc/gtest_main.vcxproj new file mode 100644 index 00000000..10527154 --- /dev/null +++ b/lib/gtest/msvc/gtest_main.vcxproj @@ -0,0 +1,152 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AF54C8A-10BF-4332-9147-F68ED9862032} + Win32Proj + + + + StaticLibrary + v120 + MultiByte + + + StaticLibrary + v120 + MultiByte + + + StaticLibrary + v120 + MultiByte + + + StaticLibrary + v120 + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName)d.lib + + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName)d.lib + + + + + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + + + + \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_main.vcxproj.filters b/lib/gtest/msvc/gtest_main.vcxproj.filters new file mode 100644 index 00000000..b602e802 --- /dev/null +++ b/lib/gtest/msvc/gtest_main.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_prod_test.vcxproj b/lib/gtest/msvc/gtest_prod_test.vcxproj new file mode 100644 index 00000000..6894fdd0 --- /dev/null +++ b/lib/gtest/msvc/gtest_prod_test.vcxproj @@ -0,0 +1,195 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA} + Win32Proj + + + + Application + v120 + MultiByte + + + Application + v120 + MultiByte + + + Application + v120 + MultiByte + + + Application + v120 + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + true + + + true + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + false + + + false + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + Level3 + EditAndContinue + + + $(OutDir)gtest_prod_test.exe + true + $(OutDir)gtest_prod_test.pdb + Console + MachineX86 + + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + Level3 + ProgramDatabase + + + $(OutDir)gtest_prod_test.exe + true + $(OutDir)gtest_prod_test.pdb + Console + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + + + $(OutDir)gtest_prod_test.exe + true + Console + true + true + MachineX86 + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + + + $(OutDir)gtest_prod_test.exe + true + Console + true + true + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + + + + + + + {3af54c8a-10bf-4332-9147-f68ed9862032} + + + + + + \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_prod_test.vcxproj.filters b/lib/gtest/msvc/gtest_prod_test.vcxproj.filters new file mode 100644 index 00000000..e4089cdd --- /dev/null +++ b/lib/gtest/msvc/gtest_prod_test.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_unittest.vcxproj b/lib/gtest/msvc/gtest_unittest.vcxproj new file mode 100644 index 00000000..5f224934 --- /dev/null +++ b/lib/gtest/msvc/gtest_unittest.vcxproj @@ -0,0 +1,184 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4D9FDFB5-986A-4139-823C-F4EE0ED481A1} + Win32Proj + + + + Application + v120 + MultiByte + + + Application + v120 + MultiByte + + + Application + v120 + MultiByte + + + Application + v120 + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + true + + + true + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + false + + + false + $(SolutionDir)bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + Level3 + EditAndContinue + + + $(OutDir)gtest_unittest.exe + true + $(OutDir)gtest_unittest.pdb + Console + MachineX86 + + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + Level3 + ProgramDatabase + + + $(OutDir)gtest_unittest.exe + true + $(OutDir)gtest_unittest.pdb + Console + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + + + $(OutDir)gtest_unittest.exe + true + Console + true + true + MachineX86 + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + + + $(OutDir)gtest_unittest.exe + true + Console + true + true + + + + + MinSpace + MinSpace + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + Default + Default + + + + + ProgramDatabase + ProgramDatabase + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + + + + {3af54c8a-10bf-4332-9147-f68ed9862032} + + + + + + \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_unittest.vcxproj.filters b/lib/gtest/msvc/gtest_unittest.vcxproj.filters new file mode 100644 index 00000000..d3d56065 --- /dev/null +++ b/lib/gtest/msvc/gtest_unittest.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + \ No newline at end of file diff --git a/lib/gtest/src/gtest-all.cc b/lib/gtest/src/gtest-all.cc new file mode 100644 index 00000000..0a9cee52 --- /dev/null +++ b/lib/gtest/src/gtest-all.cc @@ -0,0 +1,48 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: mheule@google.com (Markus Heule) +// +// Google C++ Testing Framework (Google Test) +// +// Sometimes it's desirable to build Google Test by compiling a single file. +// This file serves this purpose. + +// This line ensures that gtest.h can be compiled on its own, even +// when it's fused. +#include "gtest/gtest.h" + +// The following lines pull in the real gtest *.cc files. +#include "src/gtest.cc" +#include "src/gtest-death-test.cc" +#include "src/gtest-filepath.cc" +#include "src/gtest-port.cc" +#include "src/gtest-printers.cc" +#include "src/gtest-test-part.cc" +#include "src/gtest-typed-test.cc" diff --git a/lib/gtest/src/gtest-death-test.cc b/lib/gtest/src/gtest-death-test.cc new file mode 100644 index 00000000..a6023fce --- /dev/null +++ b/lib/gtest/src/gtest-death-test.cc @@ -0,0 +1,1344 @@ +// Copyright 2005, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan), vladl@google.com (Vlad Losev) +// +// This file implements death tests. + +#include "gtest/gtest-death-test.h" +#include "gtest/internal/gtest-port.h" + +#if GTEST_HAS_DEATH_TEST + +# if GTEST_OS_MAC +# include +# endif // GTEST_OS_MAC + +# include +# include +# include + +# if GTEST_OS_LINUX +# include +# endif // GTEST_OS_LINUX + +# include + +# if GTEST_OS_WINDOWS +# include +# else +# include +# include +# endif // GTEST_OS_WINDOWS + +# if GTEST_OS_QNX +# include +# endif // GTEST_OS_QNX + +#endif // GTEST_HAS_DEATH_TEST + +#include "gtest/gtest-message.h" +#include "gtest/internal/gtest-string.h" + +// Indicates that this translation unit is part of Google Test's +// implementation. It must come before gtest-internal-inl.h is +// included, or there will be a compiler error. This trick is to +// prevent a user from accidentally including gtest-internal-inl.h in +// his code. +#define GTEST_IMPLEMENTATION_ 1 +#include "src/gtest-internal-inl.h" +#undef GTEST_IMPLEMENTATION_ + +namespace testing { + +// Constants. + +// The default death test style. +static const char kDefaultDeathTestStyle[] = "fast"; + +GTEST_DEFINE_string_( + death_test_style, + internal::StringFromGTestEnv("death_test_style", kDefaultDeathTestStyle), + "Indicates how to run a death test in a forked child process: " + "\"threadsafe\" (child process re-executes the test binary " + "from the beginning, running only the specific death test) or " + "\"fast\" (child process runs the death test immediately " + "after forking)."); + +GTEST_DEFINE_bool_( + death_test_use_fork, + internal::BoolFromGTestEnv("death_test_use_fork", false), + "Instructs to use fork()/_exit() instead of clone() in death tests. " + "Ignored and always uses fork() on POSIX systems where clone() is not " + "implemented. Useful when running under valgrind or similar tools if " + "those do not support clone(). Valgrind 3.3.1 will just fail if " + "it sees an unsupported combination of clone() flags. " + "It is not recommended to use this flag w/o valgrind though it will " + "work in 99% of the cases. Once valgrind is fixed, this flag will " + "most likely be removed."); + +namespace internal { +GTEST_DEFINE_string_( + internal_run_death_test, "", + "Indicates the file, line number, temporal index of " + "the single death test to run, and a file descriptor to " + "which a success code may be sent, all separated by " + "the '|' characters. This flag is specified if and only if the current " + "process is a sub-process launched for running a thread-safe " + "death test. FOR INTERNAL USE ONLY."); +} // namespace internal + +#if GTEST_HAS_DEATH_TEST + +namespace internal { + +// Valid only for fast death tests. Indicates the code is running in the +// child process of a fast style death test. +static bool g_in_fast_death_test_child = false; + +// Returns a Boolean value indicating whether the caller is currently +// executing in the context of the death test child process. Tools such as +// Valgrind heap checkers may need this to modify their behavior in death +// tests. IMPORTANT: This is an internal utility. Using it may break the +// implementation of death tests. User code MUST NOT use it. +bool InDeathTestChild() { +# if GTEST_OS_WINDOWS + + // On Windows, death tests are thread-safe regardless of the value of the + // death_test_style flag. + return !GTEST_FLAG(internal_run_death_test).empty(); + +# else + + if (GTEST_FLAG(death_test_style) == "threadsafe") + return !GTEST_FLAG(internal_run_death_test).empty(); + else + return g_in_fast_death_test_child; +#endif +} + +} // namespace internal + +// ExitedWithCode constructor. +ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) { +} + +// ExitedWithCode function-call operator. +bool ExitedWithCode::operator()(int exit_status) const { +# if GTEST_OS_WINDOWS + + return exit_status == exit_code_; + +# else + + return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_; + +# endif // GTEST_OS_WINDOWS +} + +# if !GTEST_OS_WINDOWS +// KilledBySignal constructor. +KilledBySignal::KilledBySignal(int signum) : signum_(signum) { +} + +// KilledBySignal function-call operator. +bool KilledBySignal::operator()(int exit_status) const { + return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_; +} +# endif // !GTEST_OS_WINDOWS + +namespace internal { + +// Utilities needed for death tests. + +// Generates a textual description of a given exit code, in the format +// specified by wait(2). +static std::string ExitSummary(int exit_code) { + Message m; + +# if GTEST_OS_WINDOWS + + m << "Exited with exit status " << exit_code; + +# else + + if (WIFEXITED(exit_code)) { + m << "Exited with exit status " << WEXITSTATUS(exit_code); + } else if (WIFSIGNALED(exit_code)) { + m << "Terminated by signal " << WTERMSIG(exit_code); + } +# ifdef WCOREDUMP + if (WCOREDUMP(exit_code)) { + m << " (core dumped)"; + } +# endif +# endif // GTEST_OS_WINDOWS + + return m.GetString(); +} + +// Returns true if exit_status describes a process that was terminated +// by a signal, or exited normally with a nonzero exit code. +bool ExitedUnsuccessfully(int exit_status) { + return !ExitedWithCode(0)(exit_status); +} + +# if !GTEST_OS_WINDOWS +// Generates a textual failure message when a death test finds more than +// one thread running, or cannot determine the number of threads, prior +// to executing the given statement. It is the responsibility of the +// caller not to pass a thread_count of 1. +static std::string DeathTestThreadWarning(size_t thread_count) { + Message msg; + msg << "Death tests use fork(), which is unsafe particularly" + << " in a threaded context. For this test, " << GTEST_NAME_ << " "; + if (thread_count == 0) + msg << "couldn't detect the number of threads."; + else + msg << "detected " << thread_count << " threads."; + return msg.GetString(); +} +# endif // !GTEST_OS_WINDOWS + +// Flag characters for reporting a death test that did not die. +static const char kDeathTestLived = 'L'; +static const char kDeathTestReturned = 'R'; +static const char kDeathTestThrew = 'T'; +static const char kDeathTestInternalError = 'I'; + +// An enumeration describing all of the possible ways that a death test can +// conclude. DIED means that the process died while executing the test +// code; LIVED means that process lived beyond the end of the test code; +// RETURNED means that the test statement attempted to execute a return +// statement, which is not allowed; THREW means that the test statement +// returned control by throwing an exception. IN_PROGRESS means the test +// has not yet concluded. +// TODO(vladl@google.com): Unify names and possibly values for +// AbortReason, DeathTestOutcome, and flag characters above. +enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW }; + +// Routine for aborting the program which is safe to call from an +// exec-style death test child process, in which case the error +// message is propagated back to the parent process. Otherwise, the +// message is simply printed to stderr. In either case, the program +// then exits with status 1. +void DeathTestAbort(const std::string& message) { + // On a POSIX system, this function may be called from a threadsafe-style + // death test child process, which operates on a very small stack. Use + // the heap for any additional non-minuscule memory requirements. + const InternalRunDeathTestFlag* const flag = + GetUnitTestImpl()->internal_run_death_test_flag(); + if (flag != NULL) { + FILE* parent = posix::FDOpen(flag->write_fd(), "w"); + fputc(kDeathTestInternalError, parent); + fprintf(parent, "%s", message.c_str()); + fflush(parent); + _exit(1); + } else { + fprintf(stderr, "%s", message.c_str()); + fflush(stderr); + posix::Abort(); + } +} + +// A replacement for CHECK that calls DeathTestAbort if the assertion +// fails. +# define GTEST_DEATH_TEST_CHECK_(expression) \ + do { \ + if (!::testing::internal::IsTrue(expression)) { \ + DeathTestAbort( \ + ::std::string("CHECK failed: File ") + __FILE__ + ", line " \ + + ::testing::internal::StreamableToString(__LINE__) + ": " \ + + #expression); \ + } \ + } while (::testing::internal::AlwaysFalse()) + +// This macro is similar to GTEST_DEATH_TEST_CHECK_, but it is meant for +// evaluating any system call that fulfills two conditions: it must return +// -1 on failure, and set errno to EINTR when it is interrupted and +// should be tried again. The macro expands to a loop that repeatedly +// evaluates the expression as long as it evaluates to -1 and sets +// errno to EINTR. If the expression evaluates to -1 but errno is +// something other than EINTR, DeathTestAbort is called. +# define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \ + do { \ + int gtest_retval; \ + do { \ + gtest_retval = (expression); \ + } while (gtest_retval == -1 && errno == EINTR); \ + if (gtest_retval == -1) { \ + DeathTestAbort( \ + ::std::string("CHECK failed: File ") + __FILE__ + ", line " \ + + ::testing::internal::StreamableToString(__LINE__) + ": " \ + + #expression + " != -1"); \ + } \ + } while (::testing::internal::AlwaysFalse()) + +// Returns the message describing the last system error in errno. +std::string GetLastErrnoDescription() { + return errno == 0 ? "" : posix::StrError(errno); +} + +// This is called from a death test parent process to read a failure +// message from the death test child process and log it with the FATAL +// severity. On Windows, the message is read from a pipe handle. On other +// platforms, it is read from a file descriptor. +static void FailFromInternalError(int fd) { + Message error; + char buffer[256]; + int num_read; + + do { + while ((num_read = posix::Read(fd, buffer, 255)) > 0) { + buffer[num_read] = '\0'; + error << buffer; + } + } while (num_read == -1 && errno == EINTR); + + if (num_read == 0) { + GTEST_LOG_(FATAL) << error.GetString(); + } else { + const int last_error = errno; + GTEST_LOG_(FATAL) << "Error while reading death test internal: " + << GetLastErrnoDescription() << " [" << last_error << "]"; + } +} + +// Death test constructor. Increments the running death test count +// for the current test. +DeathTest::DeathTest() { + TestInfo* const info = GetUnitTestImpl()->current_test_info(); + if (info == NULL) { + DeathTestAbort("Cannot run a death test outside of a TEST or " + "TEST_F construct"); + } +} + +// Creates and returns a death test by dispatching to the current +// death test factory. +bool DeathTest::Create(const char* statement, const RE* regex, + const char* file, int line, DeathTest** test) { + return GetUnitTestImpl()->death_test_factory()->Create( + statement, regex, file, line, test); +} + +const char* DeathTest::LastMessage() { + return last_death_test_message_.c_str(); +} + +void DeathTest::set_last_death_test_message(const std::string& message) { + last_death_test_message_ = message; +} + +std::string DeathTest::last_death_test_message_; + +// Provides cross platform implementation for some death functionality. +class DeathTestImpl : public DeathTest { + protected: + DeathTestImpl(const char* a_statement, const RE* a_regex) + : statement_(a_statement), + regex_(a_regex), + spawned_(false), + status_(-1), + outcome_(IN_PROGRESS), + read_fd_(-1), + write_fd_(-1) {} + + // read_fd_ is expected to be closed and cleared by a derived class. + ~DeathTestImpl() { GTEST_DEATH_TEST_CHECK_(read_fd_ == -1); } + + void Abort(AbortReason reason); + virtual bool Passed(bool status_ok); + + const char* statement() const { return statement_; } + const RE* regex() const { return regex_; } + bool spawned() const { return spawned_; } + void set_spawned(bool is_spawned) { spawned_ = is_spawned; } + int status() const { return status_; } + void set_status(int a_status) { status_ = a_status; } + DeathTestOutcome outcome() const { return outcome_; } + void set_outcome(DeathTestOutcome an_outcome) { outcome_ = an_outcome; } + int read_fd() const { return read_fd_; } + void set_read_fd(int fd) { read_fd_ = fd; } + int write_fd() const { return write_fd_; } + void set_write_fd(int fd) { write_fd_ = fd; } + + // Called in the parent process only. Reads the result code of the death + // test child process via a pipe, interprets it to set the outcome_ + // member, and closes read_fd_. Outputs diagnostics and terminates in + // case of unexpected codes. + void ReadAndInterpretStatusByte(); + + private: + // The textual content of the code this object is testing. This class + // doesn't own this string and should not attempt to delete it. + const char* const statement_; + // The regular expression which test output must match. DeathTestImpl + // doesn't own this object and should not attempt to delete it. + const RE* const regex_; + // True if the death test child process has been successfully spawned. + bool spawned_; + // The exit status of the child process. + int status_; + // How the death test concluded. + DeathTestOutcome outcome_; + // Descriptor to the read end of the pipe to the child process. It is + // always -1 in the child process. The child keeps its write end of the + // pipe in write_fd_. + int read_fd_; + // Descriptor to the child's write end of the pipe to the parent process. + // It is always -1 in the parent process. The parent keeps its end of the + // pipe in read_fd_. + int write_fd_; +}; + +// Called in the parent process only. Reads the result code of the death +// test child process via a pipe, interprets it to set the outcome_ +// member, and closes read_fd_. Outputs diagnostics and terminates in +// case of unexpected codes. +void DeathTestImpl::ReadAndInterpretStatusByte() { + char flag; + int bytes_read; + + // The read() here blocks until data is available (signifying the + // failure of the death test) or until the pipe is closed (signifying + // its success), so it's okay to call this in the parent before + // the child process has exited. + do { + bytes_read = posix::Read(read_fd(), &flag, 1); + } while (bytes_read == -1 && errno == EINTR); + + if (bytes_read == 0) { + set_outcome(DIED); + } else if (bytes_read == 1) { + switch (flag) { + case kDeathTestReturned: + set_outcome(RETURNED); + break; + case kDeathTestThrew: + set_outcome(THREW); + break; + case kDeathTestLived: + set_outcome(LIVED); + break; + case kDeathTestInternalError: + FailFromInternalError(read_fd()); // Does not return. + break; + default: + GTEST_LOG_(FATAL) << "Death test child process reported " + << "unexpected status byte (" + << static_cast(flag) << ")"; + } + } else { + GTEST_LOG_(FATAL) << "Read from death test child process failed: " + << GetLastErrnoDescription(); + } + GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd())); + set_read_fd(-1); +} + +// Signals that the death test code which should have exited, didn't. +// Should be called only in a death test child process. +// Writes a status byte to the child's status file descriptor, then +// calls _exit(1). +void DeathTestImpl::Abort(AbortReason reason) { + // The parent process considers the death test to be a failure if + // it finds any data in our pipe. So, here we write a single flag byte + // to the pipe, then exit. + const char status_ch = + reason == TEST_DID_NOT_DIE ? kDeathTestLived : + reason == TEST_THREW_EXCEPTION ? kDeathTestThrew : kDeathTestReturned; + + GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1)); + // We are leaking the descriptor here because on some platforms (i.e., + // when built as Windows DLL), destructors of global objects will still + // run after calling _exit(). On such systems, write_fd_ will be + // indirectly closed from the destructor of UnitTestImpl, causing double + // close if it is also closed here. On debug configurations, double close + // may assert. As there are no in-process buffers to flush here, we are + // relying on the OS to close the descriptor after the process terminates + // when the destructors are not run. + _exit(1); // Exits w/o any normal exit hooks (we were supposed to crash) +} + +// Returns an indented copy of stderr output for a death test. +// This makes distinguishing death test output lines from regular log lines +// much easier. +static ::std::string FormatDeathTestOutput(const ::std::string& output) { + ::std::string ret; + for (size_t at = 0; ; ) { + const size_t line_end = output.find('\n', at); + ret += "[ DEATH ] "; + if (line_end == ::std::string::npos) { + ret += output.substr(at); + break; + } + ret += output.substr(at, line_end + 1 - at); + at = line_end + 1; + } + return ret; +} + +// Assesses the success or failure of a death test, using both private +// members which have previously been set, and one argument: +// +// Private data members: +// outcome: An enumeration describing how the death test +// concluded: DIED, LIVED, THREW, or RETURNED. The death test +// fails in the latter three cases. +// status: The exit status of the child process. On *nix, it is in the +// in the format specified by wait(2). On Windows, this is the +// value supplied to the ExitProcess() API or a numeric code +// of the exception that terminated the program. +// regex: A regular expression object to be applied to +// the test's captured standard error output; the death test +// fails if it does not match. +// +// Argument: +// status_ok: true if exit_status is acceptable in the context of +// this particular death test, which fails if it is false +// +// Returns true iff all of the above conditions are met. Otherwise, the +// first failing condition, in the order given above, is the one that is +// reported. Also sets the last death test message string. +bool DeathTestImpl::Passed(bool status_ok) { + if (!spawned()) + return false; + + const std::string error_message = GetCapturedStderr(); + + bool success = false; + Message buffer; + + buffer << "Death test: " << statement() << "\n"; + switch (outcome()) { + case LIVED: + buffer << " Result: failed to die.\n" + << " Error msg:\n" << FormatDeathTestOutput(error_message); + break; + case THREW: + buffer << " Result: threw an exception.\n" + << " Error msg:\n" << FormatDeathTestOutput(error_message); + break; + case RETURNED: + buffer << " Result: illegal return in test statement.\n" + << " Error msg:\n" << FormatDeathTestOutput(error_message); + break; + case DIED: + if (status_ok) { + const bool matched = RE::PartialMatch(error_message.c_str(), *regex()); + if (matched) { + success = true; + } else { + buffer << " Result: died but not with expected error.\n" + << " Expected: " << regex()->pattern() << "\n" + << "Actual msg:\n" << FormatDeathTestOutput(error_message); + } + } else { + buffer << " Result: died but not with expected exit code:\n" + << " " << ExitSummary(status()) << "\n" + << "Actual msg:\n" << FormatDeathTestOutput(error_message); + } + break; + case IN_PROGRESS: + default: + GTEST_LOG_(FATAL) + << "DeathTest::Passed somehow called before conclusion of test"; + } + + DeathTest::set_last_death_test_message(buffer.GetString()); + return success; +} + +# if GTEST_OS_WINDOWS +// WindowsDeathTest implements death tests on Windows. Due to the +// specifics of starting new processes on Windows, death tests there are +// always threadsafe, and Google Test considers the +// --gtest_death_test_style=fast setting to be equivalent to +// --gtest_death_test_style=threadsafe there. +// +// A few implementation notes: Like the Linux version, the Windows +// implementation uses pipes for child-to-parent communication. But due to +// the specifics of pipes on Windows, some extra steps are required: +// +// 1. The parent creates a communication pipe and stores handles to both +// ends of it. +// 2. The parent starts the child and provides it with the information +// necessary to acquire the handle to the write end of the pipe. +// 3. The child acquires the write end of the pipe and signals the parent +// using a Windows event. +// 4. Now the parent can release the write end of the pipe on its side. If +// this is done before step 3, the object's reference count goes down to +// 0 and it is destroyed, preventing the child from acquiring it. The +// parent now has to release it, or read operations on the read end of +// the pipe will not return when the child terminates. +// 5. The parent reads child's output through the pipe (outcome code and +// any possible error messages) from the pipe, and its stderr and then +// determines whether to fail the test. +// +// Note: to distinguish Win32 API calls from the local method and function +// calls, the former are explicitly resolved in the global namespace. +// +class WindowsDeathTest : public DeathTestImpl { + public: + WindowsDeathTest(const char* a_statement, + const RE* a_regex, + const char* file, + int line) + : DeathTestImpl(a_statement, a_regex), file_(file), line_(line) {} + + // All of these virtual functions are inherited from DeathTest. + virtual int Wait(); + virtual TestRole AssumeRole(); + + private: + // The name of the file in which the death test is located. + const char* const file_; + // The line number on which the death test is located. + const int line_; + // Handle to the write end of the pipe to the child process. + AutoHandle write_handle_; + // Child process handle. + AutoHandle child_handle_; + // Event the child process uses to signal the parent that it has + // acquired the handle to the write end of the pipe. After seeing this + // event the parent can release its own handles to make sure its + // ReadFile() calls return when the child terminates. + AutoHandle event_handle_; +}; + +// Waits for the child in a death test to exit, returning its exit +// status, or 0 if no child process exists. As a side effect, sets the +// outcome data member. +int WindowsDeathTest::Wait() { + if (!spawned()) + return 0; + + // Wait until the child either signals that it has acquired the write end + // of the pipe or it dies. + const HANDLE wait_handles[2] = { child_handle_.Get(), event_handle_.Get() }; + switch (::WaitForMultipleObjects(2, + wait_handles, + FALSE, // Waits for any of the handles. + INFINITE)) { + case WAIT_OBJECT_0: + case WAIT_OBJECT_0 + 1: + break; + default: + GTEST_DEATH_TEST_CHECK_(false); // Should not get here. + } + + // The child has acquired the write end of the pipe or exited. + // We release the handle on our side and continue. + write_handle_.Reset(); + event_handle_.Reset(); + + ReadAndInterpretStatusByte(); + + // Waits for the child process to exit if it haven't already. This + // returns immediately if the child has already exited, regardless of + // whether previous calls to WaitForMultipleObjects synchronized on this + // handle or not. + GTEST_DEATH_TEST_CHECK_( + WAIT_OBJECT_0 == ::WaitForSingleObject(child_handle_.Get(), + INFINITE)); + DWORD status_code; + GTEST_DEATH_TEST_CHECK_( + ::GetExitCodeProcess(child_handle_.Get(), &status_code) != FALSE); + child_handle_.Reset(); + set_status(static_cast(status_code)); + return status(); +} + +// The AssumeRole process for a Windows death test. It creates a child +// process with the same executable as the current process to run the +// death test. The child process is given the --gtest_filter and +// --gtest_internal_run_death_test flags such that it knows to run the +// current death test only. +DeathTest::TestRole WindowsDeathTest::AssumeRole() { + const UnitTestImpl* const impl = GetUnitTestImpl(); + const InternalRunDeathTestFlag* const flag = + impl->internal_run_death_test_flag(); + const TestInfo* const info = impl->current_test_info(); + const int death_test_index = info->result()->death_test_count(); + + if (flag != NULL) { + // ParseInternalRunDeathTestFlag() has performed all the necessary + // processing. + set_write_fd(flag->write_fd()); + return EXECUTE_TEST; + } + + // WindowsDeathTest uses an anonymous pipe to communicate results of + // a death test. + SECURITY_ATTRIBUTES handles_are_inheritable = { + sizeof(SECURITY_ATTRIBUTES), NULL, TRUE }; + HANDLE read_handle, write_handle; + GTEST_DEATH_TEST_CHECK_( + ::CreatePipe(&read_handle, &write_handle, &handles_are_inheritable, + 0) // Default buffer size. + != FALSE); + set_read_fd(::_open_osfhandle(reinterpret_cast(read_handle), + O_RDONLY)); + write_handle_.Reset(write_handle); + event_handle_.Reset(::CreateEvent( + &handles_are_inheritable, + TRUE, // The event will automatically reset to non-signaled state. + FALSE, // The initial state is non-signalled. + NULL)); // The even is unnamed. + GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != NULL); + const std::string filter_flag = + std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" + + info->test_case_name() + "." + info->name(); + const std::string internal_flag = + std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + + "=" + file_ + "|" + StreamableToString(line_) + "|" + + StreamableToString(death_test_index) + "|" + + StreamableToString(static_cast(::GetCurrentProcessId())) + + // size_t has the same width as pointers on both 32-bit and 64-bit + // Windows platforms. + // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx. + "|" + StreamableToString(reinterpret_cast(write_handle)) + + "|" + StreamableToString(reinterpret_cast(event_handle_.Get())); + + char executable_path[_MAX_PATH + 1]; // NOLINT + GTEST_DEATH_TEST_CHECK_( + _MAX_PATH + 1 != ::GetModuleFileNameA(NULL, + executable_path, + _MAX_PATH)); + + std::string command_line = + std::string(::GetCommandLineA()) + " " + filter_flag + " \"" + + internal_flag + "\""; + + DeathTest::set_last_death_test_message(""); + + CaptureStderr(); + // Flush the log buffers since the log streams are shared with the child. + FlushInfoLog(); + + // The child process will share the standard handles with the parent. + STARTUPINFOA startup_info; + memset(&startup_info, 0, sizeof(STARTUPINFO)); + startup_info.dwFlags = STARTF_USESTDHANDLES; + startup_info.hStdInput = ::GetStdHandle(STD_INPUT_HANDLE); + startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE); + startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE); + + PROCESS_INFORMATION process_info; + GTEST_DEATH_TEST_CHECK_(::CreateProcessA( + executable_path, + const_cast(command_line.c_str()), + NULL, // Retuned process handle is not inheritable. + NULL, // Retuned thread handle is not inheritable. + TRUE, // Child inherits all inheritable handles (for write_handle_). + 0x0, // Default creation flags. + NULL, // Inherit the parent's environment. + UnitTest::GetInstance()->original_working_dir(), + &startup_info, + &process_info) != FALSE); + child_handle_.Reset(process_info.hProcess); + ::CloseHandle(process_info.hThread); + set_spawned(true); + return OVERSEE_TEST; +} +# else // We are not on Windows. + +// ForkingDeathTest provides implementations for most of the abstract +// methods of the DeathTest interface. Only the AssumeRole method is +// left undefined. +class ForkingDeathTest : public DeathTestImpl { + public: + ForkingDeathTest(const char* statement, const RE* regex); + + // All of these virtual functions are inherited from DeathTest. + virtual int Wait(); + + protected: + void set_child_pid(pid_t child_pid) { child_pid_ = child_pid; } + + private: + // PID of child process during death test; 0 in the child process itself. + pid_t child_pid_; +}; + +// Constructs a ForkingDeathTest. +ForkingDeathTest::ForkingDeathTest(const char* a_statement, const RE* a_regex) + : DeathTestImpl(a_statement, a_regex), + child_pid_(-1) {} + +// Waits for the child in a death test to exit, returning its exit +// status, or 0 if no child process exists. As a side effect, sets the +// outcome data member. +int ForkingDeathTest::Wait() { + if (!spawned()) + return 0; + + ReadAndInterpretStatusByte(); + + int status_value; + GTEST_DEATH_TEST_CHECK_SYSCALL_(waitpid(child_pid_, &status_value, 0)); + set_status(status_value); + return status_value; +} + +// A concrete death test class that forks, then immediately runs the test +// in the child process. +class NoExecDeathTest : public ForkingDeathTest { + public: + NoExecDeathTest(const char* a_statement, const RE* a_regex) : + ForkingDeathTest(a_statement, a_regex) { } + virtual TestRole AssumeRole(); +}; + +// The AssumeRole process for a fork-and-run death test. It implements a +// straightforward fork, with a simple pipe to transmit the status byte. +DeathTest::TestRole NoExecDeathTest::AssumeRole() { + const size_t thread_count = GetThreadCount(); + if (thread_count != 1) { + GTEST_LOG_(WARNING) << DeathTestThreadWarning(thread_count); + } + + int pipe_fd[2]; + GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1); + + DeathTest::set_last_death_test_message(""); + CaptureStderr(); + // When we fork the process below, the log file buffers are copied, but the + // file descriptors are shared. We flush all log files here so that closing + // the file descriptors in the child process doesn't throw off the + // synchronization between descriptors and buffers in the parent process. + // This is as close to the fork as possible to avoid a race condition in case + // there are multiple threads running before the death test, and another + // thread writes to the log file. + FlushInfoLog(); + + const pid_t child_pid = fork(); + GTEST_DEATH_TEST_CHECK_(child_pid != -1); + set_child_pid(child_pid); + if (child_pid == 0) { + GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[0])); + set_write_fd(pipe_fd[1]); + // Redirects all logging to stderr in the child process to prevent + // concurrent writes to the log files. We capture stderr in the parent + // process and append the child process' output to a log. + LogToStderr(); + // Event forwarding to the listeners of event listener API mush be shut + // down in death test subprocesses. + GetUnitTestImpl()->listeners()->SuppressEventForwarding(); + g_in_fast_death_test_child = true; + return EXECUTE_TEST; + } else { + GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1])); + set_read_fd(pipe_fd[0]); + set_spawned(true); + return OVERSEE_TEST; + } +} + +// A concrete death test class that forks and re-executes the main +// program from the beginning, with command-line flags set that cause +// only this specific death test to be run. +class ExecDeathTest : public ForkingDeathTest { + public: + ExecDeathTest(const char* a_statement, const RE* a_regex, + const char* file, int line) : + ForkingDeathTest(a_statement, a_regex), file_(file), line_(line) { } + virtual TestRole AssumeRole(); + private: + static ::std::vector + GetArgvsForDeathTestChildProcess() { + ::std::vector args = GetInjectableArgvs(); + return args; + } + // The name of the file in which the death test is located. + const char* const file_; + // The line number on which the death test is located. + const int line_; +}; + +// Utility class for accumulating command-line arguments. +class Arguments { + public: + Arguments() { + args_.push_back(NULL); + } + + ~Arguments() { + for (std::vector::iterator i = args_.begin(); i != args_.end(); + ++i) { + free(*i); + } + } + void AddArgument(const char* argument) { + args_.insert(args_.end() - 1, posix::StrDup(argument)); + } + + template + void AddArguments(const ::std::vector& arguments) { + for (typename ::std::vector::const_iterator i = arguments.begin(); + i != arguments.end(); + ++i) { + args_.insert(args_.end() - 1, posix::StrDup(i->c_str())); + } + } + char* const* Argv() { + return &args_[0]; + } + + private: + std::vector args_; +}; + +// A struct that encompasses the arguments to the child process of a +// threadsafe-style death test process. +struct ExecDeathTestArgs { + char* const* argv; // Command-line arguments for the child's call to exec + int close_fd; // File descriptor to close; the read end of a pipe +}; + +# if GTEST_OS_MAC +inline char** GetEnviron() { + // When Google Test is built as a framework on MacOS X, the environ variable + // is unavailable. Apple's documentation (man environ) recommends using + // _NSGetEnviron() instead. + return *_NSGetEnviron(); +} +# else +// Some POSIX platforms expect you to declare environ. extern "C" makes +// it reside in the global namespace. +extern "C" char** environ; +inline char** GetEnviron() { return environ; } +# endif // GTEST_OS_MAC + +# if !GTEST_OS_QNX +// The main function for a threadsafe-style death test child process. +// This function is called in a clone()-ed process and thus must avoid +// any potentially unsafe operations like malloc or libc functions. +static int ExecDeathTestChildMain(void* child_arg) { + ExecDeathTestArgs* const args = static_cast(child_arg); + GTEST_DEATH_TEST_CHECK_SYSCALL_(close(args->close_fd)); + + // We need to execute the test program in the same environment where + // it was originally invoked. Therefore we change to the original + // working directory first. + const char* const original_dir = + UnitTest::GetInstance()->original_working_dir(); + // We can safely call chdir() as it's a direct system call. + if (chdir(original_dir) != 0) { + DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " + + GetLastErrnoDescription()); + return EXIT_FAILURE; + } + + // We can safely call execve() as it's a direct system call. We + // cannot use execvp() as it's a libc function and thus potentially + // unsafe. Since execve() doesn't search the PATH, the user must + // invoke the test program via a valid path that contains at least + // one path separator. + execve(args->argv[0], args->argv, GetEnviron()); + DeathTestAbort(std::string("execve(") + args->argv[0] + ", ...) in " + + original_dir + " failed: " + + GetLastErrnoDescription()); + return EXIT_FAILURE; +} +# endif // !GTEST_OS_QNX + +// Two utility routines that together determine the direction the stack +// grows. +// This could be accomplished more elegantly by a single recursive +// function, but we want to guard against the unlikely possibility of +// a smart compiler optimizing the recursion away. +// +// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining +// StackLowerThanAddress into StackGrowsDown, which then doesn't give +// correct answer. +void StackLowerThanAddress(const void* ptr, bool* result) GTEST_NO_INLINE_; +void StackLowerThanAddress(const void* ptr, bool* result) { + int dummy; + *result = (&dummy < ptr); +} + +bool StackGrowsDown() { + int dummy; + bool result; + StackLowerThanAddress(&dummy, &result); + return result; +} + +// Spawns a child process with the same executable as the current process in +// a thread-safe manner and instructs it to run the death test. The +// implementation uses fork(2) + exec. On systems where clone(2) is +// available, it is used instead, being slightly more thread-safe. On QNX, +// fork supports only single-threaded environments, so this function uses +// spawn(2) there instead. The function dies with an error message if +// anything goes wrong. +static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) { + ExecDeathTestArgs args = { argv, close_fd }; + pid_t child_pid = -1; + +# if GTEST_OS_QNX + // Obtains the current directory and sets it to be closed in the child + // process. + const int cwd_fd = open(".", O_RDONLY); + GTEST_DEATH_TEST_CHECK_(cwd_fd != -1); + GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(cwd_fd, F_SETFD, FD_CLOEXEC)); + // We need to execute the test program in the same environment where + // it was originally invoked. Therefore we change to the original + // working directory first. + const char* const original_dir = + UnitTest::GetInstance()->original_working_dir(); + // We can safely call chdir() as it's a direct system call. + if (chdir(original_dir) != 0) { + DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " + + GetLastErrnoDescription()); + return EXIT_FAILURE; + } + + int fd_flags; + // Set close_fd to be closed after spawn. + GTEST_DEATH_TEST_CHECK_SYSCALL_(fd_flags = fcntl(close_fd, F_GETFD)); + GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(close_fd, F_SETFD, + fd_flags | FD_CLOEXEC)); + struct inheritance inherit = {0}; + // spawn is a system call. + child_pid = spawn(args.argv[0], 0, NULL, &inherit, args.argv, GetEnviron()); + // Restores the current working directory. + GTEST_DEATH_TEST_CHECK_(fchdir(cwd_fd) != -1); + GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd)); + +# else // GTEST_OS_QNX +# if GTEST_OS_LINUX + // When a SIGPROF signal is received while fork() or clone() are executing, + // the process may hang. To avoid this, we ignore SIGPROF here and re-enable + // it after the call to fork()/clone() is complete. + struct sigaction saved_sigprof_action; + struct sigaction ignore_sigprof_action; + memset(&ignore_sigprof_action, 0, sizeof(ignore_sigprof_action)); + sigemptyset(&ignore_sigprof_action.sa_mask); + ignore_sigprof_action.sa_handler = SIG_IGN; + GTEST_DEATH_TEST_CHECK_SYSCALL_(sigaction( + SIGPROF, &ignore_sigprof_action, &saved_sigprof_action)); +# endif // GTEST_OS_LINUX + +# if GTEST_HAS_CLONE + const bool use_fork = GTEST_FLAG(death_test_use_fork); + + if (!use_fork) { + static const bool stack_grows_down = StackGrowsDown(); + const size_t stack_size = getpagesize(); + // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead. + void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE, -1, 0); + GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED); + + // Maximum stack alignment in bytes: For a downward-growing stack, this + // amount is subtracted from size of the stack space to get an address + // that is within the stack space and is aligned on all systems we care + // about. As far as I know there is no ABI with stack alignment greater + // than 64. We assume stack and stack_size already have alignment of + // kMaxStackAlignment. + const size_t kMaxStackAlignment = 64; + void* const stack_top = + static_cast(stack) + + (stack_grows_down ? stack_size - kMaxStackAlignment : 0); + GTEST_DEATH_TEST_CHECK_(stack_size > kMaxStackAlignment && + reinterpret_cast(stack_top) % kMaxStackAlignment == 0); + + child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args); + + GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1); + } +# else + const bool use_fork = true; +# endif // GTEST_HAS_CLONE + + if (use_fork && (child_pid = fork()) == 0) { + ExecDeathTestChildMain(&args); + _exit(0); + } +# endif // GTEST_OS_QNX +# if GTEST_OS_LINUX + GTEST_DEATH_TEST_CHECK_SYSCALL_( + sigaction(SIGPROF, &saved_sigprof_action, NULL)); +# endif // GTEST_OS_LINUX + + GTEST_DEATH_TEST_CHECK_(child_pid != -1); + return child_pid; +} + +// The AssumeRole process for a fork-and-exec death test. It re-executes the +// main program from the beginning, setting the --gtest_filter +// and --gtest_internal_run_death_test flags to cause only the current +// death test to be re-run. +DeathTest::TestRole ExecDeathTest::AssumeRole() { + const UnitTestImpl* const impl = GetUnitTestImpl(); + const InternalRunDeathTestFlag* const flag = + impl->internal_run_death_test_flag(); + const TestInfo* const info = impl->current_test_info(); + const int death_test_index = info->result()->death_test_count(); + + if (flag != NULL) { + set_write_fd(flag->write_fd()); + return EXECUTE_TEST; + } + + int pipe_fd[2]; + GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1); + // Clear the close-on-exec flag on the write end of the pipe, lest + // it be closed when the child process does an exec: + GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1); + + const std::string filter_flag = + std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" + + info->test_case_name() + "." + info->name(); + const std::string internal_flag = + std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "=" + + file_ + "|" + StreamableToString(line_) + "|" + + StreamableToString(death_test_index) + "|" + + StreamableToString(pipe_fd[1]); + Arguments args; + args.AddArguments(GetArgvsForDeathTestChildProcess()); + args.AddArgument(filter_flag.c_str()); + args.AddArgument(internal_flag.c_str()); + + DeathTest::set_last_death_test_message(""); + + CaptureStderr(); + // See the comment in NoExecDeathTest::AssumeRole for why the next line + // is necessary. + FlushInfoLog(); + + const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]); + GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1])); + set_child_pid(child_pid); + set_read_fd(pipe_fd[0]); + set_spawned(true); + return OVERSEE_TEST; +} + +# endif // !GTEST_OS_WINDOWS + +// Creates a concrete DeathTest-derived class that depends on the +// --gtest_death_test_style flag, and sets the pointer pointed to +// by the "test" argument to its address. If the test should be +// skipped, sets that pointer to NULL. Returns true, unless the +// flag is set to an invalid value. +bool DefaultDeathTestFactory::Create(const char* statement, const RE* regex, + const char* file, int line, + DeathTest** test) { + UnitTestImpl* const impl = GetUnitTestImpl(); + const InternalRunDeathTestFlag* const flag = + impl->internal_run_death_test_flag(); + const int death_test_index = impl->current_test_info() + ->increment_death_test_count(); + + if (flag != NULL) { + if (death_test_index > flag->index()) { + DeathTest::set_last_death_test_message( + "Death test count (" + StreamableToString(death_test_index) + + ") somehow exceeded expected maximum (" + + StreamableToString(flag->index()) + ")"); + return false; + } + + if (!(flag->file() == file && flag->line() == line && + flag->index() == death_test_index)) { + *test = NULL; + return true; + } + } + +# if GTEST_OS_WINDOWS + + if (GTEST_FLAG(death_test_style) == "threadsafe" || + GTEST_FLAG(death_test_style) == "fast") { + *test = new WindowsDeathTest(statement, regex, file, line); + } + +# else + + if (GTEST_FLAG(death_test_style) == "threadsafe") { + *test = new ExecDeathTest(statement, regex, file, line); + } else if (GTEST_FLAG(death_test_style) == "fast") { + *test = new NoExecDeathTest(statement, regex); + } + +# endif // GTEST_OS_WINDOWS + + else { // NOLINT - this is more readable than unbalanced brackets inside #if. + DeathTest::set_last_death_test_message( + "Unknown death test style \"" + GTEST_FLAG(death_test_style) + + "\" encountered"); + return false; + } + + return true; +} + +// Splits a given string on a given delimiter, populating a given +// vector with the fields. GTEST_HAS_DEATH_TEST implies that we have +// ::std::string, so we can use it here. +static void SplitString(const ::std::string& str, char delimiter, + ::std::vector< ::std::string>* dest) { + ::std::vector< ::std::string> parsed; + ::std::string::size_type pos = 0; + while (::testing::internal::AlwaysTrue()) { + const ::std::string::size_type colon = str.find(delimiter, pos); + if (colon == ::std::string::npos) { + parsed.push_back(str.substr(pos)); + break; + } else { + parsed.push_back(str.substr(pos, colon - pos)); + pos = colon + 1; + } + } + dest->swap(parsed); +} + +# if GTEST_OS_WINDOWS +// Recreates the pipe and event handles from the provided parameters, +// signals the event, and returns a file descriptor wrapped around the pipe +// handle. This function is called in the child process only. +int GetStatusFileDescriptor(unsigned int parent_process_id, + size_t write_handle_as_size_t, + size_t event_handle_as_size_t) { + AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE, + FALSE, // Non-inheritable. + parent_process_id)); + if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) { + DeathTestAbort("Unable to open parent process " + + StreamableToString(parent_process_id)); + } + + // TODO(vladl@google.com): Replace the following check with a + // compile-time assertion when available. + GTEST_CHECK_(sizeof(HANDLE) <= sizeof(size_t)); + + const HANDLE write_handle = + reinterpret_cast(write_handle_as_size_t); + HANDLE dup_write_handle; + + // The newly initialized handle is accessible only in in the parent + // process. To obtain one accessible within the child, we need to use + // DuplicateHandle. + if (!::DuplicateHandle(parent_process_handle.Get(), write_handle, + ::GetCurrentProcess(), &dup_write_handle, + 0x0, // Requested privileges ignored since + // DUPLICATE_SAME_ACCESS is used. + FALSE, // Request non-inheritable handler. + DUPLICATE_SAME_ACCESS)) { + DeathTestAbort("Unable to duplicate the pipe handle " + + StreamableToString(write_handle_as_size_t) + + " from the parent process " + + StreamableToString(parent_process_id)); + } + + const HANDLE event_handle = reinterpret_cast(event_handle_as_size_t); + HANDLE dup_event_handle; + + if (!::DuplicateHandle(parent_process_handle.Get(), event_handle, + ::GetCurrentProcess(), &dup_event_handle, + 0x0, + FALSE, + DUPLICATE_SAME_ACCESS)) { + DeathTestAbort("Unable to duplicate the event handle " + + StreamableToString(event_handle_as_size_t) + + " from the parent process " + + StreamableToString(parent_process_id)); + } + + const int write_fd = + ::_open_osfhandle(reinterpret_cast(dup_write_handle), O_APPEND); + if (write_fd == -1) { + DeathTestAbort("Unable to convert pipe handle " + + StreamableToString(write_handle_as_size_t) + + " to a file descriptor"); + } + + // Signals the parent that the write end of the pipe has been acquired + // so the parent can release its own write end. + ::SetEvent(dup_event_handle); + + return write_fd; +} +# endif // GTEST_OS_WINDOWS + +// Returns a newly created InternalRunDeathTestFlag object with fields +// initialized from the GTEST_FLAG(internal_run_death_test) flag if +// the flag is specified; otherwise returns NULL. +InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() { + if (GTEST_FLAG(internal_run_death_test) == "") return NULL; + + // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we + // can use it here. + int line = -1; + int index = -1; + ::std::vector< ::std::string> fields; + SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields); + int write_fd = -1; + +# if GTEST_OS_WINDOWS + + unsigned int parent_process_id = 0; + size_t write_handle_as_size_t = 0; + size_t event_handle_as_size_t = 0; + + if (fields.size() != 6 + || !ParseNaturalNumber(fields[1], &line) + || !ParseNaturalNumber(fields[2], &index) + || !ParseNaturalNumber(fields[3], &parent_process_id) + || !ParseNaturalNumber(fields[4], &write_handle_as_size_t) + || !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) { + DeathTestAbort("Bad --gtest_internal_run_death_test flag: " + + GTEST_FLAG(internal_run_death_test)); + } + write_fd = GetStatusFileDescriptor(parent_process_id, + write_handle_as_size_t, + event_handle_as_size_t); +# else + + if (fields.size() != 4 + || !ParseNaturalNumber(fields[1], &line) + || !ParseNaturalNumber(fields[2], &index) + || !ParseNaturalNumber(fields[3], &write_fd)) { + DeathTestAbort("Bad --gtest_internal_run_death_test flag: " + + GTEST_FLAG(internal_run_death_test)); + } + +# endif // GTEST_OS_WINDOWS + + return new InternalRunDeathTestFlag(fields[0], line, index, write_fd); +} + +} // namespace internal + +#endif // GTEST_HAS_DEATH_TEST + +} // namespace testing diff --git a/lib/gtest/src/gtest-filepath.cc b/lib/gtest/src/gtest-filepath.cc new file mode 100644 index 00000000..6be58b6f --- /dev/null +++ b/lib/gtest/src/gtest-filepath.cc @@ -0,0 +1,382 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Authors: keith.ray@gmail.com (Keith Ray) + +#include "gtest/gtest-message.h" +#include "gtest/internal/gtest-filepath.h" +#include "gtest/internal/gtest-port.h" + +#include + +#if GTEST_OS_WINDOWS_MOBILE +# include +#elif GTEST_OS_WINDOWS +# include +# include +#elif GTEST_OS_SYMBIAN +// Symbian OpenC has PATH_MAX in sys/syslimits.h +# include +#else +# include +# include // Some Linux distributions define PATH_MAX here. +#endif // GTEST_OS_WINDOWS_MOBILE + +#if GTEST_OS_WINDOWS +# define GTEST_PATH_MAX_ _MAX_PATH +#elif defined(PATH_MAX) +# define GTEST_PATH_MAX_ PATH_MAX +#elif defined(_XOPEN_PATH_MAX) +# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX +#else +# define GTEST_PATH_MAX_ _POSIX_PATH_MAX +#endif // GTEST_OS_WINDOWS + +#include "gtest/internal/gtest-string.h" + +namespace testing { +namespace internal { + +#if GTEST_OS_WINDOWS +// On Windows, '\\' is the standard path separator, but many tools and the +// Windows API also accept '/' as an alternate path separator. Unless otherwise +// noted, a file path can contain either kind of path separators, or a mixture +// of them. +const char kPathSeparator = '\\'; +const char kAlternatePathSeparator = '/'; +const char kPathSeparatorString[] = "\\"; +const char kAlternatePathSeparatorString[] = "/"; +# if GTEST_OS_WINDOWS_MOBILE +// Windows CE doesn't have a current directory. You should not use +// the current directory in tests on Windows CE, but this at least +// provides a reasonable fallback. +const char kCurrentDirectoryString[] = "\\"; +// Windows CE doesn't define INVALID_FILE_ATTRIBUTES +const DWORD kInvalidFileAttributes = 0xffffffff; +# else +const char kCurrentDirectoryString[] = ".\\"; +# endif // GTEST_OS_WINDOWS_MOBILE +#else +const char kPathSeparator = '/'; +const char kPathSeparatorString[] = "/"; +const char kCurrentDirectoryString[] = "./"; +#endif // GTEST_OS_WINDOWS + +// Returns whether the given character is a valid path separator. +static bool IsPathSeparator(char c) { +#if GTEST_HAS_ALT_PATH_SEP_ + return (c == kPathSeparator) || (c == kAlternatePathSeparator); +#else + return c == kPathSeparator; +#endif +} + +// Returns the current working directory, or "" if unsuccessful. +FilePath FilePath::GetCurrentDir() { +#if GTEST_OS_WINDOWS_MOBILE + // Windows CE doesn't have a current directory, so we just return + // something reasonable. + return FilePath(kCurrentDirectoryString); +#elif GTEST_OS_WINDOWS + char cwd[GTEST_PATH_MAX_ + 1] = { '\0' }; + return FilePath(_getcwd(cwd, sizeof(cwd)) == NULL ? "" : cwd); +#else + char cwd[GTEST_PATH_MAX_ + 1] = { '\0' }; + return FilePath(getcwd(cwd, sizeof(cwd)) == NULL ? "" : cwd); +#endif // GTEST_OS_WINDOWS_MOBILE +} + +// Returns a copy of the FilePath with the case-insensitive extension removed. +// Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns +// FilePath("dir/file"). If a case-insensitive extension is not +// found, returns a copy of the original FilePath. +FilePath FilePath::RemoveExtension(const char* extension) const { + const std::string dot_extension = std::string(".") + extension; + if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) { + return FilePath(pathname_.substr( + 0, pathname_.length() - dot_extension.length())); + } + return *this; +} + +// Returns a pointer to the last occurence of a valid path separator in +// the FilePath. On Windows, for example, both '/' and '\' are valid path +// separators. Returns NULL if no path separator was found. +const char* FilePath::FindLastPathSeparator() const { + const char* const last_sep = strrchr(c_str(), kPathSeparator); +#if GTEST_HAS_ALT_PATH_SEP_ + const char* const last_alt_sep = strrchr(c_str(), kAlternatePathSeparator); + // Comparing two pointers of which only one is NULL is undefined. + if (last_alt_sep != NULL && + (last_sep == NULL || last_alt_sep > last_sep)) { + return last_alt_sep; + } +#endif + return last_sep; +} + +// Returns a copy of the FilePath with the directory part removed. +// Example: FilePath("path/to/file").RemoveDirectoryName() returns +// FilePath("file"). If there is no directory part ("just_a_file"), it returns +// the FilePath unmodified. If there is no file part ("just_a_dir/") it +// returns an empty FilePath (""). +// On Windows platform, '\' is the path separator, otherwise it is '/'. +FilePath FilePath::RemoveDirectoryName() const { + const char* const last_sep = FindLastPathSeparator(); + return last_sep ? FilePath(last_sep + 1) : *this; +} + +// RemoveFileName returns the directory path with the filename removed. +// Example: FilePath("path/to/file").RemoveFileName() returns "path/to/". +// If the FilePath is "a_file" or "/a_file", RemoveFileName returns +// FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does +// not have a file, like "just/a/dir/", it returns the FilePath unmodified. +// On Windows platform, '\' is the path separator, otherwise it is '/'. +FilePath FilePath::RemoveFileName() const { + const char* const last_sep = FindLastPathSeparator(); + std::string dir; + if (last_sep) { + dir = std::string(c_str(), last_sep + 1 - c_str()); + } else { + dir = kCurrentDirectoryString; + } + return FilePath(dir); +} + +// Helper functions for naming files in a directory for xml output. + +// Given directory = "dir", base_name = "test", number = 0, +// extension = "xml", returns "dir/test.xml". If number is greater +// than zero (e.g., 12), returns "dir/test_12.xml". +// On Windows platform, uses \ as the separator rather than /. +FilePath FilePath::MakeFileName(const FilePath& directory, + const FilePath& base_name, + int number, + const char* extension) { + std::string file; + if (number == 0) { + file = base_name.string() + "." + extension; + } else { + file = base_name.string() + "_" + StreamableToString(number) + + "." + extension; + } + return ConcatPaths(directory, FilePath(file)); +} + +// Given directory = "dir", relative_path = "test.xml", returns "dir/test.xml". +// On Windows, uses \ as the separator rather than /. +FilePath FilePath::ConcatPaths(const FilePath& directory, + const FilePath& relative_path) { + if (directory.IsEmpty()) + return relative_path; + const FilePath dir(directory.RemoveTrailingPathSeparator()); + return FilePath(dir.string() + kPathSeparator + relative_path.string()); +} + +// Returns true if pathname describes something findable in the file-system, +// either a file, directory, or whatever. +bool FilePath::FileOrDirectoryExists() const { +#if GTEST_OS_WINDOWS_MOBILE + LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str()); + const DWORD attributes = GetFileAttributes(unicode); + delete [] unicode; + return attributes != kInvalidFileAttributes; +#else + posix::StatStruct file_stat; + return posix::Stat(pathname_.c_str(), &file_stat) == 0; +#endif // GTEST_OS_WINDOWS_MOBILE +} + +// Returns true if pathname describes a directory in the file-system +// that exists. +bool FilePath::DirectoryExists() const { + bool result = false; +#if GTEST_OS_WINDOWS + // Don't strip off trailing separator if path is a root directory on + // Windows (like "C:\\"). + const FilePath& path(IsRootDirectory() ? *this : + RemoveTrailingPathSeparator()); +#else + const FilePath& path(*this); +#endif + +#if GTEST_OS_WINDOWS_MOBILE + LPCWSTR unicode = String::AnsiToUtf16(path.c_str()); + const DWORD attributes = GetFileAttributes(unicode); + delete [] unicode; + if ((attributes != kInvalidFileAttributes) && + (attributes & FILE_ATTRIBUTE_DIRECTORY)) { + result = true; + } +#else + posix::StatStruct file_stat; + result = posix::Stat(path.c_str(), &file_stat) == 0 && + posix::IsDir(file_stat); +#endif // GTEST_OS_WINDOWS_MOBILE + + return result; +} + +// Returns true if pathname describes a root directory. (Windows has one +// root directory per disk drive.) +bool FilePath::IsRootDirectory() const { +#if GTEST_OS_WINDOWS + // TODO(wan@google.com): on Windows a network share like + // \\server\share can be a root directory, although it cannot be the + // current directory. Handle this properly. + return pathname_.length() == 3 && IsAbsolutePath(); +#else + return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]); +#endif +} + +// Returns true if pathname describes an absolute path. +bool FilePath::IsAbsolutePath() const { + const char* const name = pathname_.c_str(); +#if GTEST_OS_WINDOWS + return pathname_.length() >= 3 && + ((name[0] >= 'a' && name[0] <= 'z') || + (name[0] >= 'A' && name[0] <= 'Z')) && + name[1] == ':' && + IsPathSeparator(name[2]); +#else + return IsPathSeparator(name[0]); +#endif +} + +// Returns a pathname for a file that does not currently exist. The pathname +// will be directory/base_name.extension or +// directory/base_name_.extension if directory/base_name.extension +// already exists. The number will be incremented until a pathname is found +// that does not already exist. +// Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'. +// There could be a race condition if two or more processes are calling this +// function at the same time -- they could both pick the same filename. +FilePath FilePath::GenerateUniqueFileName(const FilePath& directory, + const FilePath& base_name, + const char* extension) { + FilePath full_pathname; + int number = 0; + do { + full_pathname.Set(MakeFileName(directory, base_name, number++, extension)); + } while (full_pathname.FileOrDirectoryExists()); + return full_pathname; +} + +// Returns true if FilePath ends with a path separator, which indicates that +// it is intended to represent a directory. Returns false otherwise. +// This does NOT check that a directory (or file) actually exists. +bool FilePath::IsDirectory() const { + return !pathname_.empty() && + IsPathSeparator(pathname_.c_str()[pathname_.length() - 1]); +} + +// Create directories so that path exists. Returns true if successful or if +// the directories already exist; returns false if unable to create directories +// for any reason. +bool FilePath::CreateDirectoriesRecursively() const { + if (!this->IsDirectory()) { + return false; + } + + if (pathname_.length() == 0 || this->DirectoryExists()) { + return true; + } + + const FilePath parent(this->RemoveTrailingPathSeparator().RemoveFileName()); + return parent.CreateDirectoriesRecursively() && this->CreateFolder(); +} + +// Create the directory so that path exists. Returns true if successful or +// if the directory already exists; returns false if unable to create the +// directory for any reason, including if the parent directory does not +// exist. Not named "CreateDirectory" because that's a macro on Windows. +bool FilePath::CreateFolder() const { +#if GTEST_OS_WINDOWS_MOBILE + FilePath removed_sep(this->RemoveTrailingPathSeparator()); + LPCWSTR unicode = String::AnsiToUtf16(removed_sep.c_str()); + int result = CreateDirectory(unicode, NULL) ? 0 : -1; + delete [] unicode; +#elif GTEST_OS_WINDOWS + int result = _mkdir(pathname_.c_str()); +#else + int result = mkdir(pathname_.c_str(), 0777); +#endif // GTEST_OS_WINDOWS_MOBILE + + if (result == -1) { + return this->DirectoryExists(); // An error is OK if the directory exists. + } + return true; // No error. +} + +// If input name has a trailing separator character, remove it and return the +// name, otherwise return the name string unmodified. +// On Windows platform, uses \ as the separator, other platforms use /. +FilePath FilePath::RemoveTrailingPathSeparator() const { + return IsDirectory() + ? FilePath(pathname_.substr(0, pathname_.length() - 1)) + : *this; +} + +// Removes any redundant separators that might be in the pathname. +// For example, "bar///foo" becomes "bar/foo". Does not eliminate other +// redundancies that might be in a pathname involving "." or "..". +// TODO(wan@google.com): handle Windows network shares (e.g. \\server\share). +void FilePath::Normalize() { + if (pathname_.c_str() == NULL) { + pathname_ = ""; + return; + } + const char* src = pathname_.c_str(); + char* const dest = new char[pathname_.length() + 1]; + char* dest_ptr = dest; + memset(dest_ptr, 0, pathname_.length() + 1); + + while (*src != '\0') { + *dest_ptr = *src; + if (!IsPathSeparator(*src)) { + src++; + } else { +#if GTEST_HAS_ALT_PATH_SEP_ + if (*dest_ptr == kAlternatePathSeparator) { + *dest_ptr = kPathSeparator; + } +#endif + while (IsPathSeparator(*src)) + src++; + } + dest_ptr++; + } + *dest_ptr = '\0'; + pathname_ = dest; + delete[] dest; +} + +} // namespace internal +} // namespace testing diff --git a/lib/gtest/src/gtest-internal-inl.h b/lib/gtest/src/gtest-internal-inl.h new file mode 100644 index 00000000..35df303c --- /dev/null +++ b/lib/gtest/src/gtest-internal-inl.h @@ -0,0 +1,1218 @@ +// Copyright 2005, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// Utility functions and classes used by the Google C++ testing framework. +// +// Author: wan@google.com (Zhanyong Wan) +// +// This file contains purely Google Test's internal implementation. Please +// DO NOT #INCLUDE IT IN A USER PROGRAM. + +#ifndef GTEST_SRC_GTEST_INTERNAL_INL_H_ +#define GTEST_SRC_GTEST_INTERNAL_INL_H_ + +// GTEST_IMPLEMENTATION_ is defined to 1 iff the current translation unit is +// part of Google Test's implementation; otherwise it's undefined. +#if !GTEST_IMPLEMENTATION_ +// A user is trying to include this from his code - just say no. +# error "gtest-internal-inl.h is part of Google Test's internal implementation." +# error "It must not be included except by Google Test itself." +#endif // GTEST_IMPLEMENTATION_ + +#ifndef _WIN32_WCE +# include +#endif // !_WIN32_WCE +#include +#include // For strtoll/_strtoul64/malloc/free. +#include // For memmove. + +#include +#include +#include + +#include "gtest/internal/gtest-port.h" + +#if GTEST_CAN_STREAM_RESULTS_ +# include // NOLINT +# include // NOLINT +#endif + +#if GTEST_OS_WINDOWS +# include // NOLINT +#endif // GTEST_OS_WINDOWS + +#include "gtest/gtest.h" // NOLINT +#include "gtest/gtest-spi.h" + +namespace testing { + +// Declares the flags. +// +// We don't want the users to modify this flag in the code, but want +// Google Test's own unit tests to be able to access it. Therefore we +// declare it here as opposed to in gtest.h. +GTEST_DECLARE_bool_(death_test_use_fork); + +namespace internal { + +// The value of GetTestTypeId() as seen from within the Google Test +// library. This is solely for testing GetTestTypeId(). +GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest; + +// Names of the flags (needed for parsing Google Test flags). +const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests"; +const char kBreakOnFailureFlag[] = "break_on_failure"; +const char kCatchExceptionsFlag[] = "catch_exceptions"; +const char kColorFlag[] = "color"; +const char kFilterFlag[] = "filter"; +const char kListTestsFlag[] = "list_tests"; +const char kOutputFlag[] = "output"; +const char kPrintTimeFlag[] = "print_time"; +const char kRandomSeedFlag[] = "random_seed"; +const char kRepeatFlag[] = "repeat"; +const char kShuffleFlag[] = "shuffle"; +const char kStackTraceDepthFlag[] = "stack_trace_depth"; +const char kStreamResultToFlag[] = "stream_result_to"; +const char kThrowOnFailureFlag[] = "throw_on_failure"; + +// A valid random seed must be in [1, kMaxRandomSeed]. +const int kMaxRandomSeed = 99999; + +// g_help_flag is true iff the --help flag or an equivalent form is +// specified on the command line. +GTEST_API_ extern bool g_help_flag; + +// Returns the current time in milliseconds. +GTEST_API_ TimeInMillis GetTimeInMillis(); + +// Returns true iff Google Test should use colors in the output. +GTEST_API_ bool ShouldUseColor(bool stdout_is_tty); + +// Formats the given time in milliseconds as seconds. +GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms); + +// Converts the given time in milliseconds to a date string in the ISO 8601 +// format, without the timezone information. N.B.: due to the use the +// non-reentrant localtime() function, this function is not thread safe. Do +// not use it in any code that can be called from multiple threads. +GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms); + +// Parses a string for an Int32 flag, in the form of "--flag=value". +// +// On success, stores the value of the flag in *value, and returns +// true. On failure, returns false without changing *value. +GTEST_API_ bool ParseInt32Flag( + const char* str, const char* flag, Int32* value); + +// Returns a random seed in range [1, kMaxRandomSeed] based on the +// given --gtest_random_seed flag value. +inline int GetRandomSeedFromFlag(Int32 random_seed_flag) { + const unsigned int raw_seed = (random_seed_flag == 0) ? + static_cast(GetTimeInMillis()) : + static_cast(random_seed_flag); + + // Normalizes the actual seed to range [1, kMaxRandomSeed] such that + // it's easy to type. + const int normalized_seed = + static_cast((raw_seed - 1U) % + static_cast(kMaxRandomSeed)) + 1; + return normalized_seed; +} + +// Returns the first valid random seed after 'seed'. The behavior is +// undefined if 'seed' is invalid. The seed after kMaxRandomSeed is +// considered to be 1. +inline int GetNextRandomSeed(int seed) { + GTEST_CHECK_(1 <= seed && seed <= kMaxRandomSeed) + << "Invalid random seed " << seed << " - must be in [1, " + << kMaxRandomSeed << "]."; + const int next_seed = seed + 1; + return (next_seed > kMaxRandomSeed) ? 1 : next_seed; +} + +// This class saves the values of all Google Test flags in its c'tor, and +// restores them in its d'tor. +class GTestFlagSaver { + public: + // The c'tor. + GTestFlagSaver() { + also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests); + break_on_failure_ = GTEST_FLAG(break_on_failure); + catch_exceptions_ = GTEST_FLAG(catch_exceptions); + color_ = GTEST_FLAG(color); + death_test_style_ = GTEST_FLAG(death_test_style); + death_test_use_fork_ = GTEST_FLAG(death_test_use_fork); + filter_ = GTEST_FLAG(filter); + internal_run_death_test_ = GTEST_FLAG(internal_run_death_test); + list_tests_ = GTEST_FLAG(list_tests); + output_ = GTEST_FLAG(output); + print_time_ = GTEST_FLAG(print_time); + random_seed_ = GTEST_FLAG(random_seed); + repeat_ = GTEST_FLAG(repeat); + shuffle_ = GTEST_FLAG(shuffle); + stack_trace_depth_ = GTEST_FLAG(stack_trace_depth); + stream_result_to_ = GTEST_FLAG(stream_result_to); + throw_on_failure_ = GTEST_FLAG(throw_on_failure); + } + + // The d'tor is not virtual. DO NOT INHERIT FROM THIS CLASS. + ~GTestFlagSaver() { + GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_; + GTEST_FLAG(break_on_failure) = break_on_failure_; + GTEST_FLAG(catch_exceptions) = catch_exceptions_; + GTEST_FLAG(color) = color_; + GTEST_FLAG(death_test_style) = death_test_style_; + GTEST_FLAG(death_test_use_fork) = death_test_use_fork_; + GTEST_FLAG(filter) = filter_; + GTEST_FLAG(internal_run_death_test) = internal_run_death_test_; + GTEST_FLAG(list_tests) = list_tests_; + GTEST_FLAG(output) = output_; + GTEST_FLAG(print_time) = print_time_; + GTEST_FLAG(random_seed) = random_seed_; + GTEST_FLAG(repeat) = repeat_; + GTEST_FLAG(shuffle) = shuffle_; + GTEST_FLAG(stack_trace_depth) = stack_trace_depth_; + GTEST_FLAG(stream_result_to) = stream_result_to_; + GTEST_FLAG(throw_on_failure) = throw_on_failure_; + } + + private: + // Fields for saving the original values of flags. + bool also_run_disabled_tests_; + bool break_on_failure_; + bool catch_exceptions_; + std::string color_; + std::string death_test_style_; + bool death_test_use_fork_; + std::string filter_; + std::string internal_run_death_test_; + bool list_tests_; + std::string output_; + bool print_time_; + internal::Int32 random_seed_; + internal::Int32 repeat_; + bool shuffle_; + internal::Int32 stack_trace_depth_; + std::string stream_result_to_; + bool throw_on_failure_; +} GTEST_ATTRIBUTE_UNUSED_; + +// Converts a Unicode code point to a narrow string in UTF-8 encoding. +// code_point parameter is of type UInt32 because wchar_t may not be +// wide enough to contain a code point. +// If the code_point is not a valid Unicode code point +// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted +// to "(Invalid Unicode 0xXXXXXXXX)". +GTEST_API_ std::string CodePointToUtf8(UInt32 code_point); + +// Converts a wide string to a narrow string in UTF-8 encoding. +// The wide string is assumed to have the following encoding: +// UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS) +// UTF-32 if sizeof(wchar_t) == 4 (on Linux) +// Parameter str points to a null-terminated wide string. +// Parameter num_chars may additionally limit the number +// of wchar_t characters processed. -1 is used when the entire string +// should be processed. +// If the string contains code points that are not valid Unicode code points +// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output +// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding +// and contains invalid UTF-16 surrogate pairs, values in those pairs +// will be encoded as individual Unicode characters from Basic Normal Plane. +GTEST_API_ std::string WideStringToUtf8(const wchar_t* str, int num_chars); + +// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file +// if the variable is present. If a file already exists at this location, this +// function will write over it. If the variable is present, but the file cannot +// be created, prints an error and exits. +void WriteToShardStatusFileIfNeeded(); + +// Checks whether sharding is enabled by examining the relevant +// environment variable values. If the variables are present, +// but inconsistent (e.g., shard_index >= total_shards), prints +// an error and exits. If in_subprocess_for_death_test, sharding is +// disabled because it must only be applied to the original test +// process. Otherwise, we could filter out death tests we intended to execute. +GTEST_API_ bool ShouldShard(const char* total_shards_str, + const char* shard_index_str, + bool in_subprocess_for_death_test); + +// Parses the environment variable var as an Int32. If it is unset, +// returns default_val. If it is not an Int32, prints an error and +// and aborts. +GTEST_API_ Int32 Int32FromEnvOrDie(const char* env_var, Int32 default_val); + +// Given the total number of shards, the shard index, and the test id, +// returns true iff the test should be run on this shard. The test id is +// some arbitrary but unique non-negative integer assigned to each test +// method. Assumes that 0 <= shard_index < total_shards. +GTEST_API_ bool ShouldRunTestOnShard( + int total_shards, int shard_index, int test_id); + +// STL container utilities. + +// Returns the number of elements in the given container that satisfy +// the given predicate. +template +inline int CountIf(const Container& c, Predicate predicate) { + // Implemented as an explicit loop since std::count_if() in libCstd on + // Solaris has a non-standard signature. + int count = 0; + for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) { + if (predicate(*it)) + ++count; + } + return count; +} + +// Applies a function/functor to each element in the container. +template +void ForEach(const Container& c, Functor functor) { + std::for_each(c.begin(), c.end(), functor); +} + +// Returns the i-th element of the vector, or default_value if i is not +// in range [0, v.size()). +template +inline E GetElementOr(const std::vector& v, int i, E default_value) { + return (i < 0 || i >= static_cast(v.size())) ? default_value : v[i]; +} + +// Performs an in-place shuffle of a range of the vector's elements. +// 'begin' and 'end' are element indices as an STL-style range; +// i.e. [begin, end) are shuffled, where 'end' == size() means to +// shuffle to the end of the vector. +template +void ShuffleRange(internal::Random* random, int begin, int end, + std::vector* v) { + const int size = static_cast(v->size()); + GTEST_CHECK_(0 <= begin && begin <= size) + << "Invalid shuffle range start " << begin << ": must be in range [0, " + << size << "]."; + GTEST_CHECK_(begin <= end && end <= size) + << "Invalid shuffle range finish " << end << ": must be in range [" + << begin << ", " << size << "]."; + + // Fisher-Yates shuffle, from + // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle + for (int range_width = end - begin; range_width >= 2; range_width--) { + const int last_in_range = begin + range_width - 1; + const int selected = begin + random->Generate(range_width); + std::swap((*v)[selected], (*v)[last_in_range]); + } +} + +// Performs an in-place shuffle of the vector's elements. +template +inline void Shuffle(internal::Random* random, std::vector* v) { + ShuffleRange(random, 0, static_cast(v->size()), v); +} + +// A function for deleting an object. Handy for being used as a +// functor. +template +static void Delete(T* x) { + delete x; +} + +// A predicate that checks the key of a TestProperty against a known key. +// +// TestPropertyKeyIs is copyable. +class TestPropertyKeyIs { + public: + // Constructor. + // + // TestPropertyKeyIs has NO default constructor. + explicit TestPropertyKeyIs(const std::string& key) : key_(key) {} + + // Returns true iff the test name of test property matches on key_. + bool operator()(const TestProperty& test_property) const { + return test_property.key() == key_; + } + + private: + std::string key_; +}; + +// Class UnitTestOptions. +// +// This class contains functions for processing options the user +// specifies when running the tests. It has only static members. +// +// In most cases, the user can specify an option using either an +// environment variable or a command line flag. E.g. you can set the +// test filter using either GTEST_FILTER or --gtest_filter. If both +// the variable and the flag are present, the latter overrides the +// former. +class GTEST_API_ UnitTestOptions { + public: + // Functions for processing the gtest_output flag. + + // Returns the output format, or "" for normal printed output. + static std::string GetOutputFormat(); + + // Returns the absolute path of the requested output file, or the + // default (test_detail.xml in the original working directory) if + // none was explicitly specified. + static std::string GetAbsolutePathToOutputFile(); + + // Functions for processing the gtest_filter flag. + + // Returns true iff the wildcard pattern matches the string. The + // first ':' or '\0' character in pattern marks the end of it. + // + // This recursive algorithm isn't very efficient, but is clear and + // works well enough for matching test names, which are short. + static bool PatternMatchesString(const char *pattern, const char *str); + + // Returns true iff the user-specified filter matches the test case + // name and the test name. + static bool FilterMatchesTest(const std::string &test_case_name, + const std::string &test_name); + +#if GTEST_OS_WINDOWS + // Function for supporting the gtest_catch_exception flag. + + // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the + // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise. + // This function is useful as an __except condition. + static int GTestShouldProcessSEH(DWORD exception_code); +#endif // GTEST_OS_WINDOWS + + // Returns true if "name" matches the ':' separated list of glob-style + // filters in "filter". + static bool MatchesFilter(const std::string& name, const char* filter); +}; + +// Returns the current application's name, removing directory path if that +// is present. Used by UnitTestOptions::GetOutputFile. +GTEST_API_ FilePath GetCurrentExecutableName(); + +// The role interface for getting the OS stack trace as a string. +class OsStackTraceGetterInterface { + public: + OsStackTraceGetterInterface() {} + virtual ~OsStackTraceGetterInterface() {} + + // Returns the current OS stack trace as an std::string. Parameters: + // + // max_depth - the maximum number of stack frames to be included + // in the trace. + // skip_count - the number of top frames to be skipped; doesn't count + // against max_depth. + virtual string CurrentStackTrace(int max_depth, int skip_count) = 0; + + // UponLeavingGTest() should be called immediately before Google Test calls + // user code. It saves some information about the current stack that + // CurrentStackTrace() will use to find and hide Google Test stack frames. + virtual void UponLeavingGTest() = 0; + + private: + GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface); +}; + +// A working implementation of the OsStackTraceGetterInterface interface. +class OsStackTraceGetter : public OsStackTraceGetterInterface { + public: + OsStackTraceGetter() : caller_frame_(NULL) {} + + virtual string CurrentStackTrace(int max_depth, int skip_count) + GTEST_LOCK_EXCLUDED_(mutex_); + + virtual void UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_); + + // This string is inserted in place of stack frames that are part of + // Google Test's implementation. + static const char* const kElidedFramesMarker; + + private: + Mutex mutex_; // protects all internal state + + // We save the stack frame below the frame that calls user code. + // We do this because the address of the frame immediately below + // the user code changes between the call to UponLeavingGTest() + // and any calls to CurrentStackTrace() from within the user code. + void* caller_frame_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter); +}; + +// Information about a Google Test trace point. +struct TraceInfo { + const char* file; + int line; + std::string message; +}; + +// This is the default global test part result reporter used in UnitTestImpl. +// This class should only be used by UnitTestImpl. +class DefaultGlobalTestPartResultReporter + : public TestPartResultReporterInterface { + public: + explicit DefaultGlobalTestPartResultReporter(UnitTestImpl* unit_test); + // Implements the TestPartResultReporterInterface. Reports the test part + // result in the current test. + virtual void ReportTestPartResult(const TestPartResult& result); + + private: + UnitTestImpl* const unit_test_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter); +}; + +// This is the default per thread test part result reporter used in +// UnitTestImpl. This class should only be used by UnitTestImpl. +class DefaultPerThreadTestPartResultReporter + : public TestPartResultReporterInterface { + public: + explicit DefaultPerThreadTestPartResultReporter(UnitTestImpl* unit_test); + // Implements the TestPartResultReporterInterface. The implementation just + // delegates to the current global test part result reporter of *unit_test_. + virtual void ReportTestPartResult(const TestPartResult& result); + + private: + UnitTestImpl* const unit_test_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter); +}; + +// The private implementation of the UnitTest class. We don't protect +// the methods under a mutex, as this class is not accessible by a +// user and the UnitTest class that delegates work to this class does +// proper locking. +class GTEST_API_ UnitTestImpl { + public: + explicit UnitTestImpl(UnitTest* parent); + virtual ~UnitTestImpl(); + + // There are two different ways to register your own TestPartResultReporter. + // You can register your own repoter to listen either only for test results + // from the current thread or for results from all threads. + // By default, each per-thread test result repoter just passes a new + // TestPartResult to the global test result reporter, which registers the + // test part result for the currently running test. + + // Returns the global test part result reporter. + TestPartResultReporterInterface* GetGlobalTestPartResultReporter(); + + // Sets the global test part result reporter. + void SetGlobalTestPartResultReporter( + TestPartResultReporterInterface* reporter); + + // Returns the test part result reporter for the current thread. + TestPartResultReporterInterface* GetTestPartResultReporterForCurrentThread(); + + // Sets the test part result reporter for the current thread. + void SetTestPartResultReporterForCurrentThread( + TestPartResultReporterInterface* reporter); + + // Gets the number of successful test cases. + int successful_test_case_count() const; + + // Gets the number of failed test cases. + int failed_test_case_count() const; + + // Gets the number of all test cases. + int total_test_case_count() const; + + // Gets the number of all test cases that contain at least one test + // that should run. + int test_case_to_run_count() const; + + // Gets the number of successful tests. + int successful_test_count() const; + + // Gets the number of failed tests. + int failed_test_count() const; + + // Gets the number of disabled tests that will be reported in the XML report. + int reportable_disabled_test_count() const; + + // Gets the number of disabled tests. + int disabled_test_count() const; + + // Gets the number of tests to be printed in the XML report. + int reportable_test_count() const; + + // Gets the number of all tests. + int total_test_count() const; + + // Gets the number of tests that should run. + int test_to_run_count() const; + + // Gets the time of the test program start, in ms from the start of the + // UNIX epoch. + TimeInMillis start_timestamp() const { return start_timestamp_; } + + // Gets the elapsed time, in milliseconds. + TimeInMillis elapsed_time() const { return elapsed_time_; } + + // Returns true iff the unit test passed (i.e. all test cases passed). + bool Passed() const { return !Failed(); } + + // Returns true iff the unit test failed (i.e. some test case failed + // or something outside of all tests failed). + bool Failed() const { + return failed_test_case_count() > 0 || ad_hoc_test_result()->Failed(); + } + + // Gets the i-th test case among all the test cases. i can range from 0 to + // total_test_case_count() - 1. If i is not in that range, returns NULL. + const TestCase* GetTestCase(int i) const { + const int index = GetElementOr(test_case_indices_, i, -1); + return index < 0 ? NULL : test_cases_[i]; + } + + // Gets the i-th test case among all the test cases. i can range from 0 to + // total_test_case_count() - 1. If i is not in that range, returns NULL. + TestCase* GetMutableTestCase(int i) { + const int index = GetElementOr(test_case_indices_, i, -1); + return index < 0 ? NULL : test_cases_[index]; + } + + // Provides access to the event listener list. + TestEventListeners* listeners() { return &listeners_; } + + // Returns the TestResult for the test that's currently running, or + // the TestResult for the ad hoc test if no test is running. + TestResult* current_test_result(); + + // Returns the TestResult for the ad hoc test. + const TestResult* ad_hoc_test_result() const { return &ad_hoc_test_result_; } + + // Sets the OS stack trace getter. + // + // Does nothing if the input and the current OS stack trace getter + // are the same; otherwise, deletes the old getter and makes the + // input the current getter. + void set_os_stack_trace_getter(OsStackTraceGetterInterface* getter); + + // Returns the current OS stack trace getter if it is not NULL; + // otherwise, creates an OsStackTraceGetter, makes it the current + // getter, and returns it. + OsStackTraceGetterInterface* os_stack_trace_getter(); + + // Returns the current OS stack trace as an std::string. + // + // The maximum number of stack frames to be included is specified by + // the gtest_stack_trace_depth flag. The skip_count parameter + // specifies the number of top frames to be skipped, which doesn't + // count against the number of frames to be included. + // + // For example, if Foo() calls Bar(), which in turn calls + // CurrentOsStackTraceExceptTop(1), Foo() will be included in the + // trace but Bar() and CurrentOsStackTraceExceptTop() won't. + std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_; + + // Finds and returns a TestCase with the given name. If one doesn't + // exist, creates one and returns it. + // + // Arguments: + // + // test_case_name: name of the test case + // type_param: the name of the test's type parameter, or NULL if + // this is not a typed or a type-parameterized test. + // set_up_tc: pointer to the function that sets up the test case + // tear_down_tc: pointer to the function that tears down the test case + TestCase* GetTestCase(const char* test_case_name, + const char* type_param, + Test::SetUpTestCaseFunc set_up_tc, + Test::TearDownTestCaseFunc tear_down_tc); + + // Adds a TestInfo to the unit test. + // + // Arguments: + // + // set_up_tc: pointer to the function that sets up the test case + // tear_down_tc: pointer to the function that tears down the test case + // test_info: the TestInfo object + void AddTestInfo(Test::SetUpTestCaseFunc set_up_tc, + Test::TearDownTestCaseFunc tear_down_tc, + TestInfo* test_info) { + // In order to support thread-safe death tests, we need to + // remember the original working directory when the test program + // was first invoked. We cannot do this in RUN_ALL_TESTS(), as + // the user may have changed the current directory before calling + // RUN_ALL_TESTS(). Therefore we capture the current directory in + // AddTestInfo(), which is called to register a TEST or TEST_F + // before main() is reached. + if (original_working_dir_.IsEmpty()) { + original_working_dir_.Set(FilePath::GetCurrentDir()); + GTEST_CHECK_(!original_working_dir_.IsEmpty()) + << "Failed to get the current working directory."; + } + + GetTestCase(test_info->test_case_name(), + test_info->type_param(), + set_up_tc, + tear_down_tc)->AddTestInfo(test_info); + } + +#if GTEST_HAS_PARAM_TEST + // Returns ParameterizedTestCaseRegistry object used to keep track of + // value-parameterized tests and instantiate and register them. + internal::ParameterizedTestCaseRegistry& parameterized_test_registry() { + return parameterized_test_registry_; + } +#endif // GTEST_HAS_PARAM_TEST + + // Sets the TestCase object for the test that's currently running. + void set_current_test_case(TestCase* a_current_test_case) { + current_test_case_ = a_current_test_case; + } + + // Sets the TestInfo object for the test that's currently running. If + // current_test_info is NULL, the assertion results will be stored in + // ad_hoc_test_result_. + void set_current_test_info(TestInfo* a_current_test_info) { + current_test_info_ = a_current_test_info; + } + + // Registers all parameterized tests defined using TEST_P and + // INSTANTIATE_TEST_CASE_P, creating regular tests for each test/parameter + // combination. This method can be called more then once; it has guards + // protecting from registering the tests more then once. If + // value-parameterized tests are disabled, RegisterParameterizedTests is + // present but does nothing. + void RegisterParameterizedTests(); + + // Runs all tests in this UnitTest object, prints the result, and + // returns true if all tests are successful. If any exception is + // thrown during a test, this test is considered to be failed, but + // the rest of the tests will still be run. + bool RunAllTests(); + + // Clears the results of all tests, except the ad hoc tests. + void ClearNonAdHocTestResult() { + ForEach(test_cases_, TestCase::ClearTestCaseResult); + } + + // Clears the results of ad-hoc test assertions. + void ClearAdHocTestResult() { + ad_hoc_test_result_.Clear(); + } + + // Adds a TestProperty to the current TestResult object when invoked in a + // context of a test or a test case, or to the global property set. If the + // result already contains a property with the same key, the value will be + // updated. + void RecordProperty(const TestProperty& test_property); + + enum ReactionToSharding { + HONOR_SHARDING_PROTOCOL, + IGNORE_SHARDING_PROTOCOL + }; + + // Matches the full name of each test against the user-specified + // filter to decide whether the test should run, then records the + // result in each TestCase and TestInfo object. + // If shard_tests == HONOR_SHARDING_PROTOCOL, further filters tests + // based on sharding variables in the environment. + // Returns the number of tests that should run. + int FilterTests(ReactionToSharding shard_tests); + + // Prints the names of the tests matching the user-specified filter flag. + void ListTestsMatchingFilter(); + + const TestCase* current_test_case() const { return current_test_case_; } + TestInfo* current_test_info() { return current_test_info_; } + const TestInfo* current_test_info() const { return current_test_info_; } + + // Returns the vector of environments that need to be set-up/torn-down + // before/after the tests are run. + std::vector& environments() { return environments_; } + + // Getters for the per-thread Google Test trace stack. + std::vector& gtest_trace_stack() { + return *(gtest_trace_stack_.pointer()); + } + const std::vector& gtest_trace_stack() const { + return gtest_trace_stack_.get(); + } + +#if GTEST_HAS_DEATH_TEST + void InitDeathTestSubprocessControlInfo() { + internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag()); + } + // Returns a pointer to the parsed --gtest_internal_run_death_test + // flag, or NULL if that flag was not specified. + // This information is useful only in a death test child process. + // Must not be called before a call to InitGoogleTest. + const InternalRunDeathTestFlag* internal_run_death_test_flag() const { + return internal_run_death_test_flag_.get(); + } + + // Returns a pointer to the current death test factory. + internal::DeathTestFactory* death_test_factory() { + return death_test_factory_.get(); + } + + void SuppressTestEventsIfInSubprocess(); + + friend class ReplaceDeathTestFactory; +#endif // GTEST_HAS_DEATH_TEST + + // Initializes the event listener performing XML output as specified by + // UnitTestOptions. Must not be called before InitGoogleTest. + void ConfigureXmlOutput(); + +#if GTEST_CAN_STREAM_RESULTS_ + // Initializes the event listener for streaming test results to a socket. + // Must not be called before InitGoogleTest. + void ConfigureStreamingOutput(); +#endif + + // Performs initialization dependent upon flag values obtained in + // ParseGoogleTestFlagsOnly. Is called from InitGoogleTest after the call to + // ParseGoogleTestFlagsOnly. In case a user neglects to call InitGoogleTest + // this function is also called from RunAllTests. Since this function can be + // called more than once, it has to be idempotent. + void PostFlagParsingInit(); + + // Gets the random seed used at the start of the current test iteration. + int random_seed() const { return random_seed_; } + + // Gets the random number generator. + internal::Random* random() { return &random_; } + + // Shuffles all test cases, and the tests within each test case, + // making sure that death tests are still run first. + void ShuffleTests(); + + // Restores the test cases and tests to their order before the first shuffle. + void UnshuffleTests(); + + // Returns the value of GTEST_FLAG(catch_exceptions) at the moment + // UnitTest::Run() starts. + bool catch_exceptions() const { return catch_exceptions_; } + + private: + friend class ::testing::UnitTest; + + // Used by UnitTest::Run() to capture the state of + // GTEST_FLAG(catch_exceptions) at the moment it starts. + void set_catch_exceptions(bool value) { catch_exceptions_ = value; } + + // The UnitTest object that owns this implementation object. + UnitTest* const parent_; + + // The working directory when the first TEST() or TEST_F() was + // executed. + internal::FilePath original_working_dir_; + + // The default test part result reporters. + DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_; + DefaultPerThreadTestPartResultReporter + default_per_thread_test_part_result_reporter_; + + // Points to (but doesn't own) the global test part result reporter. + TestPartResultReporterInterface* global_test_part_result_repoter_; + + // Protects read and write access to global_test_part_result_reporter_. + internal::Mutex global_test_part_result_reporter_mutex_; + + // Points to (but doesn't own) the per-thread test part result reporter. + internal::ThreadLocal + per_thread_test_part_result_reporter_; + + // The vector of environments that need to be set-up/torn-down + // before/after the tests are run. + std::vector environments_; + + // The vector of TestCases in their original order. It owns the + // elements in the vector. + std::vector test_cases_; + + // Provides a level of indirection for the test case list to allow + // easy shuffling and restoring the test case order. The i-th + // element of this vector is the index of the i-th test case in the + // shuffled order. + std::vector test_case_indices_; + +#if GTEST_HAS_PARAM_TEST + // ParameterizedTestRegistry object used to register value-parameterized + // tests. + internal::ParameterizedTestCaseRegistry parameterized_test_registry_; + + // Indicates whether RegisterParameterizedTests() has been called already. + bool parameterized_tests_registered_; +#endif // GTEST_HAS_PARAM_TEST + + // Index of the last death test case registered. Initially -1. + int last_death_test_case_; + + // This points to the TestCase for the currently running test. It + // changes as Google Test goes through one test case after another. + // When no test is running, this is set to NULL and Google Test + // stores assertion results in ad_hoc_test_result_. Initially NULL. + TestCase* current_test_case_; + + // This points to the TestInfo for the currently running test. It + // changes as Google Test goes through one test after another. When + // no test is running, this is set to NULL and Google Test stores + // assertion results in ad_hoc_test_result_. Initially NULL. + TestInfo* current_test_info_; + + // Normally, a user only writes assertions inside a TEST or TEST_F, + // or inside a function called by a TEST or TEST_F. Since Google + // Test keeps track of which test is current running, it can + // associate such an assertion with the test it belongs to. + // + // If an assertion is encountered when no TEST or TEST_F is running, + // Google Test attributes the assertion result to an imaginary "ad hoc" + // test, and records the result in ad_hoc_test_result_. + TestResult ad_hoc_test_result_; + + // The list of event listeners that can be used to track events inside + // Google Test. + TestEventListeners listeners_; + + // The OS stack trace getter. Will be deleted when the UnitTest + // object is destructed. By default, an OsStackTraceGetter is used, + // but the user can set this field to use a custom getter if that is + // desired. + OsStackTraceGetterInterface* os_stack_trace_getter_; + + // True iff PostFlagParsingInit() has been called. + bool post_flag_parse_init_performed_; + + // The random number seed used at the beginning of the test run. + int random_seed_; + + // Our random number generator. + internal::Random random_; + + // The time of the test program start, in ms from the start of the + // UNIX epoch. + TimeInMillis start_timestamp_; + + // How long the test took to run, in milliseconds. + TimeInMillis elapsed_time_; + +#if GTEST_HAS_DEATH_TEST + // The decomposed components of the gtest_internal_run_death_test flag, + // parsed when RUN_ALL_TESTS is called. + internal::scoped_ptr internal_run_death_test_flag_; + internal::scoped_ptr death_test_factory_; +#endif // GTEST_HAS_DEATH_TEST + + // A per-thread stack of traces created by the SCOPED_TRACE() macro. + internal::ThreadLocal > gtest_trace_stack_; + + // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests() + // starts. + bool catch_exceptions_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl); +}; // class UnitTestImpl + +// Convenience function for accessing the global UnitTest +// implementation object. +inline UnitTestImpl* GetUnitTestImpl() { + return UnitTest::GetInstance()->impl(); +} + +#if GTEST_USES_SIMPLE_RE + +// Internal helper functions for implementing the simple regular +// expression matcher. +GTEST_API_ bool IsInSet(char ch, const char* str); +GTEST_API_ bool IsAsciiDigit(char ch); +GTEST_API_ bool IsAsciiPunct(char ch); +GTEST_API_ bool IsRepeat(char ch); +GTEST_API_ bool IsAsciiWhiteSpace(char ch); +GTEST_API_ bool IsAsciiWordChar(char ch); +GTEST_API_ bool IsValidEscape(char ch); +GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch); +GTEST_API_ bool ValidateRegex(const char* regex); +GTEST_API_ bool MatchRegexAtHead(const char* regex, const char* str); +GTEST_API_ bool MatchRepetitionAndRegexAtHead( + bool escaped, char ch, char repeat, const char* regex, const char* str); +GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str); + +#endif // GTEST_USES_SIMPLE_RE + +// Parses the command line for Google Test flags, without initializing +// other parts of Google Test. +GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv); +GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv); + +#if GTEST_HAS_DEATH_TEST + +// Returns the message describing the last system error, regardless of the +// platform. +GTEST_API_ std::string GetLastErrnoDescription(); + +# if GTEST_OS_WINDOWS +// Provides leak-safe Windows kernel handle ownership. +class AutoHandle { + public: + AutoHandle() : handle_(INVALID_HANDLE_VALUE) {} + explicit AutoHandle(HANDLE handle) : handle_(handle) {} + + ~AutoHandle() { Reset(); } + + HANDLE Get() const { return handle_; } + void Reset() { Reset(INVALID_HANDLE_VALUE); } + void Reset(HANDLE handle) { + if (handle != handle_) { + if (handle_ != INVALID_HANDLE_VALUE) + ::CloseHandle(handle_); + handle_ = handle; + } + } + + private: + HANDLE handle_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(AutoHandle); +}; +# endif // GTEST_OS_WINDOWS + +// Attempts to parse a string into a positive integer pointed to by the +// number parameter. Returns true if that is possible. +// GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can use +// it here. +template +bool ParseNaturalNumber(const ::std::string& str, Integer* number) { + // Fail fast if the given string does not begin with a digit; + // this bypasses strtoXXX's "optional leading whitespace and plus + // or minus sign" semantics, which are undesirable here. + if (str.empty() || !IsDigit(str[0])) { + return false; + } + errno = 0; + + char* end; + // BiggestConvertible is the largest integer type that system-provided + // string-to-number conversion routines can return. + +# if GTEST_OS_WINDOWS && !defined(__GNUC__) + + // MSVC and C++ Builder define __int64 instead of the standard long long. + typedef unsigned __int64 BiggestConvertible; + const BiggestConvertible parsed = _strtoui64(str.c_str(), &end, 10); + +# else + + typedef unsigned long long BiggestConvertible; // NOLINT + const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10); + +# endif // GTEST_OS_WINDOWS && !defined(__GNUC__) + + const bool parse_success = *end == '\0' && errno == 0; + + // TODO(vladl@google.com): Convert this to compile time assertion when it is + // available. + GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed)); + + const Integer result = static_cast(parsed); + if (parse_success && static_cast(result) == parsed) { + *number = result; + return true; + } + return false; +} +#endif // GTEST_HAS_DEATH_TEST + +// TestResult contains some private methods that should be hidden from +// Google Test user but are required for testing. This class allow our tests +// to access them. +// +// This class is supplied only for the purpose of testing Google Test's own +// constructs. Do not use it in user tests, either directly or indirectly. +class TestResultAccessor { + public: + static void RecordProperty(TestResult* test_result, + const std::string& xml_element, + const TestProperty& property) { + test_result->RecordProperty(xml_element, property); + } + + static void ClearTestPartResults(TestResult* test_result) { + test_result->ClearTestPartResults(); + } + + static const std::vector& test_part_results( + const TestResult& test_result) { + return test_result.test_part_results(); + } +}; + +#if GTEST_CAN_STREAM_RESULTS_ + +// Streams test results to the given port on the given host machine. +class StreamingListener : public EmptyTestEventListener { + public: + // Abstract base class for writing strings to a socket. + class AbstractSocketWriter { + public: + virtual ~AbstractSocketWriter() {} + + // Sends a string to the socket. + virtual void Send(const string& message) = 0; + + // Closes the socket. + virtual void CloseConnection() {} + + // Sends a string and a newline to the socket. + void SendLn(const string& message) { + Send(message + "\n"); + } + }; + + // Concrete class for actually writing strings to a socket. + class SocketWriter : public AbstractSocketWriter { + public: + SocketWriter(const string& host, const string& port) + : sockfd_(-1), host_name_(host), port_num_(port) { + MakeConnection(); + } + + virtual ~SocketWriter() { + if (sockfd_ != -1) + CloseConnection(); + } + + // Sends a string to the socket. + virtual void Send(const string& message) { + GTEST_CHECK_(sockfd_ != -1) + << "Send() can be called only when there is a connection."; + + const int len = static_cast(message.length()); + if (write(sockfd_, message.c_str(), len) != len) { + GTEST_LOG_(WARNING) + << "stream_result_to: failed to stream to " + << host_name_ << ":" << port_num_; + } + } + + private: + // Creates a client socket and connects to the server. + void MakeConnection(); + + // Closes the socket. + void CloseConnection() { + GTEST_CHECK_(sockfd_ != -1) + << "CloseConnection() can be called only when there is a connection."; + + close(sockfd_); + sockfd_ = -1; + } + + int sockfd_; // socket file descriptor + const string host_name_; + const string port_num_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter); + }; // class SocketWriter + + // Escapes '=', '&', '%', and '\n' characters in str as "%xx". + static string UrlEncode(const char* str); + + StreamingListener(const string& host, const string& port) + : socket_writer_(new SocketWriter(host, port)) { Start(); } + + explicit StreamingListener(AbstractSocketWriter* socket_writer) + : socket_writer_(socket_writer) { Start(); } + + void OnTestProgramStart(const UnitTest& /* unit_test */) { + SendLn("event=TestProgramStart"); + } + + void OnTestProgramEnd(const UnitTest& unit_test) { + // Note that Google Test current only report elapsed time for each + // test iteration, not for the entire test program. + SendLn("event=TestProgramEnd&passed=" + FormatBool(unit_test.Passed())); + + // Notify the streaming server to stop. + socket_writer_->CloseConnection(); + } + + void OnTestIterationStart(const UnitTest& /* unit_test */, int iteration) { + SendLn("event=TestIterationStart&iteration=" + + StreamableToString(iteration)); + } + + void OnTestIterationEnd(const UnitTest& unit_test, int /* iteration */) { + SendLn("event=TestIterationEnd&passed=" + + FormatBool(unit_test.Passed()) + "&elapsed_time=" + + StreamableToString(unit_test.elapsed_time()) + "ms"); + } + + void OnTestCaseStart(const TestCase& test_case) { + SendLn(std::string("event=TestCaseStart&name=") + test_case.name()); + } + + void OnTestCaseEnd(const TestCase& test_case) { + SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed()) + + "&elapsed_time=" + StreamableToString(test_case.elapsed_time()) + + "ms"); + } + + void OnTestStart(const TestInfo& test_info) { + SendLn(std::string("event=TestStart&name=") + test_info.name()); + } + + void OnTestEnd(const TestInfo& test_info) { + SendLn("event=TestEnd&passed=" + + FormatBool((test_info.result())->Passed()) + + "&elapsed_time=" + + StreamableToString((test_info.result())->elapsed_time()) + "ms"); + } + + void OnTestPartResult(const TestPartResult& test_part_result) { + const char* file_name = test_part_result.file_name(); + if (file_name == NULL) + file_name = ""; + SendLn("event=TestPartResult&file=" + UrlEncode(file_name) + + "&line=" + StreamableToString(test_part_result.line_number()) + + "&message=" + UrlEncode(test_part_result.message())); + } + + private: + // Sends the given message and a newline to the socket. + void SendLn(const string& message) { socket_writer_->SendLn(message); } + + // Called at the start of streaming to notify the receiver what + // protocol we are using. + void Start() { SendLn("gtest_streaming_protocol_version=1.0"); } + + string FormatBool(bool value) { return value ? "1" : "0"; } + + const scoped_ptr socket_writer_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener); +}; // class StreamingListener + +#endif // GTEST_CAN_STREAM_RESULTS_ + +} // namespace internal +} // namespace testing + +#endif // GTEST_SRC_GTEST_INTERNAL_INL_H_ diff --git a/lib/gtest/src/gtest-port.cc b/lib/gtest/src/gtest-port.cc new file mode 100644 index 00000000..0c4df5f2 --- /dev/null +++ b/lib/gtest/src/gtest-port.cc @@ -0,0 +1,805 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) + +#include "gtest/internal/gtest-port.h" + +#include +#include +#include +#include + +#if GTEST_OS_WINDOWS_MOBILE +# include // For TerminateProcess() +#elif GTEST_OS_WINDOWS +# include +# include +#else +# include +#endif // GTEST_OS_WINDOWS_MOBILE + +#if GTEST_OS_MAC +# include +# include +# include +#endif // GTEST_OS_MAC + +#if GTEST_OS_QNX +# include +# include +#endif // GTEST_OS_QNX + +#include "gtest/gtest-spi.h" +#include "gtest/gtest-message.h" +#include "gtest/internal/gtest-internal.h" +#include "gtest/internal/gtest-string.h" + +// Indicates that this translation unit is part of Google Test's +// implementation. It must come before gtest-internal-inl.h is +// included, or there will be a compiler error. This trick is to +// prevent a user from accidentally including gtest-internal-inl.h in +// his code. +#define GTEST_IMPLEMENTATION_ 1 +#include "src/gtest-internal-inl.h" +#undef GTEST_IMPLEMENTATION_ + +namespace testing { +namespace internal { + +#if defined(_MSC_VER) || defined(__BORLANDC__) +// MSVC and C++Builder do not provide a definition of STDERR_FILENO. +const int kStdOutFileno = 1; +const int kStdErrFileno = 2; +#else +const int kStdOutFileno = STDOUT_FILENO; +const int kStdErrFileno = STDERR_FILENO; +#endif // _MSC_VER + +#if GTEST_OS_MAC + +// Returns the number of threads running in the process, or 0 to indicate that +// we cannot detect it. +size_t GetThreadCount() { + const task_t task = mach_task_self(); + mach_msg_type_number_t thread_count; + thread_act_array_t thread_list; + const kern_return_t status = task_threads(task, &thread_list, &thread_count); + if (status == KERN_SUCCESS) { + // task_threads allocates resources in thread_list and we need to free them + // to avoid leaks. + vm_deallocate(task, + reinterpret_cast(thread_list), + sizeof(thread_t) * thread_count); + return static_cast(thread_count); + } else { + return 0; + } +} + +#elif GTEST_OS_QNX + +// Returns the number of threads running in the process, or 0 to indicate that +// we cannot detect it. +size_t GetThreadCount() { + const int fd = open("/proc/self/as", O_RDONLY); + if (fd < 0) { + return 0; + } + procfs_info process_info; + const int status = + devctl(fd, DCMD_PROC_INFO, &process_info, sizeof(process_info), NULL); + close(fd); + if (status == EOK) { + return static_cast(process_info.num_threads); + } else { + return 0; + } +} + +#else + +size_t GetThreadCount() { + // There's no portable way to detect the number of threads, so we just + // return 0 to indicate that we cannot detect it. + return 0; +} + +#endif // GTEST_OS_MAC + +#if GTEST_USES_POSIX_RE + +// Implements RE. Currently only needed for death tests. + +RE::~RE() { + if (is_valid_) { + // regfree'ing an invalid regex might crash because the content + // of the regex is undefined. Since the regex's are essentially + // the same, one cannot be valid (or invalid) without the other + // being so too. + regfree(&partial_regex_); + regfree(&full_regex_); + } + free(const_cast(pattern_)); +} + +// Returns true iff regular expression re matches the entire str. +bool RE::FullMatch(const char* str, const RE& re) { + if (!re.is_valid_) return false; + + regmatch_t match; + return regexec(&re.full_regex_, str, 1, &match, 0) == 0; +} + +// Returns true iff regular expression re matches a substring of str +// (including str itself). +bool RE::PartialMatch(const char* str, const RE& re) { + if (!re.is_valid_) return false; + + regmatch_t match; + return regexec(&re.partial_regex_, str, 1, &match, 0) == 0; +} + +// Initializes an RE from its string representation. +void RE::Init(const char* regex) { + pattern_ = posix::StrDup(regex); + + // Reserves enough bytes to hold the regular expression used for a + // full match. + const size_t full_regex_len = strlen(regex) + 10; + char* const full_pattern = new char[full_regex_len]; + + snprintf(full_pattern, full_regex_len, "^(%s)$", regex); + is_valid_ = regcomp(&full_regex_, full_pattern, REG_EXTENDED) == 0; + // We want to call regcomp(&partial_regex_, ...) even if the + // previous expression returns false. Otherwise partial_regex_ may + // not be properly initialized can may cause trouble when it's + // freed. + // + // Some implementation of POSIX regex (e.g. on at least some + // versions of Cygwin) doesn't accept the empty string as a valid + // regex. We change it to an equivalent form "()" to be safe. + if (is_valid_) { + const char* const partial_regex = (*regex == '\0') ? "()" : regex; + is_valid_ = regcomp(&partial_regex_, partial_regex, REG_EXTENDED) == 0; + } + EXPECT_TRUE(is_valid_) + << "Regular expression \"" << regex + << "\" is not a valid POSIX Extended regular expression."; + + delete[] full_pattern; +} + +#elif GTEST_USES_SIMPLE_RE + +// Returns true iff ch appears anywhere in str (excluding the +// terminating '\0' character). +bool IsInSet(char ch, const char* str) { + return ch != '\0' && strchr(str, ch) != NULL; +} + +// Returns true iff ch belongs to the given classification. Unlike +// similar functions in , these aren't affected by the +// current locale. +bool IsAsciiDigit(char ch) { return '0' <= ch && ch <= '9'; } +bool IsAsciiPunct(char ch) { + return IsInSet(ch, "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~"); +} +bool IsRepeat(char ch) { return IsInSet(ch, "?*+"); } +bool IsAsciiWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); } +bool IsAsciiWordChar(char ch) { + return ('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') || + ('0' <= ch && ch <= '9') || ch == '_'; +} + +// Returns true iff "\\c" is a supported escape sequence. +bool IsValidEscape(char c) { + return (IsAsciiPunct(c) || IsInSet(c, "dDfnrsStvwW")); +} + +// Returns true iff the given atom (specified by escaped and pattern) +// matches ch. The result is undefined if the atom is invalid. +bool AtomMatchesChar(bool escaped, char pattern_char, char ch) { + if (escaped) { // "\\p" where p is pattern_char. + switch (pattern_char) { + case 'd': return IsAsciiDigit(ch); + case 'D': return !IsAsciiDigit(ch); + case 'f': return ch == '\f'; + case 'n': return ch == '\n'; + case 'r': return ch == '\r'; + case 's': return IsAsciiWhiteSpace(ch); + case 'S': return !IsAsciiWhiteSpace(ch); + case 't': return ch == '\t'; + case 'v': return ch == '\v'; + case 'w': return IsAsciiWordChar(ch); + case 'W': return !IsAsciiWordChar(ch); + } + return IsAsciiPunct(pattern_char) && pattern_char == ch; + } + + return (pattern_char == '.' && ch != '\n') || pattern_char == ch; +} + +// Helper function used by ValidateRegex() to format error messages. +std::string FormatRegexSyntaxError(const char* regex, int index) { + return (Message() << "Syntax error at index " << index + << " in simple regular expression \"" << regex << "\": ").GetString(); +} + +// Generates non-fatal failures and returns false if regex is invalid; +// otherwise returns true. +bool ValidateRegex(const char* regex) { + if (regex == NULL) { + // TODO(wan@google.com): fix the source file location in the + // assertion failures to match where the regex is used in user + // code. + ADD_FAILURE() << "NULL is not a valid simple regular expression."; + return false; + } + + bool is_valid = true; + + // True iff ?, *, or + can follow the previous atom. + bool prev_repeatable = false; + for (int i = 0; regex[i]; i++) { + if (regex[i] == '\\') { // An escape sequence + i++; + if (regex[i] == '\0') { + ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1) + << "'\\' cannot appear at the end."; + return false; + } + + if (!IsValidEscape(regex[i])) { + ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1) + << "invalid escape sequence \"\\" << regex[i] << "\"."; + is_valid = false; + } + prev_repeatable = true; + } else { // Not an escape sequence. + const char ch = regex[i]; + + if (ch == '^' && i > 0) { + ADD_FAILURE() << FormatRegexSyntaxError(regex, i) + << "'^' can only appear at the beginning."; + is_valid = false; + } else if (ch == '$' && regex[i + 1] != '\0') { + ADD_FAILURE() << FormatRegexSyntaxError(regex, i) + << "'$' can only appear at the end."; + is_valid = false; + } else if (IsInSet(ch, "()[]{}|")) { + ADD_FAILURE() << FormatRegexSyntaxError(regex, i) + << "'" << ch << "' is unsupported."; + is_valid = false; + } else if (IsRepeat(ch) && !prev_repeatable) { + ADD_FAILURE() << FormatRegexSyntaxError(regex, i) + << "'" << ch << "' can only follow a repeatable token."; + is_valid = false; + } + + prev_repeatable = !IsInSet(ch, "^$?*+"); + } + } + + return is_valid; +} + +// Matches a repeated regex atom followed by a valid simple regular +// expression. The regex atom is defined as c if escaped is false, +// or \c otherwise. repeat is the repetition meta character (?, *, +// or +). The behavior is undefined if str contains too many +// characters to be indexable by size_t, in which case the test will +// probably time out anyway. We are fine with this limitation as +// std::string has it too. +bool MatchRepetitionAndRegexAtHead( + bool escaped, char c, char repeat, const char* regex, + const char* str) { + const size_t min_count = (repeat == '+') ? 1 : 0; + const size_t max_count = (repeat == '?') ? 1 : + static_cast(-1) - 1; + // We cannot call numeric_limits::max() as it conflicts with the + // max() macro on Windows. + + for (size_t i = 0; i <= max_count; ++i) { + // We know that the atom matches each of the first i characters in str. + if (i >= min_count && MatchRegexAtHead(regex, str + i)) { + // We have enough matches at the head, and the tail matches too. + // Since we only care about *whether* the pattern matches str + // (as opposed to *how* it matches), there is no need to find a + // greedy match. + return true; + } + if (str[i] == '\0' || !AtomMatchesChar(escaped, c, str[i])) + return false; + } + return false; +} + +// Returns true iff regex matches a prefix of str. regex must be a +// valid simple regular expression and not start with "^", or the +// result is undefined. +bool MatchRegexAtHead(const char* regex, const char* str) { + if (*regex == '\0') // An empty regex matches a prefix of anything. + return true; + + // "$" only matches the end of a string. Note that regex being + // valid guarantees that there's nothing after "$" in it. + if (*regex == '$') + return *str == '\0'; + + // Is the first thing in regex an escape sequence? + const bool escaped = *regex == '\\'; + if (escaped) + ++regex; + if (IsRepeat(regex[1])) { + // MatchRepetitionAndRegexAtHead() calls MatchRegexAtHead(), so + // here's an indirect recursion. It terminates as the regex gets + // shorter in each recursion. + return MatchRepetitionAndRegexAtHead( + escaped, regex[0], regex[1], regex + 2, str); + } else { + // regex isn't empty, isn't "$", and doesn't start with a + // repetition. We match the first atom of regex with the first + // character of str and recurse. + return (*str != '\0') && AtomMatchesChar(escaped, *regex, *str) && + MatchRegexAtHead(regex + 1, str + 1); + } +} + +// Returns true iff regex matches any substring of str. regex must be +// a valid simple regular expression, or the result is undefined. +// +// The algorithm is recursive, but the recursion depth doesn't exceed +// the regex length, so we won't need to worry about running out of +// stack space normally. In rare cases the time complexity can be +// exponential with respect to the regex length + the string length, +// but usually it's must faster (often close to linear). +bool MatchRegexAnywhere(const char* regex, const char* str) { + if (regex == NULL || str == NULL) + return false; + + if (*regex == '^') + return MatchRegexAtHead(regex + 1, str); + + // A successful match can be anywhere in str. + do { + if (MatchRegexAtHead(regex, str)) + return true; + } while (*str++ != '\0'); + return false; +} + +// Implements the RE class. + +RE::~RE() { + free(const_cast(pattern_)); + free(const_cast(full_pattern_)); +} + +// Returns true iff regular expression re matches the entire str. +bool RE::FullMatch(const char* str, const RE& re) { + return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_, str); +} + +// Returns true iff regular expression re matches a substring of str +// (including str itself). +bool RE::PartialMatch(const char* str, const RE& re) { + return re.is_valid_ && MatchRegexAnywhere(re.pattern_, str); +} + +// Initializes an RE from its string representation. +void RE::Init(const char* regex) { + pattern_ = full_pattern_ = NULL; + if (regex != NULL) { + pattern_ = posix::StrDup(regex); + } + + is_valid_ = ValidateRegex(regex); + if (!is_valid_) { + // No need to calculate the full pattern when the regex is invalid. + return; + } + + const size_t len = strlen(regex); + // Reserves enough bytes to hold the regular expression used for a + // full match: we need space to prepend a '^', append a '$', and + // terminate the string with '\0'. + char* buffer = static_cast(malloc(len + 3)); + full_pattern_ = buffer; + + if (*regex != '^') + *buffer++ = '^'; // Makes sure full_pattern_ starts with '^'. + + // We don't use snprintf or strncpy, as they trigger a warning when + // compiled with VC++ 8.0. + memcpy(buffer, regex, len); + buffer += len; + + if (len == 0 || regex[len - 1] != '$') + *buffer++ = '$'; // Makes sure full_pattern_ ends with '$'. + + *buffer = '\0'; +} + +#endif // GTEST_USES_POSIX_RE + +const char kUnknownFile[] = "unknown file"; + +// Formats a source file path and a line number as they would appear +// in an error message from the compiler used to compile this code. +GTEST_API_ ::std::string FormatFileLocation(const char* file, int line) { + const std::string file_name(file == NULL ? kUnknownFile : file); + + if (line < 0) { + return file_name + ":"; + } +#ifdef _MSC_VER + return file_name + "(" + StreamableToString(line) + "):"; +#else + return file_name + ":" + StreamableToString(line) + ":"; +#endif // _MSC_VER +} + +// Formats a file location for compiler-independent XML output. +// Although this function is not platform dependent, we put it next to +// FormatFileLocation in order to contrast the two functions. +// Note that FormatCompilerIndependentFileLocation() does NOT append colon +// to the file location it produces, unlike FormatFileLocation(). +GTEST_API_ ::std::string FormatCompilerIndependentFileLocation( + const char* file, int line) { + const std::string file_name(file == NULL ? kUnknownFile : file); + + if (line < 0) + return file_name; + else + return file_name + ":" + StreamableToString(line); +} + + +GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line) + : severity_(severity) { + const char* const marker = + severity == GTEST_INFO ? "[ INFO ]" : + severity == GTEST_WARNING ? "[WARNING]" : + severity == GTEST_ERROR ? "[ ERROR ]" : "[ FATAL ]"; + GetStream() << ::std::endl << marker << " " + << FormatFileLocation(file, line).c_str() << ": "; +} + +// Flushes the buffers and, if severity is GTEST_FATAL, aborts the program. +GTestLog::~GTestLog() { + GetStream() << ::std::endl; + if (severity_ == GTEST_FATAL) { + fflush(stderr); + posix::Abort(); + } +} +// Disable Microsoft deprecation warnings for POSIX functions called from +// this class (creat, dup, dup2, and close) +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable: 4996) +#endif // _MSC_VER + +#if GTEST_HAS_STREAM_REDIRECTION + +// Object that captures an output stream (stdout/stderr). +class CapturedStream { + public: + // The ctor redirects the stream to a temporary file. + explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) { +# if GTEST_OS_WINDOWS + char temp_dir_path[MAX_PATH + 1] = { '\0' }; // NOLINT + char temp_file_path[MAX_PATH + 1] = { '\0' }; // NOLINT + + ::GetTempPathA(sizeof(temp_dir_path), temp_dir_path); + const UINT success = ::GetTempFileNameA(temp_dir_path, + "gtest_redir", + 0, // Generate unique file name. + temp_file_path); + GTEST_CHECK_(success != 0) + << "Unable to create a temporary file in " << temp_dir_path; + const int captured_fd = creat(temp_file_path, _S_IREAD | _S_IWRITE); + GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file " + << temp_file_path; + filename_ = temp_file_path; +# else + // There's no guarantee that a test has write access to the current + // directory, so we create the temporary file in the /tmp directory + // instead. We use /tmp on most systems, and /sdcard on Android. + // That's because Android doesn't have /tmp. +# if GTEST_OS_LINUX_ANDROID + // Note: Android applications are expected to call the framework's + // Context.getExternalStorageDirectory() method through JNI to get + // the location of the world-writable SD Card directory. However, + // this requires a Context handle, which cannot be retrieved + // globally from native code. Doing so also precludes running the + // code as part of a regular standalone executable, which doesn't + // run in a Dalvik process (e.g. when running it through 'adb shell'). + // + // The location /sdcard is directly accessible from native code + // and is the only location (unofficially) supported by the Android + // team. It's generally a symlink to the real SD Card mount point + // which can be /mnt/sdcard, /mnt/sdcard0, /system/media/sdcard, or + // other OEM-customized locations. Never rely on these, and always + // use /sdcard. + char name_template[] = "/sdcard/gtest_captured_stream.XXXXXX"; +# else + char name_template[] = "/tmp/captured_stream.XXXXXX"; +# endif // GTEST_OS_LINUX_ANDROID + const int captured_fd = mkstemp(name_template); + filename_ = name_template; +# endif // GTEST_OS_WINDOWS + fflush(NULL); + dup2(captured_fd, fd_); + close(captured_fd); + } + + ~CapturedStream() { + remove(filename_.c_str()); + } + + std::string GetCapturedString() { + if (uncaptured_fd_ != -1) { + // Restores the original stream. + fflush(NULL); + dup2(uncaptured_fd_, fd_); + close(uncaptured_fd_); + uncaptured_fd_ = -1; + } + + FILE* const file = posix::FOpen(filename_.c_str(), "r"); + const std::string content = ReadEntireFile(file); + posix::FClose(file); + return content; + } + + private: + // Reads the entire content of a file as an std::string. + static std::string ReadEntireFile(FILE* file); + + // Returns the size (in bytes) of a file. + static size_t GetFileSize(FILE* file); + + const int fd_; // A stream to capture. + int uncaptured_fd_; + // Name of the temporary file holding the stderr output. + ::std::string filename_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream); +}; + +// Returns the size (in bytes) of a file. +size_t CapturedStream::GetFileSize(FILE* file) { + fseek(file, 0, SEEK_END); + return static_cast(ftell(file)); +} + +// Reads the entire content of a file as a string. +std::string CapturedStream::ReadEntireFile(FILE* file) { + const size_t file_size = GetFileSize(file); + char* const buffer = new char[file_size]; + + size_t bytes_last_read = 0; // # of bytes read in the last fread() + size_t bytes_read = 0; // # of bytes read so far + + fseek(file, 0, SEEK_SET); + + // Keeps reading the file until we cannot read further or the + // pre-determined file size is reached. + do { + bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file); + bytes_read += bytes_last_read; + } while (bytes_last_read > 0 && bytes_read < file_size); + + const std::string content(buffer, bytes_read); + delete[] buffer; + + return content; +} + +# ifdef _MSC_VER +# pragma warning(pop) +# endif // _MSC_VER + +static CapturedStream* g_captured_stderr = NULL; +static CapturedStream* g_captured_stdout = NULL; + +// Starts capturing an output stream (stdout/stderr). +void CaptureStream(int fd, const char* stream_name, CapturedStream** stream) { + if (*stream != NULL) { + GTEST_LOG_(FATAL) << "Only one " << stream_name + << " capturer can exist at a time."; + } + *stream = new CapturedStream(fd); +} + +// Stops capturing the output stream and returns the captured string. +std::string GetCapturedStream(CapturedStream** captured_stream) { + const std::string content = (*captured_stream)->GetCapturedString(); + + delete *captured_stream; + *captured_stream = NULL; + + return content; +} + +// Starts capturing stdout. +void CaptureStdout() { + CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout); +} + +// Starts capturing stderr. +void CaptureStderr() { + CaptureStream(kStdErrFileno, "stderr", &g_captured_stderr); +} + +// Stops capturing stdout and returns the captured string. +std::string GetCapturedStdout() { + return GetCapturedStream(&g_captured_stdout); +} + +// Stops capturing stderr and returns the captured string. +std::string GetCapturedStderr() { + return GetCapturedStream(&g_captured_stderr); +} + +#endif // GTEST_HAS_STREAM_REDIRECTION + +#if GTEST_HAS_DEATH_TEST + +// A copy of all command line arguments. Set by InitGoogleTest(). +::std::vector g_argvs; + +static const ::std::vector* g_injected_test_argvs = + NULL; // Owned. + +void SetInjectableArgvs(const ::std::vector* argvs) { + if (g_injected_test_argvs != argvs) + delete g_injected_test_argvs; + g_injected_test_argvs = argvs; +} + +const ::std::vector& GetInjectableArgvs() { + if (g_injected_test_argvs != NULL) { + return *g_injected_test_argvs; + } + return g_argvs; +} +#endif // GTEST_HAS_DEATH_TEST + +#if GTEST_OS_WINDOWS_MOBILE +namespace posix { +void Abort() { + DebugBreak(); + TerminateProcess(GetCurrentProcess(), 1); +} +} // namespace posix +#endif // GTEST_OS_WINDOWS_MOBILE + +// Returns the name of the environment variable corresponding to the +// given flag. For example, FlagToEnvVar("foo") will return +// "GTEST_FOO" in the open-source version. +static std::string FlagToEnvVar(const char* flag) { + const std::string full_flag = + (Message() << GTEST_FLAG_PREFIX_ << flag).GetString(); + + Message env_var; + for (size_t i = 0; i != full_flag.length(); i++) { + env_var << ToUpper(full_flag.c_str()[i]); + } + + return env_var.GetString(); +} + +// Parses 'str' for a 32-bit signed integer. If successful, writes +// the result to *value and returns true; otherwise leaves *value +// unchanged and returns false. +bool ParseInt32(const Message& src_text, const char* str, Int32* value) { + // Parses the environment variable as a decimal integer. + char* end = NULL; + const long long_value = strtol(str, &end, 10); // NOLINT + + // Has strtol() consumed all characters in the string? + if (*end != '\0') { + // No - an invalid character was encountered. + Message msg; + msg << "WARNING: " << src_text + << " is expected to be a 32-bit integer, but actually" + << " has value \"" << str << "\".\n"; + printf("%s", msg.GetString().c_str()); + fflush(stdout); + return false; + } + + // Is the parsed value in the range of an Int32? + const Int32 result = static_cast(long_value); + if (long_value == LONG_MAX || long_value == LONG_MIN || + // The parsed value overflows as a long. (strtol() returns + // LONG_MAX or LONG_MIN when the input overflows.) + result != long_value + // The parsed value overflows as an Int32. + ) { + Message msg; + msg << "WARNING: " << src_text + << " is expected to be a 32-bit integer, but actually" + << " has value " << str << ", which overflows.\n"; + printf("%s", msg.GetString().c_str()); + fflush(stdout); + return false; + } + + *value = result; + return true; +} + +// Reads and returns the Boolean environment variable corresponding to +// the given flag; if it's not set, returns default_value. +// +// The value is considered true iff it's not "0". +bool BoolFromGTestEnv(const char* flag, bool default_value) { + const std::string env_var = FlagToEnvVar(flag); + const char* const string_value = posix::GetEnv(env_var.c_str()); + return string_value == NULL ? + default_value : strcmp(string_value, "0") != 0; +} + +// Reads and returns a 32-bit integer stored in the environment +// variable corresponding to the given flag; if it isn't set or +// doesn't represent a valid 32-bit integer, returns default_value. +Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) { + const std::string env_var = FlagToEnvVar(flag); + const char* const string_value = posix::GetEnv(env_var.c_str()); + if (string_value == NULL) { + // The environment variable is not set. + return default_value; + } + + Int32 result = default_value; + if (!ParseInt32(Message() << "Environment variable " << env_var, + string_value, &result)) { + printf("The default value %s is used.\n", + (Message() << default_value).GetString().c_str()); + fflush(stdout); + return default_value; + } + + return result; +} + +// Reads and returns the string environment variable corresponding to +// the given flag; if it's not set, returns default_value. +const char* StringFromGTestEnv(const char* flag, const char* default_value) { + const std::string env_var = FlagToEnvVar(flag); + const char* const value = posix::GetEnv(env_var.c_str()); + return value == NULL ? default_value : value; +} + +} // namespace internal +} // namespace testing diff --git a/lib/gtest/src/gtest-printers.cc b/lib/gtest/src/gtest-printers.cc new file mode 100644 index 00000000..75fa4081 --- /dev/null +++ b/lib/gtest/src/gtest-printers.cc @@ -0,0 +1,363 @@ +// Copyright 2007, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) + +// Google Test - The Google C++ Testing Framework +// +// This file implements a universal value printer that can print a +// value of any type T: +// +// void ::testing::internal::UniversalPrinter::Print(value, ostream_ptr); +// +// It uses the << operator when possible, and prints the bytes in the +// object otherwise. A user can override its behavior for a class +// type Foo by defining either operator<<(::std::ostream&, const Foo&) +// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that +// defines Foo. + +#include "gtest/gtest-printers.h" +#include +#include +#include // NOLINT +#include +#include "gtest/internal/gtest-port.h" + +namespace testing { + +namespace { + +using ::std::ostream; + +// Prints a segment of bytes in the given object. +void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start, + size_t count, ostream* os) { + char text[5] = ""; + for (size_t i = 0; i != count; i++) { + const size_t j = start + i; + if (i != 0) { + // Organizes the bytes into groups of 2 for easy parsing by + // human. + if ((j % 2) == 0) + *os << ' '; + else + *os << '-'; + } + GTEST_SNPRINTF_(text, sizeof(text), "%02X", obj_bytes[j]); + *os << text; + } +} + +// Prints the bytes in the given value to the given ostream. +void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count, + ostream* os) { + // Tells the user how big the object is. + *os << count << "-byte object <"; + + const size_t kThreshold = 132; + const size_t kChunkSize = 64; + // If the object size is bigger than kThreshold, we'll have to omit + // some details by printing only the first and the last kChunkSize + // bytes. + // TODO(wan): let the user control the threshold using a flag. + if (count < kThreshold) { + PrintByteSegmentInObjectTo(obj_bytes, 0, count, os); + } else { + PrintByteSegmentInObjectTo(obj_bytes, 0, kChunkSize, os); + *os << " ... "; + // Rounds up to 2-byte boundary. + const size_t resume_pos = (count - kChunkSize + 1)/2*2; + PrintByteSegmentInObjectTo(obj_bytes, resume_pos, count - resume_pos, os); + } + *os << ">"; +} + +} // namespace + +namespace internal2 { + +// Delegates to PrintBytesInObjectToImpl() to print the bytes in the +// given object. The delegation simplifies the implementation, which +// uses the << operator and thus is easier done outside of the +// ::testing::internal namespace, which contains a << operator that +// sometimes conflicts with the one in STL. +void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count, + ostream* os) { + PrintBytesInObjectToImpl(obj_bytes, count, os); +} + +} // namespace internal2 + +namespace internal { + +// Depending on the value of a char (or wchar_t), we print it in one +// of three formats: +// - as is if it's a printable ASCII (e.g. 'a', '2', ' '), +// - as a hexidecimal escape sequence (e.g. '\x7F'), or +// - as a special escape sequence (e.g. '\r', '\n'). +enum CharFormat { + kAsIs, + kHexEscape, + kSpecialEscape +}; + +// Returns true if c is a printable ASCII character. We test the +// value of c directly instead of calling isprint(), which is buggy on +// Windows Mobile. +inline bool IsPrintableAscii(wchar_t c) { + return 0x20 <= c && c <= 0x7E; +} + +// Prints a wide or narrow char c as a character literal without the +// quotes, escaping it when necessary; returns how c was formatted. +// The template argument UnsignedChar is the unsigned version of Char, +// which is the type of c. +template +static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) { + switch (static_cast(c)) { + case L'\0': + *os << "\\0"; + break; + case L'\'': + *os << "\\'"; + break; + case L'\\': + *os << "\\\\"; + break; + case L'\a': + *os << "\\a"; + break; + case L'\b': + *os << "\\b"; + break; + case L'\f': + *os << "\\f"; + break; + case L'\n': + *os << "\\n"; + break; + case L'\r': + *os << "\\r"; + break; + case L'\t': + *os << "\\t"; + break; + case L'\v': + *os << "\\v"; + break; + default: + if (IsPrintableAscii(c)) { + *os << static_cast(c); + return kAsIs; + } else { + *os << "\\x" + String::FormatHexInt(static_cast(c)); + return kHexEscape; + } + } + return kSpecialEscape; +} + +// Prints a wchar_t c as if it's part of a string literal, escaping it when +// necessary; returns how c was formatted. +static CharFormat PrintAsStringLiteralTo(wchar_t c, ostream* os) { + switch (c) { + case L'\'': + *os << "'"; + return kAsIs; + case L'"': + *os << "\\\""; + return kSpecialEscape; + default: + return PrintAsCharLiteralTo(c, os); + } +} + +// Prints a char c as if it's part of a string literal, escaping it when +// necessary; returns how c was formatted. +static CharFormat PrintAsStringLiteralTo(char c, ostream* os) { + return PrintAsStringLiteralTo( + static_cast(static_cast(c)), os); +} + +// Prints a wide or narrow character c and its code. '\0' is printed +// as "'\\0'", other unprintable characters are also properly escaped +// using the standard C++ escape sequence. The template argument +// UnsignedChar is the unsigned version of Char, which is the type of c. +template +void PrintCharAndCodeTo(Char c, ostream* os) { + // First, print c as a literal in the most readable form we can find. + *os << ((sizeof(c) > 1) ? "L'" : "'"); + const CharFormat format = PrintAsCharLiteralTo(c, os); + *os << "'"; + + // To aid user debugging, we also print c's code in decimal, unless + // it's 0 (in which case c was printed as '\\0', making the code + // obvious). + if (c == 0) + return; + *os << " (" << static_cast(c); + + // For more convenience, we print c's code again in hexidecimal, + // unless c was already printed in the form '\x##' or the code is in + // [1, 9]. + if (format == kHexEscape || (1 <= c && c <= 9)) { + // Do nothing. + } else { + *os << ", 0x" << String::FormatHexInt(static_cast(c)); + } + *os << ")"; +} + +void PrintTo(unsigned char c, ::std::ostream* os) { + PrintCharAndCodeTo(c, os); +} +void PrintTo(signed char c, ::std::ostream* os) { + PrintCharAndCodeTo(c, os); +} + +// Prints a wchar_t as a symbol if it is printable or as its internal +// code otherwise and also as its code. L'\0' is printed as "L'\\0'". +void PrintTo(wchar_t wc, ostream* os) { + PrintCharAndCodeTo(wc, os); +} + +// Prints the given array of characters to the ostream. CharType must be either +// char or wchar_t. +// The array starts at begin, the length is len, it may include '\0' characters +// and may not be NUL-terminated. +template +static void PrintCharsAsStringTo( + const CharType* begin, size_t len, ostream* os) { + const char* const kQuoteBegin = sizeof(CharType) == 1 ? "\"" : "L\""; + *os << kQuoteBegin; + bool is_previous_hex = false; + for (size_t index = 0; index < len; ++index) { + const CharType cur = begin[index]; + if (is_previous_hex && IsXDigit(cur)) { + // Previous character is of '\x..' form and this character can be + // interpreted as another hexadecimal digit in its number. Break string to + // disambiguate. + *os << "\" " << kQuoteBegin; + } + is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape; + } + *os << "\""; +} + +// Prints a (const) char/wchar_t array of 'len' elements, starting at address +// 'begin'. CharType must be either char or wchar_t. +template +static void UniversalPrintCharArray( + const CharType* begin, size_t len, ostream* os) { + // The code + // const char kFoo[] = "foo"; + // generates an array of 4, not 3, elements, with the last one being '\0'. + // + // Therefore when printing a char array, we don't print the last element if + // it's '\0', such that the output matches the string literal as it's + // written in the source code. + if (len > 0 && begin[len - 1] == '\0') { + PrintCharsAsStringTo(begin, len - 1, os); + return; + } + + // If, however, the last element in the array is not '\0', e.g. + // const char kFoo[] = { 'f', 'o', 'o' }; + // we must print the entire array. We also print a message to indicate + // that the array is not NUL-terminated. + PrintCharsAsStringTo(begin, len, os); + *os << " (no terminating NUL)"; +} + +// Prints a (const) char array of 'len' elements, starting at address 'begin'. +void UniversalPrintArray(const char* begin, size_t len, ostream* os) { + UniversalPrintCharArray(begin, len, os); +} + +// Prints a (const) wchar_t array of 'len' elements, starting at address +// 'begin'. +void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) { + UniversalPrintCharArray(begin, len, os); +} + +// Prints the given C string to the ostream. +void PrintTo(const char* s, ostream* os) { + if (s == NULL) { + *os << "NULL"; + } else { + *os << ImplicitCast_(s) << " pointing to "; + PrintCharsAsStringTo(s, strlen(s), os); + } +} + +// MSVC compiler can be configured to define whar_t as a typedef +// of unsigned short. Defining an overload for const wchar_t* in that case +// would cause pointers to unsigned shorts be printed as wide strings, +// possibly accessing more memory than intended and causing invalid +// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when +// wchar_t is implemented as a native type. +#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) +// Prints the given wide C string to the ostream. +void PrintTo(const wchar_t* s, ostream* os) { + if (s == NULL) { + *os << "NULL"; + } else { + *os << ImplicitCast_(s) << " pointing to "; + PrintCharsAsStringTo(s, wcslen(s), os); + } +} +#endif // wchar_t is native + +// Prints a ::string object. +#if GTEST_HAS_GLOBAL_STRING +void PrintStringTo(const ::string& s, ostream* os) { + PrintCharsAsStringTo(s.data(), s.size(), os); +} +#endif // GTEST_HAS_GLOBAL_STRING + +void PrintStringTo(const ::std::string& s, ostream* os) { + PrintCharsAsStringTo(s.data(), s.size(), os); +} + +// Prints a ::wstring object. +#if GTEST_HAS_GLOBAL_WSTRING +void PrintWideStringTo(const ::wstring& s, ostream* os) { + PrintCharsAsStringTo(s.data(), s.size(), os); +} +#endif // GTEST_HAS_GLOBAL_WSTRING + +#if GTEST_HAS_STD_WSTRING +void PrintWideStringTo(const ::std::wstring& s, ostream* os) { + PrintCharsAsStringTo(s.data(), s.size(), os); +} +#endif // GTEST_HAS_STD_WSTRING + +} // namespace internal + +} // namespace testing diff --git a/lib/gtest/src/gtest-test-part.cc b/lib/gtest/src/gtest-test-part.cc new file mode 100644 index 00000000..c60eef3a --- /dev/null +++ b/lib/gtest/src/gtest-test-part.cc @@ -0,0 +1,110 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: mheule@google.com (Markus Heule) +// +// The Google C++ Testing Framework (Google Test) + +#include "gtest/gtest-test-part.h" + +// Indicates that this translation unit is part of Google Test's +// implementation. It must come before gtest-internal-inl.h is +// included, or there will be a compiler error. This trick is to +// prevent a user from accidentally including gtest-internal-inl.h in +// his code. +#define GTEST_IMPLEMENTATION_ 1 +#include "src/gtest-internal-inl.h" +#undef GTEST_IMPLEMENTATION_ + +namespace testing { + +using internal::GetUnitTestImpl; + +// Gets the summary of the failure message by omitting the stack trace +// in it. +std::string TestPartResult::ExtractSummary(const char* message) { + const char* const stack_trace = strstr(message, internal::kStackTraceMarker); + return stack_trace == NULL ? message : + std::string(message, stack_trace); +} + +// Prints a TestPartResult object. +std::ostream& operator<<(std::ostream& os, const TestPartResult& result) { + return os + << result.file_name() << ":" << result.line_number() << ": " + << (result.type() == TestPartResult::kSuccess ? "Success" : + result.type() == TestPartResult::kFatalFailure ? "Fatal failure" : + "Non-fatal failure") << ":\n" + << result.message() << std::endl; +} + +// Appends a TestPartResult to the array. +void TestPartResultArray::Append(const TestPartResult& result) { + array_.push_back(result); +} + +// Returns the TestPartResult at the given index (0-based). +const TestPartResult& TestPartResultArray::GetTestPartResult(int index) const { + if (index < 0 || index >= size()) { + printf("\nInvalid index (%d) into TestPartResultArray.\n", index); + internal::posix::Abort(); + } + + return array_[index]; +} + +// Returns the number of TestPartResult objects in the array. +int TestPartResultArray::size() const { + return static_cast(array_.size()); +} + +namespace internal { + +HasNewFatalFailureHelper::HasNewFatalFailureHelper() + : has_new_fatal_failure_(false), + original_reporter_(GetUnitTestImpl()-> + GetTestPartResultReporterForCurrentThread()) { + GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(this); +} + +HasNewFatalFailureHelper::~HasNewFatalFailureHelper() { + GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread( + original_reporter_); +} + +void HasNewFatalFailureHelper::ReportTestPartResult( + const TestPartResult& result) { + if (result.fatally_failed()) + has_new_fatal_failure_ = true; + original_reporter_->ReportTestPartResult(result); +} + +} // namespace internal + +} // namespace testing diff --git a/lib/gtest/src/gtest-typed-test.cc b/lib/gtest/src/gtest-typed-test.cc new file mode 100644 index 00000000..f0079f40 --- /dev/null +++ b/lib/gtest/src/gtest-typed-test.cc @@ -0,0 +1,110 @@ +// Copyright 2008 Google Inc. +// All Rights Reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) + +#include "gtest/gtest-typed-test.h" +#include "gtest/gtest.h" + +namespace testing { +namespace internal { + +#if GTEST_HAS_TYPED_TEST_P + +// Skips to the first non-space char in str. Returns an empty string if str +// contains only whitespace characters. +static const char* SkipSpaces(const char* str) { + while (IsSpace(*str)) + str++; + return str; +} + +// Verifies that registered_tests match the test names in +// defined_test_names_; returns registered_tests if successful, or +// aborts the program otherwise. +const char* TypedTestCasePState::VerifyRegisteredTestNames( + const char* file, int line, const char* registered_tests) { + typedef ::std::set::const_iterator DefinedTestIter; + registered_ = true; + + // Skip initial whitespace in registered_tests since some + // preprocessors prefix stringizied literals with whitespace. + registered_tests = SkipSpaces(registered_tests); + + Message errors; + ::std::set tests; + for (const char* names = registered_tests; names != NULL; + names = SkipComma(names)) { + const std::string name = GetPrefixUntilComma(names); + if (tests.count(name) != 0) { + errors << "Test " << name << " is listed more than once.\n"; + continue; + } + + bool found = false; + for (DefinedTestIter it = defined_test_names_.begin(); + it != defined_test_names_.end(); + ++it) { + if (name == *it) { + found = true; + break; + } + } + + if (found) { + tests.insert(name); + } else { + errors << "No test named " << name + << " can be found in this test case.\n"; + } + } + + for (DefinedTestIter it = defined_test_names_.begin(); + it != defined_test_names_.end(); + ++it) { + if (tests.count(*it) == 0) { + errors << "You forgot to list test " << *it << ".\n"; + } + } + + const std::string& errors_str = errors.GetString(); + if (errors_str != "") { + fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(), + errors_str.c_str()); + fflush(stderr); + posix::Abort(); + } + + return registered_tests; +} + +#endif // GTEST_HAS_TYPED_TEST_P + +} // namespace internal +} // namespace testing diff --git a/lib/gtest/src/gtest.cc b/lib/gtest/src/gtest.cc new file mode 100644 index 00000000..6de53dd0 --- /dev/null +++ b/lib/gtest/src/gtest.cc @@ -0,0 +1,5015 @@ +// Copyright 2005, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +// Author: wan@google.com (Zhanyong Wan) +// +// The Google C++ Testing Framework (Google Test) + +#include "gtest/gtest.h" +#include "gtest/gtest-spi.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include // NOLINT +#include +#include + +#if GTEST_OS_LINUX + +// TODO(kenton@google.com): Use autoconf to detect availability of +// gettimeofday(). +# define GTEST_HAS_GETTIMEOFDAY_ 1 + +# include // NOLINT +# include // NOLINT +# include // NOLINT +// Declares vsnprintf(). This header is not available on Windows. +# include // NOLINT +# include // NOLINT +# include // NOLINT +# include // NOLINT +# include + +#elif GTEST_OS_SYMBIAN +# define GTEST_HAS_GETTIMEOFDAY_ 1 +# include // NOLINT + +#elif GTEST_OS_ZOS +# define GTEST_HAS_GETTIMEOFDAY_ 1 +# include // NOLINT + +// On z/OS we additionally need strings.h for strcasecmp. +# include // NOLINT + +#elif GTEST_OS_WINDOWS_MOBILE // We are on Windows CE. + +# include // NOLINT + +#elif GTEST_OS_WINDOWS // We are on Windows proper. + +# include // NOLINT +# include // NOLINT +# include // NOLINT +# include // NOLINT + +# if GTEST_OS_WINDOWS_MINGW +// MinGW has gettimeofday() but not _ftime64(). +// TODO(kenton@google.com): Use autoconf to detect availability of +// gettimeofday(). +// TODO(kenton@google.com): There are other ways to get the time on +// Windows, like GetTickCount() or GetSystemTimeAsFileTime(). MinGW +// supports these. consider using them instead. +# define GTEST_HAS_GETTIMEOFDAY_ 1 +# include // NOLINT +# endif // GTEST_OS_WINDOWS_MINGW + +// cpplint thinks that the header is already included, so we want to +// silence it. +# include // NOLINT + +#else + +// Assume other platforms have gettimeofday(). +// TODO(kenton@google.com): Use autoconf to detect availability of +// gettimeofday(). +# define GTEST_HAS_GETTIMEOFDAY_ 1 + +// cpplint thinks that the header is already included, so we want to +// silence it. +# include // NOLINT +# include // NOLINT + +#endif // GTEST_OS_LINUX + +#if GTEST_HAS_EXCEPTIONS +# include +#endif + +#if GTEST_CAN_STREAM_RESULTS_ +# include // NOLINT +# include // NOLINT +#endif + +// Indicates that this translation unit is part of Google Test's +// implementation. It must come before gtest-internal-inl.h is +// included, or there will be a compiler error. This trick is to +// prevent a user from accidentally including gtest-internal-inl.h in +// his code. +#define GTEST_IMPLEMENTATION_ 1 +#include "src/gtest-internal-inl.h" +#undef GTEST_IMPLEMENTATION_ + +#if GTEST_OS_WINDOWS +# define vsnprintf _vsnprintf +#endif // GTEST_OS_WINDOWS + +namespace testing { + +using internal::CountIf; +using internal::ForEach; +using internal::GetElementOr; +using internal::Shuffle; + +// Constants. + +// A test whose test case name or test name matches this filter is +// disabled and not run. +static const char kDisableTestFilter[] = "DISABLED_*:*/DISABLED_*"; + +// A test case whose name matches this filter is considered a death +// test case and will be run before test cases whose name doesn't +// match this filter. +static const char kDeathTestCaseFilter[] = "*DeathTest:*DeathTest/*"; + +// A test filter that matches everything. +static const char kUniversalFilter[] = "*"; + +// The default output file for XML output. +static const char kDefaultOutputFile[] = "test_detail.xml"; + +// The environment variable name for the test shard index. +static const char kTestShardIndex[] = "GTEST_SHARD_INDEX"; +// The environment variable name for the total number of test shards. +static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS"; +// The environment variable name for the test shard status file. +static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE"; + +namespace internal { + +// The text used in failure messages to indicate the start of the +// stack trace. +const char kStackTraceMarker[] = "\nStack trace:\n"; + +// g_help_flag is true iff the --help flag or an equivalent form is +// specified on the command line. +bool g_help_flag = false; + +} // namespace internal + +static const char* GetDefaultFilter() { + return kUniversalFilter; +} + +GTEST_DEFINE_bool_( + also_run_disabled_tests, + internal::BoolFromGTestEnv("also_run_disabled_tests", false), + "Run disabled tests too, in addition to the tests normally being run."); + +GTEST_DEFINE_bool_( + break_on_failure, + internal::BoolFromGTestEnv("break_on_failure", false), + "True iff a failed assertion should be a debugger break-point."); + +GTEST_DEFINE_bool_( + catch_exceptions, + internal::BoolFromGTestEnv("catch_exceptions", true), + "True iff " GTEST_NAME_ + " should catch exceptions and treat them as test failures."); + +GTEST_DEFINE_string_( + color, + internal::StringFromGTestEnv("color", "auto"), + "Whether to use colors in the output. Valid values: yes, no, " + "and auto. 'auto' means to use colors if the output is " + "being sent to a terminal and the TERM environment variable " + "is set to a terminal type that supports colors."); + +GTEST_DEFINE_string_( + filter, + internal::StringFromGTestEnv("filter", GetDefaultFilter()), + "A colon-separated list of glob (not regex) patterns " + "for filtering the tests to run, optionally followed by a " + "'-' and a : separated list of negative patterns (tests to " + "exclude). A test is run if it matches one of the positive " + "patterns and does not match any of the negative patterns."); + +GTEST_DEFINE_bool_(list_tests, false, + "List all tests without running them."); + +GTEST_DEFINE_string_( + output, + internal::StringFromGTestEnv("output", ""), + "A format (currently must be \"xml\"), optionally followed " + "by a colon and an output file name or directory. A directory " + "is indicated by a trailing pathname separator. " + "Examples: \"xml:filename.xml\", \"xml::directoryname/\". " + "If a directory is specified, output files will be created " + "within that directory, with file-names based on the test " + "executable's name and, if necessary, made unique by adding " + "digits."); + +GTEST_DEFINE_bool_( + print_time, + internal::BoolFromGTestEnv("print_time", true), + "True iff " GTEST_NAME_ + " should display elapsed time in text output."); + +GTEST_DEFINE_int32_( + random_seed, + internal::Int32FromGTestEnv("random_seed", 0), + "Random number seed to use when shuffling test orders. Must be in range " + "[1, 99999], or 0 to use a seed based on the current time."); + +GTEST_DEFINE_int32_( + repeat, + internal::Int32FromGTestEnv("repeat", 1), + "How many times to repeat each test. Specify a negative number " + "for repeating forever. Useful for shaking out flaky tests."); + +GTEST_DEFINE_bool_( + show_internal_stack_frames, false, + "True iff " GTEST_NAME_ " should include internal stack frames when " + "printing test failure stack traces."); + +GTEST_DEFINE_bool_( + shuffle, + internal::BoolFromGTestEnv("shuffle", false), + "True iff " GTEST_NAME_ + " should randomize tests' order on every run."); + +GTEST_DEFINE_int32_( + stack_trace_depth, + internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth), + "The maximum number of stack frames to print when an " + "assertion fails. The valid range is 0 through 100, inclusive."); + +GTEST_DEFINE_string_( + stream_result_to, + internal::StringFromGTestEnv("stream_result_to", ""), + "This flag specifies the host name and the port number on which to stream " + "test results. Example: \"localhost:555\". The flag is effective only on " + "Linux."); + +GTEST_DEFINE_bool_( + throw_on_failure, + internal::BoolFromGTestEnv("throw_on_failure", false), + "When this flag is specified, a failed assertion will throw an exception " + "if exceptions are enabled or exit the program with a non-zero code " + "otherwise."); + +namespace internal { + +// Generates a random number from [0, range), using a Linear +// Congruential Generator (LCG). Crashes if 'range' is 0 or greater +// than kMaxRange. +UInt32 Random::Generate(UInt32 range) { + // These constants are the same as are used in glibc's rand(3). + state_ = (1103515245U*state_ + 12345U) % kMaxRange; + + GTEST_CHECK_(range > 0) + << "Cannot generate a number in the range [0, 0)."; + GTEST_CHECK_(range <= kMaxRange) + << "Generation of a number in [0, " << range << ") was requested, " + << "but this can only generate numbers in [0, " << kMaxRange << ")."; + + // Converting via modulus introduces a bit of downward bias, but + // it's simple, and a linear congruential generator isn't too good + // to begin with. + return state_ % range; +} + +// GTestIsInitialized() returns true iff the user has initialized +// Google Test. Useful for catching the user mistake of not initializing +// Google Test before calling RUN_ALL_TESTS(). +// +// A user must call testing::InitGoogleTest() to initialize Google +// Test. g_init_gtest_count is set to the number of times +// InitGoogleTest() has been called. We don't protect this variable +// under a mutex as it is only accessed in the main thread. +GTEST_API_ int g_init_gtest_count = 0; +static bool GTestIsInitialized() { return g_init_gtest_count != 0; } + +// Iterates over a vector of TestCases, keeping a running sum of the +// results of calling a given int-returning method on each. +// Returns the sum. +static int SumOverTestCaseList(const std::vector& case_list, + int (TestCase::*method)() const) { + int sum = 0; + for (size_t i = 0; i < case_list.size(); i++) { + sum += (case_list[i]->*method)(); + } + return sum; +} + +// Returns true iff the test case passed. +static bool TestCasePassed(const TestCase* test_case) { + return test_case->should_run() && test_case->Passed(); +} + +// Returns true iff the test case failed. +static bool TestCaseFailed(const TestCase* test_case) { + return test_case->should_run() && test_case->Failed(); +} + +// Returns true iff test_case contains at least one test that should +// run. +static bool ShouldRunTestCase(const TestCase* test_case) { + return test_case->should_run(); +} + +// AssertHelper constructor. +AssertHelper::AssertHelper(TestPartResult::Type type, + const char* file, + int line, + const char* message) + : data_(new AssertHelperData(type, file, line, message)) { +} + +AssertHelper::~AssertHelper() { + delete data_; +} + +// Message assignment, for assertion streaming support. +void AssertHelper::operator=(const Message& message) const { + UnitTest::GetInstance()-> + AddTestPartResult(data_->type, data_->file, data_->line, + AppendUserMessage(data_->message, message), + UnitTest::GetInstance()->impl() + ->CurrentOsStackTraceExceptTop(1) + // Skips the stack frame for this function itself. + ); // NOLINT +} + +// Mutex for linked pointers. +GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex); + +// Application pathname gotten in InitGoogleTest. +std::string g_executable_path; + +// Returns the current application's name, removing directory path if that +// is present. +FilePath GetCurrentExecutableName() { + FilePath result; + +#if GTEST_OS_WINDOWS + result.Set(FilePath(g_executable_path).RemoveExtension("exe")); +#else + result.Set(FilePath(g_executable_path)); +#endif // GTEST_OS_WINDOWS + + return result.RemoveDirectoryName(); +} + +// Functions for processing the gtest_output flag. + +// Returns the output format, or "" for normal printed output. +std::string UnitTestOptions::GetOutputFormat() { + const char* const gtest_output_flag = GTEST_FLAG(output).c_str(); + if (gtest_output_flag == NULL) return std::string(""); + + const char* const colon = strchr(gtest_output_flag, ':'); + return (colon == NULL) ? + std::string(gtest_output_flag) : + std::string(gtest_output_flag, colon - gtest_output_flag); +} + +// Returns the name of the requested output file, or the default if none +// was explicitly specified. +std::string UnitTestOptions::GetAbsolutePathToOutputFile() { + const char* const gtest_output_flag = GTEST_FLAG(output).c_str(); + if (gtest_output_flag == NULL) + return ""; + + const char* const colon = strchr(gtest_output_flag, ':'); + if (colon == NULL) + return internal::FilePath::ConcatPaths( + internal::FilePath( + UnitTest::GetInstance()->original_working_dir()), + internal::FilePath(kDefaultOutputFile)).string(); + + internal::FilePath output_name(colon + 1); + if (!output_name.IsAbsolutePath()) + // TODO(wan@google.com): on Windows \some\path is not an absolute + // path (as its meaning depends on the current drive), yet the + // following logic for turning it into an absolute path is wrong. + // Fix it. + output_name = internal::FilePath::ConcatPaths( + internal::FilePath(UnitTest::GetInstance()->original_working_dir()), + internal::FilePath(colon + 1)); + + if (!output_name.IsDirectory()) + return output_name.string(); + + internal::FilePath result(internal::FilePath::GenerateUniqueFileName( + output_name, internal::GetCurrentExecutableName(), + GetOutputFormat().c_str())); + return result.string(); +} + +// Returns true iff the wildcard pattern matches the string. The +// first ':' or '\0' character in pattern marks the end of it. +// +// This recursive algorithm isn't very efficient, but is clear and +// works well enough for matching test names, which are short. +bool UnitTestOptions::PatternMatchesString(const char *pattern, + const char *str) { + switch (*pattern) { + case '\0': + case ':': // Either ':' or '\0' marks the end of the pattern. + return *str == '\0'; + case '?': // Matches any single character. + return *str != '\0' && PatternMatchesString(pattern + 1, str + 1); + case '*': // Matches any string (possibly empty) of characters. + return (*str != '\0' && PatternMatchesString(pattern, str + 1)) || + PatternMatchesString(pattern + 1, str); + default: // Non-special character. Matches itself. + return *pattern == *str && + PatternMatchesString(pattern + 1, str + 1); + } +} + +bool UnitTestOptions::MatchesFilter( + const std::string& name, const char* filter) { + const char *cur_pattern = filter; + for (;;) { + if (PatternMatchesString(cur_pattern, name.c_str())) { + return true; + } + + // Finds the next pattern in the filter. + cur_pattern = strchr(cur_pattern, ':'); + + // Returns if no more pattern can be found. + if (cur_pattern == NULL) { + return false; + } + + // Skips the pattern separater (the ':' character). + cur_pattern++; + } +} + +// Returns true iff the user-specified filter matches the test case +// name and the test name. +bool UnitTestOptions::FilterMatchesTest(const std::string &test_case_name, + const std::string &test_name) { + const std::string& full_name = test_case_name + "." + test_name.c_str(); + + // Split --gtest_filter at '-', if there is one, to separate into + // positive filter and negative filter portions + const char* const p = GTEST_FLAG(filter).c_str(); + const char* const dash = strchr(p, '-'); + std::string positive; + std::string negative; + if (dash == NULL) { + positive = GTEST_FLAG(filter).c_str(); // Whole string is a positive filter + negative = ""; + } else { + positive = std::string(p, dash); // Everything up to the dash + negative = std::string(dash + 1); // Everything after the dash + if (positive.empty()) { + // Treat '-test1' as the same as '*-test1' + positive = kUniversalFilter; + } + } + + // A filter is a colon-separated list of patterns. It matches a + // test if any pattern in it matches the test. + return (MatchesFilter(full_name, positive.c_str()) && + !MatchesFilter(full_name, negative.c_str())); +} + +#if GTEST_HAS_SEH +// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the +// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise. +// This function is useful as an __except condition. +int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) { + // Google Test should handle a SEH exception if: + // 1. the user wants it to, AND + // 2. this is not a breakpoint exception, AND + // 3. this is not a C++ exception (VC++ implements them via SEH, + // apparently). + // + // SEH exception code for C++ exceptions. + // (see http://support.microsoft.com/kb/185294 for more information). + const DWORD kCxxExceptionCode = 0xe06d7363; + + bool should_handle = true; + + if (!GTEST_FLAG(catch_exceptions)) + should_handle = false; + else if (exception_code == EXCEPTION_BREAKPOINT) + should_handle = false; + else if (exception_code == kCxxExceptionCode) + should_handle = false; + + return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} +#endif // GTEST_HAS_SEH + +} // namespace internal + +// The c'tor sets this object as the test part result reporter used by +// Google Test. The 'result' parameter specifies where to report the +// results. Intercepts only failures from the current thread. +ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter( + TestPartResultArray* result) + : intercept_mode_(INTERCEPT_ONLY_CURRENT_THREAD), + result_(result) { + Init(); +} + +// The c'tor sets this object as the test part result reporter used by +// Google Test. The 'result' parameter specifies where to report the +// results. +ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter( + InterceptMode intercept_mode, TestPartResultArray* result) + : intercept_mode_(intercept_mode), + result_(result) { + Init(); +} + +void ScopedFakeTestPartResultReporter::Init() { + internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); + if (intercept_mode_ == INTERCEPT_ALL_THREADS) { + old_reporter_ = impl->GetGlobalTestPartResultReporter(); + impl->SetGlobalTestPartResultReporter(this); + } else { + old_reporter_ = impl->GetTestPartResultReporterForCurrentThread(); + impl->SetTestPartResultReporterForCurrentThread(this); + } +} + +// The d'tor restores the test part result reporter used by Google Test +// before. +ScopedFakeTestPartResultReporter::~ScopedFakeTestPartResultReporter() { + internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); + if (intercept_mode_ == INTERCEPT_ALL_THREADS) { + impl->SetGlobalTestPartResultReporter(old_reporter_); + } else { + impl->SetTestPartResultReporterForCurrentThread(old_reporter_); + } +} + +// Increments the test part result count and remembers the result. +// This method is from the TestPartResultReporterInterface interface. +void ScopedFakeTestPartResultReporter::ReportTestPartResult( + const TestPartResult& result) { + result_->Append(result); +} + +namespace internal { + +// Returns the type ID of ::testing::Test. We should always call this +// instead of GetTypeId< ::testing::Test>() to get the type ID of +// testing::Test. This is to work around a suspected linker bug when +// using Google Test as a framework on Mac OS X. The bug causes +// GetTypeId< ::testing::Test>() to return different values depending +// on whether the call is from the Google Test framework itself or +// from user test code. GetTestTypeId() is guaranteed to always +// return the same value, as it always calls GetTypeId<>() from the +// gtest.cc, which is within the Google Test framework. +TypeId GetTestTypeId() { + return GetTypeId(); +} + +// The value of GetTestTypeId() as seen from within the Google Test +// library. This is solely for testing GetTestTypeId(). +extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId(); + +// This predicate-formatter checks that 'results' contains a test part +// failure of the given type and that the failure message contains the +// given substring. +AssertionResult HasOneFailure(const char* /* results_expr */, + const char* /* type_expr */, + const char* /* substr_expr */, + const TestPartResultArray& results, + TestPartResult::Type type, + const string& substr) { + const std::string expected(type == TestPartResult::kFatalFailure ? + "1 fatal failure" : + "1 non-fatal failure"); + Message msg; + if (results.size() != 1) { + msg << "Expected: " << expected << "\n" + << " Actual: " << results.size() << " failures"; + for (int i = 0; i < results.size(); i++) { + msg << "\n" << results.GetTestPartResult(i); + } + return AssertionFailure() << msg; + } + + const TestPartResult& r = results.GetTestPartResult(0); + if (r.type() != type) { + return AssertionFailure() << "Expected: " << expected << "\n" + << " Actual:\n" + << r; + } + + if (strstr(r.message(), substr.c_str()) == NULL) { + return AssertionFailure() << "Expected: " << expected << " containing \"" + << substr << "\"\n" + << " Actual:\n" + << r; + } + + return AssertionSuccess(); +} + +// The constructor of SingleFailureChecker remembers where to look up +// test part results, what type of failure we expect, and what +// substring the failure message should contain. +SingleFailureChecker:: SingleFailureChecker( + const TestPartResultArray* results, + TestPartResult::Type type, + const string& substr) + : results_(results), + type_(type), + substr_(substr) {} + +// The destructor of SingleFailureChecker verifies that the given +// TestPartResultArray contains exactly one failure that has the given +// type and contains the given substring. If that's not the case, a +// non-fatal failure will be generated. +SingleFailureChecker::~SingleFailureChecker() { + EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_); +} + +DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter( + UnitTestImpl* unit_test) : unit_test_(unit_test) {} + +void DefaultGlobalTestPartResultReporter::ReportTestPartResult( + const TestPartResult& result) { + unit_test_->current_test_result()->AddTestPartResult(result); + unit_test_->listeners()->repeater()->OnTestPartResult(result); +} + +DefaultPerThreadTestPartResultReporter::DefaultPerThreadTestPartResultReporter( + UnitTestImpl* unit_test) : unit_test_(unit_test) {} + +void DefaultPerThreadTestPartResultReporter::ReportTestPartResult( + const TestPartResult& result) { + unit_test_->GetGlobalTestPartResultReporter()->ReportTestPartResult(result); +} + +// Returns the global test part result reporter. +TestPartResultReporterInterface* +UnitTestImpl::GetGlobalTestPartResultReporter() { + internal::MutexLock lock(&global_test_part_result_reporter_mutex_); + return global_test_part_result_repoter_; +} + +// Sets the global test part result reporter. +void UnitTestImpl::SetGlobalTestPartResultReporter( + TestPartResultReporterInterface* reporter) { + internal::MutexLock lock(&global_test_part_result_reporter_mutex_); + global_test_part_result_repoter_ = reporter; +} + +// Returns the test part result reporter for the current thread. +TestPartResultReporterInterface* +UnitTestImpl::GetTestPartResultReporterForCurrentThread() { + return per_thread_test_part_result_reporter_.get(); +} + +// Sets the test part result reporter for the current thread. +void UnitTestImpl::SetTestPartResultReporterForCurrentThread( + TestPartResultReporterInterface* reporter) { + per_thread_test_part_result_reporter_.set(reporter); +} + +// Gets the number of successful test cases. +int UnitTestImpl::successful_test_case_count() const { + return CountIf(test_cases_, TestCasePassed); +} + +// Gets the number of failed test cases. +int UnitTestImpl::failed_test_case_count() const { + return CountIf(test_cases_, TestCaseFailed); +} + +// Gets the number of all test cases. +int UnitTestImpl::total_test_case_count() const { + return static_cast(test_cases_.size()); +} + +// Gets the number of all test cases that contain at least one test +// that should run. +int UnitTestImpl::test_case_to_run_count() const { + return CountIf(test_cases_, ShouldRunTestCase); +} + +// Gets the number of successful tests. +int UnitTestImpl::successful_test_count() const { + return SumOverTestCaseList(test_cases_, &TestCase::successful_test_count); +} + +// Gets the number of failed tests. +int UnitTestImpl::failed_test_count() const { + return SumOverTestCaseList(test_cases_, &TestCase::failed_test_count); +} + +// Gets the number of disabled tests that will be reported in the XML report. +int UnitTestImpl::reportable_disabled_test_count() const { + return SumOverTestCaseList(test_cases_, + &TestCase::reportable_disabled_test_count); +} + +// Gets the number of disabled tests. +int UnitTestImpl::disabled_test_count() const { + return SumOverTestCaseList(test_cases_, &TestCase::disabled_test_count); +} + +// Gets the number of tests to be printed in the XML report. +int UnitTestImpl::reportable_test_count() const { + return SumOverTestCaseList(test_cases_, &TestCase::reportable_test_count); +} + +// Gets the number of all tests. +int UnitTestImpl::total_test_count() const { + return SumOverTestCaseList(test_cases_, &TestCase::total_test_count); +} + +// Gets the number of tests that should run. +int UnitTestImpl::test_to_run_count() const { + return SumOverTestCaseList(test_cases_, &TestCase::test_to_run_count); +} + +// Returns the current OS stack trace as an std::string. +// +// The maximum number of stack frames to be included is specified by +// the gtest_stack_trace_depth flag. The skip_count parameter +// specifies the number of top frames to be skipped, which doesn't +// count against the number of frames to be included. +// +// For example, if Foo() calls Bar(), which in turn calls +// CurrentOsStackTraceExceptTop(1), Foo() will be included in the +// trace but Bar() and CurrentOsStackTraceExceptTop() won't. +std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) { + (void)skip_count; + return ""; +} + +// Returns the current time in milliseconds. +TimeInMillis GetTimeInMillis() { +#if GTEST_OS_WINDOWS_MOBILE || defined(__BORLANDC__) + // Difference between 1970-01-01 and 1601-01-01 in milliseconds. + // http://analogous.blogspot.com/2005/04/epoch.html + const TimeInMillis kJavaEpochToWinFileTimeDelta = + static_cast(116444736UL) * 100000UL; + const DWORD kTenthMicrosInMilliSecond = 10000; + + SYSTEMTIME now_systime; + FILETIME now_filetime; + ULARGE_INTEGER now_int64; + // TODO(kenton@google.com): Shouldn't this just use + // GetSystemTimeAsFileTime()? + GetSystemTime(&now_systime); + if (SystemTimeToFileTime(&now_systime, &now_filetime)) { + now_int64.LowPart = now_filetime.dwLowDateTime; + now_int64.HighPart = now_filetime.dwHighDateTime; + now_int64.QuadPart = (now_int64.QuadPart / kTenthMicrosInMilliSecond) - + kJavaEpochToWinFileTimeDelta; + return now_int64.QuadPart; + } + return 0; +#elif GTEST_OS_WINDOWS && !GTEST_HAS_GETTIMEOFDAY_ + __timeb64 now; + +# ifdef _MSC_VER + + // MSVC 8 deprecates _ftime64(), so we want to suppress warning 4996 + // (deprecated function) there. + // TODO(kenton@google.com): Use GetTickCount()? Or use + // SystemTimeToFileTime() +# pragma warning(push) // Saves the current warning state. +# pragma warning(disable:4996) // Temporarily disables warning 4996. + _ftime64(&now); +# pragma warning(pop) // Restores the warning state. +# else + + _ftime64(&now); + +# endif // _MSC_VER + + return static_cast(now.time) * 1000 + now.millitm; +#elif GTEST_HAS_GETTIMEOFDAY_ + struct timeval now; + gettimeofday(&now, NULL); + return static_cast(now.tv_sec) * 1000 + now.tv_usec / 1000; +#else +# error "Don't know how to get the current time on your system." +#endif +} + +// Utilities + +// class String. + +#if GTEST_OS_WINDOWS_MOBILE +// Creates a UTF-16 wide string from the given ANSI string, allocating +// memory using new. The caller is responsible for deleting the return +// value using delete[]. Returns the wide string, or NULL if the +// input is NULL. +LPCWSTR String::AnsiToUtf16(const char* ansi) { + if (!ansi) return NULL; + const int length = strlen(ansi); + const int unicode_length = + MultiByteToWideChar(CP_ACP, 0, ansi, length, + NULL, 0); + WCHAR* unicode = new WCHAR[unicode_length + 1]; + MultiByteToWideChar(CP_ACP, 0, ansi, length, + unicode, unicode_length); + unicode[unicode_length] = 0; + return unicode; +} + +// Creates an ANSI string from the given wide string, allocating +// memory using new. The caller is responsible for deleting the return +// value using delete[]. Returns the ANSI string, or NULL if the +// input is NULL. +const char* String::Utf16ToAnsi(LPCWSTR utf16_str) { + if (!utf16_str) return NULL; + const int ansi_length = + WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, + NULL, 0, NULL, NULL); + char* ansi = new char[ansi_length + 1]; + WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, + ansi, ansi_length, NULL, NULL); + ansi[ansi_length] = 0; + return ansi; +} + +#endif // GTEST_OS_WINDOWS_MOBILE + +// Compares two C strings. Returns true iff they have the same content. +// +// Unlike strcmp(), this function can handle NULL argument(s). A NULL +// C string is considered different to any non-NULL C string, +// including the empty string. +bool String::CStringEquals(const char * lhs, const char * rhs) { + if ( lhs == NULL ) return rhs == NULL; + + if ( rhs == NULL ) return false; + + return strcmp(lhs, rhs) == 0; +} + +#if GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING + +// Converts an array of wide chars to a narrow string using the UTF-8 +// encoding, and streams the result to the given Message object. +static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length, + Message* msg) { + for (size_t i = 0; i != length; ) { // NOLINT + if (wstr[i] != L'\0') { + *msg << WideStringToUtf8(wstr + i, static_cast(length - i)); + while (i != length && wstr[i] != L'\0') + i++; + } else { + *msg << '\0'; + i++; + } + } +} + +#endif // GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING + +} // namespace internal + +// Constructs an empty Message. +// We allocate the stringstream separately because otherwise each use of +// ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's +// stack frame leading to huge stack frames in some cases; gcc does not reuse +// the stack space. +Message::Message() : ss_(new ::std::stringstream) { + // By default, we want there to be enough precision when printing + // a double to a Message. + *ss_ << std::setprecision(std::numeric_limits::digits10 + 2); +} + +// These two overloads allow streaming a wide C string to a Message +// using the UTF-8 encoding. +Message& Message::operator <<(const wchar_t* wide_c_str) { + return *this << internal::String::ShowWideCString(wide_c_str); +} +Message& Message::operator <<(wchar_t* wide_c_str) { + return *this << internal::String::ShowWideCString(wide_c_str); +} + +#if GTEST_HAS_STD_WSTRING +// Converts the given wide string to a narrow string using the UTF-8 +// encoding, and streams the result to this Message object. +Message& Message::operator <<(const ::std::wstring& wstr) { + internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this); + return *this; +} +#endif // GTEST_HAS_STD_WSTRING + +#if GTEST_HAS_GLOBAL_WSTRING +// Converts the given wide string to a narrow string using the UTF-8 +// encoding, and streams the result to this Message object. +Message& Message::operator <<(const ::wstring& wstr) { + internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this); + return *this; +} +#endif // GTEST_HAS_GLOBAL_WSTRING + +// Gets the text streamed to this object so far as an std::string. +// Each '\0' character in the buffer is replaced with "\\0". +std::string Message::GetString() const { + return internal::StringStreamToString(ss_.get()); +} + +// AssertionResult constructors. +// Used in EXPECT_TRUE/FALSE(assertion_result). +AssertionResult::AssertionResult(const AssertionResult& other) + : success_(other.success_), + message_(other.message_.get() != NULL ? + new ::std::string(*other.message_) : + static_cast< ::std::string*>(NULL)) { +} + +// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE. +AssertionResult AssertionResult::operator!() const { + AssertionResult negation(!success_); + if (message_.get() != NULL) + negation << *message_; + return negation; +} + +// Makes a successful assertion result. +AssertionResult AssertionSuccess() { + return AssertionResult(true); +} + +// Makes a failed assertion result. +AssertionResult AssertionFailure() { + return AssertionResult(false); +} + +// Makes a failed assertion result with the given failure message. +// Deprecated; use AssertionFailure() << message. +AssertionResult AssertionFailure(const Message& message) { + return AssertionFailure() << message; +} + +namespace internal { + +// Constructs and returns the message for an equality assertion +// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure. +// +// The first four parameters are the expressions used in the assertion +// and their values, as strings. For example, for ASSERT_EQ(foo, bar) +// where foo is 5 and bar is 6, we have: +// +// expected_expression: "foo" +// actual_expression: "bar" +// expected_value: "5" +// actual_value: "6" +// +// The ignoring_case parameter is true iff the assertion is a +// *_STRCASEEQ*. When it's true, the string " (ignoring case)" will +// be inserted into the message. +AssertionResult EqFailure(const char* expected_expression, + const char* actual_expression, + const std::string& expected_value, + const std::string& actual_value, + bool ignoring_case) { + Message msg; + msg << "Value of: " << actual_expression; + if (actual_value != actual_expression) { + msg << "\n Actual: " << actual_value; + } + + msg << "\nExpected: " << expected_expression; + if (ignoring_case) { + msg << " (ignoring case)"; + } + if (expected_value != expected_expression) { + msg << "\nWhich is: " << expected_value; + } + + return AssertionFailure() << msg; +} + +// Constructs a failure message for Boolean assertions such as EXPECT_TRUE. +std::string GetBoolAssertionFailureMessage( + const AssertionResult& assertion_result, + const char* expression_text, + const char* actual_predicate_value, + const char* expected_predicate_value) { + const char* actual_message = assertion_result.message(); + Message msg; + msg << "Value of: " << expression_text + << "\n Actual: " << actual_predicate_value; + if (actual_message[0] != '\0') + msg << " (" << actual_message << ")"; + msg << "\nExpected: " << expected_predicate_value; + return msg.GetString(); +} + +// Helper function for implementing ASSERT_NEAR. +AssertionResult DoubleNearPredFormat(const char* expr1, + const char* expr2, + const char* abs_error_expr, + double val1, + double val2, + double abs_error) { + const double diff = fabs(val1 - val2); + if (diff <= abs_error) return AssertionSuccess(); + + // TODO(wan): do not print the value of an expression if it's + // already a literal. + return AssertionFailure() + << "The difference between " << expr1 << " and " << expr2 + << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n" + << expr1 << " evaluates to " << val1 << ",\n" + << expr2 << " evaluates to " << val2 << ", and\n" + << abs_error_expr << " evaluates to " << abs_error << "."; +} + + +// Helper template for implementing FloatLE() and DoubleLE(). +template +AssertionResult FloatingPointLE(const char* expr1, + const char* expr2, + RawType val1, + RawType val2) { + // Returns success if val1 is less than val2, + if (val1 < val2) { + return AssertionSuccess(); + } + + // or if val1 is almost equal to val2. + const FloatingPoint lhs(val1), rhs(val2); + if (lhs.AlmostEquals(rhs)) { + return AssertionSuccess(); + } + + // Note that the above two checks will both fail if either val1 or + // val2 is NaN, as the IEEE floating-point standard requires that + // any predicate involving a NaN must return false. + + ::std::stringstream val1_ss; + val1_ss << std::setprecision(std::numeric_limits::digits10 + 2) + << val1; + + ::std::stringstream val2_ss; + val2_ss << std::setprecision(std::numeric_limits::digits10 + 2) + << val2; + + return AssertionFailure() + << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n" + << " Actual: " << StringStreamToString(&val1_ss) << " vs " + << StringStreamToString(&val2_ss); +} + +} // namespace internal + +// Asserts that val1 is less than, or almost equal to, val2. Fails +// otherwise. In particular, it fails if either val1 or val2 is NaN. +AssertionResult FloatLE(const char* expr1, const char* expr2, + float val1, float val2) { + return internal::FloatingPointLE(expr1, expr2, val1, val2); +} + +// Asserts that val1 is less than, or almost equal to, val2. Fails +// otherwise. In particular, it fails if either val1 or val2 is NaN. +AssertionResult DoubleLE(const char* expr1, const char* expr2, + double val1, double val2) { + return internal::FloatingPointLE(expr1, expr2, val1, val2); +} + +namespace internal { + +// The helper function for {ASSERT|EXPECT}_EQ with int or enum +// arguments. +AssertionResult CmpHelperEQ(const char* expected_expression, + const char* actual_expression, + BiggestInt expected, + BiggestInt actual) { + if (expected == actual) { + return AssertionSuccess(); + } + + return EqFailure(expected_expression, + actual_expression, + FormatForComparisonFailureMessage(expected, actual), + FormatForComparisonFailureMessage(actual, expected), + false); +} + +// A macro for implementing the helper functions needed to implement +// ASSERT_?? and EXPECT_?? with integer or enum arguments. It is here +// just to avoid copy-and-paste of similar code. +#define GTEST_IMPL_CMP_HELPER_(op_name, op)\ +AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \ + BiggestInt val1, BiggestInt val2) {\ + if (val1 op val2) {\ + return AssertionSuccess();\ + } else {\ + return AssertionFailure() \ + << "Expected: (" << expr1 << ") " #op " (" << expr2\ + << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\ + << " vs " << FormatForComparisonFailureMessage(val2, val1);\ + }\ +} + +// Implements the helper function for {ASSERT|EXPECT}_NE with int or +// enum arguments. +GTEST_IMPL_CMP_HELPER_(NE, !=) +// Implements the helper function for {ASSERT|EXPECT}_LE with int or +// enum arguments. +GTEST_IMPL_CMP_HELPER_(LE, <=) +// Implements the helper function for {ASSERT|EXPECT}_LT with int or +// enum arguments. +GTEST_IMPL_CMP_HELPER_(LT, < ) +// Implements the helper function for {ASSERT|EXPECT}_GE with int or +// enum arguments. +GTEST_IMPL_CMP_HELPER_(GE, >=) +// Implements the helper function for {ASSERT|EXPECT}_GT with int or +// enum arguments. +GTEST_IMPL_CMP_HELPER_(GT, > ) + +#undef GTEST_IMPL_CMP_HELPER_ + +// The helper function for {ASSERT|EXPECT}_STREQ. +AssertionResult CmpHelperSTREQ(const char* expected_expression, + const char* actual_expression, + const char* expected, + const char* actual) { + if (String::CStringEquals(expected, actual)) { + return AssertionSuccess(); + } + + return EqFailure(expected_expression, + actual_expression, + PrintToString(expected), + PrintToString(actual), + false); +} + +// The helper function for {ASSERT|EXPECT}_STRCASEEQ. +AssertionResult CmpHelperSTRCASEEQ(const char* expected_expression, + const char* actual_expression, + const char* expected, + const char* actual) { + if (String::CaseInsensitiveCStringEquals(expected, actual)) { + return AssertionSuccess(); + } + + return EqFailure(expected_expression, + actual_expression, + PrintToString(expected), + PrintToString(actual), + true); +} + +// The helper function for {ASSERT|EXPECT}_STRNE. +AssertionResult CmpHelperSTRNE(const char* s1_expression, + const char* s2_expression, + const char* s1, + const char* s2) { + if (!String::CStringEquals(s1, s2)) { + return AssertionSuccess(); + } else { + return AssertionFailure() << "Expected: (" << s1_expression << ") != (" + << s2_expression << "), actual: \"" + << s1 << "\" vs \"" << s2 << "\""; + } +} + +// The helper function for {ASSERT|EXPECT}_STRCASENE. +AssertionResult CmpHelperSTRCASENE(const char* s1_expression, + const char* s2_expression, + const char* s1, + const char* s2) { + if (!String::CaseInsensitiveCStringEquals(s1, s2)) { + return AssertionSuccess(); + } else { + return AssertionFailure() + << "Expected: (" << s1_expression << ") != (" + << s2_expression << ") (ignoring case), actual: \"" + << s1 << "\" vs \"" << s2 << "\""; + } +} + +} // namespace internal + +namespace { + +// Helper functions for implementing IsSubString() and IsNotSubstring(). + +// This group of overloaded functions return true iff needle is a +// substring of haystack. NULL is considered a substring of itself +// only. + +bool IsSubstringPred(const char* needle, const char* haystack) { + if (needle == NULL || haystack == NULL) + return needle == haystack; + + return strstr(haystack, needle) != NULL; +} + +bool IsSubstringPred(const wchar_t* needle, const wchar_t* haystack) { + if (needle == NULL || haystack == NULL) + return needle == haystack; + + return wcsstr(haystack, needle) != NULL; +} + +// StringType here can be either ::std::string or ::std::wstring. +template +bool IsSubstringPred(const StringType& needle, + const StringType& haystack) { + return haystack.find(needle) != StringType::npos; +} + +// This function implements either IsSubstring() or IsNotSubstring(), +// depending on the value of the expected_to_be_substring parameter. +// StringType here can be const char*, const wchar_t*, ::std::string, +// or ::std::wstring. +template +AssertionResult IsSubstringImpl( + bool expected_to_be_substring, + const char* needle_expr, const char* haystack_expr, + const StringType& needle, const StringType& haystack) { + if (IsSubstringPred(needle, haystack) == expected_to_be_substring) + return AssertionSuccess(); + + const bool is_wide_string = sizeof(needle[0]) > 1; + const char* const begin_string_quote = is_wide_string ? "L\"" : "\""; + return AssertionFailure() + << "Value of: " << needle_expr << "\n" + << " Actual: " << begin_string_quote << needle << "\"\n" + << "Expected: " << (expected_to_be_substring ? "" : "not ") + << "a substring of " << haystack_expr << "\n" + << "Which is: " << begin_string_quote << haystack << "\""; +} + +} // namespace + +// IsSubstring() and IsNotSubstring() check whether needle is a +// substring of haystack (NULL is considered a substring of itself +// only), and return an appropriate error message when they fail. + +AssertionResult IsSubstring( + const char* needle_expr, const char* haystack_expr, + const char* needle, const char* haystack) { + return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); +} + +AssertionResult IsSubstring( + const char* needle_expr, const char* haystack_expr, + const wchar_t* needle, const wchar_t* haystack) { + return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); +} + +AssertionResult IsNotSubstring( + const char* needle_expr, const char* haystack_expr, + const char* needle, const char* haystack) { + return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); +} + +AssertionResult IsNotSubstring( + const char* needle_expr, const char* haystack_expr, + const wchar_t* needle, const wchar_t* haystack) { + return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); +} + +AssertionResult IsSubstring( + const char* needle_expr, const char* haystack_expr, + const ::std::string& needle, const ::std::string& haystack) { + return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); +} + +AssertionResult IsNotSubstring( + const char* needle_expr, const char* haystack_expr, + const ::std::string& needle, const ::std::string& haystack) { + return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); +} + +#if GTEST_HAS_STD_WSTRING +AssertionResult IsSubstring( + const char* needle_expr, const char* haystack_expr, + const ::std::wstring& needle, const ::std::wstring& haystack) { + return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); +} + +AssertionResult IsNotSubstring( + const char* needle_expr, const char* haystack_expr, + const ::std::wstring& needle, const ::std::wstring& haystack) { + return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); +} +#endif // GTEST_HAS_STD_WSTRING + +namespace internal { + +#if GTEST_OS_WINDOWS + +namespace { + +// Helper function for IsHRESULT{SuccessFailure} predicates +AssertionResult HRESULTFailureHelper(const char* expr, + const char* expected, + long hr) { // NOLINT +# if GTEST_OS_WINDOWS_MOBILE + + // Windows CE doesn't support FormatMessage. + const char error_text[] = ""; + +# else + + // Looks up the human-readable system message for the HRESULT code + // and since we're not passing any params to FormatMessage, we don't + // want inserts expanded. + const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS; + const DWORD kBufSize = 4096; + // Gets the system's human readable message string for this HRESULT. + char error_text[kBufSize] = { '\0' }; + DWORD message_length = ::FormatMessageA(kFlags, + 0, // no source, we're asking system + hr, // the error + 0, // no line width restrictions + error_text, // output buffer + kBufSize, // buf size + NULL); // no arguments for inserts + // Trims tailing white space (FormatMessage leaves a trailing CR-LF) + for (; message_length && IsSpace(error_text[message_length - 1]); + --message_length) { + error_text[message_length - 1] = '\0'; + } + +# endif // GTEST_OS_WINDOWS_MOBILE + + const std::string error_hex("0x" + String::FormatHexInt(hr)); + return ::testing::AssertionFailure() + << "Expected: " << expr << " " << expected << ".\n" + << " Actual: " << error_hex << " " << error_text << "\n"; +} + +} // namespace + +AssertionResult IsHRESULTSuccess(const char* expr, long hr) { // NOLINT + if (SUCCEEDED(hr)) { + return AssertionSuccess(); + } + return HRESULTFailureHelper(expr, "succeeds", hr); +} + +AssertionResult IsHRESULTFailure(const char* expr, long hr) { // NOLINT + if (FAILED(hr)) { + return AssertionSuccess(); + } + return HRESULTFailureHelper(expr, "fails", hr); +} + +#endif // GTEST_OS_WINDOWS + +// Utility functions for encoding Unicode text (wide strings) in +// UTF-8. + +// A Unicode code-point can have upto 21 bits, and is encoded in UTF-8 +// like this: +// +// Code-point length Encoding +// 0 - 7 bits 0xxxxxxx +// 8 - 11 bits 110xxxxx 10xxxxxx +// 12 - 16 bits 1110xxxx 10xxxxxx 10xxxxxx +// 17 - 21 bits 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx + +// The maximum code-point a one-byte UTF-8 sequence can represent. +const UInt32 kMaxCodePoint1 = (static_cast(1) << 7) - 1; + +// The maximum code-point a two-byte UTF-8 sequence can represent. +const UInt32 kMaxCodePoint2 = (static_cast(1) << (5 + 6)) - 1; + +// The maximum code-point a three-byte UTF-8 sequence can represent. +const UInt32 kMaxCodePoint3 = (static_cast(1) << (4 + 2*6)) - 1; + +// The maximum code-point a four-byte UTF-8 sequence can represent. +const UInt32 kMaxCodePoint4 = (static_cast(1) << (3 + 3*6)) - 1; + +// Chops off the n lowest bits from a bit pattern. Returns the n +// lowest bits. As a side effect, the original bit pattern will be +// shifted to the right by n bits. +inline UInt32 ChopLowBits(UInt32* bits, int n) { + const UInt32 low_bits = *bits & ((static_cast(1) << n) - 1); + *bits >>= n; + return low_bits; +} + +// Converts a Unicode code point to a narrow string in UTF-8 encoding. +// code_point parameter is of type UInt32 because wchar_t may not be +// wide enough to contain a code point. +// If the code_point is not a valid Unicode code point +// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted +// to "(Invalid Unicode 0xXXXXXXXX)". +std::string CodePointToUtf8(UInt32 code_point) { + if (code_point > kMaxCodePoint4) { + return "(Invalid Unicode 0x" + String::FormatHexInt(code_point) + ")"; + } + + char str[5]; // Big enough for the largest valid code point. + if (code_point <= kMaxCodePoint1) { + str[1] = '\0'; + str[0] = static_cast(code_point); // 0xxxxxxx + } else if (code_point <= kMaxCodePoint2) { + str[2] = '\0'; + str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx + str[0] = static_cast(0xC0 | code_point); // 110xxxxx + } else if (code_point <= kMaxCodePoint3) { + str[3] = '\0'; + str[2] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx + str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx + str[0] = static_cast(0xE0 | code_point); // 1110xxxx + } else { // code_point <= kMaxCodePoint4 + str[4] = '\0'; + str[3] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx + str[2] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx + str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx + str[0] = static_cast(0xF0 | code_point); // 11110xxx + } + return str; +} + +// The following two functions only make sense if the the system +// uses UTF-16 for wide string encoding. All supported systems +// with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16. + +// Determines if the arguments constitute UTF-16 surrogate pair +// and thus should be combined into a single Unicode code point +// using CreateCodePointFromUtf16SurrogatePair. +inline bool IsUtf16SurrogatePair(wchar_t first, wchar_t second) { + return sizeof(wchar_t) == 2 && + (first & 0xFC00) == 0xD800 && (second & 0xFC00) == 0xDC00; +} + +// Creates a Unicode code point from UTF16 surrogate pair. +inline UInt32 CreateCodePointFromUtf16SurrogatePair(wchar_t first, + wchar_t second) { + const UInt32 mask = (1 << 10) - 1; + return (sizeof(wchar_t) == 2) ? + (((first & mask) << 10) | (second & mask)) + 0x10000 : + // This function should not be called when the condition is + // false, but we provide a sensible default in case it is. + static_cast(first); +} + +// Converts a wide string to a narrow string in UTF-8 encoding. +// The wide string is assumed to have the following encoding: +// UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS) +// UTF-32 if sizeof(wchar_t) == 4 (on Linux) +// Parameter str points to a null-terminated wide string. +// Parameter num_chars may additionally limit the number +// of wchar_t characters processed. -1 is used when the entire string +// should be processed. +// If the string contains code points that are not valid Unicode code points +// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output +// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding +// and contains invalid UTF-16 surrogate pairs, values in those pairs +// will be encoded as individual Unicode characters from Basic Normal Plane. +std::string WideStringToUtf8(const wchar_t* str, int num_chars) { + if (num_chars == -1) + num_chars = static_cast(wcslen(str)); + + ::std::stringstream stream; + for (int i = 0; i < num_chars; ++i) { + UInt32 unicode_code_point; + + if (str[i] == L'\0') { + break; + } else if (i + 1 < num_chars && IsUtf16SurrogatePair(str[i], str[i + 1])) { + unicode_code_point = CreateCodePointFromUtf16SurrogatePair(str[i], + str[i + 1]); + i++; + } else { + unicode_code_point = static_cast(str[i]); + } + + stream << CodePointToUtf8(unicode_code_point); + } + return StringStreamToString(&stream); +} + +// Converts a wide C string to an std::string using the UTF-8 encoding. +// NULL will be converted to "(null)". +std::string String::ShowWideCString(const wchar_t * wide_c_str) { + if (wide_c_str == NULL) return "(null)"; + + return internal::WideStringToUtf8(wide_c_str, -1); +} + +// Compares two wide C strings. Returns true iff they have the same +// content. +// +// Unlike wcscmp(), this function can handle NULL argument(s). A NULL +// C string is considered different to any non-NULL C string, +// including the empty string. +bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) { + if (lhs == NULL) return rhs == NULL; + + if (rhs == NULL) return false; + + return wcscmp(lhs, rhs) == 0; +} + +// Helper function for *_STREQ on wide strings. +AssertionResult CmpHelperSTREQ(const char* expected_expression, + const char* actual_expression, + const wchar_t* expected, + const wchar_t* actual) { + if (String::WideCStringEquals(expected, actual)) { + return AssertionSuccess(); + } + + return EqFailure(expected_expression, + actual_expression, + PrintToString(expected), + PrintToString(actual), + false); +} + +// Helper function for *_STRNE on wide strings. +AssertionResult CmpHelperSTRNE(const char* s1_expression, + const char* s2_expression, + const wchar_t* s1, + const wchar_t* s2) { + if (!String::WideCStringEquals(s1, s2)) { + return AssertionSuccess(); + } + + return AssertionFailure() << "Expected: (" << s1_expression << ") != (" + << s2_expression << "), actual: " + << PrintToString(s1) + << " vs " << PrintToString(s2); +} + +// Compares two C strings, ignoring case. Returns true iff they have +// the same content. +// +// Unlike strcasecmp(), this function can handle NULL argument(s). A +// NULL C string is considered different to any non-NULL C string, +// including the empty string. +bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) { + if (lhs == NULL) + return rhs == NULL; + if (rhs == NULL) + return false; + return posix::StrCaseCmp(lhs, rhs) == 0; +} + + // Compares two wide C strings, ignoring case. Returns true iff they + // have the same content. + // + // Unlike wcscasecmp(), this function can handle NULL argument(s). + // A NULL C string is considered different to any non-NULL wide C string, + // including the empty string. + // NB: The implementations on different platforms slightly differ. + // On windows, this method uses _wcsicmp which compares according to LC_CTYPE + // environment variable. On GNU platform this method uses wcscasecmp + // which compares according to LC_CTYPE category of the current locale. + // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the + // current locale. +bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs, + const wchar_t* rhs) { + if (lhs == NULL) return rhs == NULL; + + if (rhs == NULL) return false; + +#if GTEST_OS_WINDOWS + return _wcsicmp(lhs, rhs) == 0; +#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID + return wcscasecmp(lhs, rhs) == 0; +#else + // Android, Mac OS X and Cygwin don't define wcscasecmp. + // Other unknown OSes may not define it either. + wint_t left, right; + do { + left = towlower(*lhs++); + right = towlower(*rhs++); + } while (left && left == right); + return left == right; +#endif // OS selector +} + +// Returns true iff str ends with the given suffix, ignoring case. +// Any string is considered to end with an empty suffix. +bool String::EndsWithCaseInsensitive( + const std::string& str, const std::string& suffix) { + const size_t str_len = str.length(); + const size_t suffix_len = suffix.length(); + return (str_len >= suffix_len) && + CaseInsensitiveCStringEquals(str.c_str() + str_len - suffix_len, + suffix.c_str()); +} + +// Formats an int value as "%02d". +std::string String::FormatIntWidth2(int value) { + std::stringstream ss; + ss << std::setfill('0') << std::setw(2) << value; + return ss.str(); +} + +// Formats an int value as "%X". +std::string String::FormatHexInt(int value) { + std::stringstream ss; + ss << std::hex << std::uppercase << value; + return ss.str(); +} + +// Formats a byte as "%02X". +std::string String::FormatByte(unsigned char value) { + std::stringstream ss; + ss << std::setfill('0') << std::setw(2) << std::hex << std::uppercase + << static_cast(value); + return ss.str(); +} + +// Converts the buffer in a stringstream to an std::string, converting NUL +// bytes to "\\0" along the way. +std::string StringStreamToString(::std::stringstream* ss) { + const ::std::string& str = ss->str(); + const char* const start = str.c_str(); + const char* const end = start + str.length(); + + std::string result; + result.reserve(2 * (end - start)); + for (const char* ch = start; ch != end; ++ch) { + if (*ch == '\0') { + result += "\\0"; // Replaces NUL with "\\0"; + } else { + result += *ch; + } + } + + return result; +} + +// Appends the user-supplied message to the Google-Test-generated message. +std::string AppendUserMessage(const std::string& gtest_msg, + const Message& user_msg) { + // Appends the user message if it's non-empty. + const std::string user_msg_string = user_msg.GetString(); + if (user_msg_string.empty()) { + return gtest_msg; + } + + return gtest_msg + "\n" + user_msg_string; +} + +} // namespace internal + +// class TestResult + +// Creates an empty TestResult. +TestResult::TestResult() + : death_test_count_(0), + elapsed_time_(0) { +} + +// D'tor. +TestResult::~TestResult() { +} + +// Returns the i-th test part result among all the results. i can +// range from 0 to total_part_count() - 1. If i is not in that range, +// aborts the program. +const TestPartResult& TestResult::GetTestPartResult(int i) const { + if (i < 0 || i >= total_part_count()) + internal::posix::Abort(); + return test_part_results_.at(i); +} + +// Returns the i-th test property. i can range from 0 to +// test_property_count() - 1. If i is not in that range, aborts the +// program. +const TestProperty& TestResult::GetTestProperty(int i) const { + if (i < 0 || i >= test_property_count()) + internal::posix::Abort(); + return test_properties_.at(i); +} + +// Clears the test part results. +void TestResult::ClearTestPartResults() { + test_part_results_.clear(); +} + +// Adds a test part result to the list. +void TestResult::AddTestPartResult(const TestPartResult& test_part_result) { + test_part_results_.push_back(test_part_result); +} + +// Adds a test property to the list. If a property with the same key as the +// supplied property is already represented, the value of this test_property +// replaces the old value for that key. +void TestResult::RecordProperty(const std::string& xml_element, + const TestProperty& test_property) { + if (!ValidateTestProperty(xml_element, test_property)) { + return; + } + internal::MutexLock lock(&test_properites_mutex_); + const std::vector::iterator property_with_matching_key = + std::find_if(test_properties_.begin(), test_properties_.end(), + internal::TestPropertyKeyIs(test_property.key())); + if (property_with_matching_key == test_properties_.end()) { + test_properties_.push_back(test_property); + return; + } + property_with_matching_key->SetValue(test_property.value()); +} + +// The list of reserved attributes used in the element of XML +// output. +static const char* const kReservedTestSuitesAttributes[] = { + "disabled", + "errors", + "failures", + "name", + "random_seed", + "tests", + "time", + "timestamp" +}; + +// The list of reserved attributes used in the element of XML +// output. +static const char* const kReservedTestSuiteAttributes[] = { + "disabled", + "errors", + "failures", + "name", + "tests", + "time" +}; + +// The list of reserved attributes used in the element of XML output. +static const char* const kReservedTestCaseAttributes[] = { + "classname", + "name", + "status", + "time", + "type_param", + "value_param" +}; + +template +std::vector ArrayAsVector(const char* const (&array)[kSize]) { + return std::vector(array, array + kSize); +} + +static std::vector GetReservedAttributesForElement( + const std::string& xml_element) { + if (xml_element == "testsuites") { + return ArrayAsVector(kReservedTestSuitesAttributes); + } else if (xml_element == "testsuite") { + return ArrayAsVector(kReservedTestSuiteAttributes); + } else if (xml_element == "testcase") { + return ArrayAsVector(kReservedTestCaseAttributes); + } else { + GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element; + } + // This code is unreachable but some compilers may not realizes that. + return std::vector(); +} + +static std::string FormatWordList(const std::vector& words) { + Message word_list; + for (size_t i = 0; i < words.size(); ++i) { + if (i > 0 && words.size() > 2) { + word_list << ", "; + } + if (i == words.size() - 1) { + word_list << "and "; + } + word_list << "'" << words[i] << "'"; + } + return word_list.GetString(); +} + +bool ValidateTestPropertyName(const std::string& property_name, + const std::vector& reserved_names) { + if (std::find(reserved_names.begin(), reserved_names.end(), property_name) != + reserved_names.end()) { + ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name + << " (" << FormatWordList(reserved_names) + << " are reserved by " << GTEST_NAME_ << ")"; + return false; + } + return true; +} + +// Adds a failure if the key is a reserved attribute of the element named +// xml_element. Returns true if the property is valid. +bool TestResult::ValidateTestProperty(const std::string& xml_element, + const TestProperty& test_property) { + return ValidateTestPropertyName(test_property.key(), + GetReservedAttributesForElement(xml_element)); +} + +// Clears the object. +void TestResult::Clear() { + test_part_results_.clear(); + test_properties_.clear(); + death_test_count_ = 0; + elapsed_time_ = 0; +} + +// Returns true iff the test failed. +bool TestResult::Failed() const { + for (int i = 0; i < total_part_count(); ++i) { + if (GetTestPartResult(i).failed()) + return true; + } + return false; +} + +// Returns true iff the test part fatally failed. +static bool TestPartFatallyFailed(const TestPartResult& result) { + return result.fatally_failed(); +} + +// Returns true iff the test fatally failed. +bool TestResult::HasFatalFailure() const { + return CountIf(test_part_results_, TestPartFatallyFailed) > 0; +} + +// Returns true iff the test part non-fatally failed. +static bool TestPartNonfatallyFailed(const TestPartResult& result) { + return result.nonfatally_failed(); +} + +// Returns true iff the test has a non-fatal failure. +bool TestResult::HasNonfatalFailure() const { + return CountIf(test_part_results_, TestPartNonfatallyFailed) > 0; +} + +// Gets the number of all test parts. This is the sum of the number +// of successful test parts and the number of failed test parts. +int TestResult::total_part_count() const { + return static_cast(test_part_results_.size()); +} + +// Returns the number of the test properties. +int TestResult::test_property_count() const { + return static_cast(test_properties_.size()); +} + +// class Test + +// Creates a Test object. + +// The c'tor saves the values of all Google Test flags. +Test::Test() + : gtest_flag_saver_(new internal::GTestFlagSaver) { +} + +// The d'tor restores the values of all Google Test flags. +Test::~Test() { + delete gtest_flag_saver_; +} + +// Sets up the test fixture. +// +// A sub-class may override this. +void Test::SetUp() { +} + +// Tears down the test fixture. +// +// A sub-class may override this. +void Test::TearDown() { +} + +// Allows user supplied key value pairs to be recorded for later output. +void Test::RecordProperty(const std::string& key, const std::string& value) { + UnitTest::GetInstance()->RecordProperty(key, value); +} + +// Allows user supplied key value pairs to be recorded for later output. +void Test::RecordProperty(const std::string& key, int value) { + Message value_message; + value_message << value; + RecordProperty(key, value_message.GetString().c_str()); +} + +namespace internal { + +void ReportFailureInUnknownLocation(TestPartResult::Type result_type, + const std::string& message) { + // This function is a friend of UnitTest and as such has access to + // AddTestPartResult. + UnitTest::GetInstance()->AddTestPartResult( + result_type, + NULL, // No info about the source file where the exception occurred. + -1, // We have no info on which line caused the exception. + message, + ""); // No stack trace, either. +} + +} // namespace internal + +// Google Test requires all tests in the same test case to use the same test +// fixture class. This function checks if the current test has the +// same fixture class as the first test in the current test case. If +// yes, it returns true; otherwise it generates a Google Test failure and +// returns false. +bool Test::HasSameFixtureClass() { + internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); + const TestCase* const test_case = impl->current_test_case(); + + // Info about the first test in the current test case. + const TestInfo* const first_test_info = test_case->test_info_list()[0]; + const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_; + const char* const first_test_name = first_test_info->name(); + + // Info about the current test. + const TestInfo* const this_test_info = impl->current_test_info(); + const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_; + const char* const this_test_name = this_test_info->name(); + + if (this_fixture_id != first_fixture_id) { + // Is the first test defined using TEST? + const bool first_is_TEST = first_fixture_id == internal::GetTestTypeId(); + // Is this test defined using TEST? + const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId(); + + if (first_is_TEST || this_is_TEST) { + // The user mixed TEST and TEST_F in this test case - we'll tell + // him/her how to fix it. + + // Gets the name of the TEST and the name of the TEST_F. Note + // that first_is_TEST and this_is_TEST cannot both be true, as + // the fixture IDs are different for the two tests. + const char* const TEST_name = + first_is_TEST ? first_test_name : this_test_name; + const char* const TEST_F_name = + first_is_TEST ? this_test_name : first_test_name; + + ADD_FAILURE() + << "All tests in the same test case must use the same test fixture\n" + << "class, so mixing TEST_F and TEST in the same test case is\n" + << "illegal. In test case " << this_test_info->test_case_name() + << ",\n" + << "test " << TEST_F_name << " is defined using TEST_F but\n" + << "test " << TEST_name << " is defined using TEST. You probably\n" + << "want to change the TEST to TEST_F or move it to another test\n" + << "case."; + } else { + // The user defined two fixture classes with the same name in + // two namespaces - we'll tell him/her how to fix it. + ADD_FAILURE() + << "All tests in the same test case must use the same test fixture\n" + << "class. However, in test case " + << this_test_info->test_case_name() << ",\n" + << "you defined test " << first_test_name + << " and test " << this_test_name << "\n" + << "using two different test fixture classes. This can happen if\n" + << "the two classes are from different namespaces or translation\n" + << "units and have the same name. You should probably rename one\n" + << "of the classes to put the tests into different test cases."; + } + return false; + } + + return true; +} + +#if GTEST_HAS_SEH + +// Adds an "exception thrown" fatal failure to the current test. This +// function returns its result via an output parameter pointer because VC++ +// prohibits creation of objects with destructors on stack in functions +// using __try (see error C2712). +static std::string* FormatSehExceptionMessage(DWORD exception_code, + const char* location) { + Message message; + message << "SEH exception with code 0x" << std::setbase(16) << + exception_code << std::setbase(10) << " thrown in " << location << "."; + + return new std::string(message.GetString()); +} + +#endif // GTEST_HAS_SEH + +namespace internal { + +#if GTEST_HAS_EXCEPTIONS + +// Adds an "exception thrown" fatal failure to the current test. +static std::string FormatCxxExceptionMessage(const char* description, + const char* location) { + Message message; + if (description != NULL) { + message << "C++ exception with description \"" << description << "\""; + } else { + message << "Unknown C++ exception"; + } + message << " thrown in " << location << "."; + + return message.GetString(); +} + +static std::string PrintTestPartResultToString( + const TestPartResult& test_part_result); + +GoogleTestFailureException::GoogleTestFailureException( + const TestPartResult& failure) + : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {} + +#endif // GTEST_HAS_EXCEPTIONS + +// We put these helper functions in the internal namespace as IBM's xlC +// compiler rejects the code if they were declared static. + +// Runs the given method and handles SEH exceptions it throws, when +// SEH is supported; returns the 0-value for type Result in case of an +// SEH exception. (Microsoft compilers cannot handle SEH and C++ +// exceptions in the same function. Therefore, we provide a separate +// wrapper function for handling SEH exceptions.) +template +Result HandleSehExceptionsInMethodIfSupported( + T* object, Result (T::*method)(), const char* location) { +#if GTEST_HAS_SEH + __try { + return (object->*method)(); + } __except (internal::UnitTestOptions::GTestShouldProcessSEH( // NOLINT + GetExceptionCode())) { + // We create the exception message on the heap because VC++ prohibits + // creation of objects with destructors on stack in functions using __try + // (see error C2712). + std::string* exception_message = FormatSehExceptionMessage( + GetExceptionCode(), location); + internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure, + *exception_message); + delete exception_message; + return static_cast(0); + } +#else + (void)location; + return (object->*method)(); +#endif // GTEST_HAS_SEH +} + +// Runs the given method and catches and reports C++ and/or SEH-style +// exceptions, if they are supported; returns the 0-value for type +// Result in case of an SEH exception. +template +Result HandleExceptionsInMethodIfSupported( + T* object, Result (T::*method)(), const char* location) { + // NOTE: The user code can affect the way in which Google Test handles + // exceptions by setting GTEST_FLAG(catch_exceptions), but only before + // RUN_ALL_TESTS() starts. It is technically possible to check the flag + // after the exception is caught and either report or re-throw the + // exception based on the flag's value: + // + // try { + // // Perform the test method. + // } catch (...) { + // if (GTEST_FLAG(catch_exceptions)) + // // Report the exception as failure. + // else + // throw; // Re-throws the original exception. + // } + // + // However, the purpose of this flag is to allow the program to drop into + // the debugger when the exception is thrown. On most platforms, once the + // control enters the catch block, the exception origin information is + // lost and the debugger will stop the program at the point of the + // re-throw in this function -- instead of at the point of the original + // throw statement in the code under test. For this reason, we perform + // the check early, sacrificing the ability to affect Google Test's + // exception handling in the method where the exception is thrown. + if (internal::GetUnitTestImpl()->catch_exceptions()) { +#if GTEST_HAS_EXCEPTIONS + try { + return HandleSehExceptionsInMethodIfSupported(object, method, location); + } catch (const internal::GoogleTestFailureException&) { // NOLINT + // This exception type can only be thrown by a failed Google + // Test assertion with the intention of letting another testing + // framework catch it. Therefore we just re-throw it. + throw; + } catch (const std::exception& e) { // NOLINT + internal::ReportFailureInUnknownLocation( + TestPartResult::kFatalFailure, + FormatCxxExceptionMessage(e.what(), location)); + } catch (...) { // NOLINT + internal::ReportFailureInUnknownLocation( + TestPartResult::kFatalFailure, + FormatCxxExceptionMessage(NULL, location)); + } + return static_cast(0); +#else + return HandleSehExceptionsInMethodIfSupported(object, method, location); +#endif // GTEST_HAS_EXCEPTIONS + } else { + return (object->*method)(); + } +} + +} // namespace internal + +// Runs the test and updates the test result. +void Test::Run() { + if (!HasSameFixtureClass()) return; + + internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); + impl->os_stack_trace_getter()->UponLeavingGTest(); + internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()"); + // We will run the test only if SetUp() was successful. + if (!HasFatalFailure()) { + impl->os_stack_trace_getter()->UponLeavingGTest(); + internal::HandleExceptionsInMethodIfSupported( + this, &Test::TestBody, "the test body"); + } + + // However, we want to clean up as much as possible. Hence we will + // always call TearDown(), even if SetUp() or the test body has + // failed. + impl->os_stack_trace_getter()->UponLeavingGTest(); + internal::HandleExceptionsInMethodIfSupported( + this, &Test::TearDown, "TearDown()"); +} + +// Returns true iff the current test has a fatal failure. +bool Test::HasFatalFailure() { + return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure(); +} + +// Returns true iff the current test has a non-fatal failure. +bool Test::HasNonfatalFailure() { + return internal::GetUnitTestImpl()->current_test_result()-> + HasNonfatalFailure(); +} + +// class TestInfo + +// Constructs a TestInfo object. It assumes ownership of the test factory +// object. +TestInfo::TestInfo(const std::string& a_test_case_name, + const std::string& a_name, + const char* a_type_param, + const char* a_value_param, + internal::TypeId fixture_class_id, + internal::TestFactoryBase* factory) + : test_case_name_(a_test_case_name), + name_(a_name), + type_param_(a_type_param ? new std::string(a_type_param) : NULL), + value_param_(a_value_param ? new std::string(a_value_param) : NULL), + fixture_class_id_(fixture_class_id), + should_run_(false), + is_disabled_(false), + matches_filter_(false), + factory_(factory), + result_() {} + +// Destructs a TestInfo object. +TestInfo::~TestInfo() { delete factory_; } + +namespace internal { + +// Creates a new TestInfo object and registers it with Google Test; +// returns the created object. +// +// Arguments: +// +// test_case_name: name of the test case +// name: name of the test +// type_param: the name of the test's type parameter, or NULL if +// this is not a typed or a type-parameterized test. +// value_param: text representation of the test's value parameter, +// or NULL if this is not a value-parameterized test. +// fixture_class_id: ID of the test fixture class +// set_up_tc: pointer to the function that sets up the test case +// tear_down_tc: pointer to the function that tears down the test case +// factory: pointer to the factory that creates a test object. +// The newly created TestInfo instance will assume +// ownership of the factory object. +TestInfo* MakeAndRegisterTestInfo( + const char* test_case_name, + const char* name, + const char* type_param, + const char* value_param, + TypeId fixture_class_id, + SetUpTestCaseFunc set_up_tc, + TearDownTestCaseFunc tear_down_tc, + TestFactoryBase* factory) { + TestInfo* const test_info = + new TestInfo(test_case_name, name, type_param, value_param, + fixture_class_id, factory); + GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info); + return test_info; +} + +#if GTEST_HAS_PARAM_TEST +void ReportInvalidTestCaseType(const char* test_case_name, + const char* file, int line) { + Message errors; + errors + << "Attempted redefinition of test case " << test_case_name << ".\n" + << "All tests in the same test case must use the same test fixture\n" + << "class. However, in test case " << test_case_name << ", you tried\n" + << "to define a test using a fixture class different from the one\n" + << "used earlier. This can happen if the two fixture classes are\n" + << "from different namespaces and have the same name. You should\n" + << "probably rename one of the classes to put the tests into different\n" + << "test cases."; + + fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(), + errors.GetString().c_str()); +} +#endif // GTEST_HAS_PARAM_TEST + +} // namespace internal + +namespace { + +// A predicate that checks the test name of a TestInfo against a known +// value. +// +// This is used for implementation of the TestCase class only. We put +// it in the anonymous namespace to prevent polluting the outer +// namespace. +// +// TestNameIs is copyable. +class TestNameIs { + public: + // Constructor. + // + // TestNameIs has NO default constructor. + explicit TestNameIs(const char* name) + : name_(name) {} + + // Returns true iff the test name of test_info matches name_. + bool operator()(const TestInfo * test_info) const { + return test_info && test_info->name() == name_; + } + + private: + std::string name_; +}; + +} // namespace + +namespace internal { + +// This method expands all parameterized tests registered with macros TEST_P +// and INSTANTIATE_TEST_CASE_P into regular tests and registers those. +// This will be done just once during the program runtime. +void UnitTestImpl::RegisterParameterizedTests() { +#if GTEST_HAS_PARAM_TEST + if (!parameterized_tests_registered_) { + parameterized_test_registry_.RegisterTests(); + parameterized_tests_registered_ = true; + } +#endif +} + +} // namespace internal + +// Creates the test object, runs it, records its result, and then +// deletes it. +void TestInfo::Run() { + if (!should_run_) return; + + // Tells UnitTest where to store test result. + internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); + impl->set_current_test_info(this); + + TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater(); + + // Notifies the unit test event listeners that a test is about to start. + repeater->OnTestStart(*this); + + const TimeInMillis start = internal::GetTimeInMillis(); + + impl->os_stack_trace_getter()->UponLeavingGTest(); + + // Creates the test object. + Test* const test = internal::HandleExceptionsInMethodIfSupported( + factory_, &internal::TestFactoryBase::CreateTest, + "the test fixture's constructor"); + + // Runs the test only if the test object was created and its + // constructor didn't generate a fatal failure. + if ((test != NULL) && !Test::HasFatalFailure()) { + // This doesn't throw as all user code that can throw are wrapped into + // exception handling code. + test->Run(); + } + + // Deletes the test object. + impl->os_stack_trace_getter()->UponLeavingGTest(); + internal::HandleExceptionsInMethodIfSupported( + test, &Test::DeleteSelf_, "the test fixture's destructor"); + + result_.set_elapsed_time(internal::GetTimeInMillis() - start); + + // Notifies the unit test event listener that a test has just finished. + repeater->OnTestEnd(*this); + + // Tells UnitTest to stop associating assertion results to this + // test. + impl->set_current_test_info(NULL); +} + +// class TestCase + +// Gets the number of successful tests in this test case. +int TestCase::successful_test_count() const { + return CountIf(test_info_list_, TestPassed); +} + +// Gets the number of failed tests in this test case. +int TestCase::failed_test_count() const { + return CountIf(test_info_list_, TestFailed); +} + +// Gets the number of disabled tests that will be reported in the XML report. +int TestCase::reportable_disabled_test_count() const { + return CountIf(test_info_list_, TestReportableDisabled); +} + +// Gets the number of disabled tests in this test case. +int TestCase::disabled_test_count() const { + return CountIf(test_info_list_, TestDisabled); +} + +// Gets the number of tests to be printed in the XML report. +int TestCase::reportable_test_count() const { + return CountIf(test_info_list_, TestReportable); +} + +// Get the number of tests in this test case that should run. +int TestCase::test_to_run_count() const { + return CountIf(test_info_list_, ShouldRunTest); +} + +// Gets the number of all tests. +int TestCase::total_test_count() const { + return static_cast(test_info_list_.size()); +} + +// Creates a TestCase with the given name. +// +// Arguments: +// +// name: name of the test case +// a_type_param: the name of the test case's type parameter, or NULL if +// this is not a typed or a type-parameterized test case. +// set_up_tc: pointer to the function that sets up the test case +// tear_down_tc: pointer to the function that tears down the test case +TestCase::TestCase(const char* a_name, const char* a_type_param, + Test::SetUpTestCaseFunc set_up_tc, + Test::TearDownTestCaseFunc tear_down_tc) + : name_(a_name), + type_param_(a_type_param ? new std::string(a_type_param) : NULL), + set_up_tc_(set_up_tc), + tear_down_tc_(tear_down_tc), + should_run_(false), + elapsed_time_(0) { +} + +// Destructor of TestCase. +TestCase::~TestCase() { + // Deletes every Test in the collection. + ForEach(test_info_list_, internal::Delete); +} + +// Returns the i-th test among all the tests. i can range from 0 to +// total_test_count() - 1. If i is not in that range, returns NULL. +const TestInfo* TestCase::GetTestInfo(int i) const { + const int index = GetElementOr(test_indices_, i, -1); + return index < 0 ? NULL : test_info_list_[index]; +} + +// Returns the i-th test among all the tests. i can range from 0 to +// total_test_count() - 1. If i is not in that range, returns NULL. +TestInfo* TestCase::GetMutableTestInfo(int i) { + const int index = GetElementOr(test_indices_, i, -1); + return index < 0 ? NULL : test_info_list_[index]; +} + +// Adds a test to this test case. Will delete the test upon +// destruction of the TestCase object. +void TestCase::AddTestInfo(TestInfo * test_info) { + test_info_list_.push_back(test_info); + test_indices_.push_back(static_cast(test_indices_.size())); +} + +// Runs every test in this TestCase. +void TestCase::Run() { + if (!should_run_) return; + + internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); + impl->set_current_test_case(this); + + TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater(); + + repeater->OnTestCaseStart(*this); + impl->os_stack_trace_getter()->UponLeavingGTest(); + internal::HandleExceptionsInMethodIfSupported( + this, &TestCase::RunSetUpTestCase, "SetUpTestCase()"); + + const internal::TimeInMillis start = internal::GetTimeInMillis(); + for (int i = 0; i < total_test_count(); i++) { + GetMutableTestInfo(i)->Run(); + } + elapsed_time_ = internal::GetTimeInMillis() - start; + + impl->os_stack_trace_getter()->UponLeavingGTest(); + internal::HandleExceptionsInMethodIfSupported( + this, &TestCase::RunTearDownTestCase, "TearDownTestCase()"); + + repeater->OnTestCaseEnd(*this); + impl->set_current_test_case(NULL); +} + +// Clears the results of all tests in this test case. +void TestCase::ClearResult() { + ad_hoc_test_result_.Clear(); + ForEach(test_info_list_, TestInfo::ClearTestResult); +} + +// Shuffles the tests in this test case. +void TestCase::ShuffleTests(internal::Random* random) { + Shuffle(random, &test_indices_); +} + +// Restores the test order to before the first shuffle. +void TestCase::UnshuffleTests() { + for (size_t i = 0; i < test_indices_.size(); i++) { + test_indices_[i] = static_cast(i); + } +} + +// Formats a countable noun. Depending on its quantity, either the +// singular form or the plural form is used. e.g. +// +// FormatCountableNoun(1, "formula", "formuli") returns "1 formula". +// FormatCountableNoun(5, "book", "books") returns "5 books". +static std::string FormatCountableNoun(int count, + const char * singular_form, + const char * plural_form) { + return internal::StreamableToString(count) + " " + + (count == 1 ? singular_form : plural_form); +} + +// Formats the count of tests. +static std::string FormatTestCount(int test_count) { + return FormatCountableNoun(test_count, "test", "tests"); +} + +// Formats the count of test cases. +static std::string FormatTestCaseCount(int test_case_count) { + return FormatCountableNoun(test_case_count, "test case", "test cases"); +} + +// Converts a TestPartResult::Type enum to human-friendly string +// representation. Both kNonFatalFailure and kFatalFailure are translated +// to "Failure", as the user usually doesn't care about the difference +// between the two when viewing the test result. +static const char * TestPartResultTypeToString(TestPartResult::Type type) { + switch (type) { + case TestPartResult::kSuccess: + return "Success"; + + case TestPartResult::kNonFatalFailure: + case TestPartResult::kFatalFailure: +#ifdef _MSC_VER + return "error: "; +#else + return "Failure\n"; +#endif + default: + return "Unknown result type"; + } +} + +namespace internal { + +// Prints a TestPartResult to an std::string. +static std::string PrintTestPartResultToString( + const TestPartResult& test_part_result) { + return (Message() + << internal::FormatFileLocation(test_part_result.file_name(), + test_part_result.line_number()) + << " " << TestPartResultTypeToString(test_part_result.type()) + << test_part_result.message()).GetString(); +} + +// Prints a TestPartResult. +static void PrintTestPartResult(const TestPartResult& test_part_result) { + const std::string& result = + PrintTestPartResultToString(test_part_result); + printf("%s\n", result.c_str()); + fflush(stdout); + // If the test program runs in Visual Studio or a debugger, the + // following statements add the test part result message to the Output + // window such that the user can double-click on it to jump to the + // corresponding source code location; otherwise they do nothing. +#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE + // We don't call OutputDebugString*() on Windows Mobile, as printing + // to stdout is done by OutputDebugString() there already - we don't + // want the same message printed twice. + ::OutputDebugStringA(result.c_str()); + ::OutputDebugStringA("\n"); +#endif +} + +// class PrettyUnitTestResultPrinter + +enum GTestColor { + COLOR_DEFAULT, + COLOR_RED, + COLOR_GREEN, + COLOR_YELLOW +}; + +#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE + +// Returns the character attribute for the given color. +WORD GetColorAttribute(GTestColor color) { + switch (color) { + case COLOR_RED: return FOREGROUND_RED; + case COLOR_GREEN: return FOREGROUND_GREEN; + case COLOR_YELLOW: return FOREGROUND_RED | FOREGROUND_GREEN; + default: return 0; + } +} + +#else + +// Returns the ANSI color code for the given color. COLOR_DEFAULT is +// an invalid input. +const char* GetAnsiColorCode(GTestColor color) { + switch (color) { + case COLOR_RED: return "1"; + case COLOR_GREEN: return "2"; + case COLOR_YELLOW: return "3"; + default: return NULL; + }; +} + +#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE + +// Returns true iff Google Test should use colors in the output. +bool ShouldUseColor(bool stdout_is_tty) { + const char* const gtest_color = GTEST_FLAG(color).c_str(); + + if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) { +#if GTEST_OS_WINDOWS + // On Windows the TERM variable is usually not set, but the + // console there does support colors. + return stdout_is_tty; +#else + // On non-Windows platforms, we rely on the TERM variable. + const char* const term = posix::GetEnv("TERM"); + const bool term_supports_color = + String::CStringEquals(term, "xterm") || + String::CStringEquals(term, "xterm-color") || + String::CStringEquals(term, "xterm-256color") || + String::CStringEquals(term, "screen") || + String::CStringEquals(term, "screen-256color") || + String::CStringEquals(term, "linux") || + String::CStringEquals(term, "cygwin"); + return stdout_is_tty && term_supports_color; +#endif // GTEST_OS_WINDOWS + } + + return String::CaseInsensitiveCStringEquals(gtest_color, "yes") || + String::CaseInsensitiveCStringEquals(gtest_color, "true") || + String::CaseInsensitiveCStringEquals(gtest_color, "t") || + String::CStringEquals(gtest_color, "1"); + // We take "yes", "true", "t", and "1" as meaning "yes". If the + // value is neither one of these nor "auto", we treat it as "no" to + // be conservative. +} + +// Helpers for printing colored strings to stdout. Note that on Windows, we +// cannot simply emit special characters and have the terminal change colors. +// This routine must actually emit the characters rather than return a string +// that would be colored when printed, as can be done on Linux. +void ColoredPrintf(GTestColor color, const char* fmt, ...) { + va_list args; + va_start(args, fmt); + +#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS || GTEST_OS_IOS + const bool use_color = false; +#else + static const bool in_color_mode = + ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0); + const bool use_color = in_color_mode && (color != COLOR_DEFAULT); +#endif // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS + // The '!= 0' comparison is necessary to satisfy MSVC 7.1. + + if (!use_color) { + vprintf(fmt, args); + va_end(args); + return; + } + +#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE + const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE); + + // Gets the current text color. + CONSOLE_SCREEN_BUFFER_INFO buffer_info; + GetConsoleScreenBufferInfo(stdout_handle, &buffer_info); + const WORD old_color_attrs = buffer_info.wAttributes; + + // We need to flush the stream buffers into the console before each + // SetConsoleTextAttribute call lest it affect the text that is already + // printed but has not yet reached the console. + fflush(stdout); + SetConsoleTextAttribute(stdout_handle, + GetColorAttribute(color) | FOREGROUND_INTENSITY); + vprintf(fmt, args); + + fflush(stdout); + // Restores the text color. + SetConsoleTextAttribute(stdout_handle, old_color_attrs); +#else + printf("\033[0;3%sm", GetAnsiColorCode(color)); + vprintf(fmt, args); + printf("\033[m"); // Resets the terminal to default. +#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE + va_end(args); +} + +// Text printed in Google Test's text output and --gunit_list_tests +// output to label the type parameter and value parameter for a test. +static const char kTypeParamLabel[] = "TypeParam"; +static const char kValueParamLabel[] = "GetParam()"; + +void PrintFullTestCommentIfPresent(const TestInfo& test_info) { + const char* const type_param = test_info.type_param(); + const char* const value_param = test_info.value_param(); + + if (type_param != NULL || value_param != NULL) { + printf(", where "); + if (type_param != NULL) { + printf("%s = %s", kTypeParamLabel, type_param); + if (value_param != NULL) + printf(" and "); + } + if (value_param != NULL) { + printf("%s = %s", kValueParamLabel, value_param); + } + } +} + +// This class implements the TestEventListener interface. +// +// Class PrettyUnitTestResultPrinter is copyable. +class PrettyUnitTestResultPrinter : public TestEventListener { + public: + PrettyUnitTestResultPrinter() {} + static void PrintTestName(const char * test_case, const char * test) { + printf("%s.%s", test_case, test); + } + + // The following methods override what's in the TestEventListener class. + virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {} + virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration); + virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test); + virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {} + virtual void OnTestCaseStart(const TestCase& test_case); + virtual void OnTestStart(const TestInfo& test_info); + virtual void OnTestPartResult(const TestPartResult& result); + virtual void OnTestEnd(const TestInfo& test_info); + virtual void OnTestCaseEnd(const TestCase& test_case); + virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test); + virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {} + virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); + virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {} + + private: + static void PrintFailedTests(const UnitTest& unit_test); +}; + + // Fired before each iteration of tests starts. +void PrettyUnitTestResultPrinter::OnTestIterationStart( + const UnitTest& unit_test, int iteration) { + if (GTEST_FLAG(repeat) != 1) + printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1); + + const char* const filter = GTEST_FLAG(filter).c_str(); + + // Prints the filter if it's not *. This reminds the user that some + // tests may be skipped. + if (!String::CStringEquals(filter, kUniversalFilter)) { + ColoredPrintf(COLOR_YELLOW, + "Note: %s filter = %s\n", GTEST_NAME_, filter); + } + + if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) { + const Int32 shard_index = Int32FromEnvOrDie(kTestShardIndex, -1); + ColoredPrintf(COLOR_YELLOW, + "Note: This is test shard %d of %s.\n", + static_cast(shard_index) + 1, + internal::posix::GetEnv(kTestTotalShards)); + } + + if (GTEST_FLAG(shuffle)) { + ColoredPrintf(COLOR_YELLOW, + "Note: Randomizing tests' orders with a seed of %d .\n", + unit_test.random_seed()); + } + + ColoredPrintf(COLOR_GREEN, "[==========] "); + printf("Running %s from %s.\n", + FormatTestCount(unit_test.test_to_run_count()).c_str(), + FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str()); + fflush(stdout); +} + +void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart( + const UnitTest& /*unit_test*/) { + ColoredPrintf(COLOR_GREEN, "[----------] "); + printf("Global test environment set-up.\n"); + fflush(stdout); +} + +void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) { + const std::string counts = + FormatCountableNoun(test_case.test_to_run_count(), "test", "tests"); + ColoredPrintf(COLOR_GREEN, "[----------] "); + printf("%s from %s", counts.c_str(), test_case.name()); + if (test_case.type_param() == NULL) { + printf("\n"); + } else { + printf(", where %s = %s\n", kTypeParamLabel, test_case.type_param()); + } + fflush(stdout); +} + +void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) { + ColoredPrintf(COLOR_GREEN, "[ RUN ] "); + PrintTestName(test_info.test_case_name(), test_info.name()); + printf("\n"); + fflush(stdout); +} + +// Called after an assertion failure. +void PrettyUnitTestResultPrinter::OnTestPartResult( + const TestPartResult& result) { + // If the test part succeeded, we don't need to do anything. + if (result.type() == TestPartResult::kSuccess) + return; + + // Print failure message from the assertion (e.g. expected this and got that). + PrintTestPartResult(result); + fflush(stdout); +} + +void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) { + if (test_info.result()->Passed()) { + ColoredPrintf(COLOR_GREEN, "[ OK ] "); + } else { + ColoredPrintf(COLOR_RED, "[ FAILED ] "); + } + PrintTestName(test_info.test_case_name(), test_info.name()); + if (test_info.result()->Failed()) + PrintFullTestCommentIfPresent(test_info); + + if (GTEST_FLAG(print_time)) { + printf(" (%s ms)\n", internal::StreamableToString( + test_info.result()->elapsed_time()).c_str()); + } else { + printf("\n"); + } + fflush(stdout); +} + +void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) { + if (!GTEST_FLAG(print_time)) return; + + const std::string counts = + FormatCountableNoun(test_case.test_to_run_count(), "test", "tests"); + ColoredPrintf(COLOR_GREEN, "[----------] "); + printf("%s from %s (%s ms total)\n\n", + counts.c_str(), test_case.name(), + internal::StreamableToString(test_case.elapsed_time()).c_str()); + fflush(stdout); +} + +void PrettyUnitTestResultPrinter::OnEnvironmentsTearDownStart( + const UnitTest& /*unit_test*/) { + ColoredPrintf(COLOR_GREEN, "[----------] "); + printf("Global test environment tear-down\n"); + fflush(stdout); +} + +// Internal helper for printing the list of failed tests. +void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) { + const int failed_test_count = unit_test.failed_test_count(); + if (failed_test_count == 0) { + return; + } + + for (int i = 0; i < unit_test.total_test_case_count(); ++i) { + const TestCase& test_case = *unit_test.GetTestCase(i); + if (!test_case.should_run() || (test_case.failed_test_count() == 0)) { + continue; + } + for (int j = 0; j < test_case.total_test_count(); ++j) { + const TestInfo& test_info = *test_case.GetTestInfo(j); + if (!test_info.should_run() || test_info.result()->Passed()) { + continue; + } + ColoredPrintf(COLOR_RED, "[ FAILED ] "); + printf("%s.%s", test_case.name(), test_info.name()); + PrintFullTestCommentIfPresent(test_info); + printf("\n"); + } + } +} + +void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test, + int /*iteration*/) { + ColoredPrintf(COLOR_GREEN, "[==========] "); + printf("%s from %s ran.", + FormatTestCount(unit_test.test_to_run_count()).c_str(), + FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str()); + if (GTEST_FLAG(print_time)) { + printf(" (%s ms total)", + internal::StreamableToString(unit_test.elapsed_time()).c_str()); + } + printf("\n"); + ColoredPrintf(COLOR_GREEN, "[ PASSED ] "); + printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str()); + + int num_failures = unit_test.failed_test_count(); + if (!unit_test.Passed()) { + const int failed_test_count = unit_test.failed_test_count(); + ColoredPrintf(COLOR_RED, "[ FAILED ] "); + printf("%s, listed below:\n", FormatTestCount(failed_test_count).c_str()); + PrintFailedTests(unit_test); + printf("\n%2d FAILED %s\n", num_failures, + num_failures == 1 ? "TEST" : "TESTS"); + } + + int num_disabled = unit_test.reportable_disabled_test_count(); + if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) { + if (!num_failures) { + printf("\n"); // Add a spacer if no FAILURE banner is displayed. + } + ColoredPrintf(COLOR_YELLOW, + " YOU HAVE %d DISABLED %s\n\n", + num_disabled, + num_disabled == 1 ? "TEST" : "TESTS"); + } + // Ensure that Google Test output is printed before, e.g., heapchecker output. + fflush(stdout); +} + +// End PrettyUnitTestResultPrinter + +// class TestEventRepeater +// +// This class forwards events to other event listeners. +class TestEventRepeater : public TestEventListener { + public: + TestEventRepeater() : forwarding_enabled_(true) {} + virtual ~TestEventRepeater(); + void Append(TestEventListener *listener); + TestEventListener* Release(TestEventListener* listener); + + // Controls whether events will be forwarded to listeners_. Set to false + // in death test child processes. + bool forwarding_enabled() const { return forwarding_enabled_; } + void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; } + + virtual void OnTestProgramStart(const UnitTest& unit_test); + virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration); + virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test); + virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test); + virtual void OnTestCaseStart(const TestCase& test_case); + virtual void OnTestStart(const TestInfo& test_info); + virtual void OnTestPartResult(const TestPartResult& result); + virtual void OnTestEnd(const TestInfo& test_info); + virtual void OnTestCaseEnd(const TestCase& test_case); + virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test); + virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test); + virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); + virtual void OnTestProgramEnd(const UnitTest& unit_test); + + private: + // Controls whether events will be forwarded to listeners_. Set to false + // in death test child processes. + bool forwarding_enabled_; + // The list of listeners that receive events. + std::vector listeners_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater); +}; + +TestEventRepeater::~TestEventRepeater() { + ForEach(listeners_, Delete); +} + +void TestEventRepeater::Append(TestEventListener *listener) { + listeners_.push_back(listener); +} + +// TODO(vladl@google.com): Factor the search functionality into Vector::Find. +TestEventListener* TestEventRepeater::Release(TestEventListener *listener) { + for (size_t i = 0; i < listeners_.size(); ++i) { + if (listeners_[i] == listener) { + listeners_.erase(listeners_.begin() + i); + return listener; + } + } + + return NULL; +} + +// Since most methods are very similar, use macros to reduce boilerplate. +// This defines a member that forwards the call to all listeners. +#define GTEST_REPEATER_METHOD_(Name, Type) \ +void TestEventRepeater::Name(const Type& parameter) { \ + if (forwarding_enabled_) { \ + for (size_t i = 0; i < listeners_.size(); i++) { \ + listeners_[i]->Name(parameter); \ + } \ + } \ +} +// This defines a member that forwards the call to all listeners in reverse +// order. +#define GTEST_REVERSE_REPEATER_METHOD_(Name, Type) \ +void TestEventRepeater::Name(const Type& parameter) { \ + if (forwarding_enabled_) { \ + for (int i = static_cast(listeners_.size()) - 1; i >= 0; i--) { \ + listeners_[i]->Name(parameter); \ + } \ + } \ +} + +GTEST_REPEATER_METHOD_(OnTestProgramStart, UnitTest) +GTEST_REPEATER_METHOD_(OnEnvironmentsSetUpStart, UnitTest) +GTEST_REPEATER_METHOD_(OnTestCaseStart, TestCase) +GTEST_REPEATER_METHOD_(OnTestStart, TestInfo) +GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult) +GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest) +GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest) +GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsTearDownEnd, UnitTest) +GTEST_REVERSE_REPEATER_METHOD_(OnTestEnd, TestInfo) +GTEST_REVERSE_REPEATER_METHOD_(OnTestCaseEnd, TestCase) +GTEST_REVERSE_REPEATER_METHOD_(OnTestProgramEnd, UnitTest) + +#undef GTEST_REPEATER_METHOD_ +#undef GTEST_REVERSE_REPEATER_METHOD_ + +void TestEventRepeater::OnTestIterationStart(const UnitTest& unit_test, + int iteration) { + if (forwarding_enabled_) { + for (size_t i = 0; i < listeners_.size(); i++) { + listeners_[i]->OnTestIterationStart(unit_test, iteration); + } + } +} + +void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test, + int iteration) { + if (forwarding_enabled_) { + for (int i = static_cast(listeners_.size()) - 1; i >= 0; i--) { + listeners_[i]->OnTestIterationEnd(unit_test, iteration); + } + } +} + +// End TestEventRepeater + +// This class generates an XML output file. +class XmlUnitTestResultPrinter : public EmptyTestEventListener { + public: + explicit XmlUnitTestResultPrinter(const char* output_file); + + virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); + + private: + // Is c a whitespace character that is normalized to a space character + // when it appears in an XML attribute value? + static bool IsNormalizableWhitespace(char c) { + return c == 0x9 || c == 0xA || c == 0xD; + } + + // May c appear in a well-formed XML document? + static bool IsValidXmlCharacter(char c) { + return IsNormalizableWhitespace(c) || c >= 0x20; + } + + // Returns an XML-escaped copy of the input string str. If + // is_attribute is true, the text is meant to appear as an attribute + // value, and normalizable whitespace is preserved by replacing it + // with character references. + static std::string EscapeXml(const std::string& str, bool is_attribute); + + // Returns the given string with all characters invalid in XML removed. + static std::string RemoveInvalidXmlCharacters(const std::string& str); + + // Convenience wrapper around EscapeXml when str is an attribute value. + static std::string EscapeXmlAttribute(const std::string& str) { + return EscapeXml(str, true); + } + + // Convenience wrapper around EscapeXml when str is not an attribute value. + static std::string EscapeXmlText(const char* str) { + return EscapeXml(str, false); + } + + // Verifies that the given attribute belongs to the given element and + // streams the attribute as XML. + static void OutputXmlAttribute(std::ostream* stream, + const std::string& element_name, + const std::string& name, + const std::string& value); + + // Streams an XML CDATA section, escaping invalid CDATA sequences as needed. + static void OutputXmlCDataSection(::std::ostream* stream, const char* data); + + // Streams an XML representation of a TestInfo object. + static void OutputXmlTestInfo(::std::ostream* stream, + const char* test_case_name, + const TestInfo& test_info); + + // Prints an XML representation of a TestCase object + static void PrintXmlTestCase(::std::ostream* stream, + const TestCase& test_case); + + // Prints an XML summary of unit_test to output stream out. + static void PrintXmlUnitTest(::std::ostream* stream, + const UnitTest& unit_test); + + // Produces a string representing the test properties in a result as space + // delimited XML attributes based on the property key="value" pairs. + // When the std::string is not empty, it includes a space at the beginning, + // to delimit this attribute from prior attributes. + static std::string TestPropertiesAsXmlAttributes(const TestResult& result); + + // The output file. + const std::string output_file_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter); +}; + +// Creates a new XmlUnitTestResultPrinter. +XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file) + : output_file_(output_file) { + if (output_file_.c_str() == NULL || output_file_.empty()) { + fprintf(stderr, "XML output file may not be null\n"); + fflush(stderr); + exit(EXIT_FAILURE); + } +} + +// Called after the unit test ends. +void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test, + int /*iteration*/) { + FILE* xmlout = NULL; + FilePath output_file(output_file_); + FilePath output_dir(output_file.RemoveFileName()); + + if (output_dir.CreateDirectoriesRecursively()) { + xmlout = posix::FOpen(output_file_.c_str(), "w"); + } + if (xmlout == NULL) { + // TODO(wan): report the reason of the failure. + // + // We don't do it for now as: + // + // 1. There is no urgent need for it. + // 2. It's a bit involved to make the errno variable thread-safe on + // all three operating systems (Linux, Windows, and Mac OS). + // 3. To interpret the meaning of errno in a thread-safe way, + // we need the strerror_r() function, which is not available on + // Windows. + fprintf(stderr, + "Unable to open file \"%s\"\n", + output_file_.c_str()); + fflush(stderr); + exit(EXIT_FAILURE); + } + std::stringstream stream; + PrintXmlUnitTest(&stream, unit_test); + fprintf(xmlout, "%s", StringStreamToString(&stream).c_str()); + fclose(xmlout); +} + +// Returns an XML-escaped copy of the input string str. If is_attribute +// is true, the text is meant to appear as an attribute value, and +// normalizable whitespace is preserved by replacing it with character +// references. +// +// Invalid XML characters in str, if any, are stripped from the output. +// It is expected that most, if not all, of the text processed by this +// module will consist of ordinary English text. +// If this module is ever modified to produce version 1.1 XML output, +// most invalid characters can be retained using character references. +// TODO(wan): It might be nice to have a minimally invasive, human-readable +// escaping scheme for invalid characters, rather than dropping them. +std::string XmlUnitTestResultPrinter::EscapeXml( + const std::string& str, bool is_attribute) { + Message m; + + for (size_t i = 0; i < str.size(); ++i) { + const char ch = str[i]; + switch (ch) { + case '<': + m << "<"; + break; + case '>': + m << ">"; + break; + case '&': + m << "&"; + break; + case '\'': + if (is_attribute) + m << "'"; + else + m << '\''; + break; + case '"': + if (is_attribute) + m << """; + else + m << '"'; + break; + default: + if (IsValidXmlCharacter(ch)) { + if (is_attribute && IsNormalizableWhitespace(ch)) + m << "&#x" << String::FormatByte(static_cast(ch)) + << ";"; + else + m << ch; + } + break; + } + } + + return m.GetString(); +} + +// Returns the given string with all characters invalid in XML removed. +// Currently invalid characters are dropped from the string. An +// alternative is to replace them with certain characters such as . or ?. +std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters( + const std::string& str) { + std::string output; + output.reserve(str.size()); + for (std::string::const_iterator it = str.begin(); it != str.end(); ++it) + if (IsValidXmlCharacter(*it)) + output.push_back(*it); + + return output; +} + +// The following routines generate an XML representation of a UnitTest +// object. +// +// This is how Google Test concepts map to the DTD: +// +// <-- corresponds to a UnitTest object +// <-- corresponds to a TestCase object +// <-- corresponds to a TestInfo object +// ... +// ... +// ... +// <-- individual assertion failures +// +// +// + +// Formats the given time in milliseconds as seconds. +std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) { + ::std::stringstream ss; + ss << ms/1000.0; + return ss.str(); +} + +// Converts the given epoch time in milliseconds to a date string in the ISO +// 8601 format, without the timezone information. +std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms) { + // Using non-reentrant version as localtime_r is not portable. + time_t seconds = static_cast(ms / 1000); +#ifdef _MSC_VER +# pragma warning(push) // Saves the current warning state. +# pragma warning(disable:4996) // Temporarily disables warning 4996 + // (function or variable may be unsafe). + const struct tm* const time_struct = localtime(&seconds); // NOLINT +# pragma warning(pop) // Restores the warning state again. +#else + const struct tm* const time_struct = localtime(&seconds); // NOLINT +#endif + if (time_struct == NULL) + return ""; // Invalid ms value + + // YYYY-MM-DDThh:mm:ss + return StreamableToString(time_struct->tm_year + 1900) + "-" + + String::FormatIntWidth2(time_struct->tm_mon + 1) + "-" + + String::FormatIntWidth2(time_struct->tm_mday) + "T" + + String::FormatIntWidth2(time_struct->tm_hour) + ":" + + String::FormatIntWidth2(time_struct->tm_min) + ":" + + String::FormatIntWidth2(time_struct->tm_sec); +} + +// Streams an XML CDATA section, escaping invalid CDATA sequences as needed. +void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream, + const char* data) { + const char* segment = data; + *stream << ""); + if (next_segment != NULL) { + stream->write( + segment, static_cast(next_segment - segment)); + *stream << "]]>]]>"); + } else { + *stream << segment; + break; + } + } + *stream << "]]>"; +} + +void XmlUnitTestResultPrinter::OutputXmlAttribute( + std::ostream* stream, + const std::string& element_name, + const std::string& name, + const std::string& value) { + const std::vector& allowed_names = + GetReservedAttributesForElement(element_name); + + GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) != + allowed_names.end()) + << "Attribute " << name << " is not allowed for element <" << element_name + << ">."; + + *stream << " " << name << "=\"" << EscapeXmlAttribute(value) << "\""; +} + +// Prints an XML representation of a TestInfo object. +// TODO(wan): There is also value in printing properties with the plain printer. +void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream, + const char* test_case_name, + const TestInfo& test_info) { + const TestResult& result = *test_info.result(); + const std::string kTestcase = "testcase"; + + *stream << " \n"; + } + const string location = internal::FormatCompilerIndependentFileLocation( + part.file_name(), part.line_number()); + const string summary = location + "\n" + part.summary(); + *stream << " "; + const string detail = location + "\n" + part.message(); + OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str()); + *stream << "\n"; + } + } + + if (failures == 0) + *stream << " />\n"; + else + *stream << " \n"; +} + +// Prints an XML representation of a TestCase object +void XmlUnitTestResultPrinter::PrintXmlTestCase(std::ostream* stream, + const TestCase& test_case) { + const std::string kTestsuite = "testsuite"; + *stream << " <" << kTestsuite; + OutputXmlAttribute(stream, kTestsuite, "name", test_case.name()); + OutputXmlAttribute(stream, kTestsuite, "tests", + StreamableToString(test_case.reportable_test_count())); + OutputXmlAttribute(stream, kTestsuite, "failures", + StreamableToString(test_case.failed_test_count())); + OutputXmlAttribute( + stream, kTestsuite, "disabled", + StreamableToString(test_case.reportable_disabled_test_count())); + OutputXmlAttribute(stream, kTestsuite, "errors", "0"); + OutputXmlAttribute(stream, kTestsuite, "time", + FormatTimeInMillisAsSeconds(test_case.elapsed_time())); + *stream << TestPropertiesAsXmlAttributes(test_case.ad_hoc_test_result()) + << ">\n"; + + for (int i = 0; i < test_case.total_test_count(); ++i) { + if (test_case.GetTestInfo(i)->is_reportable()) + OutputXmlTestInfo(stream, test_case.name(), *test_case.GetTestInfo(i)); + } + *stream << " \n"; +} + +// Prints an XML summary of unit_test to output stream out. +void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream, + const UnitTest& unit_test) { + const std::string kTestsuites = "testsuites"; + + *stream << "\n"; + *stream << "<" << kTestsuites; + + OutputXmlAttribute(stream, kTestsuites, "tests", + StreamableToString(unit_test.reportable_test_count())); + OutputXmlAttribute(stream, kTestsuites, "failures", + StreamableToString(unit_test.failed_test_count())); + OutputXmlAttribute( + stream, kTestsuites, "disabled", + StreamableToString(unit_test.reportable_disabled_test_count())); + OutputXmlAttribute(stream, kTestsuites, "errors", "0"); + OutputXmlAttribute( + stream, kTestsuites, "timestamp", + FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp())); + OutputXmlAttribute(stream, kTestsuites, "time", + FormatTimeInMillisAsSeconds(unit_test.elapsed_time())); + + if (GTEST_FLAG(shuffle)) { + OutputXmlAttribute(stream, kTestsuites, "random_seed", + StreamableToString(unit_test.random_seed())); + } + + *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result()); + + OutputXmlAttribute(stream, kTestsuites, "name", "AllTests"); + *stream << ">\n"; + + for (int i = 0; i < unit_test.total_test_case_count(); ++i) { + if (unit_test.GetTestCase(i)->reportable_test_count() > 0) + PrintXmlTestCase(stream, *unit_test.GetTestCase(i)); + } + *stream << "\n"; +} + +// Produces a string representing the test properties in a result as space +// delimited XML attributes based on the property key="value" pairs. +std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes( + const TestResult& result) { + Message attributes; + for (int i = 0; i < result.test_property_count(); ++i) { + const TestProperty& property = result.GetTestProperty(i); + attributes << " " << property.key() << "=" + << "\"" << EscapeXmlAttribute(property.value()) << "\""; + } + return attributes.GetString(); +} + +// End XmlUnitTestResultPrinter + +#if GTEST_CAN_STREAM_RESULTS_ + +// Checks if str contains '=', '&', '%' or '\n' characters. If yes, +// replaces them by "%xx" where xx is their hexadecimal value. For +// example, replaces "=" with "%3D". This algorithm is O(strlen(str)) +// in both time and space -- important as the input str may contain an +// arbitrarily long test failure message and stack trace. +string StreamingListener::UrlEncode(const char* str) { + string result; + result.reserve(strlen(str) + 1); + for (char ch = *str; ch != '\0'; ch = *++str) { + switch (ch) { + case '%': + case '=': + case '&': + case '\n': + result.append("%" + String::FormatByte(static_cast(ch))); + break; + default: + result.push_back(ch); + break; + } + } + return result; +} + +void StreamingListener::SocketWriter::MakeConnection() { + GTEST_CHECK_(sockfd_ == -1) + << "MakeConnection() can't be called when there is already a connection."; + + addrinfo hints; + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; // To allow both IPv4 and IPv6 addresses. + hints.ai_socktype = SOCK_STREAM; + addrinfo* servinfo = NULL; + + // Use the getaddrinfo() to get a linked list of IP addresses for + // the given host name. + const int error_num = getaddrinfo( + host_name_.c_str(), port_num_.c_str(), &hints, &servinfo); + if (error_num != 0) { + GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: " + << gai_strerror(error_num); + } + + // Loop through all the results and connect to the first we can. + for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != NULL; + cur_addr = cur_addr->ai_next) { + sockfd_ = socket( + cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol); + if (sockfd_ != -1) { + // Connect the client socket to the server socket. + if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) { + close(sockfd_); + sockfd_ = -1; + } + } + } + + freeaddrinfo(servinfo); // all done with this structure + + if (sockfd_ == -1) { + GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to " + << host_name_ << ":" << port_num_; + } +} + +// End of class Streaming Listener +#endif // GTEST_CAN_STREAM_RESULTS__ + +// Class ScopedTrace + +// Pushes the given source file location and message onto a per-thread +// trace stack maintained by Google Test. +ScopedTrace::ScopedTrace(const char* file, int line, const Message& message) + GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { + TraceInfo trace; + trace.file = file; + trace.line = line; + trace.message = message.GetString(); + + UnitTest::GetInstance()->PushGTestTrace(trace); +} + +// Pops the info pushed by the c'tor. +ScopedTrace::~ScopedTrace() + GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { + UnitTest::GetInstance()->PopGTestTrace(); +} + + +// class OsStackTraceGetter + +// Returns the current OS stack trace as an std::string. Parameters: +// +// max_depth - the maximum number of stack frames to be included +// in the trace. +// skip_count - the number of top frames to be skipped; doesn't count +// against max_depth. +// +string OsStackTraceGetter::CurrentStackTrace(int /* max_depth */, + int /* skip_count */) + GTEST_LOCK_EXCLUDED_(mutex_) { + return ""; +} + +void OsStackTraceGetter::UponLeavingGTest() + GTEST_LOCK_EXCLUDED_(mutex_) { +} + +const char* const +OsStackTraceGetter::kElidedFramesMarker = + "... " GTEST_NAME_ " internal frames ..."; + +// A helper class that creates the premature-exit file in its +// constructor and deletes the file in its destructor. +class ScopedPrematureExitFile { + public: + explicit ScopedPrematureExitFile(const char* premature_exit_filepath) + : premature_exit_filepath_(premature_exit_filepath) { + // If a path to the premature-exit file is specified... + if (premature_exit_filepath != NULL && *premature_exit_filepath != '\0') { + // create the file with a single "0" character in it. I/O + // errors are ignored as there's nothing better we can do and we + // don't want to fail the test because of this. + FILE* pfile = posix::FOpen(premature_exit_filepath, "w"); + fwrite("0", 1, 1, pfile); + fclose(pfile); + } + } + + ~ScopedPrematureExitFile() { + if (premature_exit_filepath_ != NULL && *premature_exit_filepath_ != '\0') { + remove(premature_exit_filepath_); + } + } + + private: + const char* const premature_exit_filepath_; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile); +}; + +} // namespace internal + +// class TestEventListeners + +TestEventListeners::TestEventListeners() + : repeater_(new internal::TestEventRepeater()), + default_result_printer_(NULL), + default_xml_generator_(NULL) { +} + +TestEventListeners::~TestEventListeners() { delete repeater_; } + +// Returns the standard listener responsible for the default console +// output. Can be removed from the listeners list to shut down default +// console output. Note that removing this object from the listener list +// with Release transfers its ownership to the user. +void TestEventListeners::Append(TestEventListener* listener) { + repeater_->Append(listener); +} + +// Removes the given event listener from the list and returns it. It then +// becomes the caller's responsibility to delete the listener. Returns +// NULL if the listener is not found in the list. +TestEventListener* TestEventListeners::Release(TestEventListener* listener) { + if (listener == default_result_printer_) + default_result_printer_ = NULL; + else if (listener == default_xml_generator_) + default_xml_generator_ = NULL; + return repeater_->Release(listener); +} + +// Returns repeater that broadcasts the TestEventListener events to all +// subscribers. +TestEventListener* TestEventListeners::repeater() { return repeater_; } + +// Sets the default_result_printer attribute to the provided listener. +// The listener is also added to the listener list and previous +// default_result_printer is removed from it and deleted. The listener can +// also be NULL in which case it will not be added to the list. Does +// nothing if the previous and the current listener objects are the same. +void TestEventListeners::SetDefaultResultPrinter(TestEventListener* listener) { + if (default_result_printer_ != listener) { + // It is an error to pass this method a listener that is already in the + // list. + delete Release(default_result_printer_); + default_result_printer_ = listener; + if (listener != NULL) + Append(listener); + } +} + +// Sets the default_xml_generator attribute to the provided listener. The +// listener is also added to the listener list and previous +// default_xml_generator is removed from it and deleted. The listener can +// also be NULL in which case it will not be added to the list. Does +// nothing if the previous and the current listener objects are the same. +void TestEventListeners::SetDefaultXmlGenerator(TestEventListener* listener) { + if (default_xml_generator_ != listener) { + // It is an error to pass this method a listener that is already in the + // list. + delete Release(default_xml_generator_); + default_xml_generator_ = listener; + if (listener != NULL) + Append(listener); + } +} + +// Controls whether events will be forwarded by the repeater to the +// listeners in the list. +bool TestEventListeners::EventForwardingEnabled() const { + return repeater_->forwarding_enabled(); +} + +void TestEventListeners::SuppressEventForwarding() { + repeater_->set_forwarding_enabled(false); +} + +// class UnitTest + +// Gets the singleton UnitTest object. The first time this method is +// called, a UnitTest object is constructed and returned. Consecutive +// calls will return the same object. +// +// We don't protect this under mutex_ as a user is not supposed to +// call this before main() starts, from which point on the return +// value will never change. +UnitTest* UnitTest::GetInstance() { + // When compiled with MSVC 7.1 in optimized mode, destroying the + // UnitTest object upon exiting the program messes up the exit code, + // causing successful tests to appear failed. We have to use a + // different implementation in this case to bypass the compiler bug. + // This implementation makes the compiler happy, at the cost of + // leaking the UnitTest object. + + // CodeGear C++Builder insists on a public destructor for the + // default implementation. Use this implementation to keep good OO + // design with private destructor. + +#if (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__) + static UnitTest* const instance = new UnitTest; + return instance; +#else + static UnitTest instance; + return &instance; +#endif // (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__) +} + +// Gets the number of successful test cases. +int UnitTest::successful_test_case_count() const { + return impl()->successful_test_case_count(); +} + +// Gets the number of failed test cases. +int UnitTest::failed_test_case_count() const { + return impl()->failed_test_case_count(); +} + +// Gets the number of all test cases. +int UnitTest::total_test_case_count() const { + return impl()->total_test_case_count(); +} + +// Gets the number of all test cases that contain at least one test +// that should run. +int UnitTest::test_case_to_run_count() const { + return impl()->test_case_to_run_count(); +} + +// Gets the number of successful tests. +int UnitTest::successful_test_count() const { + return impl()->successful_test_count(); +} + +// Gets the number of failed tests. +int UnitTest::failed_test_count() const { return impl()->failed_test_count(); } + +// Gets the number of disabled tests that will be reported in the XML report. +int UnitTest::reportable_disabled_test_count() const { + return impl()->reportable_disabled_test_count(); +} + +// Gets the number of disabled tests. +int UnitTest::disabled_test_count() const { + return impl()->disabled_test_count(); +} + +// Gets the number of tests to be printed in the XML report. +int UnitTest::reportable_test_count() const { + return impl()->reportable_test_count(); +} + +// Gets the number of all tests. +int UnitTest::total_test_count() const { return impl()->total_test_count(); } + +// Gets the number of tests that should run. +int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); } + +// Gets the time of the test program start, in ms from the start of the +// UNIX epoch. +internal::TimeInMillis UnitTest::start_timestamp() const { + return impl()->start_timestamp(); +} + +// Gets the elapsed time, in milliseconds. +internal::TimeInMillis UnitTest::elapsed_time() const { + return impl()->elapsed_time(); +} + +// Returns true iff the unit test passed (i.e. all test cases passed). +bool UnitTest::Passed() const { return impl()->Passed(); } + +// Returns true iff the unit test failed (i.e. some test case failed +// or something outside of all tests failed). +bool UnitTest::Failed() const { return impl()->Failed(); } + +// Gets the i-th test case among all the test cases. i can range from 0 to +// total_test_case_count() - 1. If i is not in that range, returns NULL. +const TestCase* UnitTest::GetTestCase(int i) const { + return impl()->GetTestCase(i); +} + +// Returns the TestResult containing information on test failures and +// properties logged outside of individual test cases. +const TestResult& UnitTest::ad_hoc_test_result() const { + return *impl()->ad_hoc_test_result(); +} + +// Gets the i-th test case among all the test cases. i can range from 0 to +// total_test_case_count() - 1. If i is not in that range, returns NULL. +TestCase* UnitTest::GetMutableTestCase(int i) { + return impl()->GetMutableTestCase(i); +} + +// Returns the list of event listeners that can be used to track events +// inside Google Test. +TestEventListeners& UnitTest::listeners() { + return *impl()->listeners(); +} + +// Registers and returns a global test environment. When a test +// program is run, all global test environments will be set-up in the +// order they were registered. After all tests in the program have +// finished, all global test environments will be torn-down in the +// *reverse* order they were registered. +// +// The UnitTest object takes ownership of the given environment. +// +// We don't protect this under mutex_, as we only support calling it +// from the main thread. +Environment* UnitTest::AddEnvironment(Environment* env) { + if (env == NULL) { + return NULL; + } + + impl_->environments().push_back(env); + return env; +} + +// Adds a TestPartResult to the current TestResult object. All Google Test +// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call +// this to report their results. The user code should use the +// assertion macros instead of calling this directly. +void UnitTest::AddTestPartResult( + TestPartResult::Type result_type, + const char* file_name, + int line_number, + const std::string& message, + const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) { + Message msg; + msg << message; + + internal::MutexLock lock(&mutex_); + if (impl_->gtest_trace_stack().size() > 0) { + msg << "\n" << GTEST_NAME_ << " trace:"; + + for (int i = static_cast(impl_->gtest_trace_stack().size()); + i > 0; --i) { + const internal::TraceInfo& trace = impl_->gtest_trace_stack()[i - 1]; + msg << "\n" << internal::FormatFileLocation(trace.file, trace.line) + << " " << trace.message; + } + } + + if (os_stack_trace.c_str() != NULL && !os_stack_trace.empty()) { + msg << internal::kStackTraceMarker << os_stack_trace; + } + + const TestPartResult result = + TestPartResult(result_type, file_name, line_number, + msg.GetString().c_str()); + impl_->GetTestPartResultReporterForCurrentThread()-> + ReportTestPartResult(result); + + if (result_type != TestPartResult::kSuccess) { + // gtest_break_on_failure takes precedence over + // gtest_throw_on_failure. This allows a user to set the latter + // in the code (perhaps in order to use Google Test assertions + // with another testing framework) and specify the former on the + // command line for debugging. + if (GTEST_FLAG(break_on_failure)) { +#if GTEST_OS_WINDOWS + // Using DebugBreak on Windows allows gtest to still break into a debugger + // when a failure happens and both the --gtest_break_on_failure and + // the --gtest_catch_exceptions flags are specified. + DebugBreak(); +#else + // Dereference NULL through a volatile pointer to prevent the compiler + // from removing. We use this rather than abort() or __builtin_trap() for + // portability: Symbian doesn't implement abort() well, and some debuggers + // don't correctly trap abort(). + *static_cast(NULL) = 1; +#endif // GTEST_OS_WINDOWS + } else if (GTEST_FLAG(throw_on_failure)) { +#if GTEST_HAS_EXCEPTIONS + throw internal::GoogleTestFailureException(result); +#else + // We cannot call abort() as it generates a pop-up in debug mode + // that cannot be suppressed in VC 7.1 or below. + exit(1); +#endif + } + } +} + +// Adds a TestProperty to the current TestResult object when invoked from +// inside a test, to current TestCase's ad_hoc_test_result_ when invoked +// from SetUpTestCase or TearDownTestCase, or to the global property set +// when invoked elsewhere. If the result already contains a property with +// the same key, the value will be updated. +void UnitTest::RecordProperty(const std::string& key, + const std::string& value) { + impl_->RecordProperty(TestProperty(key, value)); +} + +// Runs all tests in this UnitTest object and prints the result. +// Returns 0 if successful, or 1 otherwise. +// +// We don't protect this under mutex_, as we only support calling it +// from the main thread. +int UnitTest::Run() { + const bool in_death_test_child_process = + internal::GTEST_FLAG(internal_run_death_test).length() > 0; + + // Google Test implements this protocol for catching that a test + // program exits before returning control to Google Test: + // + // 1. Upon start, Google Test creates a file whose absolute path + // is specified by the environment variable + // TEST_PREMATURE_EXIT_FILE. + // 2. When Google Test has finished its work, it deletes the file. + // + // This allows a test runner to set TEST_PREMATURE_EXIT_FILE before + // running a Google-Test-based test program and check the existence + // of the file at the end of the test execution to see if it has + // exited prematurely. + + // If we are in the child process of a death test, don't + // create/delete the premature exit file, as doing so is unnecessary + // and will confuse the parent process. Otherwise, create/delete + // the file upon entering/leaving this function. If the program + // somehow exits before this function has a chance to return, the + // premature-exit file will be left undeleted, causing a test runner + // that understands the premature-exit-file protocol to report the + // test as having failed. + const internal::ScopedPrematureExitFile premature_exit_file( + in_death_test_child_process ? + NULL : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE")); + + // Captures the value of GTEST_FLAG(catch_exceptions). This value will be + // used for the duration of the program. + impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions)); + +#if GTEST_HAS_SEH + // Either the user wants Google Test to catch exceptions thrown by the + // tests or this is executing in the context of death test child + // process. In either case the user does not want to see pop-up dialogs + // about crashes - they are expected. + if (impl()->catch_exceptions() || in_death_test_child_process) { +# if !GTEST_OS_WINDOWS_MOBILE + // SetErrorMode doesn't exist on CE. + SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT | + SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX); +# endif // !GTEST_OS_WINDOWS_MOBILE + +# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE + // Death test children can be terminated with _abort(). On Windows, + // _abort() can show a dialog with a warning message. This forces the + // abort message to go to stderr instead. + _set_error_mode(_OUT_TO_STDERR); +# endif + +# if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE + // In the debug version, Visual Studio pops up a separate dialog + // offering a choice to debug the aborted program. We need to suppress + // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement + // executed. Google Test will notify the user of any unexpected + // failure via stderr. + // + // VC++ doesn't define _set_abort_behavior() prior to the version 8.0. + // Users of prior VC versions shall suffer the agony and pain of + // clicking through the countless debug dialogs. + // TODO(vladl@google.com): find a way to suppress the abort dialog() in the + // debug mode when compiled with VC 7.1 or lower. + if (!GTEST_FLAG(break_on_failure)) + _set_abort_behavior( + 0x0, // Clear the following flags: + _WRITE_ABORT_MSG | _CALL_REPORTFAULT); // pop-up window, core dump. +# endif + } +#endif // GTEST_HAS_SEH + + return internal::HandleExceptionsInMethodIfSupported( + impl(), + &internal::UnitTestImpl::RunAllTests, + "auxiliary test code (environments or event listeners)") ? 0 : 1; +} + +// Returns the working directory when the first TEST() or TEST_F() was +// executed. +const char* UnitTest::original_working_dir() const { + return impl_->original_working_dir_.c_str(); +} + +// Returns the TestCase object for the test that's currently running, +// or NULL if no test is running. +const TestCase* UnitTest::current_test_case() const + GTEST_LOCK_EXCLUDED_(mutex_) { + internal::MutexLock lock(&mutex_); + return impl_->current_test_case(); +} + +// Returns the TestInfo object for the test that's currently running, +// or NULL if no test is running. +const TestInfo* UnitTest::current_test_info() const + GTEST_LOCK_EXCLUDED_(mutex_) { + internal::MutexLock lock(&mutex_); + return impl_->current_test_info(); +} + +// Returns the random seed used at the start of the current test run. +int UnitTest::random_seed() const { return impl_->random_seed(); } + +#if GTEST_HAS_PARAM_TEST +// Returns ParameterizedTestCaseRegistry object used to keep track of +// value-parameterized tests and instantiate and register them. +internal::ParameterizedTestCaseRegistry& + UnitTest::parameterized_test_registry() + GTEST_LOCK_EXCLUDED_(mutex_) { + return impl_->parameterized_test_registry(); +} +#endif // GTEST_HAS_PARAM_TEST + +// Creates an empty UnitTest. +UnitTest::UnitTest() { + impl_ = new internal::UnitTestImpl(this); +} + +// Destructor of UnitTest. +UnitTest::~UnitTest() { + delete impl_; +} + +// Pushes a trace defined by SCOPED_TRACE() on to the per-thread +// Google Test trace stack. +void UnitTest::PushGTestTrace(const internal::TraceInfo& trace) + GTEST_LOCK_EXCLUDED_(mutex_) { + internal::MutexLock lock(&mutex_); + impl_->gtest_trace_stack().push_back(trace); +} + +// Pops a trace from the per-thread Google Test trace stack. +void UnitTest::PopGTestTrace() + GTEST_LOCK_EXCLUDED_(mutex_) { + internal::MutexLock lock(&mutex_); + impl_->gtest_trace_stack().pop_back(); +} + +namespace internal { + +UnitTestImpl::UnitTestImpl(UnitTest* parent) + : parent_(parent), +#ifdef _MSC_VER +# pragma warning(push) // Saves the current warning state. +# pragma warning(disable:4355) // Temporarily disables warning 4355 + // (using this in initializer). + default_global_test_part_result_reporter_(this), + default_per_thread_test_part_result_reporter_(this), +# pragma warning(pop) // Restores the warning state again. +#else + default_global_test_part_result_reporter_(this), + default_per_thread_test_part_result_reporter_(this), +#endif // _MSC_VER + global_test_part_result_repoter_( + &default_global_test_part_result_reporter_), + per_thread_test_part_result_reporter_( + &default_per_thread_test_part_result_reporter_), +#if GTEST_HAS_PARAM_TEST + parameterized_test_registry_(), + parameterized_tests_registered_(false), +#endif // GTEST_HAS_PARAM_TEST + last_death_test_case_(-1), + current_test_case_(NULL), + current_test_info_(NULL), + ad_hoc_test_result_(), + os_stack_trace_getter_(NULL), + post_flag_parse_init_performed_(false), + random_seed_(0), // Will be overridden by the flag before first use. + random_(0), // Will be reseeded before first use. + start_timestamp_(0), + elapsed_time_(0), +#if GTEST_HAS_DEATH_TEST + death_test_factory_(new DefaultDeathTestFactory), +#endif + // Will be overridden by the flag before first use. + catch_exceptions_(false) { + listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter); +} + +UnitTestImpl::~UnitTestImpl() { + // Deletes every TestCase. + ForEach(test_cases_, internal::Delete); + + // Deletes every Environment. + ForEach(environments_, internal::Delete); + + delete os_stack_trace_getter_; +} + +// Adds a TestProperty to the current TestResult object when invoked in a +// context of a test, to current test case's ad_hoc_test_result when invoke +// from SetUpTestCase/TearDownTestCase, or to the global property set +// otherwise. If the result already contains a property with the same key, +// the value will be updated. +void UnitTestImpl::RecordProperty(const TestProperty& test_property) { + std::string xml_element; + TestResult* test_result; // TestResult appropriate for property recording. + + if (current_test_info_ != NULL) { + xml_element = "testcase"; + test_result = &(current_test_info_->result_); + } else if (current_test_case_ != NULL) { + xml_element = "testsuite"; + test_result = &(current_test_case_->ad_hoc_test_result_); + } else { + xml_element = "testsuites"; + test_result = &ad_hoc_test_result_; + } + test_result->RecordProperty(xml_element, test_property); +} + +#if GTEST_HAS_DEATH_TEST +// Disables event forwarding if the control is currently in a death test +// subprocess. Must not be called before InitGoogleTest. +void UnitTestImpl::SuppressTestEventsIfInSubprocess() { + if (internal_run_death_test_flag_.get() != NULL) + listeners()->SuppressEventForwarding(); +} +#endif // GTEST_HAS_DEATH_TEST + +// Initializes event listeners performing XML output as specified by +// UnitTestOptions. Must not be called before InitGoogleTest. +void UnitTestImpl::ConfigureXmlOutput() { + const std::string& output_format = UnitTestOptions::GetOutputFormat(); + if (output_format == "xml") { + listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter( + UnitTestOptions::GetAbsolutePathToOutputFile().c_str())); + } else if (output_format != "") { + printf("WARNING: unrecognized output format \"%s\" ignored.\n", + output_format.c_str()); + fflush(stdout); + } +} + +#if GTEST_CAN_STREAM_RESULTS_ +// Initializes event listeners for streaming test results in string form. +// Must not be called before InitGoogleTest. +void UnitTestImpl::ConfigureStreamingOutput() { + const std::string& target = GTEST_FLAG(stream_result_to); + if (!target.empty()) { + const size_t pos = target.find(':'); + if (pos != std::string::npos) { + listeners()->Append(new StreamingListener(target.substr(0, pos), + target.substr(pos+1))); + } else { + printf("WARNING: unrecognized streaming target \"%s\" ignored.\n", + target.c_str()); + fflush(stdout); + } + } +} +#endif // GTEST_CAN_STREAM_RESULTS_ + +// Performs initialization dependent upon flag values obtained in +// ParseGoogleTestFlagsOnly. Is called from InitGoogleTest after the call to +// ParseGoogleTestFlagsOnly. In case a user neglects to call InitGoogleTest +// this function is also called from RunAllTests. Since this function can be +// called more than once, it has to be idempotent. +void UnitTestImpl::PostFlagParsingInit() { + // Ensures that this function does not execute more than once. + if (!post_flag_parse_init_performed_) { + post_flag_parse_init_performed_ = true; + +#if GTEST_HAS_DEATH_TEST + InitDeathTestSubprocessControlInfo(); + SuppressTestEventsIfInSubprocess(); +#endif // GTEST_HAS_DEATH_TEST + + // Registers parameterized tests. This makes parameterized tests + // available to the UnitTest reflection API without running + // RUN_ALL_TESTS. + RegisterParameterizedTests(); + + // Configures listeners for XML output. This makes it possible for users + // to shut down the default XML output before invoking RUN_ALL_TESTS. + ConfigureXmlOutput(); + +#if GTEST_CAN_STREAM_RESULTS_ + // Configures listeners for streaming test results to the specified server. + ConfigureStreamingOutput(); +#endif // GTEST_CAN_STREAM_RESULTS_ + } +} + +// A predicate that checks the name of a TestCase against a known +// value. +// +// This is used for implementation of the UnitTest class only. We put +// it in the anonymous namespace to prevent polluting the outer +// namespace. +// +// TestCaseNameIs is copyable. +class TestCaseNameIs { + public: + // Constructor. + explicit TestCaseNameIs(const std::string& name) + : name_(name) {} + + // Returns true iff the name of test_case matches name_. + bool operator()(const TestCase* test_case) const { + return test_case != NULL && strcmp(test_case->name(), name_.c_str()) == 0; + } + + private: + std::string name_; +}; + +// Finds and returns a TestCase with the given name. If one doesn't +// exist, creates one and returns it. It's the CALLER'S +// RESPONSIBILITY to ensure that this function is only called WHEN THE +// TESTS ARE NOT SHUFFLED. +// +// Arguments: +// +// test_case_name: name of the test case +// type_param: the name of the test case's type parameter, or NULL if +// this is not a typed or a type-parameterized test case. +// set_up_tc: pointer to the function that sets up the test case +// tear_down_tc: pointer to the function that tears down the test case +TestCase* UnitTestImpl::GetTestCase(const char* test_case_name, + const char* type_param, + Test::SetUpTestCaseFunc set_up_tc, + Test::TearDownTestCaseFunc tear_down_tc) { + // Can we find a TestCase with the given name? + const std::vector::const_iterator test_case = + std::find_if(test_cases_.begin(), test_cases_.end(), + TestCaseNameIs(test_case_name)); + + if (test_case != test_cases_.end()) + return *test_case; + + // No. Let's create one. + TestCase* const new_test_case = + new TestCase(test_case_name, type_param, set_up_tc, tear_down_tc); + + // Is this a death test case? + if (internal::UnitTestOptions::MatchesFilter(test_case_name, + kDeathTestCaseFilter)) { + // Yes. Inserts the test case after the last death test case + // defined so far. This only works when the test cases haven't + // been shuffled. Otherwise we may end up running a death test + // after a non-death test. + ++last_death_test_case_; + test_cases_.insert(test_cases_.begin() + last_death_test_case_, + new_test_case); + } else { + // No. Appends to the end of the list. + test_cases_.push_back(new_test_case); + } + + test_case_indices_.push_back(static_cast(test_case_indices_.size())); + return new_test_case; +} + +// Helpers for setting up / tearing down the given environment. They +// are for use in the ForEach() function. +static void SetUpEnvironment(Environment* env) { env->SetUp(); } +static void TearDownEnvironment(Environment* env) { env->TearDown(); } + +// Runs all tests in this UnitTest object, prints the result, and +// returns true if all tests are successful. If any exception is +// thrown during a test, the test is considered to be failed, but the +// rest of the tests will still be run. +// +// When parameterized tests are enabled, it expands and registers +// parameterized tests first in RegisterParameterizedTests(). +// All other functions called from RunAllTests() may safely assume that +// parameterized tests are ready to be counted and run. +bool UnitTestImpl::RunAllTests() { + // Makes sure InitGoogleTest() was called. + if (!GTestIsInitialized()) { + printf("%s", + "\nThis test program did NOT call ::testing::InitGoogleTest " + "before calling RUN_ALL_TESTS(). Please fix it.\n"); + return false; + } + + // Do not run any test if the --help flag was specified. + if (g_help_flag) + return true; + + // Repeats the call to the post-flag parsing initialization in case the + // user didn't call InitGoogleTest. + PostFlagParsingInit(); + + // Even if sharding is not on, test runners may want to use the + // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding + // protocol. + internal::WriteToShardStatusFileIfNeeded(); + + // True iff we are in a subprocess for running a thread-safe-style + // death test. + bool in_subprocess_for_death_test = false; + +#if GTEST_HAS_DEATH_TEST + in_subprocess_for_death_test = (internal_run_death_test_flag_.get() != NULL); +#endif // GTEST_HAS_DEATH_TEST + + const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex, + in_subprocess_for_death_test); + + // Compares the full test names with the filter to decide which + // tests to run. + const bool has_tests_to_run = FilterTests(should_shard + ? HONOR_SHARDING_PROTOCOL + : IGNORE_SHARDING_PROTOCOL) > 0; + + // Lists the tests and exits if the --gtest_list_tests flag was specified. + if (GTEST_FLAG(list_tests)) { + // This must be called *after* FilterTests() has been called. + ListTestsMatchingFilter(); + return true; + } + + random_seed_ = GTEST_FLAG(shuffle) ? + GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0; + + // True iff at least one test has failed. + bool failed = false; + + TestEventListener* repeater = listeners()->repeater(); + + start_timestamp_ = GetTimeInMillis(); + repeater->OnTestProgramStart(*parent_); + + // How many times to repeat the tests? We don't want to repeat them + // when we are inside the subprocess of a death test. + const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat); + // Repeats forever if the repeat count is negative. + const bool forever = repeat < 0; + for (int i = 0; forever || i != repeat; i++) { + // We want to preserve failures generated by ad-hoc test + // assertions executed before RUN_ALL_TESTS(). + ClearNonAdHocTestResult(); + + const TimeInMillis start = GetTimeInMillis(); + + // Shuffles test cases and tests if requested. + if (has_tests_to_run && GTEST_FLAG(shuffle)) { + random()->Reseed(random_seed_); + // This should be done before calling OnTestIterationStart(), + // such that a test event listener can see the actual test order + // in the event. + ShuffleTests(); + } + + // Tells the unit test event listeners that the tests are about to start. + repeater->OnTestIterationStart(*parent_, i); + + // Runs each test case if there is at least one test to run. + if (has_tests_to_run) { + // Sets up all environments beforehand. + repeater->OnEnvironmentsSetUpStart(*parent_); + ForEach(environments_, SetUpEnvironment); + repeater->OnEnvironmentsSetUpEnd(*parent_); + + // Runs the tests only if there was no fatal failure during global + // set-up. + if (!Test::HasFatalFailure()) { + for (int test_index = 0; test_index < total_test_case_count(); + test_index++) { + GetMutableTestCase(test_index)->Run(); + } + } + + // Tears down all environments in reverse order afterwards. + repeater->OnEnvironmentsTearDownStart(*parent_); + std::for_each(environments_.rbegin(), environments_.rend(), + TearDownEnvironment); + repeater->OnEnvironmentsTearDownEnd(*parent_); + } + + elapsed_time_ = GetTimeInMillis() - start; + + // Tells the unit test event listener that the tests have just finished. + repeater->OnTestIterationEnd(*parent_, i); + + // Gets the result and clears it. + if (!Passed()) { + failed = true; + } + + // Restores the original test order after the iteration. This + // allows the user to quickly repro a failure that happens in the + // N-th iteration without repeating the first (N - 1) iterations. + // This is not enclosed in "if (GTEST_FLAG(shuffle)) { ... }", in + // case the user somehow changes the value of the flag somewhere + // (it's always safe to unshuffle the tests). + UnshuffleTests(); + + if (GTEST_FLAG(shuffle)) { + // Picks a new random seed for each iteration. + random_seed_ = GetNextRandomSeed(random_seed_); + } + } + + repeater->OnTestProgramEnd(*parent_); + + return !failed; +} + +// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file +// if the variable is present. If a file already exists at this location, this +// function will write over it. If the variable is present, but the file cannot +// be created, prints an error and exits. +void WriteToShardStatusFileIfNeeded() { + const char* const test_shard_file = posix::GetEnv(kTestShardStatusFile); + if (test_shard_file != NULL) { + FILE* const file = posix::FOpen(test_shard_file, "w"); + if (file == NULL) { + ColoredPrintf(COLOR_RED, + "Could not write to the test shard status file \"%s\" " + "specified by the %s environment variable.\n", + test_shard_file, kTestShardStatusFile); + fflush(stdout); + exit(EXIT_FAILURE); + } + fclose(file); + } +} + +// Checks whether sharding is enabled by examining the relevant +// environment variable values. If the variables are present, +// but inconsistent (i.e., shard_index >= total_shards), prints +// an error and exits. If in_subprocess_for_death_test, sharding is +// disabled because it must only be applied to the original test +// process. Otherwise, we could filter out death tests we intended to execute. +bool ShouldShard(const char* total_shards_env, + const char* shard_index_env, + bool in_subprocess_for_death_test) { + if (in_subprocess_for_death_test) { + return false; + } + + const Int32 total_shards = Int32FromEnvOrDie(total_shards_env, -1); + const Int32 shard_index = Int32FromEnvOrDie(shard_index_env, -1); + + if (total_shards == -1 && shard_index == -1) { + return false; + } else if (total_shards == -1 && shard_index != -1) { + const Message msg = Message() + << "Invalid environment variables: you have " + << kTestShardIndex << " = " << shard_index + << ", but have left " << kTestTotalShards << " unset.\n"; + ColoredPrintf(COLOR_RED, msg.GetString().c_str()); + fflush(stdout); + exit(EXIT_FAILURE); + } else if (total_shards != -1 && shard_index == -1) { + const Message msg = Message() + << "Invalid environment variables: you have " + << kTestTotalShards << " = " << total_shards + << ", but have left " << kTestShardIndex << " unset.\n"; + ColoredPrintf(COLOR_RED, msg.GetString().c_str()); + fflush(stdout); + exit(EXIT_FAILURE); + } else if (shard_index < 0 || shard_index >= total_shards) { + const Message msg = Message() + << "Invalid environment variables: we require 0 <= " + << kTestShardIndex << " < " << kTestTotalShards + << ", but you have " << kTestShardIndex << "=" << shard_index + << ", " << kTestTotalShards << "=" << total_shards << ".\n"; + ColoredPrintf(COLOR_RED, msg.GetString().c_str()); + fflush(stdout); + exit(EXIT_FAILURE); + } + + return total_shards > 1; +} + +// Parses the environment variable var as an Int32. If it is unset, +// returns default_val. If it is not an Int32, prints an error +// and aborts. +Int32 Int32FromEnvOrDie(const char* var, Int32 default_val) { + const char* str_val = posix::GetEnv(var); + if (str_val == NULL) { + return default_val; + } + + Int32 result; + if (!ParseInt32(Message() << "The value of environment variable " << var, + str_val, &result)) { + exit(EXIT_FAILURE); + } + return result; +} + +// Given the total number of shards, the shard index, and the test id, +// returns true iff the test should be run on this shard. The test id is +// some arbitrary but unique non-negative integer assigned to each test +// method. Assumes that 0 <= shard_index < total_shards. +bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) { + return (test_id % total_shards) == shard_index; +} + +// Compares the name of each test with the user-specified filter to +// decide whether the test should be run, then records the result in +// each TestCase and TestInfo object. +// If shard_tests == true, further filters tests based on sharding +// variables in the environment - see +// http://code.google.com/p/googletest/wiki/GoogleTestAdvancedGuide. +// Returns the number of tests that should run. +int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) { + const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ? + Int32FromEnvOrDie(kTestTotalShards, -1) : -1; + const Int32 shard_index = shard_tests == HONOR_SHARDING_PROTOCOL ? + Int32FromEnvOrDie(kTestShardIndex, -1) : -1; + + // num_runnable_tests are the number of tests that will + // run across all shards (i.e., match filter and are not disabled). + // num_selected_tests are the number of tests to be run on + // this shard. + int num_runnable_tests = 0; + int num_selected_tests = 0; + for (size_t i = 0; i < test_cases_.size(); i++) { + TestCase* const test_case = test_cases_[i]; + const std::string &test_case_name = test_case->name(); + test_case->set_should_run(false); + + for (size_t j = 0; j < test_case->test_info_list().size(); j++) { + TestInfo* const test_info = test_case->test_info_list()[j]; + const std::string test_name(test_info->name()); + // A test is disabled if test case name or test name matches + // kDisableTestFilter. + const bool is_disabled = + internal::UnitTestOptions::MatchesFilter(test_case_name, + kDisableTestFilter) || + internal::UnitTestOptions::MatchesFilter(test_name, + kDisableTestFilter); + test_info->is_disabled_ = is_disabled; + + const bool matches_filter = + internal::UnitTestOptions::FilterMatchesTest(test_case_name, + test_name); + test_info->matches_filter_ = matches_filter; + + const bool is_runnable = + (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) && + matches_filter; + + const bool is_selected = is_runnable && + (shard_tests == IGNORE_SHARDING_PROTOCOL || + ShouldRunTestOnShard(total_shards, shard_index, + num_runnable_tests)); + + num_runnable_tests += is_runnable; + num_selected_tests += is_selected; + + test_info->should_run_ = is_selected; + test_case->set_should_run(test_case->should_run() || is_selected); + } + } + return num_selected_tests; +} + +// Prints the given C-string on a single line by replacing all '\n' +// characters with string "\\n". If the output takes more than +// max_length characters, only prints the first max_length characters +// and "...". +static void PrintOnOneLine(const char* str, int max_length) { + if (str != NULL) { + for (int i = 0; *str != '\0'; ++str) { + if (i >= max_length) { + printf("..."); + break; + } + if (*str == '\n') { + printf("\\n"); + i += 2; + } else { + printf("%c", *str); + ++i; + } + } + } +} + +// Prints the names of the tests matching the user-specified filter flag. +void UnitTestImpl::ListTestsMatchingFilter() { + // Print at most this many characters for each type/value parameter. + const int kMaxParamLength = 250; + + for (size_t i = 0; i < test_cases_.size(); i++) { + const TestCase* const test_case = test_cases_[i]; + bool printed_test_case_name = false; + + for (size_t j = 0; j < test_case->test_info_list().size(); j++) { + const TestInfo* const test_info = + test_case->test_info_list()[j]; + if (test_info->matches_filter_) { + if (!printed_test_case_name) { + printed_test_case_name = true; + printf("%s.", test_case->name()); + if (test_case->type_param() != NULL) { + printf(" # %s = ", kTypeParamLabel); + // We print the type parameter on a single line to make + // the output easy to parse by a program. + PrintOnOneLine(test_case->type_param(), kMaxParamLength); + } + printf("\n"); + } + printf(" %s", test_info->name()); + if (test_info->value_param() != NULL) { + printf(" # %s = ", kValueParamLabel); + // We print the value parameter on a single line to make the + // output easy to parse by a program. + PrintOnOneLine(test_info->value_param(), kMaxParamLength); + } + printf("\n"); + } + } + } + fflush(stdout); +} + +// Sets the OS stack trace getter. +// +// Does nothing if the input and the current OS stack trace getter are +// the same; otherwise, deletes the old getter and makes the input the +// current getter. +void UnitTestImpl::set_os_stack_trace_getter( + OsStackTraceGetterInterface* getter) { + if (os_stack_trace_getter_ != getter) { + delete os_stack_trace_getter_; + os_stack_trace_getter_ = getter; + } +} + +// Returns the current OS stack trace getter if it is not NULL; +// otherwise, creates an OsStackTraceGetter, makes it the current +// getter, and returns it. +OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() { + if (os_stack_trace_getter_ == NULL) { + os_stack_trace_getter_ = new OsStackTraceGetter; + } + + return os_stack_trace_getter_; +} + +// Returns the TestResult for the test that's currently running, or +// the TestResult for the ad hoc test if no test is running. +TestResult* UnitTestImpl::current_test_result() { + return current_test_info_ ? + &(current_test_info_->result_) : &ad_hoc_test_result_; +} + +// Shuffles all test cases, and the tests within each test case, +// making sure that death tests are still run first. +void UnitTestImpl::ShuffleTests() { + // Shuffles the death test cases. + ShuffleRange(random(), 0, last_death_test_case_ + 1, &test_case_indices_); + + // Shuffles the non-death test cases. + ShuffleRange(random(), last_death_test_case_ + 1, + static_cast(test_cases_.size()), &test_case_indices_); + + // Shuffles the tests inside each test case. + for (size_t i = 0; i < test_cases_.size(); i++) { + test_cases_[i]->ShuffleTests(random()); + } +} + +// Restores the test cases and tests to their order before the first shuffle. +void UnitTestImpl::UnshuffleTests() { + for (size_t i = 0; i < test_cases_.size(); i++) { + // Unshuffles the tests in each test case. + test_cases_[i]->UnshuffleTests(); + // Resets the index of each test case. + test_case_indices_[i] = static_cast(i); + } +} + +// Returns the current OS stack trace as an std::string. +// +// The maximum number of stack frames to be included is specified by +// the gtest_stack_trace_depth flag. The skip_count parameter +// specifies the number of top frames to be skipped, which doesn't +// count against the number of frames to be included. +// +// For example, if Foo() calls Bar(), which in turn calls +// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in +// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't. +std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/, + int skip_count) { + // We pass skip_count + 1 to skip this wrapper function in addition + // to what the user really wants to skip. + return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1); +} + +// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to +// suppress unreachable code warnings. +namespace { +class ClassUniqueToAlwaysTrue {}; +} + +bool IsTrue(bool condition) { return condition; } + +bool AlwaysTrue() { +#if GTEST_HAS_EXCEPTIONS + // This condition is always false so AlwaysTrue() never actually throws, + // but it makes the compiler think that it may throw. + if (IsTrue(false)) + throw ClassUniqueToAlwaysTrue(); +#endif // GTEST_HAS_EXCEPTIONS + return true; +} + +// If *pstr starts with the given prefix, modifies *pstr to be right +// past the prefix and returns true; otherwise leaves *pstr unchanged +// and returns false. None of pstr, *pstr, and prefix can be NULL. +bool SkipPrefix(const char* prefix, const char** pstr) { + const size_t prefix_len = strlen(prefix); + if (strncmp(*pstr, prefix, prefix_len) == 0) { + *pstr += prefix_len; + return true; + } + return false; +} + +// Parses a string as a command line flag. The string should have +// the format "--flag=value". When def_optional is true, the "=value" +// part can be omitted. +// +// Returns the value of the flag, or NULL if the parsing failed. +const char* ParseFlagValue(const char* str, + const char* flag, + bool def_optional) { + // str and flag must not be NULL. + if (str == NULL || flag == NULL) return NULL; + + // The flag must start with "--" followed by GTEST_FLAG_PREFIX_. + const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag; + const size_t flag_len = flag_str.length(); + if (strncmp(str, flag_str.c_str(), flag_len) != 0) return NULL; + + // Skips the flag name. + const char* flag_end = str + flag_len; + + // When def_optional is true, it's OK to not have a "=value" part. + if (def_optional && (flag_end[0] == '\0')) { + return flag_end; + } + + // If def_optional is true and there are more characters after the + // flag name, or if def_optional is false, there must be a '=' after + // the flag name. + if (flag_end[0] != '=') return NULL; + + // Returns the string after "=". + return flag_end + 1; +} + +// Parses a string for a bool flag, in the form of either +// "--flag=value" or "--flag". +// +// In the former case, the value is taken as true as long as it does +// not start with '0', 'f', or 'F'. +// +// In the latter case, the value is taken as true. +// +// On success, stores the value of the flag in *value, and returns +// true. On failure, returns false without changing *value. +bool ParseBoolFlag(const char* str, const char* flag, bool* value) { + // Gets the value of the flag as a string. + const char* const value_str = ParseFlagValue(str, flag, true); + + // Aborts if the parsing failed. + if (value_str == NULL) return false; + + // Converts the string value to a bool. + *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F'); + return true; +} + +// Parses a string for an Int32 flag, in the form of +// "--flag=value". +// +// On success, stores the value of the flag in *value, and returns +// true. On failure, returns false without changing *value. +bool ParseInt32Flag(const char* str, const char* flag, Int32* value) { + // Gets the value of the flag as a string. + const char* const value_str = ParseFlagValue(str, flag, false); + + // Aborts if the parsing failed. + if (value_str == NULL) return false; + + // Sets *value to the value of the flag. + return ParseInt32(Message() << "The value of flag --" << flag, + value_str, value); +} + +// Parses a string for a string flag, in the form of +// "--flag=value". +// +// On success, stores the value of the flag in *value, and returns +// true. On failure, returns false without changing *value. +bool ParseStringFlag(const char* str, const char* flag, std::string* value) { + // Gets the value of the flag as a string. + const char* const value_str = ParseFlagValue(str, flag, false); + + // Aborts if the parsing failed. + if (value_str == NULL) return false; + + // Sets *value to the value of the flag. + *value = value_str; + return true; +} + +// Determines whether a string has a prefix that Google Test uses for its +// flags, i.e., starts with GTEST_FLAG_PREFIX_ or GTEST_FLAG_PREFIX_DASH_. +// If Google Test detects that a command line flag has its prefix but is not +// recognized, it will print its help message. Flags starting with +// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test +// internal flags and do not trigger the help message. +static bool HasGoogleTestFlagPrefix(const char* str) { + return (SkipPrefix("--", &str) || + SkipPrefix("-", &str) || + SkipPrefix("/", &str)) && + !SkipPrefix(GTEST_FLAG_PREFIX_ "internal_", &str) && + (SkipPrefix(GTEST_FLAG_PREFIX_, &str) || + SkipPrefix(GTEST_FLAG_PREFIX_DASH_, &str)); +} + +// Prints a string containing code-encoded text. The following escape +// sequences can be used in the string to control the text color: +// +// @@ prints a single '@' character. +// @R changes the color to red. +// @G changes the color to green. +// @Y changes the color to yellow. +// @D changes to the default terminal text color. +// +// TODO(wan@google.com): Write tests for this once we add stdout +// capturing to Google Test. +static void PrintColorEncoded(const char* str) { + GTestColor color = COLOR_DEFAULT; // The current color. + + // Conceptually, we split the string into segments divided by escape + // sequences. Then we print one segment at a time. At the end of + // each iteration, the str pointer advances to the beginning of the + // next segment. + for (;;) { + const char* p = strchr(str, '@'); + if (p == NULL) { + ColoredPrintf(color, "%s", str); + return; + } + + ColoredPrintf(color, "%s", std::string(str, p).c_str()); + + const char ch = p[1]; + str = p + 2; + if (ch == '@') { + ColoredPrintf(color, "@"); + } else if (ch == 'D') { + color = COLOR_DEFAULT; + } else if (ch == 'R') { + color = COLOR_RED; + } else if (ch == 'G') { + color = COLOR_GREEN; + } else if (ch == 'Y') { + color = COLOR_YELLOW; + } else { + --str; + } + } +} + +static const char kColorEncodedHelpMessage[] = +"This program contains tests written using " GTEST_NAME_ ". You can use the\n" +"following command line flags to control its behavior:\n" +"\n" +"Test Selection:\n" +" @G--" GTEST_FLAG_PREFIX_ "list_tests@D\n" +" List the names of all tests instead of running them. The name of\n" +" TEST(Foo, Bar) is \"Foo.Bar\".\n" +" @G--" GTEST_FLAG_PREFIX_ "filter=@YPOSTIVE_PATTERNS" + "[@G-@YNEGATIVE_PATTERNS]@D\n" +" Run only the tests whose name matches one of the positive patterns but\n" +" none of the negative patterns. '?' matches any single character; '*'\n" +" matches any substring; ':' separates two patterns.\n" +" @G--" GTEST_FLAG_PREFIX_ "also_run_disabled_tests@D\n" +" Run all disabled tests too.\n" +"\n" +"Test Execution:\n" +" @G--" GTEST_FLAG_PREFIX_ "repeat=@Y[COUNT]@D\n" +" Run the tests repeatedly; use a negative count to repeat forever.\n" +" @G--" GTEST_FLAG_PREFIX_ "shuffle@D\n" +" Randomize tests' orders on every iteration.\n" +" @G--" GTEST_FLAG_PREFIX_ "random_seed=@Y[NUMBER]@D\n" +" Random number seed to use for shuffling test orders (between 1 and\n" +" 99999, or 0 to use a seed based on the current time).\n" +"\n" +"Test Output:\n" +" @G--" GTEST_FLAG_PREFIX_ "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n" +" Enable/disable colored output. The default is @Gauto@D.\n" +" -@G-" GTEST_FLAG_PREFIX_ "print_time=0@D\n" +" Don't print the elapsed time of each test.\n" +" @G--" GTEST_FLAG_PREFIX_ "output=xml@Y[@G:@YDIRECTORY_PATH@G" + GTEST_PATH_SEP_ "@Y|@G:@YFILE_PATH]@D\n" +" Generate an XML report in the given directory or with the given file\n" +" name. @YFILE_PATH@D defaults to @Gtest_details.xml@D.\n" +#if GTEST_CAN_STREAM_RESULTS_ +" @G--" GTEST_FLAG_PREFIX_ "stream_result_to=@YHOST@G:@YPORT@D\n" +" Stream test results to the given server.\n" +#endif // GTEST_CAN_STREAM_RESULTS_ +"\n" +"Assertion Behavior:\n" +#if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS +" @G--" GTEST_FLAG_PREFIX_ "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n" +" Set the default death test style.\n" +#endif // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS +" @G--" GTEST_FLAG_PREFIX_ "break_on_failure@D\n" +" Turn assertion failures into debugger break-points.\n" +" @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n" +" Turn assertion failures into C++ exceptions.\n" +" @G--" GTEST_FLAG_PREFIX_ "catch_exceptions=0@D\n" +" Do not report exceptions as test failures. Instead, allow them\n" +" to crash the program or throw a pop-up (on Windows).\n" +"\n" +"Except for @G--" GTEST_FLAG_PREFIX_ "list_tests@D, you can alternatively set " + "the corresponding\n" +"environment variable of a flag (all letters in upper-case). For example, to\n" +"disable colored text output, you can either specify @G--" GTEST_FLAG_PREFIX_ + "color=no@D or set\n" +"the @G" GTEST_FLAG_PREFIX_UPPER_ "COLOR@D environment variable to @Gno@D.\n" +"\n" +"For more information, please read the " GTEST_NAME_ " documentation at\n" +"@G" GTEST_PROJECT_URL_ "@D. If you find a bug in " GTEST_NAME_ "\n" +"(not one in your own code or tests), please report it to\n" +"@G<" GTEST_DEV_EMAIL_ ">@D.\n"; + +// Parses the command line for Google Test flags, without initializing +// other parts of Google Test. The type parameter CharType can be +// instantiated to either char or wchar_t. +template +void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) { + for (int i = 1; i < *argc; i++) { + const std::string arg_string = StreamableToString(argv[i]); + const char* const arg = arg_string.c_str(); + + using internal::ParseBoolFlag; + using internal::ParseInt32Flag; + using internal::ParseStringFlag; + + // Do we see a Google Test flag? + if (ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag, + >EST_FLAG(also_run_disabled_tests)) || + ParseBoolFlag(arg, kBreakOnFailureFlag, + >EST_FLAG(break_on_failure)) || + ParseBoolFlag(arg, kCatchExceptionsFlag, + >EST_FLAG(catch_exceptions)) || + ParseStringFlag(arg, kColorFlag, >EST_FLAG(color)) || + ParseStringFlag(arg, kDeathTestStyleFlag, + >EST_FLAG(death_test_style)) || + ParseBoolFlag(arg, kDeathTestUseFork, + >EST_FLAG(death_test_use_fork)) || + ParseStringFlag(arg, kFilterFlag, >EST_FLAG(filter)) || + ParseStringFlag(arg, kInternalRunDeathTestFlag, + >EST_FLAG(internal_run_death_test)) || + ParseBoolFlag(arg, kListTestsFlag, >EST_FLAG(list_tests)) || + ParseStringFlag(arg, kOutputFlag, >EST_FLAG(output)) || + ParseBoolFlag(arg, kPrintTimeFlag, >EST_FLAG(print_time)) || + ParseInt32Flag(arg, kRandomSeedFlag, >EST_FLAG(random_seed)) || + ParseInt32Flag(arg, kRepeatFlag, >EST_FLAG(repeat)) || + ParseBoolFlag(arg, kShuffleFlag, >EST_FLAG(shuffle)) || + ParseInt32Flag(arg, kStackTraceDepthFlag, + >EST_FLAG(stack_trace_depth)) || + ParseStringFlag(arg, kStreamResultToFlag, + >EST_FLAG(stream_result_to)) || + ParseBoolFlag(arg, kThrowOnFailureFlag, + >EST_FLAG(throw_on_failure)) + ) { + // Yes. Shift the remainder of the argv list left by one. Note + // that argv has (*argc + 1) elements, the last one always being + // NULL. The following loop moves the trailing NULL element as + // well. + for (int j = i; j != *argc; j++) { + argv[j] = argv[j + 1]; + } + + // Decrements the argument count. + (*argc)--; + + // We also need to decrement the iterator as we just removed + // an element. + i--; + } else if (arg_string == "--help" || arg_string == "-h" || + arg_string == "-?" || arg_string == "/?" || + HasGoogleTestFlagPrefix(arg)) { + // Both help flag and unrecognized Google Test flags (excluding + // internal ones) trigger help display. + g_help_flag = true; + } + } + + if (g_help_flag) { + // We print the help here instead of in RUN_ALL_TESTS(), as the + // latter may not be called at all if the user is using Google + // Test with another testing framework. + PrintColorEncoded(kColorEncodedHelpMessage); + } +} + +// Parses the command line for Google Test flags, without initializing +// other parts of Google Test. +void ParseGoogleTestFlagsOnly(int* argc, char** argv) { + ParseGoogleTestFlagsOnlyImpl(argc, argv); +} +void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) { + ParseGoogleTestFlagsOnlyImpl(argc, argv); +} + +// The internal implementation of InitGoogleTest(). +// +// The type parameter CharType can be instantiated to either char or +// wchar_t. +template +void InitGoogleTestImpl(int* argc, CharType** argv) { + g_init_gtest_count++; + + // We don't want to run the initialization code twice. + if (g_init_gtest_count != 1) return; + + if (*argc <= 0) return; + + internal::g_executable_path = internal::StreamableToString(argv[0]); + +#if GTEST_HAS_DEATH_TEST + + g_argvs.clear(); + for (int i = 0; i != *argc; i++) { + g_argvs.push_back(StreamableToString(argv[i])); + } + +#endif // GTEST_HAS_DEATH_TEST + + ParseGoogleTestFlagsOnly(argc, argv); + GetUnitTestImpl()->PostFlagParsingInit(); +} + +} // namespace internal + +// Initializes Google Test. This must be called before calling +// RUN_ALL_TESTS(). In particular, it parses a command line for the +// flags that Google Test recognizes. Whenever a Google Test flag is +// seen, it is removed from argv, and *argc is decremented. +// +// No value is returned. Instead, the Google Test flag variables are +// updated. +// +// Calling the function for the second time has no user-visible effect. +void InitGoogleTest(int* argc, char** argv) { + internal::InitGoogleTestImpl(argc, argv); +} + +// This overloaded version can be used in Windows programs compiled in +// UNICODE mode. +void InitGoogleTest(int* argc, wchar_t** argv) { + internal::InitGoogleTestImpl(argc, argv); +} + +} // namespace testing diff --git a/lib/gtest/src/gtest_main.cc b/lib/gtest/src/gtest_main.cc new file mode 100644 index 00000000..f3028225 --- /dev/null +++ b/lib/gtest/src/gtest_main.cc @@ -0,0 +1,38 @@ +// Copyright 2006, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include + +#include "gtest/gtest.h" + +GTEST_API_ int main(int argc, char **argv) { + printf("Running main() from gtest_main.cc\n"); + testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/lib/tut-framework/include/tut.h b/lib/tut-framework/include/tut.h deleted file mode 100644 index 4cb37a59..00000000 --- a/lib/tut-framework/include/tut.h +++ /dev/null @@ -1,2 +0,0 @@ -#warning This header is deprecated and will be removed in next versions. Please #include instead -#include diff --git a/lib/tut-framework/include/tut/tut.hpp b/lib/tut-framework/include/tut/tut.hpp deleted file mode 100644 index 55796d69..00000000 --- a/lib/tut-framework/include/tut/tut.hpp +++ /dev/null @@ -1,572 +0,0 @@ -#ifndef TUT_H_GUARD -#define TUT_H_GUARD -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "tut_exception.hpp" -#include "tut_result.hpp" -#include "tut_posix.hpp" -#include "tut_assert.hpp" -#include "tut_runner.hpp" - -#if defined(TUT_USE_SEH) -#include -#include -#endif - -/** - * Template Unit Tests Framework for C++. - * http://tut.dozen.ru - * - * @author Vladimir Dyuzhev, Vladimir.Dyuzhev@gmail.com - */ -namespace tut -{ - -template -class test_group; - -/** - * Test object. Contains data test run upon and default test method - * implementation. Inherited from Data to allow tests to - * access test data as members. - */ -template -class test_object : public Data, public test_object_posix -{ - template - friend class test_group; - - void set_test_group(const char *group) - { - current_test_group_ = group; - } - - void set_test_id(int current_test_id) - { - current_test_id_ = current_test_id; - } - -public: - - /** - * Default constructor - */ - test_object() - : called_method_was_a_dummy_test_(false), - current_test_id_(0), - current_test_name_(), - current_test_group_() - { - } - - void set_test_name(const std::string& current_test_name) - { - current_test_name_ = current_test_name; - } - - const std::string& get_test_name() const - { - return current_test_name_; - } - - const std::string& get_test_group() const - { - return current_test_group_; - } - - int get_test_id() const - { - return current_test_id_; - } - - /** - * Default do-nothing test. - */ - template - void test() - { - called_method_was_a_dummy_test_ = true; - } - - /** - * The flag is set to true by default (dummy) test. - * Used to detect usused test numbers and avoid unnecessary - * test object creation which may be time-consuming depending - * on operations described in Data::Data() and Data::~Data(). - */ - bool called_method_was_a_dummy_test_; - - virtual ~test_object() - { - } - -private: - int current_test_id_; - std::string current_test_name_; - std::string current_test_group_; -}; - - -/** - * Walks through test tree and stores address of each - * test method in group. Instantiation stops at 0. - */ -template -struct tests_registerer -{ - static void reg(Group& group) - { - group.reg(n, &Test::template test); - tests_registerer::reg(group); - } -}; - -template -struct tests_registerer -{ - static void reg(Group&) - { - } -}; - -/** - * Test group; used to recreate test object instance for - * each new test since we have to have reinitialized - * Data base class. - */ -template -class test_group : public group_base, public test_group_posix -{ - test_group(const test_group&); - void operator=(const test_group&); - - const char* name_; - - typedef void (test_object::*testmethod)(); - typedef std::map tests; - typedef typename tests::iterator tests_iterator; - typedef typename tests::const_iterator tests_const_iterator; - typedef typename tests::const_reverse_iterator - tests_const_reverse_iterator; - typedef typename tests::size_type size_type; - - tests tests_; - tests_iterator current_test_; - - enum seh_result - { - SEH_OK, -#if defined(TUT_USE_SEH) - SEH_CTOR, - SEH_TEST, -#endif - SEH_DUMMY - }; - - /** - * Exception-in-destructor-safe smart-pointer class. - */ - template - class safe_holder - { - T* p_; - bool permit_throw_in_dtor; - - safe_holder(const safe_holder&); - safe_holder& operator=(const safe_holder&); - - public: - safe_holder() - : p_(0), - permit_throw_in_dtor(false) - { - } - - ~safe_holder() - { - release(); - } - - T* operator->() const - { - return p_; - } - - T* get() const - { - return p_; - } - - /** - * Tell ptr it can throw from destructor. Right way is to - * use std::uncaught_exception(), but some compilers lack - * correct implementation of the function. - */ - void permit_throw() - { - permit_throw_in_dtor = true; - } - - /** - * Specially treats exceptions in test object destructor; - * if test itself failed, exceptions in destructor - * are ignored; if test was successful and destructor failed, - * warning exception throwed. - */ - void release() - { - try - { -#if defined(TUT_USE_SEH) - if (delete_obj() == false) - { - throw warning("destructor of test object raised" - " an SEH exception"); - } -#else - bool d = delete_obj(); - assert(d && "delete failed with SEH disabled: runtime bug?"); -#endif - } - catch (const std::exception& ex) - { - if (permit_throw_in_dtor) - { - std::string msg = "destructor of test object raised" - " exception: "; - msg += ex.what(); - throw warning(msg); - } - } - catch( ... ) - { - if (permit_throw_in_dtor) - { - throw warning("destructor of test object raised an" - " exception"); - } - } - } - - /** - * Re-init holder to get brand new object. - */ - void reset() - { - release(); - permit_throw_in_dtor = false; - p_ = new T(); - } - - bool delete_obj() - { -#if defined(TUT_USE_SEH) - __try - { -#endif - T* p = p_; - p_ = 0; - delete p; -#if defined(TUT_USE_SEH) - } - __except(handle_seh_(::GetExceptionCode())) - { - if (permit_throw_in_dtor) - { - return false; - } - } -#endif - return true; - } - }; - -public: - - typedef test_object object; - - /** - * Creates and registers test group with specified name. - */ - test_group(const char* name) - : name_(name), - tests_(), - current_test_() - { - // register itself - runner.get().register_group(name_,this); - - // register all tests - tests_registerer::reg(*this); - } - - /** - * This constructor is used in self-test run only. - */ - test_group(const char* name, test_runner& another_runner) - : name_(name), - tests_(), - current_test_() - { - // register itself - another_runner.register_group(name_, this); - - // register all tests - tests_registerer, test_group, - MaxTestsInGroup>::reg(*this); - }; - - /** - * Registers test method under given number. - */ - void reg(int n, testmethod tm) - { - tests_[n] = tm; - } - - /** - * Reset test position before first test. - */ - void rewind() - { - current_test_ = tests_.begin(); - } - - /** - * Runs next test. - */ - bool run_next(test_result &tr) - { - if (current_test_ == tests_.end()) - { - return false; - } - - // find next user-specialized test - safe_holder obj; - while (current_test_ != tests_.end()) - { - tests_iterator current_test = current_test_++; - - if(run_test_(current_test, obj, tr) && tr.result != test_result::dummy) - { - return true; - } - } - - return false; - } - - /** - * Runs one test by position. - */ - bool run_test(int n, test_result &tr) - { - if (tests_.rbegin() == tests_.rend() || - tests_.rbegin()->first < n) - { - return false; - } - - // withing scope; check if given test exists - tests_iterator ti = tests_.find(n); - if (ti == tests_.end()) - { - return false; - } - - safe_holder obj; - return run_test_(ti, obj, tr); - } - - /** - * VC allows only one exception handling type per function, - * so I have to split the method. - */ - bool run_test_(const tests_iterator& ti, safe_holder& obj, test_result &tr) - { - std::string current_test_name; - - tr = test_result(name_, ti->first, current_test_name, test_result::ok); - - try - { - switch (run_test_seh_(ti->second, obj, current_test_name, ti->first, tr)) - { -#if defined(TUT_USE_SEH) - case SEH_CTOR: - throw bad_ctor("seh"); - break; - - case SEH_TEST: - throw seh("seh"); - break; -#endif - case SEH_DUMMY: - tr.result = test_result::dummy; - break; - - case SEH_OK: - // ok - break; - } - } - catch (const rethrown& ex) - { - tr = ex.tr; - tr.result = test_result::rethrown; - } - catch (const tut_error& ex) - { - tr.result = ex.result(); - tr.exception_typeid = ex.type(); - tr.message = ex.what(); - } - catch (const std::exception& ex) - { - tr.result = test_result::ex; - tr.exception_typeid = type_name(ex); - tr.message = ex.what(); - } - catch (...) - { - // test failed with unknown exception - tr.result = test_result::ex; - } - - if (obj.get()) - { - tr.name = obj->get_test_name(); - - // try to report to parent, if exists - send_result_(obj.get(), tr); - } - else - { - tr.name = current_test_name; - } - - return true; - } - - /** - * Runs one under SEH if platform supports it. - */ - seh_result run_test_seh_(testmethod tm, safe_holder& obj, - std::string& current_test_name, int current_test_id, test_result tr) - { -#if defined(TUT_USE_SEH) - __try - { -#endif - if (obj.get() == 0) - { - reset_holder_(obj); - } - - obj->called_method_was_a_dummy_test_ = false; - -#if defined(TUT_USE_SEH) - - __try - { -#endif - obj.get()->set_test_id(current_test_id); - obj.get()->set_test_group(name_); - (obj.get()->*tm)(); - -#if defined(TUT_USE_SEH) - } - __except(handle_seh_(::GetExceptionCode())) - { - current_test_name = obj->get_test_name(); - return SEH_TEST; - } -#endif - - if (obj->called_method_was_a_dummy_test_) - { - // do not call obj.release(); reuse object - return SEH_DUMMY; - } - - current_test_name = obj->get_test_name(); - obj.permit_throw(); - obj.release(); -#if defined(TUT_USE_SEH) - } - __except(handle_seh_(::GetExceptionCode())) - { - return SEH_CTOR; - } -#endif - return SEH_OK; - } - - void reset_holder_(safe_holder& obj) - { - try - { - obj.reset(); - } - catch (const std::exception& ex) - { - throw bad_ctor(ex.what()); - } - catch (...) - { - throw bad_ctor("test constructor has generated an exception;" - " group execution is terminated"); - } - } -}; - -#if defined(TUT_USE_SEH) -/** - * Decides should we execute handler or ignore SE. - */ -inline int handle_seh_(DWORD excode) -{ - switch(excode) - { - case EXCEPTION_ACCESS_VIOLATION: - case EXCEPTION_DATATYPE_MISALIGNMENT: - case EXCEPTION_BREAKPOINT: - case EXCEPTION_SINGLE_STEP: - case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: - case EXCEPTION_FLT_DENORMAL_OPERAND: - case EXCEPTION_FLT_DIVIDE_BY_ZERO: - case EXCEPTION_FLT_INEXACT_RESULT: - case EXCEPTION_FLT_INVALID_OPERATION: - case EXCEPTION_FLT_OVERFLOW: - case EXCEPTION_FLT_STACK_CHECK: - case EXCEPTION_FLT_UNDERFLOW: - case EXCEPTION_INT_DIVIDE_BY_ZERO: - case EXCEPTION_INT_OVERFLOW: - case EXCEPTION_PRIV_INSTRUCTION: - case EXCEPTION_IN_PAGE_ERROR: - case EXCEPTION_ILLEGAL_INSTRUCTION: - case EXCEPTION_NONCONTINUABLE_EXCEPTION: - case EXCEPTION_STACK_OVERFLOW: - case EXCEPTION_INVALID_DISPOSITION: - case EXCEPTION_GUARD_PAGE: - case EXCEPTION_INVALID_HANDLE: - return EXCEPTION_EXECUTE_HANDLER; - }; - - return EXCEPTION_CONTINUE_SEARCH; -} -#endif -} - -#endif // TUT_H_GUARD - diff --git a/lib/tut-framework/include/tut/tut_assert.hpp b/lib/tut-framework/include/tut/tut_assert.hpp deleted file mode 100644 index 0e7a9e0f..00000000 --- a/lib/tut-framework/include/tut/tut_assert.hpp +++ /dev/null @@ -1,283 +0,0 @@ -#ifndef TUT_ASSERT_H_GUARD -#define TUT_ASSERT_H_GUARD -#include - -#include -#include -#include -#include -#include - -#if defined(TUT_USE_POSIX) -#include -#include -#endif - -#include "tut_exception.hpp" - -namespace tut -{ - - namespace detail - { - template - std::ostream &msg_prefix(std::ostream &str, const M &msg) - { - std::stringstream ss; - ss << msg; - - if(!ss.str().empty()) - { - str << ss.rdbuf() << ": "; - } - - return str; - } - } - - -namespace -{ - -/** - * Tests provided condition. - * Throws if false. - */ -void ensure(bool cond) -{ - if (!cond) - { - // TODO: default ctor? - throw failure(""); - } -} - -/** - * Tests provided condition. - * Throws if true. - */ -void ensure_not(bool cond) -{ - ensure(!cond); -} - -/** - * Tests provided condition. - * Throws if false. - */ -template -void ensure(const M& msg, bool cond) -{ - if (!cond) - { - throw failure(msg); - } -} - -/** - * Tests provided condition. - * Throws if true. - */ -template -void ensure_not(const M& msg, bool cond) -{ - ensure(msg, !cond); -} - -/** - * Tests two objects for being equal. - * Throws if false. - * - * NB: both T and Q must have operator << defined somewhere, or - * client code will not compile at all! - */ -template -void ensure_equals(const M& msg, const LHS& actual, const RHS& expected) -{ - if (expected != actual) - { - std::stringstream ss; - detail::msg_prefix(ss,msg) - << "expected `" - << expected - << "` actual `" - << actual - << "`"; - throw failure(ss.str()); - } -} - -template -void ensure_equals(const M& msg, const double& actual, const double& expected, const double& epsilon) -{ - const double diff = actual - expected; - - if ( (actual != expected) && !((diff <= epsilon) && (diff >= -epsilon )) ) - { - std::stringstream ss; - detail::msg_prefix(ss,msg) - << std::scientific - << std::showpoint - << std::setprecision(16) - << "expected `" << expected - << "` actual `" << actual - << "` with precision `" << epsilon << "`"; - throw failure(ss.str()); - } -} - -template -void ensure_equals(const M& msg, const double& actual, const double& expected) -{ - ensure_equals(msg, actual, expected, std::numeric_limits::epsilon()); -} - -template -void ensure_equals(const LHS& actual, const RHS& expected) -{ - ensure_equals("Values are not equal", actual, expected); -} - - -template -void ensure_equals(const std::string &msg, - const LhsIterator &lhs_begin, const LhsIterator &lhs_end, - const RhsIterator &rhs_begin, const RhsIterator &rhs_end) -{ - typename std::iterator_traits::difference_type lhs_size = std::distance(lhs_begin, lhs_end); - typename std::iterator_traits::difference_type rhs_size = std::distance(rhs_begin, rhs_end); - - if(lhs_size < rhs_size) - { - ensure_equals(msg + ": range is too short", lhs_size, rhs_size); - } - - if(lhs_size > rhs_size) - { - ensure_equals(msg + ": range is too long", lhs_size, rhs_size); - } - - assert(lhs_size == rhs_size); - - LhsIterator lhs_i = lhs_begin; - RhsIterator rhs_i = rhs_begin; - while( (lhs_i != lhs_end) && (rhs_i != rhs_end) ) - { - if(*lhs_i != *rhs_i) - { - std::stringstream ss; - detail::msg_prefix(ss,msg) - << "expected `" << *rhs_i - << "` actual `" << *lhs_i - << "` at offset " << std::distance(lhs_begin, lhs_i); - throw failure(ss.str()); - } - - lhs_i++; - rhs_i++; - } - - assert(lhs_i == lhs_end); - assert(rhs_i == rhs_end); -} - -template -void ensure_equals(const LhsIterator &lhs_begin, const LhsIterator &lhs_end, - const RhsIterator &rhs_begin, const RhsIterator &rhs_end) -{ - ensure_equals("Ranges are not equal", lhs_begin, lhs_end, rhs_begin, rhs_end); -} - -template -void ensure_equals(const LhsType *lhs_begin, const LhsType *lhs_end, - const RhsType *rhs_begin, const RhsType *rhs_end) -{ - ensure_equals("Ranges are not equal", lhs_begin, lhs_end, rhs_begin, rhs_end); -} - -/** - * Tests two objects for being at most in given distance one from another. - * Borders are excluded. - * Throws if false. - * - * NB: T must have operator << defined somewhere, or - * client code will not compile at all! Also, T shall have - * operators + and -, and be comparable. - * - * TODO: domains are wrong, T - T might not yield T, but Q - */ -template -void ensure_distance(const M& msg, const T& actual, const T& expected, const T& distance) -{ - if (expected-distance >= actual || expected+distance <= actual) - { - std::stringstream ss; - detail::msg_prefix(ss,msg) - << " expected `" - << expected-distance - << "` - `" - << expected+distance - << "` actual `" - << actual - << "`"; - throw failure(ss.str()); - } -} - -template -void ensure_distance(const T& actual, const T& expected, const T& distance) -{ - ensure_distance<>("Distance is wrong", actual, expected, distance); -} - -template -void ensure_errno(const M& msg, bool cond) -{ - if(!cond) - { -#if defined(TUT_USE_POSIX) - char e[512]; - std::stringstream ss; - detail::msg_prefix(ss,msg) - << strerror_r(errno, e, sizeof(e)); - throw failure(ss.str()); -#else - throw failure(msg); -#endif - } -} - -/** - * Unconditionally fails with message. - */ -void fail(const char* msg = "") -{ - throw failure(msg); -} - -template -void fail(const M& msg) -{ - throw failure(msg); -} - -/** - * Mark test case as known failure and skip execution. - */ -void skip(const char* msg = "") -{ - throw skipped(msg); -} - -template -void skip(const M& msg) -{ - throw skipped(msg); -} - -} // end of namespace - -} - -#endif - diff --git a/lib/tut-framework/include/tut/tut_config.hpp b/lib/tut-framework/include/tut/tut_config.hpp deleted file mode 100644 index d698c1c8..00000000 --- a/lib/tut-framework/include/tut/tut_config.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef TUT_CONFIG_H_GUARD -#define TUT_CONFIG_H_GUARD - -#define TUT_USE_RTTI 1 - -#endif diff --git a/lib/tut-framework/include/tut/tut_console_reporter.hpp b/lib/tut-framework/include/tut/tut_console_reporter.hpp deleted file mode 100644 index be6f9304..00000000 --- a/lib/tut-framework/include/tut/tut_console_reporter.hpp +++ /dev/null @@ -1,305 +0,0 @@ -#ifndef TUT_CONSOLE_REPORTER -#define TUT_CONSOLE_REPORTER -#include -#include - -/** - * Template Unit Tests Framework for C++. - * http://tut.dozen.ru - * - * @author Vladimir Dyuzhev, Vladimir.Dyuzhev@gmail.com - */ -namespace -{ - -std::ostream& operator<<(std::ostream& os, const tut::test_result& tr) -{ - switch(tr.result) - { - case tut::test_result::ok: - os << '.'; - break; - case tut::test_result::fail: - os << '[' << tr.test << "=F]"; - break; - case tut::test_result::ex_ctor: - os << '[' << tr.test << "=C]"; - break; - case tut::test_result::ex: - os << '[' << tr.test << "=X]"; - break; - case tut::test_result::warn: - os << '[' << tr.test << "=W]"; - break; - case tut::test_result::term: - os << '[' << tr.test << "=T]"; - break; - case tut::test_result::rethrown: - os << '[' << tr.test << "=P]"; - break; - case tut::test_result::skipped: - os << '[' << tr.test << "=S]"; - break; - case tut::test_result::dummy: - throw tut::tut_error("console reporter called for dummy test result"); - } - - return os; -} - -} // end of namespace - -namespace tut -{ - -/** - * Default TUT callback handler. - */ -class console_reporter : public tut::callback -{ - std::string current_group; - typedef std::vector not_passed_list; - not_passed_list not_passed; - std::ostream& os; - std::string suitename; - - console_reporter(const console_reporter &); - console_reporter &operator=(const console_reporter &); -public: - - int ok_count; - int exceptions_count; - int failures_count; - int terminations_count; - int warnings_count; - int skipped_count; - - console_reporter() - : current_group(), - not_passed(), - os(std::cout), - ok_count(0), - exceptions_count(0), - failures_count(0), - terminations_count(0), - warnings_count(0), - skipped_count(0), - suitename("default") - { - init(); - } - - console_reporter(const std::string &name = "default") - : current_group(), - not_passed(), - os(std::cout), - ok_count(0), - exceptions_count(0), - failures_count(0), - terminations_count(0), - warnings_count(0), - skipped_count(0), - suitename(name) - { - init(); - } - console_reporter(std::ostream& out) - : current_group(), - not_passed(), - os(out), - ok_count(0), - exceptions_count(0), - failures_count(0), - terminations_count(0), - warnings_count(0), - skipped_count(0), - suitename("default") - - { - init(); - } - - void run_started() - { - init(); - std::cout << "\n##teamcity[testSuiteStarted name='" << "suite." << suitename << "']\n" << std::flush; - } - - void test_completed(const tut::test_result& tr) - { - if (tr.group != current_group) - { - os << std::endl << tr.group << ": " << std::flush; - current_group = tr.group; - } - - os << tr << std::flush; - - // update global statistics - switch (tr.result) { - case test_result::ok: - ok_count++; - std::cout << "\n##teamcity[testStarted name='" << tr.group << "." << tr.test << "']\n" << std::flush; - std::cout << "\n##teamcity[testFinished name='" << tr.group << "." << tr.test << "']\n" << std::flush; - break; - case test_result::fail: - case test_result::rethrown: - failures_count++; - std::cout << "\n##teamcity[testStarted name='" << tr.group << "." << tr.test << "']\n" << std::flush; - std::cout << "\n##teamcity[testFailed name='" << tr.group << "." << tr.test << "']\n" << std::flush; - std::cout << "\n##teamcity[testFinished name='" << tr.group << "." << tr.test << "']\n" << std::flush; - break; - case test_result::ex: - case test_result::ex_ctor: - exceptions_count++; - std::cout << "\n##teamcity[testStarted name='" << tr.group << "." << tr.test << "']\n" << std::flush; - std::cout << "\n##teamcity[testFailed name='" << tr.group << "." << tr.test << "']\n" << std::flush; - std::cout << "\n##teamcity[testFinished name='" << tr.group << "." << tr.test << "']\n" << std::flush; - break; - case test_result::warn: - warnings_count++; - break; - case test_result::term: - terminations_count++; - break; - case test_result::skipped: - skipped_count++; - std::cout << "\n##teamcity[testStarted name='" << tr.group << "." << tr.test << "']\n" << std::flush; - std::cout << "\n##teamcity[testIgnored name='" << tr.group << "." << tr.test << "']\n" << std::flush; - std::cout << "\n##teamcity[testFinished name='" << tr.group << "." << tr.test << "']\n" << std::flush; - break; - case tut::test_result::dummy: - assert( (tr.result != tut::test_result::dummy) && "Should never be called"); - } // switch - - if ( (tr.result != tut::test_result::ok) && - (tr.result != tut::test_result::skipped) ) - { - not_passed.push_back(tr); - } - } - - void run_completed() - { - os << std::endl; - - if (not_passed.size() > 0) - { - not_passed_list::const_iterator i = not_passed.begin(); - while (i != not_passed.end()) - { - tut::test_result tr = *i; - - os << std::endl; - - os << "---> " << "group: " << tr.group - << ", test: test<" << tr.test << ">" - << (!tr.name.empty() ? (std::string(" : ") + tr.name) : std::string()) - << std::endl; - -#if defined(TUT_USE_POSIX) - if(tr.pid != getpid()) - { - os << " child pid: " << tr.pid << std::endl; - } -#endif - os << " problem: "; - switch(tr.result) - { - case test_result::rethrown: - os << "assertion failed in child" << std::endl; - break; - case test_result::fail: - os << "assertion failed" << std::endl; - break; - case test_result::ex: - case test_result::ex_ctor: - os << "unexpected exception" << std::endl; - if( tr.exception_typeid != "" ) - { - os << " exception typeid: " - << tr.exception_typeid << std::endl; - } - break; - case test_result::term: - os << "would be terminated" << std::endl; - break; - case test_result::warn: - os << "test passed, but cleanup code (destructor) raised" - " an exception" << std::endl; - break; - default: - break; - } - - - if (!tr.message.empty()) - { - if (tr.result == test_result::fail) - { - os << " failed assertion: `" << tr.message << "`" - << std::endl; - } - else - { - os << " message: `" << tr.message << "`" - << std::endl; - } - } - - ++i; - } - } - - os << std::endl; - - os << "tests summary:"; - if (terminations_count > 0) - { - os << " terminations:" << terminations_count; - } - if (exceptions_count > 0) - { - os << " exceptions:" << exceptions_count; - } - if (failures_count > 0) - { - os << " failures:" << failures_count; - } - if (warnings_count > 0) - { - os << " warnings:" << warnings_count; - } - - os << " ok:" << ok_count; - - if(skipped_count > 0) - { - os << " skipped:" << skipped_count; - } - std::cout << "\n##teamcity[testSuiteFinished name='" << "suite." << suitename << "']\n" << std::flush; - os << std::endl; - } - - virtual bool all_ok() const - { - return not_passed.empty(); - } - -private: - - void init() - { - ok_count = 0; - exceptions_count = 0; - failures_count = 0; - terminations_count = 0; - warnings_count = 0; - skipped_count = 0; - not_passed.clear(); - } -}; - -} - -#endif diff --git a/lib/tut-framework/include/tut/tut_cppunit_reporter.hpp b/lib/tut-framework/include/tut/tut_cppunit_reporter.hpp deleted file mode 100644 index 8d0d50af..00000000 --- a/lib/tut-framework/include/tut/tut_cppunit_reporter.hpp +++ /dev/null @@ -1,218 +0,0 @@ - -#ifndef TUT_CPPUNIT_REPORTER -#define TUT_CPPUNIT_REPORTER - -#include -#include -#include -#include -#include -#include - -namespace tut -{ - -/** - * CppUnit TUT reporter - */ -class cppunit_reporter : public tut::callback -{ - std::vector failed_tests_; - std::vector passed_tests_; - const std::string filename_; - std::auto_ptr stream_; - - - cppunit_reporter(const cppunit_reporter &); - cppunit_reporter &operator=(const cppunit_reporter &); - -public: - explicit cppunit_reporter(const std::string &filename = "testResult.xml") - : failed_tests_(), - passed_tests_(), - filename_(filename), - stream_(new std::ofstream(filename_.c_str())) - { - if (!stream_->good()) { - throw tut_error("Cannot open output file `" + filename_ + "`"); - } - } - - explicit cppunit_reporter(std::ostream &stream) - : failed_tests_(), - passed_tests_(), - filename_(), - stream_(&stream) - { - } - - ~cppunit_reporter() - { - if(filename_.empty()) - { - stream_.release(); - } - } - - void run_started() - { - failed_tests_.clear(); - passed_tests_.clear(); - } - - void test_completed(const tut::test_result& tr) - { - assert(tr.result != test_result::dummy ); - if ( (tr.result == test_result::ok) || - (tr.result == test_result::skipped) ) - { - passed_tests_.push_back(tr); - } - else - { - failed_tests_.push_back(tr); - } - } - - void run_completed() - { - int errors = 0; - int failures = 0; - std::string failure_type; - std::string failure_msg; - - *stream_ << "" << std::endl - << "" << std::endl; - - if (failed_tests_.size() > 0) - { - *stream_ << " " << std::endl; - - for (unsigned int i=0; i" << std::endl - << " " << encode(failed_tests_[i].group) + "::" + encode(failed_tests_[i].name) << "" << std::endl - << " " << failure_type << "" << std::endl - << " " << std::endl - << " Unknown" << std::endl - << " Unknown" << std::endl - << " " << std::endl - << " " << encode(failure_msg + failed_tests_[i].message) << "" << std::endl - << " " << std::endl; - } - - *stream_ << " " << std::endl; - } - - /* *********************** passed tests ***************************** */ - if (passed_tests_.size() > 0) { - *stream_ << " " << std::endl; - - for (unsigned int i=0; i" << std::endl - << " " << encode(passed_tests_[i].group) + "::" + encode(passed_tests_[i].name) << "" << std::endl - << " " << std::endl; - } - - *stream_ << " " << std::endl; - } - - /* *********************** statistics ***************************** */ - *stream_ << " " << std::endl - << " " << (failed_tests_.size() + passed_tests_.size()) << "" << std::endl - << " " << failed_tests_.size() << "" << std::endl - << " " << errors << "" << std::endl - << " " << failures << "" << std::endl - << " " << std::endl; - - /* *********************** footer ***************************** */ - *stream_ << "" << std::endl; - } - - virtual bool all_ok() const - { - return failed_tests_.empty(); - } - - /** - * \brief Encodes text to XML - * XML-reserved characters (e.g. "<") are encoded according to specification - * @param text text to be encoded - * @return encoded string - */ - static std::string encode(const std::string & text) - { - std::string out; - - for (unsigned int i=0; i': - out += ">"; - break; - case '&': - out += "&"; - break; - case '\'': - out += "'"; - break; - case '"': - out += """; - break; - default: - out += c; - } - } - - return out; - } -}; - -} - -#endif - diff --git a/lib/tut-framework/include/tut/tut_exception.hpp b/lib/tut-framework/include/tut/tut_exception.hpp deleted file mode 100644 index 1ebea341..00000000 --- a/lib/tut-framework/include/tut/tut_exception.hpp +++ /dev/null @@ -1,237 +0,0 @@ -#ifndef TUT_EXCEPTION_H_GUARD -#define TUT_EXCEPTION_H_GUARD - -#include -#include "tut_result.hpp" - -namespace tut -{ - -/** - * The base for all TUT exceptions. - */ -struct tut_error : public std::exception -{ - explicit tut_error(const std::string& msg) - : err_msg(msg) - { - } - - virtual test_result::result_type result() const - { - return test_result::ex; - } - - virtual std::string type() const - { - return "tut::tut_error"; - } - - const char* what() const throw() - { - return err_msg.c_str(); - } - - ~tut_error() throw() - { - } - -private: - void operator=(const tut_error &); - - const std::string err_msg; -}; - -/** - * Group not found exception. - */ -struct no_such_group : public tut_error -{ - explicit no_such_group(const std::string& grp) - : tut_error(grp) - { - } - - virtual std::string type() const - { - return "tut::no_such_group"; - } - - ~no_such_group() throw() - { - } -}; - -/** - * Test not found exception. - */ -struct no_such_test : public tut_error -{ - explicit no_such_test(const std::string& grp) - : tut_error(grp) - { - } - - virtual std::string type() const - { - return "tut::no_such_test"; - } - - ~no_such_test() throw() - { - } -}; - -/** - * Internal exception to be throwed when - * test constructor has failed. - */ -struct bad_ctor : public tut_error -{ - explicit bad_ctor(const std::string& msg) - : tut_error(msg) - { - } - - test_result::result_type result() const - { - return test_result::ex_ctor; - } - - virtual std::string type() const - { - return "tut::bad_ctor"; - } - - ~bad_ctor() throw() - { - } -}; - -/** - * Exception to be throwed when ensure() fails or fail() called. - */ -struct failure : public tut_error -{ - explicit failure(const std::string& msg) - : tut_error(msg) - { - } - - test_result::result_type result() const - { - return test_result::fail; - } - - virtual std::string type() const - { - return "tut::failure"; - } - - ~failure() throw() - { - } -}; - -/** - * Exception to be throwed when test desctructor throwed an exception. - */ -struct warning : public tut_error -{ - explicit warning(const std::string& msg) - : tut_error(msg) - { - } - - test_result::result_type result() const - { - return test_result::warn; - } - - virtual std::string type() const - { - return "tut::warning"; - } - - ~warning() throw() - { - } -}; - -/** - * Exception to be throwed when test issued SEH (Win32) - */ -struct seh : public tut_error -{ - explicit seh(const std::string& msg) - : tut_error(msg) - { - } - - virtual test_result::result_type result() const - { - return test_result::term; - } - - virtual std::string type() const - { - return "tut::seh"; - } - - ~seh() throw() - { - } -}; - -/** - * Exception to be throwed when child processes fail. - */ -struct rethrown : public failure -{ - explicit rethrown(const test_result &result) - : failure(result.message), tr(result) - { - } - - virtual test_result::result_type result() const - { - return test_result::rethrown; - } - - virtual std::string type() const - { - return "tut::rethrown"; - } - - ~rethrown() throw() - { - } - - const test_result tr; -}; - -struct skipped : public tut_error -{ - explicit skipped(const std::string& msg) - : tut_error(msg) - { - } - - virtual test_result::result_type result() const - { - return test_result::skipped; - } - - virtual std::string type() const - { - return "tut::skipped"; - } - - ~skipped() throw() - { - } -}; - -} - -#endif diff --git a/lib/tut-framework/include/tut/tut_fpt.hpp b/lib/tut-framework/include/tut/tut_fpt.hpp deleted file mode 100644 index 380c92b4..00000000 --- a/lib/tut-framework/include/tut/tut_fpt.hpp +++ /dev/null @@ -1,185 +0,0 @@ -/** - * @brief Additional ensures for scientific/engineering applications. - * @author Joerg - * @date 07/04/2008 - */ -#ifndef TUT_Float_H_GUARD -#define TUT_Float_H_GUARD - -#include -#include - -namespace tut -{ - namespace detail - { - template - struct If - { - typedef Else type; - }; - - template - struct If - { - typedef Then type; - }; - - template - struct fpt_traits - { - struct StdNumericLimitsNotAvailable {}; - static const StdNumericLimitsNotAvailable static_check[ std::numeric_limits::is_specialized ]; - - static const T zero; - - typedef typename If::is_integer, - double, - T>::type Result; - - static T abs(const T &arg) - { - if(arg < zero) - return zero - arg; - else - return arg; - } - - static T sig(const T &arg) - { - if(arg < zero) - return -1; - else - return 1; - } - - static inline Result div(const Result &number, const T &divisor) - { - static_cast(static_check); - - if(number == zero && divisor == zero) - return std::numeric_limits::quiet_NaN(); - - if(number == zero) - return zero; - - if(divisor == zero) - return sig(number) * std::numeric_limits::infinity(); - - assert(zero < number); - assert(zero < divisor); - - // Avoid underflow - if(static_cast(1) < abs(divisor)) - { - // number / divisor < min <=> number < min * divisor - if( abs(number) < abs(divisor) * std::numeric_limits::min()) - { - return sig(divisor) * sig(number) * std::numeric_limits::min(); - } - } - - // Avoid overflow - if( abs(divisor) < static_cast(1)) - { - // number / divisor > max <=> number > max * divisor - if( abs(divisor) * std::numeric_limits::max() < abs(number)) - { - return sig(divisor) * sig(number) * std::numeric_limits::max(); - } - } - - return number / divisor; - } - }; - - template - const typename fpt_traits::StdNumericLimitsNotAvailable - fpt_traits::static_check[ std::numeric_limits::is_specialized ] = { {} }; - - template - const T fpt_traits::zero = static_cast(0); - - template - bool check_tolerance(T actual, T expected, U fraction) - { - typename fpt_traits::Result diff = fpt_traits::div( fpt_traits::abs( expected - actual ), - fpt_traits::abs( expected ) ); - - return (diff == fraction) || (diff < fraction); - } - - } // namespace detail - - template - void ensure_close(const char* msg, const T& actual, const T& expected, const U& tolerance ) - { - typedef detail::fpt_traits Traits; - - typename Traits::Result fraction = Traits::div( Traits::abs(static_cast(tolerance)), - static_cast(100) ); - if( !detail::check_tolerance(actual, expected, fraction) ) - { - std::stringstream ss; - ss << ( msg ? msg : "" ) - << ( msg ? ": " : "" ) - << "expected `" - << expected - << "` and actual `" - << actual - << "` differ more than " - << tolerance - << "%"; - throw failure( ss.str().c_str() ); - } - } - - template - void ensure_close(const T& actual, const T& expected, const Tolerance& tolerance ) - { - ensure_close( 0, actual, expected, tolerance ); - } - - template - void ensure_close_fraction(const char* msg, const T& actual, const T& expected, const U& fraction) - { - typedef char StdNumericLimitsNotAvailable; - const StdNumericLimitsNotAvailable static_check[ std::numeric_limits::is_specialized ] = { 0 }; - static_cast(static_check); - - typedef typename detail::If::is_integer, - double, - U>::type Tolerance; - - if( !detail::check_tolerance(actual, expected, fraction) ) - { - std::stringstream ss; - ss << ( msg ? msg : "" ) - << ( msg ? ": " : "" ) - << "expected `" - << expected - << "` and actual `" - << actual - << "` differ more than fraction `" - << fraction - << "`"; - throw failure( ss.str().c_str() ); - } - } - - template - void ensure_close_fraction( const char* msg, const T& actual, const T& expected, const int& tolerance ) - { - ensure_close(msg, actual, expected, double(tolerance)); - } - - template< typename T, typename Tolerance> - void ensure_close_fraction(const T& actual, const T& expected, const Tolerance& fraction) - { - ensure_close_fraction( 0, actual, expected, fraction ); - } - -} // namespace tut - -#endif - diff --git a/lib/tut-framework/include/tut/tut_macros.hpp b/lib/tut-framework/include/tut/tut_macros.hpp deleted file mode 100644 index ed517d66..00000000 --- a/lib/tut-framework/include/tut/tut_macros.hpp +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef TUT_MACROS_HPP -#define TUT_MACROS_HPP - -#include - -#ifdef ensure_THROW -#error ensure_THROW macro is already defined -#endif - -/** Helper macros to ensure that a call throws exception. - * \code - * #include - * ensure_THROW( this_function_should_throw_bad_alloc(), std::bad_alloc ); - * \endcode - */ -#define ensure_THROW( x, e ) \ -try \ -{ \ - x; \ - fail(#x " has not thrown expected exception " #e); \ -} \ -catch(const e &) \ -{ \ -} \ -catch(const std::exception &ex) \ -{ \ - fail( std::string(#x " has thrown unexpected exception ")+tut::type_name(ex)+": "+ex.what()); \ -} \ -catch(...) \ -{ \ - fail(#x " has thrown unexpected unknown exception"); \ -} - -#ifdef ensure_NO_THROW -#error ensure_NO_THROW macro is already defined -#endif - -/** Helper macro to ensure a call does not throw any exceptions. - * \code - * #include - * ensure_NO_THROW( this_function_should_never_throw() ); - * \endcode - */ -#define ensure_NO_THROW( x ) \ -try \ -{ \ - x; \ -} \ -catch(const std::exception &ex) \ -{ \ - fail( std::string(#x " has thrown unexpected exception ")+tut::type_name(ex)+": "+ex.what()); \ -} \ -catch(...) \ -{ \ - fail(#x " has thrown unexpected unknown exception"); \ -} - -#ifdef __COUNTER__ -#define TUT_TESTCASE(object) template<> template<> void object::test<__COUNTER__>() -#endif - -#endif - diff --git a/lib/tut-framework/include/tut/tut_main.hpp b/lib/tut-framework/include/tut/tut_main.hpp deleted file mode 100644 index 0866c091..00000000 --- a/lib/tut-framework/include/tut/tut_main.hpp +++ /dev/null @@ -1,111 +0,0 @@ -#ifndef TUT_MAIN_H -#define TUT_MAIN_H - -#include -#include -#include -#include -#include - -namespace tut -{ - -/** Helper function to make test binaries simpler. - * - * Example of basic usage follows. - * - * @code - * namespace tut { test_runner_singleton runner; } - * - * int main(int argc, char **argv) - * { - * if( tut_main(argc, argv) ) - * return 0; - * else - * return -1; - * } - * @endcode - * - * It is also possible to do some generic initialization before - * running any tests and cleanup before exiting application. - * Note that tut_main can throw tut::no_such_group or tut::no_such_test. - * - * @code - * namespace tut { test_runner_singleton runner; } - * - * int main(int argc, char **argv) - * { - * tut::xml_reporter reporter; - * tut::runner.get().insert_callback(&reporter); - * - * MyInit(); - * try - * { - * tut_main(argc, argv); - * } - * catch(const tut::tut_error &ex) - * { - * std::cerr << "TUT error: " << ex.what() << std::endl; - * } - * MyCleanup(); - * } - * @endcode - */ -inline bool tut_main(int argc, const char **argv, std::ostream &os = std::cerr) -{ - std::stringstream usage; - usage << "Usage: " << argv[0] << " [group] [testcase]" << std::endl; - groupnames gr = runner.get().list_groups(); - usage << "Available test groups:" << std::endl; - for(groupnames::const_iterator i = gr.begin(); i != gr.end(); ++i) - { - usage << " " << *i << std::endl; - } - - if(argc>1) - { - if(std::string(argv[1]) == "-h" || - std::string(argv[1]) == "--help" || - std::string(argv[1]) == "/?" || - argc > 3) - { - os << usage.rdbuf(); - return false; - } - } - - // Check command line options. - switch(argc) - { - case 1: - runner.get().run_tests(); - break; - - case 2: - runner.get().run_tests(argv[1]); - break; - - case 3: - { - char *end; - int t = strtol(argv[2], &end, 10); - if(end != argv[2] + strlen(argv[2])) - { - throw no_such_test("`" + std::string(argv[2]) + "` should be a number"); - } - - test_result tr; - if(!runner.get().run_test(argv[1], t, tr) || tr.result == test_result::dummy) - { - throw no_such_test("No testcase `" + std::string(argv[2]) + "` in group `" + argv[1] + "`"); - } - } - break; - } - - return true; -} // tut_main() - -} - -#endif diff --git a/lib/tut-framework/include/tut/tut_posix.hpp b/lib/tut-framework/include/tut/tut_posix.hpp deleted file mode 100644 index 1cb17be4..00000000 --- a/lib/tut-framework/include/tut/tut_posix.hpp +++ /dev/null @@ -1,485 +0,0 @@ -#ifndef TUT_FORK_H_GUARD -#define TUT_FORK_H_GUARD -#include - -#if defined(TUT_USE_POSIX) -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "tut_result.hpp" -#include "tut_assert.hpp" -#include "tut_runner.hpp" - -namespace tut -{ - -template -class test_group; - -template -class test_object; - -class test_group_posix -{ -private: - template - friend class test_group; - - template - void send_result_(const T *obj, const test_result &tr) - { - if(obj->get_pipe_() == -1) - { - return; - } - - if(tr.result != test_result::ok) - { - std::stringstream ss; - ss << int(tr.result) << "\n" - << tr.group << "\n" - << tr.test << "\n" - << tr.name << "\n" - << tr.exception_typeid << "\n"; - std::copy( tr.message.begin(), tr.message.end(), std::ostreambuf_iterator(ss.rdbuf()) ); - - int size = ss.str().length(); - int w = write(obj->get_pipe_(), ss.str().c_str(), size); - ensure_errno("write() failed", w == size); - } - } - - virtual ~test_group_posix() - { - } -}; - -template -struct tut_posix -{ - pid_t fork() - { - test_object *self = dynamic_cast< tut::test_object* >(this); - ensure("trying to call 'tut_fork' in ctor of test object", self != NULL); - - return self->fork_(); - } - - pid_t waitpid(pid_t pid, int *status, int flags = 0) - { - test_object *self = dynamic_cast< tut::test_object* >(this); - ensure("trying to call 'tut_waitpid' in ctor of test object", self != NULL); - - return self->waitpid_(pid, status, flags); - } - - void ensure_child_exit(pid_t pid, int exit_status = 0) - { - test_object *self = dynamic_cast< tut::test_object* >(this); - ensure("trying to call 'ensure_child_exit' in ctor of test object", self != NULL); - - int status; - self->waitpid_(pid, &status); - - self->ensure_child_exit_(status, exit_status); - } - - - void ensure_child_signal(pid_t pid, int signal = SIGTERM) - { - test_object *self = dynamic_cast< tut::test_object* >(this); - ensure("trying to call 'ensure_child_signal' in ctor of test object", self != NULL); - - int status; - self->waitpid_(pid, &status); - - self->ensure_child_signal_(status, signal); - } - - std::set get_pids() const - { - using namespace std; - - const test_object *self = dynamic_cast< const tut::test_object* >(this); - ensure("trying to call 'get_pids' in ctor of test object", self != NULL); - - return self->get_pids_(); - } - - virtual ~tut_posix() - { - } - -}; - -class test_object_posix -{ -public: - typedef std::map pid_map; - - /** - * Default constructor - */ - test_object_posix() - : pids_(), - pipe_(-1) - { - } - - - virtual ~test_object_posix() - { - // we have forked - if(pipe_ != -1) - { - // in child, force exit - std::exit(0); - } - - if(!pids_.empty()) - { - std::stringstream ss; - - // in parent, reap children - for(std::map::iterator i = pids_.begin(); i != pids_.end(); ++i) - { - try { - kill_child_(i->first); - } catch(const rethrown &ex) { - ss << std::endl << "child " << ex.tr.pid << " has thrown an exception: " << ex.what(); - } catch(const failure &ex) { - ss << std::endl << ex.what(); - } - } - - if(!ss.str().empty()) - { - fail(ss.str().c_str()); - } - } - } - -private: - template - friend class tut_posix; - - friend class test_group_posix; - - int get_pipe_() const - { - return pipe_; - } - - - pid_t fork_() - { - // create pipe - int fds[2]; - ensure_errno("pipe() failed", ::pipe(fds) == 0); - - pid_t pid = ::fork(); - - ensure_errno("fork() failed", pid >= 0); - - if(pid != 0) - { - // in parent, register pid - ensure("duplicated child", pids_.insert( std::make_pair(pid, fds[0]) ).second); - - // close writing side - close(fds[1]); - } - else - { - // in child, shutdown reporter - tut::runner.get().clear_callbacks(); - - // close reading side - close(fds[0]); - pipe_ = fds[1]; - } - - return pid; - } - - void kill_child_(pid_t pid) - { - int status; - - if(waitpid_(pid, &status, WNOHANG) == pid) - { - ensure_child_exit_(status, 0); - return; - } - - if(::kill(pid, SIGTERM) != 0) - { - if(errno == ESRCH) - { - // no such process - return; - } - else - { - // cannot kill, we are in trouble - std::stringstream ss; - char e[1024]; - ss << "child " << pid << " could not be killed with SIGTERM, " << strerror_r(errno, e, sizeof(e)) << std::endl; - fail(ss.str()); - } - } - - if(waitpid_(pid, &status, WNOHANG) == pid) - { - // child killed, check signal - ensure_child_signal_(status, SIGTERM); - - ensure_equals("child process exists after SIGTERM", ::kill(pid, 0), -1); - return; - } - - // child seems to be still exiting, give it some time - sleep(2); - - if(waitpid_(pid, &status, WNOHANG) != pid) - { - // child is still running, kill it - if(::kill(pid, SIGKILL) != 0) - { - if(errno == ESRCH) - { - // no such process - return; - } - else - { - std::stringstream ss; - char e[1024]; - ss << "child " << pid << " could not be killed with SIGKILL, " << strerror_r(errno, e, sizeof(e)) << std::endl; - fail(ss.str()); - } - } - - ensure_equals("wait after SIGKILL", waitpid_(pid, &status), pid); - ensure_child_signal_(status, SIGKILL); - - ensure_equals("child process exists after SIGKILL", ::kill(pid, 0), -1); - - std::stringstream ss; - ss << "child " << pid << " had to be killed with SIGKILL"; - fail(ss.str()); - } - } - - test_result receive_result_(std::istream &ss, pid_t pid) - { - test_result tr; - - int type; - ss >> type; - tr.result = test_result::result_type(type); - ss.ignore(1024, '\n'); - - std::getline(ss, tr.group); - ss >> tr.test; - ss.ignore(1024, '\n'); - std::getline(ss, tr.name); - std::getline(ss, tr.exception_typeid); - std::copy( std::istreambuf_iterator(ss.rdbuf()), - std::istreambuf_iterator(), - std::back_inserter(tr.message) ); - - tr.pid = pid; - - return tr; - } - - struct fdclose - { - fdclose(int fd): fd_(fd) { } - ~fdclose() - { - close(fd_); - } - private: - int fd_; - }; - - pid_t waitpid_(pid_t pid, int *status, int flags = 0) - { - - ensure("trying to wait for unknown pid", pids_.count(pid) > 0); - - pid_t p = ::waitpid(pid, status, flags); - if( (flags & WNOHANG) && (p != pid) ) - { - return p; - } - - // read child result from pipe - fd_set fdset; - timeval tv; - tv.tv_sec = 0; - tv.tv_usec = 0; - - FD_ZERO(&fdset); - - int pipe = pids_[pid]; - fdclose guard(pipe); - - FD_SET(pipe, &fdset); - - int result = select(pipe+1, &fdset, NULL, NULL, &tv); - ensure_errno("sanity check on select() failed", result >= 0); - - if(result > 0) - { - ensure("sanity check on FD_ISSET() failed", FD_ISSET(pipe, &fdset) ); - - std::stringstream ss; - - //TODO: max failure length - char buffer[1024]; - int r = read(pipe, buffer, sizeof(buffer)); - ensure_errno("sanity check on read() failed", r >= 0); - - if(r > 0) - { - ss.write(buffer, r); - throw rethrown( receive_result_(ss, pid) ); - } - } - - return pid; - } - - void ensure_child_exit_(int status, int exit_status) - { - if(WIFSIGNALED(status)) - { - std::stringstream ss; - ss << "child killed by signal " << WTERMSIG(status) - << ": expected exit with code " << exit_status; - - throw failure(ss.str().c_str()); - } - - if(WIFEXITED(status)) - { - if(WEXITSTATUS(status) != exit_status) - { - std::stringstream ss; - ss << "child exited, expected '" - << exit_status - << "' actual '" - << WEXITSTATUS(status) - << '\''; - - throw failure(ss.str().c_str()); - } - } - - if(WIFSTOPPED(status)) - { - std::stringstream ss; - ss << "child stopped by signal " << WTERMSIG(status) - << ": expected exit with code " << exit_status; - throw failure(ss.str().c_str()); - } - } - - void ensure_child_signal_(int status, int signal) - { - if(WIFSIGNALED(status)) - { - if(WTERMSIG(status) != signal) - { - std::stringstream ss; - ss << "child killed by signal, expected '" - << signal - << "' actual '" - << WTERMSIG(status) - << '\''; - throw failure(ss.str().c_str()); - } - } - - if(WIFEXITED(status)) - { - std::stringstream ss; - ss << "child exited with code " << WEXITSTATUS(status) - << ": expected signal " << signal; - - throw failure(ss.str().c_str()); - } - - if(WIFSTOPPED(status)) - { - std::stringstream ss; - ss << "child stopped by signal " << WTERMSIG(status) - << ": expected kill by signal " << signal; - - throw failure(ss.str().c_str()); - } - } - - std::set get_pids_() const - { - using namespace std; - - set pids; - for(pid_map::const_iterator i = pids_.begin(); i != pids_.end(); ++i) - { - pids.insert( i->first ); - } - - return pids; - } - - pid_map pids_; - int pipe_; -}; - -} // namespace tut - -#else - -namespace tut -{ - -struct test_object_posix -{ - virtual ~test_object_posix() - { - } -}; - -struct test_group_posix -{ - template - void send_result_(const T*, const test_result &) - { - } - - virtual ~test_group_posix() - { - } -}; - -} // namespace tut - -#endif - - -#endif - diff --git a/lib/tut-framework/include/tut/tut_reporter.hpp b/lib/tut-framework/include/tut/tut_reporter.hpp deleted file mode 100644 index 56731d8b..00000000 --- a/lib/tut-framework/include/tut/tut_reporter.hpp +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef TUT_REPORTER -#define TUT_REPORTER - -#include - -namespace tut -{ - typedef console_reporter reporter; -} - -#endif diff --git a/lib/tut-framework/include/tut/tut_restartable.hpp b/lib/tut-framework/include/tut/tut_restartable.hpp deleted file mode 100644 index 9f929234..00000000 --- a/lib/tut-framework/include/tut/tut_restartable.hpp +++ /dev/null @@ -1,410 +0,0 @@ -#ifndef TUT_RESTARTABLE_H_GUARD -#define TUT_RESTARTABLE_H_GUARD - -#include -#include -#include -#include -#include - -/** - * Optional restartable wrapper for test_runner. - * - * Allows to restart test runs finished due to abnormal - * test application termination (such as segmentation - * fault or math error). - * - * @author Vladimir Dyuzhev, Vladimir.Dyuzhev@gmail.com - */ - -namespace tut -{ - -namespace util -{ - -/** - * Escapes non-alphabetical characters in string. - */ -std::string escape(const std::string& orig) -{ - std::string rc; - std::string::const_iterator i,e; - i = orig.begin(); - e = orig.end(); - - while (i != e) - { - if ((*i >= 'a' && *i <= 'z') || - (*i >= 'A' && *i <= 'Z') || - (*i >= '0' && *i <= '9') ) - { - rc += *i; - } - else - { - rc += '\\'; - rc += ('a'+(((unsigned int)*i) >> 4)); - rc += ('a'+(((unsigned int)*i) & 0xF)); - } - - ++i; - } - return rc; -} - -/** - * Un-escapes string. - */ -std::string unescape(const std::string& orig) -{ - std::string rc; - std::string::const_iterator i,e; - i = orig.begin(); - e = orig.end(); - - while (i != e) - { - if (*i != '\\') - { - rc += *i; - } - else - { - ++i; - if (i == e) - { - throw std::invalid_argument("unexpected end of string"); - } - unsigned int c1 = *i; - ++i; - if (i == e) - { - throw std::invalid_argument("unexpected end of string"); - } - unsigned int c2 = *i; - rc += (((c1 - 'a') << 4) + (c2 - 'a')); - } - - ++i; - } - return rc; -} - -/** - * Serialize test_result avoiding interfering with operator <<. - */ -void serialize(std::ostream& os, const tut::test_result& tr) -{ - os << escape(tr.group) << std::endl; - os << tr.test << ' '; - switch(tr.result) - { - case test_result::ok: - os << 0; - break; - case test_result::fail: - os << 1; - break; - case test_result::ex: - os << 2; - break; - case test_result::warn: - os << 3; - break; - case test_result::term: - os << 4; - break; - case test_result::rethrown: - os << 5; - break; - case test_result::ex_ctor: - os << 6; - break; - case test_result::dummy: - assert(!"Should never be called"); - default: - throw std::logic_error("operator << : bad result_type"); - } - os << ' ' << escape(tr.message) << std::endl; -} - -/** - * deserialization for test_result - */ -bool deserialize(std::istream& is, tut::test_result& tr) -{ - std::getline(is,tr.group); - if (is.eof()) - { - return false; - } - tr.group = unescape(tr.group); - - tr.test = -1; - is >> tr.test; - if (tr.test < 0) - { - throw std::logic_error("operator >> : bad test number"); - } - - int n = -1; - is >> n; - switch(n) - { - case 0: - tr.result = test_result::ok; - break; - case 1: - tr.result = test_result::fail; - break; - case 2: - tr.result = test_result::ex; - break; - case 3: - tr.result = test_result::warn; - break; - case 4: - tr.result = test_result::term; - break; - case 5: - tr.result = test_result::rethrown; - break; - case 6: - tr.result = test_result::ex_ctor; - break; - default: - throw std::logic_error("operator >> : bad result_type"); - } - - is.ignore(1); // space - std::getline(is,tr.message); - tr.message = unescape(tr.message); - if (!is.good()) - { - throw std::logic_error("malformed test result"); - } - return true; -} -} - -/** - * Restartable test runner wrapper. - */ -class restartable_wrapper -{ - test_runner& runner_; - callbacks callbacks_; - - std::string dir_; - std::string log_; // log file: last test being executed - std::string jrn_; // journal file: results of all executed tests - -public: - /** - * Default constructor. - * @param dir Directory where to search/put log and journal files - */ - restartable_wrapper(const std::string& dir = ".") - : runner_(runner.get()), - callbacks_(), - dir_(dir), - log_( dir + '/' + "log.tut" ), - jrn_( dir + '/' + "journal.tut" ) - { - // dozen: it works, but it would be better to use system path separator - } - - /** - * Stores another group for getting by name. - */ - void register_group(const std::string& name, group_base* gr) - { - runner_.register_group(name,gr); - } - - /** - * Stores callback object. - */ - void set_callback(callback* cb) - { - callbacks_.clear(); - callbacks_.insert(cb); - } - - void insert_callback(callback* cb) - { - callbacks_.insert(cb); - } - - void erase_callback(callback* cb) - { - callbacks_.erase(cb); - } - - void set_callbacks(const callbacks& cb) - { - callbacks_ = cb; - } - - const callbacks& get_callbacks() const - { - return runner_.get_callbacks(); - } - - /** - * Returns list of known test groups. - */ - groupnames list_groups() const - { - return runner_.list_groups(); - } - - /** - * Runs all tests in all groups. - */ - void run_tests() const - { - // where last run was failed - std::string fail_group; - int fail_test; - read_log_(fail_group,fail_test); - bool fail_group_reached = (fail_group == ""); - - // iterate over groups - tut::groupnames gn = list_groups(); - tut::groupnames::const_iterator gni,gne; - gni = gn.begin(); - gne = gn.end(); - while (gni != gne) - { - // skip all groups before one that failed - if (!fail_group_reached) - { - if (*gni != fail_group) - { - ++gni; - continue; - } - fail_group_reached = true; - } - - // first or restarted run - int test = (*gni == fail_group && fail_test >= 0) ? fail_test + 1 : 1; - while(true) - { - // last executed test pos - register_execution_(*gni,test); - - tut::test_result tr; - if( !runner_.run_test(*gni,test, tr) || tr.result == test_result::dummy ) - { - break; - } - register_test_(tr); - - ++test; - } - - ++gni; - } - - // show final results to user - invoke_callback_(); - - // truncate files as mark of successful finish - truncate_(); - } - -private: - /** - * Shows results from journal file. - */ - void invoke_callback_() const - { - runner_.set_callbacks(callbacks_); - runner_.cb_run_started_(); - - std::string current_group; - std::ifstream ijournal(jrn_.c_str()); - while (ijournal.good()) - { - tut::test_result tr; - if( !util::deserialize(ijournal,tr) ) - { - break; - } - runner_.cb_test_completed_(tr); - } - - runner_.cb_run_completed_(); - } - - /** - * Register test into journal. - */ - void register_test_(const test_result& tr) const - { - std::ofstream ojournal(jrn_.c_str(), std::ios::app); - util::serialize(ojournal, tr); - ojournal << std::flush; - if (!ojournal.good()) - { - throw std::runtime_error("unable to register test result in file " - + jrn_); - } - } - - /** - * Mark the fact test going to be executed - */ - void register_execution_(const std::string& grp, int test) const - { - // last executed test pos - std::ofstream olog(log_.c_str()); - olog << util::escape(grp) << std::endl << test << std::endl << std::flush; - if (!olog.good()) - { - throw std::runtime_error("unable to register execution in file " - + log_); - } - } - - /** - * Truncate tests. - */ - void truncate_() const - { - std::ofstream olog(log_.c_str()); - std::ofstream ojournal(jrn_.c_str()); - } - - /** - * Read log file - */ - void read_log_(std::string& fail_group, int& fail_test) const - { - // read failure point, if any - std::ifstream ilog(log_.c_str()); - std::getline(ilog,fail_group); - fail_group = util::unescape(fail_group); - ilog >> fail_test; - if (!ilog.good()) - { - fail_group = ""; - fail_test = -1; - truncate_(); - } - else - { - // test was terminated... - tut::test_result tr(fail_group, fail_test, "", tut::test_result::term); - register_test_(tr); - } - } -}; - -} - -#endif - diff --git a/lib/tut-framework/include/tut/tut_result.hpp b/lib/tut-framework/include/tut/tut_result.hpp deleted file mode 100644 index e9607859..00000000 --- a/lib/tut-framework/include/tut/tut_result.hpp +++ /dev/null @@ -1,174 +0,0 @@ -#ifndef TUT_RESULT_H_GUARD -#define TUT_RESULT_H_GUARD -#include - -#include - -#if defined(TUT_USE_RTTI) -#if (defined(_MSC_VER) && !defined(_CPPRTTI)) || (defined(__GNUC__) && !defined(__GXX_RTTI)) -#undef TUT_USE_RTTI -#endif -#endif - -#if defined(TUT_USE_RTTI) -#include -#endif - -namespace tut -{ - -#if defined(TUT_USE_RTTI) -template -inline std::string type_name(const T& t) -{ - return typeid(t).name(); -} -#else -template -inline std::string type_name(const T& t) -{ - return "Unknown type, RTTI disabled"; -} - -inline std::string type_name(const std::exception&) -{ - return "Unknown std::exception, RTTI disabled"; -} -#endif - - -#if defined(TUT_USE_POSIX) -struct test_result_posix -{ - test_result_posix() - : pid(getpid()) - { - } - - virtual ~test_result_posix() - { - } - - pid_t pid; -}; -#else -struct test_result_posix -{ - virtual ~test_result_posix() - { - } -}; -#endif - -/** - * Return type of runned test/test group. - * - * For test: contains result of test and, possible, message - * for failure or exception. - */ -struct test_result : public test_result_posix -{ - /** - * Test group name. - */ - std::string group; - - /** - * Test number in group. - */ - int test; - - /** - * Test name (optional) - */ - std::string name; - - /** - * result of a test - */ - enum result_type - { - ok, ///< test finished successfully - fail, ///< test failed with ensure() or fail() methods - ex, ///< test throwed an exceptions - warn, ///< test finished successfully, but test destructor throwed - term, ///< test forced test application to terminate abnormally - ex_ctor, ///< - rethrown, ///< - skipped, ///< - dummy ///< - }; - - result_type result; - - /** - * Exception message for failed test. - */ - std::string message; - std::string exception_typeid; - - /** - * Default constructor. - */ - test_result() - : group(), - test(0), - name(), - result(ok), - message(), - exception_typeid() - { - } - - /** - * Constructor. - */ - test_result(const std::string& grp, int pos, - const std::string& test_name, result_type res) - : group(grp), - test(pos), - name(test_name), - result(res), - message(), - exception_typeid() - { - } - - /** - * Constructor with exception. - */ - test_result(const std::string& grp,int pos, - const std::string& test_name, result_type res, - const std::exception& ex) - : group(grp), - test(pos), - name(test_name), - result(res), - message(ex.what()), - exception_typeid(type_name(ex)) - { - } - - /** Constructor with typeid. - */ - test_result(const std::string& grp,int pos, - const std::string& test_name, result_type res, - const std::string& ex_typeid, - const std::string& msg) - : group(grp), - test(pos), - name(test_name), - result(res), - message(msg), - exception_typeid(ex_typeid) - { - } - - virtual ~test_result() - { - } -}; - -} - -#endif diff --git a/lib/tut-framework/include/tut/tut_runner.hpp b/lib/tut-framework/include/tut/tut_runner.hpp deleted file mode 100644 index 3803046e..00000000 --- a/lib/tut-framework/include/tut/tut_runner.hpp +++ /dev/null @@ -1,388 +0,0 @@ -#ifndef TUT_RUNNER_H_GUARD -#define TUT_RUNNER_H_GUARD - -#include -#include -#include -#include "tut_exception.hpp" - -namespace tut -{ - -/** - * Interface. - * Test group operations. - */ -struct group_base -{ - virtual ~group_base() - { - } - - // execute tests iteratively - virtual void rewind() = 0; - virtual bool run_next(test_result &) = 0; - - // execute one test - virtual bool run_test(int n, test_result &tr) = 0; -}; - - -/** - * Test runner callback interface. - * Can be implemented by caller to update - * tests results in real-time. User can implement - * any of callback methods, and leave unused - * in default implementation. - */ -struct callback -{ - /** - * Default constructor. - */ - callback() - { - } - - /** - * Virtual destructor is a must for subclassed types. - */ - virtual ~callback() - { - } - - /** - * Called when new test run started. - */ - virtual void run_started() - { - } - - /** - * Called when a group started - * @param name Name of the group - */ - virtual void group_started(const std::string& name) - { - (void)name; - } - - /** - * Called when a test finished. - * @param tr Test results. - */ - virtual void test_completed(const test_result& tr) - { - (void)tr; - } - - /** - * Called when a group is completed - * @param name Name of the group - */ - virtual void group_completed(const std::string& name) - { - (void)name; - } - - /** - * Called when all tests in run completed. - */ - virtual void run_completed() - { - } - - virtual bool all_ok() const - { - return true; - } -private: - callback(const callback &); - void operator=(const callback&); -}; - -/** - * Typedef for runner::list_groups() - */ -typedef std::vector groupnames; -typedef std::set callbacks; - -/** - * Test runner. - */ -class test_runner -{ - -public: - - /** - * Constructor - */ - test_runner() - : groups_(), - callbacks_() - { - } - - /** - * Stores another group for getting by name. - * @param name new group object - * @param gr new callback object - */ - void register_group(const std::string& name, group_base* gr) - { - if (gr == 0) - { - throw tut_error("group shall be non-null"); - } - - if (groups_.find(name) != groups_.end()) - { - std::string msg("attempt to add already existent group " + name); - throw tut_error(msg); - } - - groups_.insert( std::make_pair(name, gr) ); - } - - /** - * Stores one callback object. - * @param cb new callback object - */ - void set_callback(callback *cb) - { - clear_callbacks(); - insert_callback(cb); - } - - /** - * Add callback object. - * @param cb new callback object - */ - void insert_callback(callback* cb) - { - if(cb != NULL) - { - callbacks_.insert(cb); - } - } - - /** - * Remove callback object. - * @param cb callback to remove - */ - void erase_callback(callback* cb) - { - callbacks_.erase(cb); - } - - /** - * Remove all callback objects. - */ - void clear_callbacks() - { - callbacks_.clear(); - } - - /** - * Returns callback list. - * @return callback list - */ - const callbacks &get_callbacks() const - { - return callbacks_; - } - - /** - * Set callback list. - * @param cb new callback list - */ - void set_callbacks(const callbacks &cb) - { - callbacks_ = cb; - } - - /** - * Returns list of known test groups. - * @return groups list - */ - const groupnames list_groups() const - { - groupnames ret; - for(const_iterator i = groups_.begin(); i != groups_.end(); ++i) - { - ret.push_back(i->first); - } - return ret; - } - - /** - * Runs all tests in all groups. - */ - void run_tests() const - { - cb_run_started_(); - - const_iterator i = groups_.begin(); - const_iterator e = groups_.end(); - while (i != e) - { - cb_group_started_(i->first); - run_all_tests_in_group_(i); - cb_group_completed_(i->first); - - ++i; - } - - cb_run_completed_(); - } - - /** - * Runs all tests in specified group. - * @param group_name group to test - */ - void run_tests(const std::string& group_name) const - { - cb_run_started_(); - - const_iterator i = groups_.find(group_name); - if (i == groups_.end()) - { - cb_run_completed_(); - throw no_such_group(group_name); - } - - cb_group_started_(group_name); - run_all_tests_in_group_(i); - cb_group_completed_(group_name); - cb_run_completed_(); - } - - /** - * Runs one test in specified group. - * @param group_name group to test - * @param n run case in test - * @param tr result of this case - * @return true if test is ok, otherwise false - */ - bool run_test(const std::string& group_name, int n, test_result &tr) const - { - cb_run_started_(); - - const_iterator i = groups_.find(group_name); - if (i == groups_.end()) - { - cb_run_completed_(); - throw no_such_group(group_name); - } - - cb_group_started_(group_name); - - bool t = i->second->run_test(n, tr); - - if(t && tr.result != test_result::dummy) - { - cb_test_completed_(tr); - } - - cb_group_completed_(group_name); - cb_run_completed_(); - - return t; - } - -protected: - - typedef std::map groups; - typedef groups::iterator iterator; - typedef groups::const_iterator const_iterator; - groups groups_; - - callbacks callbacks_; - -private: - friend class restartable_wrapper; - - void cb_run_started_() const - { - for(callbacks::const_iterator i = callbacks_.begin(); i != callbacks_.end(); ++i) - { - (*i)->run_started(); - } - } - - void cb_run_completed_() const - { - for(callbacks::const_iterator i = callbacks_.begin(); i != callbacks_.end(); ++i) - { - (*i)->run_completed(); - } - } - - void cb_group_started_(const std::string &group_name) const - { - for(callbacks::const_iterator i = callbacks_.begin(); i != callbacks_.end(); ++i) - { - (*i)->group_started(group_name); - } - } - - void cb_group_completed_(const std::string &group_name) const - { - for(callbacks::const_iterator i = callbacks_.begin(); i != callbacks_.end(); ++i) - { - (*i)->group_completed(group_name); - } - } - - void cb_test_completed_(const test_result &tr) const - { - for(callbacks::const_iterator i = callbacks_.begin(); i != callbacks_.end(); ++i) - { - (*i)->test_completed(tr); - } - } - - void run_all_tests_in_group_(const_iterator i) const - { - i->second->rewind(); - - test_result tr; - while(i->second->run_next(tr)) - { - if(tr.result != test_result::dummy) - { - cb_test_completed_(tr); - } - - if (tr.result == test_result::ex_ctor) - { - // test object ctor failed, skip whole group - break; - } - } - } -}; - -/** - * Singleton for test_runner implementation. - * Instance with name runner_singleton shall be implemented - * by user. - */ -class test_runner_singleton -{ -public: - - static test_runner& get() - { - static test_runner tr; - return tr; - } -}; - -extern test_runner_singleton runner; - -} - -#endif // TUT_RUNNER_H_GUARD - diff --git a/lib/tut-framework/include/tut/tut_xml_reporter.hpp b/lib/tut-framework/include/tut/tut_xml_reporter.hpp deleted file mode 100644 index d0c301dd..00000000 --- a/lib/tut-framework/include/tut/tut_xml_reporter.hpp +++ /dev/null @@ -1,305 +0,0 @@ -#ifndef TUT_XML_REPORTER -#define TUT_XML_REPORTER -#include -#include -#include -#include -#include -#include -#include -#include - -namespace tut -{ - -/** - * \brief JUnit XML TUT reporter - * @author Lukasz Maszczynski, NSN - * @date 11/07/2008 - */ -class xml_reporter : public tut::callback -{ - typedef std::vector TestResults; - typedef std::map TestGroups; - - TestGroups all_tests_; /// holds all test results - const std::string filename_; /// filename base - std::auto_ptr stream_; - - /** - * \brief Builds "testcase" XML entity with given parameters - * Builds \ entity according to given parameters. \-s are part of \. - * @param tr test result to be used as source data - * @param failure_type type of failure to be reported ("Assertion" or "Error", empty if test passed) - * @param failure_msg failure message to be reported (empty, if test passed) - * @return string with \ entity - */ - std::string xml_build_testcase(const tut::test_result & tr, const std::string & failure_type, - const std::string & failure_msg, int pid = 0) - { - using std::endl; - using std::string; - - std::ostringstream out; - - if ( (tr.result == test_result::ok) || - (tr.result == test_result::skipped) ) - { - out << " "; - } - else - { - string err_msg = cppunit_reporter::encode(failure_msg + tr.message); - - string tag; // determines tag name: "failure" or "error" - if ( tr.result == test_result::fail || tr.result == test_result::warn || - tr.result == test_result::ex || tr.result == test_result::ex_ctor || tr.result == test_result::rethrown ) - { - tag = "failure"; - } - else - { - tag = "error"; - } - - out << " " << endl; - out << " <" << tag << " message=\"" << err_msg << "\"" << " type=\"" << failure_type << "\""; -#if defined(TUT_USE_POSIX) - if(pid != getpid()) - { - out << " child=\"" << pid << "\""; - } -#else - (void)pid; -#endif - out << ">" << err_msg << "" << endl; - out << " "; - } - - return out.str(); - } - - /** - * \brief Builds "testsuite" XML entity - * Builds \ XML entity according to given parameters. - * @param errors number of errors to be reported - * @param failures number of failures to be reported - * @param total total number of tests to be reported - * @param name test suite name - * @param testcases cppunit_reporter::encoded XML string containing testcases - * @return string with \ entity - */ - std::string xml_build_testsuite(int errors, int failures, int total, - const std::string & name, const std::string & testcases) - { - std::ostringstream out; - - out << " " << std::endl; - out << testcases; - out << " "; - - return out.str(); - } - -public: - int ok_count; /// number of passed tests - int exceptions_count; /// number of tests that threw exceptions - int failures_count; /// number of tests that failed - int terminations_count; /// number of tests that would terminate - int warnings_count; /// number of tests where destructors threw an exception - - /** - * \brief Default constructor - * @param filename base filename - */ - xml_reporter(const std::string & filename) - : all_tests_(), - filename_(filename), - stream_(new std::ofstream(filename_.c_str())), - ok_count(0), - exceptions_count(0), - failures_count(0), - terminations_count(0), - warnings_count(0) - { - if (!stream_->good()) { - throw tut_error("Cannot open output file `" + filename_ + "`"); - } - } - - xml_reporter(std::ostream & stream) - : all_tests_(), - filename_(), - stream_(&stream), - ok_count(0), - exceptions_count(0), - failures_count(0), - terminations_count(0), - warnings_count(0) - { - } - - ~xml_reporter() - { - if(filename_.empty()) - { - stream_.release(); - } - } - - /** - * \brief Callback function - * This function is called before the first test is executed. It initializes counters. - */ - virtual void run_started() - { - ok_count = 0; - exceptions_count = 0; - failures_count = 0; - terminations_count = 0; - warnings_count = 0; - all_tests_.clear(); - } - - /** - * \brief Callback function - * This function is called when test completes. Counters are updated here, and test results stored. - */ - virtual void test_completed(const tut::test_result& tr) - { - // update global statistics - switch (tr.result) { - case test_result::ok: - case test_result::skipped: - ok_count++; - break; - case test_result::fail: - case test_result::rethrown: - failures_count++; - break; - case test_result::ex: - case test_result::ex_ctor: - exceptions_count++; - break; - case test_result::warn: - warnings_count++; - break; - case test_result::term: - terminations_count++; - break; - case tut::test_result::dummy: - assert(!"Should never be called"); - } // switch - - // add test result to results table - all_tests_[tr.group].push_back(tr); - } - - /** - * \brief Callback function - * This function is called when all tests are completed. It generates XML output - * to file(s). File name base can be set with constructor. - */ - virtual void run_completed() - { - /* *********************** header ***************************** */ - *stream_ << "" << std::endl; - *stream_ << "" << std::endl; - - // iterate over all test groups - for (TestGroups::const_iterator tgi = all_tests_.begin(); tgi != all_tests_.end(); ++tgi) - { - /* per-group statistics */ - int passed = 0; // passed in single group - int exceptions = 0; // exceptions in single group - int failures = 0; // failures in single group - int terminations = 0; // terminations in single group - int warnings = 0; // warnings in single group - int errors = 0; // errors in single group - - - // output is written to string stream buffer, because JUnit format tag - // contains statistics, which aren't known yet - std::ostringstream out; - - // iterate over all test cases in the current test group - const TestResults &results = tgi->second; - for (TestResults::const_iterator tri = results.begin(); tri != results.end(); ++tri) - { - std::string failure_type; // string describing the failure type - std::string failure_msg; // a string with failure message - - switch (tri->result) - { - case test_result::ok: - case test_result::skipped: - passed++; - break; - case test_result::fail: - failure_type = "Assertion"; - failure_msg = ""; - failures++; - break; - case test_result::ex: - failure_type = "Assertion"; - failure_msg = "Thrown exception: " + tri->exception_typeid + '\n'; - exceptions++; - break; - case test_result::warn: - failure_type = "Assertion"; - failure_msg = "Destructor failed.\n"; - warnings++; - break; - case test_result::term: - failure_type = "Error"; - failure_msg = "Test application terminated abnormally.\n"; - terminations++; - break; - case test_result::ex_ctor: - failure_type = "Assertion"; - failure_msg = "Constructor has thrown an exception: " + tri->exception_typeid + ".\n"; - exceptions++; - break; - case test_result::rethrown: - failure_type = "Assertion"; - failure_msg = "Child failed.\n"; - failures++; - break; - default: - failure_type = "Error"; - failure_msg = "Unknown test status, this should have never happened. " - "You may just have found a bug in TUT, please report it immediately.\n"; - errors++; - break; - } // switch - -#if defined(TUT_USE_POSIX) - out << xml_build_testcase(*tri, failure_type, failure_msg, tri->pid) << std::endl; -#else - out << xml_build_testcase(*tri, failure_type, failure_msg) << std::endl; -#endif - } // iterate over all test cases - - // calculate per-group statistics - int stat_errors = terminations + errors; - int stat_failures = failures + warnings + exceptions; - int stat_all = stat_errors + stat_failures + passed; - - *stream_ << xml_build_testsuite(stat_errors, stat_failures, stat_all, (*tgi).first/* name */, out.str()/* testcases */) << std::endl; - } // iterate over all test groups - - *stream_ << "" << std::endl; - } - - /** - * \brief Returns true, if all tests passed - */ - virtual bool all_ok() const - { - return ( (terminations_count + failures_count + warnings_count + exceptions_count) == 0); - }; -}; - -} - -#endif diff --git a/lib/tut-framework/include/tut_reporter.h b/lib/tut-framework/include/tut_reporter.h deleted file mode 100644 index ed11aec3..00000000 --- a/lib/tut-framework/include/tut_reporter.h +++ /dev/null @@ -1,5 +0,0 @@ -#warning This header is deprecated and will be removed in next versions. Please #include instead -#include -#include -#include -#include diff --git a/lib/tut-framework/include/tut_restartable.h b/lib/tut-framework/include/tut_restartable.h deleted file mode 100644 index 47e087d8..00000000 --- a/lib/tut-framework/include/tut_restartable.h +++ /dev/null @@ -1,2 +0,0 @@ -#warning This header is deprecated and will be removed in next versions. Please #include instead -#include diff --git a/tests/basics/Allocs.cpp b/tests/basics/Allocs.cpp index b14aef8e..8be4ec24 100644 --- a/tests/basics/Allocs.cpp +++ b/tests/basics/Allocs.cpp @@ -4,6 +4,38 @@ #include // for placement new #include #include +#include +#include + +// Name of the debug C Runtime Library DLL on this system +#ifdef _DEBUG +#if _MSC_VER == 1400 // VS 2005 +#define CRTDLLNAME _T("msvcr80d.dll") +#elif _MSC_VER == 1500 // VS 2008 +#define CRTDLLNAME _T("msvcr90d.dll") +#elif _MSC_VER == 1600 // VS 2010 +#define CRTDLLNAME _T("msvcr100d.dll") +#elif _MSC_VER == 1700 // VS 2012 +#define CRTDLLNAME _T("msvcr110d.dll") +#elif _MSC_VER == 1800 // VS 2013 +#define CRTDLLNAME _T("msvcr120d.dll") +#endif +#else +#if _MSC_VER == 1400 // VS 2005 +#define CRTDLLNAME _T("msvcr80.dll") +#elif _MSC_VER == 1500 // VS 2008 +#define CRTDLLNAME _T("msvcr90.dll") +#elif _MSC_VER == 1600 // VS 2010 +#define CRTDLLNAME _T("msvcr100.dll") +#elif _MSC_VER == 1700 // VS 2012 +#define CRTDLLNAME _T("msvcr110.dll") +#elif _MSC_VER == 1800 // VS 2013 +#define CRTDLLNAME _T("msvcr120.dll") +#endif +#endif + +typedef void* (__cdecl *free_t) (void* mem); +typedef void* (__cdecl *malloc_t) (size_t size); void AllocF(LeakOption type, bool bFree) { @@ -18,7 +50,7 @@ void AllocF(LeakOption type, bool bFree) free(leaked_memory); _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); } - } + } else if (type == eNew) { leaked_memory = new int(4); @@ -57,10 +89,10 @@ void AllocF(LeakOption type, bool bFree) else if (type == eRealloc) { int* temp = (int*)malloc(17); - leaked_memory = (int*)realloc(temp, 23); - leaked_memory = (int*)_recalloc(leaked_memory, 1, 31); - int* temp_dbg = (int*)malloc(9); - leaked_memory_dbg = (int*)_realloc_dbg(temp_dbg, 21, _NORMAL_BLOCK, __FILE__, __LINE__); + int* old_leaked_memory = (int*)realloc(temp, 23); + leaked_memory = (int*)_recalloc(old_leaked_memory, 1, 31); + int* old_leaked_memory_dbg = (int*)malloc(9); + leaked_memory_dbg = (int*)_realloc_dbg(old_leaked_memory_dbg, 21, _NORMAL_BLOCK, __FILE__, __LINE__); if (bFree) { free(leaked_memory); @@ -92,7 +124,7 @@ void AllocF(LeakOption type, bool bFree) _aligned_free(leaked_memory); _aligned_free_dbg(leaked_memory_dbg); } - } + } else if (type == eAlignedRealloc) { void* leaked = _aligned_offset_malloc(64, 16, 1); @@ -125,9 +157,46 @@ void AllocF(LeakOption type, bool bFree) _free_dbg(leaked_wmemory_dbg,_NORMAL_BLOCK); } } - + else if (type == eHeapAlloc) + { + HANDLE heap = HeapCreate(0x0, 0, 0); + leaked_memory = (int*)HeapAlloc(heap, 0x0, 15); + if (bFree) + { + HeapFree(leaked_memory, 0, NULL); + HeapDestroy(heap); + } + } + else if (type == eGetProcMalloc) + { + malloc_t pmalloc = NULL; + free_t pfree = NULL; + HMODULE crt = LoadLibrary(CRTDLLNAME); + assert(crt != NULL); + pmalloc = (malloc_t)GetProcAddress(crt, "malloc"); + assert(pmalloc != NULL); + leaked_memory = (int*)pmalloc(64); + if (bFree) + { + pfree = (free_t)GetProcAddress(crt, "free"); + pfree(leaked_memory); + FreeLibrary(crt); + } + } + else if (type == eIMalloc) + { + IMalloc *imalloc = NULL; + HRESULT hr = CoGetMalloc(1, &imalloc); + assert(SUCCEEDED(hr)); + leaked_memory = (int*)imalloc->Alloc(34); + if (bFree) + { + imalloc->Free(leaked_memory); + } + } } + void AllocE(LeakOption type, bool bFree) { AllocF(type, bFree); diff --git a/tests/basics/LeakOption.h b/tests/basics/LeakOption.h index 6a37885b..87d3e7ab 100644 --- a/tests/basics/LeakOption.h +++ b/tests/basics/LeakOption.h @@ -12,6 +12,9 @@ enum LeakOption eAlignedMalloc, // "_aligned_malloc" eAlignedRealloc, // "_aligned_realloc" eStrdup, // "strdup" + eHeapAlloc, + eGetProcMalloc, + eIMalloc, eCount, }; diff --git a/tests/basics/basics.cpp b/tests/basics/basics.cpp index bb2d583a..104ecb62 100644 --- a/tests/basics/basics.cpp +++ b/tests/basics/basics.cpp @@ -5,9 +5,7 @@ #include "vld.h" #include "Allocs.h" -#include -#include -#include +#include void LeakMemory(LeakOption type, int repeat, bool bFree) { @@ -17,265 +15,139 @@ void LeakMemory(LeakOption type, int repeat, bool bFree) } } -namespace tut +class TestBasics : public ::testing::TestWithParam { - struct test - { - virtual ~test() - { - } - }; - - typedef test_group tg; - typedef tg::object object; -#ifdef _M_IX86 - tg basic_group("basic_x86"); -#else - tg basic_group("basic_x64"); -#endif - - static const int repeat = 10; - - template<> - template<> - void object::test<1>() - { - set_test_name("Malloc"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eMalloc,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } - - template<> - template<> - void object::test<2>() - { - set_test_name("New"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eNew,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } +}; - template<> - template<> - void object::test<3>() - { - set_test_name("NewArray"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eNewArray,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } +static const int repeats = 1; - template<> - template<> - void object::test<4>() - { - set_test_name("Calloc"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eCalloc,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } +TEST_P(TestBasics, Malloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eMalloc, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 2; + ASSERT_EQ(leaks, correctLeaks); +} - template<> - template<> - void object::test<5>() - { - set_test_name("Realloc"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eRealloc,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } +TEST_P(TestBasics, New) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eNew, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 2; + ASSERT_EQ(leaks, correctLeaks); +} - template<> - template<> - void object::test<6>() - { - set_test_name("CoTaskMem"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eCoTaskMem,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 2)); - } +TEST_P(TestBasics, NewArray) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eNewArray, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 2; + ASSERT_EQ(leaks, correctLeaks); +} - template<> - template<> - void object::test<7>() - { - set_test_name("AlignedMalloc"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eAlignedMalloc,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 3)); - } +TEST_P(TestBasics, Calloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eCalloc, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 2; + ASSERT_EQ(leaks, correctLeaks); +} - template<> - template<> - void object::test<8>() - { - set_test_name("AlignedRealloc"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eAlignedRealloc,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 3)); - } +TEST_P(TestBasics, Realloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eRealloc, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 2; + ASSERT_EQ(leaks, correctLeaks); +} - template<> - template<> - void object::test<9>() - { - set_test_name("Strdup"); - int prev = (int)VLDGetLeaksCount(); - LeakMemory(eStrdup,repeat,false); - int leaks = (int)VLDGetLeaksCount() - prev; - ensure("leaks", leaks == (repeat * 4)); - } +TEST_P(TestBasics, CoTaskMem) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eCoTaskMem, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 2; + ASSERT_EQ(leaks, correctLeaks); +} - test_runner_singleton runner; +TEST_P(TestBasics, AlignedMalloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eAlignedMalloc, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 3; + ASSERT_EQ(leaks, correctLeaks); } -int RunAllTest() -{ - using namespace std; - tut::console_reporter reporter(std::cout); - tut::runner.get().set_callback(&reporter); +TEST_P(TestBasics, AlignedRealloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eAlignedRealloc, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 3; + ASSERT_EQ(leaks, correctLeaks); +} - try - { - tut::runner.get().run_tests(); - if(reporter.all_ok()) - { - return 0; - } - else - { - std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; - } - } - catch(const tut::no_such_group &ex) - { - std::cerr << "No such group: " << ex.what() << std::endl; - } - catch(const tut::no_such_test &ex) - { - std::cerr << "No such test: " << ex.what() << std::endl; - } - catch(const tut::tut_error &ex) - { - std::cout << "General error: " << ex.what() << std::endl; - } - return 1; +TEST_P(TestBasics, Strdup) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eStrdup, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 4; + ASSERT_EQ(leaks, correctLeaks); } -void PrintUsage() +TEST_P(TestBasics, HeapAlloc) { - wprintf(_T("Usage:\n")); - wprintf(_T("\ttest_basics \n")); - wprintf(_T("\t - The type of memory allocation to test with. This can be one of the following:\n")); - wprintf(_T("\t [malloc,new,new_array,calloc,realloc,CoTaskMem,AlignedMalloc,AlignedRealloc,strdup,all]\n")); - wprintf(_T("\t - The number of times to repeat each unique memory leak.\n\n")); + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eHeapAlloc, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 1; + ASSERT_EQ(leaks, correctLeaks); } -int _tmain(int argc, _TCHAR* argv[]) -{ - if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) - return RunAllTest(); +TEST_P(TestBasics, GetProcMalloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eGetProcMalloc, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 1; + ASSERT_EQ(leaks, correctLeaks); +} - wprintf(_T("======================================\n")); - wprintf(_T("==\n")); - wprintf(_T("== VLD Tests: basics\n")); - wprintf(_T("==\n")); - wprintf(_T("======================================\n")); - bool bFree = false; - if (argc >= 3) - { - bool checkAll = false; - LeakOption leak_type = eMalloc; // default - int multiplayer = 2; - - // Pick up options to determine which type of memory allocator - // to test with - if (_tcsicmp(_T("malloc"), argv[1]) == 0) - { - leak_type = eMalloc; - } - else if (_tcsicmp(_T("new"), argv[1]) == 0) - { - leak_type = eNew; - } - else if (_tcsicmp(_T("new_array"), argv[1]) == 0) - { - leak_type = eNewArray; - } - else if (_tcsicmp(_T("calloc"), argv[1]) == 0) - { - leak_type = eCalloc; - } - else if (_tcsicmp(_T("realloc"), argv[1]) == 0) - { - leak_type = eRealloc; - } - else if (_tcsicmp(_T("CoTaskMem"), argv[1]) == 0) - { - leak_type = eCoTaskMem; - multiplayer = 2; - } - else if (_tcsicmp(_T("AlignedMalloc"), argv[1]) == 0) - { - leak_type = eAlignedMalloc; - multiplayer = 3; - } - else if (_tcsicmp(_T("AlignedRealloc"), argv[1]) == 0) - { - leak_type = eAlignedRealloc; - multiplayer = 3; - } - else if (_tcsicmp(_T("strdup"), argv[1]) == 0) - { - leak_type = eStrdup; - multiplayer = 4; - } - else if (_tcsicmp(_T("all"), argv[1]) == 0) - { - checkAll = true; - multiplayer = 22; - } - else - { - wprintf(_T("Error!: Invalid arguments\n")); - PrintUsage(); - return -1; - } +TEST_P(TestBasics, IMalloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eIMalloc, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 1; + ASSERT_EQ(leaks, correctLeaks); +} - if (argc >= 4 && _tcsicmp(_T("free"), argv[3]) == 0) - bFree = true; +INSTANTIATE_TEST_CASE_P(FreeVal, + TestBasics, + ::testing::Bool()); - wprintf(_T("Options: %s \nNumber of Leaks: %s\n"), argv[1], argv[2]); - // Convert the string into it's integer equivalent - int prevleaks = (int)VLDGetLeaksCount(); - int repeat = _tstoi(argv[2]); - if (!checkAll) - LeakMemory(leak_type,repeat,bFree); - else - { - for (int leak_type = 0; leak_type < eCount; leak_type++) - LeakMemory((LeakOption)leak_type,repeat,bFree); - } - int leaks = (int)VLDGetLeaksCount() - prevleaks; - wprintf(_T("End of test app...\n\n")); - int diff = repeat * multiplayer - leaks; - return bFree ? leaks : diff; - } - else - { - wprintf(_T("Error!: Invalid arguments\n")); - PrintUsage(); - wprintf(_T("End of test app...\n\n")); - return -1; - } +int main(int argc, char **argv) { + ::testing::InitGoogleTest(&argc, argv); + int res = RUN_ALL_TESTS(); + VLDMarkAllLeaksAsReported(); + return res; } - diff --git a/tests/basics/basics.vcxproj b/tests/basics/basics.vcxproj index cda1ffdb..e5b66a29 100644 --- a/tests/basics/basics.vcxproj +++ b/tests/basics/basics.vcxproj @@ -244,7 +244,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -254,10 +254,7 @@ %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -268,7 +265,7 @@ exit /b 0 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -279,10 +276,7 @@ exit /b 0 %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -293,7 +287,7 @@ exit /b 0 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -303,10 +297,7 @@ exit /b 0 %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -317,7 +308,8 @@ exit /b 0 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug Console @@ -327,10 +319,7 @@ exit /b 0 %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -341,7 +330,7 @@ exit /b 0 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -351,10 +340,7 @@ exit /b 0 %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -365,7 +351,7 @@ exit /b 0 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -376,10 +362,7 @@ exit /b 0 %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -390,7 +373,7 @@ exit /b 0 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -400,10 +383,7 @@ exit /b 0 %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -414,7 +394,8 @@ exit /b 0 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug Console @@ -424,10 +405,7 @@ exit /b 0 %(AdditionalDependencies) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -439,7 +417,7 @@ exit /b 0 true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -449,10 +427,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -464,7 +439,7 @@ exit /b 0 true true STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -475,10 +450,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -490,7 +462,7 @@ exit /b 0 true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -500,10 +472,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -515,7 +484,7 @@ exit /b 0 true true STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -526,10 +495,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -542,6 +508,7 @@ exit /b 0 + Create Create @@ -557,6 +524,11 @@ exit /b 0 Create + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + diff --git a/tests/basics/basics.vcxproj.filters b/tests/basics/basics.vcxproj.filters index 0acd1b47..fdb7dc5a 100644 --- a/tests/basics/basics.vcxproj.filters +++ b/tests/basics/basics.vcxproj.filters @@ -38,5 +38,8 @@ Source Files + + Source Files + \ No newline at end of file diff --git a/tests/basics/basics_disabled.cpp b/tests/basics/basics_disabled.cpp new file mode 100644 index 00000000..413a0e2f --- /dev/null +++ b/tests/basics/basics_disabled.cpp @@ -0,0 +1,133 @@ +// basics.cpp : Defines the entry point for the console application. +// + +#include "stdafx.h" +#include "vld.h" +#include "Allocs.h" + +#include + +extern void LeakMemory(LeakOption type, int repeat, bool bFree); + +static const int repeats = 1; + +class TestBasicsDisabled : public ::testing::Test +{ + virtual void SetUp() + { + VLDDisable(); + } + + virtual void TearDown() + { + VLDEnable(); + } +}; + +TEST_F(TestBasicsDisabled, Malloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eMalloc, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} + +TEST_F(TestBasicsDisabled, New) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eNew, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} + +TEST_F(TestBasicsDisabled, NewArray) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eNewArray, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} + +TEST_F(TestBasicsDisabled, Calloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eCalloc, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} + +TEST_F(TestBasicsDisabled, Realloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eRealloc, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} + +TEST_F(TestBasicsDisabled, CoTaskMem) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eCoTaskMem, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} + +TEST_F(TestBasicsDisabled, AlignedMalloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eAlignedMalloc, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} + +TEST_F(TestBasicsDisabled, AlignedRealloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eAlignedRealloc, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} + +TEST_F(TestBasicsDisabled, Strdup) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eStrdup, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} + +TEST_F(TestBasicsDisabled, HeapAlloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eHeapAlloc, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} + +TEST_F(TestBasicsDisabled, GetProcMalloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eGetProcMalloc, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} + +TEST_F(TestBasicsDisabled, IMalloc) +{ + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eIMalloc, repeats, false); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + ASSERT_EQ(leaks, 0); +} diff --git a/tests/corruption/corruption.cpp b/tests/corruption/corruption.cpp index 8e774153..b989a7be 100644 --- a/tests/corruption/corruption.cpp +++ b/tests/corruption/corruption.cpp @@ -6,6 +6,8 @@ // This hooks vld into this app #include "../../vld.h" +#include + enum CorruptionType { eAllocMismatch, @@ -13,6 +15,12 @@ enum CorruptionType eCount }; +int __cdecl ReportHook(int /*reportHook*/, wchar_t *message, int* /*returnValue*/) +{ + fwprintf(stderr, L"%s", message); + return 1; +} + void TestCorruption( CorruptionType check ) { if (check == eAllocMismatch) @@ -28,42 +36,27 @@ void TestCorruption( CorruptionType check ) } } -int _tmain(int argc, _TCHAR* argv[]) +TEST(Corruption, AllocMismatch) { - wprintf(_T("======================================\n")); - wprintf(_T("==\n")); - wprintf(_T("== VLD Tests: Memory Corruption\n")); - wprintf(_T("==\n")); - wprintf(_T("======================================\n")); - - UINT vld_options = VLDGetOptions(); - vld_options |= VLD_OPT_VALIDATE_HEAPFREE; - VLDSetOptions(vld_options, 15, 25); - - CorruptionType check = (CorruptionType)-1; + TestCorruption(eAllocMismatch); +} - if (argc == 2) - { - // Pick up options to determine which type of test to execute - if (_tcsicmp(_T("allocmismatch"), argv[1]) == 0) - check = eAllocMismatch; - else if (_tcsicmp(_T("heapmismatch"), argv[1]) == 0) - check = eHeapMismatch; - TestCorruption(check); - } +TEST(CorruptionDeathTest, HeapMismatch) +{ + EXPECT_EXIT({ + VLDSetReportHook(VLD_RPTHOOK_INSTALL, ReportHook); + TestCorruption(eHeapMismatch); + VLDSetReportHook(VLD_RPTHOOK_REMOVE, ReportHook); + }, ::testing::ExitedWithCode(0xC0000374), "CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another."); +} - if (check == -1) - { - for (int i = 0; i < eCount; i++) - { - TestCorruption((CorruptionType)i); - } - } - else - { - TestCorruption(check); - } +int main(int argc, char **argv) { + UINT vld_options = VLDGetOptions(); + vld_options |= VLD_OPT_VALIDATE_HEAPFREE; + VLDSetOptions(vld_options, 15, 25); - return 0; + ::testing::InitGoogleTest(&argc, argv); + int res = RUN_ALL_TESTS(); + VLDMarkAllLeaksAsReported(); + return res; } - diff --git a/tests/corruption/corruption.vcxproj b/tests/corruption/corruption.vcxproj index d628843c..8e00f5b9 100644 --- a/tests/corruption/corruption.vcxproj +++ b/tests/corruption/corruption.vcxproj @@ -167,7 +167,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -186,7 +186,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -206,7 +206,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -225,7 +225,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -246,7 +246,7 @@ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -268,7 +268,7 @@ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -291,7 +291,7 @@ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -313,7 +313,7 @@ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -338,6 +338,11 @@ + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + diff --git a/tests/dynamic_app/ThreadTest.cpp b/tests/dynamic_app/ThreadTest.cpp index c56a3c2a..f310a95c 100644 --- a/tests/dynamic_app/ThreadTest.cpp +++ b/tests/dynamic_app/ThreadTest.cpp @@ -91,7 +91,7 @@ void RunLoaderLockTests(bool resolve) lpMsgBuf, MAX_PATH, NULL ); - + _tprintf(_T("%s"), lpMsgBuf); } diff --git a/tests/dynamic_app/dynamic_app.cpp b/tests/dynamic_app/dynamic_app.cpp index 361a84df..e3a1a168 100644 --- a/tests/dynamic_app/dynamic_app.cpp +++ b/tests/dynamic_app/dynamic_app.cpp @@ -7,12 +7,10 @@ #include "ThreadTests.h" #include "vld.h" -#include -#include -#include +#include // Leaks 6 memory allocations -void LeakDuplicateLeaks() +void LeakDuplicateLeaks() { // For testing aggregation for (int i = 0; i < 3; ++i) @@ -28,122 +26,55 @@ void LeakDuplicateLeaks() // Should report 6 memory leaks } -namespace tut -{ - struct test - { - virtual ~test() - { - } - }; - - typedef test_group tg; - typedef tg::object object; -#ifdef _M_IX86 - tg dynamic_group("dynamic_x86"); -#else - tg dynamic_group("dynamic_x64"); -#endif +class DynamicLoader : public ::testing::TestWithParam { +}; - static const bool resolve = false; - template<> - template<> - void object::test<1>() - { - set_test_name("LoaderTests"); - int prevleaks = (int)VLDGetLeaksCount(); - HMODULE hmfcLib = RunLoaderTests(resolve); // leaks 18 - int totalleaks = (int)VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; - ensure("leaks", leaks == 18); - FreeLibrary(hmfcLib); - } +TEST_P(DynamicLoader, LoaderTests) +{ + int prevleaks = (int)VLDGetLeaksCount(); + HMODULE hmfcLib = RunLoaderTests(GetParam()); // leaks 18 + int totalleaks = (int)VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ASSERT_EQ(18, leaks); +} - template<> - template<> - void object::test<2>() - { - set_test_name("MFCLoaderTests"); - int prevleaks = (int) VLDGetLeaksCount(); - HMODULE hmfcLib = RunMFCLoaderTests(resolve); // leaks 11 +TEST_P(DynamicLoader, MFCLoaderTests) +{ + int prevleaks = (int)VLDGetLeaksCount(); + HMODULE hmfcLib = RunMFCLoaderTests(GetParam()); // leaks 11 #ifndef STATIC_CRT - FreeLibrary(hmfcLib); + FreeLibrary(hmfcLib); #endif - int totalleaks = (int) VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; - ensure("leaks", leaks == 11); + int totalleaks = (int)VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ASSERT_EQ(11, leaks); #ifdef STATIC_CRT - FreeLibrary(hmfcLib); + FreeLibrary(hmfcLib); #endif - } - - template<> - template<> - void object::test<3>() - { - set_test_name("DuplicateLeaks"); - int prevleaks = (int)VLDGetLeaksCount(); - LeakDuplicateLeaks(); // leaks 6 - int totalleaks = (int)VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; - ensure("leaks", leaks == 6); - } - - template<> - template<> - void object::test<4>() - { - // Creates 64 threads that each leaks 11 allocations - set_test_name("thread"); - int prevleaks = (int)VLDGetLeaksCount(); - RunLoaderLockTests(resolve); - int totalleaks = (int)VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; - ensure("leaks", leaks == 64 * 11); - } - - test_runner_singleton runner; } -int RunAllTest() -{ - using namespace std; - tut::console_reporter reporter(std::cout); - tut::runner.get().set_callback(&reporter); - - try - { - tut::runner.get().run_tests(); - if(reporter.all_ok()) - { - return 0; - } - else - { - std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; - } - } - catch(const tut::no_such_group &ex) - { - std::cerr << "No such group: " << ex.what() << std::endl; - } - catch(const tut::no_such_test &ex) - { - std::cerr << "No such test: " << ex.what() << std::endl; - } - catch(const tut::tut_error &ex) - { - std::cout << "General error: " << ex.what() << std::endl; - } - return 1; +TEST_P(DynamicLoader, Thread) +{ + // Creates 64 threads that each leaks 11 allocations + int prevleaks = (int)VLDGetLeaksCount(); + RunLoaderLockTests(GetParam()); + int totalleaks = (int)VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ASSERT_EQ(leaks, 64 * 11); } -void PrintUsage() +INSTANTIATE_TEST_CASE_P(ResolveVal, + DynamicLoader, + ::testing::Bool()); + +TEST(Dynamic, DuplicateLeaks) { - wprintf(_T("Usage:\n")); - wprintf(_T("\tdynamic [resolve:[true|false]]\n")); - wprintf(_T("\t - [OPTIONAL] Resolves callstacks before unloading the dynamic DLL.\n")); + int prevleaks = (int)VLDGetLeaksCount(); + LeakDuplicateLeaks(); // leaks 6 + int totalleaks = (int)VLDGetLeaksCount(); + int leaks = totalleaks - prevleaks; + ASSERT_EQ(6, leaks); } int __cdecl ReportHook(int /*reportHook*/, wchar_t *message, int* /*returnValue*/) @@ -152,78 +83,11 @@ int __cdecl ReportHook(int /*reportHook*/, wchar_t *message, int* /*returnValue* return 1; } -int _tmain(int argc, _TCHAR* argv[]) -{ - if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) - return RunAllTest(); - +int main(int argc, char **argv) { VLDSetReportHook(VLD_RPTHOOK_INSTALL, ReportHook); - wprintf(_T("======================================\n")); - wprintf(_T("==\n")); - wprintf(_T("== VLD Tests: Dynamic DLL Loading \n")); - wprintf(_T("==\n")); - wprintf(_T("======================================\n")); - - bool resolve = true; - bool doThreadTests = false; - if (argc == 2) - { - resolve = _tcsicmp(_T("true"), argv[1]) == 0; - } - else if (argc == 3) - { - resolve = _tcsicmp(_T("true"), argv[1]) == 0; - doThreadTests = _tcsicmp(_T("thread"), argv[2]) == 0; - } - - int tutleaks = (int)VLDGetLeaksCount(); - int prevleaks = tutleaks; - HMODULE hmfcLib = RunLoaderTests(resolve); // leaks 18 - int totalleaks = (int)VLDGetLeaksCount(); - int leaks1 = totalleaks - prevleaks; - prevleaks = totalleaks; - assert(leaks1 == 18); - FreeLibrary(hmfcLib); - - hmfcLib = RunMFCLoaderTests(resolve); // leaks 11 -#ifndef STATIC_CRT - FreeLibrary(hmfcLib); -#endif - totalleaks = (int)VLDGetLeaksCount(); - int leaks2 = totalleaks - prevleaks; - prevleaks = totalleaks; - assert(leaks2 == 11); -#ifdef STATIC_CRT - FreeLibrary(hmfcLib); -#endif - FreeLibrary(hmfcLib); - - LeakDuplicateLeaks(); // leaks 6 - totalleaks = (int)VLDGetLeaksCount(); - int leaks3 = totalleaks - prevleaks; - prevleaks = totalleaks; - assert(leaks3 == 6); - - if (doThreadTests) - { - // Creates 64 threads that each leaks 11 allocations - RunLoaderLockTests(resolve); - totalleaks = (int)VLDGetLeaksCount(); - int leaks4 = totalleaks - prevleaks; - assert(leaks4 == 64 * 11); - - // ..................Total: 479 leaks total - totalleaks = (int)VLDGetLeaksCount() - tutleaks; - int diff = (64 * 11 + 31) - totalleaks; - return diff; - } - - // ..................Total: 31 leaks total - totalleaks = (int)VLDGetLeaksCount() - tutleaks; - VLDReportLeaks(); + ::testing::InitGoogleTest(&argc, argv); + int res = RUN_ALL_TESTS(); VLDMarkAllLeaksAsReported(); VLDSetReportHook(VLD_RPTHOOK_REMOVE, ReportHook); - int diff = 31 - totalleaks; - return diff; + return res; } - diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/tests/dynamic_app/dynamic_app.vcxproj index fde7883e..7c0d82ca 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/tests/dynamic_app/dynamic_app.vcxproj @@ -256,7 +256,7 @@ Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -264,12 +264,7 @@ $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -284,7 +279,7 @@ exit /b 0 Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -293,12 +288,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -313,7 +303,7 @@ exit /b 0 Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -321,12 +311,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -337,7 +322,8 @@ exit /b 0 Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug Console @@ -345,12 +331,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -361,7 +342,7 @@ exit /b 0 Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -369,12 +350,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -385,7 +361,7 @@ exit /b 0 Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug @@ -394,12 +370,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -410,7 +381,7 @@ exit /b 0 Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -418,12 +389,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -434,7 +400,8 @@ exit /b 0 Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug Console @@ -442,12 +409,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -460,7 +422,7 @@ exit /b 0 true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -470,12 +432,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -488,7 +445,7 @@ exit /b 0 true true STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -499,12 +456,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -"$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -515,7 +467,7 @@ exit /b 0 true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) Console @@ -525,12 +477,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -541,7 +488,7 @@ exit /b 0 true STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -552,12 +499,7 @@ exit /b 0 $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - -copy $(ProjectDir)..\dynamic_dll\$(Platform)\$(Configuration)\dynamic.dll $(OutDir)\dynamic.dll /y -copy $(ProjectDir)..\mfc_dll\$(Platform)\$(Configuration)\test_mfc.dll $(OutDir)\test_mfc.dll /y -if "$(PROCESSOR_ARCHITEW6432)"=="AMD64" "$(TargetPath)" test -exit /b 0 + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -573,6 +515,11 @@ exit /b 0 + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + diff --git a/tests/mfc/vldmfc.vcxproj b/tests/mfc/vldmfc.vcxproj index 8d893d38..97020937 100644 --- a/tests/mfc/vldmfc.vcxproj +++ b/tests/mfc/vldmfc.vcxproj @@ -187,7 +187,7 @@ MaxSpeed OnlyExplicitInline - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -233,7 +233,7 @@ MaxSpeed OnlyExplicitInline - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded @@ -278,7 +278,7 @@ MaxSpeed OnlyExplicitInline - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -322,7 +322,7 @@ MaxSpeed OnlyExplicitInline - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded @@ -366,7 +366,7 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -414,7 +414,7 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -461,7 +461,7 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -506,7 +506,7 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug diff --git a/tests/suite/testsuite.cpp b/tests/suite/testsuite.cpp index 27b07481..e2775b46 100644 --- a/tests/suite/testsuite.cpp +++ b/tests/suite/testsuite.cpp @@ -35,10 +35,7 @@ #include -#include -#include -#include - +#include enum action_e { a_calloc, @@ -429,99 +426,16 @@ void RunTestSuite() } } -namespace tut +TEST(TestSuit, MultiThread) { - struct test - { - virtual ~test() - { - } - }; - - typedef test_group tg; - typedef tg::object object; -#ifdef _M_IX86 - tg dynamic_group("TestSuite_x86"); -#else - tg dynamic_group("TestSuite_x64"); -#endif - - static const bool resolve = false; - - template<> - template<> - void object::test<1>() - { - set_test_name("MultiThread"); - int prevleaks = (int)VLDGetLeaksCount(); - RunTestSuite(); - int leaks = (int)VLDGetLeaksCount() - prevleaks; - ensure("leaks", leaks == leaks_count); - } - - test_runner_singleton runner; -} - -int RunAllTest() -{ - using namespace std; - tut::console_reporter reporter(std::cout); - tut::runner.get().set_callback(&reporter); - - try - { - tut::runner.get().run_tests(); - if(reporter.all_ok()) - { - return 0; - } - else - { - std::cerr << "\nFAILURE and EXCEPTION in these tests are FAKE ;)" << std::endl; - } - } - catch(const tut::no_such_group &ex) - { - std::cerr << "No such group: " << ex.what() << std::endl; - } - catch(const tut::no_such_test &ex) - { - std::cerr << "No such test: " << ex.what() << std::endl; - } - catch(const tut::tut_error &ex) - { - std::cout << "General error: " << ex.what() << std::endl; - } - return 1; -} - -int main (int argc, char *argv []) -{ - if (argc >= 2 && _tcsicmp(_T("test"), argv[1]) == 0) - return RunAllTest(); - - _tprintf(_T("======================================\n")); - _tprintf(_T("==\n")); - _tprintf(_T("== VLD Tests: thread suite\n")); - _tprintf(_T("==\n")); - _tprintf(_T("======================================\n")); - - - int prevleaks = (int)VLDGetLeaksCount(); - DWORD start = GetTickCount(); - srand(start); - + int prevleaks = static_cast(VLDGetLeaksCount()); RunTestSuite(); + int totalleaks = static_cast(VLDGetLeaksCount()); + int leaks = totalleaks - prevleaks; + ASSERT_EQ(leaks, leaks_count); +} - DWORD end = GetTickCount(); - static const int MESSAGESIZE = 512; - char message [MESSAGESIZE] = {0}; - _snprintf_s(message, MESSAGESIZE, _TRUNCATE, "Elapsed Time = %ums\n", end - start); - OutputDebugString(message); - - int totalleaks = (int)VLDGetLeaksCount() - prevleaks; - int diff = leaks_count - totalleaks; - assert(diff == 0); - - return diff; +int main(int argc, char **argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } diff --git a/tests/suite/testsuite.vcxproj b/tests/suite/testsuite.vcxproj index 4d5bcab6..f14e17d3 100644 --- a/tests/suite/testsuite.vcxproj +++ b/tests/suite/testsuite.vcxproj @@ -229,7 +229,7 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -250,7 +250,7 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -271,7 +271,7 @@ Full - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -291,7 +291,7 @@ Full - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) MultiThreaded true @@ -311,7 +311,7 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -332,11 +332,11 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug false EditAndContinue true @@ -356,7 +356,7 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN64;%(PreprocessorDefinitions) true EnableFastChecks @@ -382,7 +382,7 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN64;%(PreprocessorDefinitions) true EnableFastChecks @@ -408,7 +408,7 @@ Full - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -432,7 +432,7 @@ Full - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) MultiThreaded true @@ -456,7 +456,7 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN64;%(PreprocessorDefinitions) true EnableFastChecks @@ -482,11 +482,11 @@ Disabled - ..\..;..\..\lib\tut-framework\include;%(AdditionalIncludeDirectories) + ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) WIN64;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug false ProgramDatabase true @@ -505,6 +505,11 @@ + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + diff --git a/vld.cpp b/vld.cpp index 4bf10037..0236bac1 100644 --- a/vld.cpp +++ b/vld.cpp @@ -62,7 +62,7 @@ __declspec(dllexport) VisualLeakDetector g_vld; patchentry_t ldrLoadDllPatch [] = { "LdrLoadDll", NULL, VisualLeakDetector::_LdrLoadDll, NULL, NULL, NULL -}; +}; moduleentry_t ntdllPatch [] = { "ntdll.dll", NULL, ldrLoadDllPatch, }; @@ -218,12 +218,12 @@ VisualLeakDetector::VisualLeakDetector () LPWSTR symbolpath = buildSymbolSearchPath(); #ifdef NOISY_DBGHELP_DIAGOSTICS // From MSDN docs about SYMOPT_DEBUG: - /* To view all attempts to load symbols, call SymSetOptions with SYMOPT_DEBUG. - This causes DbgHelp to call the OutputDebugString function with detailed + /* To view all attempts to load symbols, call SymSetOptions with SYMOPT_DEBUG. + This causes DbgHelp to call the OutputDebugString function with detailed information on symbol searches, such as the directories it is searching and and error messages. In other words, this will really pollute the debug output window with extra messages. - To enable this debug output to be displayed to the console without changing your source code, - set the DBGHELP_DBGOUT environment variable to a non-NULL value before calling the SymInitialize function. + To enable this debug output to be displayed to the console without changing your source code, + set the DBGHELP_DBGOUT environment variable to a non-NULL value before calling the SymInitialize function. To log the information to a file, set the DBGHELP_LOG environment variable to the name of the log file to be used. */ SymSetOptions(SYMOPT_DEBUG | SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS | SYMOPT_LOAD_LINES); @@ -298,7 +298,7 @@ bool VisualLeakDetector::waitForAllVLDThreads() // graceful way for a thread to go down. Warn about this, // and wait until the thread has exited so that we know it // can't still be off running somewhere in VLD's code. - // + // // Since we've been waiting a while, let the human know we are // still here and alive. waitcount++; @@ -315,7 +315,7 @@ bool VisualLeakDetector::waitForAllVLDThreads() return threadsactive; } -void VisualLeakDetector::checkInternalMemoryLeaks() +void VisualLeakDetector::checkInternalMemoryLeaks() { const char* leakfile = NULL; size_t count; @@ -614,7 +614,7 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) delete [] modulenamea; } // mfc dll shouldn't be excluded - if (!isMfcModule) + if (!isMfcModule) { // This module does not import VLD. This means that none of the module's // sources #included vld.h. @@ -634,7 +634,7 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) } } } - if ((moduleFlags & VLD_MODULE_EXCLUDED) == 0 && + if ((moduleFlags & VLD_MODULE_EXCLUDED) == 0 && !(moduleFlags & VLD_MODULE_SYMBOLSLOADED) || (moduleimageinfo.SymType == SymExport)) { // This module is going to be included in leak detection, but complete // symbols for this module couldn't be loaded. This means that any stack @@ -730,7 +730,7 @@ LPWSTR VisualLeakDetector::buildSymbolSearchPath () HKEY debuggerkey; WCHAR symbolCacheDir [MAX_PATH] = {0}; LSTATUS regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\10.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); - if (regstatus != ERROR_SUCCESS) + if (regstatus != ERROR_SUCCESS) regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\9.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); if (regstatus == ERROR_SUCCESS) @@ -867,7 +867,7 @@ VOID VisualLeakDetector::configure () m_forcedModuleList[0] = '\0'; else m_options |= VLD_OPT_MODULE_LIST_INCLUDE; - + // Read the report destination (debugger, file, or both). WCHAR filename [MAX_PATH] = {0}; LoadStringOption(L"ReportFile", filename, MAX_PATH, inipath); @@ -933,7 +933,7 @@ BOOL VisualLeakDetector::enabled () tls_t* tls = getTls(); if (!(tls->flags & VLD_TLS_DISABLED) && !(tls->flags & VLD_TLS_ENABLED)) { - // The enabled/disabled state for the current thread has not been + // The enabled/disabled state for the current thread has not been // initialized yet. Use the default state. if (m_options & VLD_OPT_START_DISABLED) { tls->flags |= VLD_TLS_DISABLED; @@ -1186,14 +1186,14 @@ VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t & // Find this block in the block map. BlockMap *blockmap = &(*heapit).second->blockMap; BlockMap::Iterator blockit = blockmap->find(mem); - if (blockit == blockmap->end()) + if (blockit == blockmap->end()) { // This memory block is not in the block map. We must not have monitored this // allocation (probably happened before VLD was initialized). // This can also result from allocating on one heap, and freeing on another heap. // This is an especially bad way to corrupt the application. - // Now we have to search through every heap and every single block in each to make + // Now we have to search through every heap and every single block in each to make // sure that this is indeed the case. if (m_options & VLD_OPT_VALIDATE_HEAPFREE) { @@ -1374,7 +1374,7 @@ VOID VisualLeakDetector::reportConfig () Report(L" Aggregating duplicate leaks.\n"); } if (m_forcedModuleList[0] != '\0') { - Report(L" Forcing %s of these modules in leak detection: %s\n", + Report(L" Forcing %s of these modules in leak detection: %s\n", (m_options & VLD_OPT_MODULE_LIST_INCLUDE) ? L"inclusion" : L"exclusion", m_forcedModuleList); } if (m_maxDataDump != VLD_DEFAULT_MAX_DATA_DUMP) { @@ -1490,7 +1490,7 @@ SIZE_T VisualLeakDetector::reportHeapLeaks (HANDLE heap) // Show a summary. if (leaks_count != 0) { - Report(L"Visual Leak Detector detected %Iu memory leak%s in heap " ADDRESSFORMAT L"\n", + Report(L"Visual Leak Detector detected %Iu memory leak%s in heap " ADDRESSFORMAT L"\n", leaks_count, (leaks_count > 1) ? L"s" : L"", heap); } return leaks_count; @@ -1604,13 +1604,13 @@ VOID VisualLeakDetector::markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD thr // This is a really good example of how to iterate through the data structures // that represent heaps and their associated memory blocks. // Pre Condition: Be VERY sure that this is only called within a block that already has -// acquired a critical section for m_maplock. +// acquired a critical section for m_maplock. // // mem - The particular memory address to search for. -// +// // Return Value: // If mem is found, it will return the blockinfo_t pointer, otherwise NULL -// +// blockinfo_t* VisualLeakDetector::findAllocedBlock(LPCVOID mem, __out HANDLE& heap) { heap = NULL; @@ -1764,7 +1764,7 @@ BOOL VisualLeakDetector::detachFromModule (PCWSTR /*modulepath*/, DWORD64 module // _GetProcAddress - Calls to GetProcAddress are patched through to this // function. If the requested function is a function that has been patched // through to one of VLD's handlers, then the address of VLD's handler -// function is returned instead of the real address. Otherwise, this +// function is returned instead of the real address. Otherwise, this // function is just a wrapper around the real GetProcAddress. // // - module (IN): Handle (base address) of the module from which to retrieve @@ -1985,7 +1985,7 @@ SIZE_T VisualLeakDetector::GetThreadLeaksCount(DWORD threadId) return leaksCount; } -SIZE_T VisualLeakDetector::ReportLeaks( ) +SIZE_T VisualLeakDetector::ReportLeaks( ) { if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. @@ -2006,7 +2006,7 @@ SIZE_T VisualLeakDetector::ReportLeaks( ) return leaksCount; } -SIZE_T VisualLeakDetector::ReportThreadLeaks( DWORD threadId ) +SIZE_T VisualLeakDetector::ReportThreadLeaks( DWORD threadId ) { if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. @@ -2027,7 +2027,7 @@ SIZE_T VisualLeakDetector::ReportThreadLeaks( DWORD threadId ) return leaksCount; } -VOID VisualLeakDetector::MarkAllLeaksAsReported( ) +VOID VisualLeakDetector::MarkAllLeaksAsReported( ) { if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. @@ -2044,7 +2044,7 @@ VOID VisualLeakDetector::MarkAllLeaksAsReported( ) } } -VOID VisualLeakDetector::MarkThreadLeaksAsReported( DWORD threadId ) +VOID VisualLeakDetector::MarkThreadLeaksAsReported( DWORD threadId ) { if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. @@ -2069,7 +2069,7 @@ void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) moduleit = m_loadedModules->begin(); while( moduleit != m_loadedModules->end() ) { - if ( (*moduleit).addrLow == (UINT_PTR)module) + if ( (*moduleit).addrLow == (UINT_PTR)module) { moduleinfo_t *mod = (moduleinfo_t *)&(*moduleit); if ( on ) @@ -2197,8 +2197,8 @@ void VisualLeakDetector::GlobalEnableLeakDetection () } } -CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_INCLUDE | - VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | +CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_INCLUDE | + VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS | VLD_OPT_VALIDATE_HEAPFREE; UINT32 VisualLeakDetector::GetOptions() @@ -2278,7 +2278,7 @@ void VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filen } CriticalSectionLocker cs(m_optionsLock); - m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | + m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits m_options |= option_mask & VLD_OPT_REPORT_TO_DEBUGGER; @@ -2318,7 +2318,7 @@ int VisualLeakDetector::SetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook) { ReportHookSet::Iterator it = g_pReportHooks->insert(pfnNewHook); return (it != g_pReportHooks->end()) ? 0 : -1; - } + } else if (mode == VLD_RPTHOOK_REMOVE) { g_pReportHooks->erase(pfnNewHook); diff --git a/vld_vs14.sln b/vld_vs14.sln new file mode 100644 index 00000000..f3f4755a --- /dev/null +++ b/vld_vs14.sln @@ -0,0 +1,292 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" + ProjectSection(ProjectDependencies) = postProject + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 + Debug_StaticCrt|x64 = Debug_StaticCrt|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + DebugRelease_StaticCrt|Win32 = DebugRelease_StaticCrt|Win32 + DebugRelease_StaticCrt|x64 = DebugRelease_StaticCrt|x64 + DebugRelease|Win32 = DebugRelease|Win32 + DebugRelease|x64 = DebugRelease|x64 + Release_StaticCrt|Win32 = Release_StaticCrt|Win32 + Release_StaticCrt|x64 = Release_StaticCrt|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.Build.0 = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.ActiveCfg = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.Build.0 = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + EndGlobalSection +EndGlobal From 311d2ae839f984879f71abc4f59c17adaccdb1c1 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Tue, 28 Jul 2015 03:20:25 +0300 Subject: [PATCH 185/321] Source code moved to src subfolder --- setup/vld-setup.iss | 88 +- callstack.cpp => src/callstack.cpp | 0 callstack.h => src/callstack.h | 0 criticalsection.h => src/criticalsection.h | 0 crtmfcpatch.h => src/crtmfcpatch.h | 0 dllspatches.cpp => src/dllspatches.cpp | 0 map.h => src/map.h | 0 ntapi.cpp => src/ntapi.cpp | 0 ntapi.h => src/ntapi.h | 0 resource.h => src/resource.h | 0 set.h => src/set.h | 0 stdafx.cpp => src/stdafx.cpp | 0 stdafx.h => src/stdafx.h | 0 {tests => src/tests}/Common.props | 44 +- {tests => src/tests}/basics/Allocs.cpp | 0 {tests => src/tests}/basics/Allocs.h | 0 src/tests/basics/LeakOption.h | 22 + {tests => src/tests}/basics/basics.cpp | 24 +- {tests => src/tests}/basics/basics.vcxproj | 1068 +++++++------- .../tests}/basics/basics.vcxproj.filters | 0 .../tests}/basics/basics_disabled.cpp | 24 +- {tests => src/tests}/basics/stdafx.cpp | 0 {tests => src/tests}/basics/stdafx.h | 0 {tests => src/tests}/basics/targetver.h | 0 {tests => src/tests}/console/README.md | 0 {tests => src/tests}/console/main.c | 0 {tests => src/tests}/console/main.cpp | 0 {tests => src/tests}/console/vldconsole.sln | 0 .../tests}/console/vldconsole.vcxproj | 0 .../tests}/console/vldconsole.vcxproj.filters | 0 .../tests}/console/vldconsole_vs10.sln | 0 src/tests/copydlls.bat | 5 + {tests => src/tests}/corruption/Tests.cpp | 0 {tests => src/tests}/corruption/Tests.h | 0 .../tests}/corruption/corruption.cpp | 2 +- .../tests}/corruption/corruption.vcxproj | 696 ++++----- .../corruption/corruption.vcxproj.filters | 0 {tests => src/tests}/corruption/stdafx.cpp | 0 {tests => src/tests}/corruption/stdafx.h | 0 {tests => src/tests}/corruption/targetver.h | 0 .../tests}/dynamic_app/LoadTests.cpp | 0 {tests => src/tests}/dynamic_app/LoadTests.h | 0 .../tests}/dynamic_app/ThreadTest.cpp | 0 .../tests}/dynamic_app/ThreadTests.h | 0 .../tests}/dynamic_app/dynamic_app.cpp | 0 .../tests}/dynamic_app/dynamic_app.vcxproj | 1050 +++++++------- .../dynamic_app/dynamic_app.vcxproj.filters | 0 {tests => src/tests}/dynamic_app/stdafx.cpp | 0 {tests => src/tests}/dynamic_app/stdafx.h | 0 {tests => src/tests}/dynamic_app/targetver.h | 0 {tests => src/tests}/dynamic_dll/dllmain.cpp | 0 {tests => src/tests}/dynamic_dll/dynamic.cpp | 0 {tests => src/tests}/dynamic_dll/dynamic.h | 0 .../tests}/dynamic_dll/dynamic.vcxproj | 960 ++++++------- .../dynamic_dll/dynamic.vcxproj.filters | 0 {tests => src/tests}/dynamic_dll/stdafx.cpp | 0 {tests => src/tests}/dynamic_dll/stdafx.h | 0 {tests => src/tests}/dynamic_dll/targetver.h | 0 {tests => src/tests}/mfc/StdAfx.cpp | 0 {tests => src/tests}/mfc/StdAfx.h | 0 {tests => src/tests}/mfc/res/vldmfc.ico | Bin {tests => src/tests}/mfc/res/vldmfc.rc2 | 0 {tests => src/tests}/mfc/resource.h | 0 {tests => src/tests}/mfc/vldmfc.cpp | 0 {tests => src/tests}/mfc/vldmfc.h | 0 {tests => src/tests}/mfc/vldmfc.rc | 0 {tests => src/tests}/mfc/vldmfc.sln | 0 {tests => src/tests}/mfc/vldmfc.vcxproj | 1254 ++++++++--------- .../tests}/mfc/vldmfc.vcxproj.filters | 0 {tests => src/tests}/mfc/vldmfc_vs10.sln | 0 {tests => src/tests}/mfc/vldmfcdlg.cpp | 0 {tests => src/tests}/mfc/vldmfcdlg.h | 0 {tests => src/tests}/mfc_dll/Resource.h | 0 {tests => src/tests}/mfc_dll/mfc.cpp | 0 {tests => src/tests}/mfc_dll/mfc.def | 0 {tests => src/tests}/mfc_dll/mfc.h | 0 {tests => src/tests}/mfc_dll/mfc.rc | Bin {tests => src/tests}/mfc_dll/mfc.vcxproj | 1128 +++++++-------- .../tests}/mfc_dll/mfc.vcxproj.filters | 0 {tests => src/tests}/mfc_dll/res/mfc.rc2 | Bin {tests => src/tests}/mfc_dll/stdafx.cpp | 0 {tests => src/tests}/mfc_dll/stdafx.h | 0 {tests => src/tests}/mfc_dll/targetver.h | 0 {tests => src/tests}/suite/testsuite.cpp | 4 +- {tests => src/tests}/suite/testsuite.vcxproj | 1030 +++++++------- .../tests}/suite/testsuite.vcxproj.filters | 0 .../tests}/suite/testsuite.vcxproj.vspscc | 0 tree.h => src/tree.h | 0 utility.cpp => src/utility.cpp | 0 utility.h => src/utility.h | 0 vld.cpp => src/vld.cpp | 2 +- .../vld.dll.dependency.x64.manifest | 0 .../vld.dll.dependency.x86.manifest | 0 vld.h => src/vld.h | 0 vld.rc => src/vld.rc | 0 vld.vcxproj => src/vld.vcxproj | 402 +++--- .../vld.vcxproj.filters | 0 vld_def.h => src/vld_def.h | 92 +- vld_hooks.cpp => src/vld_hooks.cpp | 0 vldallocator.h => src/vldallocator.h | 0 vldapi.cpp => src/vldapi.cpp | 0 vldheap.cpp => src/vldheap.cpp | 0 vldheap.h => src/vldheap.h | 0 vldint.h => src/vldint.h | 816 +++++------ tests/basics/ExecuteTestBasics_x64.bat | 24 - tests/basics/ExecuteTestBasics_x86.bat | 24 - tests/basics/LeakOption.h | 22 - tests/copydlls.bat | 5 - vld_vs10.sln | 16 +- vld_vs11.sln | 16 +- vld_vs14.sln | 34 +- 111 files changed, 4398 insertions(+), 4454 deletions(-) rename callstack.cpp => src/callstack.cpp (100%) rename callstack.h => src/callstack.h (100%) rename criticalsection.h => src/criticalsection.h (100%) rename crtmfcpatch.h => src/crtmfcpatch.h (100%) mode change 100755 => 100644 rename dllspatches.cpp => src/dllspatches.cpp (100%) rename map.h => src/map.h (100%) rename ntapi.cpp => src/ntapi.cpp (100%) rename ntapi.h => src/ntapi.h (100%) rename resource.h => src/resource.h (100%) mode change 100755 => 100644 rename set.h => src/set.h (100%) rename stdafx.cpp => src/stdafx.cpp (100%) rename stdafx.h => src/stdafx.h (100%) rename {tests => src/tests}/Common.props (98%) rename {tests => src/tests}/basics/Allocs.cpp (100%) rename {tests => src/tests}/basics/Allocs.h (100%) create mode 100644 src/tests/basics/LeakOption.h rename {tests => src/tests}/basics/basics.cpp (90%) rename {tests => src/tests}/basics/basics.vcxproj (90%) rename {tests => src/tests}/basics/basics.vcxproj.filters (100%) rename {tests => src/tests}/basics/basics_disabled.cpp (91%) rename {tests => src/tests}/basics/stdafx.cpp (100%) rename {tests => src/tests}/basics/stdafx.h (100%) rename {tests => src/tests}/basics/targetver.h (100%) rename {tests => src/tests}/console/README.md (100%) rename {tests => src/tests}/console/main.c (100%) rename {tests => src/tests}/console/main.cpp (100%) rename {tests => src/tests}/console/vldconsole.sln (100%) rename {tests => src/tests}/console/vldconsole.vcxproj (100%) rename {tests => src/tests}/console/vldconsole.vcxproj.filters (100%) rename {tests => src/tests}/console/vldconsole_vs10.sln (100%) create mode 100644 src/tests/copydlls.bat rename {tests => src/tests}/corruption/Tests.cpp (100%) rename {tests => src/tests}/corruption/Tests.h (100%) rename {tests => src/tests}/corruption/corruption.cpp (98%) rename {tests => src/tests}/corruption/corruption.vcxproj (89%) rename {tests => src/tests}/corruption/corruption.vcxproj.filters (100%) rename {tests => src/tests}/corruption/stdafx.cpp (100%) rename {tests => src/tests}/corruption/stdafx.h (100%) rename {tests => src/tests}/corruption/targetver.h (100%) rename {tests => src/tests}/dynamic_app/LoadTests.cpp (100%) rename {tests => src/tests}/dynamic_app/LoadTests.h (100%) rename {tests => src/tests}/dynamic_app/ThreadTest.cpp (100%) rename {tests => src/tests}/dynamic_app/ThreadTests.h (100%) rename {tests => src/tests}/dynamic_app/dynamic_app.cpp (100%) rename {tests => src/tests}/dynamic_app/dynamic_app.vcxproj (89%) rename {tests => src/tests}/dynamic_app/dynamic_app.vcxproj.filters (100%) rename {tests => src/tests}/dynamic_app/stdafx.cpp (100%) rename {tests => src/tests}/dynamic_app/stdafx.h (100%) rename {tests => src/tests}/dynamic_app/targetver.h (100%) rename {tests => src/tests}/dynamic_dll/dllmain.cpp (100%) rename {tests => src/tests}/dynamic_dll/dynamic.cpp (100%) rename {tests => src/tests}/dynamic_dll/dynamic.h (100%) rename {tests => src/tests}/dynamic_dll/dynamic.vcxproj (98%) rename {tests => src/tests}/dynamic_dll/dynamic.vcxproj.filters (100%) rename {tests => src/tests}/dynamic_dll/stdafx.cpp (100%) rename {tests => src/tests}/dynamic_dll/stdafx.h (100%) rename {tests => src/tests}/dynamic_dll/targetver.h (100%) rename {tests => src/tests}/mfc/StdAfx.cpp (100%) rename {tests => src/tests}/mfc/StdAfx.h (100%) rename {tests => src/tests}/mfc/res/vldmfc.ico (100%) rename {tests => src/tests}/mfc/res/vldmfc.rc2 (100%) rename {tests => src/tests}/mfc/resource.h (100%) rename {tests => src/tests}/mfc/vldmfc.cpp (100%) rename {tests => src/tests}/mfc/vldmfc.h (100%) rename {tests => src/tests}/mfc/vldmfc.rc (100%) rename {tests => src/tests}/mfc/vldmfc.sln (100%) rename {tests => src/tests}/mfc/vldmfc.vcxproj (93%) rename {tests => src/tests}/mfc/vldmfc.vcxproj.filters (100%) rename {tests => src/tests}/mfc/vldmfc_vs10.sln (100%) rename {tests => src/tests}/mfc/vldmfcdlg.cpp (100%) rename {tests => src/tests}/mfc/vldmfcdlg.h (100%) rename {tests => src/tests}/mfc_dll/Resource.h (100%) rename {tests => src/tests}/mfc_dll/mfc.cpp (100%) rename {tests => src/tests}/mfc_dll/mfc.def (100%) rename {tests => src/tests}/mfc_dll/mfc.h (100%) rename {tests => src/tests}/mfc_dll/mfc.rc (100%) rename {tests => src/tests}/mfc_dll/mfc.vcxproj (98%) rename {tests => src/tests}/mfc_dll/mfc.vcxproj.filters (100%) rename {tests => src/tests}/mfc_dll/res/mfc.rc2 (100%) rename {tests => src/tests}/mfc_dll/stdafx.cpp (100%) rename {tests => src/tests}/mfc_dll/stdafx.h (100%) rename {tests => src/tests}/mfc_dll/targetver.h (100%) rename {tests => src/tests}/suite/testsuite.cpp (99%) rename {tests => src/tests}/suite/testsuite.vcxproj (90%) rename {tests => src/tests}/suite/testsuite.vcxproj.filters (100%) rename {tests => src/tests}/suite/testsuite.vcxproj.vspscc (100%) rename tree.h => src/tree.h (100%) rename utility.cpp => src/utility.cpp (100%) rename utility.h => src/utility.h (100%) rename vld.cpp => src/vld.cpp (99%) rename vld.dll.dependency.x64.manifest => src/vld.dll.dependency.x64.manifest (100%) rename vld.dll.dependency.x86.manifest => src/vld.dll.dependency.x86.manifest (100%) rename vld.h => src/vld.h (100%) rename vld.rc => src/vld.rc (100%) mode change 100755 => 100644 rename vld.vcxproj => src/vld.vcxproj (94%) rename vld.vcxproj.filters => src/vld.vcxproj.filters (100%) rename vld_def.h => src/vld_def.h (98%) rename vld_hooks.cpp => src/vld_hooks.cpp (100%) rename vldallocator.h => src/vldallocator.h (100%) rename vldapi.cpp => src/vldapi.cpp (100%) rename vldheap.cpp => src/vldheap.cpp (100%) rename vldheap.h => src/vldheap.h (100%) rename vldint.h => src/vldint.h (98%) delete mode 100644 tests/basics/ExecuteTestBasics_x64.bat delete mode 100644 tests/basics/ExecuteTestBasics_x86.bat delete mode 100644 tests/basics/LeakOption.h delete mode 100644 tests/copydlls.bat diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index ae4615a4..6e420768 100644 --- a/setup/vld-setup.iss +++ b/setup/vld-setup.iss @@ -43,45 +43,45 @@ 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: "..\bin\Win32\Release\vld.lib"; DestDir: "{app}\lib\Win32"; Flags: ignoreversion -Source: "..\bin\Win32\Release\vld_x86.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion -Source: "..\bin\x64\Release\vld.lib"; DestDir: "{app}\lib\Win64"; Flags: ignoreversion -Source: "..\bin\x64\Release\vld_x64.dll"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion -Source: "..\vld.h"; DestDir: "{app}\include"; Flags: ignoreversion -Source: "..\vld_def.h"; DestDir: "{app}\include"; Flags: ignoreversion +Source: "..\src\bin\Win32\Release\vld.lib"; DestDir: "{app}\lib\Win32"; Flags: ignoreversion +Source: "..\src\bin\Win32\Release\vld_x86.dll"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion +Source: "..\src\bin\x64\Release\vld.lib"; DestDir: "{app}\lib\Win64"; Flags: ignoreversion +Source: "..\src\bin\x64\Release\vld_x64.dll"; 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 Source: "version.h"; DestDir: "{app}\src"; Flags: ignoreversion Source: "..\AUTHORS.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "..\CHANGES.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "..\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\callstack.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\dllspatches.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\ntapi.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\stdafx.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\utility.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vld.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vld_hooks.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vldapi.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vldheap.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\callstack.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\criticalsection.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\crtmfcpatch.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\map.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\ntapi.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\resource.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\set.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\stdafx.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\tree.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\utility.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vld.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vld_def.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vldheap.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vldint.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vld.dll.dependency.x64.manifest"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vld.dll.dependency.x86.manifest"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vld.rc"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vld.vcxproj"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\vld.vcxproj.filters"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\callstack.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\dllspatches.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\ntapi.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\stdafx.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\utility.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vld.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vld_hooks.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vldapi.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vldheap.cpp"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\callstack.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\criticalsection.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\crtmfcpatch.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\map.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\ntapi.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\resource.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\set.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\stdafx.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\tree.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\utility.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vld.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vld_def.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vldheap.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vldint.h"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vld.dll.dependency.x64.manifest"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vld.dll.dependency.x86.manifest"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vld.rc"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vld.vcxproj"; DestDir: "{app}\src"; Flags: ignoreversion +Source: "..\src\vld.vcxproj.filters"; DestDir: "{app}\src"; Flags: ignoreversion [Tasks] Name: "modifypath"; Description: "Add VLD directory to your environmental path" @@ -132,7 +132,7 @@ begin Result := sUnInstString; end; -function UninstallOldVersion(regPath: string; params: string): Boolean; +function UninstallOldVersion(regPath: string; params: string): Boolean; var iResultCode: Integer; begin @@ -148,7 +148,7 @@ begin end end; -function UninstallOldVersions(): Boolean; +function UninstallOldVersions(): Boolean; var nsisUnInstallString: String; isUnInstallString: String; @@ -244,7 +244,7 @@ begin for i := 0 to GetArrayLength(map) - 1 do begin if map[i].Key = 'Win32' then map[i].Value := UpdatePath(map[i].Value, path32) - else if map[i].Key = 'x64' then map[i].Value := UpdatePath(map[i].Value, path64); + else if map[i].Key = 'x64' then map[i].Value := UpdatePath(map[i].Value, path64); end; dirList := Merge(map, '|'); Log(dirList); @@ -252,7 +252,7 @@ end; procedure ModifySettings(filename: string); var - XMLDocument: Variant; + XMLDocument: Variant; XMLParent, XMLNode, XMLNodes: Variant; IncludeDirectoriesNode: Variant; AdditionalIncludeDirectories: string; @@ -292,7 +292,7 @@ begin except ShowExceptionMessage; end; -end; +end; procedure ModifyVS2008Settings(); var @@ -311,14 +311,14 @@ begin end; end; -function EncodeString(str: string): string; +function EncodeString(str: string): string; begin Result := str; StringChangeEx(Result, '(', '%28', True); StringChangeEx(Result, ')', '%29', True); end; -procedure UpdateString(var dirList: string; path: string; suffix: string); +procedure UpdateString(var dirList: string; path: string; suffix: string); begin if dirList = '' then dirList := path + suffix @@ -329,7 +329,7 @@ end; procedure ModifyProps(filename: string; libfolder: string); var - XMLDocument: Variant; + XMLDocument: Variant; XMLParent, IdgNode, XMLNode, XMLNodes: Variant; IncludeDirectoriesNode: Variant; AdditionalIncludeDirectories: string; @@ -439,7 +439,7 @@ begin except ShowExceptionMessage; end; -end; +end; procedure ModifyAllProps(); var @@ -464,7 +464,7 @@ begin if IsTaskSelected('modifyVS2010Props') then ModifyAllProps(); end; - CurStepChangedModPath(CurStep); + CurStepChangedModPath(CurStep); end; procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); diff --git a/callstack.cpp b/src/callstack.cpp similarity index 100% rename from callstack.cpp rename to src/callstack.cpp diff --git a/callstack.h b/src/callstack.h similarity index 100% rename from callstack.h rename to src/callstack.h diff --git a/criticalsection.h b/src/criticalsection.h similarity index 100% rename from criticalsection.h rename to src/criticalsection.h diff --git a/crtmfcpatch.h b/src/crtmfcpatch.h old mode 100755 new mode 100644 similarity index 100% rename from crtmfcpatch.h rename to src/crtmfcpatch.h diff --git a/dllspatches.cpp b/src/dllspatches.cpp similarity index 100% rename from dllspatches.cpp rename to src/dllspatches.cpp diff --git a/map.h b/src/map.h similarity index 100% rename from map.h rename to src/map.h diff --git a/ntapi.cpp b/src/ntapi.cpp similarity index 100% rename from ntapi.cpp rename to src/ntapi.cpp diff --git a/ntapi.h b/src/ntapi.h similarity index 100% rename from ntapi.h rename to src/ntapi.h diff --git a/resource.h b/src/resource.h old mode 100755 new mode 100644 similarity index 100% rename from resource.h rename to src/resource.h diff --git a/set.h b/src/set.h similarity index 100% rename from set.h rename to src/set.h diff --git a/stdafx.cpp b/src/stdafx.cpp similarity index 100% rename from stdafx.cpp rename to src/stdafx.cpp diff --git a/stdafx.h b/src/stdafx.h similarity index 100% rename from stdafx.h rename to src/stdafx.h diff --git a/tests/Common.props b/src/tests/Common.props similarity index 98% rename from tests/Common.props rename to src/tests/Common.props index a2e9bd23..76e531b9 100644 --- a/tests/Common.props +++ b/src/tests/Common.props @@ -1,23 +1,23 @@ - - - - - d - - - x86 - x64 - - Debug - Debug - Release - Release - Release - Release - - - <_ProjectFileVersion>10.0.40219.1 - - - + + + + + d + + + x86 + x64 + + Debug + Debug + Release + Release + Release + Release + + + <_ProjectFileVersion>10.0.40219.1 + + + \ No newline at end of file diff --git a/tests/basics/Allocs.cpp b/src/tests/basics/Allocs.cpp similarity index 100% rename from tests/basics/Allocs.cpp rename to src/tests/basics/Allocs.cpp diff --git a/tests/basics/Allocs.h b/src/tests/basics/Allocs.h similarity index 100% rename from tests/basics/Allocs.h rename to src/tests/basics/Allocs.h diff --git a/src/tests/basics/LeakOption.h b/src/tests/basics/LeakOption.h new file mode 100644 index 00000000..788fdf61 --- /dev/null +++ b/src/tests/basics/LeakOption.h @@ -0,0 +1,22 @@ +#pragma once + + +enum LeakOption +{ + eMalloc, // "malloc" + eNew, // "new" + eNewArray,// "new_array" + eCalloc, // "calloc" + eRealloc, // "realloc" + eCoTaskMem, // For COM, use "CoTaskMem" + eAlignedMalloc, // "_aligned_malloc" + eAlignedRealloc, // "_aligned_realloc" + eStrdup, // "strdup" + eHeapAlloc, + eGetProcMalloc, + eIMalloc, + eCount, +}; + + + diff --git a/tests/basics/basics.cpp b/src/tests/basics/basics.cpp similarity index 90% rename from tests/basics/basics.cpp rename to src/tests/basics/basics.cpp index 104ecb62..868757c7 100644 --- a/tests/basics/basics.cpp +++ b/src/tests/basics/basics.cpp @@ -28,7 +28,7 @@ TEST_P(TestBasics, Malloc) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, New) @@ -38,7 +38,7 @@ TEST_P(TestBasics, New) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, NewArray) @@ -48,7 +48,7 @@ TEST_P(TestBasics, NewArray) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, Calloc) @@ -58,7 +58,7 @@ TEST_P(TestBasics, Calloc) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, Realloc) @@ -68,7 +68,7 @@ TEST_P(TestBasics, Realloc) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, CoTaskMem) @@ -78,7 +78,7 @@ TEST_P(TestBasics, CoTaskMem) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, AlignedMalloc) @@ -88,7 +88,7 @@ TEST_P(TestBasics, AlignedMalloc) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 3; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, AlignedRealloc) @@ -98,7 +98,7 @@ TEST_P(TestBasics, AlignedRealloc) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 3; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, Strdup) @@ -108,7 +108,7 @@ TEST_P(TestBasics, Strdup) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 4; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, HeapAlloc) @@ -118,7 +118,7 @@ TEST_P(TestBasics, HeapAlloc) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 1; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, GetProcMalloc) @@ -128,7 +128,7 @@ TEST_P(TestBasics, GetProcMalloc) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 1; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, IMalloc) @@ -138,7 +138,7 @@ TEST_P(TestBasics, IMalloc) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 1; - ASSERT_EQ(leaks, correctLeaks); + ASSERT_EQ(correctLeaks, leaks); } INSTANTIATE_TEST_CASE_P(FreeVal, diff --git a/tests/basics/basics.vcxproj b/src/tests/basics/basics.vcxproj similarity index 90% rename from tests/basics/basics.vcxproj rename to src/tests/basics/basics.vcxproj index e5b66a29..6b6a559b 100644 --- a/tests/basics/basics.vcxproj +++ b/src/tests/basics/basics.vcxproj @@ -1,535 +1,535 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {0943354A-41E0-4215-878A-8D0FE758052C} - Win32Proj - basics - test_basics - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - false - - - Application - true - Unicode - false - - - Application - true - Unicode - false - - - Application - true - Unicode - false - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - NotSet - %(AdditionalDependencies) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - Use - MaxSpeed - true - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - - - + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {0943354A-41E0-4215-878A-8D0FE758052C} + Win32Proj + basics + test_basics + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + false + + + Application + true + Unicode + false + + + Application + true + Unicode + false + + + Application + true + Unicode + false + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + + + \ No newline at end of file diff --git a/tests/basics/basics.vcxproj.filters b/src/tests/basics/basics.vcxproj.filters similarity index 100% rename from tests/basics/basics.vcxproj.filters rename to src/tests/basics/basics.vcxproj.filters diff --git a/tests/basics/basics_disabled.cpp b/src/tests/basics/basics_disabled.cpp similarity index 91% rename from tests/basics/basics_disabled.cpp rename to src/tests/basics/basics_disabled.cpp index 413a0e2f..c6832f81 100644 --- a/tests/basics/basics_disabled.cpp +++ b/src/tests/basics/basics_disabled.cpp @@ -30,7 +30,7 @@ TEST_F(TestBasicsDisabled, Malloc) LeakMemory(eMalloc, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } TEST_F(TestBasicsDisabled, New) @@ -39,7 +39,7 @@ TEST_F(TestBasicsDisabled, New) LeakMemory(eNew, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } TEST_F(TestBasicsDisabled, NewArray) @@ -48,7 +48,7 @@ TEST_F(TestBasicsDisabled, NewArray) LeakMemory(eNewArray, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } TEST_F(TestBasicsDisabled, Calloc) @@ -57,7 +57,7 @@ TEST_F(TestBasicsDisabled, Calloc) LeakMemory(eCalloc, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } TEST_F(TestBasicsDisabled, Realloc) @@ -66,7 +66,7 @@ TEST_F(TestBasicsDisabled, Realloc) LeakMemory(eRealloc, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } TEST_F(TestBasicsDisabled, CoTaskMem) @@ -75,7 +75,7 @@ TEST_F(TestBasicsDisabled, CoTaskMem) LeakMemory(eCoTaskMem, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } TEST_F(TestBasicsDisabled, AlignedMalloc) @@ -84,7 +84,7 @@ TEST_F(TestBasicsDisabled, AlignedMalloc) LeakMemory(eAlignedMalloc, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } TEST_F(TestBasicsDisabled, AlignedRealloc) @@ -93,7 +93,7 @@ TEST_F(TestBasicsDisabled, AlignedRealloc) LeakMemory(eAlignedRealloc, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } TEST_F(TestBasicsDisabled, Strdup) @@ -102,7 +102,7 @@ TEST_F(TestBasicsDisabled, Strdup) LeakMemory(eStrdup, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } TEST_F(TestBasicsDisabled, HeapAlloc) @@ -111,7 +111,7 @@ TEST_F(TestBasicsDisabled, HeapAlloc) LeakMemory(eHeapAlloc, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } TEST_F(TestBasicsDisabled, GetProcMalloc) @@ -120,7 +120,7 @@ TEST_F(TestBasicsDisabled, GetProcMalloc) LeakMemory(eGetProcMalloc, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } TEST_F(TestBasicsDisabled, IMalloc) @@ -129,5 +129,5 @@ TEST_F(TestBasicsDisabled, IMalloc) LeakMemory(eIMalloc, repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; - ASSERT_EQ(leaks, 0); + ASSERT_EQ(0, leaks); } diff --git a/tests/basics/stdafx.cpp b/src/tests/basics/stdafx.cpp similarity index 100% rename from tests/basics/stdafx.cpp rename to src/tests/basics/stdafx.cpp diff --git a/tests/basics/stdafx.h b/src/tests/basics/stdafx.h similarity index 100% rename from tests/basics/stdafx.h rename to src/tests/basics/stdafx.h diff --git a/tests/basics/targetver.h b/src/tests/basics/targetver.h similarity index 100% rename from tests/basics/targetver.h rename to src/tests/basics/targetver.h diff --git a/tests/console/README.md b/src/tests/console/README.md similarity index 100% rename from tests/console/README.md rename to src/tests/console/README.md diff --git a/tests/console/main.c b/src/tests/console/main.c similarity index 100% rename from tests/console/main.c rename to src/tests/console/main.c diff --git a/tests/console/main.cpp b/src/tests/console/main.cpp similarity index 100% rename from tests/console/main.cpp rename to src/tests/console/main.cpp diff --git a/tests/console/vldconsole.sln b/src/tests/console/vldconsole.sln similarity index 100% rename from tests/console/vldconsole.sln rename to src/tests/console/vldconsole.sln diff --git a/tests/console/vldconsole.vcxproj b/src/tests/console/vldconsole.vcxproj similarity index 100% rename from tests/console/vldconsole.vcxproj rename to src/tests/console/vldconsole.vcxproj diff --git a/tests/console/vldconsole.vcxproj.filters b/src/tests/console/vldconsole.vcxproj.filters similarity index 100% rename from tests/console/vldconsole.vcxproj.filters rename to src/tests/console/vldconsole.vcxproj.filters diff --git a/tests/console/vldconsole_vs10.sln b/src/tests/console/vldconsole_vs10.sln similarity index 100% rename from tests/console/vldconsole_vs10.sln rename to src/tests/console/vldconsole_vs10.sln diff --git a/src/tests/copydlls.bat b/src/tests/copydlls.bat new file mode 100644 index 00000000..830d9325 --- /dev/null +++ b/src/tests/copydlls.bat @@ -0,0 +1,5 @@ +REM Copying over Visual Leak Detector Dependencies +copy %~p0\..\bin\%1\vld_%2.dll %3\vld_%2.dll /y +copy %~p0\..\bin\%1\vld_%2.pdb %3\vld_%2.pdb /y +copy %~p0\..\..\setup\dbghelp\%2\dbghelp.dll %3\dbghelp.dll /y +copy %~p0\..\..\setup\dbghelp\%2\Microsoft.DTfW.DHL.manifest %3\Microsoft.DTfW.DHL.manifest /y \ No newline at end of file diff --git a/tests/corruption/Tests.cpp b/src/tests/corruption/Tests.cpp similarity index 100% rename from tests/corruption/Tests.cpp rename to src/tests/corruption/Tests.cpp diff --git a/tests/corruption/Tests.h b/src/tests/corruption/Tests.h similarity index 100% rename from tests/corruption/Tests.h rename to src/tests/corruption/Tests.h diff --git a/tests/corruption/corruption.cpp b/src/tests/corruption/corruption.cpp similarity index 98% rename from tests/corruption/corruption.cpp rename to src/tests/corruption/corruption.cpp index b989a7be..38d932e9 100644 --- a/tests/corruption/corruption.cpp +++ b/src/tests/corruption/corruption.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include "Tests.h" // This hooks vld into this app -#include "../../vld.h" +#include "vld.h" #include diff --git a/tests/corruption/corruption.vcxproj b/src/tests/corruption/corruption.vcxproj similarity index 89% rename from tests/corruption/corruption.vcxproj rename to src/tests/corruption/corruption.vcxproj index 8e00f5b9..6ec146c9 100644 --- a/tests/corruption/corruption.vcxproj +++ b/src/tests/corruption/corruption.vcxproj @@ -1,349 +1,349 @@ - - - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {87911ED6-84BC-4526-9654-A4FF4E0EDF52} - Win32Proj - corruption - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - - - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - - - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - - - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level3 - - - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - - - - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - - - + + + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} + Win32Proj + corruption + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + + + \ No newline at end of file diff --git a/tests/corruption/corruption.vcxproj.filters b/src/tests/corruption/corruption.vcxproj.filters similarity index 100% rename from tests/corruption/corruption.vcxproj.filters rename to src/tests/corruption/corruption.vcxproj.filters diff --git a/tests/corruption/stdafx.cpp b/src/tests/corruption/stdafx.cpp similarity index 100% rename from tests/corruption/stdafx.cpp rename to src/tests/corruption/stdafx.cpp diff --git a/tests/corruption/stdafx.h b/src/tests/corruption/stdafx.h similarity index 100% rename from tests/corruption/stdafx.h rename to src/tests/corruption/stdafx.h diff --git a/tests/corruption/targetver.h b/src/tests/corruption/targetver.h similarity index 100% rename from tests/corruption/targetver.h rename to src/tests/corruption/targetver.h diff --git a/tests/dynamic_app/LoadTests.cpp b/src/tests/dynamic_app/LoadTests.cpp similarity index 100% rename from tests/dynamic_app/LoadTests.cpp rename to src/tests/dynamic_app/LoadTests.cpp diff --git a/tests/dynamic_app/LoadTests.h b/src/tests/dynamic_app/LoadTests.h similarity index 100% rename from tests/dynamic_app/LoadTests.h rename to src/tests/dynamic_app/LoadTests.h diff --git a/tests/dynamic_app/ThreadTest.cpp b/src/tests/dynamic_app/ThreadTest.cpp similarity index 100% rename from tests/dynamic_app/ThreadTest.cpp rename to src/tests/dynamic_app/ThreadTest.cpp diff --git a/tests/dynamic_app/ThreadTests.h b/src/tests/dynamic_app/ThreadTests.h similarity index 100% rename from tests/dynamic_app/ThreadTests.h rename to src/tests/dynamic_app/ThreadTests.h diff --git a/tests/dynamic_app/dynamic_app.cpp b/src/tests/dynamic_app/dynamic_app.cpp similarity index 100% rename from tests/dynamic_app/dynamic_app.cpp rename to src/tests/dynamic_app/dynamic_app.cpp diff --git a/tests/dynamic_app/dynamic_app.vcxproj b/src/tests/dynamic_app/dynamic_app.vcxproj similarity index 89% rename from tests/dynamic_app/dynamic_app.vcxproj rename to src/tests/dynamic_app/dynamic_app.vcxproj index 7c0d82ca..c3b485f9 100644 --- a/tests/dynamic_app/dynamic_app.vcxproj +++ b/src/tests/dynamic_app/dynamic_app.vcxproj @@ -1,526 +1,526 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} - Win32Proj - dynamic_app - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - true - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - true - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - Console - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level4 - - - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level4 - - - MaxSpeed - true - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level4 - - - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Level4 - - - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - MultiThreaded - - - Console - true - true - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - - - - - - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - - - + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} + Win32Proj + dynamic_app + + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + true + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + true + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + dynamic + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Console + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + MaxSpeed + true + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + + + \ No newline at end of file diff --git a/tests/dynamic_app/dynamic_app.vcxproj.filters b/src/tests/dynamic_app/dynamic_app.vcxproj.filters similarity index 100% rename from tests/dynamic_app/dynamic_app.vcxproj.filters rename to src/tests/dynamic_app/dynamic_app.vcxproj.filters diff --git a/tests/dynamic_app/stdafx.cpp b/src/tests/dynamic_app/stdafx.cpp similarity index 100% rename from tests/dynamic_app/stdafx.cpp rename to src/tests/dynamic_app/stdafx.cpp diff --git a/tests/dynamic_app/stdafx.h b/src/tests/dynamic_app/stdafx.h similarity index 100% rename from tests/dynamic_app/stdafx.h rename to src/tests/dynamic_app/stdafx.h diff --git a/tests/dynamic_app/targetver.h b/src/tests/dynamic_app/targetver.h similarity index 100% rename from tests/dynamic_app/targetver.h rename to src/tests/dynamic_app/targetver.h diff --git a/tests/dynamic_dll/dllmain.cpp b/src/tests/dynamic_dll/dllmain.cpp similarity index 100% rename from tests/dynamic_dll/dllmain.cpp rename to src/tests/dynamic_dll/dllmain.cpp diff --git a/tests/dynamic_dll/dynamic.cpp b/src/tests/dynamic_dll/dynamic.cpp similarity index 100% rename from tests/dynamic_dll/dynamic.cpp rename to src/tests/dynamic_dll/dynamic.cpp diff --git a/tests/dynamic_dll/dynamic.h b/src/tests/dynamic_dll/dynamic.h similarity index 100% rename from tests/dynamic_dll/dynamic.h rename to src/tests/dynamic_dll/dynamic.h diff --git a/tests/dynamic_dll/dynamic.vcxproj b/src/tests/dynamic_dll/dynamic.vcxproj similarity index 98% rename from tests/dynamic_dll/dynamic.vcxproj rename to src/tests/dynamic_dll/dynamic.vcxproj index f6530e56..2226f8be 100644 --- a/tests/dynamic_dll/dynamic.vcxproj +++ b/src/tests/dynamic_dll/dynamic.vcxproj @@ -1,481 +1,481 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} - Win32Proj - dynamic - dynamic - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - - - - - - - - - - - - false - false - false - false - false - false - false - false - - - - - - - - - - - - - - - - - false - false - false - false - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - - - - - + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + Win32Proj + dynamic + dynamic + + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + DynamicLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + + + + + + + + + + + + false + false + false + false + false + false + false + false + + + + + + + + + + + + + + + + + false + false + false + false + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + + + + + \ No newline at end of file diff --git a/tests/dynamic_dll/dynamic.vcxproj.filters b/src/tests/dynamic_dll/dynamic.vcxproj.filters similarity index 100% rename from tests/dynamic_dll/dynamic.vcxproj.filters rename to src/tests/dynamic_dll/dynamic.vcxproj.filters diff --git a/tests/dynamic_dll/stdafx.cpp b/src/tests/dynamic_dll/stdafx.cpp similarity index 100% rename from tests/dynamic_dll/stdafx.cpp rename to src/tests/dynamic_dll/stdafx.cpp diff --git a/tests/dynamic_dll/stdafx.h b/src/tests/dynamic_dll/stdafx.h similarity index 100% rename from tests/dynamic_dll/stdafx.h rename to src/tests/dynamic_dll/stdafx.h diff --git a/tests/dynamic_dll/targetver.h b/src/tests/dynamic_dll/targetver.h similarity index 100% rename from tests/dynamic_dll/targetver.h rename to src/tests/dynamic_dll/targetver.h diff --git a/tests/mfc/StdAfx.cpp b/src/tests/mfc/StdAfx.cpp similarity index 100% rename from tests/mfc/StdAfx.cpp rename to src/tests/mfc/StdAfx.cpp diff --git a/tests/mfc/StdAfx.h b/src/tests/mfc/StdAfx.h similarity index 100% rename from tests/mfc/StdAfx.h rename to src/tests/mfc/StdAfx.h diff --git a/tests/mfc/res/vldmfc.ico b/src/tests/mfc/res/vldmfc.ico similarity index 100% rename from tests/mfc/res/vldmfc.ico rename to src/tests/mfc/res/vldmfc.ico diff --git a/tests/mfc/res/vldmfc.rc2 b/src/tests/mfc/res/vldmfc.rc2 similarity index 100% rename from tests/mfc/res/vldmfc.rc2 rename to src/tests/mfc/res/vldmfc.rc2 diff --git a/tests/mfc/resource.h b/src/tests/mfc/resource.h similarity index 100% rename from tests/mfc/resource.h rename to src/tests/mfc/resource.h diff --git a/tests/mfc/vldmfc.cpp b/src/tests/mfc/vldmfc.cpp similarity index 100% rename from tests/mfc/vldmfc.cpp rename to src/tests/mfc/vldmfc.cpp diff --git a/tests/mfc/vldmfc.h b/src/tests/mfc/vldmfc.h similarity index 100% rename from tests/mfc/vldmfc.h rename to src/tests/mfc/vldmfc.h diff --git a/tests/mfc/vldmfc.rc b/src/tests/mfc/vldmfc.rc similarity index 100% rename from tests/mfc/vldmfc.rc rename to src/tests/mfc/vldmfc.rc diff --git a/tests/mfc/vldmfc.sln b/src/tests/mfc/vldmfc.sln similarity index 100% rename from tests/mfc/vldmfc.sln rename to src/tests/mfc/vldmfc.sln diff --git a/tests/mfc/vldmfc.vcxproj b/src/tests/mfc/vldmfc.vcxproj similarity index 93% rename from tests/mfc/vldmfc.vcxproj rename to src/tests/mfc/vldmfc.vcxproj index 97020937..b5e9eb98 100644 --- a/tests/mfc/vldmfc.vcxproj +++ b/src/tests/mfc/vldmfc.vcxproj @@ -1,632 +1,624 @@ - - - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {A231973E-072A-428E-982E-5363ADD1CDE2} - MFCProj - - - - Application - Dynamic - Unicode - - - Application - Static - Unicode - - - Application - Dynamic - Unicode - - - Application - Static - Unicode - - - Application - Dynamic - Unicode - - - Application - Static - Unicode - - - Application - Dynamic - Unicode - - - Application - Static - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - false - false - false - false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - true - true - true - true - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - - - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - - - - - - - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/vldmfc.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Level3 - true - Use - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - Windows - false - - - MachineX86 - true - - - true - .\Release/vldmfc.bsc - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/vldmfc.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - Level3 - true - Use - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - Windows - false - - - MachineX86 - true - - - true - .\Release/vldmfc.bsc - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/vldmfc.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Level3 - true - Use - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - Windows - false - - - true - - - true - .\Release/vldmfc.bsc - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/vldmfc.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - Level3 - true - Use - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - Windows - false - - - true - - - true - .\Release/vldmfc.bsc - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/vldmfc.tlb - - - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - stdafx.h - .\Debug/vldmfc.pch - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - Windows - false - - - MachineX86 - - - true - .\Debug/vldmfc.bsc - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/vldmfc.tlb - - - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Use - stdafx.h - .\Debug/vldmfc.pch - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - true - Windows - false - - - MachineX86 - - - true - .\Debug/vldmfc.bsc - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/vldmfc.tlb - - - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - stdafx.h - .\Debug/vldmfc.pch - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - Windows - false - - - - - true - .\Debug/vldmfc.bsc - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/vldmfc.tlb - - - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - stdafx.h - .\Debug/vldmfc.pch - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)\vldmfc.exe - true - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - true - Windows - false - - - - - true - .\Debug/vldmfc.bsc - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - Create - Create - Create - Create - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - Create - Create - Create - Create - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - - - - - - - - - - - - - + + + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {A231973E-072A-428E-982E-5363ADD1CDE2} + MFCProj + + + + Application + Dynamic + Unicode + + + Application + Static + Unicode + + + Application + Dynamic + Unicode + + + Application + Static + Unicode + + + Application + Dynamic + Unicode + + + Application + Static + Unicode + + + Application + Dynamic + Unicode + + + Application + Static + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + false + false + false + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + true + true + true + true + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + + + + + + + + + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + Windows + false + + + MachineX86 + true + + + true + .\Release/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + Windows + false + + + MachineX86 + true + + + true + .\Release/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + Windows + false + + + true + + + true + .\Release/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + Windows + false + + + true + + + true + .\Release/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/vldmfc.tlb + + + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + Windows + false + + + + + true + .\Debug/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/vldmfc.tlb + + + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + Windows + false + + + + + true + .\Debug/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + Create + Create + Create + Create + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + Create + Create + Create + Create + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/mfc/vldmfc.vcxproj.filters b/src/tests/mfc/vldmfc.vcxproj.filters similarity index 100% rename from tests/mfc/vldmfc.vcxproj.filters rename to src/tests/mfc/vldmfc.vcxproj.filters diff --git a/tests/mfc/vldmfc_vs10.sln b/src/tests/mfc/vldmfc_vs10.sln similarity index 100% rename from tests/mfc/vldmfc_vs10.sln rename to src/tests/mfc/vldmfc_vs10.sln diff --git a/tests/mfc/vldmfcdlg.cpp b/src/tests/mfc/vldmfcdlg.cpp similarity index 100% rename from tests/mfc/vldmfcdlg.cpp rename to src/tests/mfc/vldmfcdlg.cpp diff --git a/tests/mfc/vldmfcdlg.h b/src/tests/mfc/vldmfcdlg.h similarity index 100% rename from tests/mfc/vldmfcdlg.h rename to src/tests/mfc/vldmfcdlg.h diff --git a/tests/mfc_dll/Resource.h b/src/tests/mfc_dll/Resource.h similarity index 100% rename from tests/mfc_dll/Resource.h rename to src/tests/mfc_dll/Resource.h diff --git a/tests/mfc_dll/mfc.cpp b/src/tests/mfc_dll/mfc.cpp similarity index 100% rename from tests/mfc_dll/mfc.cpp rename to src/tests/mfc_dll/mfc.cpp diff --git a/tests/mfc_dll/mfc.def b/src/tests/mfc_dll/mfc.def similarity index 100% rename from tests/mfc_dll/mfc.def rename to src/tests/mfc_dll/mfc.def diff --git a/tests/mfc_dll/mfc.h b/src/tests/mfc_dll/mfc.h similarity index 100% rename from tests/mfc_dll/mfc.h rename to src/tests/mfc_dll/mfc.h diff --git a/tests/mfc_dll/mfc.rc b/src/tests/mfc_dll/mfc.rc similarity index 100% rename from tests/mfc_dll/mfc.rc rename to src/tests/mfc_dll/mfc.rc diff --git a/tests/mfc_dll/mfc.vcxproj b/src/tests/mfc_dll/mfc.vcxproj similarity index 98% rename from tests/mfc_dll/mfc.vcxproj rename to src/tests/mfc_dll/mfc.vcxproj index 8f9addf1..863167ba 100644 --- a/tests/mfc_dll/mfc.vcxproj +++ b/src/tests/mfc_dll/mfc.vcxproj @@ -1,565 +1,565 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {2178E5B2-1032-441F-A664-F3D8D1FD1913} - mfc - MFCDLLProj - test_mfc - - - - DynamicLibrary - true - Unicode - Dynamic - - - DynamicLibrary - true - Unicode - Static - - - DynamicLibrary - true - Unicode - Dynamic - - - DynamicLibrary - true - Unicode - Static - - - DynamicLibrary - true - Unicode - Dynamic - - - DynamicLibrary - true - Unicode - Static - - - DynamicLibrary - true - Unicode - Dynamic - - - DynamicLibrary - true - Unicode - Static - - - DynamicLibrary - false - true - Unicode - Dynamic - - - DynamicLibrary - false - true - Unicode - Static - - - DynamicLibrary - false - true - Unicode - Dynamic - - - DynamicLibrary - false - true - Unicode - Static - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - false - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - true - true - .\mfc.def - - - false - NDEBUG;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - .\mfc.def - - - false - NDEBUG;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - true - true - .\mfc.def - - - false - NDEBUG;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - .\mfc.def - - - false - NDEBUG;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {2178E5B2-1032-441F-A664-F3D8D1FD1913} + mfc + MFCDLLProj + test_mfc + + + + DynamicLibrary + true + Unicode + Dynamic + + + DynamicLibrary + true + Unicode + Static + + + DynamicLibrary + true + Unicode + Dynamic + + + DynamicLibrary + true + Unicode + Static + + + DynamicLibrary + true + Unicode + Dynamic + + + DynamicLibrary + true + Unicode + Static + + + DynamicLibrary + true + Unicode + Dynamic + + + DynamicLibrary + true + Unicode + Static + + + DynamicLibrary + false + true + Unicode + Dynamic + + + DynamicLibrary + false + true + Unicode + Static + + + DynamicLibrary + false + true + Unicode + Dynamic + + + DynamicLibrary + false + true + Unicode + Static + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/mfc_dll/mfc.vcxproj.filters b/src/tests/mfc_dll/mfc.vcxproj.filters similarity index 100% rename from tests/mfc_dll/mfc.vcxproj.filters rename to src/tests/mfc_dll/mfc.vcxproj.filters diff --git a/tests/mfc_dll/res/mfc.rc2 b/src/tests/mfc_dll/res/mfc.rc2 similarity index 100% rename from tests/mfc_dll/res/mfc.rc2 rename to src/tests/mfc_dll/res/mfc.rc2 diff --git a/tests/mfc_dll/stdafx.cpp b/src/tests/mfc_dll/stdafx.cpp similarity index 100% rename from tests/mfc_dll/stdafx.cpp rename to src/tests/mfc_dll/stdafx.cpp diff --git a/tests/mfc_dll/stdafx.h b/src/tests/mfc_dll/stdafx.h similarity index 100% rename from tests/mfc_dll/stdafx.h rename to src/tests/mfc_dll/stdafx.h diff --git a/tests/mfc_dll/targetver.h b/src/tests/mfc_dll/targetver.h similarity index 100% rename from tests/mfc_dll/targetver.h rename to src/tests/mfc_dll/targetver.h diff --git a/tests/suite/testsuite.cpp b/src/tests/suite/testsuite.cpp similarity index 99% rename from tests/suite/testsuite.cpp rename to src/tests/suite/testsuite.cpp index e2775b46..533465bd 100644 --- a/tests/suite/testsuite.cpp +++ b/src/tests/suite/testsuite.cpp @@ -437,5 +437,7 @@ TEST(TestSuit, MultiThread) int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); + int res = RUN_ALL_TESTS(); + VLDMarkAllLeaksAsReported(); + return res; } diff --git a/tests/suite/testsuite.vcxproj b/src/tests/suite/testsuite.vcxproj similarity index 90% rename from tests/suite/testsuite.vcxproj rename to src/tests/suite/testsuite.vcxproj index f14e17d3..f78ce6ab 100644 --- a/tests/suite/testsuite.vcxproj +++ b/src/tests/suite/testsuite.vcxproj @@ -1,516 +1,516 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {EE4A829C-5FD8-460B-8A90-B518B9BABB70} - testsuite - - - - - - - - - - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - Application - NotSet - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - - - - - - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - false - EditAndContinue - false - - - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - false - EditAndContinue - false - - - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - true - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Full - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - true - true - - - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - true - true - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Full - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) - MultiThreaded - true - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - true - true - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - false - EditAndContinue - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - false - EditAndContinue - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN64;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - false - ProgramDatabase - false - - - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - MachineX64 - - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN64;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - false - ProgramDatabase - false - - - $(ProjectDir)..\..\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) - true - MachineX64 - - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Full - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) - MultiThreadedDLL - true - true - - - $(ProjectDir)..\..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) - true - true - MachineX64 - true - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Full - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) - MultiThreaded - true - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - true - MachineX64 - true - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN64;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - false - ProgramDatabase - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - MachineX64 - true - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - X64 - - - Disabled - ..\..;..\..\lib\gtest\include;%(AdditionalIncludeDirectories) - WIN64;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - false - ProgramDatabase - true - - - $(ProjectDir)..\..\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) - true - MachineX64 - true - - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - - - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - - - + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} + testsuite + + + + + + + + + + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + Application + NotSet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + + + + + + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + EditAndContinue + false + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + EditAndContinue + false + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Full + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) + MultiThreadedDLL + true + true + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Full + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + EditAndContinue + true + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + EditAndContinue + true + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + ProgramDatabase + false + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + MachineX64 + + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + ProgramDatabase + false + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + MachineX64 + + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Full + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) + MultiThreadedDLL + true + true + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + true + MachineX64 + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Full + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + true + MachineX64 + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + ProgramDatabase + true + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + MachineX64 + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + ProgramDatabase + true + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + true + MachineX64 + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + + + \ No newline at end of file diff --git a/tests/suite/testsuite.vcxproj.filters b/src/tests/suite/testsuite.vcxproj.filters similarity index 100% rename from tests/suite/testsuite.vcxproj.filters rename to src/tests/suite/testsuite.vcxproj.filters diff --git a/tests/suite/testsuite.vcxproj.vspscc b/src/tests/suite/testsuite.vcxproj.vspscc similarity index 100% rename from tests/suite/testsuite.vcxproj.vspscc rename to src/tests/suite/testsuite.vcxproj.vspscc diff --git a/tree.h b/src/tree.h similarity index 100% rename from tree.h rename to src/tree.h diff --git a/utility.cpp b/src/utility.cpp similarity index 100% rename from utility.cpp rename to src/utility.cpp diff --git a/utility.h b/src/utility.h similarity index 100% rename from utility.h rename to src/utility.h diff --git a/vld.cpp b/src/vld.cpp similarity index 99% rename from vld.cpp rename to src/vld.cpp index 0236bac1..66175270 100644 --- a/vld.cpp +++ b/src/vld.cpp @@ -598,7 +598,7 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) if (!FindImport(modulelocal, m_vldBase, VLDDLL, "?g_vld@@3VVisualLeakDetector@@A")) { bool isMfcModule = false; - if (_wcsnicmp(modulename, L"mfc", 3) == 0) + //if (_wcsnicmp(modulename, L"mfc", 3) == 0) { LPSTR modulenamea; ConvertModulePathToAscii(modulename, &modulenamea); diff --git a/vld.dll.dependency.x64.manifest b/src/vld.dll.dependency.x64.manifest similarity index 100% rename from vld.dll.dependency.x64.manifest rename to src/vld.dll.dependency.x64.manifest diff --git a/vld.dll.dependency.x86.manifest b/src/vld.dll.dependency.x86.manifest similarity index 100% rename from vld.dll.dependency.x86.manifest rename to src/vld.dll.dependency.x86.manifest diff --git a/vld.h b/src/vld.h similarity index 100% rename from vld.h rename to src/vld.h diff --git a/vld.rc b/src/vld.rc old mode 100755 new mode 100644 similarity index 100% rename from vld.rc rename to src/vld.rc diff --git a/vld.vcxproj b/src/vld.vcxproj similarity index 94% rename from vld.vcxproj rename to src/vld.vcxproj index 478ffa83..380bb68d 100644 --- a/vld.vcxproj +++ b/src/vld.vcxproj @@ -1,202 +1,202 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - vld - - - - - - - - - Unicode - DynamicLibrary - true - x86 - x64 - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)bin\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - MinimumRecommendedRules.ruleset - $(ProjectName)_$(NumericPlatform) - .dll - - - - lib\dbghelp\include;setup;%(AdditionalIncludeDirectories) - Use - - - true - 0x03200000 - false - lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) - - - - - - - copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y - - - setup - - - - - Disabled - _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level4 - false - EditAndContinue - true - 4201;4229 - - - psapi.lib;%(AdditionalDependencies) - - - vld.dll.dependency.x86.manifest - - - - - Disabled - _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level4 - false - ProgramDatabase - 4201;4229 - - - MachineX64 - psapi.lib;%(AdditionalDependencies) - - - vld.dll.dependency.x64.manifest - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - - - - - Full - Speed - true - NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - OldStyle - false - 4201;4229 - - - true - true - %(AdditionalDependencies) - - - vld.dll.dependency.x86.manifest - - - - - Full - Speed - true - NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - OldStyle - false - false - 4201;4229 - - - true - true - MachineX64 - true - %(AdditionalDependencies) - - - vld.dll.dependency.x64.manifest - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + vld + + + + + + + + + Unicode + DynamicLibrary + true + x86 + x64 + + + + + + + <_ProjectFileVersion>10.0.30128.1 + $(ProjectDir)bin\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + MinimumRecommendedRules.ruleset + $(ProjectName)_$(NumericPlatform) + .dll + + + + $(SolutionDir)\lib\dbghelp\include;$(SolutionDir)\setup;%(AdditionalIncludeDirectories) + Use + + + true + 0x03200000 + false + $(SolutionDir)\lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) + + + + + + + copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + + + $(SolutionDir)\setup + + + + + Disabled + _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + EditAndContinue + true + 4201;4229 + + + psapi.lib;%(AdditionalDependencies) + + + vld.dll.dependency.x86.manifest + + + + + Disabled + _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + ProgramDatabase + 4201;4229 + + + MachineX64 + psapi.lib;%(AdditionalDependencies) + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + OldStyle + false + 4201;4229 + + + true + true + %(AdditionalDependencies) + + + vld.dll.dependency.x86.manifest + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + OldStyle + false + false + 4201;4229 + + + true + true + MachineX64 + true + %(AdditionalDependencies) + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vld.vcxproj.filters b/src/vld.vcxproj.filters similarity index 100% rename from vld.vcxproj.filters rename to src/vld.vcxproj.filters diff --git a/vld_def.h b/src/vld_def.h similarity index 98% rename from vld_def.h rename to src/vld_def.h index b9d26761..4b6d92ed 100644 --- a/vld_def.h +++ b/src/vld_def.h @@ -1,46 +1,46 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - Import Library Header -// Copyright (c) 2005-2014 VLD Team -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include - -#define VLD_OPT_AGGREGATE_DUPLICATES 0x0001 // If set, aggregate duplicate leaks in the leak report. -#define VLD_OPT_MODULE_LIST_INCLUDE 0x0002 // If set, modules in the module list are included, all others are excluded. -#define VLD_OPT_REPORT_TO_DEBUGGER 0x0004 // If set, the memory leak report is sent to the debugger. -#define VLD_OPT_REPORT_TO_FILE 0x0008 // If set, the memory leak report is sent to a file. -#define VLD_OPT_SAFE_STACK_WALK 0x0010 // If set, the stack is walked using the "safe" method (StackWalk64). -#define VLD_OPT_SELF_TEST 0x0020 // If set, perform a self-test to verify memory leak self-checking. -#define VLD_OPT_SLOW_DEBUGGER_DUMP 0x0040 // If set, inserts a slight delay between sending output to the debugger. -#define VLD_OPT_START_DISABLED 0x0080 // If set, memory leak detection will initially disabled. -#define VLD_OPT_TRACE_INTERNAL_FRAMES 0x0100 // If set, include useless frames (e.g. internal to VLD) in call stacks. -#define VLD_OPT_UNICODE_REPORT 0x0200 // If set, the leak report will be encoded UTF-16 instead of ASCII. -#define VLD_OPT_VLDOFF 0x0400 // If set, VLD will be completely deactivated. It will not attach to any modules. -#define VLD_OPT_REPORT_TO_STDOUT 0x0800 // If set, the memory leak report is sent to stdout. -#define VLD_OPT_SKIP_HEAPFREE_LEAKS 0x1000 // If set, VLD skip HeapFree memory leaks. -#define VLD_OPT_VALIDATE_HEAPFREE 0x2000 // If set, VLD verifies and reports heap consistency for HeapFree calls. - -#define VLD_RPTHOOK_INSTALL 0 -#define VLD_RPTHOOK_REMOVE 1 - -typedef int (__cdecl * VLD_REPORT_HOOK)(int reportType, wchar_t *message, int *returnValue); +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - Import Library Header +// Copyright (c) 2005-2014 VLD Team +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include + +#define VLD_OPT_AGGREGATE_DUPLICATES 0x0001 // If set, aggregate duplicate leaks in the leak report. +#define VLD_OPT_MODULE_LIST_INCLUDE 0x0002 // If set, modules in the module list are included, all others are excluded. +#define VLD_OPT_REPORT_TO_DEBUGGER 0x0004 // If set, the memory leak report is sent to the debugger. +#define VLD_OPT_REPORT_TO_FILE 0x0008 // If set, the memory leak report is sent to a file. +#define VLD_OPT_SAFE_STACK_WALK 0x0010 // If set, the stack is walked using the "safe" method (StackWalk64). +#define VLD_OPT_SELF_TEST 0x0020 // If set, perform a self-test to verify memory leak self-checking. +#define VLD_OPT_SLOW_DEBUGGER_DUMP 0x0040 // If set, inserts a slight delay between sending output to the debugger. +#define VLD_OPT_START_DISABLED 0x0080 // If set, memory leak detection will initially disabled. +#define VLD_OPT_TRACE_INTERNAL_FRAMES 0x0100 // If set, include useless frames (e.g. internal to VLD) in call stacks. +#define VLD_OPT_UNICODE_REPORT 0x0200 // If set, the leak report will be encoded UTF-16 instead of ASCII. +#define VLD_OPT_VLDOFF 0x0400 // If set, VLD will be completely deactivated. It will not attach to any modules. +#define VLD_OPT_REPORT_TO_STDOUT 0x0800 // If set, the memory leak report is sent to stdout. +#define VLD_OPT_SKIP_HEAPFREE_LEAKS 0x1000 // If set, VLD skip HeapFree memory leaks. +#define VLD_OPT_VALIDATE_HEAPFREE 0x2000 // If set, VLD verifies and reports heap consistency for HeapFree calls. + +#define VLD_RPTHOOK_INSTALL 0 +#define VLD_RPTHOOK_REMOVE 1 + +typedef int (__cdecl * VLD_REPORT_HOOK)(int reportType, wchar_t *message, int *returnValue); diff --git a/vld_hooks.cpp b/src/vld_hooks.cpp similarity index 100% rename from vld_hooks.cpp rename to src/vld_hooks.cpp diff --git a/vldallocator.h b/src/vldallocator.h similarity index 100% rename from vldallocator.h rename to src/vldallocator.h diff --git a/vldapi.cpp b/src/vldapi.cpp similarity index 100% rename from vldapi.cpp rename to src/vldapi.cpp diff --git a/vldheap.cpp b/src/vldheap.cpp similarity index 100% rename from vldheap.cpp rename to src/vldheap.cpp diff --git a/vldheap.h b/src/vldheap.h similarity index 100% rename from vldheap.h rename to src/vldheap.h diff --git a/vldint.h b/src/vldint.h similarity index 98% rename from vldint.h rename to src/vldint.h index f1ae1d44..7ac173ea 100644 --- a/vldint.h +++ b/src/vldint.h @@ -1,408 +1,408 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Visual Leak Detector - VisualLeakDetector Class Definition -// Copyright (c) 2005-2014 VLD Team -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -// -// See COPYING.txt for the full terms of the GNU Lesser General Public License. -// -//////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#ifndef VLDBUILD -#error \ - "This header should only be included by Visual Leak Detector when building it from source. \ - Applications should never include this header." -#endif - -#include -#pragma push_macro("new") -#undef new -#include -#include -#pragma pop_macro("new") -#include -#include "vld_def.h" -#include "version.h" -#include "callstack.h" // Provides a custom class for handling call stacks. -#include "map.h" // Provides a custom STL-like map template. -#include "ntapi.h" // Provides access to NT APIs. -#include "set.h" // Provides a custom STL-like set template. -#include "utility.h" // Provides miscellaneous utility functions. -#include "vldallocator.h" // Provides internal allocator. - -#define MAXMODULELISTLENGTH 512 // Maximum module list length, in characters. -#define SELFTESTTEXTA "Memory Leak Self-Test" -#define SELFTESTTEXTW L"Memory Leak Self-Test" -#define VLDREGKEYPRODUCT L"Software\\Visual Leak Detector" -#ifndef WIN64 -#define VLDDLL "vld_x86.dll" -#else -#define VLDDLL "vld_x64.dll" -#endif - -// The Visual Leak Detector APIs. -extern "C" __declspec(dllexport) void VLDDisable (); -extern "C" __declspec(dllexport) void VLDEnable (); -extern "C" __declspec(dllexport) void VLDRestore (); - -// Function pointer types for explicit dynamic linking with functions listed in -// the import patch table. -typedef HANDLE(__stdcall *GetProcessHeap_t) (); -typedef HANDLE(__stdcall *HeapCreate_t) (DWORD, SIZE_T, SIZE_T); -typedef FARPROC(__stdcall *GetProcAddress_t) (HMODULE, LPCSTR); - -typedef void* (__cdecl *_calloc_dbg_t) (size_t, size_t, int, const char*, int); -typedef void* (__cdecl *_malloc_dbg_t) (size_t, int, const char *, int); -typedef void* (__cdecl *_realloc_dbg_t) (void *, size_t, int, const char *, int); -typedef void* (__cdecl *_recalloc_dbg_t) (void *, size_t, size_t, int, const char *, int); -typedef void* (__cdecl *calloc_t) (size_t, size_t); -typedef HRESULT (__stdcall *CoGetMalloc_t) (DWORD, LPMALLOC *); -typedef LPVOID (__stdcall *CoTaskMemAlloc_t) (SIZE_T); -typedef LPVOID (__stdcall *CoTaskMemRealloc_t) (LPVOID, SIZE_T); -typedef void* (__cdecl *malloc_t) (size_t); -typedef void* (__cdecl *new_t) (size_t); -typedef void* (__cdecl *new_dbg_crt_t) (size_t, int, const char *, int); -typedef void* (__cdecl *new_dbg_mfc_t) (size_t, const char *, int); -typedef void* (__cdecl *realloc_t) (void *, size_t); -typedef void* (__cdecl *_recalloc_t) (void *, size_t, size_t); -typedef char* (__cdecl *_strdup_t) (const char*); -typedef char* (__cdecl *_strdup_dbg_t) (const char*, int, const char* ,int); -typedef wchar_t* (__cdecl *_wcsdup_t) (const wchar_t*); -typedef wchar_t* (__cdecl *_wcsdup_dbg_t) (const wchar_t*, int, const char* ,int); -typedef void* (__cdecl *_aligned_malloc_t) (size_t, size_t); -typedef void* (__cdecl *_aligned_offset_malloc_t) (size_t, size_t, size_t); -typedef void* (__cdecl *_aligned_realloc_t) (void *, size_t, size_t); -typedef void* (__cdecl *_aligned_offset_realloc_t) (void *, size_t, size_t, size_t); -typedef void* (__cdecl *_aligned_recalloc_t) (void *, size_t, size_t, size_t); -typedef void* (__cdecl *_aligned_offset_recalloc_t) (void *, size_t, size_t, size_t, size_t); -typedef void* (__cdecl *_aligned_malloc_dbg_t) (size_t, size_t, int, const char *, int); -typedef void* (__cdecl *_aligned_offset_malloc_dbg_t) (size_t, size_t, size_t, int, const char *, int); -typedef void* (__cdecl *_aligned_realloc_dbg_t) (void *, size_t, size_t, int, const char *, int); -typedef void* (__cdecl *_aligned_offset_realloc_dbg_t) (void *, size_t, size_t, size_t, int, const char *, int); -typedef void* (__cdecl *_aligned_recalloc_dbg_t) (void *, size_t, size_t, size_t, int, const char *, int); -typedef void* (__cdecl *_aligned_offset_recalloc_dbg_t) (void *, size_t, size_t, size_t, size_t, int, const char *, int); - -// Data is collected for every block allocated from any heap in the process. -// The data is stored in this structure and these structures are stored in -// a BlockMap which maps each of these structures to its corresponding memory -// block. -struct blockinfo_t { - std::unique_ptr callStack; - DWORD threadId; - SIZE_T serialNumber; - SIZE_T size; - bool reported; -}; - -// BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. -typedef Map BlockMap; - -// Information about each heap in the process is kept in this map. Primarily -// this is used for mapping heaps to all of the blocks allocated from those -// heaps. -struct heapinfo_t { - BlockMap blockMap; // Map of all blocks allocated from this heap. - UINT32 flags; // Heap status flags: -#define VLD_HEAP_CRT_DBG 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). -#define VLD_HEAP_CRT_UNKNOWN 0x2 // If set, this heap is a unknown CRT heap. -}; - -// HeapMaps map heaps (via their handles) to BlockMaps. -typedef Map HeapMap; -typedef std::basic_string, vldallocator > vldstring; - -// This structure stores information, primarily the virtual address range, about -// a given module and can be used with the Set template because it supports the -// '<' operator (sorts by virtual address range). -struct moduleinfo_t { - BOOL operator < (const struct moduleinfo_t& other) const - { - if (addrHigh < other.addrLow) { - return TRUE; - } - else { - return FALSE; - } - } - - SIZE_T addrLow; // Lowest address within the module's virtual address space (i.e. base address). - SIZE_T addrHigh; // Highest address within the module's virtual address space (i.e. base + size). - UINT32 flags; // Module flags: -#define VLD_MODULE_EXCLUDED 0x1 // If set, this module is excluded from leak detection. -#define VLD_MODULE_SYMBOLSLOADED 0x2 // If set, this module's debug symbols have been loaded. - vldstring name; // The module's name (e.g. "kernel32.dll"). - vldstring path; // The fully qualified path from where the module was loaded. -}; - -// ModuleSets store information about modules loaded in the process. -typedef Set ModuleSet; - -typedef Set ReportHookSet; - -// Thread local storage structure. Every thread in the process gets its own copy -// of this structure. Thread specific information, such as the current leak -// detection status (enabled or disabled) and the address that initiated the -// current allocation is stored here. -struct tls_t { - context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. - UINT32 flags; // Thread-local status flags: -#define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. -#define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. -#define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. - UINT32 oldFlags; // Thread-local status old flags - BOOL blockProcessed; // Internal diagnostic feature - DWORD threadId; // Thread ID of the thread that owns this TLS structure. - blockinfo_t* pblockInfo; // Store pointer to callstack. -}; - -// The TlsSet allows VLD to keep track of all thread local storage structures -// allocated in the process. -typedef Map TlsMap; - -class CallStack; - -//////////////////////////////////////////////////////////////////////////////// -// -// The VisualLeakDetector Class -// -// One global instance of this class is instantiated. Upon construction it -// patches the import address table (IAT) of every other module loaded in the -// process (see the "patchimport" utility function) to allow key Windows heap -// APIs to be patched through to, or redirected to, functions provided by VLD. -// Patching the IATs in this manner allows VLD to be made aware of all -// relevant heap activity, making it possible for VLD to detect and trace -// memory leaks. -// -// The one global instance of this class is constructed within the context of -// the process' main thread during process initialization and is destroyed in -// the same context during process termination. -// -// When the VisualLeakDetector object is destroyed, it consults its internal -// data structures, looking for any memory that has not been freed. A memory -// leak report is then generated, indicating any memory leaks that may have -// been identified. -// -// This class is derived from IMalloc so that it can provide an implementation -// of the IMalloc COM interface in order to support detection of COM-based -// memory leaks. However, this implementation of IMalloc is actually just a -// thin wrapper around the system's implementation of IMalloc. -// -class VisualLeakDetector : public IMalloc -{ -public: - VisualLeakDetector(); - ~VisualLeakDetector(); - - //////////////////////////////////////////////////////////////////////////////// - // Public CRT and MFC Common Handlers - // - // Many heap functions are indirectly rerouted to these handlers. One common - // function exists for each heap function with a given signature. These - // handlers are not direct IAT replacements, but are called by the individual - // IAT replacement functions. - //////////////////////////////////////////////////////////////////////////////// - // Standard CRT and MFC common handlers - void* _calloc (calloc_t pcalloc, context_t& context, bool debugRuntime, size_t num, size_t size); - void* _malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size); - void* _new (new_t pnew, context_t& context, bool debugRuntime, size_t size); - void* _realloc (realloc_t prealloc, context_t& context, bool debugRuntime, void *mem, size_t size); - void* __recalloc (_recalloc_t precalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size); - char* __strdup(_strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src); - wchar_t* __wcsdup(_wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src); - - // Debug CRT and MFC common handlers - void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, bool debugRuntime, size_t num, size_t size, int type, char const *file, int line); - void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); - void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); - void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); - void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); - void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, int type, char const *file, int line); - void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, int type, char const *file, int line); - char* __strdup_dbg(_strdup_dbg_t pstrdup, context_t& context, bool debugRuntime, const char* src, int type, char const *file, int line); - wchar_t* __wcsdup_dbg(_wcsdup_dbg_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src, int type, char const *file, int line); - - void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment); - void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset); - void *__aligned_realloc (_aligned_realloc_t p_aligned_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment); - void *__aligned_offset_realloc (_aligned_offset_realloc_t p_aligned_offset_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset); - void *__aligned_recalloc (_aligned_recalloc_t p_aligned_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment); - void *__aligned_offset_recalloc (_aligned_offset_recalloc_t p_aligned_offset_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset); - void* __aligned_malloc_dbg (_aligned_malloc_dbg_t p_aligned_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_aligned_offset_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - void* __aligned_realloc_dbg (_aligned_realloc_dbg_t p_aligned_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_aligned_offset_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - void* __aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_aligned_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_aligned_offset_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - - //////////////////////////////////////////////////////////////////////////////// - // Public IMalloc methods - for support of COM-based memory leak detection. - //////////////////////////////////////////////////////////////////////////////// - ULONG __stdcall AddRef (); - LPVOID __stdcall Alloc (SIZE_T size); - INT __stdcall DidAlloc (LPVOID mem); - VOID __stdcall Free (LPVOID mem); - SIZE_T __stdcall GetSize (LPVOID mem); - VOID __stdcall HeapMinimize (); - HRESULT __stdcall QueryInterface (REFIID iid, LPVOID *object); - LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); - ULONG __stdcall Release (); - - void DisableLeakDetection (); - void EnableLeakDetection (); - void RestoreLeakDetectionState (); - void GlobalDisableLeakDetection (); - void GlobalEnableLeakDetection (); - - VOID RefreshModules(); - SIZE_T GetLeaksCount(); - SIZE_T GetThreadLeaksCount(DWORD threadId); - SIZE_T ReportLeaks(); - SIZE_T ReportThreadLeaks(DWORD threadId); - VOID MarkAllLeaksAsReported(); - VOID MarkThreadLeaksAsReported(DWORD threadId); - VOID EnableModule(HMODULE module); - VOID DisableModule(HMODULE module); - UINT32 GetOptions(); - VOID GetReportFilename(WCHAR *filename); - VOID SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); - VOID SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); - int SetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook); - VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); - bool GetModulesList(WCHAR *modules, UINT size); - VOID ResolveCallstacks(); - - static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle); - static NTSTATUS __stdcall _LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, unicodestring_t *modulename, - PHANDLE modulehandle); - static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); -private: - //////////////////////////////////////////////////////////////////////////////// - // Private leak detection functions - see each function definition for details. - //////////////////////////////////////////////////////////////////////////////// - VOID attachToLoadedModules (ModuleSet *newmodules); - UINT32 getModuleState(ModuleSet::Iterator& it, UINT32 &moduleFlags); - LPWSTR buildSymbolSearchPath(); - VOID configure (); - BOOL enabled (); - SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); - tls_t* getTls (); - VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, UINT_PTR ra); - VOID mapHeap (HANDLE heap); - VOID remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context); - VOID reportConfig (); - SIZE_T reportHeapLeaks (HANDLE heap); - SIZE_T getLeaksCount (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); - SIZE_T reportLeaks(heapinfo_t* heapinfo, bool &firstLeak, Set &aggregatedLeaks, DWORD threadId = (DWORD)-1); - VOID markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); - VOID unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context); - VOID unmapHeap (HANDLE heap); - void resolveStacks(heapinfo_t* heapinfo); - - // Static functions (callbacks) - static BOOL __stdcall addLoadedModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - static BOOL __stdcall detachFromModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); - - // Utils - static bool isModuleExcluded (UINT_PTR returnaddress); - blockinfo_t* findAllocedBlock(LPCVOID, __out HANDLE& heap); - static void getCallStack( CallStack *&pcallstack, context_t &context ); - static inline void firstAllocCall(tls_t * tls); - void setupReporting(); - void checkInternalMemoryLeaks(); - bool waitForAllVLDThreads(); - - //////////////////////////////////////////////////////////////////////////////// - // IAT replacement functions - see each function definition for details. - // - // Because there are so many virtually identical CRT and MFC replacement - // functions, they are excluded from the class to reduce the amount of noise - // within this class's code. See crtmfcpatch.cpp for those functions. - //////////////////////////////////////////////////////////////////////////////// - // Win32 IAT replacement functions - static FARPROC __stdcall _GetProcAddress(HMODULE module, LPCSTR procname); - static HANDLE __stdcall _GetProcessHeap(); - - static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); - static BOOL __stdcall _HeapDestroy (HANDLE heap); - static LPVOID __stdcall _HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size); - static BOOL __stdcall _HeapFree (HANDLE heap, DWORD flags, LPVOID mem); - static LPVOID __stdcall _HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); - - static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); - static BYTE __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); - static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); - - // COM IAT replacement functions - static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); - static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); - static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); - - static void AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size); - static void ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context); - - //////////////////////////////////////////////////////////////////////////////// - // Private data - //////////////////////////////////////////////////////////////////////////////// - WCHAR m_forcedModuleList [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. - HeapMap *m_heapMap; // Map of all active heaps in the process. - IMalloc *m_iMalloc; // Pointer to the system implementation of IMalloc. - - SIZE_T m_requestCurr; // Current request number. - SIZE_T m_totalAlloc; // Grand total - sum of all allocations. - SIZE_T m_curAlloc; // Total amount currently allocated. - SIZE_T m_maxAlloc; // Largest ever allocated at once. - ModuleSet *m_loadedModules; // Contains information about all modules loaded in the process. - CriticalSection m_heapMapLock; // Serializes access to the heap and block maps. - SIZE_T m_maxDataDump; // Maximum number of user-data bytes to dump for each leaked block. - UINT32 m_maxTraceFrames; // Maximum number of frames per stack trace for each leaked block. - CriticalSection m_modulesLock; // Protects accesses to the "loaded modules" ModuleSet. - CriticalSection m_optionsLock; // Serializes access to the heap and block maps. - UINT32 m_options; // Configuration options. - - static patchentry_t m_kernelbasePatch []; - static patchentry_t m_kernel32Patch []; - static patchentry_t m_ntdllPatch []; - static patchentry_t m_ole32Patch []; - static moduleentry_t m_patchTable [52]; // Table of imports patched for attaching VLD to other modules. - FILE *m_reportFile; // File where the memory leak report may be sent to. - WCHAR m_reportFilePath [MAX_PATH]; // Full path and name of file to send memory leak report to. - const char *m_selfTestFile; // Filename where the memory leak self-test block is leaked. - int m_selfTestLine; // Line number where the memory leak self-test block is leaked. - UINT32 m_status; // Status flags: -#define VLD_STATUS_DBGHELPLINKED 0x1 // If set, the explicit dynamic link to the Debug Help Library succeeded. -#define VLD_STATUS_INSTALLED 0x2 // If set, VLD was successfully installed. -#define VLD_STATUS_NEVER_ENABLED 0x4 // If set, VLD started disabled, and has not yet been manually enabled. -#define VLD_STATUS_FORCE_REPORT_TO_FILE 0x8 // If set, the leak report is being forced to a file. - DWORD m_tlsIndex; // Thread-local storage index. - CriticalSection m_tlsLock; // Protects accesses to the Set of TLS structures. - TlsMap *m_tlsMap; // Set of all thread-local storage structures for the process. - HMODULE m_vldBase; // Visual Leak Detector's own module handle (base address). - - VOID __stdcall ChangeModuleState(HMODULE module, bool on); - static GetProcAddress_t m_GetProcAddress; - static GetProcessHeap_t m_GetProcessHeap; - static HeapCreate_t m_HeapCreate; -}; - - -// Configuration option default values -#define VLD_DEFAULT_MAX_DATA_DUMP 256 -#define VLD_DEFAULT_MAX_TRACE_FRAMES 64 -#define VLD_DEFAULT_REPORT_FILE_NAME L".\\memory_leak_report.txt" +//////////////////////////////////////////////////////////////////////////////// +// +// Visual Leak Detector - VisualLeakDetector Class Definition +// Copyright (c) 2005-2014 VLD Team +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +// +// See COPYING.txt for the full terms of the GNU Lesser General Public License. +// +//////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#ifndef VLDBUILD +#error \ + "This header should only be included by Visual Leak Detector when building it from source. \ + Applications should never include this header." +#endif + +#include +#pragma push_macro("new") +#undef new +#include +#include +#pragma pop_macro("new") +#include +#include "vld_def.h" +#include "version.h" +#include "callstack.h" // Provides a custom class for handling call stacks. +#include "map.h" // Provides a custom STL-like map template. +#include "ntapi.h" // Provides access to NT APIs. +#include "set.h" // Provides a custom STL-like set template. +#include "utility.h" // Provides miscellaneous utility functions. +#include "vldallocator.h" // Provides internal allocator. + +#define MAXMODULELISTLENGTH 512 // Maximum module list length, in characters. +#define SELFTESTTEXTA "Memory Leak Self-Test" +#define SELFTESTTEXTW L"Memory Leak Self-Test" +#define VLDREGKEYPRODUCT L"Software\\Visual Leak Detector" +#ifndef WIN64 +#define VLDDLL "vld_x86.dll" +#else +#define VLDDLL "vld_x64.dll" +#endif + +// The Visual Leak Detector APIs. +extern "C" __declspec(dllexport) void VLDDisable (); +extern "C" __declspec(dllexport) void VLDEnable (); +extern "C" __declspec(dllexport) void VLDRestore (); + +// Function pointer types for explicit dynamic linking with functions listed in +// the import patch table. +typedef HANDLE(__stdcall *GetProcessHeap_t) (); +typedef HANDLE(__stdcall *HeapCreate_t) (DWORD, SIZE_T, SIZE_T); +typedef FARPROC(__stdcall *GetProcAddress_t) (HMODULE, LPCSTR); + +typedef void* (__cdecl *_calloc_dbg_t) (size_t, size_t, int, const char*, int); +typedef void* (__cdecl *_malloc_dbg_t) (size_t, int, const char *, int); +typedef void* (__cdecl *_realloc_dbg_t) (void *, size_t, int, const char *, int); +typedef void* (__cdecl *_recalloc_dbg_t) (void *, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *calloc_t) (size_t, size_t); +typedef HRESULT (__stdcall *CoGetMalloc_t) (DWORD, LPMALLOC *); +typedef LPVOID (__stdcall *CoTaskMemAlloc_t) (SIZE_T); +typedef LPVOID (__stdcall *CoTaskMemRealloc_t) (LPVOID, SIZE_T); +typedef void* (__cdecl *malloc_t) (size_t); +typedef void* (__cdecl *new_t) (size_t); +typedef void* (__cdecl *new_dbg_crt_t) (size_t, int, const char *, int); +typedef void* (__cdecl *new_dbg_mfc_t) (size_t, const char *, int); +typedef void* (__cdecl *realloc_t) (void *, size_t); +typedef void* (__cdecl *_recalloc_t) (void *, size_t, size_t); +typedef char* (__cdecl *_strdup_t) (const char*); +typedef char* (__cdecl *_strdup_dbg_t) (const char*, int, const char* ,int); +typedef wchar_t* (__cdecl *_wcsdup_t) (const wchar_t*); +typedef wchar_t* (__cdecl *_wcsdup_dbg_t) (const wchar_t*, int, const char* ,int); +typedef void* (__cdecl *_aligned_malloc_t) (size_t, size_t); +typedef void* (__cdecl *_aligned_offset_malloc_t) (size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_realloc_t) (void *, size_t, size_t); +typedef void* (__cdecl *_aligned_offset_realloc_t) (void *, size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_recalloc_t) (void *, size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_offset_recalloc_t) (void *, size_t, size_t, size_t, size_t); +typedef void* (__cdecl *_aligned_malloc_dbg_t) (size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_offset_malloc_dbg_t) (size_t, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_realloc_dbg_t) (void *, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_offset_realloc_dbg_t) (void *, size_t, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_recalloc_dbg_t) (void *, size_t, size_t, size_t, int, const char *, int); +typedef void* (__cdecl *_aligned_offset_recalloc_dbg_t) (void *, size_t, size_t, size_t, size_t, int, const char *, int); + +// Data is collected for every block allocated from any heap in the process. +// The data is stored in this structure and these structures are stored in +// a BlockMap which maps each of these structures to its corresponding memory +// block. +struct blockinfo_t { + std::unique_ptr callStack; + DWORD threadId; + SIZE_T serialNumber; + SIZE_T size; + bool reported; +}; + +// BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. +typedef Map BlockMap; + +// Information about each heap in the process is kept in this map. Primarily +// this is used for mapping heaps to all of the blocks allocated from those +// heaps. +struct heapinfo_t { + BlockMap blockMap; // Map of all blocks allocated from this heap. + UINT32 flags; // Heap status flags: +#define VLD_HEAP_CRT_DBG 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). +#define VLD_HEAP_CRT_UNKNOWN 0x2 // If set, this heap is a unknown CRT heap. +}; + +// HeapMaps map heaps (via their handles) to BlockMaps. +typedef Map HeapMap; +typedef std::basic_string, vldallocator > vldstring; + +// This structure stores information, primarily the virtual address range, about +// a given module and can be used with the Set template because it supports the +// '<' operator (sorts by virtual address range). +struct moduleinfo_t { + BOOL operator < (const struct moduleinfo_t& other) const + { + if (addrHigh < other.addrLow) { + return TRUE; + } + else { + return FALSE; + } + } + + SIZE_T addrLow; // Lowest address within the module's virtual address space (i.e. base address). + SIZE_T addrHigh; // Highest address within the module's virtual address space (i.e. base + size). + UINT32 flags; // Module flags: +#define VLD_MODULE_EXCLUDED 0x1 // If set, this module is excluded from leak detection. +#define VLD_MODULE_SYMBOLSLOADED 0x2 // If set, this module's debug symbols have been loaded. + vldstring name; // The module's name (e.g. "kernel32.dll"). + vldstring path; // The fully qualified path from where the module was loaded. +}; + +// ModuleSets store information about modules loaded in the process. +typedef Set ModuleSet; + +typedef Set ReportHookSet; + +// Thread local storage structure. Every thread in the process gets its own copy +// of this structure. Thread specific information, such as the current leak +// detection status (enabled or disabled) and the address that initiated the +// current allocation is stored here. +struct tls_t { + context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. + UINT32 flags; // Thread-local status flags: +#define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. +#define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. +#define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. + UINT32 oldFlags; // Thread-local status old flags + BOOL blockProcessed; // Internal diagnostic feature + DWORD threadId; // Thread ID of the thread that owns this TLS structure. + blockinfo_t* pblockInfo; // Store pointer to callstack. +}; + +// The TlsSet allows VLD to keep track of all thread local storage structures +// allocated in the process. +typedef Map TlsMap; + +class CallStack; + +//////////////////////////////////////////////////////////////////////////////// +// +// The VisualLeakDetector Class +// +// One global instance of this class is instantiated. Upon construction it +// patches the import address table (IAT) of every other module loaded in the +// process (see the "patchimport" utility function) to allow key Windows heap +// APIs to be patched through to, or redirected to, functions provided by VLD. +// Patching the IATs in this manner allows VLD to be made aware of all +// relevant heap activity, making it possible for VLD to detect and trace +// memory leaks. +// +// The one global instance of this class is constructed within the context of +// the process' main thread during process initialization and is destroyed in +// the same context during process termination. +// +// When the VisualLeakDetector object is destroyed, it consults its internal +// data structures, looking for any memory that has not been freed. A memory +// leak report is then generated, indicating any memory leaks that may have +// been identified. +// +// This class is derived from IMalloc so that it can provide an implementation +// of the IMalloc COM interface in order to support detection of COM-based +// memory leaks. However, this implementation of IMalloc is actually just a +// thin wrapper around the system's implementation of IMalloc. +// +class VisualLeakDetector : public IMalloc +{ +public: + VisualLeakDetector(); + ~VisualLeakDetector(); + + //////////////////////////////////////////////////////////////////////////////// + // Public CRT and MFC Common Handlers + // + // Many heap functions are indirectly rerouted to these handlers. One common + // function exists for each heap function with a given signature. These + // handlers are not direct IAT replacements, but are called by the individual + // IAT replacement functions. + //////////////////////////////////////////////////////////////////////////////// + // Standard CRT and MFC common handlers + void* _calloc (calloc_t pcalloc, context_t& context, bool debugRuntime, size_t num, size_t size); + void* _malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size); + void* _new (new_t pnew, context_t& context, bool debugRuntime, size_t size); + void* _realloc (realloc_t prealloc, context_t& context, bool debugRuntime, void *mem, size_t size); + void* __recalloc (_recalloc_t precalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size); + char* __strdup(_strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src); + wchar_t* __wcsdup(_wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src); + + // Debug CRT and MFC common handlers + void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, bool debugRuntime, size_t num, size_t size, int type, char const *file, int line); + void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); + void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); + void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); + void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); + void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, int type, char const *file, int line); + void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, int type, char const *file, int line); + char* __strdup_dbg(_strdup_dbg_t pstrdup, context_t& context, bool debugRuntime, const char* src, int type, char const *file, int line); + wchar_t* __wcsdup_dbg(_wcsdup_dbg_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src, int type, char const *file, int line); + + void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment); + void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset); + void *__aligned_realloc (_aligned_realloc_t p_aligned_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment); + void *__aligned_offset_realloc (_aligned_offset_realloc_t p_aligned_offset_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset); + void *__aligned_recalloc (_aligned_recalloc_t p_aligned_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment); + void *__aligned_offset_recalloc (_aligned_offset_recalloc_t p_aligned_offset_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset); + void* __aligned_malloc_dbg (_aligned_malloc_dbg_t p_aligned_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_aligned_offset_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + void* __aligned_realloc_dbg (_aligned_realloc_dbg_t p_aligned_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_aligned_offset_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + void* __aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_aligned_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, int type, char const *file, int line); + void* __aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_aligned_offset_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); + + //////////////////////////////////////////////////////////////////////////////// + // Public IMalloc methods - for support of COM-based memory leak detection. + //////////////////////////////////////////////////////////////////////////////// + ULONG __stdcall AddRef (); + LPVOID __stdcall Alloc (SIZE_T size); + INT __stdcall DidAlloc (LPVOID mem); + VOID __stdcall Free (LPVOID mem); + SIZE_T __stdcall GetSize (LPVOID mem); + VOID __stdcall HeapMinimize (); + HRESULT __stdcall QueryInterface (REFIID iid, LPVOID *object); + LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); + ULONG __stdcall Release (); + + void DisableLeakDetection (); + void EnableLeakDetection (); + void RestoreLeakDetectionState (); + void GlobalDisableLeakDetection (); + void GlobalEnableLeakDetection (); + + VOID RefreshModules(); + SIZE_T GetLeaksCount(); + SIZE_T GetThreadLeaksCount(DWORD threadId); + SIZE_T ReportLeaks(); + SIZE_T ReportThreadLeaks(DWORD threadId); + VOID MarkAllLeaksAsReported(); + VOID MarkThreadLeaksAsReported(DWORD threadId); + VOID EnableModule(HMODULE module); + VOID DisableModule(HMODULE module); + UINT32 GetOptions(); + VOID GetReportFilename(WCHAR *filename); + VOID SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT32 maxTraceFrames); + VOID SetReportOptions(UINT32 option_mask, CONST WCHAR *filename); + int SetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook); + VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); + bool GetModulesList(WCHAR *modules, UINT size); + VOID ResolveCallstacks(); + + static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, + PHANDLE modulehandle); + static NTSTATUS __stdcall _LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, unicodestring_t *modulename, + PHANDLE modulehandle); + static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); +private: + //////////////////////////////////////////////////////////////////////////////// + // Private leak detection functions - see each function definition for details. + //////////////////////////////////////////////////////////////////////////////// + VOID attachToLoadedModules (ModuleSet *newmodules); + UINT32 getModuleState(ModuleSet::Iterator& it, UINT32 &moduleFlags); + LPWSTR buildSymbolSearchPath(); + VOID configure (); + BOOL enabled (); + SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); + tls_t* getTls (); + VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, UINT_PTR ra); + VOID mapHeap (HANDLE heap); + VOID remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, + bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context); + VOID reportConfig (); + SIZE_T reportHeapLeaks (HANDLE heap); + SIZE_T getLeaksCount (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); + SIZE_T reportLeaks(heapinfo_t* heapinfo, bool &firstLeak, Set &aggregatedLeaks, DWORD threadId = (DWORD)-1); + VOID markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); + VOID unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context); + VOID unmapHeap (HANDLE heap); + void resolveStacks(heapinfo_t* heapinfo); + + // Static functions (callbacks) + static BOOL __stdcall addLoadedModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + static BOOL __stdcall detachFromModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); + + // Utils + static bool isModuleExcluded (UINT_PTR returnaddress); + blockinfo_t* findAllocedBlock(LPCVOID, __out HANDLE& heap); + static void getCallStack( CallStack *&pcallstack, context_t &context ); + static inline void firstAllocCall(tls_t * tls); + void setupReporting(); + void checkInternalMemoryLeaks(); + bool waitForAllVLDThreads(); + + //////////////////////////////////////////////////////////////////////////////// + // IAT replacement functions - see each function definition for details. + // + // Because there are so many virtually identical CRT and MFC replacement + // functions, they are excluded from the class to reduce the amount of noise + // within this class's code. See crtmfcpatch.cpp for those functions. + //////////////////////////////////////////////////////////////////////////////// + // Win32 IAT replacement functions + static FARPROC __stdcall _GetProcAddress(HMODULE module, LPCSTR procname); + static HANDLE __stdcall _GetProcessHeap(); + + static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); + static BOOL __stdcall _HeapDestroy (HANDLE heap); + static LPVOID __stdcall _HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size); + static BOOL __stdcall _HeapFree (HANDLE heap, DWORD flags, LPVOID mem); + static LPVOID __stdcall _HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); + + static LPVOID __stdcall _RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size); + static BYTE __stdcall _RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem); + static LPVOID __stdcall _RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size); + + // COM IAT replacement functions + static HRESULT __stdcall _CoGetMalloc (DWORD context, LPMALLOC *imalloc); + static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); + static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); + + static void AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size); + static void ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context); + + //////////////////////////////////////////////////////////////////////////////// + // Private data + //////////////////////////////////////////////////////////////////////////////// + WCHAR m_forcedModuleList [MAXMODULELISTLENGTH]; // List of modules to be forcefully included in leak detection. + HeapMap *m_heapMap; // Map of all active heaps in the process. + IMalloc *m_iMalloc; // Pointer to the system implementation of IMalloc. + + SIZE_T m_requestCurr; // Current request number. + SIZE_T m_totalAlloc; // Grand total - sum of all allocations. + SIZE_T m_curAlloc; // Total amount currently allocated. + SIZE_T m_maxAlloc; // Largest ever allocated at once. + ModuleSet *m_loadedModules; // Contains information about all modules loaded in the process. + CriticalSection m_heapMapLock; // Serializes access to the heap and block maps. + SIZE_T m_maxDataDump; // Maximum number of user-data bytes to dump for each leaked block. + UINT32 m_maxTraceFrames; // Maximum number of frames per stack trace for each leaked block. + CriticalSection m_modulesLock; // Protects accesses to the "loaded modules" ModuleSet. + CriticalSection m_optionsLock; // Serializes access to the heap and block maps. + UINT32 m_options; // Configuration options. + + static patchentry_t m_kernelbasePatch []; + static patchentry_t m_kernel32Patch []; + static patchentry_t m_ntdllPatch []; + static patchentry_t m_ole32Patch []; + static moduleentry_t m_patchTable [52]; // Table of imports patched for attaching VLD to other modules. + FILE *m_reportFile; // File where the memory leak report may be sent to. + WCHAR m_reportFilePath [MAX_PATH]; // Full path and name of file to send memory leak report to. + const char *m_selfTestFile; // Filename where the memory leak self-test block is leaked. + int m_selfTestLine; // Line number where the memory leak self-test block is leaked. + UINT32 m_status; // Status flags: +#define VLD_STATUS_DBGHELPLINKED 0x1 // If set, the explicit dynamic link to the Debug Help Library succeeded. +#define VLD_STATUS_INSTALLED 0x2 // If set, VLD was successfully installed. +#define VLD_STATUS_NEVER_ENABLED 0x4 // If set, VLD started disabled, and has not yet been manually enabled. +#define VLD_STATUS_FORCE_REPORT_TO_FILE 0x8 // If set, the leak report is being forced to a file. + DWORD m_tlsIndex; // Thread-local storage index. + CriticalSection m_tlsLock; // Protects accesses to the Set of TLS structures. + TlsMap *m_tlsMap; // Set of all thread-local storage structures for the process. + HMODULE m_vldBase; // Visual Leak Detector's own module handle (base address). + + VOID __stdcall ChangeModuleState(HMODULE module, bool on); + static GetProcAddress_t m_GetProcAddress; + static GetProcessHeap_t m_GetProcessHeap; + static HeapCreate_t m_HeapCreate; +}; + + +// Configuration option default values +#define VLD_DEFAULT_MAX_DATA_DUMP 256 +#define VLD_DEFAULT_MAX_TRACE_FRAMES 64 +#define VLD_DEFAULT_REPORT_FILE_NAME L".\\memory_leak_report.txt" diff --git a/tests/basics/ExecuteTestBasics_x64.bat b/tests/basics/ExecuteTestBasics_x64.bat deleted file mode 100644 index 61a1e45a..00000000 --- a/tests/basics/ExecuteTestBasics_x64.bat +++ /dev/null @@ -1,24 +0,0 @@ -@echo off - -set Platform=.\x64 -"%Platform%\Debug(Release)\test_basics" -"%Platform%\Debug(Release)\test_basics" invalid_argument 5 -"%Platform%\Debug(Release)\test_basics" malloc 5 -"%Platform%\Debug(Release)\test_basics" new 5 -"%Platform%\Debug(Release)\test_basics" new_array 5 -"%Platform%\Debug(Release)\test_basics" calloc 5 -"%Platform%\Debug(Release)\test_basics" realloc 5 -"%Platform%\Debug(Release)\test_basics" CoTaskMem 5 - -"%Platform%\Debug(Release)_StaticCrt\test_basics" -"%Platform%\Debug(Release)_StaticCrt\test_basics" invalid_argument 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" malloc 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" new 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" new_array 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" calloc 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" realloc 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" CoTaskMem 5 - -pause - -@echo on \ No newline at end of file diff --git a/tests/basics/ExecuteTestBasics_x86.bat b/tests/basics/ExecuteTestBasics_x86.bat deleted file mode 100644 index 73bdf391..00000000 --- a/tests/basics/ExecuteTestBasics_x86.bat +++ /dev/null @@ -1,24 +0,0 @@ -@echo off - -set Platform=.\Win32 -"%Platform%\Debug(Release)\test_basics" -"%Platform%\Debug(Release)\test_basics" invalid_argument 5 -"%Platform%\Debug(Release)\test_basics" malloc 5 -"%Platform%\Debug(Release)\test_basics" new 5 -"%Platform%\Debug(Release)\test_basics" new_array 5 -"%Platform%\Debug(Release)\test_basics" calloc 5 -"%Platform%\Debug(Release)\test_basics" realloc 5 -"%Platform%\Debug(Release)\test_basics" CoTaskMem 5 - -"%Platform%\Debug(Release)_StaticCrt\test_basics" -"%Platform%\Debug(Release)_StaticCrt\test_basics" invalid_argument 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" malloc 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" new 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" new_array 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" calloc 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" realloc 5 -"%Platform%\Debug(Release)_StaticCrt\test_basics" CoTaskMem 5 - -pause - -@echo on \ No newline at end of file diff --git a/tests/basics/LeakOption.h b/tests/basics/LeakOption.h deleted file mode 100644 index 87d3e7ab..00000000 --- a/tests/basics/LeakOption.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - - -enum LeakOption -{ - eMalloc, // "malloc" - eNew, // "new" - eNewArray,// "new_array" - eCalloc, // "calloc" - eRealloc, // "realloc" - eCoTaskMem, // For COM, use "CoTaskMem" - eAlignedMalloc, // "_aligned_malloc" - eAlignedRealloc, // "_aligned_realloc" - eStrdup, // "strdup" - eHeapAlloc, - eGetProcMalloc, - eIMalloc, - eCount, -}; - - - diff --git a/tests/copydlls.bat b/tests/copydlls.bat deleted file mode 100644 index d6ef93bf..00000000 --- a/tests/copydlls.bat +++ /dev/null @@ -1,5 +0,0 @@ -REM Copying over Visual Leak Detector Dependencies -copy %~p0\..\bin\%1\vld_%2.dll %3\vld_%2.dll /y -copy %~p0\..\bin\%1\vld_%2.pdb %3\vld_%2.pdb /y -copy %~p0\..\setup\dbghelp\%2\dbghelp.dll %3\dbghelp.dll /y -copy %~p0\..\setup\dbghelp\%2\Microsoft.DTfW.DHL.manifest %3\Microsoft.DTfW.DHL.manifest /y \ No newline at end of file diff --git a/vld_vs10.sln b/vld_vs10.sln index bc1d81a4..e6636c55 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -1,37 +1,37 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" ProjectSection(ProjectDependencies) = postProject {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "src\tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "src\tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection diff --git a/vld_vs11.sln b/vld_vs11.sln index 5e1181da..4e09a56c 100644 --- a/vld_vs11.sln +++ b/vld_vs11.sln @@ -1,37 +1,37 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" ProjectSection(ProjectDependencies) = postProject {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "src\tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "src\tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection diff --git a/vld_vs14.sln b/vld_vs14.sln index f3f4755a..105c6b21 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -3,37 +3,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" ProjectSection(ProjectDependencies) = postProject {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "src\tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "src\tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" ProjectSection(ProjectDependencies) = postProject {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} EndProjectSection @@ -210,12 +210,12 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 @@ -235,11 +235,9 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.ActiveCfg = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.Build.0 = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.ActiveCfg = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.Build.0 = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 @@ -260,12 +258,12 @@ Global {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|Win32.ActiveCfg = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|x64.ActiveCfg = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|x64.Build.0 = Debug|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 From e4dbf1e8d8867dc5b3e8152be404492f943b321b Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 30 Jul 2015 01:14:13 +0300 Subject: [PATCH 186/321] Preliminary support for VS2015 --- lib/gtest/msvc/gtest.vcxproj | 16 +- mfc_detect/vldmfc.cpp | 50 ++- mfc_detect/vldmfc_detect.vcxproj | 19 +- mfc_detect/vldmfc_detect_vs14.sln | 40 +++ src/criticalsection.h | 18 +- src/crtmfcpatch.h | 235 +++++++++---- src/dllspatches.cpp | 389 +++++++++++++--------- src/tests/basics/Allocs.cpp | 8 + src/tests/basics/basics.vcxproj | 21 +- src/tests/corruption/corruption.vcxproj | 10 +- src/tests/dynamic_app/dynamic_app.cpp | 2 + src/tests/dynamic_app/dynamic_app.vcxproj | 14 +- src/tests/dynamic_dll/dynamic.vcxproj | 14 +- src/tests/mfc/vldmfc.vcxproj | 10 +- src/tests/mfc_dll/mfc.vcxproj | 14 +- src/tests/suite/testsuite.cpp | 8 + src/tests/suite/testsuite.vcxproj | 14 +- src/vld.rc | 6 +- src/vld.vcxproj | 14 +- src/vldint.h | 2 +- 20 files changed, 637 insertions(+), 267 deletions(-) create mode 100644 mfc_detect/vldmfc_detect_vs14.sln diff --git a/lib/gtest/msvc/gtest.vcxproj b/lib/gtest/msvc/gtest.vcxproj index 537f4048..082bbc76 100644 --- a/lib/gtest/msvc/gtest.vcxproj +++ b/lib/gtest/msvc/gtest.vcxproj @@ -42,42 +42,42 @@ StaticLibrary - v100 + v140 MultiByte StaticLibrary - v100 + v140 MultiByte StaticLibrary - v100 + v140 MultiByte StaticLibrary - v100 + v140 MultiByte StaticLibrary - v100 + v140 MultiByte StaticLibrary - v100 + v140 MultiByte StaticLibrary - v100 + v140 MultiByte StaticLibrary - v100 + v140 MultiByte diff --git a/mfc_detect/vldmfc.cpp b/mfc_detect/vldmfc.cpp index 44a15777..7f5c7d87 100644 --- a/mfc_detect/vldmfc.cpp +++ b/mfc_detect/vldmfc.cpp @@ -228,8 +228,12 @@ BOOL CMFCExampleApp::InitInstance() #define MFCDLLNAME _T("mfc110d.dll") #elif _MFC_VER == 0x0C00 // VS 2013 #define MFCDLLNAME _T("mfc120d.dll") -#elif _MFC_VER == 0x0D00 // VS 2015 -#define MFCDLLNAME _T("mfc130d.dll") +#elif _MFC_VER == 0x0D00 +#error MFC version not supported +#elif _MFC_VER == 0x0E00 // VS 2015 +#define MFCDLLNAME _T("mfc140d.dll") +#else +#error MFC version not supported #endif #else #if _MFC_VER == 0x0700 // VS 2003 @@ -244,8 +248,12 @@ BOOL CMFCExampleApp::InitInstance() #define MFCDLLNAME _T("mfc110ud.dll") #elif _MFC_VER == 0x0C00 // VS 2013 #define MFCDLLNAME _T("mfc120ud.dll") -#elif _MFC_VER == 0x0D00 // VS 2015 -#define MFCDLLNAME _T("mfc130ud.dll") +#elif _MFC_VER == 0x0D00 +#error MFC version not supported +#elif _MFC_VER == 0x0E00 // VS 2015 +#define MFCDLLNAME _T("mfc140ud.dll") +#else +#error MFC version not supported #endif #endif #else @@ -262,8 +270,12 @@ BOOL CMFCExampleApp::InitInstance() #define MFCDLLNAME _T("mfc110.dll") #elif _MFC_VER == 0x0C00 // VS 2013 #define MFCDLLNAME _T("mfc120.dll") -#elif _MFC_VER == 0x0D00 // VS 2015 -#define MFCDLLNAME _T("mfc130.dll") +#elif _MFC_VER == 0x0D00 +#error MFC version not supported +#elif _MFC_VER == 0x0E00 // VS 2015 +#define MFCDLLNAME _T("mfc140.dll") +#else +#error MFC version not supported #endif #else #if _MFC_VER == 0x0700 // VS 2003 @@ -278,8 +290,12 @@ BOOL CMFCExampleApp::InitInstance() #define MFCDLLNAME _T("mfc110u.dll") #elif _MFC_VER == 0x0C00 // VS 2013 #define MFCDLLNAME _T("mfc120u.dll") -#elif _MFC_VER == 0x0D00 // VS 2015 -#define MFCDLLNAME _T("mfc130u.dll") +#elif _MFC_VER == 0x0D00 +#error MFC version not supported +#elif _MFC_VER == 0x0E00 // VS 2015 +#define MFCDLLNAME _T("mfc140u.dll") +#else +#error MFC version not supported #endif #endif #endif @@ -304,10 +320,26 @@ BOOL CMFCExampleApp::InitInstance() #endif TCHAR msg[256]; +#ifdef _UNICODE + #define CHARSET _T(" Unicode") +#elif defined( _MBCS ) + #define CHARSET _T(" MBCS") +#endif +#ifdef _DEBUG + #define CONF _T(" Debug") +#else + #define CONF _T(" Release") +#endif +#ifndef _WIN64 + #define PLATFORM _T(" Win32") +#else + #define PLATFORM _T(" x64") +#endif + TCHAR title[] = _T("MFC ordinals: ") CHARSET CONF PLATFORM; _stprintf(msg, _T("%d, %d, %d, %d, %d, %d"), o1, o2, o3, o4, o5, o6); SetClipboardText(msg); - MessageBox(NULL, msg, _T("MFC ordinals"), + MessageBox(NULL, msg, title, MB_ICONINFORMATION | MB_OK); return FALSE; diff --git a/mfc_detect/vldmfc_detect.vcxproj b/mfc_detect/vldmfc_detect.vcxproj index 7ebc05c5..55baf70e 100644 --- a/mfc_detect/vldmfc_detect.vcxproj +++ b/mfc_detect/vldmfc_detect.vcxproj @@ -1,5 +1,5 @@  - + Debug (Unicode) @@ -37,47 +37,56 @@ {A231973E-072A-428E-982E-5363ADD1CDE2} MFCProj + 8.1 Application Dynamic Unicode + v140 Application Dynamic - NotSet + MultiByte + v140 Application Dynamic - NotSet + MultiByte + v140 Application Dynamic Unicode + v140 Application Dynamic Unicode + v140 Application Dynamic - NotSet + MultiByte + v140 Application Dynamic - NotSet + MultiByte + v140 Application Dynamic Unicode + v140 diff --git a/mfc_detect/vldmfc_detect_vs14.sln b/mfc_detect/vldmfc_detect_vs14.sln new file mode 100644 index 00000000..a0e37a79 --- /dev/null +++ b/mfc_detect/vldmfc_detect_vs14.sln @@ -0,0 +1,40 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc_detect", "vldmfc_detect.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug (Unicode)|Win32 = Debug (Unicode)|Win32 + Debug (Unicode)|x64 = Debug (Unicode)|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release (Unicode)|Win32 = Release (Unicode)|Win32 + Release (Unicode)|x64 = Release (Unicode)|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.ActiveCfg = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|Win32.Build.0 = Debug (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.ActiveCfg = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug (Unicode)|x64.Build.0 = Debug (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|Win32.ActiveCfg = Release (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|Win32.Build.0 = Release (Unicode)|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|x64.ActiveCfg = Release (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release (Unicode)|x64.Build.0 = Release (Unicode)|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/criticalsection.h b/src/criticalsection.h index 3cf3c0eb..2d722acc 100644 --- a/src/criticalsection.h +++ b/src/criticalsection.h @@ -13,20 +13,20 @@ class CriticalSection void Delete() { DeleteCriticalSection(&m_critRegion); } // enter the section - void Enter() - { + void Enter() + { ULONG_PTR ownerThreadId = (ULONG_PTR)m_critRegion.OwningThread; UNREFERENCED_PARAMETER(ownerThreadId); EnterCriticalSection(&m_critRegion); } - bool IsLocked() - { + bool IsLocked() + { return (m_critRegion.OwningThread != NULL); } - bool IsLockedByCurrentThread() - { + bool IsLockedByCurrentThread() + { if (m_critRegion.OwningThread == NULL) return false; HANDLE ownerThreadId = (HANDLE)GetCurrentThreadId(); @@ -62,9 +62,9 @@ class CriticalSectionLocker { LeaveLock(); } - -private: - void LeaveLock() + +private: + void LeaveLock() { if (!m_leave) { diff --git a/src/crtmfcpatch.h b/src/crtmfcpatch.h index 3ccbcd0f..be1985fb 100644 --- a/src/crtmfcpatch.h +++ b/src/crtmfcpatch.h @@ -33,10 +33,10 @@ Applications should never include this header." extern __declspec(dllexport) VisualLeakDetector g_vld; template -class CrtMfcPatch +class CrtPatch { public: - static CrtMfcPatch data; + static CrtPatch data; static void* __cdecl crtd__calloc_dbg (size_t num, size_t size, int type, char const *file, int line); static void* __cdecl crtd__malloc_dbg (size_t size, int type, const char *file, int line); @@ -53,7 +53,7 @@ class CrtMfcPatch static char* __cdecl crtd__strdup_dbg (const char* src, int type, char const *file, int line); static wchar_t* __cdecl crtd__wcsdup (const wchar_t* src); static wchar_t* __cdecl crtd__wcsdup_dbg (const wchar_t* src, int type, char const *file, int line); - + static void* __cdecl crtd_scalar_new (size_t size); static void* __cdecl crtd_vector_new (size_t size); @@ -69,24 +69,11 @@ class CrtMfcPatch static void* __cdecl crtd__aligned_offset_realloc (void *memblock, size_t size, size_t alignment, size_t offset); static void* __cdecl crtd__aligned_recalloc (void *memblock, size_t num, size_t size, size_t alignment); static void* __cdecl crtd__aligned_offset_recalloc (void *memblock, size_t num, size_t size, size_t alignment, size_t offset); - - static void* __cdecl mfcd_vector_new (size_t size); - static void* __cdecl mfcd__vector_new_dbg_4p (size_t size, int type, char const *file, int line); - static void* __cdecl mfcd__vector_new_dbg_3p (size_t size, char const *file, int line); - static void* __cdecl mfcd_scalar_new (size_t size); - static void* __cdecl mfcd__scalar_new_dbg_4p (size_t size, int type, char const *file, int line); - static void* __cdecl mfcd__scalar_new_dbg_3p (size_t size, char const *file, int line); - static void* __cdecl mfcud_vector_new (size_t size); - static void* __cdecl mfcud__vector_new_dbg_4p (size_t size, int type, char const *file, int line); - static void* __cdecl mfcud__vector_new_dbg_3p (size_t size, char const *file, int line); - static void* __cdecl mfcud_scalar_new (size_t size); - static void* __cdecl mfcud__scalar_new_dbg_4p (size_t size, int type, char const *file, int line); - static void* __cdecl mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line); union { - void* function[40]; - struct + void* function[28]; + struct { void* pcrtd__calloc_dbg; void* pcrtd__malloc_dbg; @@ -116,7 +103,34 @@ class CrtMfcPatch void* pcrtd__vector_new_dbg; void* pcrtd_scalar_new; void* pcrtd_vector_new; + }; + }; +}; + +template +class MfcPatch +{ +public: + static MfcPatch data; + + static void* __cdecl mfcd_vector_new(size_t size); + static void* __cdecl mfcd__vector_new_dbg_4p(size_t size, int type, char const *file, int line); + static void* __cdecl mfcd__vector_new_dbg_3p(size_t size, char const *file, int line); + static void* __cdecl mfcd_scalar_new(size_t size); + static void* __cdecl mfcd__scalar_new_dbg_4p(size_t size, int type, char const *file, int line); + static void* __cdecl mfcd__scalar_new_dbg_3p(size_t size, char const *file, int line); + static void* __cdecl mfcud_vector_new(size_t size); + static void* __cdecl mfcud__vector_new_dbg_4p(size_t size, int type, char const *file, int line); + static void* __cdecl mfcud__vector_new_dbg_3p(size_t size, char const *file, int line); + static void* __cdecl mfcud_scalar_new(size_t size); + static void* __cdecl mfcud__scalar_new_dbg_4p(size_t size, int type, char const *file, int line); + static void* __cdecl mfcud__scalar_new_dbg_3p(size_t size, char const *file, int line); + union + { + void* function[12]; + struct + { void* pmfcd_scalar_new; void* pmfcd_vector_new; void* pmfcd__scalar_new_dbg_4p; @@ -159,7 +173,7 @@ class CrtMfcPatch // Returns the value returned by _calloc_dbg. // template -void* CrtMfcPatch::crtd__calloc_dbg (size_t num, +void* CrtPatch::crtd__calloc_dbg (size_t num, size_t size, int type, char const *file, @@ -191,7 +205,7 @@ void* CrtMfcPatch::crtd__calloc_dbg (size_t num, // Returns the value returned by _malloc_dbg. // template -void* CrtMfcPatch::crtd__malloc_dbg (size_t size, +void* CrtPatch::crtd__malloc_dbg (size_t size, int type, char const *file, int line) @@ -224,7 +238,7 @@ void* CrtMfcPatch::crtd__malloc_dbg (size_t size, // Returns the value returned by _realloc_dbg. // template -void* CrtMfcPatch::crtd__realloc_dbg (void *mem, +void* CrtPatch::crtd__realloc_dbg (void *mem, size_t size, int type, char const *file, @@ -258,7 +272,7 @@ void* CrtMfcPatch::crtd__realloc_dbg (void *mem, // Returns the value returned by _realloc_dbg. // template -void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, +void* CrtPatch::crtd__recalloc_dbg (void *mem, size_t num, size_t size, int type, @@ -276,7 +290,7 @@ void* CrtMfcPatch::crtd__recalloc_dbg (void *mem, template -char* CrtMfcPatch::crtd__strdup_dbg (const char* src, +char* CrtPatch::crtd__strdup_dbg (const char* src, int type, char const *file, int line) @@ -292,7 +306,7 @@ char* CrtMfcPatch::crtd__strdup_dbg (const char* src, template -wchar_t* CrtMfcPatch::crtd__wcsdup_dbg (const wchar_t* src, +wchar_t* CrtPatch::crtd__wcsdup_dbg (const wchar_t* src, int type, char const *file, int line) @@ -323,7 +337,7 @@ wchar_t* CrtMfcPatch::crtd__wcsdup_dbg (const wchar_t* src, // Returns the value returned by the CRT debug scalar new operator. // template -void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, +void* CrtPatch::crtd__scalar_new_dbg (size_t size, int type, char const *file, int line) @@ -354,7 +368,7 @@ void* CrtMfcPatch::crtd__scalar_new_dbg (size_t size, // Returns the value returned by the CRT debug vector new operator. // template -void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, +void* CrtPatch::crtd__vector_new_dbg (size_t size, int type, char const *file, int line) @@ -382,7 +396,7 @@ void* CrtMfcPatch::crtd__vector_new_dbg (size_t size, // Returns the valued returned from calloc. // template -void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) +void* CrtPatch::crtd_calloc (size_t num, size_t size) { calloc_t pcrtxxd_calloc = (calloc_t)data.pcrtd_calloc; assert(pcrtxxd_calloc); @@ -405,7 +419,7 @@ void* CrtMfcPatch::crtd_calloc (size_t num, size_t size) // Returns the valued returned from malloc. // template -void* CrtMfcPatch::crtd_malloc (size_t size) +void* CrtPatch::crtd_malloc (size_t size) { malloc_t pcrtxxd_malloc = (malloc_t)data.pcrtd_malloc; assert(pcrtxxd_malloc); @@ -430,7 +444,7 @@ void* CrtMfcPatch::crtd_malloc (size_t size) // Returns the value returned from realloc. // template -void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) +void* CrtPatch::crtd_realloc (void *mem, size_t size) { realloc_t pcrtxxd_realloc = (realloc_t)data.pcrtd_realloc; assert(pcrtxxd_realloc); @@ -455,7 +469,7 @@ void* CrtMfcPatch::crtd_realloc (void *mem, size_t size) // Returns the value returned from realloc. // template -void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, size_t size) +void* CrtPatch::crtd__recalloc (void *mem, size_t num, size_t size) { _recalloc_t pcrtxxd_recalloc = (_recalloc_t)data.pcrtd_recalloc; assert(pcrtxxd_recalloc); @@ -468,7 +482,7 @@ void* CrtMfcPatch::crtd__recalloc (void *mem, size_t num, siz template -char* CrtMfcPatch::crtd__strdup (const char* src) +char* CrtPatch::crtd__strdup (const char* src) { _strdup_t pcrtxxd_strdup = (_strdup_t)data.pcrtd__strdup; assert(pcrtxxd_strdup); @@ -480,7 +494,7 @@ char* CrtMfcPatch::crtd__strdup (const char* src) } template -wchar_t* CrtMfcPatch::crtd__wcsdup (const wchar_t* src) +wchar_t* CrtPatch::crtd__wcsdup (const wchar_t* src) { _wcsdup_t pcrtxxd_wcsdup = (_wcsdup_t)data.pcrtd__wcsdup; assert(pcrtxxd_wcsdup); @@ -508,7 +522,7 @@ wchar_t* CrtMfcPatch::crtd__wcsdup (const wchar_t* src) // Returns the value returned by _aligned_malloc_dbg. // template -void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size, +void* CrtPatch::crtd__aligned_malloc_dbg (size_t size, size_t alignment, int type, char const *file, @@ -540,7 +554,7 @@ void* CrtMfcPatch::crtd__aligned_malloc_dbg (size_t size // Returns the value returned by _aligned_offset_malloc_dbg. // template -void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t size, +void* CrtPatch::crtd__aligned_offset_malloc_dbg (size_t size, size_t alignment, size_t offset, int type, @@ -575,7 +589,7 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc_dbg (size_t // Returns the value returned by _aligned_realloc_dbg. // template -void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem, +void* CrtPatch::crtd__aligned_realloc_dbg (void *mem, size_t size, size_t alignment, int type, @@ -610,7 +624,7 @@ void* CrtMfcPatch::crtd__aligned_realloc_dbg (void *mem // Returns the value returned by _aligned_offset_realloc_dbg. // template -void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void *mem, +void* CrtPatch::crtd__aligned_offset_realloc_dbg (void *mem, size_t size, size_t alignment, size_t offset, @@ -648,7 +662,7 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc_dbg (void // Returns the value returned by _aligned_realloc_dbg. // template -void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *mem, +void* CrtPatch::crtd__aligned_recalloc_dbg (void *mem, size_t num, size_t size, size_t alignment, @@ -686,7 +700,7 @@ void* CrtMfcPatch::crtd__aligned_recalloc_dbg (void *me // Returns the value returned by _aligned_offset_realloc_dbg. // template -void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void *mem, +void* CrtPatch::crtd__aligned_offset_recalloc_dbg (void *mem, size_t num, size_t size, size_t alignment, @@ -716,7 +730,7 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc_dbg (void // Returns the valued returned from malloc. // template -void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t alignment) +void* CrtPatch::crtd__aligned_malloc (size_t size, size_t alignment) { _aligned_malloc_t pcrtxxd_malloc = (_aligned_malloc_t)data.pcrtd_aligned_malloc; assert(pcrtxxd_malloc); @@ -739,7 +753,7 @@ void* CrtMfcPatch::crtd__aligned_malloc (size_t size, size_t // Returns the valued returned from malloc. // template -void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset) +void* CrtPatch::crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset) { _aligned_offset_malloc_t pcrtxxd_malloc = (_aligned_offset_malloc_t)data.pcrtd_aligned_offset_malloc; assert(pcrtxxd_malloc); @@ -764,7 +778,7 @@ void* CrtMfcPatch::crtd__aligned_offset_malloc (size_t size, // Returns the value returned from realloc. // template -void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t size, size_t alignment) +void* CrtPatch::crtd__aligned_realloc (void *mem, size_t size, size_t alignment) { _aligned_realloc_t pcrtxxd_realloc = (_aligned_realloc_t)data.pcrtd_aligned_realloc; assert(pcrtxxd_realloc); @@ -789,7 +803,7 @@ void* CrtMfcPatch::crtd__aligned_realloc (void *mem, size_t s // Returns the value returned from realloc. // template -void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, size_t size, size_t alignment, size_t offset) +void* CrtPatch::crtd__aligned_offset_realloc (void *mem, size_t size, size_t alignment, size_t offset) { _aligned_offset_realloc_t pcrtxxd_realloc = (_aligned_offset_realloc_t)data.pcrtd_aligned_offset_realloc; assert(pcrtxxd_realloc); @@ -816,7 +830,7 @@ void* CrtMfcPatch::crtd__aligned_offset_realloc (void *mem, s // Returns the value returned from realloc. // template -void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t num, size_t size, size_t alignment) +void* CrtPatch::crtd__aligned_recalloc (void *mem, size_t num, size_t size, size_t alignment) { _aligned_recalloc_t pcrtxxd_recalloc = (_aligned_recalloc_t)data.pcrtd_aligned_recalloc; assert(pcrtxxd_recalloc); @@ -843,7 +857,7 @@ void* CrtMfcPatch::crtd__aligned_recalloc (void *mem, size_t // Returns the value returned from realloc. // template -void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, size_t num, size_t size, size_t alignment, size_t offset) +void* CrtPatch::crtd__aligned_offset_recalloc (void *mem, size_t num, size_t size, size_t alignment, size_t offset) { _aligned_offset_recalloc_t pcrtxxd_recalloc = (_aligned_offset_recalloc_t)data.pcrtd_aligned_offset_recalloc; assert(pcrtxxd_recalloc); @@ -864,7 +878,7 @@ void* CrtMfcPatch::crtd__aligned_offset_recalloc (void *mem, // Returns the value returned by the CRT scalar new operator. // template -void* CrtMfcPatch::crtd_scalar_new (size_t size) +void* CrtPatch::crtd_scalar_new (size_t size) { new_t pcrtxxd_scalar_new = (new_t)data.pcrtd_scalar_new; assert(pcrtxxd_scalar_new); @@ -885,7 +899,7 @@ void* CrtMfcPatch::crtd_scalar_new (size_t size) // Returns the value returned by the CRT vector new operator. // template -void* CrtMfcPatch::crtd_vector_new (size_t size) +void* CrtPatch::crtd_vector_new (size_t size) { new_t pcrtxxd_scalar_new = (new_t)data.pcrtd_vector_new; assert(pcrtxxd_scalar_new); @@ -919,7 +933,7 @@ void* CrtMfcPatch::crtd_vector_new (size_t size) // Returns the value returned by the MFC debug scalar new operator. // template -void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size, +void* MfcPatch::mfcd__scalar_new_dbg_4p (size_t size, int type, char const *file, int line) @@ -948,7 +962,7 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_4p (size_t size // Returns the value returned by the MFC debug scalar new operator. // template -void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size, +void* MfcPatch::mfcd__scalar_new_dbg_3p (size_t size, char const *file, int line) { @@ -978,7 +992,7 @@ void* CrtMfcPatch::mfcd__scalar_new_dbg_3p (size_t size // Returns the value returned by the MFC debug vector new operator. // template -void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size, +void* MfcPatch::mfcd__vector_new_dbg_4p (size_t size, int type, char const *file, int line) @@ -1007,7 +1021,7 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_4p (size_t size // Returns the value returned by the MFC debug vector new operator. // template -void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size, +void* MfcPatch::mfcd__vector_new_dbg_3p (size_t size, char const *file, int line) { @@ -1030,7 +1044,7 @@ void* CrtMfcPatch::mfcd__vector_new_dbg_3p (size_t size // Returns the value returned by the MFC scalar new operator. // template -void* CrtMfcPatch::mfcd_scalar_new (size_t size) +void* MfcPatch::mfcd_scalar_new (size_t size) { new_t pmfcxxd_new = (new_t)data.pmfcd_scalar_new; assert(pmfcxxd_new); @@ -1051,7 +1065,7 @@ void* CrtMfcPatch::mfcd_scalar_new (size_t size) // Returns the value returned by the MFC vector new operator. // template -void* CrtMfcPatch::mfcd_vector_new (size_t size) +void* MfcPatch::mfcd_vector_new (size_t size) { new_t pmfcxxd_new = (new_t)data.pmfcd_vector_new; assert(pmfcxxd_new); @@ -1079,7 +1093,7 @@ void* CrtMfcPatch::mfcd_vector_new (size_t size) // Returns the value returned by the MFC debug scalar new operator. // template -void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size, +void* MfcPatch::mfcud__scalar_new_dbg_4p (size_t size, int type, char const *file, int line) @@ -1108,7 +1122,7 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_4p (size_t size // Returns the value returned by the MFC debug scalar new operator. // template -void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size, +void* MfcPatch::mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line) { @@ -1138,7 +1152,7 @@ void* CrtMfcPatch::mfcud__scalar_new_dbg_3p (size_t size // Returns the value returned by the MFC debug vector new operator. // template -void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size, +void* MfcPatch::mfcud__vector_new_dbg_4p (size_t size, int type, char const *file, int line) @@ -1167,7 +1181,7 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_4p (size_t size // Returns the value returned by the MFC debug vector new operator. // template -void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size, +void* MfcPatch::mfcud__vector_new_dbg_3p (size_t size, char const *file, int line) { @@ -1190,7 +1204,7 @@ void* CrtMfcPatch::mfcud__vector_new_dbg_3p (size_t size // Returns the value returned by the MFC scalar new operator. // template -void* CrtMfcPatch::mfcud_scalar_new (size_t size) +void* MfcPatch::mfcud_scalar_new (size_t size) { new_t pmfcxxd_new = (new_t)data.pmfcud_scalar_new; assert(pmfcxxd_new); @@ -1211,7 +1225,7 @@ void* CrtMfcPatch::mfcud_scalar_new (size_t size) // Returns the value returned by the MFC vector new operator. // template -void* CrtMfcPatch::mfcud_vector_new (size_t size) +void* MfcPatch::mfcud_vector_new (size_t size) { new_t pmfcxxd_new = (new_t)data.pmfcud_vector_new; assert(pmfcxxd_new); @@ -1223,45 +1237,50 @@ void* CrtMfcPatch::mfcud_vector_new (size_t size) } // Visual Studio 6.0 -typedef CrtMfcPatch<60> +typedef CrtPatch<60> VS60; -typedef CrtMfcPatch<60, true> +typedef CrtPatch<60, true> VS60d; // Visual Studio .NET 2002 -typedef CrtMfcPatch<70> +typedef CrtPatch<70> VS70; -typedef CrtMfcPatch<70, true> +typedef CrtPatch<70, true> VS70d; // Visual Studio .NET 2003 -typedef CrtMfcPatch<71> +typedef CrtPatch<71> VS71; -typedef CrtMfcPatch<71, true> +typedef CrtPatch<71, true> VS71d; // Visual Studio 2005 -typedef CrtMfcPatch<80> +typedef CrtPatch<80> VS80; -typedef CrtMfcPatch<80, true> +typedef CrtPatch<80, true> VS80d; // Visual Studio 2008 -typedef CrtMfcPatch<90> +typedef CrtPatch<90> VS90; -typedef CrtMfcPatch<90, true> +typedef CrtPatch<90, true> VS90d; // Visual Studio 2010 -typedef CrtMfcPatch<100> +typedef CrtPatch<100> VS100; -typedef CrtMfcPatch<100, true> +typedef CrtPatch<100, true> VS100d; // Visual Studio 2012 -typedef CrtMfcPatch<110> +typedef CrtPatch<110> VS110; -typedef CrtMfcPatch<110, true> +typedef CrtPatch<110, true> VS110d; // Visual Studio 2013 -typedef CrtMfcPatch<120> +typedef CrtPatch<120> VS120; -typedef CrtMfcPatch<120, true> +typedef CrtPatch<120, true> VS120d; +// Visual Studio 2015 and higher +typedef CrtPatch<130> + UCRT; +typedef CrtPatch<130, true> + UCRTd; VS60 VS60::data; VS60d VS60d::data; @@ -1279,3 +1298,71 @@ VS110 VS110::data; VS110d VS110d::data; VS120 VS120::data; VS120d VS120d::data; +UCRT UCRT::data; +UCRTd UCRTd::data; + + +// Visual Studio 6.0 +typedef MfcPatch<60> + Mfc60; +typedef MfcPatch<60, true> + Mfc60d; +// Visual Studio .NET 2002 +typedef MfcPatch<70> + Mfc70; +typedef MfcPatch<70, true> + Mfc70d; +// Visual Studio .NET 2003 +typedef MfcPatch<71> + Mfc71; +typedef MfcPatch<71, true> + Mfc71d; +// Visual Studio 2005 +typedef MfcPatch<80> + Mfc80; +typedef MfcPatch<80, true> + Mfc80d; +// Visual Studio 2008 +typedef MfcPatch<90> + Mfc90; +typedef MfcPatch<90, true> + Mfc90d; +// Visual Studio 2010 +typedef MfcPatch<100> + Mfc100; +typedef MfcPatch<100, true> + Mfc100d; +// Visual Studio 2012 +typedef MfcPatch<110> + Mfc110; +typedef MfcPatch<110, true> + Mfc110d; +// Visual Studio 2013 +typedef MfcPatch<120> + Mfc120; +typedef MfcPatch<120, true> + Mfc120d; +// Visual Studio 2015 +typedef MfcPatch<140> + Mfc140; +typedef MfcPatch<140, true> + Mfc140d; + +Mfc60 Mfc60::data; +Mfc60d Mfc60d::data; +Mfc70 Mfc70::data; +Mfc70d Mfc70d::data; +Mfc71 Mfc71::data; +Mfc71d Mfc71d::data; +Mfc80 Mfc80::data; +Mfc80d Mfc80d::data; +Mfc90 Mfc90::data; +Mfc90d Mfc90d::data; +Mfc100 Mfc100::data; +Mfc100d Mfc100d::data; +Mfc110 Mfc110::data; +Mfc110d Mfc110d::data; +Mfc120 Mfc120::data; +Mfc120d Mfc120d::data; +Mfc140 Mfc140::data; +Mfc140d Mfc140d::data; \ No newline at end of file diff --git a/src/dllspatches.cpp b/src/dllspatches.cpp index fdc9635b..3226d4c1 100644 --- a/src/dllspatches.cpp +++ b/src/dllspatches.cpp @@ -83,16 +83,16 @@ HeapCreate_t VisualLeakDetector::m_HeapCreate = NULL; static patchentry_t mfc42Patch [] = { // XXX why are the vector new operators missing for mfc42.dll? - //ORDINAL(711), &VS60::pmfcd_scalar_new, VS60::mfcd_scalar_new, - NULL, NULL, NULL + //ORDINAL(711), &Mfc60::pmfcd_scalar_new, Mfc60::mfcd_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc42dPatch [] = { // XXX why are the vector new operators missing for mfc42d.dll? - ORDINAL(711), &VS60d::data.pmfcd_scalar_new, VS60d::mfcd_scalar_new, - ORDINAL(712), &VS60d::data.pmfcd__scalar_new_dbg_4p, VS60d::mfcd__scalar_new_dbg_4p, - ORDINAL(714), &VS60d::data.pmfcd__scalar_new_dbg_3p, VS60d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(711), &Mfc60d::data.pmfcd_scalar_new, Mfc60d::mfcd_scalar_new, + ORDINAL(712), &Mfc60d::data.pmfcd__scalar_new_dbg_4p, Mfc60d::mfcd__scalar_new_dbg_4p, + ORDINAL(714), &Mfc60d::data.pmfcd__scalar_new_dbg_3p, Mfc60d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc42uPatch [] = { @@ -103,234 +103,266 @@ static patchentry_t mfc42uPatch [] = { static patchentry_t mfc42udPatch [] = { // XXX why are the vector new operators missing for mfc42ud.dll? - ORDINAL(711), &VS60d::data.pmfcud_scalar_new, VS60d::mfcud_scalar_new, - ORDINAL(712), &VS60d::data.pmfcud__scalar_new_dbg_4p, VS60d::mfcud__scalar_new_dbg_4p, - ORDINAL(714), &VS60d::data.pmfcud__scalar_new_dbg_3p, VS60d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(711), &Mfc60d::data.pmfcud_scalar_new, Mfc60d::mfcud_scalar_new, + ORDINAL(712), &Mfc60d::data.pmfcud__scalar_new_dbg_4p, Mfc60d::mfcud__scalar_new_dbg_4p, + ORDINAL(714), &Mfc60d::data.pmfcud__scalar_new_dbg_3p, Mfc60d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc70Patch [] = { - //ORDINAL(257), &VS70::data.pmfcd_vector_new, VS70::mfcd_vector_new, - //ORDINAL(832), &VS70::data.pmfcd_scalar_new, VS70::mfcd_scalar_new, + //ORDINAL(257), &Mfc70::data.pmfcd_vector_new, Mfc70::mfcd_vector_new, + //ORDINAL(832), &Mfc70::data.pmfcd_scalar_new, Mfc70::mfcd_scalar_new, NULL, NULL, NULL }; static patchentry_t mfc70dPatch [] = { - ORDINAL(257), &VS70d::data.pmfcd_vector_new, VS70d::mfcd_vector_new, - ORDINAL(258), &VS70d::data.pmfcd__vector_new_dbg_4p, VS70d::mfcd__vector_new_dbg_4p, - ORDINAL(259), &VS70d::data.pmfcd__vector_new_dbg_3p, VS70d::mfcd__vector_new_dbg_3p, - ORDINAL(832), &VS70d::data.pmfcd_scalar_new, VS70d::mfcd_scalar_new, - ORDINAL(833), &VS70d::data.pmfcd__scalar_new_dbg_4p, VS70d::mfcd__scalar_new_dbg_4p, - ORDINAL(834), &VS70d::data.pmfcd__scalar_new_dbg_3p, VS70d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(257), &Mfc70d::data.pmfcd_vector_new, Mfc70d::mfcd_vector_new, + ORDINAL(258), &Mfc70d::data.pmfcd__vector_new_dbg_4p, Mfc70d::mfcd__vector_new_dbg_4p, + ORDINAL(259), &Mfc70d::data.pmfcd__vector_new_dbg_3p, Mfc70d::mfcd__vector_new_dbg_3p, + ORDINAL(832), &Mfc70d::data.pmfcd_scalar_new, Mfc70d::mfcd_scalar_new, + ORDINAL(833), &Mfc70d::data.pmfcd__scalar_new_dbg_4p, Mfc70d::mfcd__scalar_new_dbg_4p, + ORDINAL(834), &Mfc70d::data.pmfcd__scalar_new_dbg_3p, Mfc70d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc70uPatch [] = { - //ORDINAL(258), &VS70::data.pmfcud_vector_new, VS70::mfcud_vector_new, - //ORDINAL(833), &VS70::data.pmfcud_scalar_new, VS70::mfcud_scalar_new, - NULL, NULL, NULL + //ORDINAL(258), &Mfc70::data.pmfcud_vector_new, Mfc70::mfcud_vector_new, + //ORDINAL(833), &Mfc70::data.pmfcud_scalar_new, Mfc70::mfcud_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc70udPatch [] = { - ORDINAL(258), &VS70d::data.pmfcud_vector_new, VS70d::mfcud_vector_new, - ORDINAL(259), &VS70d::data.pmfcud__vector_new_dbg_4p, VS70d::mfcud__vector_new_dbg_4p, - ORDINAL(260), &VS70d::data.pmfcud__vector_new_dbg_3p, VS70d::mfcud__vector_new_dbg_3p, - ORDINAL(833), &VS70d::data.pmfcud_scalar_new, VS70d::mfcud_scalar_new, - ORDINAL(834), &VS70d::data.pmfcud__scalar_new_dbg_4p, VS70d::mfcud__scalar_new_dbg_4p, - ORDINAL(835), &VS70d::data.pmfcud__scalar_new_dbg_3p, VS70d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(258), &Mfc70d::data.pmfcud_vector_new, Mfc70d::mfcud_vector_new, + ORDINAL(259), &Mfc70d::data.pmfcud__vector_new_dbg_4p, Mfc70d::mfcud__vector_new_dbg_4p, + ORDINAL(260), &Mfc70d::data.pmfcud__vector_new_dbg_3p, Mfc70d::mfcud__vector_new_dbg_3p, + ORDINAL(833), &Mfc70d::data.pmfcud_scalar_new, Mfc70d::mfcud_scalar_new, + ORDINAL(834), &Mfc70d::data.pmfcud__scalar_new_dbg_4p, Mfc70d::mfcud__scalar_new_dbg_4p, + ORDINAL(835), &Mfc70d::data.pmfcud__scalar_new_dbg_3p, Mfc70d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc71Patch [] = { - //ORDINAL(267), &VS71::data.pmfcd_vector_new, VS71::mfcd_vector_new, - //ORDINAL(893), &VS71::data.pmfcd_scalar_new, VS71::mfcd_scalar_new, - NULL, NULL, NULL + //ORDINAL(267), &Mfc71::data.pmfcd_vector_new, MfcMfc71::mfcd_vector_new, + //ORDINAL(893), &Mfc71::data.pmfcd_scalar_new, MfcMfc71::mfcd_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc71dPatch [] = { - ORDINAL(267), &VS71d::data.pmfcd_vector_new, VS71d::mfcd_vector_new, - ORDINAL(268), &VS71d::data.pmfcd__vector_new_dbg_4p, VS71d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS71d::data.pmfcd__vector_new_dbg_3p, VS71d::mfcd__vector_new_dbg_3p, - ORDINAL(893), &VS71d::data.pmfcd_scalar_new, VS71d::mfcd_scalar_new, - ORDINAL(894), &VS71d::data.pmfcd__scalar_new_dbg_4p, VS71d::mfcd__scalar_new_dbg_4p, - ORDINAL(895), &VS71d::data.pmfcd__scalar_new_dbg_3p, VS71d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc71d::data.pmfcd_vector_new, Mfc71d::mfcd_vector_new, + ORDINAL(268), &Mfc71d::data.pmfcd__vector_new_dbg_4p, Mfc71d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &Mfc71d::data.pmfcd__vector_new_dbg_3p, Mfc71d::mfcd__vector_new_dbg_3p, + ORDINAL(893), &Mfc71d::data.pmfcd_scalar_new, Mfc71d::mfcd_scalar_new, + ORDINAL(894), &Mfc71d::data.pmfcd__scalar_new_dbg_4p, Mfc71d::mfcd__scalar_new_dbg_4p, + ORDINAL(895), &Mfc71d::data.pmfcd__scalar_new_dbg_3p, Mfc71d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc71uPatch [] = { - //ORDINAL(267), &VS71::data.pmfcud_vector_new, VS71::mfcud_vector_new, - //ORDINAL(893), &VS71::data.pmfcud_scalar_new, VS71::mfcud_scalar_new, - NULL, NULL, NULL + //ORDINAL(267), &Mfc71::data.pmfcud_vector_new, Mfc71::mfcud_vector_new, + //ORDINAL(893), &Mfc71::data.pmfcud_scalar_new, Mfc71::mfcud_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc71udPatch [] = { - ORDINAL(267), &VS71d::data.pmfcud_vector_new, VS71d::mfcud_vector_new, - ORDINAL(268), &VS71d::data.pmfcud__vector_new_dbg_4p, VS71d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS71d::data.pmfcud__vector_new_dbg_3p, VS71d::mfcud__vector_new_dbg_3p, - ORDINAL(893), &VS71d::data.pmfcud_scalar_new, VS71d::mfcud_scalar_new, - ORDINAL(894), &VS71d::data.pmfcud__scalar_new_dbg_4p, VS71d::mfcud__scalar_new_dbg_4p, - ORDINAL(895), &VS71d::data.pmfcud__scalar_new_dbg_3p, VS71d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc71d::data.pmfcud_vector_new, Mfc71d::mfcud_vector_new, + ORDINAL(268), &Mfc71d::data.pmfcud__vector_new_dbg_4p, Mfc71d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &Mfc71d::data.pmfcud__vector_new_dbg_3p, Mfc71d::mfcud__vector_new_dbg_3p, + ORDINAL(893), &Mfc71d::data.pmfcud_scalar_new, Mfc71d::mfcud_scalar_new, + ORDINAL(894), &Mfc71d::data.pmfcud__scalar_new_dbg_4p, Mfc71d::mfcud__scalar_new_dbg_4p, + ORDINAL(895), &Mfc71d::data.pmfcud__scalar_new_dbg_3p, Mfc71d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc80Patch [] = { - //ORDINAL(267), &VS80::data.pmfcd_vector_new, VS80::mfcd_vector_new, - //ORDINAL2(893,907), &VS80::data.pmfcd_scalar_new, VS80::mfcd_scalar_new, - NULL, NULL, NULL + //ORDINAL(267), &Mfc80::data.pmfcd_vector_new, Mfc80::mfcd_vector_new, + //ORDINAL2(893,907), &Mfc80::data.pmfcd_scalar_new, Mfc80::mfcd_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc80dPatch [] = { - ORDINAL(267), &VS80d::data.pmfcd_vector_new, VS80d::mfcd_vector_new, - ORDINAL(268), &VS80d::data.pmfcd__vector_new_dbg_4p, VS80d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS80d::data.pmfcd__vector_new_dbg_3p, VS80d::mfcd__vector_new_dbg_3p, - ORDINAL2(893,907), &VS80d::data.pmfcd_scalar_new, VS80d::mfcd_scalar_new, - ORDINAL2(894,908), &VS80d::data.pmfcd__scalar_new_dbg_4p, VS80d::mfcd__scalar_new_dbg_4p, - ORDINAL2(895,909), &VS80d::data.pmfcd__scalar_new_dbg_3p, VS80d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc80d::data.pmfcd_vector_new, Mfc80d::mfcd_vector_new, + ORDINAL(268), &Mfc80d::data.pmfcd__vector_new_dbg_4p, Mfc80d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &Mfc80d::data.pmfcd__vector_new_dbg_3p, Mfc80d::mfcd__vector_new_dbg_3p, + ORDINAL2(893,907), &Mfc80d::data.pmfcd_scalar_new, Mfc80d::mfcd_scalar_new, + ORDINAL2(894,908), &Mfc80d::data.pmfcd__scalar_new_dbg_4p, Mfc80d::mfcd__scalar_new_dbg_4p, + ORDINAL2(895,909), &Mfc80d::data.pmfcd__scalar_new_dbg_3p, Mfc80d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc80uPatch [] = { - //ORDINAL(267), &VS80::data.pmfcud_vector_new, VS80::mfcud_vector_new, - //ORDINAL2(893,907), &VS80::data.pmfcud_scalar_new, VS80::mfcud_scalar_new, - NULL, NULL, NULL + //ORDINAL(267), &Mfc80::data.pmfcud_vector_new, Mfc80::mfcud_vector_new, + //ORDINAL2(893,907), &Mfc80::data.pmfcud_scalar_new, Mfc80::mfcud_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc80udPatch [] = { - ORDINAL(267), &VS80d::data.pmfcud_vector_new, VS80d::mfcud_vector_new, - ORDINAL(268), &VS80d::data.pmfcud__vector_new_dbg_4p, VS80d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS80d::data.pmfcud__vector_new_dbg_3p, VS80d::mfcud__vector_new_dbg_3p, - ORDINAL2(893,907), &VS80d::data.pmfcud_scalar_new, VS80d::mfcud_scalar_new, - ORDINAL2(894,908), &VS80d::data.pmfcud__scalar_new_dbg_4p, VS80d::mfcud__scalar_new_dbg_4p, - ORDINAL2(895,909), &VS80d::data.pmfcud__scalar_new_dbg_3p, VS80d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc80d::data.pmfcud_vector_new, Mfc80d::mfcud_vector_new, + ORDINAL(268), &Mfc80d::data.pmfcud__vector_new_dbg_4p, Mfc80d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &Mfc80d::data.pmfcud__vector_new_dbg_3p, Mfc80d::mfcud__vector_new_dbg_3p, + ORDINAL2(893,907), &Mfc80d::data.pmfcud_scalar_new, Mfc80d::mfcud_scalar_new, + ORDINAL2(894,908), &Mfc80d::data.pmfcud__scalar_new_dbg_4p, Mfc80d::mfcud__scalar_new_dbg_4p, + ORDINAL2(895,909), &Mfc80d::data.pmfcud__scalar_new_dbg_3p, Mfc80d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc90Patch [] = { - ORDINAL(265), &VS90::data.pmfcd_vector_new, VS90::mfcd_vector_new, - ORDINAL2(798, 776), &VS90::data.pmfcd_scalar_new, VS90::mfcd_scalar_new, - NULL, NULL, NULL + ORDINAL(265), &Mfc90::data.pmfcd_vector_new, Mfc90::mfcd_vector_new, + ORDINAL2(798, 776), &Mfc90::data.pmfcd_scalar_new, Mfc90::mfcd_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc90dPatch [] = { - ORDINAL(267), &VS90d::data.pmfcd_vector_new, VS90d::mfcd_vector_new, - ORDINAL(268), &VS90d::data.pmfcd__vector_new_dbg_4p, VS90d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS90d::data.pmfcd__vector_new_dbg_3p, VS90d::mfcd__vector_new_dbg_3p, - ORDINAL2(931, 909), &VS90d::data.pmfcd_scalar_new, VS90d::mfcd_scalar_new, - ORDINAL2(932, 910), &VS90d::data.pmfcd__scalar_new_dbg_4p, VS90d::mfcd__scalar_new_dbg_4p, - ORDINAL2(933, 911), &VS90d::data.pmfcd__scalar_new_dbg_3p, VS90d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc90d::data.pmfcd_vector_new, Mfc90d::mfcd_vector_new, + ORDINAL(268), &Mfc90d::data.pmfcd__vector_new_dbg_4p, Mfc90d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &Mfc90d::data.pmfcd__vector_new_dbg_3p, Mfc90d::mfcd__vector_new_dbg_3p, + ORDINAL2(931, 909), &Mfc90d::data.pmfcd_scalar_new, Mfc90d::mfcd_scalar_new, + ORDINAL2(932, 910), &Mfc90d::data.pmfcd__scalar_new_dbg_4p, Mfc90d::mfcd__scalar_new_dbg_4p, + ORDINAL2(933, 911), &Mfc90d::data.pmfcd__scalar_new_dbg_3p, Mfc90d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc90uPatch [] = { - ORDINAL(265), &VS90::data.pmfcud_vector_new, VS90::mfcud_vector_new, - ORDINAL2(798, 776), &VS90::data.pmfcud_scalar_new, VS90::mfcud_scalar_new, - NULL, NULL, NULL + ORDINAL(265), &Mfc90::data.pmfcud_vector_new, Mfc90::mfcud_vector_new, + ORDINAL2(798, 776), &Mfc90::data.pmfcud_scalar_new, Mfc90::mfcud_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc90udPatch [] = { - ORDINAL(267), &VS90d::data.pmfcud_vector_new, VS90d::mfcud_vector_new, - ORDINAL(268), &VS90d::data.pmfcud__vector_new_dbg_4p, VS90d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS90d::data.pmfcud__vector_new_dbg_3p, VS90d::mfcud__vector_new_dbg_3p, - ORDINAL2(935, 913), &VS90d::data.pmfcud_scalar_new, VS90d::mfcud_scalar_new, - ORDINAL2(936, 914), &VS90d::data.pmfcud__scalar_new_dbg_4p, VS90d::mfcud__scalar_new_dbg_4p, - ORDINAL2(937, 915), &VS90d::data.pmfcud__scalar_new_dbg_3p, VS90d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc90d::data.pmfcud_vector_new, Mfc90d::mfcud_vector_new, + ORDINAL(268), &Mfc90d::data.pmfcud__vector_new_dbg_4p, Mfc90d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &Mfc90d::data.pmfcud__vector_new_dbg_3p, Mfc90d::mfcud__vector_new_dbg_3p, + ORDINAL2(935, 913), &Mfc90d::data.pmfcud_scalar_new, Mfc90d::mfcud_scalar_new, + ORDINAL2(936, 914), &Mfc90d::data.pmfcud__scalar_new_dbg_4p, Mfc90d::mfcud__scalar_new_dbg_4p, + ORDINAL2(937, 915), &Mfc90d::data.pmfcud__scalar_new_dbg_3p, Mfc90d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc100Patch [] = { - ORDINAL(265), &VS100::data.pmfcd_vector_new, VS100::mfcd_vector_new, - ORDINAL2(1294, 1272), &VS100::data.pmfcd_scalar_new, VS100::mfcd_scalar_new, - NULL, NULL, NULL + ORDINAL(265), &Mfc100::data.pmfcd_vector_new, Mfc100::mfcd_vector_new, + ORDINAL2(1294, 1272), &Mfc100::data.pmfcd_scalar_new, Mfc100::mfcd_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc100dPatch [] = { - ORDINAL(267), &VS100d::data.pmfcd_vector_new, VS100d::mfcd_vector_new, - ORDINAL(268), &VS100d::data.pmfcd__vector_new_dbg_4p, VS100d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS100d::data.pmfcd__vector_new_dbg_3p, VS100d::mfcd__vector_new_dbg_3p, - ORDINAL2(1427, 1405), &VS100d::data.pmfcd_scalar_new, VS100d::mfcd_scalar_new, - ORDINAL2(1428, 1406), &VS100d::data.pmfcd__scalar_new_dbg_4p, VS100d::mfcd__scalar_new_dbg_4p, - ORDINAL2(1429, 1407), &VS100d::data.pmfcd__scalar_new_dbg_3p, VS100d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc100d::data.pmfcd_vector_new, Mfc100d::mfcd_vector_new, + ORDINAL(268), &Mfc100d::data.pmfcd__vector_new_dbg_4p, Mfc100d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &Mfc100d::data.pmfcd__vector_new_dbg_3p, Mfc100d::mfcd__vector_new_dbg_3p, + ORDINAL2(1427, 1405), &Mfc100d::data.pmfcd_scalar_new, Mfc100d::mfcd_scalar_new, + ORDINAL2(1428, 1406), &Mfc100d::data.pmfcd__scalar_new_dbg_4p, Mfc100d::mfcd__scalar_new_dbg_4p, + ORDINAL2(1429, 1407), &Mfc100d::data.pmfcd__scalar_new_dbg_3p, Mfc100d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc100uPatch [] = { - ORDINAL(265), &VS100::data.pmfcud_vector_new, VS100::mfcud_vector_new, - ORDINAL2(1298, 1276), &VS100::data.pmfcud_scalar_new, VS100::mfcud_scalar_new, - NULL, NULL, NULL + ORDINAL(265), &Mfc100::data.pmfcud_vector_new, Mfc100::mfcud_vector_new, + ORDINAL2(1298, 1276), &Mfc100::data.pmfcud_scalar_new, Mfc100::mfcud_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc100udPatch [] = { - ORDINAL(267), &VS100d::data.pmfcud_vector_new, VS100d::mfcud_vector_new, - ORDINAL(268), &VS100d::data.pmfcud__vector_new_dbg_4p, VS100d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS100d::data.pmfcud__vector_new_dbg_3p, VS100d::mfcud__vector_new_dbg_3p, - ORDINAL2(1434, 1412), &VS100d::data.pmfcud_scalar_new, VS100d::mfcud_scalar_new, - ORDINAL2(1435, 1413), &VS100d::data.pmfcud__scalar_new_dbg_4p, VS100d::mfcud__scalar_new_dbg_4p, - ORDINAL2(1436, 1414), &VS100d::data.pmfcud__scalar_new_dbg_3p, VS100d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc100d::data.pmfcud_vector_new, Mfc100d::mfcud_vector_new, + ORDINAL(268), &Mfc100d::data.pmfcud__vector_new_dbg_4p, Mfc100d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &Mfc100d::data.pmfcud__vector_new_dbg_3p, Mfc100d::mfcud__vector_new_dbg_3p, + ORDINAL2(1434, 1412), &Mfc100d::data.pmfcud_scalar_new, Mfc100d::mfcud_scalar_new, + ORDINAL2(1435, 1413), &Mfc100d::data.pmfcud__scalar_new_dbg_4p, Mfc100d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1436, 1414), &Mfc100d::data.pmfcud__scalar_new_dbg_3p, Mfc100d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc110Patch [] = { - ORDINAL(265), &VS110::data.pmfcd_vector_new, VS110::mfcd_vector_new, - ORDINAL2(1498, 1476), &VS110::data.pmfcd_scalar_new, VS110::mfcd_scalar_new, - NULL, NULL, NULL + ORDINAL(265), &Mfc110::data.pmfcd_vector_new, Mfc110::mfcd_vector_new, + ORDINAL2(1498, 1476), &Mfc110::data.pmfcd_scalar_new, Mfc110::mfcd_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc110dPatch [] = { - ORDINAL(267), &VS110d::data.pmfcd_vector_new, VS110d::mfcd_vector_new, - ORDINAL(268), &VS110d::data.pmfcd__vector_new_dbg_4p, VS110d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS110d::data.pmfcd__vector_new_dbg_3p, VS110d::mfcd__vector_new_dbg_3p, - ORDINAL2(1629, 1607), &VS110d::data.pmfcd_scalar_new, VS110d::mfcd_scalar_new, - ORDINAL2(1630, 1608), &VS110d::data.pmfcd__scalar_new_dbg_4p, VS110d::mfcd__scalar_new_dbg_4p, - ORDINAL2(1631, 1609), &VS110d::data.pmfcd__scalar_new_dbg_3p, VS110d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc110d::data.pmfcd_vector_new, Mfc110d::mfcd_vector_new, + ORDINAL(268), &Mfc110d::data.pmfcd__vector_new_dbg_4p, Mfc110d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &Mfc110d::data.pmfcd__vector_new_dbg_3p, Mfc110d::mfcd__vector_new_dbg_3p, + ORDINAL2(1629, 1607), &Mfc110d::data.pmfcd_scalar_new, Mfc110d::mfcd_scalar_new, + ORDINAL2(1630, 1608), &Mfc110d::data.pmfcd__scalar_new_dbg_4p, Mfc110d::mfcd__scalar_new_dbg_4p, + ORDINAL2(1631, 1609), &Mfc110d::data.pmfcd__scalar_new_dbg_3p, Mfc110d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc110uPatch [] = { - ORDINAL(265), &VS110::data.pmfcud_vector_new, VS110::mfcud_vector_new, - ORDINAL2(1502, 1480), &VS110::data.pmfcud_scalar_new, VS110::mfcud_scalar_new, - NULL, NULL, NULL + ORDINAL(265), &Mfc110::data.pmfcud_vector_new, Mfc110::mfcud_vector_new, + ORDINAL2(1502, 1480), &Mfc110::data.pmfcud_scalar_new, Mfc110::mfcud_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc110udPatch [] = { - ORDINAL(267), &VS110d::data.pmfcud_vector_new, VS110d::mfcud_vector_new, - ORDINAL(268), &VS110d::data.pmfcud__vector_new_dbg_4p, VS110d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS110d::data.pmfcud__vector_new_dbg_3p, VS110d::mfcud__vector_new_dbg_3p, - ORDINAL2(1636, 1614), &VS110d::data.pmfcud_scalar_new, VS110d::mfcud_scalar_new, - ORDINAL2(1637, 1615), &VS110d::data.pmfcud__scalar_new_dbg_4p, VS110d::mfcud__scalar_new_dbg_4p, - ORDINAL2(1638, 1616), &VS110d::data.pmfcud__scalar_new_dbg_3p, VS110d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc110d::data.pmfcud_vector_new, Mfc110d::mfcud_vector_new, + ORDINAL(268), &Mfc110d::data.pmfcud__vector_new_dbg_4p, Mfc110d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &Mfc110d::data.pmfcud__vector_new_dbg_3p, Mfc110d::mfcud__vector_new_dbg_3p, + ORDINAL2(1636, 1614), &Mfc110d::data.pmfcud_scalar_new, Mfc110d::mfcud_scalar_new, + ORDINAL2(1637, 1615), &Mfc110d::data.pmfcud__scalar_new_dbg_4p, Mfc110d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1638, 1616), &Mfc110d::data.pmfcud__scalar_new_dbg_3p, Mfc110d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc120Patch [] = { - ORDINAL(265), &VS120::data.pmfcd_vector_new, VS120::mfcd_vector_new, - ORDINAL2(1502, 1480), &VS120::data.pmfcd_scalar_new, VS120::mfcd_scalar_new, - NULL, NULL, NULL + ORDINAL(265), &Mfc120::data.pmfcd_vector_new, Mfc120::mfcd_vector_new, + ORDINAL2(1502, 1480), &Mfc120::data.pmfcd_scalar_new, Mfc120::mfcd_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc120dPatch [] = { - ORDINAL(267), &VS120d::data.pmfcd_vector_new, VS120d::mfcd_vector_new, - ORDINAL(268), &VS120d::data.pmfcd__vector_new_dbg_4p, VS120d::mfcd__vector_new_dbg_4p, - ORDINAL(269), &VS120d::data.pmfcd__vector_new_dbg_3p, VS120d::mfcd__vector_new_dbg_3p, - ORDINAL2(1633, 1611), &VS120d::data.pmfcd_scalar_new, VS120d::mfcd_scalar_new, - ORDINAL2(1634, 1612), &VS120d::data.pmfcd__scalar_new_dbg_4p, VS120d::mfcd__scalar_new_dbg_4p, - ORDINAL2(1635, 1613), &VS120d::data.pmfcd__scalar_new_dbg_3p, VS120d::mfcd__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc120d::data.pmfcd_vector_new, Mfc120d::mfcd_vector_new, + ORDINAL(268), &Mfc120d::data.pmfcd__vector_new_dbg_4p, Mfc120d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &Mfc120d::data.pmfcd__vector_new_dbg_3p, Mfc120d::mfcd__vector_new_dbg_3p, + ORDINAL2(1633, 1611), &Mfc120d::data.pmfcd_scalar_new, Mfc120d::mfcd_scalar_new, + ORDINAL2(1634, 1612), &Mfc120d::data.pmfcd__scalar_new_dbg_4p, Mfc120d::mfcd__scalar_new_dbg_4p, + ORDINAL2(1635, 1613), &Mfc120d::data.pmfcd__scalar_new_dbg_3p, Mfc120d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t mfc120uPatch [] = { - ORDINAL(265), &VS120::data.pmfcud_vector_new, VS120::mfcud_vector_new, - ORDINAL2(1506, 1484), &VS120::data.pmfcud_scalar_new, VS120::mfcud_scalar_new, - NULL, NULL, NULL + ORDINAL(265), &Mfc120::data.pmfcud_vector_new, Mfc120::mfcud_vector_new, + ORDINAL2(1506, 1484), &Mfc120::data.pmfcud_scalar_new, Mfc120::mfcud_scalar_new, + NULL, NULL, NULL }; static patchentry_t mfc120udPatch [] = { - ORDINAL(267), &VS120d::data.pmfcud_vector_new, VS120d::mfcud_vector_new, - ORDINAL(268), &VS120d::data.pmfcud__vector_new_dbg_4p, VS120d::mfcud__vector_new_dbg_4p, - ORDINAL(269), &VS120d::data.pmfcud__vector_new_dbg_3p, VS120d::mfcud__vector_new_dbg_3p, - ORDINAL2(1640, 1618), &VS120d::data.pmfcud_scalar_new, VS120d::mfcud_scalar_new, - ORDINAL2(1641, 1619), &VS120d::data.pmfcud__scalar_new_dbg_4p, VS120d::mfcud__scalar_new_dbg_4p, - ORDINAL2(1642, 1620), &VS120d::data.pmfcud__scalar_new_dbg_3p, VS120d::mfcud__scalar_new_dbg_3p, - NULL, NULL, NULL + ORDINAL(267), &Mfc120d::data.pmfcud_vector_new, Mfc120d::mfcud_vector_new, + ORDINAL(268), &Mfc120d::data.pmfcud__vector_new_dbg_4p, Mfc120d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &Mfc120d::data.pmfcud__vector_new_dbg_3p, Mfc120d::mfcud__vector_new_dbg_3p, + ORDINAL2(1640, 1618), &Mfc120d::data.pmfcud_scalar_new, Mfc120d::mfcud_scalar_new, + ORDINAL2(1641, 1619), &Mfc120d::data.pmfcud__scalar_new_dbg_4p, Mfc120d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1642, 1620), &Mfc120d::data.pmfcud__scalar_new_dbg_3p, Mfc120d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc140Patch[] = { + ORDINAL(265), &Mfc140::data.pmfcd_vector_new, Mfc140::mfcd_vector_new, + ORDINAL2(1507, 1485), &Mfc140::data.pmfcd_scalar_new, Mfc140::mfcd_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc140dPatch[] = { + ORDINAL(267), &Mfc140d::data.pmfcd_vector_new, Mfc140d::mfcd_vector_new, + ORDINAL(268), &Mfc140d::data.pmfcd__vector_new_dbg_4p, Mfc140d::mfcd__vector_new_dbg_4p, + ORDINAL(269), &Mfc140d::data.pmfcd__vector_new_dbg_3p, Mfc140d::mfcd__vector_new_dbg_3p, + ORDINAL2(1638, 1616), &Mfc140d::data.pmfcd_scalar_new, Mfc140d::mfcd_scalar_new, + ORDINAL2(1639, 1617), &Mfc140d::data.pmfcd__scalar_new_dbg_4p, Mfc140d::mfcd__scalar_new_dbg_4p, + ORDINAL2(1640, 1618), &Mfc140d::data.pmfcd__scalar_new_dbg_3p, Mfc140d::mfcd__scalar_new_dbg_3p, + NULL, NULL, NULL +}; + +static patchentry_t mfc140uPatch[] = { + ORDINAL(265), &Mfc140::data.pmfcud_vector_new, Mfc140::mfcud_vector_new, + ORDINAL2(1511, 1489), &Mfc140::data.pmfcud_scalar_new, Mfc140::mfcud_scalar_new, + NULL, NULL, NULL +}; + +static patchentry_t mfc140udPatch[] = { + ORDINAL(267), &Mfc140d::data.pmfcud_vector_new, Mfc140d::mfcud_vector_new, + ORDINAL(268), &Mfc140d::data.pmfcud__vector_new_dbg_4p, Mfc140d::mfcud__vector_new_dbg_4p, + ORDINAL(269), &Mfc140d::data.pmfcud__vector_new_dbg_3p, Mfc140d::mfcud__vector_new_dbg_3p, + ORDINAL2(1645, 1623), &Mfc140d::data.pmfcud_scalar_new, Mfc140d::mfcud_scalar_new, + ORDINAL2(1646, 1624), &Mfc140d::data.pmfcud__scalar_new_dbg_4p, Mfc140d::mfcud__scalar_new_dbg_4p, + ORDINAL2(1647, 1625), &Mfc140d::data.pmfcud__scalar_new_dbg_3p, Mfc140d::mfcud__scalar_new_dbg_3p, + NULL, NULL, NULL }; static patchentry_t msvcrtPatch [] = { @@ -670,6 +702,59 @@ static patchentry_t msvcr120dPatch [] = { "_aligned_offset_recalloc", &VS120d::data.pcrtd_aligned_offset_recalloc, VS120d::crtd__aligned_offset_recalloc, NULL, NULL, NULL, }; + +static patchentry_t ucrtbasePatch[] = { + scalar_new_dbg_name, &UCRT::data.pcrtd__scalar_new_dbg, UCRT::crtd__scalar_new_dbg, + vector_new_dbg_name, &UCRT::data.pcrtd__vector_new_dbg, UCRT::crtd__vector_new_dbg, + "calloc", &UCRT::data.pcrtd_calloc, UCRT::crtd_calloc, + "malloc", &UCRT::data.pcrtd_malloc, UCRT::crtd_malloc, + "realloc", &UCRT::data.pcrtd_realloc, UCRT::crtd_realloc, + "_recalloc", &UCRT::data.pcrtd_recalloc, UCRT::crtd__recalloc, + "_strdup", &UCRT::data.pcrtd__strdup, UCRT::crtd__strdup, + "_wcsdup", &UCRT::data.pcrtd__wcsdup, UCRT::crtd__wcsdup, + scalar_new_name, &UCRT::data.pcrtd_scalar_new, UCRT::crtd_scalar_new, + vector_new_name, &UCRT::data.pcrtd_vector_new, UCRT::crtd_vector_new, + "_aligned_malloc", &UCRT::data.pcrtd_aligned_malloc, UCRT::crtd__aligned_malloc, + "_aligned_offset_malloc", &UCRT::data.pcrtd_aligned_offset_malloc, UCRT::crtd__aligned_offset_malloc, + "_aligned_realloc", &UCRT::data.pcrtd_aligned_realloc, UCRT::crtd__aligned_realloc, + "_aligned_offset_realloc", &UCRT::data.pcrtd_aligned_offset_realloc, UCRT::crtd__aligned_offset_realloc, + "_aligned_recalloc", &UCRT::data.pcrtd_aligned_recalloc, UCRT::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &UCRT::data.pcrtd_aligned_offset_recalloc, UCRT::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, +}; + +static patchentry_t ucrtbasedPatch[] = { + "_calloc_dbg", &UCRTd::data.pcrtd__calloc_dbg, UCRTd::crtd__calloc_dbg, + "_malloc_dbg", &UCRTd::data.pcrtd__malloc_dbg, UCRTd::crtd__malloc_dbg, + "_realloc_dbg", &UCRTd::data.pcrtd__realloc_dbg, UCRTd::crtd__realloc_dbg, + "_recalloc_dbg", &UCRTd::data.pcrtd__recalloc_dbg, UCRTd::crtd__recalloc_dbg, + "_strdup_dbg", &UCRTd::data.pcrtd__strdup_dbg, UCRTd::crtd__strdup_dbg, + "_wcsdup_dbg", &UCRTd::data.pcrtd__wcsdup_dbg, UCRTd::crtd__wcsdup_dbg, + scalar_new_dbg_name, &UCRTd::data.pcrtd__scalar_new_dbg, UCRTd::crtd__scalar_new_dbg, + vector_new_dbg_name, &UCRTd::data.pcrtd__vector_new_dbg, UCRTd::crtd__vector_new_dbg, + "calloc", &UCRTd::data.pcrtd_calloc, UCRTd::crtd_calloc, + "malloc", &UCRTd::data.pcrtd_malloc, UCRTd::crtd_malloc, + "realloc", &UCRTd::data.pcrtd_realloc, UCRTd::crtd_realloc, + "_recalloc", &UCRTd::data.pcrtd_recalloc, UCRTd::crtd__recalloc, + "_strdup", &UCRTd::data.pcrtd__strdup, UCRTd::crtd__strdup, + "_wcsdup", &UCRTd::data.pcrtd__wcsdup, UCRTd::crtd__wcsdup, + scalar_new_name, &UCRTd::data.pcrtd_scalar_new, UCRTd::crtd_scalar_new, + vector_new_name, &UCRTd::data.pcrtd_vector_new, UCRTd::crtd_vector_new, + "_aligned_malloc_dbg", &UCRTd::data.pcrtd__aligned_malloc_dbg, UCRTd::crtd__aligned_malloc_dbg, + "_aligned_offset_malloc_dbg", &UCRTd::data.pcrtd__aligned_offset_malloc_dbg, UCRTd::crtd__aligned_offset_malloc_dbg, + "_aligned_realloc_dbg", &UCRTd::data.pcrtd__aligned_realloc_dbg, UCRTd::crtd__aligned_realloc_dbg, + "_aligned_offset_realloc_dbg", &UCRTd::data.pcrtd__aligned_offset_realloc_dbg, UCRTd::crtd__aligned_offset_realloc_dbg, + "_aligned_recalloc_dbg", &UCRTd::data.pcrtd__aligned_recalloc_dbg, UCRTd::crtd__aligned_recalloc_dbg, + "_aligned_offset_recalloc_dbg", &UCRTd::data.pcrtd__aligned_offset_recalloc_dbg, UCRTd::crtd__aligned_offset_recalloc_dbg, + "_aligned_malloc", &UCRTd::data.pcrtd_aligned_malloc, UCRTd::crtd__aligned_malloc, + "_aligned_offset_malloc", &UCRTd::data.pcrtd_aligned_offset_malloc, UCRTd::crtd__aligned_offset_malloc, + "_aligned_realloc", &UCRTd::data.pcrtd_aligned_realloc, UCRTd::crtd__aligned_realloc, + "_aligned_offset_realloc", &UCRTd::data.pcrtd_aligned_offset_realloc, UCRTd::crtd__aligned_offset_realloc, + "_aligned_recalloc", &UCRTd::data.pcrtd_aligned_recalloc, UCRTd::crtd__aligned_recalloc, + "_aligned_offset_recalloc", &UCRTd::data.pcrtd_aligned_offset_recalloc, UCRTd::crtd__aligned_offset_recalloc, + NULL, NULL, NULL, +}; + patchentry_t VisualLeakDetector::m_ntdllPatch [] = { "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, "RtlFreeHeap", NULL, VisualLeakDetector::_RtlFreeHeap, @@ -722,6 +807,10 @@ moduleentry_t VisualLeakDetector::m_patchTable [] = { "mfc120d.dll", 0x0, mfc120dPatch, "mfc120u.dll", 0x0, mfc120uPatch, "mfc120ud.dll", 0x0, mfc120udPatch, + "mfc140.dll", 0x0, mfc140Patch, + "mfc140d.dll", 0x0, mfc140dPatch, + "mfc140u.dll", 0x0, mfc140uPatch, + "mfc140ud.dll", 0x0, mfc140udPatch, // CRT new operators and heap APIs. "msvcrt.dll", 0x0, msvcrtPatch, @@ -740,6 +829,8 @@ moduleentry_t VisualLeakDetector::m_patchTable [] = { "msvcr110d.dll",0x0, msvcr110dPatch, "msvcr120.dll", 0x0, msvcr120Patch, "msvcr120d.dll",0x0, msvcr120dPatch, + "ucrtbase.dll", 0x0, ucrtbasePatch, + "ucrtbased.dll",0x0, ucrtbasedPatch, // NT APIs. "ntdll.dll", 0x0, m_ntdllPatch, diff --git a/src/tests/basics/Allocs.cpp b/src/tests/basics/Allocs.cpp index 8be4ec24..a48f8caf 100644 --- a/src/tests/basics/Allocs.cpp +++ b/src/tests/basics/Allocs.cpp @@ -19,6 +19,10 @@ #define CRTDLLNAME _T("msvcr110d.dll") #elif _MSC_VER == 1800 // VS 2013 #define CRTDLLNAME _T("msvcr120d.dll") +#elif _MSC_VER == 1900 // VS 2015 +#define CRTDLLNAME _T("ucrtbased.dll") +#else +#error Unsupported compiler #endif #else #if _MSC_VER == 1400 // VS 2005 @@ -31,6 +35,10 @@ #define CRTDLLNAME _T("msvcr110.dll") #elif _MSC_VER == 1800 // VS 2013 #define CRTDLLNAME _T("msvcr120.dll") +#elif _MSC_VER == 1900 // VS 2015 +#define CRTDLLNAME _T("ucrtbase.dll") +#else +#error Unsupported compiler #endif #endif diff --git a/src/tests/basics/basics.vcxproj b/src/tests/basics/basics.vcxproj index 6b6a559b..4de5a0f6 100644 --- a/src/tests/basics/basics.vcxproj +++ b/src/tests/basics/basics.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -61,69 +61,81 @@ Application true Unicode + v140 Application true Unicode + v140 Application true Unicode + v140 Application true Unicode + v140 Application true Unicode false + v140 Application true Unicode false + v140 Application true Unicode false + v140 Application true Unicode false + v140 Application false true Unicode + v140 Application false true Unicode + v140 Application false true Unicode + v140 Application false true Unicode + v140 @@ -508,7 +520,12 @@ - + + true + true + true + true + Create Create diff --git a/src/tests/corruption/corruption.vcxproj b/src/tests/corruption/corruption.vcxproj index 6ec146c9..93b7c525 100644 --- a/src/tests/corruption/corruption.vcxproj +++ b/src/tests/corruption/corruption.vcxproj @@ -1,5 +1,5 @@  - + Debug_StaticCrt @@ -44,45 +44,53 @@ Application true Unicode + v140 Application true Unicode + v140 Application true Unicode + v140 Application true Unicode + v140 Application false true Unicode + v140 Application false true Unicode + v140 Application false true Unicode + v140 Application false true Unicode + v140 diff --git a/src/tests/dynamic_app/dynamic_app.cpp b/src/tests/dynamic_app/dynamic_app.cpp index e3a1a168..1fa3fb00 100644 --- a/src/tests/dynamic_app/dynamic_app.cpp +++ b/src/tests/dynamic_app/dynamic_app.cpp @@ -32,10 +32,12 @@ class DynamicLoader : public ::testing::TestWithParam { TEST_P(DynamicLoader, LoaderTests) { + VLDMarkAllLeaksAsReported(); int prevleaks = (int)VLDGetLeaksCount(); HMODULE hmfcLib = RunLoaderTests(GetParam()); // leaks 18 int totalleaks = (int)VLDGetLeaksCount(); int leaks = totalleaks - prevleaks; + VLDReportLeaks(); ASSERT_EQ(18, leaks); } diff --git a/src/tests/dynamic_app/dynamic_app.vcxproj b/src/tests/dynamic_app/dynamic_app.vcxproj index c3b485f9..66bfb60e 100644 --- a/src/tests/dynamic_app/dynamic_app.vcxproj +++ b/src/tests/dynamic_app/dynamic_app.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -60,65 +60,77 @@ Application true Unicode + v140 Application true Unicode + v140 Application true Unicode + v140 Application true Unicode + v140 Application true Unicode + v140 Application true Unicode + v140 Application true Unicode + v140 Application true Unicode + v140 Application false true Unicode + v140 Application false true Unicode + v140 Application false true Unicode + v140 Application false true Unicode + v140 diff --git a/src/tests/dynamic_dll/dynamic.vcxproj b/src/tests/dynamic_dll/dynamic.vcxproj index 2226f8be..9221557c 100644 --- a/src/tests/dynamic_dll/dynamic.vcxproj +++ b/src/tests/dynamic_dll/dynamic.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -61,65 +61,77 @@ DynamicLibrary true Unicode + v140 DynamicLibrary true Unicode + v140 DynamicLibrary true Unicode + v140 DynamicLibrary true Unicode + v140 DynamicLibrary true Unicode + v140 DynamicLibrary true Unicode + v140 DynamicLibrary true Unicode + v140 DynamicLibrary true Unicode + v140 DynamicLibrary false true Unicode + v140 DynamicLibrary false true Unicode + v140 DynamicLibrary false true Unicode + v140 DynamicLibrary false true Unicode + v140 diff --git a/src/tests/mfc/vldmfc.vcxproj b/src/tests/mfc/vldmfc.vcxproj index b5e9eb98..1b1cd8ff 100644 --- a/src/tests/mfc/vldmfc.vcxproj +++ b/src/tests/mfc/vldmfc.vcxproj @@ -1,5 +1,5 @@  - + Debug_StaticCrt @@ -43,41 +43,49 @@ Application Dynamic Unicode + v140 Application Static Unicode + v140 Application Dynamic Unicode + v140 Application Static Unicode + v140 Application Dynamic Unicode + v140 Application Static Unicode + v140 Application Dynamic Unicode + v140 Application Static Unicode + v140 diff --git a/src/tests/mfc_dll/mfc.vcxproj b/src/tests/mfc_dll/mfc.vcxproj index 863167ba..1b68b0cc 100644 --- a/src/tests/mfc_dll/mfc.vcxproj +++ b/src/tests/mfc_dll/mfc.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -62,48 +62,56 @@ true Unicode Dynamic + v140 DynamicLibrary true Unicode Static + v140 DynamicLibrary true Unicode Dynamic + v140 DynamicLibrary true Unicode Static + v140 DynamicLibrary true Unicode Dynamic + v140 DynamicLibrary true Unicode Static + v140 DynamicLibrary true Unicode Dynamic + v140 DynamicLibrary true Unicode Static + v140 DynamicLibrary @@ -111,6 +119,7 @@ true Unicode Dynamic + v140 DynamicLibrary @@ -118,6 +127,7 @@ true Unicode Static + v140 DynamicLibrary @@ -125,6 +135,7 @@ true Unicode Dynamic + v140 DynamicLibrary @@ -132,6 +143,7 @@ true Unicode Static + v140 diff --git a/src/tests/suite/testsuite.cpp b/src/tests/suite/testsuite.cpp index 533465bd..403f7151 100644 --- a/src/tests/suite/testsuite.cpp +++ b/src/tests/suite/testsuite.cpp @@ -61,6 +61,10 @@ enum action_e { #define CRTDLLNAME _T("msvcr110d.dll") #elif _MSC_VER == 1800 // VS 2013 #define CRTDLLNAME _T("msvcr120d.dll") +#elif _MSC_VER == 1900 // VS 2015 +#define CRTDLLNAME _T("ucrtbased.dll") +#else +#error Unsupported compiler #endif #else #if _MSC_VER == 1400 // VS 2005 @@ -73,6 +77,10 @@ enum action_e { #define CRTDLLNAME _T("msvcr110.dll") #elif _MSC_VER == 1800 // VS 2013 #define CRTDLLNAME _T("msvcr120.dll") +#elif _MSC_VER == 1900 // VS 2015 +#define CRTDLLNAME _T("ucrtbase.dll") +#else +#error Unsupported compiler #endif #endif diff --git a/src/tests/suite/testsuite.vcxproj b/src/tests/suite/testsuite.vcxproj index f78ce6ab..e4e5dcfe 100644 --- a/src/tests/suite/testsuite.vcxproj +++ b/src/tests/suite/testsuite.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -66,50 +66,62 @@ Application NotSet + v140 Application NotSet + v140 Application NotSet + v140 Application NotSet + v140 Application NotSet + v140 Application NotSet + v140 Application NotSet + v140 Application NotSet + v140 Application NotSet + v140 Application NotSet + v140 Application NotSet + v140 Application NotSet + v140 diff --git a/src/vld.rc b/src/vld.rc index 09d1b247..f6cacc51 100644 --- a/src/vld.rc +++ b/src/vld.rc @@ -28,18 +28,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#include \r\n" "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "\r\n" "\0" diff --git a/src/vld.vcxproj b/src/vld.vcxproj index 380bb68d..7c15f523 100644 --- a/src/vld.vcxproj +++ b/src/vld.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -37,6 +37,18 @@ + + v140 + + + v140 + + + v140 + + + v140 + diff --git a/src/vldint.h b/src/vldint.h index 7ac173ea..b7b22a80 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -380,7 +380,7 @@ class VisualLeakDetector : public IMalloc static patchentry_t m_kernel32Patch []; static patchentry_t m_ntdllPatch []; static patchentry_t m_ole32Patch []; - static moduleentry_t m_patchTable [52]; // Table of imports patched for attaching VLD to other modules. + static moduleentry_t m_patchTable [58]; // Table of imports patched for attaching VLD to other modules. FILE *m_reportFile; // File where the memory leak report may be sent to. WCHAR m_reportFilePath [MAX_PATH]; // Full path and name of file to send memory leak report to. const char *m_selfTestFile; // Filename where the memory leak self-test block is leaked. From 5300adbb541c3c0197acd29cbf4b92b7feeae553 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 30 Jul 2015 10:28:19 +0300 Subject: [PATCH 187/321] dynamic_app test fixed --- src/dllspatches.cpp | 116 +++++++++++++------------- src/tests/basics/basics.vcxproj | 7 +- src/tests/dynamic_app/LoadTests.cpp | 4 +- src/tests/dynamic_app/dynamic_app.cpp | 2 - src/utility.h | 1 + src/vld.cpp | 31 ++++--- 6 files changed, 76 insertions(+), 85 deletions(-) diff --git a/src/dllspatches.cpp b/src/dllspatches.cpp index 3226d4c1..a9fc6760 100644 --- a/src/dllspatches.cpp +++ b/src/dllspatches.cpp @@ -771,70 +771,70 @@ patchentry_t VisualLeakDetector::m_ole32Patch [] = { moduleentry_t VisualLeakDetector::m_patchTable [] = { // Win32 heap APIs. - "kernel32.dll", 0x0, m_kernelbasePatch, // we patch this record on Win7 - "kernel32.dll", 0x0, m_kernel32Patch, + "kernel32.dll", FALSE, 0x0, m_kernelbasePatch, // we patch this record on Win7 + "kernel32.dll", FALSE, 0x0, m_kernel32Patch, // MFC new operators (exported by ordinal). - "mfc42.dll", 0x0, mfc42Patch, - "mfc42d.dll", 0x0, mfc42dPatch, - "mfc42u.dll", 0x0, mfc42uPatch, - "mfc42ud.dll", 0x0, mfc42udPatch, - "mfc70.dll", 0x0, mfc70Patch, - "mfc70d.dll", 0x0, mfc70dPatch, - "mfc70u.dll", 0x0, mfc70uPatch, - "mfc70ud.dll", 0x0, mfc70udPatch, - "mfc71.dll", 0x0, mfc71Patch, - "mfc71d.dll", 0x0, mfc71dPatch, - "mfc71u.dll", 0x0, mfc71uPatch, - "mfc71ud.dll", 0x0, mfc71udPatch, - "mfc80.dll", 0x0, mfc80Patch, - "mfc80d.dll", 0x0, mfc80dPatch, - "mfc80u.dll", 0x0, mfc80uPatch, - "mfc80ud.dll", 0x0, mfc80udPatch, - "mfc90.dll", 0x0, mfc90Patch, - "mfc90d.dll", 0x0, mfc90dPatch, - "mfc90u.dll", 0x0, mfc90uPatch, - "mfc90ud.dll", 0x0, mfc90udPatch, - "mfc100.dll", 0x0, mfc100Patch, - "mfc100d.dll", 0x0, mfc100dPatch, - "mfc100u.dll", 0x0, mfc100uPatch, - "mfc100ud.dll", 0x0, mfc100udPatch, - "mfc110.dll", 0x0, mfc110Patch, - "mfc110d.dll", 0x0, mfc110dPatch, - "mfc110u.dll", 0x0, mfc110uPatch, - "mfc110ud.dll", 0x0, mfc110udPatch, - "mfc120.dll", 0x0, mfc120Patch, - "mfc120d.dll", 0x0, mfc120dPatch, - "mfc120u.dll", 0x0, mfc120uPatch, - "mfc120ud.dll", 0x0, mfc120udPatch, - "mfc140.dll", 0x0, mfc140Patch, - "mfc140d.dll", 0x0, mfc140dPatch, - "mfc140u.dll", 0x0, mfc140uPatch, - "mfc140ud.dll", 0x0, mfc140udPatch, + "mfc42.dll", TRUE, 0x0, mfc42Patch, + "mfc42d.dll", TRUE, 0x0, mfc42dPatch, + "mfc42u.dll", TRUE, 0x0, mfc42uPatch, + "mfc42ud.dll", TRUE, 0x0, mfc42udPatch, + "mfc70.dll", TRUE, 0x0, mfc70Patch, + "mfc70d.dll", TRUE, 0x0, mfc70dPatch, + "mfc70u.dll", TRUE, 0x0, mfc70uPatch, + "mfc70ud.dll", TRUE, 0x0, mfc70udPatch, + "mfc71.dll", TRUE, 0x0, mfc71Patch, + "mfc71d.dll", TRUE, 0x0, mfc71dPatch, + "mfc71u.dll", TRUE, 0x0, mfc71uPatch, + "mfc71ud.dll", TRUE, 0x0, mfc71udPatch, + "mfc80.dll", TRUE, 0x0, mfc80Patch, + "mfc80d.dll", TRUE, 0x0, mfc80dPatch, + "mfc80u.dll", TRUE, 0x0, mfc80uPatch, + "mfc80ud.dll", TRUE, 0x0, mfc80udPatch, + "mfc90.dll", TRUE, 0x0, mfc90Patch, + "mfc90d.dll", TRUE, 0x0, mfc90dPatch, + "mfc90u.dll", TRUE, 0x0, mfc90uPatch, + "mfc90ud.dll", TRUE, 0x0, mfc90udPatch, + "mfc100.dll", TRUE, 0x0, mfc100Patch, + "mfc100d.dll", TRUE, 0x0, mfc100dPatch, + "mfc100u.dll", TRUE, 0x0, mfc100uPatch, + "mfc100ud.dll", TRUE, 0x0, mfc100udPatch, + "mfc110.dll", TRUE, 0x0, mfc110Patch, + "mfc110d.dll", TRUE, 0x0, mfc110dPatch, + "mfc110u.dll", TRUE, 0x0, mfc110uPatch, + "mfc110ud.dll", TRUE, 0x0, mfc110udPatch, + "mfc120.dll", TRUE, 0x0, mfc120Patch, + "mfc120d.dll", TRUE, 0x0, mfc120dPatch, + "mfc120u.dll", TRUE, 0x0, mfc120uPatch, + "mfc120ud.dll", TRUE, 0x0, mfc120udPatch, + "mfc140.dll", TRUE, 0x0, mfc140Patch, + "mfc140d.dll", TRUE, 0x0, mfc140dPatch, + "mfc140u.dll", TRUE, 0x0, mfc140uPatch, + "mfc140ud.dll", TRUE, 0x0, mfc140udPatch, // CRT new operators and heap APIs. - "msvcrt.dll", 0x0, msvcrtPatch, - "msvcrtd.dll", 0x0, msvcrtdPatch, - "msvcr70.dll", 0x0, msvcr70Patch, - "msvcr70d.dll", 0x0, msvcr70dPatch, - "msvcr71.dll", 0x0, msvcr71Patch, - "msvcr71d.dll", 0x0, msvcr71dPatch, - "msvcr80.dll", 0x0, msvcr80Patch, - "msvcr80d.dll", 0x0, msvcr80dPatch, - "msvcr90.dll", 0x0, msvcr90Patch, - "msvcr90d.dll", 0x0, msvcr90dPatch, - "msvcr100.dll", 0x0, msvcr100Patch, - "msvcr100d.dll",0x0, msvcr100dPatch, - "msvcr110.dll", 0x0, msvcr110Patch, - "msvcr110d.dll",0x0, msvcr110dPatch, - "msvcr120.dll", 0x0, msvcr120Patch, - "msvcr120d.dll",0x0, msvcr120dPatch, - "ucrtbase.dll", 0x0, ucrtbasePatch, - "ucrtbased.dll",0x0, ucrtbasedPatch, + "msvcrt.dll", FALSE, 0x0, msvcrtPatch, + "msvcrtd.dll", FALSE, 0x0, msvcrtdPatch, + "msvcr70.dll", TRUE, 0x0, msvcr70Patch, + "msvcr70d.dll", TRUE, 0x0, msvcr70dPatch, + "msvcr71.dll", TRUE, 0x0, msvcr71Patch, + "msvcr71d.dll", TRUE, 0x0, msvcr71dPatch, + "msvcr80.dll", TRUE, 0x0, msvcr80Patch, + "msvcr80d.dll", TRUE, 0x0, msvcr80dPatch, + "msvcr90.dll", TRUE, 0x0, msvcr90Patch, + "msvcr90d.dll", TRUE, 0x0, msvcr90dPatch, + "msvcr100.dll", TRUE, 0x0, msvcr100Patch, + "msvcr100d.dll",TRUE, 0x0, msvcr100dPatch, + "msvcr110.dll", TRUE, 0x0, msvcr110Patch, + "msvcr110d.dll",TRUE, 0x0, msvcr110dPatch, + "msvcr120.dll", TRUE, 0x0, msvcr120Patch, + "msvcr120d.dll",TRUE, 0x0, msvcr120dPatch, + "ucrtbase.dll", TRUE, 0x0, ucrtbasePatch, + "ucrtbased.dll",TRUE, 0x0, ucrtbasedPatch, // NT APIs. - "ntdll.dll", 0x0, m_ntdllPatch, + "ntdll.dll", FALSE, 0x0, m_ntdllPatch, // COM heap APIs. - "ole32.dll", 0x0, m_ole32Patch + "ole32.dll", FALSE, 0x0, m_ole32Patch }; diff --git a/src/tests/basics/basics.vcxproj b/src/tests/basics/basics.vcxproj index 4de5a0f6..193658ca 100644 --- a/src/tests/basics/basics.vcxproj +++ b/src/tests/basics/basics.vcxproj @@ -520,12 +520,7 @@ - - true - true - true - true - + Create Create diff --git a/src/tests/dynamic_app/LoadTests.cpp b/src/tests/dynamic_app/LoadTests.cpp index 9a6738f3..5fea312a 100644 --- a/src/tests/dynamic_app/LoadTests.cpp +++ b/src/tests/dynamic_app/LoadTests.cpp @@ -26,7 +26,7 @@ void CallVLDExportedMethod(const CHAR* function) } } -void CallDynamicMethods(HMODULE module, const CHAR* function) +void CallDynamicMethods(HMODULE module, const CHAR* function) { typedef void (__cdecl *DYNAPI_FNC)(); if (module != NULL) @@ -63,7 +63,7 @@ HMODULE RunLoaderTests(bool resolve) return hdyn; } -void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function ) +void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function ) { HMODULE dynamic_module = hmfcLib; assert(dynamic_module); diff --git a/src/tests/dynamic_app/dynamic_app.cpp b/src/tests/dynamic_app/dynamic_app.cpp index 1fa3fb00..e3a1a168 100644 --- a/src/tests/dynamic_app/dynamic_app.cpp +++ b/src/tests/dynamic_app/dynamic_app.cpp @@ -32,12 +32,10 @@ class DynamicLoader : public ::testing::TestWithParam { TEST_P(DynamicLoader, LoaderTests) { - VLDMarkAllLeaksAsReported(); int prevleaks = (int)VLDGetLeaksCount(); HMODULE hmfcLib = RunLoaderTests(GetParam()); // leaks 18 int totalleaks = (int)VLDGetLeaksCount(); int leaks = totalleaks - prevleaks; - VLDReportLeaks(); ASSERT_EQ(18, leaks); } diff --git a/src/utility.h b/src/utility.h index 95c6da51..5774a473 100644 --- a/src/utility.h +++ b/src/utility.h @@ -114,6 +114,7 @@ struct patchentry_t struct moduleentry_t { LPCSTR exportModuleName; // The name of the module exporting the patched API. + BOOL reportLeaks; // Patch module to report leaks from it UINT_PTR moduleBase; // The base address of the exporting module (filled in at runtime when the modules are loaded). patchentry_t* patchTable; }; diff --git a/src/vld.cpp b/src/vld.cpp index 66175270..e40a0aa8 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -64,7 +64,7 @@ patchentry_t ldrLoadDllPatch [] = { NULL, NULL, NULL }; moduleentry_t ntdllPatch [] = { - "ntdll.dll", NULL, ldrLoadDllPatch, + "ntdll.dll", FALSE, NULL, ldrLoadDllPatch, }; BOOL IsWin7OrBetter() @@ -597,24 +597,21 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) if (!FindImport(modulelocal, m_vldBase, VLDDLL, "?g_vld@@3VVisualLeakDetector@@A")) { - bool isMfcModule = false; - //if (_wcsnicmp(modulename, L"mfc", 3) == 0) - { - LPSTR modulenamea; - ConvertModulePathToAscii(modulename, &modulenamea); - - for (UINT index = 0; index < _countof(m_patchTable); index++) { - moduleentry_t *entry = &m_patchTable[index]; - if (_stricmp(entry->exportModuleName, modulenamea) == 0) { - isMfcModule = true; - break; - } + // mfc and crt dll's shouldn't be excluded + bool patchKnownModule = false; + LPSTR modulenamea; + ConvertModulePathToAscii(modulename, &modulenamea); + + for (UINT index = 0; index < _countof(m_patchTable); index++) { + moduleentry_t *entry = &m_patchTable[index]; + if (_stricmp(entry->exportModuleName, modulenamea) == 0) { + patchKnownModule = entry->reportLeaks != 0; + break; } - - delete [] modulenamea; } - // mfc dll shouldn't be excluded - if (!isMfcModule) + delete[] modulenamea; + + if (!patchKnownModule) { // This module does not import VLD. This means that none of the module's // sources #included vld.h. From 9ea4127549060cc72539fa271727b5b113f40fb5 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 31 Jul 2015 01:13:02 +0300 Subject: [PATCH 188/321] Path to tests fixed --- src/tests/Common.props | 15 ++++- src/tests/basics/Allocs.cpp | 76 ++++++++++++----------- src/tests/basics/Allocs.h | 15 +---- src/tests/basics/basics.cpp | 10 --- src/tests/basics/basics.vcxproj | 49 +-------------- src/tests/basics/basics_disabled.cpp | 4 -- src/tests/corruption/corruption.vcxproj | 33 +--------- src/tests/dynamic_app/LoadTests.cpp | 2 - src/tests/dynamic_app/dynamic_app.cpp | 3 +- src/tests/dynamic_app/dynamic_app.vcxproj | 76 +++++------------------ src/tests/dynamic_dll/dynamic.cpp | 8 --- src/tests/dynamic_dll/dynamic.vcxproj | 25 +------- src/tests/mfc/vldmfc.vcxproj | 41 +++--------- src/tests/mfc_dll/mfc.vcxproj | 25 +------- src/tests/suite/testsuite.vcxproj | 57 +++-------------- vld_vs14.sln | 5 +- 16 files changed, 99 insertions(+), 345 deletions(-) diff --git a/src/tests/Common.props b/src/tests/Common.props index 76e531b9..9bbbe1fe 100644 --- a/src/tests/Common.props +++ b/src/tests/Common.props @@ -3,7 +3,8 @@ d - + + x86 x64 @@ -17,7 +18,19 @@ <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)src\bin\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + + + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + \ No newline at end of file diff --git a/src/tests/basics/Allocs.cpp b/src/tests/basics/Allocs.cpp index a48f8caf..f2aae931 100644 --- a/src/tests/basics/Allocs.cpp +++ b/src/tests/basics/Allocs.cpp @@ -45,18 +45,26 @@ typedef void* (__cdecl *free_t) (void* mem); typedef void* (__cdecl *malloc_t) (size_t size); -void AllocF(LeakOption type, bool bFree) +static const int recursion = 3; + +template +struct allocator; + +template<> +struct allocator<0> { + +static void alloc(LeakOption type, bool bFree) { int* leaked_memory = NULL; int* leaked_memory_dbg = NULL; if (type == eMalloc) { - leaked_memory = (int*)malloc(78); - leaked_memory_dbg = (int*)_malloc_dbg(80, _NORMAL_BLOCK,__FILE__,__LINE__); + leaked_memory = (int*)malloc(78); + leaked_memory_dbg = (int*)_malloc_dbg(80, _NORMAL_BLOCK, __FILE__, __LINE__); if (bFree) { free(leaked_memory); - _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); } } else if (type == eNew) @@ -72,7 +80,7 @@ void AllocF(LeakOption type, bool bFree) else if (type == eNewArray) { leaked_memory = new int[3]; - leaked_memory_dbg = new (_NORMAL_BLOCK,__FILE__,__LINE__) int[4]; + leaked_memory_dbg = new (_NORMAL_BLOCK, __FILE__, __LINE__) int[4]; // placement new operator int temp[3]; @@ -80,18 +88,18 @@ void AllocF(LeakOption type, bool bFree) float* placed_mem = new (place) float[3]; // doesn't work. Nothing gets patched by vld if (bFree) { - delete [] leaked_memory; - delete [] leaked_memory_dbg; + delete[] leaked_memory; + delete[] leaked_memory_dbg; } } else if (type == eCalloc) { - leaked_memory = (int*)calloc(47,sizeof(int)); + leaked_memory = (int*)calloc(47, sizeof(int)); leaked_memory_dbg = (int*)_calloc_dbg(39, sizeof(int), _NORMAL_BLOCK, __FILE__, __LINE__); if (bFree) { free(leaked_memory); - _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); } } else if (type == eRealloc) @@ -104,7 +112,7 @@ void AllocF(LeakOption type, bool bFree) if (bFree) { free(leaked_memory); - _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); } } else if (type == eCoTaskMem) @@ -153,16 +161,16 @@ void AllocF(LeakOption type, bool bFree) } else if (type == eStrdup) { - leaked_memory = (int*)strdup("strdup() leaks!"); - leaked_memory_dbg = (int*)_strdup_dbg("_strdup_dbg() leaks!", _NORMAL_BLOCK,__FILE__,__LINE__); + leaked_memory = (int*)strdup("strdup() leaks!"); + leaked_memory_dbg = (int*)_strdup_dbg("_strdup_dbg() leaks!", _NORMAL_BLOCK, __FILE__, __LINE__); void* leaked_wmemory = (int*)wcsdup(L"wcsdup() leaks!"); - void* leaked_wmemory_dbg = (int*)_wcsdup_dbg(L"_wcsdup_dbg() leaks!", _NORMAL_BLOCK,__FILE__,__LINE__); + void* leaked_wmemory_dbg = (int*)_wcsdup_dbg(L"_wcsdup_dbg() leaks!", _NORMAL_BLOCK, __FILE__, __LINE__); if (bFree) { free(leaked_memory); - _free_dbg(leaked_memory_dbg,_NORMAL_BLOCK); + _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); free(leaked_wmemory); - _free_dbg(leaked_wmemory_dbg,_NORMAL_BLOCK); + _free_dbg(leaked_wmemory_dbg, _NORMAL_BLOCK); } } else if (type == eHeapAlloc) @@ -204,33 +212,27 @@ void AllocF(LeakOption type, bool bFree) } } +}; -void AllocE(LeakOption type, bool bFree) -{ - AllocF(type, bFree); -} - -void AllocD(LeakOption type, bool bFree) -{ - AllocE(type, bFree); -} +template +struct allocator { + static void alloc(LeakOption type, bool bFree) + { + allocator::alloc(type, bFree); + } +}; -void AllocC(LeakOption type, bool bFree) +void alloc(LeakOption type, bool bFree) { - AllocD(type, bFree); + allocator::alloc(type, bFree); } -void AllocB(LeakOption type, bool bFree) -{ - AllocC(type, bFree); -} +const int repeats = 1; -void AllocA(LeakOption type, bool bFree) +void LeakMemory(LeakOption type, int repeat, bool bFree) { - AllocB(type, bFree); + for (int i = 0; i < repeat; i++) + { + alloc(type, bFree); + } } - -void Alloc(LeakOption type, bool bFree) -{ - AllocA(type, bFree); -} \ No newline at end of file diff --git a/src/tests/basics/Allocs.h b/src/tests/basics/Allocs.h index 4f414407..a1b8211a 100644 --- a/src/tests/basics/Allocs.h +++ b/src/tests/basics/Allocs.h @@ -1,17 +1,6 @@ #pragma once #include "LeakOption.h" -void AllocF(LeakOption type, bool bFree); - -void AllocE(LeakOption type, bool bFree); - -void AllocD(LeakOption type, bool bFree); - -void AllocC(LeakOption type, bool bFree); - -void AllocB(LeakOption type, bool bFree); - -void AllocA(LeakOption type, bool bFree); - -void Alloc(LeakOption type, bool bFree = false); +extern void LeakMemory(LeakOption type, int repeat, bool bFree = false); +extern const int repeats; diff --git a/src/tests/basics/basics.cpp b/src/tests/basics/basics.cpp index 868757c7..5451ef29 100644 --- a/src/tests/basics/basics.cpp +++ b/src/tests/basics/basics.cpp @@ -7,20 +7,10 @@ #include -void LeakMemory(LeakOption type, int repeat, bool bFree) -{ - for (int i = 0; i < repeat; i++) - { - Alloc(type, bFree); - } -} - class TestBasics : public ::testing::TestWithParam { }; -static const int repeats = 1; - TEST_P(TestBasics, Malloc) { int prev = static_cast(VLDGetLeaksCount()); diff --git a/src/tests/basics/basics.vcxproj b/src/tests/basics/basics.vcxproj index 193658ca..9b1bb1cb 100644 --- a/src/tests/basics/basics.vcxproj +++ b/src/tests/basics/basics.vcxproj @@ -55,6 +55,7 @@ Win32Proj basics test_basics + 8.1 @@ -191,63 +192,39 @@ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ @@ -256,12 +233,10 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) NotSet %(AdditionalDependencies) @@ -277,13 +252,11 @@ Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) NotSet %(AdditionalDependencies) @@ -299,12 +272,10 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) NotSet %(AdditionalDependencies) @@ -320,13 +291,11 @@ Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) NotSet %(AdditionalDependencies) @@ -342,12 +311,10 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) NotSet %(AdditionalDependencies) @@ -363,13 +330,11 @@ Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) NotSet %(AdditionalDependencies) @@ -385,12 +350,10 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) NotSet %(AdditionalDependencies) @@ -406,13 +369,11 @@ Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) NotSet %(AdditionalDependencies) @@ -429,14 +390,12 @@ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -451,7 +410,6 @@ true true STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -459,7 +417,6 @@ true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -474,14 +431,12 @@ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -496,7 +451,6 @@ true true STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -504,7 +458,6 @@ true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) diff --git a/src/tests/basics/basics_disabled.cpp b/src/tests/basics/basics_disabled.cpp index c6832f81..26cef6c6 100644 --- a/src/tests/basics/basics_disabled.cpp +++ b/src/tests/basics/basics_disabled.cpp @@ -7,10 +7,6 @@ #include -extern void LeakMemory(LeakOption type, int repeat, bool bFree); - -static const int repeats = 1; - class TestBasicsDisabled : public ::testing::Test { virtual void SetUp() diff --git a/src/tests/corruption/corruption.vcxproj b/src/tests/corruption/corruption.vcxproj index 93b7c525..af16ead7 100644 --- a/src/tests/corruption/corruption.vcxproj +++ b/src/tests/corruption/corruption.vcxproj @@ -38,6 +38,7 @@ {87911ED6-84BC-4526-9654-A4FF4E0EDF52} Win32Proj corruption + 8.1 @@ -130,43 +131,27 @@ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ @@ -175,12 +160,10 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -194,13 +177,11 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -214,12 +195,10 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -233,13 +212,11 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -254,14 +231,12 @@ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -276,7 +251,6 @@ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -284,7 +258,6 @@ true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -299,14 +272,12 @@ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -321,7 +292,6 @@ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -329,7 +299,6 @@ true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) diff --git a/src/tests/dynamic_app/LoadTests.cpp b/src/tests/dynamic_app/LoadTests.cpp index 5fea312a..9fd4edff 100644 --- a/src/tests/dynamic_app/LoadTests.cpp +++ b/src/tests/dynamic_app/LoadTests.cpp @@ -44,7 +44,6 @@ void CallDynamicMethods(HMODULE module, const CHAR* function) HMODULE RunLoaderTests(bool resolve) { HMODULE hdyn = LoadLibrary(_T("dynamic.dll")); - assert(hdyn); if (hdyn) { VLDEnableModule(hdyn); @@ -84,7 +83,6 @@ void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function ) HMODULE RunMFCLoaderTests(bool resolve) { HMODULE hmfcLib = LoadLibrary(_T("test_mfc.dll")); - assert(hmfcLib); if (hmfcLib) { VLDEnableModule(hmfcLib); diff --git a/src/tests/dynamic_app/dynamic_app.cpp b/src/tests/dynamic_app/dynamic_app.cpp index e3a1a168..38d23d56 100644 --- a/src/tests/dynamic_app/dynamic_app.cpp +++ b/src/tests/dynamic_app/dynamic_app.cpp @@ -2,7 +2,6 @@ // #include "stdafx.h" -#include #include "LoadTests.h" #include "ThreadTests.h" #include "vld.h" @@ -34,6 +33,7 @@ TEST_P(DynamicLoader, LoaderTests) { int prevleaks = (int)VLDGetLeaksCount(); HMODULE hmfcLib = RunLoaderTests(GetParam()); // leaks 18 + ASSERT_NE(0u, (UINT_PTR)hmfcLib); int totalleaks = (int)VLDGetLeaksCount(); int leaks = totalleaks - prevleaks; ASSERT_EQ(18, leaks); @@ -43,6 +43,7 @@ TEST_P(DynamicLoader, MFCLoaderTests) { int prevleaks = (int)VLDGetLeaksCount(); HMODULE hmfcLib = RunMFCLoaderTests(GetParam()); // leaks 11 + ASSERT_NE(0u, (UINT_PTR)hmfcLib); #ifndef STATIC_CRT FreeLibrary(hmfcLib); #endif diff --git a/src/tests/dynamic_app/dynamic_app.vcxproj b/src/tests/dynamic_app/dynamic_app.vcxproj index 66bfb60e..2651f487 100644 --- a/src/tests/dynamic_app/dynamic_app.vcxproj +++ b/src/tests/dynamic_app/dynamic_app.vcxproj @@ -54,6 +54,7 @@ {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} Win32Proj dynamic_app + 8.1 @@ -186,80 +187,44 @@ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic true true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic true true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - dynamic @@ -268,12 +233,10 @@ Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -291,13 +254,11 @@ Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -315,12 +276,10 @@ Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -334,13 +293,11 @@ Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -354,12 +311,10 @@ Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -373,13 +328,11 @@ Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -393,12 +346,10 @@ Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -412,13 +363,11 @@ Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreadedDebug Console true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -434,14 +383,12 @@ true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -457,7 +404,6 @@ true true STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -465,7 +411,6 @@ true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -479,14 +424,12 @@ true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) Console true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -500,7 +443,6 @@ true STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -508,7 +450,6 @@ true true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -531,6 +472,21 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + {3aea2aaf-3e9b-466f-b361-560b95ad88b4} + false + false + false + false + false + + + {2178e5b2-1032-441f-a664-f3d8d1fd1913} + false + false + false + false + diff --git a/src/tests/dynamic_dll/dynamic.cpp b/src/tests/dynamic_dll/dynamic.cpp index 074963d5..e9570b1e 100644 --- a/src/tests/dynamic_dll/dynamic.cpp +++ b/src/tests/dynamic_dll/dynamic.cpp @@ -10,14 +10,6 @@ extern "C" { // This is an example of an exported variable DYNAMIC_API int ndynamic = 0; -void LeakMemory(LeakOption type, int repeat) -{ - for (int i = 0; i < repeat; i++) - { - Alloc(type); - } -} - // This is an example of an exported function. void SimpleLeak_Malloc(void) diff --git a/src/tests/dynamic_dll/dynamic.vcxproj b/src/tests/dynamic_dll/dynamic.vcxproj index 9221557c..52132ce2 100644 --- a/src/tests/dynamic_dll/dynamic.vcxproj +++ b/src/tests/dynamic_dll/dynamic.vcxproj @@ -55,6 +55,7 @@ Win32Proj dynamic dynamic + 8.1 @@ -187,63 +188,39 @@ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ diff --git a/src/tests/mfc/vldmfc.vcxproj b/src/tests/mfc/vldmfc.vcxproj index 1b1cd8ff..9081bb9c 100644 --- a/src/tests/mfc/vldmfc.vcxproj +++ b/src/tests/mfc/vldmfc.vcxproj @@ -37,6 +37,7 @@ {A231973E-072A-428E-982E-5363ADD1CDE2} MFCProj + 8.1 @@ -125,26 +126,10 @@ <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false false false false - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ true true true @@ -174,6 +159,14 @@ + + + + + + + + NDEBUG;%(PreprocessorDefinitions) @@ -187,7 +180,6 @@ MaxSpeed OnlyExplicitInline - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -203,7 +195,6 @@ $(OutDir)\vldmfc.exe true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) Windows false @@ -233,7 +224,6 @@ MaxSpeed OnlyExplicitInline - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded @@ -249,7 +239,6 @@ $(OutDir)\vldmfc.exe true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) Windows false @@ -278,7 +267,6 @@ MaxSpeed OnlyExplicitInline - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -294,7 +282,6 @@ $(OutDir)\vldmfc.exe true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) Windows false @@ -322,7 +309,6 @@ MaxSpeed OnlyExplicitInline - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true MultiThreaded @@ -338,7 +324,6 @@ $(OutDir)\vldmfc.exe true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) Windows false @@ -366,7 +351,6 @@ Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -385,7 +369,6 @@ $(OutDir)\vldmfc.exe true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true Windows false @@ -414,7 +397,6 @@ Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -433,7 +415,6 @@ $(OutDir)\vldmfc.exe true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true Windows false @@ -461,7 +442,6 @@ Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -479,7 +459,6 @@ $(OutDir)\vldmfc.exe true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true Windows false @@ -506,7 +485,6 @@ Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -524,7 +502,6 @@ $(OutDir)\vldmfc.exe true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true Windows false diff --git a/src/tests/mfc_dll/mfc.vcxproj b/src/tests/mfc_dll/mfc.vcxproj index 1b68b0cc..9f4fa84b 100644 --- a/src/tests/mfc_dll/mfc.vcxproj +++ b/src/tests/mfc_dll/mfc.vcxproj @@ -55,6 +55,7 @@ mfc MFCDLLProj test_mfc + 8.1 @@ -199,63 +200,39 @@ true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ true - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ true - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ false - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ diff --git a/src/tests/suite/testsuite.vcxproj b/src/tests/suite/testsuite.vcxproj index e4e5dcfe..489bea6f 100644 --- a/src/tests/suite/testsuite.vcxproj +++ b/src/tests/suite/testsuite.vcxproj @@ -61,6 +61,7 @@ + 8.1 @@ -177,30 +178,6 @@ <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ MinimumRecommendedRules.ruleset MinimumRecommendedRules.ruleset @@ -238,10 +215,17 @@ + + + + + + + + Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -251,7 +235,6 @@ false - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true @@ -262,7 +245,6 @@ Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -272,7 +254,6 @@ false - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true @@ -283,14 +264,12 @@ Full - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) MultiThreadedDLL true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true true true @@ -303,14 +282,12 @@ Full - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) MultiThreaded true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true true true @@ -323,7 +300,6 @@ Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -333,7 +309,6 @@ true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true @@ -344,7 +319,6 @@ Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN32;%(PreprocessorDefinitions) true EnableFastChecks @@ -354,7 +328,6 @@ true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true @@ -368,7 +341,6 @@ Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN64;%(PreprocessorDefinitions) true EnableFastChecks @@ -378,7 +350,6 @@ false - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true MachineX64 @@ -394,7 +365,6 @@ Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN64;%(PreprocessorDefinitions) true EnableFastChecks @@ -404,7 +374,6 @@ false - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true MachineX64 @@ -420,14 +389,12 @@ Full - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) MultiThreadedDLL true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true true MachineX64 @@ -444,14 +411,12 @@ Full - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) MultiThreaded true true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true true MachineX64 @@ -468,7 +433,6 @@ Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN64;%(PreprocessorDefinitions) true EnableFastChecks @@ -478,7 +442,6 @@ true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true MachineX64 true @@ -494,7 +457,6 @@ Disabled - $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) WIN64;%(PreprocessorDefinitions) true EnableFastChecks @@ -504,7 +466,6 @@ true - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) true MachineX64 true diff --git a/vld_vs14.sln b/vld_vs14.sln index 105c6b21..d124118a 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -42,6 +42,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 @@ -285,6 +287,7 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal From d2bacae231efa8c1947e1bca78c61829120fa0c1 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 31 Jul 2015 01:41:11 +0300 Subject: [PATCH 189/321] Realloc leak reporting fixed when vld disabled --- src/dllspatches.cpp | 32 ++++++++++++++++---------------- src/vld.cpp | 6 ++++-- src/vld_hooks.cpp | 38 +++++++++++++++++++------------------- 3 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/dllspatches.cpp b/src/dllspatches.cpp index a9fc6760..8f66ab9f 100644 --- a/src/dllspatches.cpp +++ b/src/dllspatches.cpp @@ -815,22 +815,22 @@ moduleentry_t VisualLeakDetector::m_patchTable [] = { // CRT new operators and heap APIs. "msvcrt.dll", FALSE, 0x0, msvcrtPatch, "msvcrtd.dll", FALSE, 0x0, msvcrtdPatch, - "msvcr70.dll", TRUE, 0x0, msvcr70Patch, - "msvcr70d.dll", TRUE, 0x0, msvcr70dPatch, - "msvcr71.dll", TRUE, 0x0, msvcr71Patch, - "msvcr71d.dll", TRUE, 0x0, msvcr71dPatch, - "msvcr80.dll", TRUE, 0x0, msvcr80Patch, - "msvcr80d.dll", TRUE, 0x0, msvcr80dPatch, - "msvcr90.dll", TRUE, 0x0, msvcr90Patch, - "msvcr90d.dll", TRUE, 0x0, msvcr90dPatch, - "msvcr100.dll", TRUE, 0x0, msvcr100Patch, - "msvcr100d.dll",TRUE, 0x0, msvcr100dPatch, - "msvcr110.dll", TRUE, 0x0, msvcr110Patch, - "msvcr110d.dll",TRUE, 0x0, msvcr110dPatch, - "msvcr120.dll", TRUE, 0x0, msvcr120Patch, - "msvcr120d.dll",TRUE, 0x0, msvcr120dPatch, - "ucrtbase.dll", TRUE, 0x0, ucrtbasePatch, - "ucrtbased.dll",TRUE, 0x0, ucrtbasedPatch, + "msvcr70.dll", FALSE, 0x0, msvcr70Patch, + "msvcr70d.dll", FALSE, 0x0, msvcr70dPatch, + "msvcr71.dll", FALSE, 0x0, msvcr71Patch, + "msvcr71d.dll", FALSE, 0x0, msvcr71dPatch, + "msvcr80.dll", FALSE, 0x0, msvcr80Patch, + "msvcr80d.dll", FALSE, 0x0, msvcr80dPatch, + "msvcr90.dll", FALSE, 0x0, msvcr90Patch, + "msvcr90d.dll", FALSE, 0x0, msvcr90dPatch, + "msvcr100.dll", FALSE, 0x0, msvcr100Patch, + "msvcr100d.dll",FALSE, 0x0, msvcr100dPatch, + "msvcr110.dll", FALSE, 0x0, msvcr110Patch, + "msvcr110d.dll",FALSE, 0x0, msvcr110dPatch, + "msvcr120.dll", FALSE, 0x0, msvcr120Patch, + "msvcr120d.dll",FALSE, 0x0, msvcr120dPatch, + "ucrtbase.dll", FALSE, 0x0, ucrtbasePatch, + "ucrtbased.dll",FALSE, 0x0, ucrtbasedPatch, // NT APIs. "ntdll.dll", FALSE, 0x0, m_ntdllPatch, diff --git a/src/vld.cpp b/src/vld.cpp index e40a0aa8..e7b31905 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -597,7 +597,8 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) if (!FindImport(modulelocal, m_vldBase, VLDDLL, "?g_vld@@3VVisualLeakDetector@@A")) { - // mfc and crt dll's shouldn't be excluded + // mfc dll's shouldn't be excluded, to have matched number of leaks + // from the statically linked MFC and dynamically bool patchKnownModule = false; LPSTR modulenamea; ConvertModulePathToAscii(modulename, &modulenamea); @@ -605,7 +606,8 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) for (UINT index = 0; index < _countof(m_patchTable); index++) { moduleentry_t *entry = &m_patchTable[index]; if (_stricmp(entry->exportModuleName, modulenamea) == 0) { - patchKnownModule = entry->reportLeaks != 0; + if (entry->reportLeaks != 0) + patchKnownModule = true; break; } } diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 45b3df16..1298d191 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -385,7 +385,7 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t // // Returns the value returned from the specified _aligned_offset_malloc. // -void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, bool debugRuntime, +void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset) { tls_t *tls = g_vld.getTls(); @@ -657,8 +657,8 @@ void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_ return block; } -// __aligned_offset_malloc_dbg - This function is just a wrapper around the real -// _aligned_offset_malloc_dbg that sets appropriate flags to be consulted when +// __aligned_offset_malloc_dbg - This function is just a wrapper around the real +// _aligned_offset_malloc_dbg that sets appropriate flags to be consulted when // the memory is actually allocated by RtlAllocateHeap. // // - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to @@ -770,7 +770,7 @@ void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_reall } // _aligned_offset_realloc_debug - This function is just a wrapper around the real -// _aligned_offset_realloc_dbg that sets appropriate flags to be consulted when +// _aligned_offset_realloc_dbg that sets appropriate flags to be consulted when // the memory is actually allocated by RtlAllocateHeap. // // - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation @@ -888,7 +888,7 @@ void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_rec } // _aligned_offset_recalloc_debug - This function is just a wrapper around the real -// _aligned_offset_recalloc_dbg that sets appropriate flags to be consulted when +// _aligned_offset_recalloc_dbg that sets appropriate flags to be consulted when // the memory is actually allocated by RtlAllocateHeap. // // - p_recalloc_dbg (IN): Pointer to the particular __recalloc_dbg implementation @@ -1065,12 +1065,12 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, return block; } -char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, - context_t& context, - bool debugRuntime, - const char* src, - int type, - char const *file, +char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, + context_t& context, + bool debugRuntime, + const char* src, + int type, + char const *file, int line) { tls_t *tls = g_vld.getTls(); @@ -1096,12 +1096,12 @@ char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, return block; } -wchar_t* VisualLeakDetector::__wcsdup_dbg (_wcsdup_dbg_t p_wcsdup_dbg, - context_t& context, - bool debugRuntime, - const wchar_t* src, - int type, - char const *file, +wchar_t* VisualLeakDetector::__wcsdup_dbg (_wcsdup_dbg_t p_wcsdup_dbg, + context_t& context, + bool debugRuntime, + const wchar_t* src, + int type, + char const *file, int line) { tls_t *tls = g_vld.getTls(); @@ -1732,7 +1732,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID // Reallocate the block. newmem = RtlReAllocateHeap(heap, flags, mem, size); - if (newmem == NULL) + if ((newmem == NULL) || !g_vld.enabled()) return newmem; tls_t *tls = g_vld.getTls(); @@ -1775,7 +1775,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S // Reallocate the block. newmem = HeapReAlloc(heap, flags, mem, size); - if (newmem == NULL) + if ((newmem == NULL) || !g_vld.enabled()) return newmem; tls_t *tls = g_vld.getTls(); From cc8753fc57c0968a2cfc89c04d42e4eb6c05ebe0 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 1 Aug 2015 01:32:19 +0300 Subject: [PATCH 190/321] runtests.bat added --- src/runtests.bat | 13 +++++ vld_vs14.sln | 148 +++++++++++++++++++++++------------------------ 2 files changed, 87 insertions(+), 74 deletions(-) create mode 100644 src/runtests.bat diff --git a/src/runtests.bat b/src/runtests.bat new file mode 100644 index 00000000..14a20f40 --- /dev/null +++ b/src/runtests.bat @@ -0,0 +1,13 @@ +rem @echo off +setlocal enabledelayedexpansion +set tests_path=%~dp0\bin\%1\%~2 +echo %tests_path% +if not exist !tests_path!\ goto nodir +!tests_path!\test_basics.exe --gtest_output="xml:!tests_path!\test_basics.exe.xml" +!tests_path!\dynamic_app.exe --gtest_output="xml:!tests_path!\dynamic_app.exe.xml" +!tests_path!\testsuite.exe --gtest_output="xml:!tests_path!\testsuite.exe.xml" +exit /b 0 +:nodir + +echo No test dir "!tests_path!\" +exit /b 1 \ No newline at end of file diff --git a/vld_vs14.sln b/vld_vs14.sln index d124118a..df56c260 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -46,20 +46,28 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 + Debug(Release)_StaticCrt|x64 = Debug(Release)_StaticCrt|x64 + Debug(Release)|Win32 = Debug(Release)|Win32 + Debug(Release)|x64 = Debug(Release)|x64 Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 Debug_StaticCrt|x64 = Debug_StaticCrt|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - DebugRelease_StaticCrt|Win32 = DebugRelease_StaticCrt|Win32 - DebugRelease_StaticCrt|x64 = DebugRelease_StaticCrt|x64 - DebugRelease|Win32 = DebugRelease|Win32 - DebugRelease|x64 = DebugRelease|x64 Release_StaticCrt|Win32 = Release_StaticCrt|Win32 Release_StaticCrt|x64 = Release_StaticCrt|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 @@ -68,14 +76,6 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 @@ -84,6 +84,14 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -92,14 +100,6 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -108,6 +108,14 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -116,14 +124,6 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -132,6 +132,14 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -140,14 +148,6 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -156,6 +156,14 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -164,14 +172,6 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -180,6 +180,14 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -188,14 +196,6 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -204,6 +204,14 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -212,14 +220,6 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -228,6 +228,12 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.Build.0 = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -236,12 +242,6 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.ActiveCfg = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.ActiveCfg = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.Build.0 = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -250,6 +250,14 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.Build.0 = Debug|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -258,14 +266,6 @@ Global {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.DebugRelease|x64.Build.0 = Debug|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 From b930d622b05c9916ad794074941bf776baeeed3a Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 2 Aug 2015 23:56:00 +0300 Subject: [PATCH 191/321] Improved PatchImport code --- lib/gtest/msvc/gtest.vcxproj | 17 ++-- src/tests/Common.props | 1 + src/tests/basics/Allocs.cpp | 24 +++--- src/tests/basics/LeakOption.h | 2 +- src/tests/basics/basics.vcxproj | 7 ++ src/tests/corruption/corruption.vcxproj | 6 ++ src/tests/dynamic_app/dynamic_app.vcxproj | 6 ++ src/tests/suite/testsuite.vcxproj | 7 ++ src/utility.cpp | 100 +++++++++++++++------- src/vld.cpp | 53 ++++++------ src/vld.vcxproj | 1 + 11 files changed, 147 insertions(+), 77 deletions(-) diff --git a/lib/gtest/msvc/gtest.vcxproj b/lib/gtest/msvc/gtest.vcxproj index 082bbc76..625c099c 100644 --- a/lib/gtest/msvc/gtest.vcxproj +++ b/lib/gtest/msvc/gtest.vcxproj @@ -38,6 +38,7 @@ {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} Win32Proj libgtest + 8.1 @@ -146,7 +147,7 @@ Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -161,7 +162,7 @@ Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -177,7 +178,7 @@ Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -192,7 +193,7 @@ Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -206,7 +207,7 @@ - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -218,7 +219,7 @@ - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded @@ -231,7 +232,7 @@ - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL @@ -244,7 +245,7 @@ - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded diff --git a/src/tests/Common.props b/src/tests/Common.props index 9bbbe1fe..b1e83578 100644 --- a/src/tests/Common.props +++ b/src/tests/Common.props @@ -28,6 +28,7 @@ $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) + _VARIADIC_MAX=10;%(PreprocessorDefinitions) $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) diff --git a/src/tests/basics/Allocs.cpp b/src/tests/basics/Allocs.cpp index f2aae931..65bb09db 100644 --- a/src/tests/basics/Allocs.cpp +++ b/src/tests/basics/Allocs.cpp @@ -179,10 +179,21 @@ static void alloc(LeakOption type, bool bFree) leaked_memory = (int*)HeapAlloc(heap, 0x0, 15); if (bFree) { - HeapFree(leaked_memory, 0, NULL); + HeapFree(heap, 0, leaked_memory); HeapDestroy(heap); } } + else if (type == eIMalloc) + { + IMalloc *imalloc = NULL; + HRESULT hr = CoGetMalloc(1, &imalloc); + assert(SUCCEEDED(hr)); + leaked_memory = (int*)imalloc->Alloc(34); + if (bFree) + { + imalloc->Free(leaked_memory); + } + } else if (type == eGetProcMalloc) { malloc_t pmalloc = NULL; @@ -199,17 +210,6 @@ static void alloc(LeakOption type, bool bFree) FreeLibrary(crt); } } - else if (type == eIMalloc) - { - IMalloc *imalloc = NULL; - HRESULT hr = CoGetMalloc(1, &imalloc); - assert(SUCCEEDED(hr)); - leaked_memory = (int*)imalloc->Alloc(34); - if (bFree) - { - imalloc->Free(leaked_memory); - } - } } }; diff --git a/src/tests/basics/LeakOption.h b/src/tests/basics/LeakOption.h index 788fdf61..caef110d 100644 --- a/src/tests/basics/LeakOption.h +++ b/src/tests/basics/LeakOption.h @@ -13,8 +13,8 @@ enum LeakOption eAlignedRealloc, // "_aligned_realloc" eStrdup, // "strdup" eHeapAlloc, - eGetProcMalloc, eIMalloc, + eGetProcMalloc, eCount, }; diff --git a/src/tests/basics/basics.vcxproj b/src/tests/basics/basics.vcxproj index 9b1bb1cb..b26b0b20 100644 --- a/src/tests/basics/basics.vcxproj +++ b/src/tests/basics/basics.vcxproj @@ -493,6 +493,13 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + false + true + diff --git a/src/tests/corruption/corruption.vcxproj b/src/tests/corruption/corruption.vcxproj index af16ead7..08705e05 100644 --- a/src/tests/corruption/corruption.vcxproj +++ b/src/tests/corruption/corruption.vcxproj @@ -319,6 +319,12 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + false + diff --git a/src/tests/dynamic_app/dynamic_app.vcxproj b/src/tests/dynamic_app/dynamic_app.vcxproj index 2651f487..51c973fa 100644 --- a/src/tests/dynamic_app/dynamic_app.vcxproj +++ b/src/tests/dynamic_app/dynamic_app.vcxproj @@ -472,6 +472,12 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + false + {3aea2aaf-3e9b-466f-b361-560b95ad88b4} false diff --git a/src/tests/suite/testsuite.vcxproj b/src/tests/suite/testsuite.vcxproj index 489bea6f..a6a2c09e 100644 --- a/src/tests/suite/testsuite.vcxproj +++ b/src/tests/suite/testsuite.vcxproj @@ -482,6 +482,13 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + true + false + diff --git a/src/utility.cpp b/src/utility.cpp index eebeb598..04474def 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -184,10 +184,10 @@ VOID DumpMemoryW (LPCVOID address, SIZE_T size) } // FilterFunction - Used in structured exception handling -DWORD FilterFunction(long) -{ +DWORD FilterFunction(long) +{ return EXCEPTION_CONTINUE_SEARCH; -} +} // FindOriginalImportDescriptor - Determines if the specified module imports the named import // from the named exporting module. @@ -274,7 +274,7 @@ BOOL FindImport (HMODULE importmodule, HMODULE exportmodule, LPCSTR exportmodule idte = FindOriginalImportDescriptor(importmodule, exportmodulename); if (idte == NULL) return FALSE; - + // Get the *real* address of the import. If we find this address in the IAT, // then we've found that the module does import the named import. import = GetProcAddress(exportmodule, importname); @@ -425,6 +425,36 @@ BOOL IsModulePatched (HMODULE importmodule, moduleentry_t patchtable [], UINT ta return FALSE; } +LPVOID FindRealCode(LPVOID pCode) +{ + LPVOID result = pCode; + if (pCode != NULL) + { + if (*(WORD *)pCode == 0x25ff) // jmp + { + DWORD addr = *((DWORD *)((ULONG_PTR)pCode + 2)); +#ifdef _WIN64 + // RIP relative addressing + PBYTE pNextInst = (PBYTE)((ULONG_PTR)pCode + 6); + pCode = *(LPVOID*)(pNextInst + addr); + return pCode; +#else + pCode = *(LPVOID*)(addr); + return FindRealCode(pCode); +#endif + } + if (*(BYTE *)pCode == 0xE9) + { + // Relative next instruction + PBYTE pNextInst = (PBYTE)((ULONG_PTR)pCode + 5); + LONG offset = *((LONG *)((ULONG_PTR)pCode + 1)); + pCode = (LPVOID*)(pNextInst + offset); + return FindRealCode(pCode); + } + } + return result; +} + // PatchImport - Patches all future calls to an imported function, or references // to an imported variable, through to a replacement function or variable. // Patching is done by replacing the import's address in the specified target @@ -487,8 +517,8 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) int result = 0; while (idte->FirstThunk != 0x0) { - PCHAR name = (PCHAR)R2VA(importmodule, idte->Name); - UNREFERENCED_PARAMETER(name); + PCHAR importdllname = (PCHAR)R2VA(importmodule, idte->Name); + UNREFERENCED_PARAMETER(importdllname); patchentry_t *entry = module->patchTable; int i = 0; @@ -499,8 +529,8 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) // Get the *real* address of the import. If we find this address in the IAT, // then we've found the entry that needs to be patched. - FARPROC import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); - FARPROC import = GetProcAddress(exportmodule, importname); + LPVOID import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); + LPVOID import = GetProcAddress(exportmodule, importname); if ( import2 ) import = import2; @@ -511,32 +541,42 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) } // Locate the import's IAT entry. - IMAGE_THUNK_DATA *iate = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); - while (iate->u1.Function != 0x0) + IMAGE_THUNK_DATA *thunk = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->FirstThunk); + IMAGE_THUNK_DATA *origThunk = (IMAGE_THUNK_DATA*)R2VA(importmodule, idte->OriginalFirstThunk); + for (; origThunk->u1.Function != NULL; + origThunk++, thunk++) { - if (iate->u1.Function != (DWORD_PTR)import) + if (origThunk->u1.Ordinal & IMAGE_ORDINAL_FLAG) { - iate++; + // Ordinal import - we can handle named imports + // only, so skip it. continue; } - // Found the IAT entry. Overwrite the address stored in the IAT - // entry with the address of the replacement. Note that the IAT - // entry may be write-protected, so we must first ensure that it is - // writable. - if ( import != replacement ) + LPVOID func = FindRealCode((LPVOID)thunk->u1.Function); + //PIMAGE_IMPORT_BY_NAME funcEntry = (PIMAGE_IMPORT_BY_NAME) + // R2VA(importmodule, origThunk->u1.AddressOfData); + if (((DWORD_PTR)func == (DWORD_PTR)import) /*|| + (0 == strcmp(static_cast(funcEntry->Name), importname))*/) { - if (entry->original != NULL) - *entry->original = (LPVOID)iate->u1.Function; - - DWORD protect; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)replacement; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + // Found the IAT entry. Overwrite the address stored in the IAT + // entry with the address of the replacement. Note that the IAT + // entry may be write-protected, so we must first ensure that it is + // writable. + if (import != replacement) + { + if (entry->original != NULL) + *entry->original = func; + + DWORD protect; + VirtualProtect(&thunk->u1.Function, sizeof(thunk->u1.Function), PAGE_EXECUTE_READWRITE, &protect); + thunk->u1.Function = (DWORD_PTR)replacement; + VirtualProtect(&thunk->u1.Function, sizeof(thunk->u1.Function), protect, &protect); + } + // The patch has been installed in the import module. + result++; + break; } - // The patch has been installed in the import module. - result++; - iate++; } entry++; i++; } @@ -887,7 +927,7 @@ VOID SetReportFile (FILE *file, BOOL copydebugger, BOOL tostdout) // // Return Value: // -// The new concatenated string. +// The new concatenated string. // LPWSTR AppendString (LPWSTR dest, LPCWSTR source) { @@ -1032,7 +1072,7 @@ static const DWORD crctab[256] = { }; DWORD CalculateCRC32(UINT_PTR p, UINT startValue) -{ +{ register DWORD hash = startValue; hash = (hash >> 8) ^ crctab[(hash & 0xff) ^ ((p >> 0) & 0xff)]; hash = (hash >> 8) ^ crctab[(hash & 0xff) ^ ((p >> 8) & 0xff)]; @@ -1080,7 +1120,7 @@ HMODULE GetCallingModule( UINT_PTR pCaller ) MEMORY_BASIC_INFORMATION mbi; if ( VirtualQuery((LPCVOID)pCaller, &mbi, sizeof(MEMORY_BASIC_INFORMATION)) == sizeof(MEMORY_BASIC_INFORMATION) ) { - // the allocation base is the beginning of a PE file + // the allocation base is the beginning of a PE file hModule = (HMODULE) mbi.AllocationBase; } return hModule; diff --git a/src/vld.cpp b/src/vld.cpp index e7b31905..900a9533 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -67,30 +67,31 @@ moduleentry_t ntdllPatch [] = { "ntdll.dll", FALSE, NULL, ldrLoadDllPatch, }; -BOOL IsWin7OrBetter() +bool IsWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor) { - OSVERSIONINFOEX info = { sizeof(OSVERSIONINFOEX) }; - GetVersionEx((LPOSVERSIONINFO)&info); - if (info.dwMajorVersion > 6) - return TRUE; - - if (info.dwMajorVersion == 6 && info.dwMinorVersion >= 1) - return TRUE; - - return FALSE; + OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0,{ 0 }, 0, 0 }; + DWORDLONG const dwlConditionMask = VerSetConditionMask( + VerSetConditionMask( + VerSetConditionMask( + 0, VER_MAJORVERSION, VER_GREATER_EQUAL), + VER_MINORVERSION, VER_GREATER_EQUAL), + VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL); + + osvi.dwMajorVersion = wMajorVersion; + osvi.dwMinorVersion = wMinorVersion; + osvi.wServicePackMajor = wServicePackMajor; + + return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE; } -BOOL IsWin8OrBetter() +bool IsWindows7OrGreater() { - OSVERSIONINFOEX info = { sizeof(OSVERSIONINFOEX) }; - GetVersionEx((LPOSVERSIONINFO)&info); - if (info.dwMajorVersion > 6) - return TRUE; - - if (info.dwMajorVersion == 6 && info.dwMinorVersion >= 2) - return TRUE; + return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 0); +} - return FALSE; +bool IsWindows8OrGreater() +{ + return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0); } // Constructor - Initializes private data, loads configuration options, and @@ -120,17 +121,17 @@ VisualLeakDetector::VisualLeakDetector () HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); HMODULE kernelBase = GetModuleHandleW(L"KernelBase.dll"); - if (!IsWin7OrBetter()) // kernel32.dll + if (!IsWindows7OrGreater()) // kernel32.dll { if (kernel32) - m_GetProcAddress = (GetProcAddress_t) GetProcAddress(kernel32,"GetProcAddress"); + m_GetProcAddress = (GetProcAddress_t) GetProcAddress(kernel32, "GetProcAddress"); } else { + if (kernelBase) + m_GetProcAddress = (GetProcAddress_t)GetProcAddress(kernelBase, "GetProcAddress"); assert(m_patchTable[0].patchTable == m_kernelbasePatch); m_patchTable[0].exportModuleName = "kernelbase.dll"; - if (kernelBase) - m_GetProcAddress = (GetProcAddress_t) GetProcAddress(kernelBase,"GetProcAddress"); } // Initialize global variables. @@ -141,14 +142,14 @@ VisualLeakDetector::VisualLeakDetector () HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); if (ntdll) { - if (!IsWin8OrBetter()) + if (!IsWindows8OrGreater()) { LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); } else { LdrLoadDllWin8 = (LdrLoadDllWin8_t)GetProcAddress(ntdll, "LdrLoadDll"); - ldrLoadDllPatch[0].replacement = VisualLeakDetector::_LdrLoadDllWin8; + ldrLoadDllPatch[0].replacement = _LdrLoadDllWin8; } RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); @@ -1832,7 +1833,7 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) return g_vld._RGetProcAddress(module, procname); } -FARPROC VisualLeakDetector::_RGetProcAddress (HMODULE module, LPCSTR procname) +FARPROC VisualLeakDetector::_RGetProcAddress(HMODULE module, LPCSTR procname) { return m_GetProcAddress(module, procname); } diff --git a/src/vld.vcxproj b/src/vld.vcxproj index 7c15f523..7f22cb88 100644 --- a/src/vld.vcxproj +++ b/src/vld.vcxproj @@ -34,6 +34,7 @@ true x86 x64 + 8.1 From 9ddb222c523672e586df40e732a207209acfee76 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Mon, 3 Aug 2015 01:30:33 +0300 Subject: [PATCH 192/321] Debug define PRINTHOOKINFO added --- src/dllspatches.cpp | 20 +++++++++++--------- src/utility.cpp | 19 +++++++++++++++++-- src/vld_hooks.cpp | 4 ++-- src/vldint.h | 2 ++ 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/dllspatches.cpp b/src/dllspatches.cpp index 8f66ab9f..328e3a33 100644 --- a/src/dllspatches.cpp +++ b/src/dllspatches.cpp @@ -56,16 +56,17 @@ const char vector_new_name[] = "??_U@YAPEAX_K@Z"; // through to replacement functions provided by VLD. Having this table simply // makes it more convenient to add additional IAT patches. patchentry_t VisualLeakDetector::m_kernelbasePatch [] = { - "GetProcAddress", NULL, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. + "GetProcAddress", NULL, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. "GetProcessHeap", (LPVOID*)&m_GetProcessHeap, _GetProcessHeap, NULL, NULL, NULL }; patchentry_t VisualLeakDetector::m_kernel32Patch [] = { + "GetProcAddress", NULL, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. "HeapAlloc", NULL, _HeapAlloc, "HeapCreate", (LPVOID*)&m_HeapCreate, _HeapCreate, "HeapDestroy", NULL, _HeapDestroy, - "HeapFree", NULL, _HeapFree, + "HeapFree", (LPVOID*)&m_HeapFree, _HeapFree, "HeapReAlloc", NULL, _HeapReAlloc, NULL, NULL, NULL }; @@ -80,6 +81,7 @@ patchentry_t VisualLeakDetector::m_kernel32Patch [] = { GetProcAddress_t VisualLeakDetector::m_GetProcAddress = NULL; GetProcessHeap_t VisualLeakDetector::m_GetProcessHeap = NULL; HeapCreate_t VisualLeakDetector::m_HeapCreate = NULL; +HeapFree_t VisualLeakDetector::m_HeapFree = NULL; static patchentry_t mfc42Patch [] = { // XXX why are the vector new operators missing for mfc42.dll? @@ -756,22 +758,22 @@ static patchentry_t ucrtbasedPatch[] = { }; patchentry_t VisualLeakDetector::m_ntdllPatch [] = { - "RtlAllocateHeap", NULL, VisualLeakDetector::_RtlAllocateHeap, - "RtlFreeHeap", NULL, VisualLeakDetector::_RtlFreeHeap, - "RtlReAllocateHeap", NULL, VisualLeakDetector::_RtlReAllocateHeap, + "RtlAllocateHeap", NULL, _RtlAllocateHeap, + "RtlFreeHeap", NULL, _RtlFreeHeap, + "RtlReAllocateHeap", NULL, _RtlReAllocateHeap, NULL, NULL, NULL }; patchentry_t VisualLeakDetector::m_ole32Patch [] = { - "CoGetMalloc", NULL, VisualLeakDetector::_CoGetMalloc, - "CoTaskMemAlloc", NULL, VisualLeakDetector::_CoTaskMemAlloc, - "CoTaskMemRealloc", NULL, VisualLeakDetector::_CoTaskMemRealloc, + "CoGetMalloc", NULL, _CoGetMalloc, + "CoTaskMemAlloc", NULL, _CoTaskMemAlloc, + "CoTaskMemRealloc", NULL, _CoTaskMemRealloc, NULL, NULL, NULL }; moduleentry_t VisualLeakDetector::m_patchTable [] = { // Win32 heap APIs. - "kernel32.dll", FALSE, 0x0, m_kernelbasePatch, // we patch this record on Win7 + "kernel32.dll", FALSE, 0x0, m_kernelbasePatch, // we patch this record on Win7 and higher "kernel32.dll", FALSE, 0x0, m_kernel32Patch, // MFC new operators (exported by ordinal). diff --git a/src/utility.cpp b/src/utility.cpp index 04474def..c0dd3ca0 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -28,6 +28,8 @@ #include "vldint.h" #include +//#define PRINTHOOKINFO + // Imported Global Variables extern CriticalSection g_imageLock; extern ReportHookSet* g_pReportHooks; @@ -554,8 +556,6 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) } LPVOID func = FindRealCode((LPVOID)thunk->u1.Function); - //PIMAGE_IMPORT_BY_NAME funcEntry = (PIMAGE_IMPORT_BY_NAME) - // R2VA(importmodule, origThunk->u1.AddressOfData); if (((DWORD_PTR)func == (DWORD_PTR)import) /*|| (0 == strcmp(static_cast(funcEntry->Name), importname))*/) { @@ -565,6 +565,10 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) // writable. if (import != replacement) { +#ifdef PRINTHOOKINFO + DbgReport(L"Hook func by address. Patch dll %S. Found dll %S. Function %S.\n", + module->exportModuleName, importdllname, importname); +#endif if (entry->original != NULL) *entry->original = func; @@ -577,6 +581,17 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) result++; break; } +#ifdef PRINTHOOKINFO + PIMAGE_IMPORT_BY_NAME funcEntry = (PIMAGE_IMPORT_BY_NAME) + R2VA(importmodule, origThunk->u1.AddressOfData); + if (stricmp(importdllname, module->exportModuleName) == 0 && + strcmp(static_cast(funcEntry->Name), importname) == 0) + { + DbgReport(L"Hook func by name. Patch dll %S. Found dll %S. Function %S.\n", + module->exportModuleName, importdllname, importname); + break; + } +#endif } entry++; i++; } diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 1298d191..b54ba147 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -1695,13 +1695,13 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) { context_t context; // Record the current frame pointer. - CAPTURE_CONTEXT(context, HeapFree); + CAPTURE_CONTEXT(context, m_HeapFree); // Unmap the block from the specified heap. g_vld.unmapBlock(heap, mem, context); } - status = HeapFree(heap, flags, mem); + status = m_HeapFree(heap, flags, mem); return status; } diff --git a/src/vldint.h b/src/vldint.h index b7b22a80..7dede846 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -64,6 +64,7 @@ extern "C" __declspec(dllexport) void VLDRestore (); // the import patch table. typedef HANDLE(__stdcall *GetProcessHeap_t) (); typedef HANDLE(__stdcall *HeapCreate_t) (DWORD, SIZE_T, SIZE_T); +typedef BOOL(__stdcall *HeapFree_t) (HANDLE, DWORD, LPVOID); typedef FARPROC(__stdcall *GetProcAddress_t) (HMODULE, LPCSTR); typedef void* (__cdecl *_calloc_dbg_t) (size_t, size_t, int, const char*, int); @@ -399,6 +400,7 @@ class VisualLeakDetector : public IMalloc static GetProcAddress_t m_GetProcAddress; static GetProcessHeap_t m_GetProcessHeap; static HeapCreate_t m_HeapCreate; + static HeapFree_t m_HeapFree; }; From 478255a6ac644cff56c7ed43ef89ebeabe53f83c Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Mon, 3 Aug 2015 01:30:49 +0300 Subject: [PATCH 193/321] GetProcessHeap() simplified --- src/vld_hooks.cpp | 74 ++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 42 deletions(-) diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index b54ba147..accb4c38 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -1395,56 +1395,46 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, // HANDLE VisualLeakDetector::_GetProcessHeap() { - // Get the return address within the calling function. - UINT_PTR ra = (UINT_PTR) _ReturnAddress(); - // Get the process heap. HANDLE heap = m_GetProcessHeap(); - // Try to get the name of the function containing the return address. - BYTE symbolbuffer[sizeof(SYMBOL_INFO) +MAX_SYMBOL_NAME_SIZE] = { 0 }; - SYMBOL_INFO *functioninfo = (SYMBOL_INFO*) &symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; + CriticalSectionLocker cs(g_vld.m_heapMapLock); + HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); + if (heapit == g_vld.m_heapMap->end()) + { + g_vld.mapHeap(heap); + heapit = g_vld.m_heapMap->find(heap); + } - g_symbolLock.Enter(); - DWORD64 displacement; - DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); - VLDDisable(); - BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); - VLDRestore(); - g_symbolLock.Leave(); - if (symfound == TRUE) { - if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { - // GetProcessHeap was called by _heap_init (VS2012 and upper). This is a static CRT heap (msvcr*.dll). - CriticalSectionLocker cs(g_vld.m_heapMapLock); - HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); - if (heapit == g_vld.m_heapMap->end()) - { - g_vld.mapHeap(heap); - heapit = g_vld.m_heapMap->find(heap); - } - HMODULE hCallingModule = (HMODULE) functioninfo->ModBase; - if (hCallingModule) + // GetProcessHeap was called by _heap_init (VS2012 and VS2013) or __acrt_initialize_heap (VS2015 and upper). + // This is a static CRT heap (msvcr*.dll and ucrtbase*.dll). + if ((*heapit).second->flags == 0) + { + // Get the return address within the calling function. + UINT_PTR ra = (UINT_PTR)_ReturnAddress(); + + HMODULE hCallingModule = NULL; + if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + (LPCTSTR)ra, &hCallingModule)) + { + HMODULE hCurrentModule = GetModuleHandleW(NULL); + UINT32 flags = VLD_HEAP_CRT_UNKNOWN; + if (hCallingModule != hCurrentModule) { - HMODULE hCurrentModule = GetModuleHandleW(NULL); - if (hCallingModule != hCurrentModule) - { - // CRT dynamic linking - WCHAR callingmodulename[MAX_PATH] = L""; - if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) - { - _wcslwr_s(callingmodulename); - if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime - (*heapit).second->flags = VLD_HEAP_CRT_DBG; - } - } - else + // CRT dynamic linking + WCHAR callingmodulename[MAX_PATH] = L""; + if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) { - // CRT static linking - (*heapit).second->flags = VLD_HEAP_CRT_UNKNOWN; + _wcslwr_s(callingmodulename); + if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime + flags = VLD_HEAP_CRT_DBG; } } + else + { + // CRT static linking + } + (*heapit).second->flags = flags; } } From 6e9b0b85a88ae6e1625f729558c279b6f1f8cee8 Mon Sep 17 00:00:00 2001 From: dragon Date: Wed, 5 Aug 2015 02:43:15 +0300 Subject: [PATCH 194/321] TeamCity change in 'VLD' project: 'https://github.com/KindDragon/vld.git#refs/heads/master' VCS root was updated --- .teamcity/Vld/buildTypes/Vld_CompileAll.xml | 22 +++++++++++++++++++ .teamcity/Vld/pluginData/plugin-settings.xml | 5 +++++ .teamcity/Vld/project-config.xml | 7 ++++++ ...thubComKindDragonVldGitRefsHeadsMaster.xml | 16 ++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 .teamcity/Vld/buildTypes/Vld_CompileAll.xml create mode 100644 .teamcity/Vld/pluginData/plugin-settings.xml create mode 100644 .teamcity/Vld/project-config.xml create mode 100644 .teamcity/Vld/vcsRoots/Vld_HttpsGithubComKindDragonVldGitRefsHeadsMaster.xml diff --git a/.teamcity/Vld/buildTypes/Vld_CompileAll.xml b/.teamcity/Vld/buildTypes/Vld_CompileAll.xml new file mode 100644 index 00000000..164e0d6c --- /dev/null +++ b/.teamcity/Vld/buildTypes/Vld_CompileAll.xml @@ -0,0 +1,22 @@ + + + Compile All + + + + + + + + + + + + + + + + + + + diff --git a/.teamcity/Vld/pluginData/plugin-settings.xml b/.teamcity/Vld/pluginData/plugin-settings.xml new file mode 100644 index 00000000..7ab93ea0 --- /dev/null +++ b/.teamcity/Vld/pluginData/plugin-settings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.teamcity/Vld/project-config.xml b/.teamcity/Vld/project-config.xml new file mode 100644 index 00000000..8e6d17f5 --- /dev/null +++ b/.teamcity/Vld/project-config.xml @@ -0,0 +1,7 @@ + + + VLD + + + + diff --git a/.teamcity/Vld/vcsRoots/Vld_HttpsGithubComKindDragonVldGitRefsHeadsMaster.xml b/.teamcity/Vld/vcsRoots/Vld_HttpsGithubComKindDragonVldGitRefsHeadsMaster.xml new file mode 100644 index 00000000..799b8d3a --- /dev/null +++ b/.teamcity/Vld/vcsRoots/Vld_HttpsGithubComKindDragonVldGitRefsHeadsMaster.xml @@ -0,0 +1,16 @@ + + + https://github.com/KindDragon/vld.git#refs/heads/master + + + + + + + + + + + + + From 18c14737f9f2edb2fbbe2ff92aa8366541bc52b9 Mon Sep 17 00:00:00 2001 From: dragon Date: Wed, 5 Aug 2015 02:43:26 +0300 Subject: [PATCH 195/321] TeamCity change in 'VLD' project: commit current project settings --- .../Vld/buildTypes/Vld_DebugCrtDllWin32.xml | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .teamcity/Vld/buildTypes/Vld_DebugCrtDllWin32.xml diff --git a/.teamcity/Vld/buildTypes/Vld_DebugCrtDllWin32.xml b/.teamcity/Vld/buildTypes/Vld_DebugCrtDllWin32.xml new file mode 100644 index 00000000..1cfae2f5 --- /dev/null +++ b/.teamcity/Vld/buildTypes/Vld_DebugCrtDllWin32.xml @@ -0,0 +1,60 @@ + + + Debug CrtDll Win32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e4926ab43b856759206c269153690c165ada5501 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Wed, 5 Aug 2015 18:38:50 +0300 Subject: [PATCH 196/321] Corruption project fixed --- src/tests/corruption/corruption.vcxproj | 138 ++++++++++++++++++++++++ vld_vs14.sln | 14 +-- 2 files changed, 146 insertions(+), 6 deletions(-) diff --git a/src/tests/corruption/corruption.vcxproj b/src/tests/corruption/corruption.vcxproj index 08705e05..5693f09f 100644 --- a/src/tests/corruption/corruption.vcxproj +++ b/src/tests/corruption/corruption.vcxproj @@ -1,6 +1,22 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + Debug_StaticCrt Win32 @@ -47,24 +63,48 @@ Unicode v140 + + Application + true + Unicode + v140 + Application true Unicode v140 + + Application + true + Unicode + v140 + Application true Unicode v140 + + Application + true + Unicode + v140 + Application true Unicode v140 + + Application + true + Unicode + v140 + Application false @@ -100,18 +140,34 @@ + + + + + + + + + + + + + + + + @@ -132,15 +188,27 @@ true + + true + true + + true + true + + true + true + + true + false @@ -170,6 +238,23 @@ Copying over Visual Leak Detector Dependencies + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + @@ -188,6 +273,24 @@ Copying over Visual Leak Detector Dependencies + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + @@ -205,6 +308,23 @@ Copying over Visual Leak Detector Dependencies + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + @@ -223,6 +343,24 @@ Copying over Visual Leak Detector Dependencies + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + Level3 diff --git a/vld_vs14.sln b/vld_vs14.sln index df56c260..a553371f 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -228,12 +228,14 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 From 61ad4c43bb8b1f90790c53cbb0cf5fdaeb3ee051 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Wed, 5 Aug 2015 18:39:32 +0300 Subject: [PATCH 197/321] VisualLeakDetector::_HeapCreate changed to match VisualLeakDetector::_GetProcessHeap --- src/vld_hooks.cpp | 67 ++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index accb4c38..edad82bc 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -1457,55 +1457,44 @@ HANDLE VisualLeakDetector::_GetProcessHeap() // HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) { - // Get the return address within the calling function. - UINT_PTR ra = (UINT_PTR)_ReturnAddress(); - // Create the heap. HANDLE heap = m_HeapCreate(options, initsize, maxsize); // Map the created heap handle to a new block map. g_vld.mapHeap(heap); - // Try to get the name of the function containing the return address. - BYTE symbolbuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; - SYMBOL_INFO *functioninfo = (SYMBOL_INFO*)&symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; - - g_symbolLock.Enter(); - DWORD64 displacement; - DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); - VLDDisable(); - BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); - VLDRestore(); - g_symbolLock.Leave(); - if (symfound == TRUE) { - if (wcscmp(L"_heap_init", functioninfo->Name) == 0) { - // HeapCreate was called by _heap_init (VS2010 and before). This is a static CRT heap (msvcr*.dll). - CriticalSectionLocker cs(g_vld.m_heapMapLock); - HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); - assert(heapit != g_vld.m_heapMap->end()); - HMODULE hCallingModule = (HMODULE)functioninfo->ModBase; - if (hCallingModule) + CriticalSectionLocker cs(g_vld.m_heapMapLock); + HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); + assert(heapit != g_vld.m_heapMap->end()); + + // HeapCreate was called by _heap_init (VS2010 and before). This is a static CRT heap (msvcr*.dll). + if ((*heapit).second->flags == 0) + { + // Get the return address within the calling function. + UINT_PTR ra = (UINT_PTR)_ReturnAddress(); + + HMODULE hCallingModule = NULL; + if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + (LPCTSTR)ra, &hCallingModule)) + { + HMODULE hCurrentModule = GetModuleHandleW(NULL); + UINT32 flags = VLD_HEAP_CRT_UNKNOWN; + if (hCallingModule != hCurrentModule) { - HMODULE hCurrentModule = GetModuleHandleW(NULL); - if (hCallingModule != hCurrentModule) - { - // CRT dynamic linking - WCHAR callingmodulename [MAX_PATH] = L""; - if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) - { - _wcslwr_s(callingmodulename); - if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime - (*heapit).second->flags = VLD_HEAP_CRT_DBG; - } - } - else + // CRT dynamic linking + WCHAR callingmodulename[MAX_PATH] = L""; + if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) { - // CRT static linking - (*heapit).second->flags = VLD_HEAP_CRT_UNKNOWN; + _wcslwr_s(callingmodulename); + if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime + (*heapit).second->flags = VLD_HEAP_CRT_DBG; } } + else + { + // CRT static linking + } + (*heapit).second->flags = flags; } } From 5aa0ef6ac83fd8f2d6a3631ef37683f9c01eac00 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 6 Aug 2015 02:01:26 +0300 Subject: [PATCH 198/321] Support hook Win10 GetProcAddressForCaller --- src/dllspatches.cpp | 4 +- src/tests/basics/basics.cpp | 18 ++++---- src/vld.cpp | 88 +++++++++++++++++++++++++++++++++++-- src/vldheap.h | 5 ++- src/vldint.h | 8 +++- 5 files changed, 108 insertions(+), 15 deletions(-) diff --git a/src/dllspatches.cpp b/src/dllspatches.cpp index 328e3a33..f1f7f142 100644 --- a/src/dllspatches.cpp +++ b/src/dllspatches.cpp @@ -57,7 +57,8 @@ const char vector_new_name[] = "??_U@YAPEAX_K@Z"; // makes it more convenient to add additional IAT patches. patchentry_t VisualLeakDetector::m_kernelbasePatch [] = { "GetProcAddress", NULL, _GetProcAddress, // Not heap related, but can be used to obtain pointers to heap functions. - "GetProcessHeap", (LPVOID*)&m_GetProcessHeap, _GetProcessHeap, + "GetProcAddressForCaller", NULL, _GetProcAddressForCaller, // Not heap related, but can be used to obtain pointers to heap functions. + "GetProcessHeap", (LPVOID*)&m_GetProcessHeap, _GetProcessHeap, NULL, NULL, NULL }; @@ -79,6 +80,7 @@ patchentry_t VisualLeakDetector::m_kernel32Patch [] = { #endif GetProcAddress_t VisualLeakDetector::m_GetProcAddress = NULL; +GetProcAddressForCaller_t VisualLeakDetector::m_GetProcAddressForCaller = NULL; GetProcessHeap_t VisualLeakDetector::m_GetProcessHeap = NULL; HeapCreate_t VisualLeakDetector::m_HeapCreate = NULL; HeapFree_t VisualLeakDetector::m_HeapFree = NULL; diff --git a/src/tests/basics/basics.cpp b/src/tests/basics/basics.cpp index 5451ef29..f7d8112d 100644 --- a/src/tests/basics/basics.cpp +++ b/src/tests/basics/basics.cpp @@ -111,20 +111,20 @@ TEST_P(TestBasics, HeapAlloc) ASSERT_EQ(correctLeaks, leaks); } -TEST_P(TestBasics, GetProcMalloc) +TEST_P(TestBasics, IMalloc) { - int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eGetProcMalloc, repeats, GetParam()); - int total = static_cast(VLDGetLeaksCount()); - int leaks = total - prev; - int correctLeaks = GetParam() ? 0 : repeats * 1; - ASSERT_EQ(correctLeaks, leaks); + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eIMalloc, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 1; + ASSERT_EQ(correctLeaks, leaks); } -TEST_P(TestBasics, IMalloc) +TEST_P(TestBasics, GetProcMalloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eIMalloc, repeats, GetParam()); + LeakMemory(eGetProcMalloc, repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 1; diff --git a/src/vld.cpp b/src/vld.cpp index 900a9533..fbe7d1f2 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -128,8 +128,11 @@ VisualLeakDetector::VisualLeakDetector () } else { - if (kernelBase) - m_GetProcAddress = (GetProcAddress_t)GetProcAddress(kernelBase, "GetProcAddress"); + if (kernelBase) + { + m_GetProcAddress = (GetProcAddress_t)GetProcAddress(kernelBase, "GetProcAddress"); + m_GetProcAddressForCaller = (GetProcAddressForCaller_t)GetProcAddress(kernelBase, "GetProcAddressForCaller"); + } assert(m_patchTable[0].patchTable == m_kernelbasePatch); m_patchTable[0].exportModuleName = "kernelbase.dll"; } @@ -1835,7 +1838,86 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) FARPROC VisualLeakDetector::_RGetProcAddress(HMODULE module, LPCSTR procname) { - return m_GetProcAddress(module, procname); + return m_GetProcAddress(module, procname); +} + +// _GetProcAddress - Calls to GetProcAddress are patched through to this +// function. If the requested function is a function that has been patched +// through to one of VLD's handlers, then the address of VLD's handler +// function is returned instead of the real address. Otherwise, this +// function is just a wrapper around the real GetProcAddress. +// +// - module (IN): Handle (base address) of the module from which to retrieve +// the address of an exported function. +// +// - procname (IN): ANSI string containing the name of the exported function +// whose address is to be retrieved. +// +// - caller (IN) +// +// Return Value: +// +// Returns a pointer to the requested function, or VLD's replacement for +// the function, if there is a replacement function. +// +FARPROC VisualLeakDetector::_GetProcAddressForCaller(HMODULE module, LPCSTR procname, LPVOID caller) +{ + // See if there is an entry in the patch table that matches the requested + // function. + UINT tablesize = _countof(g_vld.m_patchTable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &g_vld.m_patchTable[index]; + if ((entry->moduleBase == 0x0) || ((HMODULE)entry->moduleBase != module)) { + // This patch table entry is for a different module. + continue; + } + + patchentry_t *patchentry = entry->patchTable; + while (patchentry->importName) + { + // This patch table entry is for the specified module. If the requested + // imports name matches the entry's import name (or ordinal), then + // return the address of the replacement instead of the address of the + // actual import. + if ((SIZE_T)patchentry->importName < (SIZE_T)g_vld.m_vldBase) { + // This entry's import name is not a valid pointer to data in + // vld.dll. It must be an ordinal value. + if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { + if (patchentry->original != NULL) + *patchentry->original = g_vld._RGetProcAddress(module, procname); + return (FARPROC)patchentry->replacement; + } + } + else { + __try + { + if (strcmp(patchentry->importName, procname) == 0) { + if (patchentry->original != NULL) + *patchentry->original = g_vld._RGetProcAddress(module, procname); + return (FARPROC)patchentry->replacement; + } + } + __except (FilterFunction(GetExceptionCode())) + { + if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { + if (patchentry->original != NULL) + *patchentry->original = g_vld._RGetProcAddress(module, procname); + return (FARPROC)patchentry->replacement; + } + } + } + patchentry++; + } + } + + // The requested function is not a patched function. Just return the real + // address of the requested function. + return g_vld._RGetProcAddressForCaller(module, procname, caller); +} + +FARPROC VisualLeakDetector::_RGetProcAddressForCaller(HMODULE module, LPCSTR procname, LPVOID caller) +{ + return m_GetProcAddressForCaller(module, procname, caller); } // _LdrLoadDll - Calls to LdrLoadDll are patched through to this function. This diff --git a/src/vldheap.h b/src/vldheap.h index 85bed4e3..d5fd4fb0 100644 --- a/src/vldheap.h +++ b/src/vldheap.h @@ -41,7 +41,7 @@ struct crtdbgblockheader_t { struct crtdbgblockheader_t *next; // Pointer to the next block in the list of blocks allocated from the CRT heap. struct crtdbgblockheader_t *prev; // Pointer to the previous block in the list of blocks allocated from the CRT heap. - char *file; // Source file where this block was allocated. + char const *file; // Source file where this block was allocated. int line; // Line of code, within the above file, where this block was allocated. #ifdef _WIN64 int use; // This block's "use type": see below. @@ -59,6 +59,9 @@ struct crtdbgblockheader_t unsigned char gap [GAPSIZE]; // No-man's land buffer zone, for buffer overrun/underrun checking. }; +typedef char checkDebugHeapBlockAlignment[ + (sizeof(crtdbgblockheader_t) % MEMORY_ALLOCATION_ALIGNMENT == 0) ? 1 : -1]; + // Macro to strip off any sub-type information stored in a block's "use type". #define CRT_USE_TYPE(use) (use & 0xFFFF) diff --git a/src/vldint.h b/src/vldint.h index 7dede846..acfc2806 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -66,6 +66,7 @@ typedef HANDLE(__stdcall *GetProcessHeap_t) (); typedef HANDLE(__stdcall *HeapCreate_t) (DWORD, SIZE_T, SIZE_T); typedef BOOL(__stdcall *HeapFree_t) (HANDLE, DWORD, LPVOID); typedef FARPROC(__stdcall *GetProcAddress_t) (HMODULE, LPCSTR); +typedef FARPROC(__stdcall *GetProcAddressForCaller_t) (HMODULE, LPCSTR, LPVOID); typedef void* (__cdecl *_calloc_dbg_t) (size_t, size_t, int, const char*, int); typedef void* (__cdecl *_malloc_dbg_t) (size_t, int, const char *, int); @@ -291,7 +292,9 @@ class VisualLeakDetector : public IMalloc PHANDLE modulehandle); static NTSTATUS __stdcall _LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, unicodestring_t *modulename, PHANDLE modulehandle); - static FARPROC __stdcall _RGetProcAddress (HMODULE module, LPCSTR procname); + static FARPROC __stdcall _RGetProcAddress(HMODULE module, LPCSTR procname); + static FARPROC __stdcall _RGetProcAddressForCaller(HMODULE module, LPCSTR procname, LPVOID caller); + private: //////////////////////////////////////////////////////////////////////////////// // Private leak detection functions - see each function definition for details. @@ -338,6 +341,8 @@ class VisualLeakDetector : public IMalloc //////////////////////////////////////////////////////////////////////////////// // Win32 IAT replacement functions static FARPROC __stdcall _GetProcAddress(HMODULE module, LPCSTR procname); + static FARPROC __stdcall _GetProcAddressForCaller(HMODULE module, LPCSTR procname, LPVOID caller); + static HANDLE __stdcall _GetProcessHeap(); static HANDLE __stdcall _HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize); @@ -398,6 +403,7 @@ class VisualLeakDetector : public IMalloc VOID __stdcall ChangeModuleState(HMODULE module, bool on); static GetProcAddress_t m_GetProcAddress; + static GetProcAddressForCaller_t m_GetProcAddressForCaller; static GetProcessHeap_t m_GetProcessHeap; static HeapCreate_t m_HeapCreate; static HeapFree_t m_HeapFree; From b03e57f4f3fc2071263f978746974b0bb96d3323 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 6 Aug 2015 02:04:30 +0300 Subject: [PATCH 199/321] Improved diagnostic output --- src/utility.cpp | 35 ++++++-- src/vld_hooks.cpp | 220 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 216 insertions(+), 39 deletions(-) diff --git a/src/utility.cpp b/src/utility.cpp index c0dd3ca0..a6bea4e4 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -30,6 +30,11 @@ //#define PRINTHOOKINFO +#ifdef PRINTHOOKINFO +#include +#pragma comment(lib, "shlwapi.lib") +#endif + // Imported Global Variables extern CriticalSection g_imageLock; extern ReportHookSet* g_pReportHooks; @@ -516,6 +521,13 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) // This module has no IDT (i.e. it imports nothing). return FALSE; } +#ifdef PRINTHOOKINFO + bool dllNamePrinted = false; + CHAR cwBuffer[2048] = { 0 }; + LPSTR pszBuffer = cwBuffer; + DWORD dwMaxChars = _countof(cwBuffer); + DWORD dwLength = ::GetModuleFileNameA(importmodule, pszBuffer, dwMaxChars); +#endif int result = 0; while (idte->FirstThunk != 0x0) { @@ -556,8 +568,7 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) } LPVOID func = FindRealCode((LPVOID)thunk->u1.Function); - if (((DWORD_PTR)func == (DWORD_PTR)import) /*|| - (0 == strcmp(static_cast(funcEntry->Name), importname))*/) + if (((DWORD_PTR)func == (DWORD_PTR)import)) { // Found the IAT entry. Overwrite the address stored in the IAT // entry with the address of the replacement. Note that the IAT @@ -566,8 +577,14 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) if (import != replacement) { #ifdef PRINTHOOKINFO - DbgReport(L"Hook func by address. Patch dll %S. Found dll %S. Function %S.\n", - module->exportModuleName, importdllname, importname); + if (!dllNamePrinted) + { + dllNamePrinted = true; + DbgReport(L"Hook dll \"%S\":\n", + StrRChrA(pszBuffer, pszBuffer + dwLength, '\\') + 1); + } + DbgReport(L"Hook import %S(\"%S\") for dll \"%S\".\n", + importname, module->exportModuleName, importdllname); #endif if (entry->original != NULL) *entry->original = func; @@ -587,8 +604,14 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) if (stricmp(importdllname, module->exportModuleName) == 0 && strcmp(static_cast(funcEntry->Name), importname) == 0) { - DbgReport(L"Hook func by name. Patch dll %S. Found dll %S. Function %S.\n", - module->exportModuleName, importdllname, importname); + if (!dllNamePrinted) + { + dllNamePrinted = true; + DbgReport(L"Hook dll \"%S\":\n", + StrRChrA(pszBuffer, pszBuffer + dwLength, '\\') + 1); + } + DbgReport(L"Import found %S(\"%S\") for dll \"%S\".\n", + importname, module->exportModuleName, importdllname); break; } #endif diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index edad82bc..8f1c61f5 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -37,6 +37,10 @@ #include "vldheap.h" // Provides internal new and delete operators. #include "vldint.h" // Provides access to the Visual Leak Detector internals. +//#define PRINTHOOKCALLS +//#define PRINTHOOKCALLS2 +#include + extern HANDLE g_currentProcess; extern CriticalSection g_symbolLock; @@ -44,7 +48,7 @@ void VisualLeakDetector::firstAllocCall(tls_t * tls) { if (tls->pblockInfo) { - tls->flags &= ~VLD_TLS_CRTALLOC; + tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; CallStack* callstack; getCallStack(callstack, tls->context); tls->pblockInfo->callStack.reset(callstack); @@ -54,7 +58,7 @@ void VisualLeakDetector::firstAllocCall(tls_t * tls) // Reset thread local flags and variables for the next allocation. tls->context.fp = 0x0; tls->context.func = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; } //////////////////////////////////////////////////////////////////////////////// @@ -89,11 +93,14 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, size_t num, size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -128,11 +135,14 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -167,11 +177,14 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool de // void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntime, size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t* tls = g_vld.getTls(); // The new operator is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -212,11 +225,14 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, void *mem, size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -258,11 +274,14 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, size_t num, size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -283,11 +302,14 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, char* VisualLeakDetector::__strdup( _strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src ) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -308,11 +330,14 @@ char* VisualLeakDetector::__strdup( _strdup_t pstrdup, context_t& context, bool wchar_t* VisualLeakDetector::__wcsdup( _wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src ) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -348,11 +373,14 @@ wchar_t* VisualLeakDetector::__wcsdup( _wcsdup_t pwcsdup, context_t& context, bo void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size, size_t alignment) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -388,11 +416,14 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // malloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -434,11 +465,14 @@ void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, size_t size, size_t alignment) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -481,11 +515,14 @@ void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t p size_t alignment, size_t offset) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -530,11 +567,14 @@ void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, size_t size, size_t alignment) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -580,11 +620,14 @@ void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t size_t alignment, size_t offset) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // realloc is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -634,11 +677,14 @@ void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_ char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -689,11 +735,14 @@ void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_db char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -746,11 +795,14 @@ void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_reall char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -804,11 +856,14 @@ void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_ char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -864,11 +919,14 @@ void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_rec char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -925,11 +983,14 @@ void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recallo char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -989,11 +1050,14 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -1042,11 +1106,14 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -1073,11 +1140,14 @@ char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -1104,11 +1174,14 @@ wchar_t* VisualLeakDetector::__wcsdup_dbg (_wcsdup_dbg_t p_wcsdup_dbg, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _malloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -1157,11 +1230,14 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // The debug new operator is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -1209,6 +1285,9 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); bool firstcall = (tls->context.fp == 0x0); @@ -1254,6 +1333,9 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); bool firstcall = (tls->context.fp == 0x0); @@ -1306,11 +1388,14 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -1363,11 +1448,14 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif tls_t *tls = g_vld.getTls(); // _realloc_dbg is a CRT function and allocates from the CRT heap. if (debugRuntime) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; bool firstcall = (tls->context.fp == 0x0); if (firstcall) { @@ -1395,6 +1483,9 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, // HANDLE VisualLeakDetector::_GetProcessHeap() { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif // Get the process heap. HANDLE heap = m_GetProcessHeap(); @@ -1457,6 +1548,9 @@ HANDLE VisualLeakDetector::_GetProcessHeap() // HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif // Create the heap. HANDLE heap = m_HeapCreate(options, initsize, maxsize); @@ -1513,6 +1607,9 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m // BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif // After this heap is destroyed, the heap's address space will be unmapped // from the process's address space. So, we'd better generate a leak report // for this heap now, while we can still read from the memory blocks @@ -1543,6 +1640,9 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) // LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) { +#ifdef PRINTHOOKCALLS2 + DbgReport(_T(__FUNCTION__ "\n")); +#endif // Allocate the block. LPVOID block = RtlAllocateHeap(heap, flags, size); @@ -1584,6 +1684,9 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si // HeapAlloc (kernel32.dll) call RtlAllocateHeap (ntdll.dll) LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) { +#ifdef PRINTHOOKCALLS2 + DbgReport(_T(__FUNCTION__ "\n")); +#endif // Allocate the block. LPVOID block = HeapAlloc(heap, flags, size); @@ -1624,11 +1727,11 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size) { - bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; + bool debugcrtalloc = (tls->flags & VLD_TLS_DEBUGCRTALLOC) ? true : false; // The module that initiated this allocation is included in leak // detection. Map this block to the specified heap. - g_vld.mapBlock(heap, block, size, crtalloc, tls->threadId, tls->pblockInfo, tls->context.fp[1]); + g_vld.mapBlock(heap, block, size, debugcrtalloc, tls->threadId, tls->pblockInfo, tls->context.fp[1]); } // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. @@ -1648,6 +1751,9 @@ void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SI // BYTE VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) { +#ifdef PRINTHOOKCALLS2 + DbgReport(_T(__FUNCTION__ "\n")); +#endif BYTE status; if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls @@ -1668,6 +1774,9 @@ BYTE VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) // HeapFree (kernel32.dll) call RtlFreeHeap (ntdll.dll) BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) { +#ifdef PRINTHOOKCALLS2 + DbgReport(_T(__FUNCTION__ "\n")); +#endif BOOL status; if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls @@ -1707,6 +1816,9 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) // LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif LPVOID newmem; // Reallocate the block. @@ -1750,6 +1862,9 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID // for kernel32.dll LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif LPVOID newmem; // Reallocate the block. @@ -1792,13 +1907,16 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context) { - bool crtalloc = (tls->flags & VLD_TLS_CRTALLOC) ? true : false; +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif + bool crtalloc = (tls->flags & VLD_TLS_DEBUGCRTALLOC) ? true : false; // Reset thread local flags and variables, in case any libraries called // into while remapping the block allocate some memory. tls->context.fp = 0x0; tls->context.func = 0x0; - tls->flags &= ~VLD_TLS_CRTALLOC; + tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; // The module that initiated this allocation is included in leak // detection. Remap the block. @@ -1809,7 +1927,7 @@ void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LP __debugbreak(); #endif if (crtalloc) - tls->flags |= VLD_TLS_CRTALLOC; + tls->flags |= VLD_TLS_DEBUGCRTALLOC; tls->context = context; } @@ -1838,6 +1956,9 @@ void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LP // HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif static CoGetMalloc_t pCoGetMalloc = NULL; HRESULT hr = S_OK; @@ -1883,6 +2004,9 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) // LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; LPVOID block; @@ -1930,6 +2054,9 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) // LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; LPVOID block; @@ -1978,6 +2105,9 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) // ULONG VisualLeakDetector::AddRef () { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif assert(m_iMalloc != NULL); return (m_iMalloc) ? m_iMalloc->AddRef() : 0; } @@ -1994,6 +2124,9 @@ ULONG VisualLeakDetector::AddRef () // LPVOID VisualLeakDetector::Alloc (SIZE_T size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif LPVOID block; context_t context; tls_t *tls = getTls(); @@ -2029,6 +2162,9 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) // INT VisualLeakDetector::DidAlloc (LPVOID mem) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif assert(m_iMalloc != NULL); return (m_iMalloc) ? m_iMalloc->DidAlloc(mem) : 0; } @@ -2044,6 +2180,9 @@ INT VisualLeakDetector::DidAlloc (LPVOID mem) // VOID VisualLeakDetector::Free (LPVOID mem) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif assert(m_iMalloc != NULL); if (m_iMalloc) m_iMalloc->Free(mem); } @@ -2060,6 +2199,9 @@ VOID VisualLeakDetector::Free (LPVOID mem) // SIZE_T VisualLeakDetector::GetSize (LPVOID mem) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif assert(m_iMalloc != NULL); return (m_iMalloc) ? m_iMalloc->GetSize(mem) : 0; } @@ -2073,6 +2215,9 @@ SIZE_T VisualLeakDetector::GetSize (LPVOID mem) // VOID VisualLeakDetector::HeapMinimize () { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif assert(m_iMalloc != NULL); if (m_iMalloc) m_iMalloc->HeapMinimize(); } @@ -2093,6 +2238,9 @@ VOID VisualLeakDetector::HeapMinimize () // HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif assert(m_iMalloc != NULL); return (m_iMalloc) ? m_iMalloc->QueryInterface(iid, object) : E_UNEXPECTED; } @@ -2113,6 +2261,9 @@ HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) // LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif LPVOID block; context_t context; tls_t *tls = getTls(); @@ -2146,6 +2297,9 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) // ULONG VisualLeakDetector::Release () { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__ "\n")); +#endif assert(m_iMalloc != NULL); return (m_iMalloc) ? m_iMalloc->Release() : 0; } From f088a96da5ce421e9589921bfb3666de005e3404 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 6 Aug 2015 02:07:15 +0300 Subject: [PATCH 200/321] Changed algorithm for detection CRT debug header --- src/vld.cpp | 17 +++++++++-------- src/vldint.h | 3 ++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index fbe7d1f2..3b8862c6 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -1058,7 +1058,7 @@ tls_t* VisualLeakDetector::getTls () // // None. // -VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, UINT_PTR ra) +VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool debugcrtalloc, DWORD threadId, blockinfo_t* &pblockInfo, UINT_PTR ra) { // Record the block's information. blockinfo_t* blockinfo = new blockinfo_t(); @@ -1068,6 +1068,7 @@ VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool c blockinfo->serialNumber = m_requestCurr++; blockinfo->size = size; blockinfo->reported = false; + blockinfo->debugCrtAlloc = debugcrtalloc; if (SIZE_MAX - m_totalAlloc > size) m_totalAlloc += size; @@ -1087,7 +1088,7 @@ VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool c heapit = m_heapMap->find(heap); assert(heapit != m_heapMap->end()); } - if (crtalloc) { + if (debugcrtalloc) { // The heap that this block was allocated from is a CRT heap. (*heapit).second->flags = VLD_HEAP_CRT_DBG; } @@ -1297,13 +1298,13 @@ VOID VisualLeakDetector::unmapHeap (HANDLE heap) // None. // VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context) + bool debugcrtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context) { if (newmem != mem) { // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. unmapBlock(heap, mem, context); - mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo, 0); + mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo, 0); return; } @@ -1316,7 +1317,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // block has also not been mapped to a blockinfo_t entry yet either, // so treat this reallocation as a brand-new allocation (this will // also map the heap to a new block map). - mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo, 0); + mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo, 0); return; } @@ -1326,7 +1327,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (blockit == blockmap->end()) { // The block hasn't been mapped to a blockinfo_t entry yet. // Treat this reallocation as a new allocation. - mapBlock(heap, newmem, size, crtalloc, threadId, pblockInfo, 0); + mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo, 0); return; } @@ -1338,7 +1339,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S info->callStack.reset(); } - if (crtalloc) { + if (debugcrtalloc) { // The heap that this block was allocated from is a CRT heap. (*heapit).second->flags = VLD_HEAP_CRT_DBG; } @@ -1445,7 +1446,7 @@ SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo, DWORD threadId) if (threadId != ((DWORD)-1) && info->threadId != threadId) continue; - if (heapinfo->flags & VLD_HEAP_CRT_DBG) { + if (info->debugCrtAlloc) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header pretended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; diff --git a/src/vldint.h b/src/vldint.h index acfc2806..f89e885e 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -109,6 +109,7 @@ struct blockinfo_t { SIZE_T serialNumber; SIZE_T size; bool reported; + bool debugCrtAlloc; }; // BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. @@ -163,7 +164,7 @@ typedef Set ReportHookSet; struct tls_t { context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. UINT32 flags; // Thread-local status flags: -#define VLD_TLS_CRTALLOC 0x1 // If set, the current allocation is a CRT allocation. +#define VLD_TLS_DEBUGCRTALLOC 0x1 // If set, the current allocation is a CRT allocation. #define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. #define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. UINT32 oldFlags; // Thread-local status old flags From 30e6e0a82ab1356f36c0ae9778124dd0a8ce5396 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 6 Aug 2015 02:58:43 +0300 Subject: [PATCH 201/321] Remove logic for detecting debug heap (no longer needed) --- src/vld.cpp | 49 +++++------------------------------ src/vld_hooks.cpp | 65 +---------------------------------------------- src/vldint.h | 6 ++--- 3 files changed, 10 insertions(+), 110 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index 3b8862c6..724a55a2 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -574,7 +574,7 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) if (!SymbolsLoaded) { CriticalSectionLocker cs(g_vld.m_heapMapLock); // fix GetModuleFileName thread lock - g_symbolLock.Enter(); + CriticalSectionLocker csSL(g_symbolLock); DbgTrace(L"dbghelp32.dll %i: SymLoadModuleEx\n", GetCurrentThreadId()); DWORD64 module = SymLoadModuleEx(g_currentProcess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0); if (module == modulebase) @@ -582,7 +582,6 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) DbgTrace(L"dbghelp32.dll %i: SymGetModuleInfoW64\n", GetCurrentThreadId()); SymbolsLoaded = SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo); } - g_symbolLock.Leave(); } if (SymbolsLoaded) moduleFlags |= VLD_MODULE_SYMBOLSLOADED; @@ -1058,7 +1057,7 @@ tls_t* VisualLeakDetector::getTls () // // None. // -VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool debugcrtalloc, DWORD threadId, blockinfo_t* &pblockInfo, UINT_PTR ra) +VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool debugcrtalloc, DWORD threadId, blockinfo_t* &pblockInfo) { // Record the block's information. blockinfo_t* blockinfo = new blockinfo_t(); @@ -1088,35 +1087,6 @@ VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool d heapit = m_heapMap->find(heap); assert(heapit != m_heapMap->end()); } - if (debugcrtalloc) { - // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags = VLD_HEAP_CRT_DBG; - } - else if (ra != 0 && (*heapit).second->flags == VLD_HEAP_CRT_UNKNOWN) - { - // Try to get the name of the function containing the return address. - BYTE symbolbuffer[sizeof(SYMBOL_INFO) +MAX_SYMBOL_NAME_SIZE] = { 0 }; - SYMBOL_INFO *functioninfo = (SYMBOL_INFO*) &symbolbuffer; - functioninfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functioninfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; - - g_symbolLock.Enter(); - DWORD64 displacement; - DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); - VLDDisable(); - BOOL symfound = SymFromAddrW(g_currentProcess, ra, &displacement, functioninfo); - VLDRestore(); - g_symbolLock.Leave(); - if (symfound == TRUE && wcscmp(L"_heap_alloc_base", functioninfo->Name) == 0) - { - // Debug static linked CRT - (*heapit).second->flags = VLD_HEAP_CRT_DBG; - } - else - { - (*heapit).second->flags = 0; - } - } BlockMap* blockmap = &(*heapit).second->blockMap; BlockMap::Iterator blockit = blockmap->insert(mem, blockinfo); if (blockit == blockmap->end()) { @@ -1304,7 +1274,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. unmapBlock(heap, mem, context); - mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo, 0); + mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo); return; } @@ -1317,7 +1287,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // block has also not been mapped to a blockinfo_t entry yet either, // so treat this reallocation as a brand-new allocation (this will // also map the heap to a new block map). - mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo, 0); + mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo); return; } @@ -1327,7 +1297,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (blockit == blockmap->end()) { // The block hasn't been mapped to a blockinfo_t entry yet. // Treat this reallocation as a new allocation. - mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo, 0); + mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo); return; } @@ -1339,11 +1309,6 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S info->callStack.reset(); } - if (debugcrtalloc) { - // The heap that this block was allocated from is a CRT heap. - (*heapit).second->flags = VLD_HEAP_CRT_DBG; - } - if (m_totalAlloc < SIZE_MAX) { m_totalAlloc -= info->size; @@ -1524,7 +1489,7 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S LPCVOID address = block; SIZE_T size = info->size; - if (heapinfo->flags & VLD_HEAP_CRT_DBG) { + if (info->debugCrtAlloc) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header pretended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; @@ -2470,7 +2435,7 @@ void VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) const void* address = block; assert(address != NULL); - if (heapinfo->flags & VLD_HEAP_CRT_DBG) { + if (info->debugCrtAlloc) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header prepended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 8f1c61f5..fa8739f2 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -1497,38 +1497,6 @@ HANDLE VisualLeakDetector::_GetProcessHeap() heapit = g_vld.m_heapMap->find(heap); } - // GetProcessHeap was called by _heap_init (VS2012 and VS2013) or __acrt_initialize_heap (VS2015 and upper). - // This is a static CRT heap (msvcr*.dll and ucrtbase*.dll). - if ((*heapit).second->flags == 0) - { - // Get the return address within the calling function. - UINT_PTR ra = (UINT_PTR)_ReturnAddress(); - - HMODULE hCallingModule = NULL; - if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, - (LPCTSTR)ra, &hCallingModule)) - { - HMODULE hCurrentModule = GetModuleHandleW(NULL); - UINT32 flags = VLD_HEAP_CRT_UNKNOWN; - if (hCallingModule != hCurrentModule) - { - // CRT dynamic linking - WCHAR callingmodulename[MAX_PATH] = L""; - if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) - { - _wcslwr_s(callingmodulename); - if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime - flags = VLD_HEAP_CRT_DBG; - } - } - else - { - // CRT static linking - } - (*heapit).second->flags = flags; - } - } - return heap; } @@ -1561,37 +1529,6 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); assert(heapit != g_vld.m_heapMap->end()); - // HeapCreate was called by _heap_init (VS2010 and before). This is a static CRT heap (msvcr*.dll). - if ((*heapit).second->flags == 0) - { - // Get the return address within the calling function. - UINT_PTR ra = (UINT_PTR)_ReturnAddress(); - - HMODULE hCallingModule = NULL; - if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, - (LPCTSTR)ra, &hCallingModule)) - { - HMODULE hCurrentModule = GetModuleHandleW(NULL); - UINT32 flags = VLD_HEAP_CRT_UNKNOWN; - if (hCallingModule != hCurrentModule) - { - // CRT dynamic linking - WCHAR callingmodulename[MAX_PATH] = L""; - if (GetModuleFileName(hCallingModule, callingmodulename, _countof(callingmodulename)) > 0) - { - _wcslwr_s(callingmodulename); - if (wcsstr(callingmodulename, L"d.dll") != 0) // debug runtime - (*heapit).second->flags = VLD_HEAP_CRT_DBG; - } - } - else - { - // CRT static linking - } - (*heapit).second->flags = flags; - } - } - return heap; } @@ -1731,7 +1668,7 @@ void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SI // The module that initiated this allocation is included in leak // detection. Map this block to the specified heap. - g_vld.mapBlock(heap, block, size, debugcrtalloc, tls->threadId, tls->pblockInfo, tls->context.fp[1]); + g_vld.mapBlock(heap, block, size, debugcrtalloc, tls->threadId, tls->pblockInfo); } // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. diff --git a/src/vldint.h b/src/vldint.h index f89e885e..80e7bf89 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -120,9 +120,7 @@ typedef Map BlockMap; // heaps. struct heapinfo_t { BlockMap blockMap; // Map of all blocks allocated from this heap. - UINT32 flags; // Heap status flags: -#define VLD_HEAP_CRT_DBG 0x1 // If set, this heap is a CRT heap (i.e. the CRT uses it for new/malloc). -#define VLD_HEAP_CRT_UNKNOWN 0x2 // If set, this heap is a unknown CRT heap. + UINT32 flags; // Heap status flags }; // HeapMaps map heaps (via their handles) to BlockMaps. @@ -307,7 +305,7 @@ class VisualLeakDetector : public IMalloc BOOL enabled (); SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); tls_t* getTls (); - VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, UINT_PTR ra); + VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo); VOID mapHeap (HANDLE heap); VOID remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context); From 590c1772db7ae2a13cceead290c1f78391bd4960 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 6 Aug 2015 22:42:29 +0300 Subject: [PATCH 202/321] Support visualization VLD containers --- src/callstack.h | 16 ++++---- src/vld.natvis | 84 +++++++++++++++++++++++++++++++++++++++++ src/vld.vcxproj | 3 ++ src/vld.vcxproj.filters | 3 ++ 4 files changed, 98 insertions(+), 8 deletions(-) create mode 100644 src/vld.natvis diff --git a/src/callstack.h b/src/callstack.h index 9566f3ce..0d1b4295 100644 --- a/src/callstack.h +++ b/src/callstack.h @@ -55,8 +55,8 @@ // way, the CallStack can grow dynamically as needed. New frames are always // pushed onto the chunk at the end of the list known as the "top" chunk. // -// IMPORTANT NOTE: This class as originally written makes two fatal assumptions: -// First: That the application will never load modules (call LoadLibrary) during the +// IMPORTANT NOTE: This class as originally written makes two fatal assumptions: +// First: That the application will never load modules (call LoadLibrary) during the // lifetime of the app. // Second: That modules will never get unloaded (call to FreeLibrary) // during the lifetime of the app. @@ -64,17 +64,17 @@ // memory allocations whose call stacks goes through dynamically loaded modules // will be incomplete. This is manifested by stack frames that cannot be resolved // when the stack is 'dumped' because the binaries have been unloaded from the -// process. +// process. // To rectify this situation, it is up to the caller to resolve or format the call stacks // into human readable form, BEFORE the callers process unloads any modules. That is -// done by calling VisualLeakDetector::ResolveCallstacks, which can be called from +// done by calling VisualLeakDetector::ResolveCallstacks, which can be called from // external code by the exported VLDResolveCallstacks function. // When this happens, the call stacks are formatted, and then cached for later dumping. // This has performance penalties, as the current implementation saves all info to heap memory, // and it is wasteful, as some of the 'converted' memory is not a true leak, but will get // properly de-allocated at a later time. However there is no other way to work around the // fact that the call stacks can only get formatted when the binary is loaded in the process. -// +// class CallStack { public: @@ -83,14 +83,14 @@ class CallStack static CallStack* Create(); // Public APIs - see each function definition for details. VOID clear (); - // Prints the call stack to one of either / or the debug output window and or + // Prints the call stack to one of either / or the debug output window and or // a log file. VOID dump (BOOL showinternalframes, UINT start_frame = 0) const; // Formats the stack frame into a human readable format, and saves it for later retrieval. VOID resolve(BOOL showinternalframes); DWORD getHashValue () const; virtual VOID getStackTrace (UINT32 maxdepth, const context_t& context) = 0; - + BOOL operator == (const CallStack &other) const; UINT_PTR operator [] (UINT32 index) const; VOID push_back (const UINT_PTR programcounter); @@ -102,7 +102,7 @@ class CallStack private: // Don't allow this!! - CallStack (const CallStack &other); + CallStack (const CallStack &other); // Don't allow this!! CallStack& operator = (const CallStack &other); diff --git a/src/vld.natvis b/src/vld.natvis new file mode 100644 index 00000000..ca8daf08 --- /dev/null +++ b/src/vld.natvis @@ -0,0 +1,84 @@ + + + + + {first}, {second,na} + ({first}, {second,na}) + + first + second + + + + + {m_tree} + + m_tree + + + + + {{ reserve={m_reserve} }}} + + + + + + *cur + cur = cur->left + + + + + + + {key} + + key + + + + + {m_node} + + m_node + + + + + {{ size={m_size} }}} + + m_size + m_capacity + + + + + m_size + + i = 0 + + (void*)chunk->frames[i] + i++ + + chunk = chunk->next + + + + + + + + {buffer,[length/2]su} + buffer,[length/2]su + + length + maxlength + + length/2 + buffer + + + + + diff --git a/src/vld.vcxproj b/src/vld.vcxproj index 7f22cb88..2440507f 100644 --- a/src/vld.vcxproj +++ b/src/vld.vcxproj @@ -209,6 +209,9 @@ + + + diff --git a/src/vld.vcxproj.filters b/src/vld.vcxproj.filters index 0564e514..02ecff1d 100644 --- a/src/vld.vcxproj.filters +++ b/src/vld.vcxproj.filters @@ -98,4 +98,7 @@ Resource Files + + + \ No newline at end of file From 850476f04b04bd939877ca08cb33eb1db2c4a1d0 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 8 Aug 2015 01:06:03 +0300 Subject: [PATCH 203/321] Toolset changed to v140_xp --- lib/gtest/msvc/gtest.vcxproj | 16 ++++---- src/tests/basics/basics.vcxproj | 24 ++++++------ src/tests/corruption/corruption.vcxproj | 24 ++++++------ src/tests/dynamic_app/dynamic_app.vcxproj | 24 ++++++------ src/tests/dynamic_dll/dynamic.vcxproj | 24 ++++++------ src/tests/mfc/vldmfc.vcxproj | 32 +++++++-------- src/tests/mfc_dll/mfc.vcxproj | 24 ++++++------ src/tests/suite/testsuite.vcxproj | 48 +++++++++++------------ src/vld.cpp | 1 + src/vld.vcxproj | 29 +++++++++++--- 10 files changed, 132 insertions(+), 114 deletions(-) diff --git a/lib/gtest/msvc/gtest.vcxproj b/lib/gtest/msvc/gtest.vcxproj index 625c099c..410a0fac 100644 --- a/lib/gtest/msvc/gtest.vcxproj +++ b/lib/gtest/msvc/gtest.vcxproj @@ -43,42 +43,42 @@ StaticLibrary - v140 + v140_xp MultiByte StaticLibrary - v140 + v140_xp MultiByte StaticLibrary - v140 + v140_xp MultiByte StaticLibrary - v140 + v140_xp MultiByte StaticLibrary - v140 + v140_xp MultiByte StaticLibrary - v140 + v140_xp MultiByte StaticLibrary - v140 + v140_xp MultiByte StaticLibrary - v140 + v140_xp MultiByte diff --git a/src/tests/basics/basics.vcxproj b/src/tests/basics/basics.vcxproj index b26b0b20..05bad28c 100644 --- a/src/tests/basics/basics.vcxproj +++ b/src/tests/basics/basics.vcxproj @@ -62,81 +62,81 @@ Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode false - v140 + v140_xp Application true Unicode false - v140 + v140_xp Application true Unicode false - v140 + v140_xp Application true Unicode false - v140 + v140_xp Application false true Unicode - v140 + v140_xp Application false true Unicode - v140 + v140_xp Application false true Unicode - v140 + v140_xp Application false true Unicode - v140 + v140_xp diff --git a/src/tests/corruption/corruption.vcxproj b/src/tests/corruption/corruption.vcxproj index 5693f09f..ad3eadf7 100644 --- a/src/tests/corruption/corruption.vcxproj +++ b/src/tests/corruption/corruption.vcxproj @@ -61,77 +61,77 @@ Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application false true Unicode - v140 + v140_xp Application false true Unicode - v140 + v140_xp Application false true Unicode - v140 + v140_xp Application false true Unicode - v140 + v140_xp diff --git a/src/tests/dynamic_app/dynamic_app.vcxproj b/src/tests/dynamic_app/dynamic_app.vcxproj index 51c973fa..5a9f87a4 100644 --- a/src/tests/dynamic_app/dynamic_app.vcxproj +++ b/src/tests/dynamic_app/dynamic_app.vcxproj @@ -61,77 +61,77 @@ Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application true Unicode - v140 + v140_xp Application false true Unicode - v140 + v140_xp Application false true Unicode - v140 + v140_xp Application false true Unicode - v140 + v140_xp Application false true Unicode - v140 + v140_xp diff --git a/src/tests/dynamic_dll/dynamic.vcxproj b/src/tests/dynamic_dll/dynamic.vcxproj index 52132ce2..0c1a106d 100644 --- a/src/tests/dynamic_dll/dynamic.vcxproj +++ b/src/tests/dynamic_dll/dynamic.vcxproj @@ -62,77 +62,77 @@ DynamicLibrary true Unicode - v140 + v140_xp DynamicLibrary true Unicode - v140 + v140_xp DynamicLibrary true Unicode - v140 + v140_xp DynamicLibrary true Unicode - v140 + v140_xp DynamicLibrary true Unicode - v140 + v140_xp DynamicLibrary true Unicode - v140 + v140_xp DynamicLibrary true Unicode - v140 + v140_xp DynamicLibrary true Unicode - v140 + v140_xp DynamicLibrary false true Unicode - v140 + v140_xp DynamicLibrary false true Unicode - v140 + v140_xp DynamicLibrary false true Unicode - v140 + v140_xp DynamicLibrary false true Unicode - v140 + v140_xp diff --git a/src/tests/mfc/vldmfc.vcxproj b/src/tests/mfc/vldmfc.vcxproj index 9081bb9c..e1c10713 100644 --- a/src/tests/mfc/vldmfc.vcxproj +++ b/src/tests/mfc/vldmfc.vcxproj @@ -44,49 +44,49 @@ Application Dynamic Unicode - v140 + v140_xp Application Static Unicode - v140 + v140_xp Application Dynamic Unicode - v140 + v140_xp Application Static Unicode - v140 + v140_xp Application Dynamic Unicode - v140 + v140_xp Application Static Unicode - v140 + v140_xp Application Dynamic Unicode - v140 + v140_xp Application Static Unicode - v140 + v140_xp @@ -134,10 +134,10 @@ true true true - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset @@ -146,10 +146,10 @@ - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset - AllRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset diff --git a/src/tests/mfc_dll/mfc.vcxproj b/src/tests/mfc_dll/mfc.vcxproj index 9f4fa84b..bcc0e7a1 100644 --- a/src/tests/mfc_dll/mfc.vcxproj +++ b/src/tests/mfc_dll/mfc.vcxproj @@ -63,56 +63,56 @@ true Unicode Dynamic - v140 + v140_xp DynamicLibrary true Unicode Static - v140 + v140_xp DynamicLibrary true Unicode Dynamic - v140 + v140_xp DynamicLibrary true Unicode Static - v140 + v140_xp DynamicLibrary true Unicode Dynamic - v140 + v140_xp DynamicLibrary true Unicode Static - v140 + v140_xp DynamicLibrary true Unicode Dynamic - v140 + v140_xp DynamicLibrary true Unicode Static - v140 + v140_xp DynamicLibrary @@ -120,7 +120,7 @@ true Unicode Dynamic - v140 + v140_xp DynamicLibrary @@ -128,7 +128,7 @@ true Unicode Static - v140 + v140_xp DynamicLibrary @@ -136,7 +136,7 @@ true Unicode Dynamic - v140 + v140_xp DynamicLibrary @@ -144,7 +144,7 @@ true Unicode Static - v140 + v140_xp diff --git a/src/tests/suite/testsuite.vcxproj b/src/tests/suite/testsuite.vcxproj index a6a2c09e..38bb10ba 100644 --- a/src/tests/suite/testsuite.vcxproj +++ b/src/tests/suite/testsuite.vcxproj @@ -67,62 +67,62 @@ Application NotSet - v140 + v140_xp Application NotSet - v140 + v140_xp Application NotSet - v140 + v140_xp Application NotSet - v140 + v140_xp Application NotSet - v140 + v140_xp Application NotSet - v140 + v140_xp Application NotSet - v140 + v140_xp Application NotSet - v140 + v140_xp Application NotSet - v140 + v140_xp Application NotSet - v140 + v140_xp Application NotSet - v140 + v140_xp Application NotSet - v140 + v140_xp @@ -178,38 +178,38 @@ <_ProjectFileVersion>10.0.30128.1 - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset - MinimumRecommendedRules.ruleset - MinimumRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset diff --git a/src/vld.cpp b/src/vld.cpp index 724a55a2..307cbc1a 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -89,6 +89,7 @@ bool IsWindows7OrGreater() return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 0); } +#define _WIN32_WINNT_WIN8 0x0602 bool IsWindows8OrGreater() { return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0); diff --git a/src/vld.vcxproj b/src/vld.vcxproj index 2440507f..174be6c7 100644 --- a/src/vld.vcxproj +++ b/src/vld.vcxproj @@ -39,16 +39,16 @@ - v140 + v140_xp - v140 + v140_xp - v140 + v140_xp - v140 + v140_xp @@ -56,10 +56,24 @@ <_ProjectFileVersion>10.0.30128.1 $(ProjectDir)bin\$(Platform)\$(Configuration)\ $(ProjectDir)obj\$(Platform)\$(Configuration)\ - MinimumRecommendedRules.ruleset + NativeRecommendedRules.ruleset $(ProjectName)_$(NumericPlatform) .dll + + false + + + false + + + false + NativeRecommendedRules.ruleset + + + false + NativeRecommendedRules.ruleset + $(SolutionDir)\lib\dbghelp\include;$(SolutionDir)\setup;%(AdditionalIncludeDirectories) @@ -91,7 +105,7 @@ Level4 false EditAndContinue - true + false 4201;4229 @@ -111,6 +125,7 @@ false ProgramDatabase 4201;4229 + false MachineX64 @@ -136,6 +151,7 @@ OldStyle false 4201;4229 + false true @@ -160,6 +176,7 @@ false false 4201;4229 + false true From f2eb79606ef1b611a9a0920dd6fe8f75fd0590f0 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 6 Aug 2015 22:45:27 +0300 Subject: [PATCH 204/321] Fixed hooking function that contains only JMP to another function, like _recalloc to _recalloc_base in x64 release --- src/utility.cpp | 20 ++++++++------------ src/utility.h | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/utility.cpp b/src/utility.cpp index a6bea4e4..eb339cd6 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -27,14 +27,10 @@ #include "vldheap.h" // Provides internal new and delete operators. #include "vldint.h" #include +#include //#define PRINTHOOKINFO -#ifdef PRINTHOOKINFO -#include -#pragma comment(lib, "shlwapi.lib") -#endif - // Imported Global Variables extern CriticalSection g_imageLock; extern ReportHookSet* g_pReportHooks; @@ -450,7 +446,7 @@ LPVOID FindRealCode(LPVOID pCode) return FindRealCode(pCode); #endif } - if (*(BYTE *)pCode == 0xE9) + if (*(BYTE *)pCode == 0xE9) // jmp { // Relative next instruction PBYTE pNextInst = (PBYTE)((ULONG_PTR)pCode + 5); @@ -543,10 +539,10 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) // Get the *real* address of the import. If we find this address in the IAT, // then we've found the entry that needs to be patched. - LPVOID import2 = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); - LPVOID import = GetProcAddress(exportmodule, importname); - if ( import2 ) - import = import2; + LPVOID import = VisualLeakDetector::_RGetProcAddress(exportmodule, importname); + if ( !import) + import = GetProcAddress(exportmodule, importname); + import = FindRealCode(import); if (import == NULL) // Perhaps the named export module does not actually export the named import? { @@ -581,7 +577,7 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) { dllNamePrinted = true; DbgReport(L"Hook dll \"%S\":\n", - StrRChrA(pszBuffer, pszBuffer + dwLength, '\\') + 1); + strrchr(pszBuffer, '\\') + 1); } DbgReport(L"Hook import %S(\"%S\") for dll \"%S\".\n", importname, module->exportModuleName, importdllname); @@ -608,7 +604,7 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) { dllNamePrinted = true; DbgReport(L"Hook dll \"%S\":\n", - StrRChrA(pszBuffer, pszBuffer + dwLength, '\\') + 1); + strrchr(pszBuffer, '\\') + 1); } DbgReport(L"Import found %S(\"%S\") for dll \"%S\".\n", importname, module->exportModuleName, importdllname); diff --git a/src/utility.h b/src/utility.h index 5774a473..866d15db 100644 --- a/src/utility.h +++ b/src/utility.h @@ -130,7 +130,7 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module); BOOL PatchModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tablesize); VOID Print (LPWSTR message); VOID Report (LPCWSTR format, ...); -#ifdef _DEBUG +#ifndef NDEBUG #define DbgPrint(x) Print(x) #define DbgReport(...) Report(__VA_ARGS__) #define DbgTrace(...) From 81508cf7709846828e8fc1676fba4f6c617ec964 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 8 Aug 2015 01:13:45 +0300 Subject: [PATCH 205/321] SubSystem fixed --- src/tests/suite/testsuite.vcxproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/tests/suite/testsuite.vcxproj b/src/tests/suite/testsuite.vcxproj index 38bb10ba..800d3a17 100644 --- a/src/tests/suite/testsuite.vcxproj +++ b/src/tests/suite/testsuite.vcxproj @@ -236,6 +236,7 @@ true + Console call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -255,6 +256,7 @@ true + Console call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -273,6 +275,7 @@ true true true + Console call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -291,6 +294,7 @@ true true true + Console call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -310,6 +314,7 @@ true + Console call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -329,6 +334,7 @@ true + Console call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -352,6 +358,7 @@ true MachineX64 + Console @@ -376,6 +383,7 @@ true MachineX64 + Console @@ -399,6 +407,7 @@ true MachineX64 true + Console call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -421,6 +430,7 @@ true MachineX64 true + Console call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -445,6 +455,7 @@ true MachineX64 true + Console call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) @@ -469,6 +480,7 @@ true MachineX64 true + Console call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) From c0c37a89635d25dce4713588b14f8c2b925df304 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 8 Aug 2015 02:12:34 +0300 Subject: [PATCH 206/321] Symbols path detection improved --- src/utility.cpp | 7 ++++--- src/vld.cpp | 20 +++++++++++++++----- src/vld.vcxproj | 4 ++++ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/utility.cpp b/src/utility.cpp index eb339cd6..0eade86f 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -705,14 +705,15 @@ VOID Print (LPWSTR messagew) fputws(messagew, stdout); } else { + const size_t MAXMESSAGELENGTH = 5119; size_t count = 0; - CHAR messagea [MAXREPORTLENGTH + 1]; - if (wcstombs_s(&count, messagea, MAXREPORTLENGTH + 1, messagew, _TRUNCATE) != 0) { + CHAR messagea [MAXMESSAGELENGTH + 1]; + if (wcstombs_s(&count, messagea, MAXMESSAGELENGTH + 1, messagew, _TRUNCATE) != 0) { // Failed to convert the Unicode message to ASCII. assert(FALSE); return; } - messagea[MAXREPORTLENGTH] = '\0'; + messagea[MAXMESSAGELENGTH] = '\0'; if (s_reportFile != NULL) { // Send the report to the previously specified file. diff --git a/src/vld.cpp b/src/vld.cpp index 307cbc1a..5a024853 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -729,11 +729,21 @@ LPWSTR VisualLeakDetector::buildSymbolSearchPath () delete [] env; } - // Append Visual Studio 2010/2008 symbols cache directory. +#if _MSC_VER > 1900 +#error Not supported VS +#endif + // Append Visual Studio symbols cache directory. HKEY debuggerkey; WCHAR symbolCacheDir [MAX_PATH] = {0}; - LSTATUS regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\10.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); - if (regstatus != ERROR_SUCCESS) + // VS2015 + LSTATUS regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\14.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); + if (regstatus != ERROR_SUCCESS) // VS2013 + regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\12.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); + if (regstatus != ERROR_SUCCESS) // VS2012 + regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\11.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); + if (regstatus != ERROR_SUCCESS) // VS2010 + regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\10.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); + if (regstatus != ERROR_SUCCESS) // VS2008 regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\9.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); if (regstatus == ERROR_SUCCESS) @@ -743,9 +753,9 @@ LPWSTR VisualLeakDetector::buildSymbolSearchPath () regstatus = RegQueryValueEx(debuggerkey, L"SymbolCacheDir", NULL, &valuetype, (LPBYTE)&symbolCacheDir, &dirLength); if (regstatus == ERROR_SUCCESS && valuetype == REG_SZ) { - path = AppendString(path, L";srv*"); + path = AppendString(path, L";"); path = AppendString(path, symbolCacheDir); - path = AppendString(path, L"\\MicrosoftPublicSymbols;srv*"); + path = AppendString(path, L"\\MicrosoftPublicSymbols;"); path = AppendString(path, symbolCacheDir); } RegCloseKey(debuggerkey); diff --git a/src/vld.vcxproj b/src/vld.vcxproj index 174be6c7..4e7d194d 100644 --- a/src/vld.vcxproj +++ b/src/vld.vcxproj @@ -110,6 +110,7 @@ psapi.lib;%(AdditionalDependencies) + Windows vld.dll.dependency.x86.manifest @@ -130,6 +131,7 @@ MachineX64 psapi.lib;%(AdditionalDependencies) + Windows vld.dll.dependency.x64.manifest @@ -157,6 +159,7 @@ true true %(AdditionalDependencies) + Windows vld.dll.dependency.x86.manifest @@ -184,6 +187,7 @@ MachineX64 true %(AdditionalDependencies) + Windows vld.dll.dependency.x64.manifest From a1119fbf6521590018cebcc5c880c42187ed5c31 Mon Sep 17 00:00:00 2001 From: "dmitriy.vovk" Date: Thu, 6 Aug 2015 17:52:47 +0200 Subject: [PATCH 207/321] Fixed stack overflow, when using StackWalkMethod=safe --- src/vld_hooks.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index fa8739f2..4a6e1a41 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -186,6 +186,13 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntim if (debugRuntime) tls->flags |= VLD_TLS_DEBUGCRTALLOC; + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew(size); + + // fix for StackWalkMethod=safe + if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + return block; + bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. @@ -194,9 +201,6 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntim tls->blockProcessed = FALSE; } - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew(size); - if (firstcall) firstAllocCall(tls); From 40532d570659d9559fa03169cc25c1bfe9ddcfd4 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Mon, 10 Aug 2015 01:18:54 +0300 Subject: [PATCH 208/321] Use CaptureStackBackTrace in FastCallStack for x86 --- src/callstack.cpp | 53 +++++++++++++++++++++++++---------------------- src/utility.h | 13 ++++++++++-- vld.ini | 2 +- 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index 57439dd5..040ecf79 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -271,7 +271,7 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const HMODULE hCallingModule = GetCallingModule(programCounter); LPWSTR moduleName = L"(Module name unavailable)"; - if (hCallingModule && + if (hCallingModule && GetModuleFileName(hCallingModule, callingModuleName, _countof(callingModuleName)) > 0) { moduleName = wcsrchr(callingModuleName, L'\\'); @@ -291,19 +291,19 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const // Display the current stack frame's information. if (foundline) { if (displacement == 0) - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s\n", + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s\n", sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); else - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); } else { if (displacement64 == 0) - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", programCounter, moduleName, functionName); else - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", - programCounter, moduleName, functionName, (DWORD)displacement64); + NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", + programCounter, moduleName, functionName, (DWORD)displacement64); } if (!isFrameInternal) @@ -312,7 +312,7 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const } // Resolve - Creates a nicely formatted rendition of the CallStack, including -// symbolic information (function names and line numbers) if available. and +// symbolic information (function names and line numbers) if available. and // saves it for later retrieval. This is almost identical to Callstack::dump above. // // Note: The symbol handler must be initialized prior to calling this @@ -346,7 +346,7 @@ void CallStack::resolve(BOOL showInternalFrames) sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; - + WCHAR callingModuleName [MAX_PATH] = L""; WCHAR lowerCaseName [MAX_PATH]; @@ -355,7 +355,7 @@ void CallStack::resolve(BOOL showInternalFrames) m_resolved = new WCHAR[m_resolvedCapacity]; const size_t allocedBytes = m_resolvedCapacity * sizeof(WCHAR); ZeroMemory(m_resolved, allocedBytes); - + // Iterate through each frame in the call stack. for (UINT32 frame = 0; frame < m_size; frame++) { @@ -367,7 +367,7 @@ void CallStack::resolve(BOOL showInternalFrames) DWORD displacement = 0; // It turns out that calls to SymGetLineFromAddrW64 may free the very memory we are scrutinizing here - // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. + // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. // When that happens there is nothing we can do except crash. DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); @@ -405,7 +405,7 @@ void CallStack::resolve(BOOL showInternalFrames) HMODULE hCallingModule = GetCallingModule(programCounter); LPWSTR moduleName = L"(Module name unavailable)"; - if (hCallingModule && + if (hCallingModule && GetModuleFileName(hCallingModule, callingModuleName, _countof(callingModuleName)) > 0) { moduleName = wcsrchr(callingModuleName, L'\\'); @@ -425,18 +425,18 @@ void CallStack::resolve(BOOL showInternalFrames) if (foundline) { // Just truncate anything that is too long. if (displacement == 0) - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s\n", + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s\n", sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); else - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); } else { if (displacement64 == 0) - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", programCounter, moduleName, functionName); else - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", + NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", programCounter, moduleName, functionName, (DWORD)displacement64); } @@ -561,7 +561,7 @@ VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) } UINT_PTR* framePointer = context.fp; -#if defined(_M_IX86) +/*#if defined(_M_IX86) while (count < maxdepth) { if (*framePointer < (UINT_PTR)framePointer) { if (*framePointer == NULL) { @@ -593,15 +593,15 @@ VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) push_back(*(framePointer + 1)); framePointer = (UINT_PTR*)*framePointer; } -#elif defined(_M_X64) +#elif defined(_M_X64)*/ UINT32 maxframes = min(62, maxdepth + 10); - static USHORT (WINAPI *s_pfnCaptureStackBackTrace)(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash) = 0; - if (s_pfnCaptureStackBackTrace == 0) - { - const HMODULE hNtDll = GetModuleHandleW(L"ntdll.dll"); + static USHORT (WINAPI *s_pfnCaptureStackBackTrace)(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash) = 0; + if (s_pfnCaptureStackBackTrace == 0) + { + const HMODULE hNtDll = GetModuleHandleW(L"ntdll.dll"); reinterpret_cast(s_pfnCaptureStackBackTrace) = ::GetProcAddress(hNtDll, "RtlCaptureStackBackTrace"); - if (s_pfnCaptureStackBackTrace == 0) + if (s_pfnCaptureStackBackTrace == 0) return; } UINT_PTR* myFrames = new UINT_PTR[maxframes]; @@ -623,7 +623,7 @@ VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) count++; } delete [] myFrames; -#endif +//#endif } // getStackTrace - Traces the stack as far back as possible, or until 'maxdepth' @@ -663,11 +663,14 @@ VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) // Get the required values for initialization of the STACKFRAME64 structure // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame. #if defined(_M_IX86) - UINT_PTR programcounter = *(framePointer + 1); + /*UINT_PTR programcounter = *(framePointer + 1); UINT_PTR stackpointer = (*framePointer) - maxdepth * 10 * sizeof(void*); // An approximation. currentContext.SPREG = stackpointer; currentContext.BPREG = (DWORD64)framePointer; - currentContext.IPREG = programcounter; + currentContext.IPREG = programcounter;*/ + currentContext.SPREG = context.Esp; + currentContext.BPREG = (DWORD64)framePointer; + currentContext.IPREG = context.Eip; #elif defined(_M_X64) currentContext.SPREG = context.Rsp; currentContext.BPREG = (DWORD64)framePointer; diff --git a/src/utility.h b/src/utility.h index 866d15db..a613cb42 100644 --- a/src/utility.h +++ b/src/utility.h @@ -62,7 +62,10 @@ struct context_t { UINT_PTR* fp; UINT_PTR func; -#if defined(_M_X64) +#if defined(_M_IX86) + DWORD Esp; + DWORD Eip; +#elif defined(_M_X64) DWORD64 Rsp; DWORD64 Rip; #endif // _M_IX86 @@ -70,8 +73,14 @@ struct context_t #if defined(_M_IX86) // Copies the current frame pointer to the supplied variable. -#define CAPTURE_CONTEXT(context, function) \ +/*#define CAPTURE_CONTEXT(context, function) \ context.fp = ((UINT_PTR*)_AddressOfReturnAddress()) - 1; \ + context.func = (UINT_PTR)(function)*/ +#define CAPTURE_CONTEXT(context, function) \ + CONTEXT _ctx; \ + RtlCaptureContext(&_ctx); \ + context.Esp = _ctx.Esp; context.Eip = _ctx.Eip; \ + context.fp = ((UINT_PTR*)_AddressOfReturnAddress()) - 1; \ context.func = (UINT_PTR)(function) #define GET_RETURN_ADDRESS(context) *(context.fp + 1) #elif defined(_M_X64) diff --git a/vld.ini b/vld.ini index 378f17ba..a0b31230 100644 --- a/vld.ini +++ b/vld.ini @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Visual Leak Detector - Initialization/Configuration File -;; Copyright (c) 2005-2014 VLD Team +;; Copyright (c) 2005-2015 VLD Team ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public From f5790ae0c409b97a8cd7e36180fd716f56587e57 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Tue, 11 Aug 2015 18:56:46 +0300 Subject: [PATCH 209/321] Leaks fixed for VS2012 toolset --- src/vld_hooks.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 4a6e1a41..74c0cf1c 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -186,13 +186,6 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntim if (debugRuntime) tls->flags |= VLD_TLS_DEBUGCRTALLOC; - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew(size); - - // fix for StackWalkMethod=safe - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - return block; - bool firstcall = (tls->context.fp == 0x0); if (firstcall) { // This is the first call to enter VLD for the current allocation. @@ -201,6 +194,9 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntim tls->blockProcessed = FALSE; } + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + void* block = pnew(size); + if (firstcall) firstAllocCall(tls); From b0385b21a9eb80081b07d02241527100c896b9eb Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Wed, 12 Aug 2015 00:26:30 +0300 Subject: [PATCH 210/321] VLDResolveCallstacks() return count of unresolved functions --- src/callstack.cpp | 18 ++++++------------ src/callstack.h | 2 +- src/tests/basics/basics.cpp | 9 +++++++++ src/tests/dynamic_app/LoadTests.cpp | 4 ++-- src/tests/dynamic_app/dynamic_app.cpp | 9 +++++++++ src/vld.cpp | 22 +++++++++++++++++----- src/vld.h | 18 +++++++++--------- src/vldapi.cpp | 4 ++-- src/vldint.h | 4 ++-- 9 files changed, 57 insertions(+), 33 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index 040ecf79..8f31e3fb 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -325,14 +325,14 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const // // None. // -void CallStack::resolve(BOOL showInternalFrames) +int CallStack::resolve(BOOL showInternalFrames) { if (m_resolved) { // already resolved, no need to do it again // resolving twice may report an incorrect module for the stack frames // if the memory was leaked in a dynamic library that was already unloaded. - return; + return 0; } if (m_status & CALLSTACK_STATUS_INCOMPLETE) { // This call stack appears to be incomplete. Using StackWalk64 may be @@ -342,6 +342,7 @@ void CallStack::resolve(BOOL showInternalFrames) L" complete stack trace.\n"); } + int unresolvedFunctionsCount = 0; IMAGEHLP_LINE64 sourceInfo = { 0 }; sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); @@ -397,6 +398,7 @@ void CallStack::resolve(BOOL showInternalFrames) functionName = functionInfo->Name; } else { + unresolvedFunctionsCount++; // GetFormattedMessage( GetLastError() ); functionName = L"(Function name unavailable)"; displacement64 = 0; @@ -446,6 +448,7 @@ void CallStack::resolve(BOOL showInternalFrames) wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); } } // end for loop + return unresolvedFunctionsCount; } // DumpResolve @@ -595,18 +598,9 @@ VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) } #elif defined(_M_X64)*/ UINT32 maxframes = min(62, maxdepth + 10); - static USHORT (WINAPI *s_pfnCaptureStackBackTrace)(ULONG FramesToSkip, ULONG FramesToCapture, PVOID* BackTrace, PULONG BackTraceHash) = 0; - if (s_pfnCaptureStackBackTrace == 0) - { - const HMODULE hNtDll = GetModuleHandleW(L"ntdll.dll"); - reinterpret_cast(s_pfnCaptureStackBackTrace) - = ::GetProcAddress(hNtDll, "RtlCaptureStackBackTrace"); - if (s_pfnCaptureStackBackTrace == 0) - return; - } UINT_PTR* myFrames = new UINT_PTR[maxframes]; ZeroMemory(myFrames, sizeof(UINT_PTR) * maxframes); - s_pfnCaptureStackBackTrace(0, maxframes, (PVOID*)myFrames, NULL); + RtlCaptureStackBackTrace(0, maxframes, reinterpret_cast(myFrames), NULL); UINT32 startIndex = 0; while (count < maxframes) { if (myFrames[count] == 0) diff --git a/src/callstack.h b/src/callstack.h index 0d1b4295..54656524 100644 --- a/src/callstack.h +++ b/src/callstack.h @@ -87,7 +87,7 @@ class CallStack // a log file. VOID dump (BOOL showinternalframes, UINT start_frame = 0) const; // Formats the stack frame into a human readable format, and saves it for later retrieval. - VOID resolve(BOOL showinternalframes); + int resolve(BOOL showinternalframes); DWORD getHashValue () const; virtual VOID getStackTrace (UINT32 maxdepth, const context_t& context) = 0; diff --git a/src/tests/basics/basics.cpp b/src/tests/basics/basics.cpp index f7d8112d..36461caa 100644 --- a/src/tests/basics/basics.cpp +++ b/src/tests/basics/basics.cpp @@ -9,6 +9,15 @@ class TestBasics : public ::testing::TestWithParam { + virtual void SetUp() + { + VLDMarkAllLeaksAsReported(); + } + virtual void TearDown() + { + // Check that callstack resolved without unresolved functions (required symbols for all dll's) + //EXPECT_EQ(0, VLDResolveCallstacks()); + } }; TEST_P(TestBasics, Malloc) diff --git a/src/tests/dynamic_app/LoadTests.cpp b/src/tests/dynamic_app/LoadTests.cpp index 9fd4edff..6cdb3773 100644 --- a/src/tests/dynamic_app/LoadTests.cpp +++ b/src/tests/dynamic_app/LoadTests.cpp @@ -14,14 +14,14 @@ void CallVLDExportedMethod(const CHAR* function) { HMODULE vld_module = GetModuleHandle(sVld_dll); assert(vld_module); - typedef void (*VLDAPI_func)(); + typedef int (*VLDAPI_func)(); if (vld_module != NULL) { VLDAPI_func func = (VLDAPI_func)GetProcAddress(vld_module, function); assert(func); if (func) { - func(); + int result = func(); } } } diff --git a/src/tests/dynamic_app/dynamic_app.cpp b/src/tests/dynamic_app/dynamic_app.cpp index 38d23d56..63b42021 100644 --- a/src/tests/dynamic_app/dynamic_app.cpp +++ b/src/tests/dynamic_app/dynamic_app.cpp @@ -26,6 +26,15 @@ void LeakDuplicateLeaks() } class DynamicLoader : public ::testing::TestWithParam { + virtual void SetUp() + { + VLDMarkAllLeaksAsReported(); + } + virtual void TearDown() + { + // Check that callstack resolved without unresolved functions (required symbols for all dll's) + //EXPECT_EQ(0, VLDResolveCallstacks()); + } }; diff --git a/src/vld.cpp b/src/vld.cpp index 5a024853..cde48abe 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -1527,6 +1527,14 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S } SIZE_T blockLeaksCount = 1; Report(L"---------- Block %Iu at " ADDRESSFORMAT L": %Iu bytes ----------\n", info->serialNumber, address, size); +#ifdef _DEBUG + if (info->debugCrtAlloc) + { + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + Report(L" CRT Alloc ID: %Iu\n", crtheader->request); + assert(size == crtheader->size); + } +#endif assert(info->callStack); if (m_options & VLD_OPT_AGGREGATE_DUPLICATES) { // Aggregate all other leaks which are duplicates of this one @@ -2428,8 +2436,9 @@ void VisualLeakDetector::setupReporting() } } -void VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) +int VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) { + int unresolvedFunctionsCount = 0; BlockMap& blockmap = heapinfo->blockMap; for (BlockMap::Iterator blockit = blockmap.begin(); blockit != blockmap.end(); ++blockit) { @@ -2466,16 +2475,18 @@ void VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) // Dump the call stack. if (info->callStack) { - info->callStack->resolve(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + unresolvedFunctionsCount += info->callStack->resolve(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); } } + return unresolvedFunctionsCount; } -void VisualLeakDetector::ResolveCallstacks() +int VisualLeakDetector::ResolveCallstacks() { if (m_options & VLD_OPT_VLDOFF) - return; + return 0; + int unresolvedFunctionsCount = 0; // Generate the Callstacks early CriticalSectionLocker cs(m_heapMapLock); for (HeapMap::Iterator heapiter = m_heapMap->begin(); heapiter != m_heapMap->end(); ++heapiter) @@ -2483,6 +2494,7 @@ void VisualLeakDetector::ResolveCallstacks() HANDLE heap = (*heapiter).first; UNREFERENCED_PARAMETER(heap); heapinfo_t* heapinfo = (*heapiter).second; - resolveStacks(heapinfo); + unresolvedFunctionsCount += resolveStacks(heapinfo); } + return unresolvedFunctionsCount; } diff --git a/src/vld.h b/src/vld.h index c9f6a5a3..ee6b60f4 100644 --- a/src/vld.h +++ b/src/vld.h @@ -101,7 +101,7 @@ __declspec(dllimport) void VLDEnable (); __declspec(dllimport) void VLDRestore (); // VLDGlobalDisable - Disables Visual Leak Detector's memory leak detection at -// runtime in all threads. If memory leak detection is already disabled, +// runtime in all threads. If memory leak detection is already disabled, // then calling this function has no effect. // // Return Value: @@ -110,8 +110,8 @@ __declspec(dllimport) void VLDRestore (); // __declspec(dllimport) void VLDGlobalDisable (); -// VLDGlobalEnable - Enables Visual Leak Detector's memory leak detection -// at runtime in all threads. If memory leak detection is already enabled, +// VLDGlobalEnable - Enables Visual Leak Detector's memory leak detection +// at runtime in all threads. If memory leak detection is already enabled, // which it is by default, then calling this function has no effect. // // Return Value: @@ -288,7 +288,7 @@ __declspec(dllimport) VLD_BOOL VLDGetModulesList(wchar_t *modules, VLD_UINT size // __declspec(dllimport) void VLDSetReportOptions(VLD_UINT option_mask, const wchar_t *filename); -// VLDSetReportHook - Installs or uninstalls a client-defined reporting function by hooking it +// VLDSetReportHook - Installs or uninstalls a client-defined reporting function by hooking it // into the C run-time debug reporting process (debug version only). // // mode: The action to take: VLD_RPTHOOK_INSTALL or VLD_RPTHOOK_REMOVE. @@ -302,17 +302,17 @@ __declspec(dllimport) void VLDSetReportOptions(VLD_UINT option_mask, const wchar __declspec(dllimport) int VLDSetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook); // VLDResolveCallstacks - Performs symbol resolution for all saved extent CallStack's that have -// been tracked by Visual Leak Detector. This function is necessary for applications that +// been tracked by Visual Leak Detector. This function is necessary for applications that // dynamically load and unload modules, and through which memory leaks might be included. -// If this is NOT called, stack traces may have stack frames with no symbol information. This +// If this is NOT called, stack traces may have stack frames with no symbol information. This // happens because the symbol API's cannot look up symbols for a binary / module that has been unloaded // from the process. // // Return Value: // -// None. +// int: 0 if successfully resolved all callstacks. // -__declspec(dllexport) void VLDResolveCallstacks(); +__declspec(dllexport) int VLDResolveCallstacks(); #ifdef __cplusplus } @@ -341,6 +341,6 @@ __declspec(dllexport) void VLDResolveCallstacks(); #define VLDSetModulesList(a) #define VLDGetModulesList(a, b) (FALSE) #define VLDSetReportOptions(a, b) -#define VLDResolveCallstacks() +#define VLDResolveCallstacks() (0) #endif // _DEBUG diff --git a/src/vldapi.cpp b/src/vldapi.cpp index 245312d2..fb0e57a8 100644 --- a/src/vldapi.cpp +++ b/src/vldapi.cpp @@ -142,9 +142,9 @@ __declspec(dllexport) void VLDSetReportOptions(UINT option_mask, CONST WCHAR *fi g_vld.SetReportOptions(option_mask,filename); } -__declspec(dllexport) void VLDResolveCallstacks() +__declspec(dllexport) int VLDResolveCallstacks() { - g_vld.ResolveCallstacks(); + return g_vld.ResolveCallstacks(); } } diff --git a/src/vldint.h b/src/vldint.h index 80e7bf89..697eccc8 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -285,7 +285,7 @@ class VisualLeakDetector : public IMalloc int SetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook); VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); bool GetModulesList(WCHAR *modules, UINT size); - VOID ResolveCallstacks(); + int ResolveCallstacks(); static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, PHANDLE modulehandle); @@ -316,7 +316,7 @@ class VisualLeakDetector : public IMalloc VOID markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); VOID unmapBlock (HANDLE heap, LPCVOID mem, const context_t &context); VOID unmapHeap (HANDLE heap); - void resolveStacks(heapinfo_t* heapinfo); + int resolveStacks(heapinfo_t* heapinfo); // Static functions (callbacks) static BOOL __stdcall addLoadedModule (PCWSTR modulepath, DWORD64 modulebase, ULONG modulesize, PVOID context); From 987226bd8c27979321df095eddd6fdb8bb8670cb Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Wed, 12 Aug 2015 02:04:32 +0300 Subject: [PATCH 211/321] Stackoverflow with StackWalkMethod=safe fixed again --- src/vld.cpp | 9 +-------- src/vld_hooks.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index cde48abe..20ead596 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -1987,15 +1987,8 @@ VOID VisualLeakDetector::RefreshModules() void VisualLeakDetector::getCallStack( CallStack *&pcallstack, context_t &context_ ) { CallStack* callstack = CallStack::Create(); - - // Reset thread local flags and variables, in case any libraries called - // into while mapping the block allocate some memory. - context_t context = context_; pcallstack = callstack; - context_.fp = 0x0; - context_.func = 0x0; - - callstack->getStackTrace(g_vld.m_maxTraceFrames, context); + callstack->getStackTrace(g_vld.m_maxTraceFrames, context_); } // Find the information for the module that initiated this reallocation. diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 74c0cf1c..2d8eb217 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -49,14 +49,15 @@ void VisualLeakDetector::firstAllocCall(tls_t * tls) if (tls->pblockInfo) { tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; + blockinfo_t* pblockInfo = tls->pblockInfo; + tls->pblockInfo = NULL; CallStack* callstack; getCallStack(callstack, tls->context); - tls->pblockInfo->callStack.reset(callstack); - tls->pblockInfo = NULL; + pblockInfo->callStack.reset(callstack); } // Reset thread local flags and variables for the next allocation. - tls->context.fp = 0x0; + tls->context.fp = NULL; tls->context.func = 0x0; tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; } @@ -186,7 +187,7 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntim if (debugRuntime) tls->flags |= VLD_TLS_DEBUGCRTALLOC; - bool firstcall = (tls->context.fp == 0x0); + bool firstcall = (tls->context.fp == NULL); if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. From d86aeaa7fb3c9fee82216388699515b90388ba8a Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 14 Aug 2015 02:35:04 +0300 Subject: [PATCH 212/321] Visual Studio 2013 solution added --- .gitignore | 1 + lib/gtest/msvc/gtest_vs12.vcxproj | 275 ++++++++ lib/gtest/msvc/gtest_vs12.vcxproj.filters | 18 + src/tests/basics/basics_vs12.vcxproj | 507 +++++++++++++++ src/tests/basics/basics_vs12.vcxproj.filters | 45 ++ src/tests/corruption/corruption_vs12.vcxproj | 471 ++++++++++++++ .../corruption_vs12.vcxproj.filters | 39 ++ .../dynamic_app/dynamic_app_vs12.vcxproj | 501 ++++++++++++++ .../dynamic_app_vs12.vcxproj.filters | 45 ++ src/tests/dynamic_dll/dynamic_vs12.vcxproj | 470 ++++++++++++++ .../dynamic_dll/dynamic_vs12.vcxproj.filters | 45 ++ src/tests/mfc/vldmfc_vs12.vcxproj | 611 ++++++++++++++++++ src/tests/mfc/vldmfc_vs12.vcxproj.filters | 55 ++ src/tests/mfc_dll/mfc_vs12.vcxproj | 554 ++++++++++++++++ src/tests/mfc_dll/mfc_vs12.vcxproj.filters | 52 ++ src/tests/suite/testsuite_vs12.vcxproj | 509 +++++++++++++++ .../suite/testsuite_vs12.vcxproj.filters | 22 + src/vld_vs12.vcxproj | 240 +++++++ src/vld_vs12.vcxproj.filters | 104 +++ vld_vs12.sln | 295 +++++++++ 20 files changed, 4859 insertions(+) create mode 100644 lib/gtest/msvc/gtest_vs12.vcxproj create mode 100644 lib/gtest/msvc/gtest_vs12.vcxproj.filters create mode 100644 src/tests/basics/basics_vs12.vcxproj create mode 100644 src/tests/basics/basics_vs12.vcxproj.filters create mode 100644 src/tests/corruption/corruption_vs12.vcxproj create mode 100644 src/tests/corruption/corruption_vs12.vcxproj.filters create mode 100644 src/tests/dynamic_app/dynamic_app_vs12.vcxproj create mode 100644 src/tests/dynamic_app/dynamic_app_vs12.vcxproj.filters create mode 100644 src/tests/dynamic_dll/dynamic_vs12.vcxproj create mode 100644 src/tests/dynamic_dll/dynamic_vs12.vcxproj.filters create mode 100644 src/tests/mfc/vldmfc_vs12.vcxproj create mode 100644 src/tests/mfc/vldmfc_vs12.vcxproj.filters create mode 100644 src/tests/mfc_dll/mfc_vs12.vcxproj create mode 100644 src/tests/mfc_dll/mfc_vs12.vcxproj.filters create mode 100644 src/tests/suite/testsuite_vs12.vcxproj create mode 100644 src/tests/suite/testsuite_vs12.vcxproj.filters create mode 100644 src/vld_vs12.vcxproj create mode 100644 src/vld_vs12.vcxproj.filters create mode 100644 vld_vs12.sln diff --git a/.gitignore b/.gitignore index 45291193..fbf3918e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ ipch/ setup/vld-*-setup.exe setup/Output/ lib/gtest/msvc/bin/ +_ReSharper.Caches/ diff --git a/lib/gtest/msvc/gtest_vs12.vcxproj b/lib/gtest/msvc/gtest_vs12.vcxproj new file mode 100644 index 00000000..2b84d5a7 --- /dev/null +++ b/lib/gtest/msvc/gtest_vs12.vcxproj @@ -0,0 +1,275 @@ + + + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} + Win32Proj + libgtest + 8.1 + libgtest + + + + StaticLibrary + v120_xp + MultiByte + + + StaticLibrary + v120_xp + MultiByte + + + StaticLibrary + v120_xp + MultiByte + + + StaticLibrary + v120_xp + MultiByte + + + StaticLibrary + v120_xp + MultiByte + + + StaticLibrary + v120_xp + MultiByte + + + StaticLibrary + v120_xp + MultiByte + + + StaticLibrary + v120_xp + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + $(OutDir)gtestd.lib + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + $(OutDir)gtestd.lib + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)gtestd.lib + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + $(OutDir)gtestd.lib + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + $(OutDir)gtest.lib + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + $(OutDir)gtest.lib + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + $(OutDir)gtest.lib + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + $(OutDir)gtest.lib + + + + + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_vs12.vcxproj.filters b/lib/gtest/msvc/gtest_vs12.vcxproj.filters new file mode 100644 index 00000000..b566f891 --- /dev/null +++ b/lib/gtest/msvc/gtest_vs12.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/basics/basics_vs12.vcxproj b/src/tests/basics/basics_vs12.vcxproj new file mode 100644 index 00000000..7f66e0fb --- /dev/null +++ b/src/tests/basics/basics_vs12.vcxproj @@ -0,0 +1,507 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {0943354A-41E0-4215-878A-8D0FE758052C} + Win32Proj + test_basics + test_basics + 8.1 + + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + false + v120_xp + + + Application + true + Unicode + false + v120_xp + + + Application + true + Unicode + false + v120_xp + + + Application + true + Unicode + false + v120_xp + + + Application + false + true + Unicode + v120_xp + + + Application + false + true + Unicode + v120_xp + + + Application + false + true + Unicode + v120_xp + + + Application + false + true + Unicode + v120_xp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + MultiThreadedDebug + + + Console + true + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + MultiThreadedDebug + + + Console + true + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + MultiThreadedDebug + + + Console + true + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + MultiThreadedDebug + + + Console + true + NotSet + %(AdditionalDependencies) + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + Use + MaxSpeed + true + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + false + true + + + + + + \ No newline at end of file diff --git a/src/tests/basics/basics_vs12.vcxproj.filters b/src/tests/basics/basics_vs12.vcxproj.filters new file mode 100644 index 00000000..fdb7dc5a --- /dev/null +++ b/src/tests/basics/basics_vs12.vcxproj.filters @@ -0,0 +1,45 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/corruption/corruption_vs12.vcxproj b/src/tests/corruption/corruption_vs12.vcxproj new file mode 100644 index 00000000..1b893d84 --- /dev/null +++ b/src/tests/corruption/corruption_vs12.vcxproj @@ -0,0 +1,471 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} + Win32Proj + corruption + 8.1 + corruption + + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + false + true + Unicode + v120_xp + + + Application + false + true + Unicode + v120_xp + + + Application + false + true + Unicode + v120_xp + + + Application + false + true + Unicode + v120_xp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level3 + + + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + false + + + + + + \ No newline at end of file diff --git a/src/tests/corruption/corruption_vs12.vcxproj.filters b/src/tests/corruption/corruption_vs12.vcxproj.filters new file mode 100644 index 00000000..9194b4d8 --- /dev/null +++ b/src/tests/corruption/corruption_vs12.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/dynamic_app/dynamic_app_vs12.vcxproj b/src/tests/dynamic_app/dynamic_app_vs12.vcxproj new file mode 100644 index 00000000..183c7044 --- /dev/null +++ b/src/tests/dynamic_app/dynamic_app_vs12.vcxproj @@ -0,0 +1,501 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} + Win32Proj + dynamic_app + 8.1 + dynamic_app + + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + true + Unicode + v120_xp + + + Application + false + true + Unicode + v120_xp + + + Application + false + true + Unicode + v120_xp + + + Application + false + true + Unicode + v120_xp + + + Application + false + true + Unicode + v120_xp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + true + + + + true + + + true + + + true + true + + + true + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + MaxSpeed + true + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Level4 + + + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + + + + + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + false + + + {3aea2aaf-3e9b-466f-b361-560b95ad88b4} + false + false + false + false + false + + + {2178e5b2-1032-441f-a664-f3d8d1fd1913} + false + false + false + false + + + + + + \ No newline at end of file diff --git a/src/tests/dynamic_app/dynamic_app_vs12.vcxproj.filters b/src/tests/dynamic_app/dynamic_app_vs12.vcxproj.filters new file mode 100644 index 00000000..72fba51d --- /dev/null +++ b/src/tests/dynamic_app/dynamic_app_vs12.vcxproj.filters @@ -0,0 +1,45 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/dynamic_dll/dynamic_vs12.vcxproj b/src/tests/dynamic_dll/dynamic_vs12.vcxproj new file mode 100644 index 00000000..826dd205 --- /dev/null +++ b/src/tests/dynamic_dll/dynamic_vs12.vcxproj @@ -0,0 +1,470 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + Win32Proj + dynamic + dynamic + 8.1 + + + + DynamicLibrary + true + Unicode + v120_xp + + + DynamicLibrary + true + Unicode + v120_xp + + + DynamicLibrary + true + Unicode + v120_xp + + + DynamicLibrary + true + Unicode + v120_xp + + + DynamicLibrary + true + Unicode + v120_xp + + + DynamicLibrary + true + Unicode + v120_xp + + + DynamicLibrary + true + Unicode + v120_xp + + + DynamicLibrary + true + Unicode + v120_xp + + + DynamicLibrary + false + true + Unicode + v120_xp + + + DynamicLibrary + false + true + Unicode + v120_xp + + + DynamicLibrary + false + true + Unicode + v120_xp + + + DynamicLibrary + false + true + Unicode + v120_xp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + + + + + + + + + + + + false + false + false + false + false + false + false + false + + + + + + + + + + + + + + + + + false + false + false + false + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + + + + + + \ No newline at end of file diff --git a/src/tests/dynamic_dll/dynamic_vs12.vcxproj.filters b/src/tests/dynamic_dll/dynamic_vs12.vcxproj.filters new file mode 100644 index 00000000..52e065e3 --- /dev/null +++ b/src/tests/dynamic_dll/dynamic_vs12.vcxproj.filters @@ -0,0 +1,45 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/mfc/vldmfc_vs12.vcxproj b/src/tests/mfc/vldmfc_vs12.vcxproj new file mode 100644 index 00000000..44ad9eae --- /dev/null +++ b/src/tests/mfc/vldmfc_vs12.vcxproj @@ -0,0 +1,611 @@ + + + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {A231973E-072A-428E-982E-5363ADD1CDE2} + MFCProj + 8.1 + vldmfc + vldmfc + + + + Application + Dynamic + Unicode + v120_xp + + + Application + Static + Unicode + v120_xp + + + Application + Dynamic + Unicode + v120_xp + + + Application + Static + Unicode + v120_xp + + + Application + Dynamic + Unicode + v120_xp + + + Application + Static + Unicode + v120_xp + + + Application + Dynamic + Unicode + v120_xp + + + Application + Static + Unicode + v120_xp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + false + false + false + false + true + true + true + true + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + + + + + + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + Windows + false + + + MachineX86 + true + + + true + .\Release/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + Windows + false + + + MachineX86 + true + + + true + .\Release/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + Windows + false + + + true + + + true + .\Release/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/vldmfc.tlb + + + + + MaxSpeed + OnlyExplicitInline + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + true + Use + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + Windows + false + + + true + + + true + .\Release/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + true + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/vldmfc.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + true + Windows + false + + + MachineX86 + + + true + .\Debug/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/vldmfc.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + true + Windows + false + + + + + true + .\Debug/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/vldmfc.tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + stdafx.h + .\Debug/vldmfc.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)\vldmfc.exe + true + true + Windows + false + + + + + true + .\Debug/vldmfc.bsc + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + Create + Create + Create + Create + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + Create + Create + Create + Create + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/tests/mfc/vldmfc_vs12.vcxproj.filters b/src/tests/mfc/vldmfc_vs12.vcxproj.filters new file mode 100644 index 00000000..2aeb011e --- /dev/null +++ b/src/tests/mfc/vldmfc_vs12.vcxproj.filters @@ -0,0 +1,55 @@ + + + + + {34f1f2ae-d745-4d33-82c0-d281bca28a63} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {716aeea6-27e4-47d9-9d4e-4a9d35551f9c} + h;hpp;hxx;hm;inl + + + {468ee78d-f409-4040-95ff-fd2928868302} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/src/tests/mfc_dll/mfc_vs12.vcxproj b/src/tests/mfc_dll/mfc_vs12.vcxproj new file mode 100644 index 00000000..49f4aa61 --- /dev/null +++ b/src/tests/mfc_dll/mfc_vs12.vcxproj @@ -0,0 +1,554 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {2178E5B2-1032-441F-A664-F3D8D1FD1913} + test_mfc + MFCDLLProj + test_mfc + 8.1 + + + + DynamicLibrary + true + Unicode + Dynamic + v120_xp + + + DynamicLibrary + true + Unicode + Static + v120_xp + + + DynamicLibrary + true + Unicode + Dynamic + v120_xp + + + DynamicLibrary + true + Unicode + Static + v120_xp + + + DynamicLibrary + true + Unicode + Dynamic + v120_xp + + + DynamicLibrary + true + Unicode + Static + v120_xp + + + DynamicLibrary + true + Unicode + Dynamic + v120_xp + + + DynamicLibrary + true + Unicode + Static + v120_xp + + + DynamicLibrary + false + true + Unicode + Dynamic + v120_xp + + + DynamicLibrary + false + true + Unicode + Static + v120_xp + + + DynamicLibrary + false + true + Unicode + Dynamic + v120_xp + + + DynamicLibrary + false + true + Unicode + Static + v120_xp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + false + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + .\mfc.def + + + false + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/tests/mfc_dll/mfc_vs12.vcxproj.filters b/src/tests/mfc_dll/mfc_vs12.vcxproj.filters new file mode 100644 index 00000000..656c5de1 --- /dev/null +++ b/src/tests/mfc_dll/mfc_vs12.vcxproj.filters @@ -0,0 +1,52 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Resource Files + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/tests/suite/testsuite_vs12.vcxproj b/src/tests/suite/testsuite_vs12.vcxproj new file mode 100644 index 00000000..72c0848e --- /dev/null +++ b/src/tests/suite/testsuite_vs12.vcxproj @@ -0,0 +1,509 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} + testsuite + + + + + + + + + 8.1 + testsuite + + + + Application + NotSet + v120_xp + + + Application + NotSet + v120_xp + + + Application + NotSet + v120_xp + + + Application + NotSet + v120_xp + + + Application + NotSet + v120_xp + + + Application + NotSet + v120_xp + + + Application + NotSet + v120_xp + + + Application + NotSet + v120_xp + + + Application + NotSet + v120_xp + + + Application + NotSet + v120_xp + + + Application + NotSet + v120_xp + + + Application + NotSet + v120_xp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + + + + + + + + + + + + Disabled + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + EditAndContinue + false + + + true + Console + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Disabled + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + EditAndContinue + false + + + true + Console + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Full + VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) + MultiThreadedDLL + true + true + + + true + true + true + Console + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Full + VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + true + true + true + Console + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Disabled + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + EditAndContinue + true + + + true + Console + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + Disabled + WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + EditAndContinue + true + + + true + Console + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + ProgramDatabase + false + + + true + MachineX64 + Console + + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + ProgramDatabase + false + + + true + MachineX64 + Console + + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Full + VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) + MultiThreadedDLL + true + true + + + true + true + MachineX64 + true + Console + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Full + VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + true + true + MachineX64 + true + Console + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + false + ProgramDatabase + true + + + true + MachineX64 + true + Console + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + X64 + + + Disabled + WIN64;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + false + ProgramDatabase + true + + + true + MachineX64 + true + Console + + + call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + Copying over Visual Leak Detector Dependencies + + + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + true + false + + + + + + \ No newline at end of file diff --git a/src/tests/suite/testsuite_vs12.vcxproj.filters b/src/tests/suite/testsuite_vs12.vcxproj.filters new file mode 100644 index 00000000..31a8fddb --- /dev/null +++ b/src/tests/suite/testsuite_vs12.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + \ No newline at end of file diff --git a/src/vld_vs12.vcxproj b/src/vld_vs12.vcxproj new file mode 100644 index 00000000..e06f79e1 --- /dev/null +++ b/src/vld_vs12.vcxproj @@ -0,0 +1,240 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + vld + + + + + + + + + Unicode + DynamicLibrary + true + x86 + x64 + 8.1 + vld + + + + + v120_xp + + + v120_xp + + + v120_xp + + + v120_xp + + + + + <_ProjectFileVersion>10.0.30128.1 + $(ProjectDir)bin\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + NativeRecommendedRules.ruleset + $(ProjectName)_$(NumericPlatform) + .dll + + + false + + + false + + + false + NativeRecommendedRules.ruleset + + + false + NativeRecommendedRules.ruleset + + + + $(SolutionDir)\lib\dbghelp\include;$(SolutionDir)\setup;%(AdditionalIncludeDirectories) + Use + + + true + 0x03200000 + false + $(SolutionDir)\lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) + + + + + + + copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + + + $(SolutionDir)\setup + + + + + Disabled + _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + EditAndContinue + false + 4201;4229 + + + psapi.lib;%(AdditionalDependencies) + Windows + + + vld.dll.dependency.x86.manifest + + + + + Disabled + _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + ProgramDatabase + 4201;4229 + false + + + MachineX64 + psapi.lib;%(AdditionalDependencies) + Windows + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + OldStyle + false + 4201;4229 + false + + + true + true + %(AdditionalDependencies) + Windows + + + vld.dll.dependency.x86.manifest + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + OldStyle + false + false + 4201;4229 + false + + + true + true + MachineX64 + true + %(AdditionalDependencies) + Windows + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/vld_vs12.vcxproj.filters b/src/vld_vs12.vcxproj.filters new file mode 100644 index 00000000..02ecff1d --- /dev/null +++ b/src/vld_vs12.vcxproj.filters @@ -0,0 +1,104 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + + \ No newline at end of file diff --git a/vld_vs12.sln b/vld_vs12.sln new file mode 100644 index 00000000..5f170c32 --- /dev/null +++ b/vld_vs12.sln @@ -0,0 +1,295 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld_vs12.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics_vs12.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite_vs12.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic_vs12.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app_vs12.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" + ProjectSection(ProjectDependencies) = postProject + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "src\tests\mfc_dll\mfc_vs12.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "src\tests\mfc\vldmfc_vs12.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption_vs12.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest_vs12.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 + Debug(Release)_StaticCrt|x64 = Debug(Release)_StaticCrt|x64 + Debug(Release)|Win32 = Debug(Release)|Win32 + Debug(Release)|x64 = Debug(Release)|x64 + Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 + Debug_StaticCrt|x64 = Debug_StaticCrt|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_StaticCrt|Win32 = Release_StaticCrt|Win32 + Release_StaticCrt|x64 = Release_StaticCrt|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + EndGlobalSection +EndGlobal From 1aa7edfc278e6956414769d33618eda7c918b444 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 14 Aug 2015 03:44:59 +0300 Subject: [PATCH 213/321] Improved allocation from dbghelp.dll handling --- src/tests/suite/testsuite.cpp | 9 +++++- src/vld.cpp | 5 ++- src/vld.natvis | 10 ++++++ src/vld_hooks.cpp | 60 +++++++++++++---------------------- src/vldint.h | 8 +++-- 5 files changed, 48 insertions(+), 44 deletions(-) diff --git a/src/tests/suite/testsuite.cpp b/src/tests/suite/testsuite.cpp index 403f7151..c7357ba0 100644 --- a/src/tests/suite/testsuite.cpp +++ b/src/tests/suite/testsuite.cpp @@ -84,14 +84,21 @@ enum action_e { #endif #endif +#define FASTSTACKWALK + +#ifdef FASTSTACKWALK #define MAXALLOC 1000 // Maximum number of allocations of each type to perform, per thread +static const int NUMTHREADS = 63; // Number of threads to run simultaneously +#else +#define MAXALLOC 10 // Maximum number of allocations of each type to perform, per thread +static const int NUMTHREADS = 15; // Number of threads to run simultaneously +#endif #define MAXBLOCKS (MAXALLOC * numactions) // Total maximum number of allocations, per thread #define MAXDEPTH 32 // Maximum depth of the allocation call stack #define MAXSIZE 64 // Maximum block size to allocate #define MINDEPTH 0 // Minimum depth of the allocation call stack #define MINSIZE 16 // Minimum block size to allocate static const int NUMDUPLEAKS = 3; // Number of times to duplicate each leak -static const int NUMTHREADS = 63; // Number of threads to run simultaneously #define ONCEINAWHILE 10 // Free a random block approx. once every... struct blockholder_t { diff --git a/src/vld.cpp b/src/vld.cpp index 20ead596..f2b49ee2 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -1042,7 +1042,6 @@ tls_t* VisualLeakDetector::getTls () tls->oldFlags = 0x0; tls->threadId = threadId; tls->pblockInfo = NULL; - tls->blockProcessed = FALSE; } return tls; @@ -1984,11 +1983,11 @@ VOID VisualLeakDetector::RefreshModules() delete oldmodules; } -void VisualLeakDetector::getCallStack( CallStack *&pcallstack, context_t &context_ ) +void VisualLeakDetector::getCallStack( CallStack *&pcallstack, context_t &context ) { CallStack* callstack = CallStack::Create(); pcallstack = callstack; - callstack->getStackTrace(g_vld.m_maxTraceFrames, context_); + callstack->getStackTrace(g_vld.m_maxTraceFrames, context); } // Find the information for the module that initiated this reallocation. diff --git a/src/vld.natvis b/src/vld.natvis index ca8daf08..bca5474f 100644 --- a/src/vld.natvis +++ b/src/vld.natvis @@ -81,4 +81,14 @@ + + + + this + next + *this,! + + + + diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 2d8eb217..41430dc4 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -48,18 +48,26 @@ void VisualLeakDetector::firstAllocCall(tls_t * tls) { if (tls->pblockInfo) { - tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; + context_t context = tls->context; blockinfo_t* pblockInfo = tls->pblockInfo; + + // Reset thread local flags and variables in case dbghelp.dll try allocate some data. + tls->context.fp = NULL; + tls->context.func = 0x0; + tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; tls->pblockInfo = NULL; + CallStack* callstack; - getCallStack(callstack, tls->context); + getCallStack(callstack, context); pblockInfo->callStack.reset(callstack); + return; } // Reset thread local flags and variables for the next allocation. tls->context.fp = NULL; tls->context.func = 0x0; tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; + tls->pblockInfo = NULL; } //////////////////////////////////////////////////////////////////////////////// @@ -108,7 +116,6 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -150,7 +157,6 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool de // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -192,7 +198,6 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntim // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -240,7 +245,6 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -289,7 +293,6 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -317,7 +320,6 @@ char* VisualLeakDetector::__strdup( _strdup_t pstrdup, context_t& context, bool // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -345,7 +347,6 @@ wchar_t* VisualLeakDetector::__wcsdup( _wcsdup_t pwcsdup, context_t& context, bo // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -388,7 +389,6 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -431,7 +431,6 @@ void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmal // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -480,7 +479,6 @@ void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -530,7 +528,6 @@ void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t p // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -582,7 +579,6 @@ void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -635,7 +631,6 @@ void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -692,7 +687,6 @@ void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_ // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -750,7 +744,6 @@ void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_db // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -810,7 +803,6 @@ void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_reall // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -871,7 +863,6 @@ void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_ // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -934,7 +925,6 @@ void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_rec // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -998,7 +988,6 @@ void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recallo // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -1065,7 +1054,6 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -1121,7 +1109,6 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -1155,7 +1142,6 @@ char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -1189,7 +1175,6 @@ wchar_t* VisualLeakDetector::__wcsdup_dbg (_wcsdup_dbg_t p_wcsdup_dbg, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -1245,7 +1230,6 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -1296,7 +1280,6 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -1344,7 +1327,6 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -1403,7 +1385,6 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -1463,7 +1444,6 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -1588,7 +1568,6 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si return block; tls_t* tls = g_vld.getTls(); - tls->blockProcessed = TRUE; bool firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { @@ -1600,7 +1579,10 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si context = tls->context; if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + { + assert(tls->pblockInfo == NULL); return block; + } if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { // Begin the stack trace with the current frame. Obtain the current @@ -1632,7 +1614,6 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) return block; tls_t* tls = g_vld.getTls(); - tls->blockProcessed = TRUE; bool firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { @@ -1644,7 +1625,10 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) context = tls->context; if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + { + assert(tls->pblockInfo == NULL); return block; + } if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { // Begin the stack trace with the current frame. Obtain the current @@ -1765,7 +1749,6 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID return newmem; tls_t *tls = g_vld.getTls(); - tls->blockProcessed = TRUE; bool firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { @@ -1777,7 +1760,10 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID context = tls->context; if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + { + assert(tls->pblockInfo == NULL); return newmem; + } if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { // Begin the stack trace with the current frame. Obtain the current @@ -1811,7 +1797,6 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S return newmem; tls_t *tls = g_vld.getTls(); - tls->blockProcessed = TRUE; bool firstcall = (tls->context.fp == 0x0); context_t context; if (firstcall) { @@ -1823,7 +1808,10 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S context = tls->context; if (isModuleExcluded(GET_RETURN_ADDRESS(context))) + { + assert(tls->pblockInfo == NULL); return newmem; + } if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { // Begin the stack trace with the current frame. Obtain the current @@ -1965,7 +1953,6 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) // Record the current frame pointer. CAPTURE_CONTEXT(context, pCoTaskMemAlloc); tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -2015,7 +2002,6 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) // Record the current frame pointer. CAPTURE_CONTEXT(context, pCoTaskMemRealloc); tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. @@ -2075,7 +2061,6 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) // Record the current frame pointer. CAPTURE_CONTEXT(context, NULL); tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlAllocateHeap. @@ -2212,7 +2197,6 @@ LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) // Record the current frame pointer. CAPTURE_CONTEXT(context, NULL); tls->context = context; - tls->blockProcessed = FALSE; } // Do the allocation. The block will be mapped by _RtlReAllocateHeap. diff --git a/src/vldint.h b/src/vldint.h index 697eccc8..4f65b273 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -166,11 +166,15 @@ struct tls_t { #define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. #define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. UINT32 oldFlags; // Thread-local status old flags - BOOL blockProcessed; // Internal diagnostic feature DWORD threadId; // Thread ID of the thread that owns this TLS structure. blockinfo_t* pblockInfo; // Store pointer to callstack. }; +// Allocation state: +// 1. Allocation function set tls->context and tls->pblockInfo = NULL +// 2. HeapAlloc set tls->pblockInfo and map block +// 3. Allocation function reset tls data and capture callstack to tls->pblockInfo + // The TlsSet allows VLD to keep track of all thread local storage structures // allocated in the process. typedef Map TlsMap; @@ -220,7 +224,7 @@ class VisualLeakDetector : public IMalloc // Standard CRT and MFC common handlers void* _calloc (calloc_t pcalloc, context_t& context, bool debugRuntime, size_t num, size_t size); void* _malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size); - void* _new (new_t pnew, context_t& context, bool debugRuntime, size_t size); + void* _new (new_t pnew, context_t& context, bool debugRuntime, size_t size); void* _realloc (realloc_t prealloc, context_t& context, bool debugRuntime, void *mem, size_t size); void* __recalloc (_recalloc_t precalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size); char* __strdup(_strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src); From 4f6bb01b7a1c117e607abcd24576df449d4c21fb Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 20 Aug 2015 02:52:45 +0300 Subject: [PATCH 214/321] Support text formating using cppformat, this will help avoid deadlock because of calling _snwprintf_s --- .gitignore | 1 + lib/cppformat/ChangeLog.rst | 335 ++++ lib/cppformat/LICENSE.rst | 23 + lib/cppformat/format.cc | 1169 ++++++++++++ lib/cppformat/format.h | 2649 ++++++++++++++++++++++++++ lib/cppformat/format.vcxproj | 202 ++ lib/cppformat/format.vcxproj.filters | 27 + lib/cppformat/posix.cc | 242 +++ lib/cppformat/posix.h | 337 ++++ src/callstack.cpp | 70 +- src/tests/suite/testsuite.cpp | 50 +- src/utility.h | 6 +- src/vld.vcxproj | 7 +- vld_vs12.sln | 2 +- vld_vs14.sln | 27 + 15 files changed, 5100 insertions(+), 47 deletions(-) create mode 100644 lib/cppformat/ChangeLog.rst create mode 100644 lib/cppformat/LICENSE.rst create mode 100644 lib/cppformat/format.cc create mode 100644 lib/cppformat/format.h create mode 100644 lib/cppformat/format.vcxproj create mode 100644 lib/cppformat/format.vcxproj.filters create mode 100644 lib/cppformat/posix.cc create mode 100644 lib/cppformat/posix.h diff --git a/.gitignore b/.gitignore index fbf3918e..438b1e0d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ setup/vld-*-setup.exe setup/Output/ lib/gtest/msvc/bin/ _ReSharper.Caches/ +lib/cppformat/bin/ diff --git a/lib/cppformat/ChangeLog.rst b/lib/cppformat/ChangeLog.rst new file mode 100644 index 00000000..fe780ae0 --- /dev/null +++ b/lib/cppformat/ChangeLog.rst @@ -0,0 +1,335 @@ +1.1.0 - 2015-03-06 +------------------ + +* Added ``BasicArrayWriter``, a class template that provides operations for + formatting and writing data into a fixed-size array + (`#105 `_ and + `#122 `_): + + .. code:: c++ + + char buffer[100]; + fmt::ArrayWriter w(buffer); + w.write("The answer is {}", 42); + +* Added `0 A.D. `_ and `PenUltima Online (POL) + `_ to the list of notable projects using C++ Format. + +* C++ Format now uses MSVC intrinsics for better formatting performance + (`#115 `_, + `#116 `_, + `#118 `_ and + `#121 `_). + Previously these optimizations where only used on GCC and Clang. + Thanks to `@CarterLi `_ and + `@objectx `_. + +* CMake install target (`#119 `_). + Thanks to `@TrentHouliston `_. + + You can now install C++ Format with ``make install`` command. + +* Improved `Biicode `_ support + (`#98 `_ and + `#104 `_). Thanks to + `@MariadeAnton `_ and + `@franramirez688 `_. + +* Improved support for bulding with `Android NDK + `_ + (`#107 `_). + Thanks to `@newnon `_. + + The `android-ndk-example `_ + repository provides and example of using C++ Format with Android NDK: + + .. image:: https://raw.githubusercontent.com/cppformat/android-ndk-example/ + master/screenshot.png + +* Improved documentation of ``SystemError`` and ``WindowsError`` + (`#54 `_). + +* Various code improvements + (`#110 `_, + `#111 `_ + `#112 `_). + Thanks to `@CarterLi `_. + +* Improved compile-time errors when formatting wide into narrow strings + (`#117 `_). + +* Fixed ``BasicWriter::write`` without formatting arguments when C++11 support + is disabled (`#109 `_). + +* Fixed header-only build on OS X with GCC 4.9 + (`#124 `_). + +* Fixed packaging issues (`#94 `_). + +* Fixed warnings in GCC, MSVC and Xcode/Clang + (`#95 `_, + `#96 `_ and + `#114 `_). + +* Added `changelog `_ + (`#103 `_). + +1.0.0 - 2015-02-05 +------------------ + +* Add support for a header-only configuration when ``FMT_HEADER_ONLY`` is + defined before including ``format.h``: + + .. code:: c++ + + #define FMT_HEADER_ONLY + #include "format.h" + +* Compute string length in the constructor of ``BasicStringRef`` + instead of the ``size`` method + (`#79 `_). + This eliminates size computation for string literals on reasonable optimizing + compilers. + +* Fix formatting of types with overloaded ``operator <<`` for ``std::wostream`` + (`#86 `_): + + .. code:: c++ + + fmt::format(L"The date is {0}", Date(2012, 12, 9)); + +* Fix linkage of tests on Arch Linux + (`#89 `_). + +* Allow precision specifier for non-float arguments + (`#90 `_): + + .. code:: c++ + + fmt::print("{:.3}\n", "Carpet"); // prints "Car" + +* Fix build on Android NDK + (`#93 `_) + +* Improvements to documentation build procedure. + +* Remove ``FMT_SHARED`` CMake variable in favor of standard `BUILD_SHARED_LIBS + `_. + +* Fix error handling in ``fmt::fprintf``. + +* Fix a number of warnings. + +0.12.0 - 2014-10-25 +------------------- + +* [Breaking] Improved separation between formatting and buffer management. + ``Writer`` is now a base class that cannot be instantiated directly. + The new ``MemoryWriter`` class implements the default buffer management + with small allocations done on stack. So ``fmt::Writer`` should be replaced + with ``fmt::MemoryWriter`` in variable declarations. + + Old code: + + .. code:: c++ + + fmt::Writer w; + + New code: + + .. code:: c++ + + fmt::MemoryWriter w; + + If you pass ``fmt::Writer`` by reference, you can continue to do so: + + .. code:: c++ + + void f(fmt::Writer &w); + + This doesn't affect the formatting API. + +* Support for custom memory allocators + (`#69 `_) + +* Formatting functions now accept `signed char` and `unsigned char` strings as + arguments (`#73 `_): + + .. code:: c++ + + auto s = format("GLSL version: {}", glGetString(GL_VERSION)); + +* Reduced code bloat. According to the new `benchmark results + `_, + cppformat is close to ``printf`` and by the order of magnitude better than + Boost Format in terms of compiled code size. + +* Improved appearance of the documentation on mobile by using the `Sphinx + Bootstrap theme `_: + + .. |old| image:: https://cloud.githubusercontent.com/assets/576385/4792130/ + cd256436-5de3-11e4-9a62-c077d0c2b003.png + + .. |new| image:: https://cloud.githubusercontent.com/assets/576385/4792131/ + cd29896c-5de3-11e4-8f59-cac952942bf0.png + + +-------+-------+ + | Old | New | + +-------+-------+ + | |old| | |new| | + +-------+-------+ + +0.11.0 - 2014-08-21 +------------------- + +* Safe printf implementation with a POSIX extension for positional arguments: + + .. code:: c++ + + fmt::printf("Elapsed time: %.2f seconds", 1.23); + fmt::printf("%1$s, %3$d %2$s", weekday, month, day); + +* Arguments of ``char`` type can now be formatted as integers + (Issue `#55 `_): + + .. code:: c++ + + fmt::format("0x{0:02X}", 'a'); + +* Deprecated parts of the API removed. + +* The library is now built and tested on MinGW with Appveyor in addition to + existing test platforms Linux/GCC, OS X/Clang, Windows/MSVC. + +0.10.0 - 2014-07-01 +------------------- + +**Improved API** + +* All formatting methods are now implemented as variadic functions instead + of using ``operator<<`` for feeding arbitrary arguments into a temporary + formatter object. This works both with C++11 where variadic templates are + used and with older standards where variadic functions are emulated by + providing lightweight wrapper functions defined with the ``FMT_VARIADIC`` + macro. You can use this macro for defining your own portable variadic + functions: + + .. code:: c++ + + void report_error(const char *format, const fmt::ArgList &args) { + fmt::print("Error: {}"); + fmt::print(format, args); + } + FMT_VARIADIC(void, report_error, const char *) + + report_error("file not found: {}", path); + + Apart from a more natural syntax, this also improves performance as there + is no need to construct temporary formatter objects and control arguments' + lifetimes. Because the wrapper functions are very ligthweight, this doesn't + cause code bloat even in pre-C++11 mode. + +* Simplified common case of formatting an ``std::string``. Now it requires a + single function call: + + .. code:: c++ + + std::string s = format("The answer is {}.", 42); + + Previously it required 2 function calls: + + .. code:: c++ + + std::string s = str(Format("The answer is {}.") << 42); + + Instead of unsafe ``c_str`` function, ``fmt::Writer`` should be used directly + to bypass creation of ``std::string``: + + .. code:: c++ + + fmt::Writer w; + w.write("The answer is {}.", 42); + w.c_str(); // returns a C string + + This doesn't do dynamic memory allocation for small strings and is less error + prone as the lifetime of the string is the same as for ``std::string::c_str`` + which is well understood (hopefully). + +* Improved consistency in naming functions that are a part of the public API. + Now all public functions are lowercase following the standard library + conventions. Previously it was a combination of lowercase and + CapitalizedWords. + Issue `#50 `_. + +* Old functions are marked as deprecated and will be removed in the next + release. + +**Other Changes** + +* Experimental support for printf format specifications (work in progress): + + .. code:: c++ + + fmt::printf("The answer is %d.", 42); + std::string s = fmt::sprintf("Look, a %s!", "string"); + +* Support for hexadecimal floating point format specifiers ``a`` and ``A``: + + .. code:: c++ + + print("{:a}", -42.0); // Prints -0x1.5p+5 + print("{:A}", -42.0); // Prints -0X1.5P+5 + +* CMake option ``FMT_SHARED`` that specifies whether to build format as a + shared library (off by default). + +0.9.0 - 2014-05-13 +------------------ + +* More efficient implementation of variadic formatting functions. + +* ``Writer::Format`` now has a variadic overload: + + .. code:: c++ + + Writer out; + out.Format("Look, I'm {}!", "variadic"); + +* For efficiency and consistency with other overloads, variadic overload of + the ``Format`` function now returns ``Writer`` instead of ``std::string``. + Use the ``str`` function to convert it to ``std::string``: + + .. code:: c++ + + std::string s = str(Format("Look, I'm {}!", "variadic")); + +* Replaced formatter actions with output sinks: ``NoAction`` -> ``NullSink``, + ``Write`` -> ``FileSink``, ``ColorWriter`` -> ``ANSITerminalSink``. + This improves naming consistency and shouldn't affect client code unless + these classes are used directly which should be rarely needed. + +* Added ``ThrowSystemError`` function that formats a message and throws + ``SystemError`` containing the formatted message and system-specific error + description. For example, the following code + + .. code:: c++ + + FILE *f = fopen(filename, "r"); + if (!f) + ThrowSystemError(errno, "Failed to open file '{}'") << filename; + + will throw ``SystemError`` exception with description + "Failed to open file '': No such file or directory" if file + doesn't exist. + +* Support for AppVeyor continuous integration platform. + +* ``Format`` now throws ``SystemError`` in case of I/O errors. + +* Improve test infrastructure. Print functions are now tested by redirecting + the output to a pipe. + +0.8.0 - 2014-04-14 +------------------ + +* Initial release diff --git a/lib/cppformat/LICENSE.rst b/lib/cppformat/LICENSE.rst new file mode 100644 index 00000000..b1c96ca0 --- /dev/null +++ b/lib/cppformat/LICENSE.rst @@ -0,0 +1,23 @@ +Copyright (c) 2012 - 2015, Victor Zverovich + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/lib/cppformat/format.cc b/lib/cppformat/format.cc new file mode 100644 index 00000000..13474980 --- /dev/null +++ b/lib/cppformat/format.cc @@ -0,0 +1,1169 @@ +/* + Formatting library for C++ + + Copyright (c) 2012 - 2015, Victor Zverovich + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "format.h" + +#include + +#include +#include +#include +#include +#include + +#ifdef _WIN32 +# ifdef __MINGW32__ +# include +# endif +# include +#endif + +using fmt::internal::Arg; + +// Check if exceptions are disabled. +#if __GNUC__ && !__EXCEPTIONS +# define FMT_EXCEPTIONS 0 +#endif +#if _MSC_VER && !_HAS_EXCEPTIONS +# define FMT_EXCEPTIONS 0 +#endif +#ifndef FMT_EXCEPTIONS +# define FMT_EXCEPTIONS 1 +#endif + +#if FMT_EXCEPTIONS +# define FMT_TRY try +# define FMT_CATCH(x) catch (x) +#else +# define FMT_TRY if (true) +# define FMT_CATCH(x) if (false) +#endif + +#ifndef FMT_THROW +# if FMT_EXCEPTIONS +# define FMT_THROW(x) throw x +# define FMT_RETURN_AFTER_THROW(x) +# else +# define FMT_THROW(x) assert(false) +# define FMT_RETURN_AFTER_THROW(x) return x +# endif +#endif + +#ifdef FMT_HEADER_ONLY +# define FMT_FUNC inline +#else +# define FMT_FUNC +#endif + +#if _MSC_VER +# pragma warning(push) +# pragma warning(disable: 4127) // conditional expression is constant +# pragma warning(disable: 4702) // unreachable code +#endif + +namespace { + +#ifndef _MSC_VER +# define FMT_SNPRINTF snprintf +#else // _MSC_VER +inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) { + va_list args; + va_start(args, format); + int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args); + va_end(args); + return result; +} +# define FMT_SNPRINTF fmt_snprintf +#endif // _MSC_VER + +// Checks if a value fits in int - used to avoid warnings about comparing +// signed and unsigned integers. +template +struct IntChecker { + template + static bool fits_in_int(T value) { + unsigned max = INT_MAX; + return value <= max; + } +}; + +template <> +struct IntChecker { + template + static bool fits_in_int(T value) { + return value >= INT_MIN && value <= INT_MAX; + } +}; + +const char RESET_COLOR[] = "\x1b[0m"; + +typedef void (*FormatFunc)(fmt::Writer &, int, fmt::StringRef); + +// Portable thread-safe version of strerror. +// Sets buffer to point to a string describing the error code. +// This can be either a pointer to a string stored in buffer, +// or a pointer to some static immutable string. +// Returns one of the following values: +// 0 - success +// ERANGE - buffer is not large enough to store the error message +// other - failure +// Buffer should be at least of size 1. +int safe_strerror( + int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT { + assert(buffer != 0 && buffer_size != 0); + int result = 0; +#if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE) || __ANDROID__ + // XSI-compliant version of strerror_r. + result = strerror_r(error_code, buffer, buffer_size); + if (result != 0) + result = errno; +#elif _GNU_SOURCE + // GNU-specific version of strerror_r. + char *message = strerror_r(error_code, buffer, buffer_size); + // If the buffer is full then the message is probably truncated. + if (message == buffer && strlen(buffer) == buffer_size - 1) + result = ERANGE; + buffer = message; +#elif __MINGW32__ + errno = 0; + (void)buffer_size; + buffer = strerror(error_code); + result = errno; +#elif _WIN32 + result = strerror_s(buffer, buffer_size, error_code); + // If the buffer is full then the message is probably truncated. + if (result == 0 && std::strlen(buffer) == buffer_size - 1) + result = ERANGE; +#else + result = strerror_r(error_code, buffer, buffer_size); + if (result == -1) + result = errno; // glibc versions before 2.13 return result in errno. +#endif + return result; +} + +void format_error_code(fmt::Writer &out, int error_code, + fmt::StringRef message) FMT_NOEXCEPT { + // Report error code making sure that the output fits into + // INLINE_BUFFER_SIZE to avoid dynamic memory allocation and potential + // bad_alloc. + out.clear(); + static const char SEP[] = ": "; + static const char ERR[] = "error "; + fmt::internal::IntTraits::MainType ec_value = error_code; + // Subtract 2 to account for terminating null characters in SEP and ERR. + std::size_t error_code_size = + sizeof(SEP) + sizeof(ERR) + fmt::internal::count_digits(ec_value) - 2; + if (message.size() <= fmt::internal::INLINE_BUFFER_SIZE - error_code_size) + out << message << SEP; + out << ERR << error_code; + assert(out.size() <= fmt::internal::INLINE_BUFFER_SIZE); +} + +void report_error(FormatFunc func, + int error_code, fmt::StringRef message) FMT_NOEXCEPT { + fmt::MemoryWriter full_message; + func(full_message, error_code, message); + // Use Writer::data instead of Writer::c_str to avoid potential memory + // allocation. + std::fwrite(full_message.data(), full_message.size(), 1, stderr); + std::fputc('\n', stderr); +} + +// IsZeroInt::visit(arg) returns true iff arg is a zero integer. +class IsZeroInt : public fmt::internal::ArgVisitor { + public: + template + bool visit_any_int(T value) { return value == 0; } +}; + +// Parses an unsigned integer advancing s to the end of the parsed input. +// This function assumes that the first character of s is a digit. +template +int parse_nonnegative_int(const Char *&s) { + assert('0' <= *s && *s <= '9'); + unsigned value = 0; + do { + unsigned new_value = value * 10 + (*s++ - '0'); + // Check if value wrapped around. + if (new_value < value) { + value = UINT_MAX; + break; + } + value = new_value; + } while ('0' <= *s && *s <= '9'); + if (value > INT_MAX) + FMT_THROW(fmt::FormatError("number is too big")); + return value; +} + +inline void require_numeric_argument(const Arg &arg, char spec) { + if (arg.type > Arg::LAST_NUMERIC_TYPE) { + std::string message = + fmt::format("format specifier '{}' requires numeric argument", spec); + FMT_THROW(fmt::FormatError(message)); + } +} + +template +void check_sign(const Char *&s, const Arg &arg) { + char sign = static_cast(*s); + require_numeric_argument(arg, sign); + if (arg.type == Arg::UINT || arg.type == Arg::ULONG_LONG) { + FMT_THROW(fmt::FormatError(fmt::format( + "format specifier '{}' requires signed argument", sign))); + } + ++s; +} + +// Checks if an argument is a valid printf width specifier and sets +// left alignment if it is negative. +class WidthHandler : public fmt::internal::ArgVisitor { + private: + fmt::FormatSpec &spec_; + + FMT_DISALLOW_COPY_AND_ASSIGN(WidthHandler); + + public: + explicit WidthHandler(fmt::FormatSpec &spec) : spec_(spec) {} + + unsigned visit_unhandled_arg() { + FMT_THROW(fmt::FormatError("width is not integer")); + FMT_RETURN_AFTER_THROW(0); + } + + template + unsigned visit_any_int(T value) { + typedef typename fmt::internal::IntTraits::MainType UnsignedType; + UnsignedType width = value; + if (fmt::internal::is_negative(value)) { + spec_.align_ = fmt::ALIGN_LEFT; + width = 0 - width; + } + if (width > INT_MAX) + FMT_THROW(fmt::FormatError("number is too big")); + return static_cast(width); + } +}; + +class PrecisionHandler : + public fmt::internal::ArgVisitor { + public: + unsigned visit_unhandled_arg() { + FMT_THROW(fmt::FormatError("precision is not integer")); + FMT_RETURN_AFTER_THROW(0); + } + + template + int visit_any_int(T value) { + if (!IntChecker::is_signed>::fits_in_int(value)) + FMT_THROW(fmt::FormatError("number is too big")); + return static_cast(value); + } +}; + +// Converts an integer argument to an integral type T for printf. +template +class ArgConverter : public fmt::internal::ArgVisitor, void> { + private: + fmt::internal::Arg &arg_; + wchar_t type_; + + FMT_DISALLOW_COPY_AND_ASSIGN(ArgConverter); + + public: + ArgConverter(fmt::internal::Arg &arg, wchar_t type) + : arg_(arg), type_(type) {} + + template + void visit_any_int(U value) { + bool is_signed = type_ == 'd' || type_ == 'i'; + using fmt::internal::Arg; + if (sizeof(T) <= sizeof(int)) { + // Extra casts are used to silence warnings. + if (is_signed) { + arg_.type = Arg::INT; + arg_.int_value = static_cast(static_cast(value)); + } else { + arg_.type = Arg::UINT; + arg_.uint_value = static_cast( + static_cast::Type>(value)); + } + } else { + if (is_signed) { + arg_.type = Arg::LONG_LONG; + arg_.long_long_value = + static_cast::Type>(value); + } else { + arg_.type = Arg::ULONG_LONG; + arg_.ulong_long_value = + static_cast::Type>(value); + } + } + } +}; + +// Converts an integer argument to char for printf. +class CharConverter : public fmt::internal::ArgVisitor { + private: + fmt::internal::Arg &arg_; + + FMT_DISALLOW_COPY_AND_ASSIGN(CharConverter); + + public: + explicit CharConverter(fmt::internal::Arg &arg) : arg_(arg) {} + + template + void visit_any_int(T value) { + arg_.type = Arg::CHAR; + arg_.int_value = static_cast(value); + } +}; + +// This function template is used to prevent compile errors when handling +// incompatible string arguments, e.g. handling a wide string in a narrow +// string formatter. +template +Arg::StringValue ignore_incompatible_str(Arg::StringValue); + +template <> +inline Arg::StringValue ignore_incompatible_str( + Arg::StringValue) { return Arg::StringValue(); } + +template <> +inline Arg::StringValue ignore_incompatible_str( + Arg::StringValue s) { return s; } +} // namespace + +FMT_FUNC void fmt::SystemError::init( + int err_code, StringRef format_str, ArgList args) { + error_code_ = err_code; + MemoryWriter w; + internal::format_system_error(w, err_code, format(format_str, args)); + std::runtime_error &base = *this; + base = std::runtime_error(w.str()); +} + +template +int fmt::internal::CharTraits::format_float( + char *buffer, std::size_t size, const char *format, + unsigned width, int precision, T value) { + if (width == 0) { + return precision < 0 ? + FMT_SNPRINTF(buffer, size, format, value) : + FMT_SNPRINTF(buffer, size, format, precision, value); + } + return precision < 0 ? + FMT_SNPRINTF(buffer, size, format, width, value) : + FMT_SNPRINTF(buffer, size, format, width, precision, value); +} + +template +int fmt::internal::CharTraits::format_float( + wchar_t *buffer, std::size_t size, const wchar_t *format, + unsigned width, int precision, T value) { + if (width == 0) { + return precision < 0 ? + swprintf(buffer, size, format, value) : + swprintf(buffer, size, format, precision, value); + } + return precision < 0 ? + swprintf(buffer, size, format, width, value) : + swprintf(buffer, size, format, width, precision, value); +} + +template +const char fmt::internal::BasicData::DIGITS[] = + "0001020304050607080910111213141516171819" + "2021222324252627282930313233343536373839" + "4041424344454647484950515253545556575859" + "6061626364656667686970717273747576777879" + "8081828384858687888990919293949596979899"; + +#define FMT_POWERS_OF_10(factor) \ + factor * 10, \ + factor * 100, \ + factor * 1000, \ + factor * 10000, \ + factor * 100000, \ + factor * 1000000, \ + factor * 10000000, \ + factor * 100000000, \ + factor * 1000000000 + +template +const uint32_t fmt::internal::BasicData::POWERS_OF_10_32[] = { + 0, FMT_POWERS_OF_10(1) +}; + +template +const uint64_t fmt::internal::BasicData::POWERS_OF_10_64[] = { + 0, + FMT_POWERS_OF_10(1), + FMT_POWERS_OF_10(fmt::ULongLong(1000000000)), + // Multiply several constants instead of using a single long long constant + // to avoid warnings about C++98 not supporting long long. + fmt::ULongLong(1000000000) * fmt::ULongLong(1000000000) * 10 +}; + +FMT_FUNC void fmt::internal::report_unknown_type(char code, const char *type) { + if (std::isprint(static_cast(code))) { + FMT_THROW(fmt::FormatError( + fmt::format("unknown format code '{}' for {}", code, type))); + } + FMT_THROW(fmt::FormatError( + fmt::format("unknown format code '\\x{:02x}' for {}", + static_cast(code), type))); +} + +#ifdef _WIN32 + +FMT_FUNC fmt::internal::UTF8ToUTF16::UTF8ToUTF16(fmt::StringRef s) { + int length = MultiByteToWideChar( + CP_UTF8, MB_ERR_INVALID_CHARS, s.c_str(), -1, 0, 0); + static const char ERROR_MSG[] = "cannot convert string from UTF-8 to UTF-16"; + if (length == 0) + FMT_THROW(WindowsError(GetLastError(), ERROR_MSG)); + buffer_.resize(length); + length = MultiByteToWideChar( + CP_UTF8, MB_ERR_INVALID_CHARS, s.c_str(), -1, &buffer_[0], length); + if (length == 0) + FMT_THROW(WindowsError(GetLastError(), ERROR_MSG)); +} + +FMT_FUNC fmt::internal::UTF16ToUTF8::UTF16ToUTF8(fmt::WStringRef s) { + if (int error_code = convert(s)) { + FMT_THROW(WindowsError(error_code, + "cannot convert string from UTF-16 to UTF-8")); + } +} + +FMT_FUNC int fmt::internal::UTF16ToUTF8::convert(fmt::WStringRef s) { + int length = WideCharToMultiByte(CP_UTF8, 0, s.c_str(), -1, 0, 0, 0, 0); + if (length == 0) + return GetLastError(); + buffer_.resize(length); + length = WideCharToMultiByte( + CP_UTF8, 0, s.c_str(), -1, &buffer_[0], length, 0, 0); + if (length == 0) + return GetLastError(); + return 0; +} + +FMT_FUNC void fmt::WindowsError::init( + int err_code, StringRef format_str, ArgList args) { + error_code_ = err_code; + MemoryWriter w; + internal::format_windows_error(w, err_code, format(format_str, args)); + std::runtime_error &base = *this; + base = std::runtime_error(w.str()); +} + +#endif + +FMT_FUNC void fmt::internal::format_system_error( + fmt::Writer &out, int error_code, + fmt::StringRef message) FMT_NOEXCEPT { + FMT_TRY { + MemoryBuffer buffer; + buffer.resize(INLINE_BUFFER_SIZE); + for (;;) { + char *system_message = &buffer[0]; + int result = safe_strerror(error_code, system_message, buffer.size()); + if (result == 0) { + out << message << ": " << system_message; + return; + } + if (result != ERANGE) + break; // Can't get error message, report error code instead. + buffer.resize(buffer.size() * 2); + } + } FMT_CATCH(...) {} + format_error_code(out, error_code, message); +} + +#ifdef _WIN32 +FMT_FUNC void fmt::internal::format_windows_error( + fmt::Writer &out, int error_code, + fmt::StringRef message) FMT_NOEXCEPT { + class String { + private: + LPWSTR str_; + + public: + String() : str_() {} + ~String() { LocalFree(str_); } + LPWSTR *ptr() { return &str_; } + LPCWSTR c_str() const { return str_; } + }; + FMT_TRY { + String system_message; + if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, + error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + reinterpret_cast(system_message.ptr()), 0, 0)) { + UTF16ToUTF8 utf8_message; + if (utf8_message.convert(system_message.c_str()) == ERROR_SUCCESS) { + out << message << ": " << utf8_message; + return; + } + } + } FMT_CATCH(...) {} + format_error_code(out, error_code, message); +} +#endif + +// An argument formatter. +template +class fmt::internal::ArgFormatter : + public fmt::internal::ArgVisitor, void> { + private: + fmt::BasicFormatter &formatter_; + fmt::BasicWriter &writer_; + fmt::FormatSpec &spec_; + const Char *format_; + + FMT_DISALLOW_COPY_AND_ASSIGN(ArgFormatter); + + public: + ArgFormatter( + fmt::BasicFormatter &f,fmt::FormatSpec &s, const Char *fmt) + : formatter_(f), writer_(f.writer()), spec_(s), format_(fmt) {} + + template + void visit_any_int(T value) { writer_.write_int(value, spec_); } + + template + void visit_any_double(T value) { writer_.write_double(value, spec_); } + + void visit_char(int value) { + if (spec_.type_ && spec_.type_ != 'c') { + spec_.flags_ |= CHAR_FLAG; + writer_.write_int(value, spec_); + return; + } + if (spec_.align_ == ALIGN_NUMERIC || spec_.flags_ != 0) + FMT_THROW(FormatError("invalid format specifier for char")); + typedef typename fmt::BasicWriter::CharPtr CharPtr; + Char fill = static_cast(spec_.fill()); + if (spec_.precision_ == 0) { + std::fill_n(writer_.grow_buffer(spec_.width_), spec_.width_, fill); + return; + } + CharPtr out = CharPtr(); + if (spec_.width_ > 1) { + out = writer_.grow_buffer(spec_.width_); + if (spec_.align_ == fmt::ALIGN_RIGHT) { + std::fill_n(out, spec_.width_ - 1, fill); + out += spec_.width_ - 1; + } else if (spec_.align_ == fmt::ALIGN_CENTER) { + out = writer_.fill_padding(out, spec_.width_, 1, fill); + } else { + std::fill_n(out + 1, spec_.width_ - 1, fill); + } + } else { + out = writer_.grow_buffer(1); + } + *out = static_cast(value); + } + + void visit_string(Arg::StringValue value) { + writer_.write_str(value, spec_); + } + void visit_wstring(Arg::StringValue value) { + writer_.write_str(ignore_incompatible_str(value), spec_); + } + + void visit_pointer(const void *value) { + if (spec_.type_ && spec_.type_ != 'p') + fmt::internal::report_unknown_type(spec_.type_, "pointer"); + spec_.flags_ = fmt::HASH_FLAG; + spec_.type_ = 'x'; + writer_.write_int(reinterpret_cast(value), spec_); + } + + void visit_custom(Arg::CustomValue c) { + c.format(&formatter_, c.value, &format_); + } +}; + +template +void fmt::internal::FixedBuffer::grow(std::size_t) { + FMT_THROW(std::runtime_error("buffer overflow")); +} + +template +template +void fmt::BasicWriter::write_str( + const Arg::StringValue &s, const FormatSpec &spec) { + // Check if StrChar is convertible to Char. + internal::CharTraits::convert(StrChar()); + if (spec.type_ && spec.type_ != 's') + internal::report_unknown_type(spec.type_, "string"); + const StrChar *str_value = s.value; + std::size_t str_size = s.size; + if (str_size == 0) { + if (!str_value) + FMT_THROW(FormatError("string pointer is null")); + if (*str_value) + str_size = std::char_traits::length(str_value); + } + std::size_t precision = spec.precision_; + if (spec.precision_ >= 0 && precision < str_size) + str_size = spec.precision_; + write_str(str_value, str_size, spec); +} + +template +inline Arg fmt::BasicFormatter::parse_arg_index(const Char *&s) { + const char *error = 0; + Arg arg = *s < '0' || *s > '9' ? + next_arg(error) : get_arg(parse_nonnegative_int(s), error); + if (error) { + FMT_THROW(FormatError( + *s != '}' && *s != ':' ? "invalid format string" : error)); + } + return arg; +} + +FMT_FUNC Arg fmt::internal::FormatterBase::do_get_arg( + unsigned arg_index, const char *&error) { + Arg arg = args_[arg_index]; + if (arg.type == Arg::NONE) + error = "argument index out of range"; + return arg; +} + +inline Arg fmt::internal::FormatterBase::next_arg(const char *&error) { + if (next_arg_index_ >= 0) + return do_get_arg(next_arg_index_++, error); + error = "cannot switch from manual to automatic argument indexing"; + return Arg(); +} + +inline Arg fmt::internal::FormatterBase::get_arg( + unsigned arg_index, const char *&error) { + if (next_arg_index_ <= 0) { + next_arg_index_ = -1; + return do_get_arg(arg_index, error); + } + error = "cannot switch from automatic to manual argument indexing"; + return Arg(); +} + +template +void fmt::internal::PrintfFormatter::parse_flags( + FormatSpec &spec, const Char *&s) { + for (;;) { + switch (*s++) { + case '-': + spec.align_ = ALIGN_LEFT; + break; + case '+': + spec.flags_ |= SIGN_FLAG | PLUS_FLAG; + break; + case '0': + spec.fill_ = '0'; + break; + case ' ': + spec.flags_ |= SIGN_FLAG; + break; + case '#': + spec.flags_ |= HASH_FLAG; + break; + default: + --s; + return; + } + } +} + +template +Arg fmt::internal::PrintfFormatter::get_arg( + const Char *s, unsigned arg_index) { + const char *error = 0; + Arg arg = arg_index == UINT_MAX ? + next_arg(error) : FormatterBase::get_arg(arg_index - 1, error); + if (error) + FMT_THROW(FormatError(!*s ? "invalid format string" : error)); + return arg; +} + +template +unsigned fmt::internal::PrintfFormatter::parse_header( + const Char *&s, FormatSpec &spec) { + unsigned arg_index = UINT_MAX; + Char c = *s; + if (c >= '0' && c <= '9') { + // Parse an argument index (if followed by '$') or a width possibly + // preceded with '0' flag(s). + unsigned value = parse_nonnegative_int(s); + if (*s == '$') { // value is an argument index + ++s; + arg_index = value; + } else { + if (c == '0') + spec.fill_ = '0'; + if (value != 0) { + // Nonzero value means that we parsed width and don't need to + // parse it or flags again, so return now. + spec.width_ = value; + return arg_index; + } + } + } + parse_flags(spec, s); + // Parse width. + if (*s >= '0' && *s <= '9') { + spec.width_ = parse_nonnegative_int(s); + } else if (*s == '*') { + ++s; + spec.width_ = WidthHandler(spec).visit(get_arg(s)); + } + return arg_index; +} + +template +void fmt::internal::PrintfFormatter::format( + BasicWriter &writer, BasicStringRef format_str, + const ArgList &args) { + const Char *start = format_str.c_str(); + set_args(args); + const Char *s = start; + while (*s) { + Char c = *s++; + if (c != '%') continue; + if (*s == c) { + write(writer, start, s); + start = ++s; + continue; + } + write(writer, start, s - 1); + + FormatSpec spec; + spec.align_ = ALIGN_RIGHT; + + // Parse argument index, flags and width. + unsigned arg_index = parse_header(s, spec); + + // Parse precision. + if (*s == '.') { + ++s; + if ('0' <= *s && *s <= '9') { + spec.precision_ = parse_nonnegative_int(s); + } else if (*s == '*') { + ++s; + spec.precision_ = PrecisionHandler().visit(get_arg(s)); + } + } + + Arg arg = get_arg(s, arg_index); + if (spec.flag(HASH_FLAG) && IsZeroInt().visit(arg)) + spec.flags_ &= ~HASH_FLAG; + if (spec.fill_ == '0') { + if (arg.type <= Arg::LAST_NUMERIC_TYPE) + spec.align_ = ALIGN_NUMERIC; + else + spec.fill_ = ' '; // Ignore '0' flag for non-numeric types. + } + + // Parse length and convert the argument to the required type. + switch (*s++) { + case 'h': + if (*s == 'h') + ArgConverter(arg, *++s).visit(arg); + else + ArgConverter(arg, *s).visit(arg); + break; + case 'l': + if (*s == 'l') + ArgConverter(arg, *++s).visit(arg); + else + ArgConverter(arg, *s).visit(arg); + break; + case 'j': + ArgConverter(arg, *s).visit(arg); + break; + case 'z': + ArgConverter(arg, *s).visit(arg); + break; + case 't': + ArgConverter(arg, *s).visit(arg); + break; + case 'L': + // printf produces garbage when 'L' is omitted for long double, no + // need to do the same. + break; + default: + --s; + ArgConverter(arg, *s).visit(arg); + } + + // Parse type. + if (!*s) + FMT_THROW(FormatError("invalid format string")); + spec.type_ = static_cast(*s++); + if (arg.type <= Arg::LAST_INTEGER_TYPE) { + // Normalize type. + switch (spec.type_) { + case 'i': case 'u': + spec.type_ = 'd'; + break; + case 'c': + // TODO: handle wchar_t + CharConverter(arg).visit(arg); + break; + } + } + + start = s; + + // Format argument. + switch (arg.type) { + case Arg::INT: + writer.write_int(arg.int_value, spec); + break; + case Arg::UINT: + writer.write_int(arg.uint_value, spec); + break; + case Arg::LONG_LONG: + writer.write_int(arg.long_long_value, spec); + break; + case Arg::ULONG_LONG: + writer.write_int(arg.ulong_long_value, spec); + break; + case Arg::CHAR: { + if (spec.type_ && spec.type_ != 'c') + writer.write_int(arg.int_value, spec); + typedef typename BasicWriter::CharPtr CharPtr; + CharPtr out = CharPtr(); + if (spec.width_ > 1) { + Char fill = ' '; + out = writer.grow_buffer(spec.width_); + if (spec.align_ != ALIGN_LEFT) { + std::fill_n(out, spec.width_ - 1, fill); + out += spec.width_ - 1; + } else { + std::fill_n(out + 1, spec.width_ - 1, fill); + } + } else { + out = writer.grow_buffer(1); + } + *out = static_cast(arg.int_value); + break; + } + case Arg::DOUBLE: + writer.write_double(arg.double_value, spec); + break; + case Arg::LONG_DOUBLE: + writer.write_double(arg.long_double_value, spec); + break; + case Arg::CSTRING: + arg.string.size = 0; + writer.write_str(arg.string, spec); + break; + case Arg::STRING: + writer.write_str(arg.string, spec); + break; + case Arg::WSTRING: + writer.write_str(ignore_incompatible_str(arg.wstring), spec); + break; + case Arg::POINTER: + if (spec.type_ && spec.type_ != 'p') + internal::report_unknown_type(spec.type_, "pointer"); + spec.flags_= HASH_FLAG; + spec.type_ = 'x'; + writer.write_int(reinterpret_cast(arg.pointer), spec); + break; + case Arg::CUSTOM: { + if (spec.type_) + internal::report_unknown_type(spec.type_, "object"); + const void *str_format = "s"; + arg.custom.format(&writer, arg.custom.value, &str_format); + break; + } + default: + assert(false); + break; + } + } + write(writer, start, s); +} + +template +const Char *fmt::BasicFormatter::format( + const Char *&format_str, const Arg &arg) { + const Char *s = format_str; + FormatSpec spec; + if (*s == ':') { + if (arg.type == Arg::CUSTOM) { + arg.custom.format(this, arg.custom.value, &s); + return s; + } + ++s; + // Parse fill and alignment. + if (Char c = *s) { + const Char *p = s + 1; + spec.align_ = ALIGN_DEFAULT; + do { + switch (*p) { + case '<': + spec.align_ = ALIGN_LEFT; + break; + case '>': + spec.align_ = ALIGN_RIGHT; + break; + case '=': + spec.align_ = ALIGN_NUMERIC; + break; + case '^': + spec.align_ = ALIGN_CENTER; + break; + } + if (spec.align_ != ALIGN_DEFAULT) { + if (p != s) { + if (c == '}') break; + if (c == '{') + FMT_THROW(FormatError("invalid fill character '{'")); + s += 2; + spec.fill_ = c; + } else ++s; + if (spec.align_ == ALIGN_NUMERIC) + require_numeric_argument(arg, '='); + break; + } + } while (--p >= s); + } + + // Parse sign. + switch (*s) { + case '+': + check_sign(s, arg); + spec.flags_ |= SIGN_FLAG | PLUS_FLAG; + break; + case '-': + check_sign(s, arg); + spec.flags_ |= MINUS_FLAG; + break; + case ' ': + check_sign(s, arg); + spec.flags_ |= SIGN_FLAG; + break; + } + + if (*s == '#') { + require_numeric_argument(arg, '#'); + spec.flags_ |= HASH_FLAG; + ++s; + } + + // Parse width and zero flag. + if ('0' <= *s && *s <= '9') { + if (*s == '0') { + require_numeric_argument(arg, '0'); + spec.align_ = ALIGN_NUMERIC; + spec.fill_ = '0'; + } + // Zero may be parsed again as a part of the width, but it is simpler + // and more efficient than checking if the next char is a digit. + spec.width_ = parse_nonnegative_int(s); + } + + // Parse precision. + if (*s == '.') { + ++s; + spec.precision_ = 0; + if ('0' <= *s && *s <= '9') { + spec.precision_ = parse_nonnegative_int(s); + } else if (*s == '{') { + ++s; + const Arg &precision_arg = parse_arg_index(s); + if (*s++ != '}') + FMT_THROW(FormatError("invalid format string")); + ULongLong value = 0; + switch (precision_arg.type) { + case Arg::INT: + if (precision_arg.int_value < 0) + FMT_THROW(FormatError("negative precision")); + value = precision_arg.int_value; + break; + case Arg::UINT: + value = precision_arg.uint_value; + break; + case Arg::LONG_LONG: + if (precision_arg.long_long_value < 0) + FMT_THROW(FormatError("negative precision")); + value = precision_arg.long_long_value; + break; + case Arg::ULONG_LONG: + value = precision_arg.ulong_long_value; + break; + default: + FMT_THROW(FormatError("precision is not integer")); + } + if (value > INT_MAX) + FMT_THROW(FormatError("number is too big")); + spec.precision_ = static_cast(value); + } else { + FMT_THROW(FormatError("missing precision specifier")); + } + if (arg.type < Arg::LAST_INTEGER_TYPE || arg.type == Arg::POINTER) { + FMT_THROW(FormatError( + fmt::format("precision not allowed in {} format specifier", + arg.type == Arg::POINTER ? "pointer" : "integer"))); + } + } + + // Parse type. + if (*s != '}' && *s) + spec.type_ = static_cast(*s++); + } + + if (*s++ != '}') + FMT_THROW(FormatError("missing '}' in format string")); + start_ = s; + + // Format argument. + internal::ArgFormatter(*this, spec, s - 1).visit(arg); + return s; +} + +template +void fmt::BasicFormatter::format( + BasicStringRef format_str, const ArgList &args) { + const Char *s = start_ = format_str.c_str(); + set_args(args); + while (*s) { + Char c = *s++; + if (c != '{' && c != '}') continue; + if (*s == c) { + write(writer_, start_, s); + start_ = ++s; + continue; + } + if (c == '}') + FMT_THROW(FormatError("unmatched '}' in format string")); + write(writer_, start_, s - 1); + Arg arg = parse_arg_index(s); + s = format(s, arg); + } + write(writer_, start_, s); +} + +FMT_FUNC void fmt::report_system_error( + int error_code, fmt::StringRef message) FMT_NOEXCEPT { + report_error(internal::format_system_error, error_code, message); +} + +#ifdef _WIN32 +FMT_FUNC void fmt::report_windows_error( + int error_code, fmt::StringRef message) FMT_NOEXCEPT { + report_error(internal::format_windows_error, error_code, message); +} +#endif + +FMT_FUNC void fmt::print(std::FILE *f, StringRef format_str, ArgList args) { + MemoryWriter w; + w.write(format_str, args); + std::fwrite(w.data(), 1, w.size(), f); +} + +FMT_FUNC void fmt::print(StringRef format_str, ArgList args) { + print(stdout, format_str, args); +} + +FMT_FUNC void fmt::print(std::ostream &os, StringRef format_str, ArgList args) { + MemoryWriter w; + w.write(format_str, args); + os.write(w.data(), w.size()); +} + +FMT_FUNC void fmt::print_colored(Color c, StringRef format, ArgList args) { + char escape[] = "\x1b[30m"; + escape[3] = '0' + static_cast(c); + std::fputs(escape, stdout); + print(format, args); + std::fputs(RESET_COLOR, stdout); +} + +FMT_FUNC int fmt::fprintf(std::FILE *f, StringRef format, ArgList args) { + MemoryWriter w; + printf(w, format, args); + std::size_t size = w.size(); + return std::fwrite(w.data(), 1, size, f) < size ? -1 : static_cast(size); +} + +#ifndef FMT_HEADER_ONLY + +// Explicit instantiations for char. + +template void fmt::internal::FixedBuffer::grow(std::size_t); + +template const char *fmt::BasicFormatter::format( + const char *&format_str, const fmt::internal::Arg &arg); + +template void fmt::BasicFormatter::format( + BasicStringRef format, const ArgList &args); + +template void fmt::internal::PrintfFormatter::format( + BasicWriter &writer, BasicStringRef format, const ArgList &args); + +template int fmt::internal::CharTraits::format_float( + char *buffer, std::size_t size, const char *format, + unsigned width, int precision, double value); + +template int fmt::internal::CharTraits::format_float( + char *buffer, std::size_t size, const char *format, + unsigned width, int precision, long double value); + +// Explicit instantiations for wchar_t. + +template void fmt::internal::FixedBuffer::grow(std::size_t); + +template const wchar_t *fmt::BasicFormatter::format( + const wchar_t *&format_str, const fmt::internal::Arg &arg); + +template void fmt::BasicFormatter::format( + BasicStringRef format, const ArgList &args); + +template void fmt::internal::PrintfFormatter::format( + BasicWriter &writer, BasicStringRef format, + const ArgList &args); + +template int fmt::internal::CharTraits::format_float( + wchar_t *buffer, std::size_t size, const wchar_t *format, + unsigned width, int precision, double value); + +template int fmt::internal::CharTraits::format_float( + wchar_t *buffer, std::size_t size, const wchar_t *format, + unsigned width, int precision, long double value); + +#endif // FMT_HEADER_ONLY + +#if _MSC_VER +# pragma warning(pop) +#endif diff --git a/lib/cppformat/format.h b/lib/cppformat/format.h new file mode 100644 index 00000000..9c6bc906 --- /dev/null +++ b/lib/cppformat/format.h @@ -0,0 +1,2649 @@ +/* + Formatting library for C++ + + Copyright (c) 2012 - 2015, Victor Zverovich + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef FMT_FORMAT_H_ +#define FMT_FORMAT_H_ + +#include + +#include +#include +#include // for std::ptrdiff_t +#include +#include +#include +#include +#include +#include + +#if _SECURE_SCL +# include +#endif + +#ifdef _MSC_VER +# include // _BitScanReverse, _BitScanReverse64 + +namespace fmt { +namespace internal { +# pragma intrinsic(_BitScanReverse) +inline uint32_t clz(uint32_t x) { + unsigned long r = 0; + _BitScanReverse(&r, x); + return 31 - r; +} +# define FMT_BUILTIN_CLZ(n) fmt::internal::clz(n) + +# ifdef _WIN64 +# pragma intrinsic(_BitScanReverse64) +# endif + +inline uint32_t clzll(uint64_t x) { + unsigned long r = 0; +# ifdef _WIN64 + _BitScanReverse64(&r, x); +# else + // Scan the high 32 bits. + if (_BitScanReverse(&r, static_cast(x >> 32))) + return 63 - (r + 32); + + // Scan the low 32 bits. + _BitScanReverse(&r, static_cast(x)); +# endif + return 63 - r; +} +# define FMT_BUILTIN_CLZLL(n) fmt::internal::clzll(n) +} +} +#endif + +#ifdef __GNUC__ +# define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +# define FMT_GCC_EXTENSION __extension__ +# if FMT_GCC_VERSION >= 406 +# pragma GCC diagnostic push +// Disable the warning about "long long" which is sometimes reported even +// when using __extension__. +# pragma GCC diagnostic ignored "-Wlong-long" +// Disable the warning about declaration shadowing because it affects too +// many valid cases. +# pragma GCC diagnostic ignored "-Wshadow" +# endif +# if __cplusplus >= 201103L || defined __GXX_EXPERIMENTAL_CXX0X__ +# define FMT_HAS_GXX_CXX11 1 +# endif +#else +# define FMT_GCC_EXTENSION +#endif + +#ifdef __clang__ +# pragma clang diagnostic ignored "-Wdocumentation" +#endif + +#ifdef __GNUC_LIBSTD__ +# define FMT_GNUC_LIBSTD_VERSION (__GNUC_LIBSTD__ * 100 + __GNUC_LIBSTD_MINOR__) +#endif + +#ifdef __has_feature +# define FMT_HAS_FEATURE(x) __has_feature(x) +#else +# define FMT_HAS_FEATURE(x) 0 +#endif + +#ifdef __has_builtin +# define FMT_HAS_BUILTIN(x) __has_builtin(x) +#else +# define FMT_HAS_BUILTIN(x) 0 +#endif + +#ifdef __has_cpp_attribute +# define FMT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x) +#else +# define FMT_HAS_CPP_ATTRIBUTE(x) 0 +#endif + +#ifndef FMT_USE_VARIADIC_TEMPLATES +// Variadic templates are available in GCC since version 4.4 +// (http://gcc.gnu.org/projects/cxx0x.html) and in Visual C++ +// since version 2013. +# define FMT_USE_VARIADIC_TEMPLATES \ + (FMT_HAS_FEATURE(cxx_variadic_templates) || \ + (FMT_GCC_VERSION >= 404 && FMT_HAS_GXX_CXX11) || _MSC_VER >= 1800) +#endif + +#ifndef FMT_USE_RVALUE_REFERENCES +// Don't use rvalue references when compiling with clang and an old libstdc++ +// as the latter doesn't provide std::move. +# if defined(FMT_GNUC_LIBSTD_VERSION) && FMT_GNUC_LIBSTD_VERSION <= 402 +# define FMT_USE_RVALUE_REFERENCES 0 +# else +# define FMT_USE_RVALUE_REFERENCES \ + (FMT_HAS_FEATURE(cxx_rvalue_references) || \ + (FMT_GCC_VERSION >= 403 && FMT_HAS_GXX_CXX11) || _MSC_VER >= 1600) +# endif +#endif + +#if FMT_USE_RVALUE_REFERENCES +# include // for std::move +#endif + +// Define FMT_USE_NOEXCEPT to make C++ Format use noexcept (C++11 feature). +#if FMT_USE_NOEXCEPT || FMT_HAS_FEATURE(cxx_noexcept) || \ + (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) +# define FMT_NOEXCEPT noexcept +#else +# define FMT_NOEXCEPT throw() +#endif + +// A macro to disallow the copy constructor and operator= functions +// This should be used in the private: declarations for a class +#if FMT_USE_DELETED_FUNCTIONS || FMT_HAS_FEATURE(cxx_deleted_functions) || \ + (FMT_GCC_VERSION >= 404 && FMT_HAS_GXX_CXX11) || _MSC_VER >= 1800 +# define FMT_DISALLOW_COPY_AND_ASSIGN(TypeName) \ + TypeName(const TypeName&) = delete; \ + TypeName& operator=(const TypeName&) = delete +#else +# define FMT_DISALLOW_COPY_AND_ASSIGN(TypeName) \ + TypeName(const TypeName&); \ + TypeName& operator=(const TypeName&) +#endif + +namespace fmt { + +// Fix the warning about long long on older versions of GCC +// that don't support the diagnostic pragma. +FMT_GCC_EXTENSION typedef long long LongLong; +FMT_GCC_EXTENSION typedef unsigned long long ULongLong; + +#if FMT_USE_RVALUE_REFERENCES +using std::move; +#endif + +template +class BasicWriter; + +typedef BasicWriter Writer; +typedef BasicWriter WWriter; + +template +class BasicFormatter; + +template +void format(BasicFormatter &f, const Char *&format_str, const T &value); + +/** + \rst + A string reference. It can be constructed from a C string or + ``std::string``. + + You can use one of the following typedefs for common character types: + + +------------+-------------------------+ + | Type | Definition | + +============+=========================+ + | StringRef | BasicStringRef | + +------------+-------------------------+ + | WStringRef | BasicStringRef | + +------------+-------------------------+ + + This class is most useful as a parameter type to allow passing + different types of strings to a function, for example:: + + template + std::string format(StringRef format_str, const Args & ... args); + + format("{}", 42); + format(std::string("{}"), 42); + \endrst + */ +template +class BasicStringRef { + private: + const Char *data_; + std::size_t size_; + + public: + /** + Constructs a string reference object from a C string and a size. + */ + BasicStringRef(const Char *s, std::size_t size) : data_(s), size_(size) {} + + /** + Constructs a string reference object from a C string computing + the size with ``std::char_traits::length``. + */ + BasicStringRef(const Char *s) + : data_(s), size_(std::char_traits::length(s)) {} + + /** + Constructs a string reference from an `std::string` object. + */ + BasicStringRef(const std::basic_string &s) + : data_(s.c_str()), size_(s.size()) {} + + /** + Converts a string reference to an `std::string` object. + */ + operator std::basic_string() const { + return std::basic_string(data_, size()); + } + + /** + Returns the pointer to a C string. + */ + const Char *c_str() const { return data_; } + + /** + Returns the string size. + */ + std::size_t size() const { return size_; } + + friend bool operator==(BasicStringRef lhs, BasicStringRef rhs) { + return lhs.data_ == rhs.data_; + } + friend bool operator!=(BasicStringRef lhs, BasicStringRef rhs) { + return lhs.data_ != rhs.data_; + } +}; + +typedef BasicStringRef StringRef; +typedef BasicStringRef WStringRef; + +/** + A formatting error such as invalid format string. +*/ +class FormatError : public std::runtime_error { + public: + explicit FormatError(StringRef message) + : std::runtime_error(message.c_str()) {} +}; + +namespace internal { + +// The number of characters to store in the MemoryBuffer object itself +// to avoid dynamic memory allocation. +enum { INLINE_BUFFER_SIZE = 500 }; + +#if _SECURE_SCL +// Use checked iterator to avoid warnings on MSVC. +template +inline stdext::checked_array_iterator make_ptr(T *ptr, std::size_t size) { + return stdext::checked_array_iterator(ptr, size); +} +#else +template +inline T *make_ptr(T *ptr, std::size_t) { return ptr; } +#endif + +// A buffer for POD types. It supports a subset of std::vector's operations. +template +class Buffer { + private: + FMT_DISALLOW_COPY_AND_ASSIGN(Buffer); + + protected: + T *ptr_; + std::size_t size_; + std::size_t capacity_; + + Buffer(T *ptr = 0, std::size_t capacity = 0) + : ptr_(ptr), size_(0), capacity_(capacity) {} + + virtual void grow(std::size_t size) = 0; + + public: + virtual ~Buffer() {} + + // Returns the size of this buffer. + std::size_t size() const { return size_; } + + // Returns the capacity of this buffer. + std::size_t capacity() const { return capacity_; } + + // Resizes the buffer. If T is a POD type new elements are not initialized. + void resize(std::size_t new_size) { + if (new_size > capacity_) + grow(new_size); + size_ = new_size; + } + + // Reserves space to store at least capacity elements. + void reserve(std::size_t capacity) { + if (capacity > capacity_) + grow(capacity); + } + + void clear() FMT_NOEXCEPT { size_ = 0; } + + void push_back(const T &value) { + if (size_ == capacity_) + grow(size_ + 1); + ptr_[size_++] = value; + } + + // Appends data to the end of the buffer. + void append(const T *begin, const T *end); + + T &operator[](std::size_t index) { return ptr_[index]; } + const T &operator[](std::size_t index) const { return ptr_[index]; } +}; + +template +void Buffer::append(const T *begin, const T *end) { + std::ptrdiff_t num_elements = end - begin; + if (size_ + num_elements > capacity_) + grow(size_ + num_elements); + std::copy(begin, end, make_ptr(ptr_, capacity_) + size_); + size_ += num_elements; +} + +// A memory buffer for POD types with the first SIZE elements stored in +// the object itself. +template > +class MemoryBuffer : private Allocator, public Buffer { + private: + T data_[SIZE]; + + // Free memory allocated by the buffer. + void free() { + if (this->ptr_ != data_) this->deallocate(this->ptr_, this->capacity_); + } + + protected: + void grow(std::size_t size); + + public: + explicit MemoryBuffer(const Allocator &alloc = Allocator()) + : Allocator(alloc), Buffer(data_, SIZE) {} + ~MemoryBuffer() { free(); } + +#if FMT_USE_RVALUE_REFERENCES + private: + // Move data from other to this buffer. + void move(MemoryBuffer &other) { + Allocator &this_alloc = *this, &other_alloc = other; + this_alloc = std::move(other_alloc); + this->size_ = other.size_; + this->capacity_ = other.capacity_; + if (other.ptr_ == other.data_) { + this->ptr_ = data_; + std::copy(other.data_, + other.data_ + this->size_, make_ptr(data_, this->capacity_)); + } else { + this->ptr_ = other.ptr_; + // Set pointer to the inline array so that delete is not called + // when freeing. + other.ptr_ = other.data_; + } + } + + public: + MemoryBuffer(MemoryBuffer &&other) { + move(other); + } + + MemoryBuffer &operator=(MemoryBuffer &&other) { + assert(this != &other); + free(); + move(other); + return *this; + } +#endif + + // Returns a copy of the allocator associated with this buffer. + Allocator get_allocator() const { return *this; } +}; + +template +void MemoryBuffer::grow(std::size_t size) { + std::size_t new_capacity = + (std::max)(size, this->capacity_ + this->capacity_ / 2); + T *new_ptr = this->allocate(new_capacity); + // The following code doesn't throw, so the raw pointer above doesn't leak. + std::copy(this->ptr_, + this->ptr_ + this->size_, make_ptr(new_ptr, new_capacity)); + std::size_t old_capacity = this->capacity_; + T *old_ptr = this->ptr_; + this->capacity_ = new_capacity; + this->ptr_ = new_ptr; + // deallocate may throw (at least in principle), but it doesn't matter since + // the buffer already uses the new storage and will deallocate it in case + // of exception. + if (old_ptr != data_) + this->deallocate(old_ptr, old_capacity); +} + +// A fixed-size buffer. +template +class FixedBuffer : public fmt::internal::Buffer { + public: + FixedBuffer(Char *array, std::size_t size) + : fmt::internal::Buffer(array, size) {} + + protected: + void grow(std::size_t size); +}; + +#ifndef _MSC_VER +// Portable version of signbit. +inline int getsign(double x) { + // When compiled in C++11 mode signbit is no longer a macro but a function + // defined in namespace std and the macro is undefined. +# ifdef signbit + return signbit(x); +# else + return std::signbit(x); +# endif +} + +// Portable version of isinf. +# ifdef isinf +inline int isinfinity(double x) { return isinf(x); } +inline int isinfinity(long double x) { return isinf(x); } +# else +inline int isinfinity(double x) { return std::isinf(x); } +inline int isinfinity(long double x) { return std::isinf(x); } +# endif +#else +inline int getsign(double value) { + if (value < 0) return 1; + if (value == value) return 0; + int dec = 0, sign = 0; + char buffer[2]; // The buffer size must be >= 2 or _ecvt_s will fail. + _ecvt_s(buffer, sizeof(buffer), value, 0, &dec, &sign); + return sign; +} +inline int isinfinity(double x) { return !_finite(x); } +inline int isinfinity(long double x) { return !_finite(static_cast(x)); } +#endif + +template +class BasicCharTraits { + public: +#if _SECURE_SCL + typedef stdext::checked_array_iterator CharPtr; +#else + typedef Char *CharPtr; +#endif +}; + +template +class CharTraits; + +template <> +class CharTraits : public BasicCharTraits { + private: + // Conversion from wchar_t to char is not allowed. + static char convert(wchar_t); + +public: + static char convert(char value) { return value; } + + // Formats a floating-point number. + template + static int format_float(char *buffer, std::size_t size, + const char *format, unsigned width, int precision, T value); +}; + +template <> +class CharTraits : public BasicCharTraits { + public: + static wchar_t convert(char value) { return value; } + static wchar_t convert(wchar_t value) { return value; } + + template + static int format_float(wchar_t *buffer, std::size_t size, + const wchar_t *format, unsigned width, int precision, T value); +}; + +// Checks if a number is negative - used to avoid warnings. +template +struct SignChecker { + template + static bool is_negative(T value) { return value < 0; } +}; + +template <> +struct SignChecker { + template + static bool is_negative(T) { return false; } +}; + +// Returns true if value is negative, false otherwise. +// Same as (value < 0) but doesn't produce warnings if T is an unsigned type. +template +inline bool is_negative(T value) { + return SignChecker::is_signed>::is_negative(value); +} + +// Selects uint32_t if FitsIn32Bits is true, uint64_t otherwise. +template +struct TypeSelector { typedef uint32_t Type; }; + +template <> +struct TypeSelector { typedef uint64_t Type; }; + +template +struct IntTraits { + // Smallest of uint32_t and uint64_t that is large enough to represent + // all values of T. + typedef typename + TypeSelector::digits <= 32>::Type MainType; +}; + +// MakeUnsigned::Type gives an unsigned type corresponding to integer type T. +template +struct MakeUnsigned { typedef T Type; }; + +#define FMT_SPECIALIZE_MAKE_UNSIGNED(T, U) \ + template <> \ + struct MakeUnsigned { typedef U Type; } + +FMT_SPECIALIZE_MAKE_UNSIGNED(char, unsigned char); +FMT_SPECIALIZE_MAKE_UNSIGNED(signed char, unsigned char); +FMT_SPECIALIZE_MAKE_UNSIGNED(short, unsigned short); +FMT_SPECIALIZE_MAKE_UNSIGNED(int, unsigned); +FMT_SPECIALIZE_MAKE_UNSIGNED(long, unsigned long); +FMT_SPECIALIZE_MAKE_UNSIGNED(LongLong, ULongLong); + +void report_unknown_type(char code, const char *type); + +// Static data is placed in this class template to allow header-only +// configuration. +template +struct BasicData { + static const uint32_t POWERS_OF_10_32[]; + static const uint64_t POWERS_OF_10_64[]; + static const char DIGITS[]; +}; + +typedef BasicData<> Data; + +#if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clz) +# define FMT_BUILTIN_CLZ(n) __builtin_clz(n) +#endif + +#if FMT_GCC_VERSION >= 400 || FMT_HAS_BUILTIN(__builtin_clzll) +# define FMT_BUILTIN_CLZLL(n) __builtin_clzll(n) +#endif + +#ifdef FMT_BUILTIN_CLZLL +// Returns the number of decimal digits in n. Leading zeros are not counted +// except for n == 0 in which case count_digits returns 1. +inline unsigned count_digits(uint64_t n) { + // Based on http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog10 + // and the benchmark https://github.com/localvoid/cxx-benchmark-count-digits. + unsigned t = (64 - FMT_BUILTIN_CLZLL(n | 1)) * 1233 >> 12; + return t - (n < Data::POWERS_OF_10_64[t]) + 1; +} +#else +// Fallback version of count_digits used when __builtin_clz is not available. +inline unsigned count_digits(uint64_t n) { + unsigned count = 1; + for (;;) { + // Integer division is slow so do it for a group of four digits instead + // of for every digit. The idea comes from the talk by Alexandrescu + // "Three Optimization Tips for C++". See speed-test for a comparison. + if (n < 10) return count; + if (n < 100) return count + 1; + if (n < 1000) return count + 2; + if (n < 10000) return count + 3; + n /= 10000u; + count += 4; + } +} +#endif + +#ifdef FMT_BUILTIN_CLZ +// Optional version of count_digits for better performance on 32-bit platforms. +inline unsigned count_digits(uint32_t n) { + uint32_t t = (32 - FMT_BUILTIN_CLZ(n | 1)) * 1233 >> 12; + return t - (n < Data::POWERS_OF_10_32[t]) + 1; +} +#endif + +// Formats a decimal unsigned integer value writing into buffer. +template +inline void format_decimal(Char *buffer, UInt value, unsigned num_digits) { + --num_digits; + while (value >= 100) { + // Integer division is slow so do it for a group of two digits instead + // of for every digit. The idea comes from the talk by Alexandrescu + // "Three Optimization Tips for C++". See speed-test for a comparison. + unsigned index = (value % 100) * 2; + value /= 100; + buffer[num_digits] = Data::DIGITS[index + 1]; + buffer[num_digits - 1] = Data::DIGITS[index]; + num_digits -= 2; + } + if (value < 10) { + *buffer = static_cast('0' + value); + return; + } + unsigned index = static_cast(value * 2); + buffer[1] = Data::DIGITS[index + 1]; + buffer[0] = Data::DIGITS[index]; +} + +#ifdef _WIN32 +// A converter from UTF-8 to UTF-16. +// It is only provided for Windows since other systems support UTF-8 natively. +class UTF8ToUTF16 { + private: + MemoryBuffer buffer_; + + public: + explicit UTF8ToUTF16(StringRef s); + operator WStringRef() const { return WStringRef(&buffer_[0], size()); } + size_t size() const { return buffer_.size() - 1; } + const wchar_t *c_str() const { return &buffer_[0]; } + std::wstring str() const { return std::wstring(&buffer_[0], size()); } +}; + +// A converter from UTF-16 to UTF-8. +// It is only provided for Windows since other systems support UTF-8 natively. +class UTF16ToUTF8 { + private: + MemoryBuffer buffer_; + + public: + UTF16ToUTF8() {} + explicit UTF16ToUTF8(WStringRef s); + operator StringRef() const { return StringRef(&buffer_[0], size()); } + size_t size() const { return buffer_.size() - 1; } + const char *c_str() const { return &buffer_[0]; } + std::string str() const { return std::string(&buffer_[0], size()); } + + // Performs conversion returning a system error code instead of + // throwing exception on conversion error. This method may still throw + // in case of memory allocation error. + int convert(WStringRef s); +}; +#endif + +void format_system_error(fmt::Writer &out, int error_code, + fmt::StringRef message) FMT_NOEXCEPT; + +#ifdef _WIN32 +void format_windows_error(fmt::Writer &out, int error_code, + fmt::StringRef message) FMT_NOEXCEPT; +#endif + +// Computes max(Arg, 1) at compile time. It is used to avoid errors about +// allocating an array of 0 size. +template +struct NonZero { + enum { VALUE = Arg }; +}; + +template <> +struct NonZero<0> { + enum { VALUE = 1 }; +}; + +// The value of a formatting argument. It is a POD type to allow storage in +// internal::MemoryBuffer. +struct Value { + template + struct StringValue { + const Char *value; + std::size_t size; + }; + + typedef void (*FormatFunc)( + void *formatter, const void *arg, void *format_str_ptr); + + struct CustomValue { + const void *value; + FormatFunc format; + }; + + union { + int int_value; + unsigned uint_value; + LongLong long_long_value; + ULongLong ulong_long_value; + double double_value; + long double long_double_value; + const void *pointer; + StringValue string; + StringValue sstring; + StringValue ustring; + StringValue wstring; + CustomValue custom; + }; +}; + +struct Arg : Value { + enum Type { + NONE, + // Integer types should go first, + INT, UINT, LONG_LONG, ULONG_LONG, CHAR, LAST_INTEGER_TYPE = CHAR, + // followed by floating-point types. + DOUBLE, LONG_DOUBLE, LAST_NUMERIC_TYPE = LONG_DOUBLE, + CSTRING, STRING, WSTRING, POINTER, CUSTOM + }; + Type type; +}; + +template +struct None {}; + +// A helper class template to enable or disable overloads taking wide +// characters and strings in MakeValue. +template +struct WCharHelper { + typedef None Supported; + typedef T Unsupported; +}; + +template +struct WCharHelper { + typedef T Supported; + typedef None Unsupported; +}; + +// Makes a Value object from any type. +template +class MakeValue : public Value { + private: + // The following two methods are private to disallow formatting of + // arbitrary pointers. If you want to output a pointer cast it to + // "void *" or "const void *". In particular, this forbids formatting + // of "[const] volatile char *" which is printed as bool by iostreams. + // Do not implement! + template + MakeValue(const T *value); + template + MakeValue(T *value); + + // The following methods are private to disallow formatting of wide + // characters and strings into narrow strings as in + // fmt::format("{}", L"test"); + // To fix this, use a wide format string: fmt::format(L"{}", L"test"). + MakeValue(typename WCharHelper::Unsupported); + MakeValue(typename WCharHelper::Unsupported); + MakeValue(typename WCharHelper::Unsupported); + MakeValue(typename WCharHelper::Unsupported); + MakeValue(typename WCharHelper::Unsupported); + + void set_string(StringRef str) { + string.value = str.c_str(); + string.size = str.size(); + } + + void set_string(WStringRef str) { + wstring.value = str.c_str(); + wstring.size = str.size(); + } + + // Formats an argument of a custom type, such as a user-defined class. + template + static void format_custom_arg( + void *formatter, const void *arg, void *format_str_ptr) { + format(*static_cast*>(formatter), + *static_cast(format_str_ptr), + *static_cast(arg)); + } + + public: + MakeValue() {} + +#define FMT_MAKE_VALUE(Type, field, TYPE) \ + MakeValue(Type value) { field = value; } \ + static uint64_t type(Type) { return Arg::TYPE; } + + FMT_MAKE_VALUE(bool, int_value, INT) + FMT_MAKE_VALUE(short, int_value, INT) + FMT_MAKE_VALUE(unsigned short, uint_value, UINT) + FMT_MAKE_VALUE(int, int_value, INT) + FMT_MAKE_VALUE(unsigned, uint_value, UINT) + + MakeValue(long value) { + // To minimize the number of types we need to deal with, long is + // translated either to int or to long long depending on its size. + if (sizeof(long) == sizeof(int)) + int_value = static_cast(value); + else + long_long_value = value; + } + static uint64_t type(long) { + return sizeof(long) == sizeof(int) ? Arg::INT : Arg::LONG_LONG; + } + + MakeValue(unsigned long value) { + if (sizeof(unsigned long) == sizeof(unsigned)) + uint_value = static_cast(value); + else + ulong_long_value = value; + } + static uint64_t type(unsigned long) { + return sizeof(unsigned long) == sizeof(unsigned) ? + Arg::UINT : Arg::ULONG_LONG; + } + + FMT_MAKE_VALUE(LongLong, long_long_value, LONG_LONG) + FMT_MAKE_VALUE(ULongLong, ulong_long_value, ULONG_LONG) + FMT_MAKE_VALUE(float, double_value, DOUBLE) + FMT_MAKE_VALUE(double, double_value, DOUBLE) + FMT_MAKE_VALUE(long double, long_double_value, LONG_DOUBLE) + FMT_MAKE_VALUE(signed char, int_value, CHAR) + FMT_MAKE_VALUE(unsigned char, int_value, CHAR) + FMT_MAKE_VALUE(char, int_value, CHAR) + + MakeValue(typename WCharHelper::Supported value) { + int_value = value; + } + static uint64_t type(wchar_t) { return Arg::CHAR; } + +#define FMT_MAKE_STR_VALUE(Type, TYPE) \ + MakeValue(Type value) { set_string(value); } \ + static uint64_t type(Type) { return Arg::TYPE; } + + FMT_MAKE_VALUE(char *, string.value, CSTRING) + FMT_MAKE_VALUE(const char *, string.value, CSTRING) + FMT_MAKE_VALUE(const signed char *, sstring.value, CSTRING) + FMT_MAKE_VALUE(const unsigned char *, ustring.value, CSTRING) + FMT_MAKE_STR_VALUE(const std::string &, STRING) + FMT_MAKE_STR_VALUE(StringRef, STRING) + +#define FMT_MAKE_WSTR_VALUE(Type, TYPE) \ + MakeValue(typename WCharHelper::Supported value) { \ + set_string(value); \ + } \ + static uint64_t type(Type) { return Arg::TYPE; } + + FMT_MAKE_WSTR_VALUE(wchar_t *, WSTRING) + FMT_MAKE_WSTR_VALUE(const wchar_t *, WSTRING) + FMT_MAKE_WSTR_VALUE(const std::wstring &, WSTRING) + FMT_MAKE_WSTR_VALUE(WStringRef, WSTRING) + + FMT_MAKE_VALUE(void *, pointer, POINTER) + FMT_MAKE_VALUE(const void *, pointer, POINTER) + + template + MakeValue(const T &value) { + custom.value = &value; + custom.format = &format_custom_arg; + } + template + static uint64_t type(const T &) { return Arg::CUSTOM; } +}; + +#define FMT_DISPATCH(call) static_cast(this)->call + +// An argument visitor. +// To use ArgVisitor define a subclass that implements some or all of the +// visit methods with the same signatures as the methods in ArgVisitor, +// for example, visit_int(int). +// Specify the subclass name as the Impl template parameter. Then calling +// ArgVisitor::visit for some argument will dispatch to a visit method +// specific to the argument type. For example, if the argument type is +// double then visit_double(double) method of a subclass will be called. +// If the subclass doesn't contain a method with this signature, then +// a corresponding method of ArgVisitor will be called. +// +// Example: +// class MyArgVisitor : public ArgVisitor { +// public: +// void visit_int(int value) { print("{}", value); } +// void visit_double(double value) { print("{}", value ); } +// }; +// +// ArgVisitor uses the curiously recurring template pattern: +// http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern +template +class ArgVisitor { + public: + Result visit_unhandled_arg() { return Result(); } + + Result visit_int(int value) { + return FMT_DISPATCH(visit_any_int(value)); + } + Result visit_long_long(LongLong value) { + return FMT_DISPATCH(visit_any_int(value)); + } + Result visit_uint(unsigned value) { + return FMT_DISPATCH(visit_any_int(value)); + } + Result visit_ulong_long(ULongLong value) { + return FMT_DISPATCH(visit_any_int(value)); + } + Result visit_char(int value) { + return FMT_DISPATCH(visit_any_int(value)); + } + template + Result visit_any_int(T) { + return FMT_DISPATCH(visit_unhandled_arg()); + } + + Result visit_double(double value) { + return FMT_DISPATCH(visit_any_double(value)); + } + Result visit_long_double(long double value) { + return FMT_DISPATCH(visit_any_double(value)); + } + template + Result visit_any_double(T) { + return FMT_DISPATCH(visit_unhandled_arg()); + } + + Result visit_string(Arg::StringValue) { + return FMT_DISPATCH(visit_unhandled_arg()); + } + Result visit_wstring(Arg::StringValue) { + return FMT_DISPATCH(visit_unhandled_arg()); + } + Result visit_pointer(const void *) { + return FMT_DISPATCH(visit_unhandled_arg()); + } + Result visit_custom(Arg::CustomValue) { + return FMT_DISPATCH(visit_unhandled_arg()); + } + + Result visit(const Arg &arg) { + switch (arg.type) { + default: + assert(false); + return Result(); + case Arg::INT: + return FMT_DISPATCH(visit_int(arg.int_value)); + case Arg::UINT: + return FMT_DISPATCH(visit_uint(arg.uint_value)); + case Arg::LONG_LONG: + return FMT_DISPATCH(visit_long_long(arg.long_long_value)); + case Arg::ULONG_LONG: + return FMT_DISPATCH(visit_ulong_long(arg.ulong_long_value)); + case Arg::DOUBLE: + return FMT_DISPATCH(visit_double(arg.double_value)); + case Arg::LONG_DOUBLE: + return FMT_DISPATCH(visit_long_double(arg.long_double_value)); + case Arg::CHAR: + return FMT_DISPATCH(visit_char(arg.int_value)); + case Arg::CSTRING: { + Value::StringValue str = arg.string; + str.size = 0; + return FMT_DISPATCH(visit_string(str)); + } + case Arg::STRING: + return FMT_DISPATCH(visit_string(arg.string)); + case Arg::WSTRING: + return FMT_DISPATCH(visit_wstring(arg.wstring)); + case Arg::POINTER: + return FMT_DISPATCH(visit_pointer(arg.pointer)); + case Arg::CUSTOM: + return FMT_DISPATCH(visit_custom(arg.custom)); + } + } +}; + +class RuntimeError : public std::runtime_error { + protected: + RuntimeError() : std::runtime_error("") {} +}; + +template +class ArgFormatter; +} // namespace internal + +/** + An argument list. + */ +class ArgList { + private: + uint64_t types_; + const internal::Value *values_; + + public: + // Maximum number of arguments that can be passed in ArgList. + enum { MAX_ARGS = 16 }; + + ArgList() : types_(0) {} + ArgList(ULongLong types, const internal::Value *values) + : types_(types), values_(values) {} + + /** + Returns the argument at specified index. + */ + internal::Arg operator[](unsigned index) const { + using internal::Arg; + Arg arg; + if (index >= MAX_ARGS) { + arg.type = Arg::NONE; + return arg; + } + unsigned shift = index * 4; + uint64_t mask = 0xf; + Arg::Type type = + static_cast((types_ & (mask << shift)) >> shift); + arg.type = type; + if (type != Arg::NONE) { + internal::Value &value = arg; + value = values_[index]; + } + return arg; + } +}; + +struct FormatSpec; + +namespace internal { + +class FormatterBase { + private: + ArgList args_; + int next_arg_index_; + + // Returns the argument with specified index. + Arg do_get_arg(unsigned arg_index, const char *&error); + + protected: + void set_args(const ArgList &args) { + args_ = args; + next_arg_index_ = 0; + } + + // Returns the next argument. + Arg next_arg(const char *&error); + + // Checks if manual indexing is used and returns the argument with + // specified index. + Arg get_arg(unsigned arg_index, const char *&error); + + template + void write(BasicWriter &w, const Char *start, const Char *end) { + if (start != end) + w << BasicStringRef(start, end - start); + } +}; + +// A printf formatter. +template +class PrintfFormatter : private FormatterBase { + private: + void parse_flags(FormatSpec &spec, const Char *&s); + + // Returns the argument with specified index or, if arg_index is equal + // to the maximum unsigned value, the next argument. + Arg get_arg(const Char *s, + unsigned arg_index = (std::numeric_limits::max)()); + + // Parses argument index, flags and width and returns the argument index. + unsigned parse_header(const Char *&s, FormatSpec &spec); + + public: + void format(BasicWriter &writer, + BasicStringRef format_str, const ArgList &args); +}; +} // namespace internal + +// A formatter. +template +class BasicFormatter : private internal::FormatterBase { + private: + BasicWriter &writer_; + const Char *start_; + + FMT_DISALLOW_COPY_AND_ASSIGN(BasicFormatter); + + // Parses argument index and returns corresponding argument. + internal::Arg parse_arg_index(const Char *&s); + + public: + explicit BasicFormatter(BasicWriter &w) : writer_(w) {} + + BasicWriter &writer() { return writer_; } + + void format(BasicStringRef format_str, const ArgList &args); + + const Char *format(const Char *&format_str, const internal::Arg &arg); +}; + +enum Alignment { + ALIGN_DEFAULT, ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER, ALIGN_NUMERIC +}; + +// Flags. +enum { + SIGN_FLAG = 1, PLUS_FLAG = 2, MINUS_FLAG = 4, HASH_FLAG = 8, + CHAR_FLAG = 0x10 // Argument has char type - used in error reporting. +}; + +// An empty format specifier. +struct EmptySpec {}; + +// A type specifier. +template +struct TypeSpec : EmptySpec { + Alignment align() const { return ALIGN_DEFAULT; } + unsigned width() const { return 0; } + int precision() const { return -1; } + bool flag(unsigned) const { return false; } + char type() const { return TYPE; } + char fill() const { return ' '; } +}; + +// A width specifier. +struct WidthSpec { + unsigned width_; + // Fill is always wchar_t and cast to char if necessary to avoid having + // two specialization of WidthSpec and its subclasses. + wchar_t fill_; + + WidthSpec(unsigned width, wchar_t fill) : width_(width), fill_(fill) {} + + unsigned width() const { return width_; } + wchar_t fill() const { return fill_; } +}; + +// An alignment specifier. +struct AlignSpec : WidthSpec { + Alignment align_; + + AlignSpec(unsigned width, wchar_t fill, Alignment align = ALIGN_DEFAULT) + : WidthSpec(width, fill), align_(align) {} + + Alignment align() const { return align_; } + + int precision() const { return -1; } +}; + +// An alignment and type specifier. +template +struct AlignTypeSpec : AlignSpec { + AlignTypeSpec(unsigned width, wchar_t fill) : AlignSpec(width, fill) {} + + bool flag(unsigned) const { return false; } + char type() const { return TYPE; } +}; + +// A full format specifier. +struct FormatSpec : AlignSpec { + unsigned flags_; + int precision_; + char type_; + + FormatSpec( + unsigned width = 0, char type = 0, wchar_t fill = ' ') + : AlignSpec(width, fill), flags_(0), precision_(-1), type_(type) {} + + bool flag(unsigned f) const { return (flags_ & f) != 0; } + int precision() const { return precision_; } + char type() const { return type_; } +}; + +// An integer format specifier. +template , typename Char = char> +class IntFormatSpec : public SpecT { + private: + T value_; + + public: + IntFormatSpec(T val, const SpecT &spec = SpecT()) + : SpecT(spec), value_(val) {} + + T value() const { return value_; } +}; + +// A string format specifier. +template +class StrFormatSpec : public AlignSpec { + private: + const T *str_; + + public: + StrFormatSpec(const T *str, unsigned width, wchar_t fill) + : AlignSpec(width, fill), str_(str) {} + + const T *str() const { return str_; } +}; + +/** + Returns an integer format specifier to format the value in base 2. + */ +IntFormatSpec > bin(int value); + +/** + Returns an integer format specifier to format the value in base 8. + */ +IntFormatSpec > oct(int value); + +/** + Returns an integer format specifier to format the value in base 16 using + lower-case letters for the digits above 9. + */ +IntFormatSpec > hex(int value); + +/** + Returns an integer formatter format specifier to format in base 16 using + upper-case letters for the digits above 9. + */ +IntFormatSpec > hexu(int value); + +/** + \rst + Returns an integer format specifier to pad the formatted argument with the + fill character to the specified width using the default (right) numeric + alignment. + + **Example**:: + + MemoryWriter out; + out << pad(hex(0xcafe), 8, '0'); + // out.str() == "0000cafe" + + \endrst + */ +template +IntFormatSpec, Char> pad( + int value, unsigned width, Char fill = ' '); + +#define FMT_DEFINE_INT_FORMATTERS(TYPE) \ +inline IntFormatSpec > bin(TYPE value) { \ + return IntFormatSpec >(value, TypeSpec<'b'>()); \ +} \ + \ +inline IntFormatSpec > oct(TYPE value) { \ + return IntFormatSpec >(value, TypeSpec<'o'>()); \ +} \ + \ +inline IntFormatSpec > hex(TYPE value) { \ + return IntFormatSpec >(value, TypeSpec<'x'>()); \ +} \ + \ +inline IntFormatSpec > hexu(TYPE value) { \ + return IntFormatSpec >(value, TypeSpec<'X'>()); \ +} \ + \ +template \ +inline IntFormatSpec > pad( \ + IntFormatSpec > f, unsigned width) { \ + return IntFormatSpec >( \ + f.value(), AlignTypeSpec(width, ' ')); \ +} \ + \ +/* For compatibility with older compilers we provide two overloads for pad, */ \ +/* one that takes a fill character and one that doesn't. In the future this */ \ +/* can be replaced with one overload making the template argument Char */ \ +/* default to char (C++11). */ \ +template \ +inline IntFormatSpec, Char> pad( \ + IntFormatSpec, Char> f, \ + unsigned width, Char fill) { \ + return IntFormatSpec, Char>( \ + f.value(), AlignTypeSpec(width, fill)); \ +} \ + \ +inline IntFormatSpec > pad( \ + TYPE value, unsigned width) { \ + return IntFormatSpec >( \ + value, AlignTypeSpec<0>(width, ' ')); \ +} \ + \ +template \ +inline IntFormatSpec, Char> pad( \ + TYPE value, unsigned width, Char fill) { \ + return IntFormatSpec, Char>( \ + value, AlignTypeSpec<0>(width, fill)); \ +} + +FMT_DEFINE_INT_FORMATTERS(int) +FMT_DEFINE_INT_FORMATTERS(long) +FMT_DEFINE_INT_FORMATTERS(unsigned) +FMT_DEFINE_INT_FORMATTERS(unsigned long) +FMT_DEFINE_INT_FORMATTERS(LongLong) +FMT_DEFINE_INT_FORMATTERS(ULongLong) + +/** + \rst + Returns a string formatter that pads the formatted argument with the fill + character to the specified width using the default (left) string alignment. + + **Example**:: + + std::string s = str(MemoryWriter() << pad("abc", 8)); + // s == "abc " + + \endrst + */ +template +inline StrFormatSpec pad( + const Char *str, unsigned width, Char fill = ' ') { + return StrFormatSpec(str, width, fill); +} + +inline StrFormatSpec pad( + const wchar_t *str, unsigned width, char fill = ' ') { + return StrFormatSpec(str, width, fill); +} + +// Generates a comma-separated list with results of applying f to +// numbers 0..n-1. +# define FMT_GEN(n, f) FMT_GEN##n(f) +# define FMT_GEN1(f) f(0) +# define FMT_GEN2(f) FMT_GEN1(f), f(1) +# define FMT_GEN3(f) FMT_GEN2(f), f(2) +# define FMT_GEN4(f) FMT_GEN3(f), f(3) +# define FMT_GEN5(f) FMT_GEN4(f), f(4) +# define FMT_GEN6(f) FMT_GEN5(f), f(5) +# define FMT_GEN7(f) FMT_GEN6(f), f(6) +# define FMT_GEN8(f) FMT_GEN7(f), f(7) +# define FMT_GEN9(f) FMT_GEN8(f), f(8) +# define FMT_GEN10(f) FMT_GEN9(f), f(9) +# define FMT_GEN11(f) FMT_GEN10(f), f(10) +# define FMT_GEN12(f) FMT_GEN11(f), f(11) +# define FMT_GEN13(f) FMT_GEN12(f), f(12) +# define FMT_GEN14(f) FMT_GEN13(f), f(13) +# define FMT_GEN15(f) FMT_GEN14(f), f(14) + +namespace internal { +inline uint64_t make_type() { return 0; } + +template +inline uint64_t make_type(const T &arg) { return MakeValue::type(arg); } + +#if FMT_USE_VARIADIC_TEMPLATES +template +inline uint64_t make_type(const Arg &first, const Args & ... tail) { + return make_type(first) | (make_type(tail...) << 4); +} +#else + +struct ArgType { + uint64_t type; + + ArgType() : type(0) {} + + template + ArgType(const T &arg) : type(make_type(arg)) {} +}; + +# define FMT_ARG_TYPE_DEFAULT(n) ArgType t##n = ArgType() + +inline uint64_t make_type(FMT_GEN15(FMT_ARG_TYPE_DEFAULT)) { + return t0.type | (t1.type << 4) | (t2.type << 8) | (t3.type << 12) | + (t4.type << 16) | (t5.type << 20) | (t6.type << 24) | (t7.type << 28) | + (t8.type << 32) | (t9.type << 36) | (t10.type << 40) | (t11.type << 44) | + (t12.type << 48) | (t13.type << 52) | (t14.type << 56); +} +#endif +} // namespace internal + +# define FMT_MAKE_TEMPLATE_ARG(n) typename T##n +# define FMT_MAKE_ARG_TYPE(n) T##n +# define FMT_MAKE_ARG(n) const T##n &v##n +# define FMT_MAKE_REF_char(n) fmt::internal::MakeValue(v##n) +# define FMT_MAKE_REF_wchar_t(n) fmt::internal::MakeValue(v##n) + +#if FMT_USE_VARIADIC_TEMPLATES +// Defines a variadic function returning void. +# define FMT_VARIADIC_VOID(func, arg_type) \ + template \ + void func(arg_type arg1, const Args & ... args) { \ + const fmt::internal::Value values[ \ + fmt::internal::NonZero::VALUE] = { \ + fmt::internal::MakeValue(args)... \ + }; \ + func(arg1, ArgList(fmt::internal::make_type(args...), values)); \ + } + +// Defines a variadic constructor. +# define FMT_VARIADIC_CTOR(ctor, func, arg0_type, arg1_type) \ + template \ + ctor(arg0_type arg0, arg1_type arg1, const Args & ... args) { \ + using fmt::internal::MakeValue; \ + const fmt::internal::Value values[ \ + fmt::internal::NonZero::VALUE] = { \ + MakeValue(args)... \ + }; \ + func(arg0, arg1, ArgList(fmt::internal::make_type(args...), values)); \ + } + +#else + +# define FMT_MAKE_REF(n) fmt::internal::MakeValue(v##n) +# define FMT_MAKE_REF2(n) v##n + +// Defines a wrapper for a function taking one argument of type arg_type +// and n additional arguments of arbitrary types. +# define FMT_WRAP1(func, arg_type, n) \ + template \ + inline void func(arg_type arg1, FMT_GEN(n, FMT_MAKE_ARG)) { \ + const fmt::internal::Value vals[] = {FMT_GEN(n, FMT_MAKE_REF)}; \ + func(arg1, fmt::ArgList( \ + fmt::internal::make_type(FMT_GEN(n, FMT_MAKE_REF2)), vals)); \ + } + +// Emulates a variadic function returning void on a pre-C++11 compiler. +# define FMT_VARIADIC_VOID(func, arg_type) \ + inline void func(arg_type arg) { func(arg, fmt::ArgList()); } \ + FMT_WRAP1(func, arg_type, 1) FMT_WRAP1(func, arg_type, 2) \ + FMT_WRAP1(func, arg_type, 3) FMT_WRAP1(func, arg_type, 4) \ + FMT_WRAP1(func, arg_type, 5) FMT_WRAP1(func, arg_type, 6) \ + FMT_WRAP1(func, arg_type, 7) FMT_WRAP1(func, arg_type, 8) \ + FMT_WRAP1(func, arg_type, 9) FMT_WRAP1(func, arg_type, 10) + +# define FMT_CTOR(ctor, func, arg0_type, arg1_type, n) \ + template \ + ctor(arg0_type arg0, arg1_type arg1, FMT_GEN(n, FMT_MAKE_ARG)) { \ + const fmt::internal::Value vals[] = {FMT_GEN(n, FMT_MAKE_REF)}; \ + func(arg0, arg1, fmt::ArgList( \ + fmt::internal::make_type(FMT_GEN(n, FMT_MAKE_REF2)), vals)); \ + } + +// Emulates a variadic constructor on a pre-C++11 compiler. +# define FMT_VARIADIC_CTOR(ctor, func, arg0_type, arg1_type) \ + FMT_CTOR(ctor, func, arg0_type, arg1_type, 1) \ + FMT_CTOR(ctor, func, arg0_type, arg1_type, 2) \ + FMT_CTOR(ctor, func, arg0_type, arg1_type, 3) \ + FMT_CTOR(ctor, func, arg0_type, arg1_type, 4) \ + FMT_CTOR(ctor, func, arg0_type, arg1_type, 5) \ + FMT_CTOR(ctor, func, arg0_type, arg1_type, 6) \ + FMT_CTOR(ctor, func, arg0_type, arg1_type, 7) \ + FMT_CTOR(ctor, func, arg0_type, arg1_type, 8) \ + FMT_CTOR(ctor, func, arg0_type, arg1_type, 9) \ + FMT_CTOR(ctor, func, arg0_type, arg1_type, 10) +#endif + +// Generates a comma-separated list with results of applying f to pairs +// (argument, index). +#define FMT_FOR_EACH1(f, x0) f(x0, 0) +#define FMT_FOR_EACH2(f, x0, x1) \ + FMT_FOR_EACH1(f, x0), f(x1, 1) +#define FMT_FOR_EACH3(f, x0, x1, x2) \ + FMT_FOR_EACH2(f, x0 ,x1), f(x2, 2) +#define FMT_FOR_EACH4(f, x0, x1, x2, x3) \ + FMT_FOR_EACH3(f, x0, x1, x2), f(x3, 3) +#define FMT_FOR_EACH5(f, x0, x1, x2, x3, x4) \ + FMT_FOR_EACH4(f, x0, x1, x2, x3), f(x4, 4) +#define FMT_FOR_EACH6(f, x0, x1, x2, x3, x4, x5) \ + FMT_FOR_EACH5(f, x0, x1, x2, x3, x4), f(x5, 5) +#define FMT_FOR_EACH7(f, x0, x1, x2, x3, x4, x5, x6) \ + FMT_FOR_EACH6(f, x0, x1, x2, x3, x4, x5), f(x6, 6) +#define FMT_FOR_EACH8(f, x0, x1, x2, x3, x4, x5, x6, x7) \ + FMT_FOR_EACH7(f, x0, x1, x2, x3, x4, x5, x6), f(x7, 7) +#define FMT_FOR_EACH9(f, x0, x1, x2, x3, x4, x5, x6, x7, x8) \ + FMT_FOR_EACH8(f, x0, x1, x2, x3, x4, x5, x6, x7), f(x8, 8) +#define FMT_FOR_EACH10(f, x0, x1, x2, x3, x4, x5, x6, x7, x8, x9) \ + FMT_FOR_EACH9(f, x0, x1, x2, x3, x4, x5, x6, x7, x8), f(x9, 9) + +/** + An error returned by an operating system or a language runtime, + for example a file opening error. +*/ +class SystemError : public internal::RuntimeError { + private: + void init(int err_code, StringRef format_str, ArgList args); + + protected: + int error_code_; + + typedef char Char; // For FMT_VARIADIC_CTOR. + + SystemError() {} + + public: + /** + \rst + Constructs a :class:`fmt::SystemError` object with the description + of the form + + .. parsed-literal:: + **: ** + + where ** is the formatted message and ** is + the system message corresponding to the error code. + *error_code* is a system error code as given by ``errno``. + If *error_code* is not a valid error code such as -1, the system message + may look like "Unknown error -1" and is platform-dependent. + + **Example**:: + + // This throws a SystemError with the description + // cannot open file 'madeup': No such file or directory + // or similar (system message may vary). + const char *filename = "madeup"; + std::FILE *file = std::fopen(filename, "r"); + if (!file) + throw fmt::SystemError(errno, "cannot open file '{}'", filename); + \endrst + */ + SystemError(int error_code, StringRef message) { + init(error_code, message, ArgList()); + } + FMT_VARIADIC_CTOR(SystemError, init, int, StringRef) + + int error_code() const { return error_code_; } +}; + +/** + \rst + This template provides operations for formatting and writing data into + a character stream. The output is stored in a buffer provided by a subclass + such as :class:`fmt::BasicMemoryWriter`. + + You can use one of the following typedefs for common character types: + + +---------+----------------------+ + | Type | Definition | + +=========+======================+ + | Writer | BasicWriter | + +---------+----------------------+ + | WWriter | BasicWriter | + +---------+----------------------+ + + \endrst + */ +template +class BasicWriter { + private: + // Output buffer. + internal::Buffer &buffer_; + + FMT_DISALLOW_COPY_AND_ASSIGN(BasicWriter); + + typedef typename internal::CharTraits::CharPtr CharPtr; + +#if _SECURE_SCL + // Returns pointer value. + static Char *get(CharPtr p) { return p.base(); } +#else + static Char *get(Char *p) { return p; } +#endif + + // Fills the padding around the content and returns the pointer to the + // content area. + static CharPtr fill_padding(CharPtr buffer, + unsigned total_size, std::size_t content_size, wchar_t fill); + + // Grows the buffer by n characters and returns a pointer to the newly + // allocated area. + CharPtr grow_buffer(std::size_t n) { + std::size_t size = buffer_.size(); + buffer_.resize(size + n); + return internal::make_ptr(&buffer_[size], n); + } + + // Prepare a buffer for integer formatting. + CharPtr prepare_int_buffer(unsigned num_digits, + const EmptySpec &, const char *prefix, unsigned prefix_size) { + unsigned size = prefix_size + num_digits; + CharPtr p = grow_buffer(size); + std::copy(prefix, prefix + prefix_size, p); + return p + size - 1; + } + + template + CharPtr prepare_int_buffer(unsigned num_digits, + const Spec &spec, const char *prefix, unsigned prefix_size); + + // Formats an integer. + template + void write_int(T value, Spec spec); + + // Formats a floating-point number (double or long double). + template + void write_double(T value, const FormatSpec &spec); + + // Writes a formatted string. + template + CharPtr write_str( + const StrChar *s, std::size_t size, const AlignSpec &spec); + + template + void write_str( + const internal::Arg::StringValue &str, const FormatSpec &spec); + + // This following methods are private to disallow writing wide characters + // and strings to a char stream. If you want to print a wide string as a + // pointer as std::ostream does, cast it to const void*. + // Do not implement! + void operator<<(typename internal::WCharHelper::Unsupported); + void operator<<( + typename internal::WCharHelper::Unsupported); + + // Appends floating-point length specifier to the format string. + // The second argument is only used for overload resolution. + void append_float_length(Char *&format_ptr, long double) { + *format_ptr++ = 'L'; + } + + template + void append_float_length(Char *&, T) {} + + friend class internal::ArgFormatter; + friend class internal::PrintfFormatter; + + protected: + /** + Constructs a ``BasicWriter`` object. + */ + explicit BasicWriter(internal::Buffer &b) : buffer_(b) {} + + public: + /** + Destroys a ``BasicWriter`` object. + */ + virtual ~BasicWriter() {} + + /** + Returns the total number of characters written. + */ + std::size_t size() const { return buffer_.size(); } + + /** + Returns a pointer to the output buffer content. No terminating null + character is appended. + */ + const Char *data() const FMT_NOEXCEPT { return &buffer_[0]; } + + /** + Returns a pointer to the output buffer content with terminating null + character appended. + */ + const Char *c_str() const { + std::size_t size = buffer_.size(); + buffer_.reserve(size + 1); + buffer_[size] = '\0'; + return &buffer_[0]; + } + + /** + Returns the content of the output buffer as an `std::string`. + */ + std::basic_string str() const { + return std::basic_string(&buffer_[0], buffer_.size()); + } + + /** + \rst + Writes formatted data. + + *args* is an argument list representing arbitrary arguments. + + **Example**:: + + MemoryWriter out; + out.write("Current point:\n"); + out.write("({:+f}, {:+f})", -3.14, 3.14); + + This will write the following output to the ``out`` object: + + .. code-block:: none + + Current point: + (-3.140000, +3.140000) + + The output can be accessed using :func:`data()`, :func:`c_str` or + :func:`str` methods. + + See also :ref:`syntax`. + \endrst + */ + void write(BasicStringRef format, ArgList args) { + BasicFormatter(*this).format(format, args); + } + FMT_VARIADIC_VOID(write, BasicStringRef) + + BasicWriter &operator<<(int value) { + return *this << IntFormatSpec(value); + } + BasicWriter &operator<<(unsigned value) { + return *this << IntFormatSpec(value); + } + BasicWriter &operator<<(long value) { + return *this << IntFormatSpec(value); + } + BasicWriter &operator<<(unsigned long value) { + return *this << IntFormatSpec(value); + } + BasicWriter &operator<<(LongLong value) { + return *this << IntFormatSpec(value); + } + + /** + Formats *value* and writes it to the stream. + */ + BasicWriter &operator<<(ULongLong value) { + return *this << IntFormatSpec(value); + } + + BasicWriter &operator<<(double value) { + write_double(value, FormatSpec()); + return *this; + } + + /** + Formats *value* using the general format for floating-point numbers + (``'g'``) and writes it to the stream. + */ + BasicWriter &operator<<(long double value) { + write_double(value, FormatSpec()); + return *this; + } + + /** + Writes a character to the stream. + */ + BasicWriter &operator<<(char value) { + buffer_.push_back(value); + return *this; + } + + BasicWriter &operator<<( + typename internal::WCharHelper::Supported value) { + buffer_.push_back(value); + return *this; + } + + /** + Writes *value* to the stream. + */ + BasicWriter &operator<<(fmt::BasicStringRef value) { + const Char *str = value.c_str(); + buffer_.append(str, str + value.size()); + return *this; + } + + template + BasicWriter &operator<<(IntFormatSpec spec) { + internal::CharTraits::convert(FillChar()); + write_int(spec.value(), spec); + return *this; + } + + template + BasicWriter &operator<<(const StrFormatSpec &spec) { + const StrChar *s = spec.str(); + // TODO: error if fill is not convertible to Char + write_str(s, std::char_traits::length(s), spec); + return *this; + } + + void clear() FMT_NOEXCEPT { buffer_.clear(); } +}; + +template +template +typename BasicWriter::CharPtr BasicWriter::write_str( + const StrChar *s, std::size_t size, const AlignSpec &spec) { + CharPtr out = CharPtr(); + if (spec.width() > size) { + out = grow_buffer(spec.width()); + Char fill = static_cast(spec.fill()); + if (spec.align() == ALIGN_RIGHT) { + std::fill_n(out, spec.width() - size, fill); + out += spec.width() - size; + } else if (spec.align() == ALIGN_CENTER) { + out = fill_padding(out, spec.width(), size, fill); + } else { + std::fill_n(out + size, spec.width() - size, fill); + } + } else { + out = grow_buffer(size); + } + std::copy(s, s + size, out); + return out; +} + +template +typename BasicWriter::CharPtr + BasicWriter::fill_padding( + CharPtr buffer, unsigned total_size, + std::size_t content_size, wchar_t fill) { + std::size_t padding = total_size - content_size; + std::size_t left_padding = padding / 2; + Char fill_char = static_cast(fill); + std::fill_n(buffer, left_padding, fill_char); + buffer += left_padding; + CharPtr content = buffer; + std::fill_n(buffer + content_size, padding - left_padding, fill_char); + return content; +} + +template +template +typename BasicWriter::CharPtr + BasicWriter::prepare_int_buffer( + unsigned num_digits, const Spec &spec, + const char *prefix, unsigned prefix_size) { + unsigned width = spec.width(); + Alignment align = spec.align(); + Char fill = static_cast(spec.fill()); + if (spec.precision() > static_cast(num_digits)) { + // Octal prefix '0' is counted as a digit, so ignore it if precision + // is specified. + if (prefix_size > 0 && prefix[prefix_size - 1] == '0') + --prefix_size; + unsigned number_size = prefix_size + spec.precision(); + AlignSpec subspec(number_size, '0', ALIGN_NUMERIC); + if (number_size >= width) + return prepare_int_buffer(num_digits, subspec, prefix, prefix_size); + buffer_.reserve(width); + unsigned fill_size = width - number_size; + if (align != ALIGN_LEFT) { + CharPtr p = grow_buffer(fill_size); + std::fill(p, p + fill_size, fill); + } + CharPtr result = prepare_int_buffer( + num_digits, subspec, prefix, prefix_size); + if (align == ALIGN_LEFT) { + CharPtr p = grow_buffer(fill_size); + std::fill(p, p + fill_size, fill); + } + return result; + } + unsigned size = prefix_size + num_digits; + if (width <= size) { + CharPtr p = grow_buffer(size); + std::copy(prefix, prefix + prefix_size, p); + return p + size - 1; + } + CharPtr p = grow_buffer(width); + CharPtr end = p + width; + if (align == ALIGN_LEFT) { + std::copy(prefix, prefix + prefix_size, p); + p += size; + std::fill(p, end, fill); + } else if (align == ALIGN_CENTER) { + p = fill_padding(p, width, size, fill); + std::copy(prefix, prefix + prefix_size, p); + p += size; + } else { + if (align == ALIGN_NUMERIC) { + if (prefix_size != 0) { + p = std::copy(prefix, prefix + prefix_size, p); + size -= prefix_size; + } + } else { + std::copy(prefix, prefix + prefix_size, end - size); + } + std::fill(p, end - size, fill); + p = end; + } + return p - 1; +} + +template +template +void BasicWriter::write_int(T value, Spec spec) { + unsigned prefix_size = 0; + typedef typename internal::IntTraits::MainType UnsignedType; + UnsignedType abs_value = value; + char prefix[4] = ""; + if (internal::is_negative(value)) { + prefix[0] = '-'; + ++prefix_size; + abs_value = 0 - abs_value; + } else if (spec.flag(SIGN_FLAG)) { + prefix[0] = spec.flag(PLUS_FLAG) ? '+' : ' '; + ++prefix_size; + } + switch (spec.type()) { + case 0: case 'd': { + unsigned num_digits = internal::count_digits(abs_value); + CharPtr p = prepare_int_buffer( + num_digits, spec, prefix, prefix_size) + 1 - num_digits; + internal::format_decimal(get(p), abs_value, num_digits); + break; + } + case 'x': case 'X': { + UnsignedType n = abs_value; + if (spec.flag(HASH_FLAG)) { + prefix[prefix_size++] = '0'; + prefix[prefix_size++] = spec.type(); + } + unsigned num_digits = 0; + do { + ++num_digits; + } while ((n >>= 4) != 0); + Char *p = get(prepare_int_buffer( + num_digits, spec, prefix, prefix_size)); + n = abs_value; + const char *digits = spec.type() == 'x' ? + "0123456789abcdef" : "0123456789ABCDEF"; + do { + *p-- = digits[n & 0xf]; + } while ((n >>= 4) != 0); + break; + } + case 'b': case 'B': { + UnsignedType n = abs_value; + if (spec.flag(HASH_FLAG)) { + prefix[prefix_size++] = '0'; + prefix[prefix_size++] = spec.type(); + } + unsigned num_digits = 0; + do { + ++num_digits; + } while ((n >>= 1) != 0); + Char *p = get(prepare_int_buffer(num_digits, spec, prefix, prefix_size)); + n = abs_value; + do { + *p-- = '0' + (n & 1); + } while ((n >>= 1) != 0); + break; + } + case 'o': { + UnsignedType n = abs_value; + if (spec.flag(HASH_FLAG)) + prefix[prefix_size++] = '0'; + unsigned num_digits = 0; + do { + ++num_digits; + } while ((n >>= 3) != 0); + Char *p = get(prepare_int_buffer(num_digits, spec, prefix, prefix_size)); + n = abs_value; + do { + *p-- = '0' + (n & 7); + } while ((n >>= 3) != 0); + break; + } + default: + internal::report_unknown_type( + spec.type(), spec.flag(CHAR_FLAG) ? "char" : "integer"); + break; + } +} + +template +template +void BasicWriter::write_double( + T value, const FormatSpec &spec) { + // Check type. + char type = spec.type(); + bool upper = false; + switch (type) { + case 0: + type = 'g'; + break; + case 'e': case 'f': case 'g': case 'a': + break; + case 'F': +#ifdef _MSC_VER + // MSVC's printf doesn't support 'F'. + type = 'f'; +#endif + // Fall through. + case 'E': case 'G': case 'A': + upper = true; + break; + default: + internal::report_unknown_type(type, "double"); + break; + } + + char sign = 0; + // Use getsign instead of value < 0 because the latter is always + // false for NaN. + if (internal::getsign(static_cast(value))) { + sign = '-'; + value = -value; + } else if (spec.flag(SIGN_FLAG)) { + sign = spec.flag(PLUS_FLAG) ? '+' : ' '; + } + + if (value != value) { + // Format NaN ourselves because sprintf's output is not consistent + // across platforms. + std::size_t nan_size = 4; + const char *nan = upper ? " NAN" : " nan"; + if (!sign) { + --nan_size; + ++nan; + } + CharPtr out = write_str(nan, nan_size, spec); + if (sign) + *out = sign; + return; + } + + if (internal::isinfinity(value)) { + // Format infinity ourselves because sprintf's output is not consistent + // across platforms. + std::size_t inf_size = 4; + const char *inf = upper ? " INF" : " inf"; + if (!sign) { + --inf_size; + ++inf; + } + CharPtr out = write_str(inf, inf_size, spec); + if (sign) + *out = sign; + return; + } + + std::size_t offset = buffer_.size(); + unsigned width = spec.width(); + if (sign) { + buffer_.reserve(buffer_.size() + (std::max)(width, 1u)); + if (width > 0) + --width; + ++offset; + } + + // Build format string. + enum { MAX_FORMAT_SIZE = 10}; // longest format: %#-*.*Lg + Char format[MAX_FORMAT_SIZE]; + Char *format_ptr = format; + *format_ptr++ = '%'; + unsigned width_for_sprintf = width; + if (spec.flag(HASH_FLAG)) + *format_ptr++ = '#'; + if (spec.align() == ALIGN_CENTER) { + width_for_sprintf = 0; + } else { + if (spec.align() == ALIGN_LEFT) + *format_ptr++ = '-'; + if (width != 0) + *format_ptr++ = '*'; + } + if (spec.precision() >= 0) { + *format_ptr++ = '.'; + *format_ptr++ = '*'; + } + + append_float_length(format_ptr, value); + *format_ptr++ = type; + *format_ptr = '\0'; + + // Format using snprintf. + Char fill = static_cast(spec.fill()); + for (;;) { + std::size_t buffer_size = buffer_.capacity() - offset; +#if _MSC_VER + // MSVC's vsnprintf_s doesn't work with zero size, so reserve + // space for at least one extra character to make the size non-zero. + // Note that the buffer's capacity will increase by more than 1. + if (buffer_size == 0) { + buffer_.reserve(offset + 1); + buffer_size = buffer_.capacity() - offset; + } +#endif + Char *start = &buffer_[offset]; + int n = internal::CharTraits::format_float( + start, buffer_size, format, width_for_sprintf, spec.precision(), value); + if (n >= 0 && offset + n < buffer_.capacity()) { + if (sign) { + if ((spec.align() != ALIGN_RIGHT && spec.align() != ALIGN_DEFAULT) || + *start != ' ') { + *(start - 1) = sign; + sign = 0; + } else { + *(start - 1) = fill; + } + ++n; + } + if (spec.align() == ALIGN_CENTER && + spec.width() > static_cast(n)) { + width = spec.width(); + CharPtr p = grow_buffer(width); + std::copy(p, p + n, p + (width - n) / 2); + fill_padding(p, spec.width(), n, fill); + return; + } + if (spec.fill() != ' ' || sign) { + while (*start == ' ') + *start++ = fill; + if (sign) + *(start - 1) = sign; + } + grow_buffer(n); + return; + } + // If n is negative we ask to increase the capacity by at least 1, + // but as std::vector, the buffer grows exponentially. + buffer_.reserve(n >= 0 ? offset + n + 1 : buffer_.capacity() + 1); + } +} + +/** + \rst + This class template provides operations for formatting and writing data + into a character stream. The output is stored in a memory buffer that grows + dynamically. + + You can use one of the following typedefs for common character types + and the standard allocator: + + +---------------+-----------------------------------------------------+ + | Type | Definition | + +===============+=====================================================+ + | MemoryWriter | BasicMemoryWriter> | + +---------------+-----------------------------------------------------+ + | WMemoryWriter | BasicMemoryWriter> | + +---------------+-----------------------------------------------------+ + + **Example**:: + + MemoryWriter out; + out << "The answer is " << 42 << "\n"; + out.write("({:+f}, {:+f})", -3.14, 3.14); + + This will write the following output to the ``out`` object: + + .. code-block:: none + + The answer is 42 + (-3.140000, +3.140000) + + The output can be converted to an ``std::string`` with ``out.str()`` or + accessed as a C string with ``out.c_str()``. + \endrst + */ +template > +class BasicMemoryWriter : public BasicWriter { + private: + internal::MemoryBuffer buffer_; + + public: + explicit BasicMemoryWriter(const Allocator& alloc = Allocator()) + : BasicWriter(buffer_), buffer_(alloc) {} + +#if FMT_USE_RVALUE_REFERENCES + /** + \rst + Constructs a :class:`fmt::BasicMemoryWriter` object moving the content + of the other object to it. + \endrst + */ + BasicMemoryWriter(BasicMemoryWriter &&other) + : BasicWriter(buffer_), buffer_(std::move(other.buffer_)) { + } + + /** + \rst + Moves the content of the other ``BasicMemoryWriter`` object to this one. + \endrst + */ + BasicMemoryWriter &operator=(BasicMemoryWriter &&other) { + buffer_ = std::move(other.buffer_); + return *this; + } +#endif +}; + +typedef BasicMemoryWriter MemoryWriter; +typedef BasicMemoryWriter WMemoryWriter; + +/** + \rst + This class template provides operations for formatting and writing data + into a fixed-size array. For writing into a dynamically growing buffer + use :class:`fmt::BasicMemoryWriter`. + + Any write method will throw ``std::runtime_error`` if the output doesn't fit + into the array. + + You can use one of the following typedefs for common character types: + + +--------------+---------------------------+ + | Type | Definition | + +==============+===========================+ + | ArrayWriter | BasicArrayWriter | + +--------------+---------------------------+ + | WArrayWriter | BasicArrayWriter | + +--------------+---------------------------+ + \endrst + */ +template +class BasicArrayWriter : public BasicWriter { + private: + internal::FixedBuffer buffer_; + + public: + /** + \rst + Constructs a :class:`fmt::BasicArrayWriter` object for *array* of the + given size. + \endrst + */ + BasicArrayWriter(Char *array, std::size_t size) + : BasicWriter(buffer_), buffer_(array, size) {} + + // FIXME: this is temporary undocumented due to a bug in Sphinx + /* + \rst + Constructs a :class:`fmt::BasicArrayWriter` object for *array* of the + size known at compile time. + \endrst + */ + template + explicit BasicArrayWriter(Char (&array)[SIZE]) + : BasicWriter(buffer_), buffer_(array, SIZE) {} +}; + +typedef BasicArrayWriter ArrayWriter; +typedef BasicArrayWriter WArrayWriter; + +// Formats a value. +template +void format(BasicFormatter &f, const Char *&format_str, const T &value) { + std::basic_ostringstream os; + os << value; + internal::Arg arg; + internal::Value &arg_value = arg; + std::basic_string str = os.str(); + arg_value = internal::MakeValue(str); + arg.type = static_cast( + internal::MakeValue::type(str)); + format_str = f.format(format_str, arg); +} + +// Reports a system error without throwing an exception. +// Can be used to report errors from destructors. +void report_system_error(int error_code, StringRef message) FMT_NOEXCEPT; + +#ifdef _WIN32 + +/** A Windows error. */ +class WindowsError : public SystemError { + private: + void init(int error_code, StringRef format_str, ArgList args); + + public: + /** + \rst + Constructs a :class:`fmt::WindowsError` object with the description + of the form + + .. parsed-literal:: + **: ** + + where ** is the formatted message and ** is the + system message corresponding to the error code. + *error_code* is a Windows error code as given by ``GetLastError``. + If *error_code* is not a valid error code such as -1, the system message + will look like "error -1". + + **Example**:: + + // This throws a WindowsError with the description + // cannot open file 'madeup': The system cannot find the file specified. + // or similar (system message may vary). + const char *filename = "madeup"; + LPOFSTRUCT of = LPOFSTRUCT(); + HFILE file = OpenFile(filename, &of, OF_READ); + if (file == HFILE_ERROR) { + throw fmt::WindowsError(GetLastError(), + "cannot open file '{}'", filename); + } + \endrst + */ + WindowsError(int error_code, StringRef message) { + init(error_code, message, ArgList()); + } + FMT_VARIADIC_CTOR(WindowsError, init, int, StringRef) +}; + +// Reports a Windows error without throwing an exception. +// Can be used to report errors from destructors. +void report_windows_error(int error_code, StringRef message) FMT_NOEXCEPT; + +#endif + +enum Color { BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE }; + +/** + Formats a string and prints it to stdout using ANSI escape sequences + to specify color (experimental). + Example: + PrintColored(fmt::RED, "Elapsed time: {0:.2f} seconds") << 1.23; + */ +void print_colored(Color c, StringRef format, ArgList args); + +/** + \rst + Formats arguments and returns the result as a string. + + **Example**:: + + std::string message = format("The answer is {}", 42); + \endrst +*/ +inline std::string format(StringRef format_str, ArgList args) { + MemoryWriter w; + w.write(format_str, args); + return w.str(); +} + +inline std::wstring format(WStringRef format_str, ArgList args) { + WMemoryWriter w; + w.write(format_str, args); + return w.str(); +} + +/** + \rst + Prints formatted data to the file *f*. + + **Example**:: + + print(stderr, "Don't {}!", "panic"); + \endrst + */ +void print(std::FILE *f, StringRef format_str, ArgList args); + +/** + \rst + Prints formatted data to ``stdout``. + + **Example**:: + + print("Elapsed time: {0:.2f} seconds", 1.23); + \endrst + */ +void print(StringRef format_str, ArgList args); + +/** + \rst + Prints formatted data to the stream *os*. + + **Example**:: + + print(cerr, "Don't {}!", "panic"); + \endrst + */ +void print(std::ostream &os, StringRef format_str, ArgList args); + +template +void printf(BasicWriter &w, BasicStringRef format, ArgList args) { + internal::PrintfFormatter().format(w, format, args); +} + +/** + \rst + Formats arguments and returns the result as a string. + + **Example**:: + + std::string message = fmt::sprintf("The answer is %d", 42); + \endrst +*/ +inline std::string sprintf(StringRef format, ArgList args) { + MemoryWriter w; + printf(w, format, args); + return w.str(); +} + +/** + \rst + Prints formatted data to the file *f*. + + **Example**:: + + fmt::fprintf(stderr, "Don't %s!", "panic"); + \endrst + */ +int fprintf(std::FILE *f, StringRef format, ArgList args); + +/** + \rst + Prints formatted data to ``stdout``. + + **Example**:: + + fmt::printf("Elapsed time: %.2f seconds", 1.23); + \endrst + */ +inline int printf(StringRef format, ArgList args) { + return fprintf(stdout, format, args); +} + +/** + Fast integer formatter. + */ +class FormatInt { + private: + // Buffer should be large enough to hold all digits (digits10 + 1), + // a sign and a null character. + enum {BUFFER_SIZE = std::numeric_limits::digits10 + 3}; + mutable char buffer_[BUFFER_SIZE]; + char *str_; + + // Formats value in reverse and returns the number of digits. + char *format_decimal(ULongLong value) { + char *buffer_end = buffer_ + BUFFER_SIZE - 1; + while (value >= 100) { + // Integer division is slow so do it for a group of two digits instead + // of for every digit. The idea comes from the talk by Alexandrescu + // "Three Optimization Tips for C++". See speed-test for a comparison. + unsigned index = (value % 100) * 2; + value /= 100; + *--buffer_end = internal::Data::DIGITS[index + 1]; + *--buffer_end = internal::Data::DIGITS[index]; + } + if (value < 10) { + *--buffer_end = static_cast('0' + value); + return buffer_end; + } + unsigned index = static_cast(value * 2); + *--buffer_end = internal::Data::DIGITS[index + 1]; + *--buffer_end = internal::Data::DIGITS[index]; + return buffer_end; + } + + void FormatSigned(LongLong value) { + ULongLong abs_value = static_cast(value); + bool negative = value < 0; + if (negative) + abs_value = 0 - abs_value; + str_ = format_decimal(abs_value); + if (negative) + *--str_ = '-'; + } + + public: + explicit FormatInt(int value) { FormatSigned(value); } + explicit FormatInt(long value) { FormatSigned(value); } + explicit FormatInt(LongLong value) { FormatSigned(value); } + explicit FormatInt(unsigned value) : str_(format_decimal(value)) {} + explicit FormatInt(unsigned long value) : str_(format_decimal(value)) {} + explicit FormatInt(ULongLong value) : str_(format_decimal(value)) {} + + /** + Returns the number of characters written to the output buffer. + */ + std::size_t size() const { return buffer_ - str_ + BUFFER_SIZE - 1; } + + /** + Returns a pointer to the output buffer content. No terminating null + character is appended. + */ + const char *data() const { return str_; } + + /** + Returns a pointer to the output buffer content with terminating null + character appended. + */ + const char *c_str() const { + buffer_[BUFFER_SIZE - 1] = '\0'; + return str_; + } + + /** + Returns the content of the output buffer as an `std::string`. + */ + std::string str() const { return std::string(str_, size()); } +}; + +// Formats a decimal integer value writing into buffer and returns +// a pointer to the end of the formatted string. This function doesn't +// write a terminating null character. +template +inline void format_decimal(char *&buffer, T value) { + typename internal::IntTraits::MainType abs_value = value; + if (internal::is_negative(value)) { + *buffer++ = '-'; + abs_value = 0 - abs_value; + } + if (abs_value < 100) { + if (abs_value < 10) { + *buffer++ = static_cast('0' + abs_value); + return; + } + unsigned index = static_cast(abs_value * 2); + *buffer++ = internal::Data::DIGITS[index]; + *buffer++ = internal::Data::DIGITS[index + 1]; + return; + } + unsigned num_digits = internal::count_digits(abs_value); + internal::format_decimal(buffer, abs_value, num_digits); + buffer += num_digits; +} +} + +#if FMT_GCC_VERSION +// Use the system_header pragma to suppress warnings about variadic macros +// because suppressing -Wvariadic-macros with the diagnostic pragma doesn't +// work. It is used at the end because we want to suppress as little warnings +// as possible. +# pragma GCC system_header +#endif + +// This is used to work around VC++ bugs in handling variadic macros. +#define FMT_EXPAND(args) args + +// Returns the number of arguments. +// Based on https://groups.google.com/forum/#!topic/comp.std.c/d-6Mj5Lko_s. +#define FMT_NARG(...) FMT_NARG_(__VA_ARGS__, FMT_RSEQ_N()) +#define FMT_NARG_(...) FMT_EXPAND(FMT_ARG_N(__VA_ARGS__)) +#define FMT_ARG_N(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N +#define FMT_RSEQ_N() 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 + +#define FMT_CONCAT(a, b) a##b +#define FMT_FOR_EACH_(N, f, ...) \ + FMT_EXPAND(FMT_CONCAT(FMT_FOR_EACH, N)(f, __VA_ARGS__)) +#define FMT_FOR_EACH(f, ...) \ + FMT_EXPAND(FMT_FOR_EACH_(FMT_NARG(__VA_ARGS__), f, __VA_ARGS__)) + +#define FMT_ADD_ARG_NAME(type, index) type arg##index +#define FMT_GET_ARG_NAME(type, index) arg##index + +#if FMT_USE_VARIADIC_TEMPLATES +# define FMT_VARIADIC_(Char, ReturnType, func, call, ...) \ + template \ + ReturnType func(FMT_FOR_EACH(FMT_ADD_ARG_NAME, __VA_ARGS__), \ + const Args & ... args) { \ + using fmt::internal::Value; \ + const Value values[fmt::internal::NonZero::VALUE] = { \ + fmt::internal::MakeValue(args)... \ + }; \ + call(FMT_FOR_EACH(FMT_GET_ARG_NAME, __VA_ARGS__), fmt::ArgList( \ + fmt::internal::make_type(args...), values)); \ + } +#else +// Defines a wrapper for a function taking __VA_ARGS__ arguments +// and n additional arguments of arbitrary types. +# define FMT_WRAP(Char, ReturnType, func, call, n, ...) \ + template \ + inline ReturnType func(FMT_FOR_EACH(FMT_ADD_ARG_NAME, __VA_ARGS__), \ + FMT_GEN(n, FMT_MAKE_ARG)) { \ + const fmt::internal::Value vals[] = {FMT_GEN(n, FMT_MAKE_REF_##Char)}; \ + call(FMT_FOR_EACH(FMT_GET_ARG_NAME, __VA_ARGS__), fmt::ArgList( \ + fmt::internal::make_type(FMT_GEN(n, FMT_MAKE_REF2)), vals)); \ + } + +# define FMT_VARIADIC_(Char, ReturnType, func, call, ...) \ + inline ReturnType func(FMT_FOR_EACH(FMT_ADD_ARG_NAME, __VA_ARGS__)) { \ + call(FMT_FOR_EACH(FMT_GET_ARG_NAME, __VA_ARGS__), fmt::ArgList()); \ + } \ + FMT_WRAP(Char, ReturnType, func, call, 1, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 2, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 3, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 4, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 5, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 6, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 7, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 8, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 9, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 10, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 11, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 12, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 13, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 14, __VA_ARGS__) \ + FMT_WRAP(Char, ReturnType, func, call, 15, __VA_ARGS__) +#endif // FMT_USE_VARIADIC_TEMPLATES + +/** + \rst + Defines a variadic function with the specified return type, function name + and argument types passed as variable arguments to this macro. + + **Example**:: + + void print_error(const char *file, int line, const char *format, + fmt::ArgList args) { + fmt::print("{}: {}: ", file, line); + fmt::print(format, args); + } + FMT_VARIADIC(void, print_error, const char *, int, const char *) + + ``FMT_VARIADIC`` is used for compatibility with legacy C++ compilers that + don't implement variadic templates. You don't have to use this macro if + you don't need legacy compiler support and can use variadic templates + directly:: + + template + void print_error(const char *file, int line, const char *format, + const Args & ... args) { + fmt::print("{}: {}: ", file, line); + fmt::print(format, args...); + } + \endrst + */ +#define FMT_VARIADIC(ReturnType, func, ...) \ + FMT_VARIADIC_(char, ReturnType, func, return func, __VA_ARGS__) + +#define FMT_VARIADIC_W(ReturnType, func, ...) \ + FMT_VARIADIC_(wchar_t, ReturnType, func, return func, __VA_ARGS__) + +namespace fmt { +FMT_VARIADIC(std::string, format, StringRef) +FMT_VARIADIC_W(std::wstring, format, WStringRef) +FMT_VARIADIC(void, print, StringRef) +FMT_VARIADIC(void, print, std::FILE *, StringRef) +FMT_VARIADIC(void, print, std::ostream &, StringRef) +FMT_VARIADIC(void, print_colored, Color, StringRef) +FMT_VARIADIC(std::string, sprintf, StringRef) +FMT_VARIADIC(int, printf, StringRef) +FMT_VARIADIC(int, fprintf, std::FILE *, StringRef) +} + +// Restore warnings. +#if FMT_GCC_VERSION >= 406 +# pragma GCC diagnostic pop +#endif + +#ifdef __clang__ +# pragma clang diagnostic pop +#endif + +#ifdef FMT_HEADER_ONLY +# include "format.cc" +#endif + +#endif // FMT_FORMAT_H_ diff --git a/lib/cppformat/format.vcxproj b/lib/cppformat/format.vcxproj new file mode 100644 index 00000000..bf921bb1 --- /dev/null +++ b/lib/cppformat/format.vcxproj @@ -0,0 +1,202 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} + Win32Proj + Win32 + libformat + 8.1 + + + + StaticLibrary + false + MultiByte + v140_xp + + + StaticLibrary + false + MultiByte + v140_xp + + + StaticLibrary + false + MultiByte + v140_xp + + + StaticLibrary + false + MultiByte + v140_xp + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + bin\$(Platform)-$(Configuration)\ + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + $(ProjectName) + $(ProjectName) + .lib + .lib + bin\$(Platform)-$(Configuration)\ + bin\$(Platform)-$(Configuration)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + obj\$(Platform)-$(Configuration)\$(ProjectName)\ + $(ProjectName) + $(ProjectName) + .lib + .lib + + + + .;gmock;%(AdditionalIncludeDirectories) + Debug/ + EnableFastChecks + CompileAsCpp + EditAndContinue + Sync + NotUsing + MultiThreadedDebug + true + Level3 + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + $(IntDir) + Disabled + + + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + .;gmock;%(AdditionalIncludeDirectories) + + + .;gmock;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + + .;gmock;%(AdditionalIncludeDirectories) + Debug/ + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + NotUsing + MultiThreadedDebug + true + Level3 + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + $(IntDir) + Disabled + + + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + .;gmock;%(AdditionalIncludeDirectories) + + + .;gmock;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + + .;gmock;%(AdditionalIncludeDirectories) + Release/ + CompileAsCpp + ProgramDatabase + Sync + NotUsing + MultiThreaded + true + Level3 + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + $(IntDir) + + + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + .;gmock;%(AdditionalIncludeDirectories) + + + .;gmock;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + .;gmock;%(AdditionalIncludeDirectories) + Release/ + CompileAsCpp + ProgramDatabase + Sync + NotUsing + MultiThreaded + true + Level3 + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + $(IntDir) + + + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + .;gmock;%(AdditionalIncludeDirectories) + + + .;gmock;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/cppformat/format.vcxproj.filters b/lib/cppformat/format.vcxproj.filters new file mode 100644 index 00000000..ce1d0af3 --- /dev/null +++ b/lib/cppformat/format.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + + + {915FED9B-B1C3-4F90-BF61-CF9EE0706F01} + + + {FB559997-0E66-467B-B839-27310F735431} + + + \ No newline at end of file diff --git a/lib/cppformat/posix.cc b/lib/cppformat/posix.cc new file mode 100644 index 00000000..4c086af6 --- /dev/null +++ b/lib/cppformat/posix.cc @@ -0,0 +1,242 @@ +/* + A C++ interface to POSIX functions. + + Copyright (c) 2014 - 2015, Victor Zverovich + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +// Disable bogus MSVC warnings. +#ifndef _CRT_SECURE_NO_WARNINGS +# define _CRT_SECURE_NO_WARNINGS +#endif + +#include "posix.h" + +#include +#include +#include + +#ifndef _WIN32 +# include +#else +# include +# include + +# define O_CREAT _O_CREAT +# define O_TRUNC _O_TRUNC + +#ifndef S_IRUSR +# define S_IRUSR _S_IREAD +#endif + +#ifndef S_IWUSR +# define S_IWUSR _S_IWRITE +#endif + +# ifdef __MINGW32__ +# define _SH_DENYNO 0x40 +# endif + +#endif // _WIN32 + +namespace { +#ifdef _WIN32 +// Return type of read and write functions. +typedef int RWResult; + +// On Windows the count argument to read and write is unsigned, so convert +// it from size_t preventing integer overflow. +inline unsigned convert_rwcount(std::size_t count) { + return count <= UINT_MAX ? static_cast(count) : UINT_MAX; +} +#else +// Return type of read and write functions. +typedef ssize_t RWResult; + +inline std::size_t convert_rwcount(std::size_t count) { return count; } +#endif +} + +fmt::BufferedFile::~BufferedFile() FMT_NOEXCEPT { + if (file_ && FMT_SYSTEM(fclose(file_)) != 0) + fmt::report_system_error(errno, "cannot close file"); +} + +fmt::BufferedFile::BufferedFile(fmt::StringRef filename, fmt::StringRef mode) { + FMT_RETRY_VAL(file_, FMT_SYSTEM(fopen(filename.c_str(), mode.c_str())), 0); + if (!file_) + throw SystemError(errno, "cannot open file {}", filename); +} + +void fmt::BufferedFile::close() { + if (!file_) + return; + int result = FMT_SYSTEM(fclose(file_)); + file_ = 0; + if (result != 0) + throw SystemError(errno, "cannot close file"); +} + +int fmt::BufferedFile::fileno() const { + int fd = FMT_POSIX_CALL(fileno(file_)); + if (fd == -1) + throw SystemError(errno, "cannot get file descriptor"); + return fd; +} + +fmt::File::File(fmt::StringRef path, int oflag) { + int mode = S_IRUSR | S_IWUSR; +#ifdef _WIN32 + fd_ = -1; + FMT_POSIX_CALL(sopen_s(&fd_, path.c_str(), oflag, _SH_DENYNO, mode)); +#else + FMT_RETRY(fd_, FMT_POSIX_CALL(open(path.c_str(), oflag, mode))); +#endif + if (fd_ == -1) + throw SystemError(errno, "cannot open file {}", path); +} + +fmt::File::~File() FMT_NOEXCEPT { + // Don't retry close in case of EINTR! + // See http://linux.derkeiler.com/Mailing-Lists/Kernel/2005-09/3000.html + if (fd_ != -1 && FMT_POSIX_CALL(close(fd_)) != 0) + fmt::report_system_error(errno, "cannot close file"); +} + +void fmt::File::close() { + if (fd_ == -1) + return; + // Don't retry close in case of EINTR! + // See http://linux.derkeiler.com/Mailing-Lists/Kernel/2005-09/3000.html + int result = FMT_POSIX_CALL(close(fd_)); + fd_ = -1; + if (result != 0) + throw SystemError(errno, "cannot close file"); +} + +fmt::LongLong fmt::File::size() const { +#ifdef _WIN32 + LARGE_INTEGER filesize = {}; + HANDLE handle = reinterpret_cast(_get_osfhandle(fd_)); + if (!FMT_SYSTEM(GetFileSizeEx(handle, &filesize))) + throw WindowsError(GetLastError(), "cannot get file size"); + FMT_STATIC_ASSERT(sizeof(fmt::LongLong) >= sizeof(filesize.QuadPart), + "return type of File::size is not large enough"); + return filesize.QuadPart; +#else + typedef struct stat Stat; + Stat file_stat = Stat(); + if (FMT_POSIX_CALL(fstat(fd_, &file_stat)) == -1) + throw SystemError(errno, "cannot get file attributes"); + FMT_STATIC_ASSERT(sizeof(fmt::LongLong) >= sizeof(file_stat.st_size), + "return type of File::size is not large enough"); + return file_stat.st_size; +#endif +} + +std::size_t fmt::File::read(void *buffer, std::size_t count) { + RWResult result = 0; + FMT_RETRY(result, FMT_POSIX_CALL(read(fd_, buffer, convert_rwcount(count)))); + if (result < 0) + throw SystemError(errno, "cannot read from file"); + return result; +} + +std::size_t fmt::File::write(const void *buffer, std::size_t count) { + RWResult result = 0; + FMT_RETRY(result, FMT_POSIX_CALL(write(fd_, buffer, convert_rwcount(count)))); + if (result < 0) + throw SystemError(errno, "cannot write to file"); + return result; +} + +fmt::File fmt::File::dup(int fd) { + // Don't retry as dup doesn't return EINTR. + // http://pubs.opengroup.org/onlinepubs/009695399/functions/dup.html + int new_fd = FMT_POSIX_CALL(dup(fd)); + if (new_fd == -1) + throw SystemError(errno, "cannot duplicate file descriptor {}", fd); + return File(new_fd); +} + +void fmt::File::dup2(int fd) { + int result = 0; + FMT_RETRY(result, FMT_POSIX_CALL(dup2(fd_, fd))); + if (result == -1) { + throw SystemError(errno, + "cannot duplicate file descriptor {} to {}", fd_, fd); + } +} + +void fmt::File::dup2(int fd, ErrorCode &ec) FMT_NOEXCEPT { + int result = 0; + FMT_RETRY(result, FMT_POSIX_CALL(dup2(fd_, fd))); + if (result == -1) + ec = ErrorCode(errno); +} + +void fmt::File::pipe(File &read_end, File &write_end) { + // Close the descriptors first to make sure that assignments don't throw + // and there are no leaks. + read_end.close(); + write_end.close(); + int fds[2] = {}; +#ifdef _WIN32 + // Make the default pipe capacity same as on Linux 2.6.11+. + enum { DEFAULT_CAPACITY = 65536 }; + int result = FMT_POSIX_CALL(pipe(fds, DEFAULT_CAPACITY, _O_BINARY)); +#else + // Don't retry as the pipe function doesn't return EINTR. + // http://pubs.opengroup.org/onlinepubs/009696799/functions/pipe.html + int result = FMT_POSIX_CALL(pipe(fds)); +#endif + if (result != 0) + throw SystemError(errno, "cannot create pipe"); + // The following assignments don't throw because read_fd and write_fd + // are closed. + read_end = File(fds[0]); + write_end = File(fds[1]); +} + +fmt::BufferedFile fmt::File::fdopen(const char *mode) { + // Don't retry as fdopen doesn't return EINTR. + FILE *f = FMT_POSIX_CALL(fdopen(fd_, mode)); + if (!f) + throw SystemError(errno, "cannot associate stream with file descriptor"); + BufferedFile file(f); + fd_ = -1; + return file; +} + +long fmt::getpagesize() { +#ifdef _WIN32 + SYSTEM_INFO si; + GetSystemInfo(&si); + return si.dwPageSize; +#else + long size = FMT_POSIX_CALL(sysconf(_SC_PAGESIZE)); + if (size < 0) + throw SystemError(errno, "cannot get memory page size"); + return size; +#endif +} diff --git a/lib/cppformat/posix.h b/lib/cppformat/posix.h new file mode 100644 index 00000000..e16ac521 --- /dev/null +++ b/lib/cppformat/posix.h @@ -0,0 +1,337 @@ +/* + A C++ interface to POSIX functions. + + Copyright (c) 2014 - 2015, Victor Zverovich + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef FMT_POSIX_H_ +#define FMT_POSIX_H_ + +#include +#include // for O_RDONLY +#include + +#include + +#include "format.h" + +#ifdef FMT_INCLUDE_POSIX_TEST +# include "test/posix-test.h" +#endif + +#ifndef FMT_POSIX +# ifdef _WIN32 +// Fix warnings about deprecated symbols. +# define FMT_POSIX(call) _##call +# else +# define FMT_POSIX(call) call +# endif +#endif + +// Calls to system functions are wrapped in FMT_SYSTEM for testability. +#ifdef FMT_SYSTEM +# define FMT_POSIX_CALL(call) FMT_SYSTEM(call) +#else +# define FMT_SYSTEM(call) call +# ifdef _WIN32 +// Fix warnings about deprecated symbols. +# define FMT_POSIX_CALL(call) ::_##call +# else +# define FMT_POSIX_CALL(call) ::call +# endif +#endif + +#if FMT_GCC_VERSION >= 407 +# define FMT_UNUSED __attribute__((unused)) +#else +# define FMT_UNUSED +#endif + +#if FMT_USE_STATIC_ASSERT || FMT_HAS_CPP_ATTRIBUTE(cxx_static_assert) || \ + (FMT_GCC_VERSION >= 403 && FMT_HAS_GXX_CXX11) || _MSC_VER >= 1600 +# define FMT_STATIC_ASSERT(cond, message) static_assert(cond, message) +#else +# define FMT_CONCAT_(a, b) FMT_CONCAT(a, b) +# define FMT_STATIC_ASSERT(cond, message) \ + typedef int FMT_CONCAT_(Assert, __LINE__)[(cond) ? 1 : -1] FMT_UNUSED +#endif + +// Retries the expression while it evaluates to error_result and errno +// equals to EINTR. +#ifndef _WIN32 +# define FMT_RETRY_VAL(result, expression, error_result) \ + do { \ + result = (expression); \ + } while (result == error_result && errno == EINTR) +#else +# define FMT_RETRY_VAL(result, expression, error_result) result = (expression) +#endif + +#define FMT_RETRY(result, expression) FMT_RETRY_VAL(result, expression, -1) + +namespace fmt { + +// An error code. +class ErrorCode { + private: + int value_; + + public: + explicit ErrorCode(int value = 0) FMT_NOEXCEPT : value_(value) {} + + int get() const FMT_NOEXCEPT { return value_; } +}; + +// A buffered file. +class BufferedFile { + private: + FILE *file_; + + friend class File; + + explicit BufferedFile(FILE *f) : file_(f) {} + + public: + // Constructs a BufferedFile object which doesn't represent any file. + BufferedFile() FMT_NOEXCEPT : file_(0) {} + + // Destroys the object closing the file it represents if any. + ~BufferedFile() FMT_NOEXCEPT; + +#if !FMT_USE_RVALUE_REFERENCES + // Emulate a move constructor and a move assignment operator if rvalue + // references are not supported. + + private: + // A proxy object to emulate a move constructor. + // It is private to make it impossible call operator Proxy directly. + struct Proxy { + FILE *file; + }; + +public: + // A "move constructor" for moving from a temporary. + BufferedFile(Proxy p) FMT_NOEXCEPT : file_(p.file) {} + + // A "move constructor" for for moving from an lvalue. + BufferedFile(BufferedFile &f) FMT_NOEXCEPT : file_(f.file_) { + f.file_ = 0; + } + + // A "move assignment operator" for moving from a temporary. + BufferedFile &operator=(Proxy p) { + close(); + file_ = p.file; + return *this; + } + + // A "move assignment operator" for moving from an lvalue. + BufferedFile &operator=(BufferedFile &other) { + close(); + file_ = other.file_; + other.file_ = 0; + return *this; + } + + // Returns a proxy object for moving from a temporary: + // BufferedFile file = BufferedFile(...); + operator Proxy() FMT_NOEXCEPT { + Proxy p = {file_}; + file_ = 0; + return p; + } + +#else + private: + FMT_DISALLOW_COPY_AND_ASSIGN(BufferedFile); + + public: + BufferedFile(BufferedFile &&other) FMT_NOEXCEPT : file_(other.file_) { + other.file_ = 0; + } + + BufferedFile& operator=(BufferedFile &&other) { + close(); + file_ = other.file_; + other.file_ = 0; + return *this; + } +#endif + + // Opens a file. + BufferedFile(fmt::StringRef filename, fmt::StringRef mode); + + // Closes the file. + void close(); + + // Returns the pointer to a FILE object representing this file. + FILE *get() const FMT_NOEXCEPT { return file_; } + + int fileno() const; + + void print(fmt::StringRef format_str, const ArgList &args) { + fmt::print(file_, format_str, args); + } + FMT_VARIADIC(void, print, fmt::StringRef) +}; + +// A file. Closed file is represented by a File object with descriptor -1. +// Methods that are not declared with FMT_NOEXCEPT may throw +// fmt::SystemError in case of failure. Note that some errors such as +// closing the file multiple times will cause a crash on Windows rather +// than an exception. You can get standard behavior by overriding the +// invalid parameter handler with _set_invalid_parameter_handler. +class File { + private: + int fd_; // File descriptor. + + // Constructs a File object with a given descriptor. + explicit File(int fd) : fd_(fd) {} + + public: + // Possible values for the oflag argument to the constructor. + enum { + RDONLY = FMT_POSIX(O_RDONLY), // Open for reading only. + WRONLY = FMT_POSIX(O_WRONLY), // Open for writing only. + RDWR = FMT_POSIX(O_RDWR) // Open for reading and writing. + }; + + // Constructs a File object which doesn't represent any file. + File() FMT_NOEXCEPT : fd_(-1) {} + + // Opens a file and constructs a File object representing this file. + File(fmt::StringRef path, int oflag); + +#if !FMT_USE_RVALUE_REFERENCES + // Emulate a move constructor and a move assignment operator if rvalue + // references are not supported. + + private: + // A proxy object to emulate a move constructor. + // It is private to make it impossible call operator Proxy directly. + struct Proxy { + int fd; + }; + + public: + // A "move constructor" for moving from a temporary. + File(Proxy p) FMT_NOEXCEPT : fd_(p.fd) {} + + // A "move constructor" for for moving from an lvalue. + File(File &other) FMT_NOEXCEPT : fd_(other.fd_) { + other.fd_ = -1; + } + + // A "move assignment operator" for moving from a temporary. + File &operator=(Proxy p) { + close(); + fd_ = p.fd; + return *this; + } + + // A "move assignment operator" for moving from an lvalue. + File &operator=(File &other) { + close(); + fd_ = other.fd_; + other.fd_ = -1; + return *this; + } + + // Returns a proxy object for moving from a temporary: + // File file = File(...); + operator Proxy() FMT_NOEXCEPT { + Proxy p = {fd_}; + fd_ = -1; + return p; + } + +#else + private: + FMT_DISALLOW_COPY_AND_ASSIGN(File); + + public: + File(File &&other) FMT_NOEXCEPT : fd_(other.fd_) { + other.fd_ = -1; + } + + File& operator=(File &&other) { + close(); + fd_ = other.fd_; + other.fd_ = -1; + return *this; + } +#endif + + // Destroys the object closing the file it represents if any. + ~File() FMT_NOEXCEPT; + + // Returns the file descriptor. + int descriptor() const FMT_NOEXCEPT { return fd_; } + + // Closes the file. + void close(); + + // Returns the file size. + fmt::LongLong size() const; + + // Attempts to read count bytes from the file into the specified buffer. + std::size_t read(void *buffer, std::size_t count); + + // Attempts to write count bytes from the specified buffer to the file. + std::size_t write(const void *buffer, std::size_t count); + + // Duplicates a file descriptor with the dup function and returns + // the duplicate as a file object. + static File dup(int fd); + + // Makes fd be the copy of this file descriptor, closing fd first if + // necessary. + void dup2(int fd); + + // Makes fd be the copy of this file descriptor, closing fd first if + // necessary. + void dup2(int fd, ErrorCode &ec) FMT_NOEXCEPT; + + // Creates a pipe setting up read_end and write_end file objects for reading + // and writing respectively. + static void pipe(File &read_end, File &write_end); + + // Creates a BufferedFile object associated with this file and detaches + // this File object from the file. + BufferedFile fdopen(const char *mode); +}; + +// Returns the memory page size. +long getpagesize(); +} // namespace fmt + +#if !FMT_USE_RVALUE_REFERENCES +namespace std { +// For compatibility with C++98. +inline fmt::BufferedFile &move(fmt::BufferedFile &f) { return f; } +inline fmt::File &move(fmt::File &f) { return f; } +} +#endif + +#endif // FMT_POSIX_H_ diff --git a/src/callstack.cpp b/src/callstack.cpp index 8f31e3fb..2bf95d07 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -27,6 +27,7 @@ #include "utility.h" // Provides various utility functions. #include "vldheap.h" // Provides internal new and delete operators. #include "vldint.h" // Provides access to VLD internals. +#include "cppformat\format.h" // Imported global variables. extern HANDLE g_currentProcess; @@ -287,23 +288,33 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const Print(stack_line); isPrevFrameInternal = isFrameInternal; - int NumChars = -1; + fmt::WArrayWriter w(stack_line); // Display the current stack frame's information. - if (foundline) { + if (foundline) + { if (displacement == 0) - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); + { + w.write(L" {} ({}): {}!{}\n", + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); + } else - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); + { + w.write(L" {} ({}): {}!{} + 0x{:X} bytes\n", + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); + } } - else { + else + { if (displacement64 == 0) - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", - programCounter, moduleName, functionName); + { + w.write(L" " ADDRESSCPPFORMAT L" (File and line number not available): {}!{}\n", + programCounter, moduleName, functionName); + } else - NumChars = _snwprintf_s(stack_line, max_size, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", - programCounter, moduleName, functionName, (DWORD)displacement64); + { + w.write(L" " ADDRESSCPPFORMAT L" (File and line number not available): {}!{} + 0x{:X} bytes\n", + programCounter, moduleName, functionName, (DWORD)displacement64); + } } if (!isFrameInternal) @@ -419,28 +430,39 @@ int CallStack::resolve(BOOL showInternalFrames) moduleName = callingModuleName; } - // Use static here to increase performance, and avoid heap allocs. Hopefully this won't - // prove to be an issue in thread safety. If it does, it will have to be simply non-static. + // Use static here to increase performance, and avoid heap allocs. + // It's thread safe because of g_heapMapLock lock. static WCHAR stack_line[max_line_length] = L""; - int NumChars = -1; + fmt::WArrayWriter w(stack_line); // Display the current stack frame's information. - if (foundline) { + if (foundline) + { // Just truncate anything that is too long. if (displacement == 0) - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); + { + w.write(L" {} ({}): {}!{}\n", + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); + } else - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" %s (%d): %s!%s + 0x%X bytes\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); + { + w.write(L" {} ({}): {}!{} + 0x{:X} bytes\n", + sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); + } } - else { + else + { if (displacement64 == 0) - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s\n", - programCounter, moduleName, functionName); + { + w.write(L" " ADDRESSCPPFORMAT L" (File and line number not available): {}!{}\n", + programCounter, moduleName, functionName); + } else - NumChars = _snwprintf_s(stack_line, max_line_length, _TRUNCATE, L" " ADDRESSFORMAT L" (File and line number not available): %s!%s + 0x%X bytes\n", - programCounter, moduleName, functionName, (DWORD)displacement64); + { + w.write(L" " ADDRESSCPPFORMAT L" (File and line number not available): {}!{} + 0x{:X} bytes\n", + programCounter, moduleName, functionName, (DWORD)displacement64); + } } + int NumChars = w.size(); if (NumChars >= 0) { assert(m_resolved != NULL); diff --git a/src/tests/suite/testsuite.cpp b/src/tests/suite/testsuite.cpp index c7357ba0..d1f325a3 100644 --- a/src/tests/suite/testsuite.cpp +++ b/src/tests/suite/testsuite.cpp @@ -84,22 +84,18 @@ enum action_e { #endif #endif -#define FASTSTACKWALK +//#define FASTSTACKWALK -#ifdef FASTSTACKWALK -#define MAXALLOC 1000 // Maximum number of allocations of each type to perform, per thread -static const int NUMTHREADS = 63; // Number of threads to run simultaneously -#else -#define MAXALLOC 10 // Maximum number of allocations of each type to perform, per thread -static const int NUMTHREADS = 15; // Number of threads to run simultaneously -#endif -#define MAXBLOCKS (MAXALLOC * numactions) // Total maximum number of allocations, per thread -#define MAXDEPTH 32 // Maximum depth of the allocation call stack -#define MAXSIZE 64 // Maximum block size to allocate -#define MINDEPTH 0 // Minimum depth of the allocation call stack -#define MINSIZE 16 // Minimum block size to allocate +static int MAXALLOC = 0; // Maximum number of allocations of each type to perform, per thread +static int NUMTHREADS = 0; // Number of threads to run simultaneously +static int MAXBLOCKS = 0; // Total maximum number of allocations, per thread + +static const int MAXDEPTH = 32; // Maximum depth of the allocation call stack +static const int MAXSIZE = 64; // Maximum block size to allocate +static const int MINDEPTH = 0; // Minimum depth of the allocation call stack +static const int MINSIZE = 16; // Minimum block size to allocate static const int NUMDUPLEAKS = 3; // Number of times to duplicate each leak -#define ONCEINAWHILE 10 // Free a random block approx. once every... +static const int ONCEINAWHILE = 10; // Free a random block approx. once every... struct blockholder_t { PVOID block; @@ -117,7 +113,7 @@ struct threadcontext_t { unsigned threadid; }; -__declspec(thread) blockholder_t blocks [MAXBLOCKS]; +__declspec(thread) blockholder_t *blocks = NULL; __declspec(thread) ULONG freeBlock = (ULONG)0; __declspec(thread) ULONG counts [numactions] = { 0 }; __declspec(thread) IMalloc *imalloc = NULL; @@ -303,13 +299,14 @@ unsigned __stdcall threadproc_test (LPVOID param) threadcontext_t* context = (threadcontext_t*)param; assert(context); - srand(context->seed); - + blocks = new blockholder_t[MAXBLOCKS]; for (ULONG index = 0; index < MAXBLOCKS; index++) { blocks[index].block = NULL; blocks[index].leak = FALSE; } + srand(context->seed); + BOOL allocate_more = TRUE; while (allocate_more == TRUE) { // Select a random allocation action and a random size. @@ -381,16 +378,29 @@ unsigned __stdcall threadproc_test (LPVOID param) assert(total_allocs == 0); } + delete[] blocks; return 0; } void RunTestSuite() { - threadcontext_t contexts [NUMTHREADS]; + if (!(VLDGetOptions() & VLD_OPT_SAFE_STACK_WALK)) + { + MAXALLOC = 1000; + NUMTHREADS = 63; + } + else + { + MAXALLOC = 10; + NUMTHREADS = 15; + } + MAXBLOCKS = (MAXALLOC * numactions); + + threadcontext_t* contexts = new threadcontext_t[NUMTHREADS]; // Select a random thread to be the leaker. UINT leakythread = random(NUMTHREADS - 1); - HANDLE threads[NUMTHREADS] = {0}; + HANDLE* threads = new HANDLE[NUMTHREADS]; for (UINT index = 0; index < NUMTHREADS; ++index) { contexts[index].index = index; @@ -439,6 +449,8 @@ void RunTestSuite() _tprintf(_T("Some other return value\n")); break; } + delete[] contexts; + delete[] threads; } TEST(TestSuit, MultiThread) diff --git a/src/utility.h b/src/utility.h index a613cb42..92718f9c 100644 --- a/src/utility.h +++ b/src/utility.h @@ -34,9 +34,11 @@ Applications should never include this header." #include #ifdef _WIN64 -#define ADDRESSFORMAT L"0x%.16X" // Format string for 64-bit addresses +#define ADDRESSFORMAT L"0x%.16X" // Format string for 64-bit addresses +#define ADDRESSCPPFORMAT L"0x{:016X}" // Format string for 64-bit addresses #else -#define ADDRESSFORMAT L"0x%.8X" // Format string for 32-bit addresses +#define ADDRESSFORMAT L"0x%.8X" // Format string for 32-bit addresses +#define ADDRESSCPPFORMAT L"0x{:08X}" // Format string for 32-bit addresses #endif // _WIN64 #define BOM 0xFEFF // Unicode byte-order mark. #define MAXREPORTLENGTH 511 // Maximum length, in characters, of "report" messages. diff --git a/src/vld.vcxproj b/src/vld.vcxproj index 4e7d194d..7c4cc588 100644 --- a/src/vld.vcxproj +++ b/src/vld.vcxproj @@ -76,7 +76,7 @@ - $(SolutionDir)\lib\dbghelp\include;$(SolutionDir)\setup;%(AdditionalIncludeDirectories) + $(SolutionDir)\lib\;$(SolutionDir)\lib\dbghelp\include;$(SolutionDir)\setup;%(AdditionalIncludeDirectories) Use @@ -233,6 +233,11 @@ + + + {4adfd279-56c6-4b1d-ba9e-b815e81c1b17} + + diff --git a/vld_vs12.sln b/vld_vs12.sln index 5f170c32..3b110fd9 100644 --- a/vld_vs12.sln +++ b/vld_vs12.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 +# Visual Studio 2013 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld_vs12.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" diff --git a/vld_vs14.sln b/vld_vs14.sln index a553371f..723006de 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -44,6 +44,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 @@ -276,6 +278,30 @@ Global {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -291,5 +317,6 @@ Global {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} EndGlobalSection EndGlobal From b9a53cd07818539045248e812dbdc52211f38ce0 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 20 Aug 2015 02:58:04 +0300 Subject: [PATCH 215/321] mapblock() moved to firstAllocCall() CS g_stackWalkLock merged with g_heapMapLock --- src/callstack.cpp | 4 +-- src/vld.cpp | 38 +++++++++++++------------- src/vld_hooks.cpp | 69 +++++++++++++++++++++++++++++++---------------- src/vldint.h | 18 +++++++------ 4 files changed, 76 insertions(+), 53 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index 2bf95d07..a8a21769 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -32,7 +32,7 @@ // Imported global variables. extern HANDLE g_currentProcess; extern HANDLE g_currentThread; -extern CriticalSection g_stackWalkLock; +extern CriticalSection g_heapMapLock; extern CriticalSection g_symbolLock; extern VisualLeakDetector g_vld; @@ -710,7 +710,7 @@ VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) frame.Virtual = TRUE; // Walk the stack. - CriticalSectionLocker cs(g_stackWalkLock); + CriticalSectionLocker cs(g_heapMapLock); while (count < maxdepth) { count++; DbgTrace(L"dbghelp32.dll %i: StackWalk64\n", GetCurrentThreadId()); diff --git a/src/vld.cpp b/src/vld.cpp index f2b49ee2..dc51b4d8 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -50,7 +50,7 @@ HANDLE g_currentProcess; // Pseudo-handle for the current process. HANDLE g_currentThread; // Pseudo-handle for the current thread. CriticalSection g_imageLock; // Serializes calls to the Debug Help Library PE image access APIs. HANDLE g_processHeap; // Handle to the process's heap (COM allocations come from here). -CriticalSection g_stackWalkLock; // Serializes calls to StackWalk64 from the Debug Help Library. +CriticalSection g_heapMapLock; // Serializes access to the heap and block maps. CriticalSection g_symbolLock; // Serializes calls to the Debug Help Library symbols handling APIs. CriticalSection g_loaderLock; // Serializes calls to LdrLoadDll, GetProcAddress and EnumerateLoadedModulesW64(). ReportHookSet* g_pReportHooks; @@ -159,7 +159,7 @@ VisualLeakDetector::VisualLeakDetector () RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); } - g_stackWalkLock.Initialize(); + g_heapMapLock.Initialize(); g_symbolLock.Initialize(); g_vldHeap = HeapCreate(0x0, 0, 0); g_vldHeapLock.Initialize(); @@ -176,7 +176,6 @@ VisualLeakDetector::VisualLeakDetector () m_maxAlloc = 0; m_loadedModules = new ModuleSet(); m_optionsLock.Initialize(); - m_heapMapLock.Initialize(); m_modulesLock.Initialize(); m_selfTestFile = __FILE__; m_selfTestLine = 0; @@ -454,12 +453,11 @@ VisualLeakDetector::~VisualLeakDetector () HeapDestroy(g_vldHeap); m_optionsLock.Delete(); - m_heapMapLock.Delete(); m_modulesLock.Delete(); m_tlsLock.Delete(); g_loaderLock.Delete(); g_imageLock.Delete(); - g_stackWalkLock.Delete(); + g_heapMapLock.Delete(); g_symbolLock.Delete(); g_vldHeapLock.Delete(); @@ -574,7 +572,7 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) if (!SymbolsLoaded) { - CriticalSectionLocker cs(g_vld.m_heapMapLock); // fix GetModuleFileName thread lock + CriticalSectionLocker cs(g_heapMapLock); // fix GetModuleFileName thread lock CriticalSectionLocker csSL(g_symbolLock); DbgTrace(L"dbghelp32.dll %i: SymLoadModuleEx\n", GetCurrentThreadId()); DWORD64 module = SymLoadModuleEx(g_currentProcess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0); @@ -1041,7 +1039,7 @@ tls_t* VisualLeakDetector::getTls () tls->flags = 0x0; tls->oldFlags = 0x0; tls->threadId = threadId; - tls->pblockInfo = NULL; + tls->blockWithoutGuard = NULL; } return tls; @@ -1089,7 +1087,7 @@ VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool d m_maxAlloc = m_curAlloc; // Insert the block's information into the block map. - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); HeapMap::Iterator heapit = m_heapMap->find(heap); if (heapit == m_heapMap->end()) { // We haven't mapped this heap to a block map yet. Do it now. @@ -1129,7 +1127,7 @@ VOID VisualLeakDetector::mapHeap (HANDLE heap) heapinfo_t* heapinfo = new heapinfo_t; heapinfo->blockMap.reserve(BLOCK_MAP_RESERVE); heapinfo->flags = 0x0; - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); HeapMap::Iterator heapit = m_heapMap->insert(heap, heapinfo); if (heapit == m_heapMap->end()) { // Somehow this heap has been created twice without being destroyed, @@ -1159,7 +1157,7 @@ VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t & return; // Find this heap's block map. - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); HeapMap::Iterator heapit = m_heapMap->find(heap); if (heapit == m_heapMap->end()) { // We don't have a block map for this heap. We must not have monitored @@ -1229,7 +1227,7 @@ VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t & VOID VisualLeakDetector::unmapHeap (HANDLE heap) { // Find this heap's block map. - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); HeapMap::Iterator heapit = m_heapMap->find(heap); if (heapit == m_heapMap->end()) { // This heap hasn't been mapped. We must not have monitored this heap's @@ -1290,7 +1288,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was reallocated in-place. Find the existing blockinfo_t // entry in the block map and update it with the new callstack and size. - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); HeapMap::Iterator heapit = m_heapMap->find(heap); if (heapit == m_heapMap->end()) { // We haven't mapped this heap to a block map yet. Obviously the @@ -1454,7 +1452,7 @@ SIZE_T VisualLeakDetector::reportHeapLeaks (HANDLE heap) assert(heap != NULL); // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); HeapMap::Iterator heapit = m_heapMap->find(heap); if (heapit == m_heapMap->end()) { // Nothing is allocated from this heap. No leaks. @@ -2015,7 +2013,7 @@ SIZE_T VisualLeakDetector::GetLeaksCount() SIZE_T leaksCount = 0; // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); @@ -2034,7 +2032,7 @@ SIZE_T VisualLeakDetector::GetThreadLeaksCount(DWORD threadId) SIZE_T leaksCount = 0; // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); @@ -2053,7 +2051,7 @@ SIZE_T VisualLeakDetector::ReportLeaks( ) // Generate a memory leak report for each heap in the process. SIZE_T leaksCount = 0; - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); bool firstLeak = true; Set aggregatedLeaks; for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { @@ -2074,7 +2072,7 @@ SIZE_T VisualLeakDetector::ReportThreadLeaks( DWORD threadId ) // Generate a memory leak report for each heap in the process. SIZE_T leaksCount = 0; - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); bool firstLeak = true; Set aggregatedLeaks; for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { @@ -2094,7 +2092,7 @@ VOID VisualLeakDetector::MarkAllLeaksAsReported( ) } // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); @@ -2111,7 +2109,7 @@ VOID VisualLeakDetector::MarkThreadLeaksAsReported( DWORD threadId ) } // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); @@ -2480,7 +2478,7 @@ int VisualLeakDetector::ResolveCallstacks() int unresolvedFunctionsCount = 0; // Generate the Callstacks early - CriticalSectionLocker cs(m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); for (HeapMap::Iterator heapiter = m_heapMap->begin(); heapiter != m_heapMap->end(); ++heapiter) { HANDLE heap = (*heapiter).first; diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 41430dc4..d08019e6 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -42,20 +42,25 @@ #include extern HANDLE g_currentProcess; +extern CriticalSection g_heapMapLock; extern CriticalSection g_symbolLock; void VisualLeakDetector::firstAllocCall(tls_t * tls) { - if (tls->pblockInfo) + if (tls->blockWithoutGuard) { context_t context = tls->context; - blockinfo_t* pblockInfo = tls->pblockInfo; + blockinfo_t* pblockInfo = NULL; + if (tls->newBlockWithoutGuard == NULL) + AllocateHeap(tls, pblockInfo); + else + ReAllocateHeap(tls, pblockInfo); // Reset thread local flags and variables in case dbghelp.dll try allocate some data. tls->context.fp = NULL; tls->context.func = 0x0; + tls->blockWithoutGuard = NULL; tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; - tls->pblockInfo = NULL; CallStack* callstack; getCallStack(callstack, context); @@ -66,8 +71,8 @@ void VisualLeakDetector::firstAllocCall(tls_t * tls) // Reset thread local flags and variables for the next allocation. tls->context.fp = NULL; tls->context.func = 0x0; + tls->blockWithoutGuard = NULL; tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; - tls->pblockInfo = NULL; } //////////////////////////////////////////////////////////////////////////////// @@ -1470,7 +1475,7 @@ HANDLE VisualLeakDetector::_GetProcessHeap() // Get the process heap. HANDLE heap = m_GetProcessHeap(); - CriticalSectionLocker cs(g_vld.m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); if (heapit == g_vld.m_heapMap->end()) { @@ -1506,7 +1511,7 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m // Map the created heap handle to a new block map. g_vld.mapHeap(heap); - CriticalSectionLocker cs(g_vld.m_heapMapLock); + CriticalSectionLocker cs(g_heapMapLock); HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); assert(heapit != g_vld.m_heapMap->end()); @@ -1580,7 +1585,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si if (isModuleExcluded(GET_RETURN_ADDRESS(context))) { - assert(tls->pblockInfo == NULL); + assert(tls->blockWithoutGuard == NULL); return block; } @@ -1592,8 +1597,10 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si } tls->context = context; - - AllocateHeap(tls, heap, block, size); + tls->heap = heap; + tls->blockWithoutGuard = block; + tls->newBlockWithoutGuard = NULL; + tls->size = size; if (firstcall) firstAllocCall(tls); @@ -1626,7 +1633,7 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) if (isModuleExcluded(GET_RETURN_ADDRESS(context))) { - assert(tls->pblockInfo == NULL); + assert(tls->blockWithoutGuard == NULL); return block; } @@ -1638,8 +1645,10 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) } tls->context = context; - - AllocateHeap(tls, heap, block, size); + tls->heap = heap; + tls->blockWithoutGuard = block; + tls->newBlockWithoutGuard = NULL; + tls->size = size; if (firstcall) firstAllocCall(tls); @@ -1647,13 +1656,13 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) return block; } -void VisualLeakDetector::AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size) +void VisualLeakDetector::AllocateHeap (tls_t* tls, blockinfo_t* &pblockInfo) { bool debugcrtalloc = (tls->flags & VLD_TLS_DEBUGCRTALLOC) ? true : false; // The module that initiated this allocation is included in leak // detection. Map this block to the specified heap. - g_vld.mapBlock(heap, block, size, debugcrtalloc, tls->threadId, tls->pblockInfo); + g_vld.mapBlock(tls->heap, tls->blockWithoutGuard, tls->size, debugcrtalloc, tls->threadId, pblockInfo); } // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. @@ -1761,7 +1770,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID if (isModuleExcluded(GET_RETURN_ADDRESS(context))) { - assert(tls->pblockInfo == NULL); + assert(tls->blockWithoutGuard == NULL); return newmem; } @@ -1772,12 +1781,16 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID CAPTURE_CONTEXT(context, RtlReAllocateHeap); } - ReAllocateHeap(tls, heap, mem, newmem, size, context); + tls->context = context; + tls->heap = heap; + tls->blockWithoutGuard = mem; + tls->newBlockWithoutGuard = newmem; + tls->size = size; if (firstcall) { firstAllocCall(tls); - tls->pblockInfo = NULL; + tls->blockWithoutGuard = NULL; } return newmem; @@ -1809,7 +1822,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S if (isModuleExcluded(GET_RETURN_ADDRESS(context))) { - assert(tls->pblockInfo == NULL); + assert(tls->blockWithoutGuard == NULL); return newmem; } @@ -1820,33 +1833,43 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S CAPTURE_CONTEXT(context, HeapReAlloc); } - ReAllocateHeap(tls, heap, mem, newmem, size, context); + tls->context = context; + tls->heap = heap; + tls->blockWithoutGuard = mem; + tls->newBlockWithoutGuard = newmem; + tls->size = size; if (firstcall) { firstAllocCall(tls); - tls->pblockInfo = NULL; + tls->blockWithoutGuard = NULL; } return newmem; } -void VisualLeakDetector::ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context) +void VisualLeakDetector::ReAllocateHeap (tls_t *tls, blockinfo_t* &pblockInfo) { #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); #endif bool crtalloc = (tls->flags & VLD_TLS_DEBUGCRTALLOC) ? true : false; + context_t context = tls->context; + HANDLE heap = tls->heap; + LPVOID mem = tls->blockWithoutGuard; + LPVOID newmem = tls->newBlockWithoutGuard; + SIZE_T size = tls->size; + // Reset thread local flags and variables, in case any libraries called // into while remapping the block allocate some memory. - tls->context.fp = 0x0; + tls->context.fp = NULL; tls->context.func = 0x0; tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; // The module that initiated this allocation is included in leak // detection. Remap the block. - g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->threadId, tls->pblockInfo, context); + g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->threadId, pblockInfo, context); #ifdef _DEBUG if(tls->context.fp != 0) diff --git a/src/vldint.h b/src/vldint.h index 4f65b273..43836d8f 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -167,13 +167,16 @@ struct tls_t { #define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. UINT32 oldFlags; // Thread-local status old flags DWORD threadId; // Thread ID of the thread that owns this TLS structure. - blockinfo_t* pblockInfo; // Store pointer to callstack. + HANDLE heap; + LPVOID blockWithoutGuard; // Store pointer to block. + LPVOID newBlockWithoutGuard; + SIZE_T size; }; // Allocation state: -// 1. Allocation function set tls->context and tls->pblockInfo = NULL -// 2. HeapAlloc set tls->pblockInfo and map block -// 3. Allocation function reset tls data and capture callstack to tls->pblockInfo +// 1. Allocation function set tls->context and tls->blockWithoutGuard = NULL +// 2. HeapAlloc set tls->heap, tls->blockWithoutGuard, tls->newBlockWithoutGuard and tls->size +// 3. Allocation function reset tls data, map block and capture callstack to tls->blockWithoutGuard // The TlsSet allows VLD to keep track of all thread local storage structures // allocated in the process. @@ -330,7 +333,7 @@ class VisualLeakDetector : public IMalloc static bool isModuleExcluded (UINT_PTR returnaddress); blockinfo_t* findAllocedBlock(LPCVOID, __out HANDLE& heap); static void getCallStack( CallStack *&pcallstack, context_t &context ); - static inline void firstAllocCall(tls_t * tls); + static void firstAllocCall(tls_t * tls); void setupReporting(); void checkInternalMemoryLeaks(); bool waitForAllVLDThreads(); @@ -363,8 +366,8 @@ class VisualLeakDetector : public IMalloc static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); - static void AllocateHeap (tls_t* tls, HANDLE heap, LPVOID block, SIZE_T size); - static void ReAllocateHeap (tls_t *tls, HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size, const context_t &context); + static void AllocateHeap (tls_t* tls, blockinfo_t* &pblockInfo); + static void ReAllocateHeap (tls_t *tls, blockinfo_t* &pblockInfo); //////////////////////////////////////////////////////////////////////////////// // Private data @@ -378,7 +381,6 @@ class VisualLeakDetector : public IMalloc SIZE_T m_curAlloc; // Total amount currently allocated. SIZE_T m_maxAlloc; // Largest ever allocated at once. ModuleSet *m_loadedModules; // Contains information about all modules loaded in the process. - CriticalSection m_heapMapLock; // Serializes access to the heap and block maps. SIZE_T m_maxDataDump; // Maximum number of user-data bytes to dump for each leaked block. UINT32 m_maxTraceFrames; // Maximum number of frames per stack trace for each leaked block. CriticalSection m_modulesLock; // Protects accesses to the "loaded modules" ModuleSet. From 3fcb0e4d178df6e52459c6bd118a2b309fa0a6b6 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 21 Aug 2015 02:07:06 +0300 Subject: [PATCH 216/321] Fast callstack capturing improved --- src/callstack.cpp | 42 +++++++++++++++++++++--------------------- src/callstack.h | 30 +++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index a8a21769..cbebcb8d 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -480,26 +480,6 @@ void CallStack::dumpResolved() const Print(m_resolved); } - - -// getHashValue - Generate callstack hash value. -// -// Return Value: -// -// None. -// -DWORD CallStack::getHashValue () const -{ - DWORD hashcode = 0xD202EF8D; - - // Iterate through each frame in the call stack. - for (UINT32 frame = 0; frame < m_size; frame++) { - UINT_PTR programcounter = (*this)[frame]; - hashcode = CalculateCRC32(programcounter, hashcode); - } - return hashcode; -} - // push_back - Pushes a frame's program counter onto the CallStack. Pushes are // always appended to the back of the chunk list (aka the "top" chunk). // @@ -622,7 +602,9 @@ VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) UINT32 maxframes = min(62, maxdepth + 10); UINT_PTR* myFrames = new UINT_PTR[maxframes]; ZeroMemory(myFrames, sizeof(UINT_PTR) * maxframes); - RtlCaptureStackBackTrace(0, maxframes, reinterpret_cast(myFrames), NULL); + ULONG BackTraceHash; + maxframes = RtlCaptureStackBackTrace(0, maxframes, reinterpret_cast(myFrames), &BackTraceHash); + m_hashValue = BackTraceHash; UINT32 startIndex = 0; while (count < maxframes) { if (myFrames[count] == 0) @@ -728,3 +710,21 @@ VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) push_back((UINT_PTR)frame.AddrPC.Offset); } } + +// getHashValue - Generate callstack hash value. +// +// Return Value: +// +// None. +// +DWORD SafeCallStack::getHashValue() const +{ + DWORD hashcode = 0xD202EF8D; + + // Iterate through each frame in the call stack. + for (UINT32 frame = 0; frame < m_size; frame++) { + UINT_PTR programcounter = (*this)[frame]; + hashcode = CalculateCRC32(programcounter, hashcode); + } + return hashcode; +} diff --git a/src/callstack.h b/src/callstack.h index 54656524..acfbb131 100644 --- a/src/callstack.h +++ b/src/callstack.h @@ -88,7 +88,7 @@ class CallStack VOID dump (BOOL showinternalframes, UINT start_frame = 0) const; // Formats the stack frame into a human readable format, and saves it for later retrieval. int resolve(BOOL showinternalframes); - DWORD getHashValue () const; + virtual DWORD getHashValue() const = 0; virtual VOID getStackTrace (UINT32 maxdepth, const context_t& context) = 0; BOOL operator == (const CallStack &other) const; @@ -100,12 +100,6 @@ class CallStack UINT32 m_status; // Status flags: #define CALLSTACK_STATUS_INCOMPLETE 0x1 // If set, the stack trace stored in this CallStack appears to be incomplete. -private: - // Don't allow this!! - CallStack (const CallStack &other); - // Don't allow this!! - CallStack& operator = (const CallStack &other); - // The chunk list is made of a linked list of Chunks. struct chunk_t { chunk_t* next; // Pointer to the next chunk in the chunk list. @@ -128,6 +122,12 @@ class CallStack // human readable form. Currently this is only called by the dump method. void dumpResolved() const; bool isInternalModule( const PWSTR filename ) const; + +private: + // Don't allow this!! + CallStack(const CallStack &other); + // Don't allow this!! + CallStack& operator = (const CallStack &other); }; @@ -141,7 +141,18 @@ class CallStack class FastCallStack : public CallStack { public: - VOID getStackTrace (UINT32 maxdepth, const context_t& context); + FastCallStack() + : m_hashValue(0) + { + } + virtual VOID getStackTrace (UINT32 maxdepth, const context_t& context); + virtual DWORD getHashValue() const + { + return m_hashValue; + } + +private: + UINT32 m_hashValue; }; //////////////////////////////////////////////////////////////////////////////// @@ -154,5 +165,6 @@ class FastCallStack : public CallStack class SafeCallStack : public CallStack { public: - VOID getStackTrace (UINT32 maxdepth, const context_t& context); + virtual VOID getStackTrace (UINT32 maxdepth, const context_t& context); + virtual DWORD getHashValue() const; }; From 68a5cfe7eab4c6054690c10775802d3531d5a885 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 22 Aug 2015 01:53:38 +0300 Subject: [PATCH 217/321] Callstack formating slightly changed --- src/callstack.cpp | 250 +++++++++++++++++++--------------------------- src/callstack.h | 6 +- 2 files changed, 109 insertions(+), 147 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index cbebcb8d..1633cac3 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -181,6 +181,84 @@ VOID CallStack::clear () m_resolvedLength = 0; } +LPCWSTR CallStack::getFunctionName(SIZE_T programCounter, DWORD64& displacement64, + SYMBOL_INFO* functionInfo) const +{ + // Initialize structures passed to the symbol handler. + functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); + functionInfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; + + // Try to get the name of the function containing this program + // counter address. + displacement64 = 0; + LPCWSTR functionName; + DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); + if (SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { + functionName = functionInfo->Name; + } + else { + // GetFormattedMessage( GetLastError() ); + fmt::WArrayWriter wf(functionInfo->Name, MAX_SYMBOL_NAME_LENGTH); + wf.write(L"" ADDRESSCPPFORMAT, programCounter); + functionName = wf.c_str(); + displacement64 = 0; + } + return functionName; +} + +DWORD CallStack::resolveFunction(SIZE_T programCounter, IMAGEHLP_LINEW64* sourceInfo, DWORD displacement, + LPCWSTR functionName, LPWSTR stack_line, DWORD stackLineSize) const +{ + WCHAR callingModuleName[260]; + HMODULE hCallingModule = GetCallingModule(programCounter); + LPWSTR moduleName = L"(Module name unavailable)"; + if (hCallingModule && + GetModuleFileName(hCallingModule, callingModuleName, _countof(callingModuleName)) > 0) + { + moduleName = wcsrchr(callingModuleName, L'\\'); + if (moduleName == NULL) + moduleName = wcsrchr(callingModuleName, L'/'); + if (moduleName != NULL) + moduleName++; + else + moduleName = callingModuleName; + } + + fmt::WArrayWriter w(stack_line, stackLineSize); + // Display the current stack frame's information. + if (sourceInfo) + { + if (displacement == 0) + { + w.write(L" {} ({}): {}!{}()\n", + sourceInfo->FileName, sourceInfo->LineNumber, moduleName, + functionName); + } + else + { + w.write(L" {} ({}): {}!{}() + 0x{:X} bytes\n", + sourceInfo->FileName, sourceInfo->LineNumber, moduleName, + functionName, displacement); + } + } + else + { + if (displacement == 0) + { + w.write(L" {}!{}()\n", + moduleName, functionName); + } + else + { + w.write(L" {}!{}() + 0x{:X} bytes\n", + moduleName, functionName, displacement); + } + } + DWORD NumChars = w.size(); + stack_line[NumChars] = '\0'; + return NumChars; +} + // dump - Dumps a nicely formatted rendition of the CallStack, including // symbolic information (function names and line numbers) if available. @@ -215,17 +293,11 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const IMAGEHLP_LINE64 sourceInfo = { 0 }; sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; - WCHAR lowerCaseName [MAX_PATH]; - WCHAR callingModuleName [MAX_PATH]; - - const size_t max_size = MAXREPORTLENGTH + 1; - // Use static here to increase performance, and avoid heap allocs. Hopefully this won't - // prove to be an issue in thread safety. If it does, it will have to be simply non-static. + // Use static here to increase performance, and avoid heap allocs. + // It's thread safe because of g_heapMapLock lock. static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; - bool isPrevFrameInternal = false; // Iterate through each frame in the call stack. for (UINT32 frame = start_frame; frame < m_size; frame++) @@ -238,87 +310,29 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const DWORD displacement = 0; DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); - bool isFrameInternal = false; - if (foundline && !showInternalFrames) { + if (foundline) { wcscpy_s(lowerCaseName, sourceInfo.FileName); _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); if (isInternalModule(lowerCaseName)) { - isFrameInternal = true; // Don't show frames in files internal to the heap. g_symbolLock.Leave(); + continue; } } - // Initialize structures passed to the symbol handler. - SYMBOL_INFO* functionInfo = (SYMBOL_INFO*)&symbolBuffer; - functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functionInfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; - - // Try to get the name of the function containing this program - // counter address. - DWORD64 displacement64 = 0; - LPWSTR functionName; - DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); - if (SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { - functionName = functionInfo->Name; - } - else { - // GetFormattedMessage( GetLastError() ); - functionName = L"(Function name unavailable)"; - displacement64 = 0; - } - g_symbolLock.Leave(); - - HMODULE hCallingModule = GetCallingModule(programCounter); - LPWSTR moduleName = L"(Module name unavailable)"; - if (hCallingModule && - GetModuleFileName(hCallingModule, callingModuleName, _countof(callingModuleName)) > 0) - { - moduleName = wcsrchr(callingModuleName, L'\\'); - if (moduleName == NULL) - moduleName = wcsrchr(callingModuleName, L'/'); - if (moduleName != NULL) - moduleName++; - else - moduleName = callingModuleName; - } + DWORD64 displacement64; + BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; + LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); - if (!isFrameInternal && isPrevFrameInternal) - Print(stack_line); - isPrevFrameInternal = isFrameInternal; + g_symbolLock.Leave(); - fmt::WArrayWriter w(stack_line); - // Display the current stack frame's information. - if (foundline) - { - if (displacement == 0) - { - w.write(L" {} ({}): {}!{}\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); - } - else - { - w.write(L" {} ({}): {}!{} + 0x{:X} bytes\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); - } - } - else - { - if (displacement64 == 0) - { - w.write(L" " ADDRESSCPPFORMAT L" (File and line number not available): {}!{}\n", - programCounter, moduleName, functionName); - } - else - { - w.write(L" " ADDRESSCPPFORMAT L" (File and line number not available): {}!{} + 0x{:X} bytes\n", - programCounter, moduleName, functionName, (DWORD)displacement64); - } - } + if (!foundline) + displacement = (DWORD)displacement64; + DWORD NumChars = resolveFunction(programCounter, foundline ? &sourceInfo : NULL, + displacement, functionName, stack_line, _countof(stack_line)); - if (!isFrameInternal) - Print(stack_line); + Print(stack_line); } } @@ -359,7 +373,10 @@ int CallStack::resolve(BOOL showInternalFrames) BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; - WCHAR callingModuleName [MAX_PATH] = L""; + // Use static here to increase performance, and avoid heap allocs. + // It's thread safe because of g_heapMapLock lock. + static WCHAR function_generated_name[MAX_PATH] = L""; + static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; WCHAR lowerCaseName [MAX_PATH]; const size_t max_line_length = MAXREPORTLENGTH + 1; @@ -375,14 +392,13 @@ int CallStack::resolve(BOOL showInternalFrames) // this program counter address. SIZE_T programCounter = (*this)[frame]; g_symbolLock.Enter(); - BOOL foundline = FALSE; DWORD displacement = 0; // It turns out that calls to SymGetLineFromAddrW64 may free the very memory we are scrutinizing here // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. // When that happens there is nothing we can do except crash. DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); - foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + BOOL foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); assert(m_resolved != NULL); if (foundline && !showInternalFrames) { @@ -395,74 +411,16 @@ int CallStack::resolve(BOOL showInternalFrames) } } - // Initialize structures passed to the symbol handler. - SYMBOL_INFO* functionInfo = (SYMBOL_INFO*)&symbolBuffer; - functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); - functionInfo->MaxNameLen = MAX_SYMBOL_NAME_LENGTH; - - // Try to get the name of the function containing this program - // counter address. - DWORD64 displacement64 = 0; - LPWSTR functionName; - DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); - if (SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { - functionName = functionInfo->Name; - } - else { - unresolvedFunctionsCount++; - // GetFormattedMessage( GetLastError() ); - functionName = L"(Function name unavailable)"; - displacement64 = 0; - } - g_symbolLock.Leave(); + DWORD64 displacement64; + BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; + LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); - HMODULE hCallingModule = GetCallingModule(programCounter); - LPWSTR moduleName = L"(Module name unavailable)"; - if (hCallingModule && - GetModuleFileName(hCallingModule, callingModuleName, _countof(callingModuleName)) > 0) - { - moduleName = wcsrchr(callingModuleName, L'\\'); - if (moduleName == NULL) - moduleName = wcsrchr(callingModuleName, L'/'); - if (moduleName != NULL) - moduleName++; - else - moduleName = callingModuleName; - } + g_symbolLock.Leave(); - // Use static here to increase performance, and avoid heap allocs. - // It's thread safe because of g_heapMapLock lock. - static WCHAR stack_line[max_line_length] = L""; - fmt::WArrayWriter w(stack_line); - // Display the current stack frame's information. - if (foundline) - { - // Just truncate anything that is too long. - if (displacement == 0) - { - w.write(L" {} ({}): {}!{}\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName); - } - else - { - w.write(L" {} ({}): {}!{} + 0x{:X} bytes\n", - sourceInfo.FileName, sourceInfo.LineNumber, moduleName, functionName, displacement); - } - } - else - { - if (displacement64 == 0) - { - w.write(L" " ADDRESSCPPFORMAT L" (File and line number not available): {}!{}\n", - programCounter, moduleName, functionName); - } - else - { - w.write(L" " ADDRESSCPPFORMAT L" (File and line number not available): {}!{} + 0x{:X} bytes\n", - programCounter, moduleName, functionName, (DWORD)displacement64); - } - } - int NumChars = w.size(); + if (!foundline) + displacement = (DWORD)displacement64; + DWORD NumChars = resolveFunction( programCounter, foundline ? &sourceInfo : NULL, + displacement, functionName, stack_line, _countof( stack_line )); if (NumChars >= 0) { assert(m_resolved != NULL); diff --git a/src/callstack.h b/src/callstack.h index acfbb131..0a9d593d 100644 --- a/src/callstack.h +++ b/src/callstack.h @@ -86,7 +86,7 @@ class CallStack // Prints the call stack to one of either / or the debug output window and or // a log file. VOID dump (BOOL showinternalframes, UINT start_frame = 0) const; - // Formats the stack frame into a human readable format, and saves it for later retrieval. + // Formats the stack frame into a human readable format, and saves it for later retrieval. int resolve(BOOL showinternalframes); virtual DWORD getHashValue() const = 0; virtual VOID getStackTrace (UINT32 maxdepth, const context_t& context) = 0; @@ -122,6 +122,10 @@ class CallStack // human readable form. Currently this is only called by the dump method. void dumpResolved() const; bool isInternalModule( const PWSTR filename ) const; + LPCWSTR getFunctionName(SIZE_T programCounter, DWORD64& displacement64, + SYMBOL_INFO* functionInfo) const; + DWORD resolveFunction(SIZE_T programCounter, IMAGEHLP_LINEW64* sourceInfo, DWORD displacement, + LPCWSTR functionName, LPWSTR stack_line, DWORD stackLineSize) const; private: // Don't allow this!! From 98ad597689596d6941e70a86a1a41a3184cd9785 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 29 Aug 2015 23:34:16 +0300 Subject: [PATCH 218/321] Improved callstack capturing for x64 apps --- .gitignore | 1 + src/callstack.cpp | 31 +++++++------------------------ src/tests/copydlls.bat | 9 +++++---- src/utility.h | 26 ++++++++++---------------- 4 files changed, 23 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 438b1e0d..d0b7beb5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ setup/Output/ lib/gtest/msvc/bin/ _ReSharper.Caches/ lib/cppformat/bin/ +src/bin/vld.ini diff --git a/src/callstack.cpp b/src/callstack.cpp index 1633cac3..d34b2ed5 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -522,9 +522,9 @@ VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) count++; push_back(function); } - UINT_PTR* framePointer = context.fp; /*#if defined(_M_IX86) + UINT_PTR* framePointer = (UINT_PTR*)context.BPREG; while (count < maxdepth) { if (*framePointer < (UINT_PTR)framePointer) { if (*framePointer == NULL) { @@ -567,7 +567,7 @@ VOID FastCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) while (count < maxframes) { if (myFrames[count] == 0) break; - if (myFrames[count] == *(framePointer + 1)) + if (myFrames[count] == context.fp) startIndex = count; count++; } @@ -611,32 +611,15 @@ VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) push_back(function); } - UINT_PTR* framePointer = context.fp; DWORD architecture = X86X64ARCHITECTURE; - CONTEXT currentContext; - memset(¤tContext, 0, sizeof(currentContext)); // Get the required values for initialization of the STACKFRAME64 structure // to be passed to StackWalk64(). Required fields are AddrPC and AddrFrame. -#if defined(_M_IX86) - /*UINT_PTR programcounter = *(framePointer + 1); - UINT_PTR stackpointer = (*framePointer) - maxdepth * 10 * sizeof(void*); // An approximation. - currentContext.SPREG = stackpointer; - currentContext.BPREG = (DWORD64)framePointer; - currentContext.IPREG = programcounter;*/ - currentContext.SPREG = context.Esp; - currentContext.BPREG = (DWORD64)framePointer; - currentContext.IPREG = context.Eip; -#elif defined(_M_X64) - currentContext.SPREG = context.Rsp; - currentContext.BPREG = (DWORD64)framePointer; - currentContext.IPREG = context.Rip; -#else - // If you want to retarget Visual Leak Detector to another processor - // architecture then you'll need to provide architecture-specific code to - // obtain the program counter and stack pointer from the given frame pointer. -#error "Visual Leak Detector is not supported on this architecture." -#endif // _M_IX86 || _M_X64 + CONTEXT currentContext; + memset(¤tContext, 0, sizeof(currentContext)); + currentContext.SPREG = context.SPREG; + currentContext.BPREG = context.BPREG; + currentContext.IPREG = context.IPREG; // Initialize the STACKFRAME64 structure. STACKFRAME64 frame; diff --git a/src/tests/copydlls.bat b/src/tests/copydlls.bat index 830d9325..dc611069 100644 --- a/src/tests/copydlls.bat +++ b/src/tests/copydlls.bat @@ -1,5 +1,6 @@ REM Copying over Visual Leak Detector Dependencies -copy %~p0\..\bin\%1\vld_%2.dll %3\vld_%2.dll /y -copy %~p0\..\bin\%1\vld_%2.pdb %3\vld_%2.pdb /y -copy %~p0\..\..\setup\dbghelp\%2\dbghelp.dll %3\dbghelp.dll /y -copy %~p0\..\..\setup\dbghelp\%2\Microsoft.DTfW.DHL.manifest %3\Microsoft.DTfW.DHL.manifest /y \ No newline at end of file +xcopy %~p0\..\..\vld.ini %~p0\..\bin\ /y /d +xcopy %~p0\..\bin\%1\vld_%2.dll %3\vld_%2.dll /y +xcopy %~p0\..\bin\%1\vld_%2.pdb %3\vld_%2.pdb /y +xcopy %~p0\..\..\setup\dbghelp\%2\dbghelp.dll %3\dbghelp.dll /y +xcopy %~p0\..\..\setup\dbghelp\%2\Microsoft.DTfW.DHL.manifest %3\Microsoft.DTfW.DHL.manifest /y \ No newline at end of file diff --git a/src/utility.h b/src/utility.h index 92718f9c..0aff0b30 100644 --- a/src/utility.h +++ b/src/utility.h @@ -45,16 +45,12 @@ Applications should never include this header." // Architecture-specific definitions for x86 and x64 #if defined(_M_IX86) -#define SIZEOFPTR 4 #define X86X64ARCHITECTURE IMAGE_FILE_MACHINE_I386 -#define AXREG Eax #define BPREG Ebp #define IPREG Eip #define SPREG Esp #elif defined(_M_X64) -#define SIZEOFPTR 8 #define X86X64ARCHITECTURE IMAGE_FILE_MACHINE_AMD64 -#define AXREG Rax #define BPREG Rbp #define IPREG Rip #define SPREG Rsp @@ -62,38 +58,36 @@ Applications should never include this header." struct context_t { - UINT_PTR* fp; + UINT_PTR fp; UINT_PTR func; #if defined(_M_IX86) + DWORD Ebp; DWORD Esp; DWORD Eip; #elif defined(_M_X64) + DWORD64 Rbp; DWORD64 Rsp; DWORD64 Rip; #endif // _M_IX86 }; +// Capture current context #if defined(_M_IX86) -// Copies the current frame pointer to the supplied variable. -/*#define CAPTURE_CONTEXT(context, function) \ - context.fp = ((UINT_PTR*)_AddressOfReturnAddress()) - 1; \ - context.func = (UINT_PTR)(function)*/ #define CAPTURE_CONTEXT(context, function) \ CONTEXT _ctx; \ RtlCaptureContext(&_ctx); \ - context.Esp = _ctx.Esp; context.Eip = _ctx.Eip; \ - context.fp = ((UINT_PTR*)_AddressOfReturnAddress()) - 1; \ + context.Ebp = _ctx.Ebp; context.Esp = _ctx.Esp; context.Eip = _ctx.Eip; \ + context.fp = (UINT_PTR)_ReturnAddress(); \ context.func = (UINT_PTR)(function) -#define GET_RETURN_ADDRESS(context) *(context.fp + 1) +#define GET_RETURN_ADDRESS(context) (context.fp) #elif defined(_M_X64) -// Capture current context #define CAPTURE_CONTEXT(context, function) \ CONTEXT _ctx; \ RtlCaptureContext(&_ctx); \ - context.Rsp = _ctx.Rsp; context.Rip = _ctx.Rip; \ - context.fp = ((UINT_PTR*)_AddressOfReturnAddress()) - 1; \ + context.Rbp = _ctx.Rbp; context.Rsp = _ctx.Rsp; context.Rip = _ctx.Rip; \ + context.fp = (UINT_PTR)_ReturnAddress(); \ context.func = (UINT_PTR)(function) -#define GET_RETURN_ADDRESS(context) *(context.fp + 1) +#define GET_RETURN_ADDRESS(context) (context.fp) #else // If you want to retarget Visual Leak Detector to another processor // architecture then you'll need to provide an architecture-specific macro to From d4ff13cdcba4b3d328454e03c0dfdd37d27c3242 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 30 Aug 2015 03:36:28 +0300 Subject: [PATCH 219/321] MFC function hooking fixed --- src/utility.cpp | 86 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 30 deletions(-) diff --git a/src/utility.cpp b/src/utility.cpp index 0eade86f..ba58210a 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -42,6 +42,8 @@ static BOOL s_reportToDebugger = TRUE; // If TRUE, a copy of the memory static BOOL s_reportToStdOut = TRUE; // If TRUE, a copy of the memory leak report will be sent to standard output. static encoding_e s_reportEncoding = ascii; // Output encoding of the memory leak report. +#define IS_ORDINAL(name) (((UINT_PTR)name & 0xFFFF) == ((UINT_PTR)name)) + // DumpMemoryA - Dumps a nicely formatted rendition of a region of memory. // Includes both the hex value of each byte and its ASCII equivalent (if // printable). @@ -488,9 +490,9 @@ LPVOID FindRealCode(LPVOID pCode) // import module does not import the specified export, so nothing changed, // then FALSE will be returned. // -BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) +BOOL PatchImport (HMODULE importmodule, moduleentry_t *patchModule) { - HMODULE exportmodule = (HMODULE)module->moduleBase; + HMODULE exportmodule = (HMODULE)patchModule->moduleBase; if (exportmodule == NULL) return FALSE; @@ -530,12 +532,12 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) PCHAR importdllname = (PCHAR)R2VA(importmodule, idte->Name); UNREFERENCED_PARAMETER(importdllname); - patchentry_t *entry = module->patchTable; + patchentry_t *patchEntry = patchModule->patchTable; int i = 0; - while(entry->importName) + while(patchEntry->importName) { - LPCSTR importname = entry->importName; - LPCVOID replacement = entry->replacement; + LPCSTR importname = patchEntry->importName; + LPCVOID replacement = patchEntry->replacement; // Get the *real* address of the import. If we find this address in the IAT, // then we've found the entry that needs to be patched. @@ -546,7 +548,7 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) if (import == NULL) // Perhaps the named export module does not actually export the named import? { - entry++; i++; + patchEntry++; i++; continue; } @@ -556,13 +558,6 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) for (; origThunk->u1.Function != NULL; origThunk++, thunk++) { - if (origThunk->u1.Ordinal & IMAGE_ORDINAL_FLAG) - { - // Ordinal import - we can handle named imports - // only, so skip it. - continue; - } - LPVOID func = FindRealCode((LPVOID)thunk->u1.Function); if (((DWORD_PTR)func == (DWORD_PTR)import)) { @@ -579,11 +574,19 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) DbgReport(L"Hook dll \"%S\":\n", strrchr(pszBuffer, '\\') + 1); } - DbgReport(L"Hook import %S(\"%S\") for dll \"%S\".\n", - importname, module->exportModuleName, importdllname); + if (!IS_ORDINAL(importname)) + { + DbgReport(L"Hook import %S(\"%S\") for dll \"%S\".\n", + importname, patchModule->exportModuleName, importdllname); + } + else + { + DbgReport(L"Hook import %zu(\"%S\") for dll \"%S\".\n", + importname, patchModule->exportModuleName, importdllname); + } #endif - if (entry->original != NULL) - *entry->original = func; + if (patchEntry->original != NULL) + *patchEntry->original = func; DWORD protect; VirtualProtect(&thunk->u1.Function, sizeof(thunk->u1.Function), PAGE_EXECUTE_READWRITE, &protect); @@ -597,22 +600,38 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *module) #ifdef PRINTHOOKINFO PIMAGE_IMPORT_BY_NAME funcEntry = (PIMAGE_IMPORT_BY_NAME) R2VA(importmodule, origThunk->u1.AddressOfData); - if (stricmp(importdllname, module->exportModuleName) == 0 && - strcmp(static_cast(funcEntry->Name), importname) == 0) + if (stricmp(importdllname, patchModule->exportModuleName) == 0) { - if (!dllNamePrinted) - { - dllNamePrinted = true; - DbgReport(L"Hook dll \"%S\":\n", - strrchr(pszBuffer, '\\') + 1); - } - DbgReport(L"Import found %S(\"%S\") for dll \"%S\".\n", - importname, module->exportModuleName, importdllname); - break; + if (!(origThunk->u1.Ordinal & IMAGE_ORDINAL_FLAG) && !IS_ORDINAL(importname) && + strcmp(reinterpret_cast(funcEntry->Name), importname) == 0) + { + if (!dllNamePrinted) + { + dllNamePrinted = true; + DbgReport(L"Hook dll \"%S\":\n", + strrchr(pszBuffer, '\\') + 1); + } + DbgReport(L"Import found %S(\"%S\") for dll \"%S\".\n", + importname, patchModule->exportModuleName, importdllname); + break; + } + if ((origThunk->u1.Ordinal & IMAGE_ORDINAL_FLAG) && IS_ORDINAL(importname) && + (IMAGE_ORDINAL(origThunk->u1.Ordinal) == (UINT_PTR)importname)) + { + if (!dllNamePrinted) + { + dllNamePrinted = true; + DbgReport(L"Hook dll \"%S\":\n", + strrchr(pszBuffer, '\\') + 1); + } + DbgReport(L"Import found %zu(\"%S\") for dll \"%S\".\n", + importname, patchModule->exportModuleName, importdllname); + break; + } } #endif } - entry++; i++; + patchEntry++; i++; } idte++; @@ -649,6 +668,13 @@ BOOL PatchModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tables UINT index; BOOL patched = FALSE; +#ifdef PRINTHOOKINFO + CHAR cwBuffer[2048] = { 0 }; + LPSTR pszBuffer = cwBuffer; + DWORD dwMaxChars = _countof(cwBuffer); + DWORD dwLength = ::GetModuleFileNameA(importmodule, pszBuffer, dwMaxChars); +#endif + // Loop through the import patch table, individually patching each import // listed in the table. DbgTrace(L"dbghelp32.dll %i: PatchModule - ImageDirectoryEntryToDataEx\n", GetCurrentThreadId()); From 98266b3f26de0bd8809d59f76356bd95561b30d5 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 30 Aug 2015 03:37:00 +0300 Subject: [PATCH 220/321] Restore back internal frame detection --- src/callstack.cpp | 51 ++++++++++++++++++++++++++++++++++++----------- src/vld_hooks.cpp | 4 +++- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index d34b2ed5..33eabe6e 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -298,6 +298,7 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const // Use static here to increase performance, and avoid heap allocs. // It's thread safe because of g_heapMapLock lock. static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; + bool isPrevFrameInternal = false; // Iterate through each frame in the call stack. for (UINT32 frame = start_frame; frame < m_size; frame++) @@ -310,17 +311,23 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const DWORD displacement = 0; DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); - if (foundline) { + + bool isFrameInternal = false; + if (foundline && !showInternalFrames) { wcscpy_s(lowerCaseName, sourceInfo.FileName); _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); if (isInternalModule(lowerCaseName)) { // Don't show frames in files internal to the heap. - g_symbolLock.Leave(); - continue; + isFrameInternal = true; } } + // show one allocation function for context + if (!isFrameInternal && isPrevFrameInternal) + Print(stack_line); + isPrevFrameInternal = isFrameInternal; + DWORD64 displacement64; BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); @@ -332,7 +339,8 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const DWORD NumChars = resolveFunction(programCounter, foundline ? &sourceInfo : NULL, displacement, functionName, stack_line, _countof(stack_line)); - Print(stack_line); + if (!isFrameInternal) + Print(stack_line); } } @@ -371,13 +379,13 @@ int CallStack::resolve(BOOL showInternalFrames) IMAGEHLP_LINE64 sourceInfo = { 0 }; sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - BYTE symbolBuffer [sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; + WCHAR lowerCaseName[MAX_PATH]; // Use static here to increase performance, and avoid heap allocs. // It's thread safe because of g_heapMapLock lock. - static WCHAR function_generated_name[MAX_PATH] = L""; static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; - WCHAR lowerCaseName [MAX_PATH]; + bool isPrevFrameInternal = false; + DWORD NumChars = 0; const size_t max_line_length = MAXREPORTLENGTH + 1; m_resolvedCapacity = m_size * max_line_length; @@ -401,16 +409,24 @@ int CallStack::resolve(BOOL showInternalFrames) BOOL foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); assert(m_resolved != NULL); + bool isFrameInternal = false; if (foundline && !showInternalFrames) { wcscpy_s(lowerCaseName, sourceInfo.FileName); _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); if (isInternalModule(lowerCaseName)) { // Don't show frames in files internal to the heap. - g_symbolLock.Leave(); - continue; + isFrameInternal = true; } } + // show one allocation function for context + if (NumChars >= 0 && !isFrameInternal && isPrevFrameInternal) { + assert(m_resolved != NULL); + m_resolvedLength += NumChars; + wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); + } + isPrevFrameInternal = isFrameInternal; + DWORD64 displacement64; BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); @@ -419,10 +435,10 @@ int CallStack::resolve(BOOL showInternalFrames) if (!foundline) displacement = (DWORD)displacement64; - DWORD NumChars = resolveFunction( programCounter, foundline ? &sourceInfo : NULL, + NumChars = resolveFunction( programCounter, foundline ? &sourceInfo : NULL, displacement, functionName, stack_line, _countof( stack_line )); - if (NumChars >= 0) { + if (NumChars >= 0 && !isFrameInternal) { assert(m_resolved != NULL); m_resolvedLength += NumChars; wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); @@ -491,7 +507,18 @@ bool CallStack::isInternalModule( const PWSTR filename ) const wcsstr(filename, L"\\crt\\src\\free.c") || wcsstr(filename, L"\\crt\\src\\strdup.c") || wcsstr(filename, L"\\crt\\src\\wcsdup.c") || - wcsstr(filename, L"\\vc\\include\\xmemory0"); + wcsstr(filename, L"\\vc\\include\\xmemory0") || + // VS2015 + wcsstr(filename, L"\\atlmfc\\include\\atlsimpstr.h") || + wcsstr(filename, L"\\atlmfc\\include\\cstringt.h") || + wcsstr(filename, L"\\atlmfc\\src\\mfc\\afxmem.cpp") || + wcsstr(filename, L"\\atlmfc\\src\\mfc\\strcore.cpp") || + wcsstr(filename, L"\\vcstartup\\src\\heap\\new_scalar.cpp") || + wcsstr(filename, L"\\vcstartup\\src\\heap\\new_array.cpp") || + wcsstr(filename, L"\\vcstartup\\src\\heap\\new_debug.cpp") || + wcsstr(filename, L"\\ucrt\\src\\appcrt\\heap\\align.cpp") || + wcsstr(filename, L"\\ucrt\\src\\appcrt\\heap\\malloc.cpp") || + wcsstr(filename, L"\\ucrt\\src\\appcrt\\heap\\debug_heap.cpp"); } // getStackTrace - Traces the stack as far back as possible, or until 'maxdepth' diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index d08019e6..ce540bde 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -2082,7 +2082,9 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - CAPTURE_CONTEXT(context, NULL); + UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; + UINT_PTR allocFunc = cVtablePtr[3]; + CAPTURE_CONTEXT(context, allocFunc); tls->context = context; } From 451cb8341fcfa04272f1631beb7dff49cce636df Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Tue, 1 Sep 2015 02:13:11 +0300 Subject: [PATCH 221/321] VS2013 project building fixed --- lib/cppformat/format.vcxproj | 16 +- lib/cppformat/format_vs12.vcxproj | 202 ++++++++++++++++++ lib/cppformat/format_vs12.vcxproj.filters | 27 +++ lib/gtest/msvc/gtest.vcxproj | 32 +-- lib/gtest/msvc/gtest_vs12.vcxproj | 32 +-- src/tests/Common.props | 8 +- src/tests/basics/basics.cpp | 1 + src/tests/basics/basics_vs12.vcxproj | 62 ++---- src/tests/copydlls.bat | 10 +- src/tests/corruption/corruption_vs12.vcxproj | 62 ++---- .../dynamic_app/dynamic_app_vs12.vcxproj | 62 ++---- src/tests/mfc/vldmfc_vs12.vcxproj | 40 +--- src/tests/suite/testsuite_vs12.vcxproj | 62 ++---- src/vld.vcxproj | 4 +- src/vld_vs12.vcxproj | 11 +- vld_vs12.sln | 37 +++- 16 files changed, 381 insertions(+), 287 deletions(-) create mode 100644 lib/cppformat/format_vs12.vcxproj create mode 100644 lib/cppformat/format_vs12.vcxproj.filters diff --git a/lib/cppformat/format.vcxproj b/lib/cppformat/format.vcxproj index bf921bb1..53cf7dfb 100644 --- a/lib/cppformat/format.vcxproj +++ b/lib/cppformat/format.vcxproj @@ -59,18 +59,18 @@ <_ProjectFileVersion>10.0.20506.1 - bin\$(Platform)-$(Configuration)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ $(ProjectName) $(ProjectName) .lib .lib - bin\$(Platform)-$(Configuration)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ $(ProjectName) $(ProjectName) .lib diff --git a/lib/cppformat/format_vs12.vcxproj b/lib/cppformat/format_vs12.vcxproj new file mode 100644 index 00000000..f780bcfa --- /dev/null +++ b/lib/cppformat/format_vs12.vcxproj @@ -0,0 +1,202 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} + Win32Proj + Win32 + libformat + 8.1 + + + + StaticLibrary + false + MultiByte + v120_xp + + + StaticLibrary + false + MultiByte + v120_xp + + + StaticLibrary + false + MultiByte + v120_xp + + + StaticLibrary + false + MultiByte + v120_xp + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ + $(ProjectName) + $(ProjectName) + .lib + .lib + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ + $(ProjectName) + $(ProjectName) + .lib + .lib + + + + .;gmock;%(AdditionalIncludeDirectories) + Debug/ + EnableFastChecks + CompileAsCpp + EditAndContinue + Sync + NotUsing + MultiThreadedDebug + true + Level3 + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + $(IntDir) + Disabled + + + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + .;gmock;%(AdditionalIncludeDirectories) + + + .;gmock;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + + .;gmock;%(AdditionalIncludeDirectories) + Debug/ + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + NotUsing + MultiThreadedDebug + true + Level3 + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + $(IntDir) + Disabled + + + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + .;gmock;%(AdditionalIncludeDirectories) + + + .;gmock;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + + .;gmock;%(AdditionalIncludeDirectories) + Release/ + CompileAsCpp + ProgramDatabase + Sync + NotUsing + MultiThreaded + true + Level3 + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + $(IntDir) + + + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + .;gmock;%(AdditionalIncludeDirectories) + + + .;gmock;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + .;gmock;%(AdditionalIncludeDirectories) + Release/ + CompileAsCpp + ProgramDatabase + Sync + NotUsing + MultiThreaded + true + Level3 + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + $(IntDir) + + + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + .;gmock;%(AdditionalIncludeDirectories) + + + .;gmock;%(AdditionalIncludeDirectories) + $(ProjectDir)/$(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/cppformat/format_vs12.vcxproj.filters b/lib/cppformat/format_vs12.vcxproj.filters new file mode 100644 index 00000000..ce1d0af3 --- /dev/null +++ b/lib/cppformat/format_vs12.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + + + {915FED9B-B1C3-4F90-BF61-CF9EE0706F01} + + + {FB559997-0E66-467B-B839-27310F735431} + + + \ No newline at end of file diff --git a/lib/gtest/msvc/gtest.vcxproj b/lib/gtest/msvc/gtest.vcxproj index 410a0fac..3994bdf4 100644 --- a/lib/gtest/msvc/gtest.vcxproj +++ b/lib/gtest/msvc/gtest.vcxproj @@ -113,36 +113,36 @@ <_ProjectFileVersion>14.0.22823.1 - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ diff --git a/lib/gtest/msvc/gtest_vs12.vcxproj b/lib/gtest/msvc/gtest_vs12.vcxproj index 2b84d5a7..18f10f7e 100644 --- a/lib/gtest/msvc/gtest_vs12.vcxproj +++ b/lib/gtest/msvc/gtest_vs12.vcxproj @@ -114,36 +114,36 @@ <_ProjectFileVersion>14.0.22823.1 - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - bin\$(Platform)-$(Configuration)\ - obj\$(Platform)-$(Configuration)\$(ProjectName)\ + bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ + obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ diff --git a/src/tests/Common.props b/src/tests/Common.props index b1e83578..19f55a3b 100644 --- a/src/tests/Common.props +++ b/src/tests/Common.props @@ -18,12 +18,12 @@ <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)src\bin\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) + call ..\copydlls.bat $(Platform)\$(VldConfiguration)-v$(PlatformToolsetVersion) $(NumericPlatform) $(Outdir) Copying over Visual Leak Detector Dependencies @@ -31,7 +31,7 @@ _VARIADIC_MAX=10;%(PreprocessorDefinitions) - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration);%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration)-v$(PlatformToolsetVersion);%(AdditionalLibraryDirectories) \ No newline at end of file diff --git a/src/tests/basics/basics.cpp b/src/tests/basics/basics.cpp index 36461caa..1bbd3d9c 100644 --- a/src/tests/basics/basics.cpp +++ b/src/tests/basics/basics.cpp @@ -127,6 +127,7 @@ TEST_P(TestBasics, IMalloc) int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 1; + VLDReportLeaks(); ASSERT_EQ(correctLeaks, leaks); } diff --git a/src/tests/basics/basics_vs12.vcxproj b/src/tests/basics/basics_vs12.vcxproj index 7f66e0fb..e2bece88 100644 --- a/src/tests/basics/basics_vs12.vcxproj +++ b/src/tests/basics/basics_vs12.vcxproj @@ -240,10 +240,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -260,10 +257,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -279,10 +273,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -299,10 +290,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -318,10 +306,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -338,10 +323,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -357,10 +339,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -377,10 +356,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -397,10 +373,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -418,10 +391,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -438,10 +408,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -459,10 +426,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -490,7 +454,7 @@ - + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} diff --git a/src/tests/copydlls.bat b/src/tests/copydlls.bat index dc611069..7c561a8e 100644 --- a/src/tests/copydlls.bat +++ b/src/tests/copydlls.bat @@ -1,6 +1,6 @@ REM Copying over Visual Leak Detector Dependencies -xcopy %~p0\..\..\vld.ini %~p0\..\bin\ /y /d -xcopy %~p0\..\bin\%1\vld_%2.dll %3\vld_%2.dll /y -xcopy %~p0\..\bin\%1\vld_%2.pdb %3\vld_%2.pdb /y -xcopy %~p0\..\..\setup\dbghelp\%2\dbghelp.dll %3\dbghelp.dll /y -xcopy %~p0\..\..\setup\dbghelp\%2\Microsoft.DTfW.DHL.manifest %3\Microsoft.DTfW.DHL.manifest /y \ No newline at end of file +xcopy %~dp0\..\..\vld.ini %~dp0\..\bin\ /y /d +copy %~p0\..\bin\%1\vld_%2.dll %3\vld_%2.dll /y +copy %~p0\..\bin\%1\vld_%2.pdb %3\vld_%2.pdb /y +copy %~dp0\..\..\setup\dbghelp\%2\dbghelp.dll %3\dbghelp.dll /y +copy %~dp0\..\..\setup\dbghelp\%2\Microsoft.DTfW.DHL.manifest %3\Microsoft.DTfW.DHL.manifest /y \ No newline at end of file diff --git a/src/tests/corruption/corruption_vs12.vcxproj b/src/tests/corruption/corruption_vs12.vcxproj index 1b893d84..11f07352 100644 --- a/src/tests/corruption/corruption_vs12.vcxproj +++ b/src/tests/corruption/corruption_vs12.vcxproj @@ -234,10 +234,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -251,10 +248,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -269,10 +263,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -287,10 +278,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -304,10 +292,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -321,10 +306,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -339,10 +321,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -357,10 +336,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -377,10 +353,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -398,10 +371,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -418,10 +388,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -439,10 +406,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -455,7 +419,7 @@ - + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} diff --git a/src/tests/dynamic_app/dynamic_app_vs12.vcxproj b/src/tests/dynamic_app/dynamic_app_vs12.vcxproj index 183c7044..38e5278b 100644 --- a/src/tests/dynamic_app/dynamic_app_vs12.vcxproj +++ b/src/tests/dynamic_app/dynamic_app_vs12.vcxproj @@ -239,10 +239,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -261,10 +258,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -282,10 +276,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -300,10 +291,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -317,10 +305,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -335,10 +320,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -352,10 +334,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -370,10 +349,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -391,10 +367,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -413,10 +386,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -432,10 +402,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -452,10 +419,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -470,7 +434,7 @@ - + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} diff --git a/src/tests/mfc/vldmfc_vs12.vcxproj b/src/tests/mfc/vldmfc_vs12.vcxproj index 44ad9eae..57a4bbfe 100644 --- a/src/tests/mfc/vldmfc_vs12.vcxproj +++ b/src/tests/mfc/vldmfc_vs12.vcxproj @@ -208,10 +208,7 @@ true .\Release/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -252,10 +249,7 @@ true .\Release/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -294,10 +288,7 @@ true .\Release/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -336,10 +327,7 @@ true .\Release/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -382,10 +370,7 @@ true .\Debug/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -428,10 +413,7 @@ true .\Debug/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -471,10 +453,7 @@ true .\Debug/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -514,10 +493,7 @@ true .\Debug/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + diff --git a/src/tests/suite/testsuite_vs12.vcxproj b/src/tests/suite/testsuite_vs12.vcxproj index 72c0848e..d2491214 100644 --- a/src/tests/suite/testsuite_vs12.vcxproj +++ b/src/tests/suite/testsuite_vs12.vcxproj @@ -239,10 +239,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -259,10 +256,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -278,10 +272,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -297,10 +288,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -317,10 +305,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -337,10 +322,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -362,10 +344,7 @@ Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -387,10 +366,7 @@ Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -410,10 +386,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -433,10 +406,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -458,10 +428,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -483,16 +450,13 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + - + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} diff --git a/src/vld.vcxproj b/src/vld.vcxproj index 7c4cc588..97dc35a0 100644 --- a/src/vld.vcxproj +++ b/src/vld.vcxproj @@ -54,8 +54,8 @@ <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)bin\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ NativeRecommendedRules.ruleset $(ProjectName)_$(NumericPlatform) .dll diff --git a/src/vld_vs12.vcxproj b/src/vld_vs12.vcxproj index e06f79e1..ce66e3f7 100644 --- a/src/vld_vs12.vcxproj +++ b/src/vld_vs12.vcxproj @@ -55,8 +55,8 @@ <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)bin\$(Platform)\$(Configuration)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)\ + $(ProjectDir)bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ NativeRecommendedRules.ruleset $(ProjectName)_$(NumericPlatform) .dll @@ -77,7 +77,7 @@ - $(SolutionDir)\lib\dbghelp\include;$(SolutionDir)\setup;%(AdditionalIncludeDirectories) + $(SolutionDir)\lib\;$(SolutionDir)\lib\dbghelp\include;$(SolutionDir)\setup;%(AdditionalIncludeDirectories) Use @@ -234,6 +234,11 @@ + + + {4adfd279-56c6-4b1d-ba9e-b815e81c1b17} + + diff --git a/vld_vs12.sln b/vld_vs12.sln index 3b110fd9..31fef29e 100644 --- a/vld_vs12.sln +++ b/vld_vs12.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld_vs12.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" EndProject @@ -44,6 +44,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format_vs12.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 @@ -276,6 +278,30 @@ Global {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -283,13 +309,14 @@ Global GlobalSection(NestedProjects) = preSolution {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} EndGlobalSection EndGlobal From 44acbfa35f09e10bb3a186e21816ac33e8548d9f Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 3 Sep 2015 21:04:58 +0300 Subject: [PATCH 222/321] appveyor.yml added --- appveyor.yml | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..c0c1fb22 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,79 @@ +version: '{build}' + +branches: + # blacklist + except: + - gh-pages + +platform: + - Win32 + - x64 + +configuration: + - Debug(Release) + - Debug(Release)_StaticCrt + - Release + - Release_StaticCrt + +matrix: + fast_finish: false + +build_script: +- ps: >- + Write-Output "Configuration: $env:CONFIGURATION" + + Write-Output "Platform: $env:PLATFORM" + + msbuild /v:m /p:"Configuration=$env:CONFIGURATION" /p:Platform="$env:PLATFORM" "vld_vs14.sln" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + +test_script: +- ps: >- + cd src\ + + function Add-GTest-Result($testResult) + { + $testsuites = ([xml](get-content $testResult)).testsuites + $anyFailures = $FALSE + + foreach ($testsuite in $testsuites.testsuite) { + foreach ($testcase in $testsuite.testcase) { + if ($testcase.failure) { + $time = ([double]$testcase.time * 1000) + Add-AppveyorTest $testcase.name -Outcome Failed -FileName $testsuite.name -Duration $time -ErrorMessage $testcase.failure.message + Add-AppveyorMessage "$($testcase.name) failed" -Category Error + $anyFailures = $TRUE + } + elseif ($testcase.skipped) { + Add-AppveyorTest $testcase.name -Outcome Ignored -Filename $testsuite.name + } + else { + $time = ([double]$testcase.time * 1000) + Add-AppveyorTest $testcase.name -Outcome Passed -FileName $testsuite.name -Duration $time + } + } + } + + if ($anyFailures -eq $TRUE){ + Write-Output "Failing build as there are broken tests" + $host.SetShouldExit(1) + } + } + + + function Run-Tests($platform, $configuration) + { + $tests_path = ".\bin\$platform\$configuration\" + $tests_path + + # Run tests and ipload results to AppVeyor one by one + Get-ChildItem "$tests_path\*.exe" | foreach { + $testfile = "$($_.FullName).xml" + & $_.FullName "--gtest_output=`"xml:$testfile`"" + if (Test-Path $testfile) + { + Add-GTest-Result($testfile) + } + } + } + + Run-Tests "$env:PLATFORM" "$env:CONFIGURATION-v140" From cc6f50d5dfda75ce165817e6d4d4d5382493b9f1 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 3 Sep 2015 22:15:22 +0300 Subject: [PATCH 223/321] TEST(CorruptionDeathTest, HeapMismatch) fixed in release --- src/tests/corruption/corruption.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/corruption/corruption.cpp b/src/tests/corruption/corruption.cpp index 38d932e9..b72ac568 100644 --- a/src/tests/corruption/corruption.cpp +++ b/src/tests/corruption/corruption.cpp @@ -43,11 +43,11 @@ TEST(Corruption, AllocMismatch) TEST(CorruptionDeathTest, HeapMismatch) { - EXPECT_EXIT({ + EXPECT_DEATH({ VLDSetReportHook(VLD_RPTHOOK_INSTALL, ReportHook); TestCorruption(eHeapMismatch); VLDSetReportHook(VLD_RPTHOOK_REMOVE, ReportHook); - }, ::testing::ExitedWithCode(0xC0000374), "CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another."); + }, "CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another."); } int main(int argc, char **argv) { From 0bdca754b5682fd99b0552ca32bacf38c7de6dd8 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 4 Sep 2015 00:18:10 +0300 Subject: [PATCH 224/321] Renamed solution configuration for msbuild --- appveyor.yml | 8 ++- vld_vs14.sln | 168 +++++++++++++++++++++++++-------------------------- 2 files changed, 89 insertions(+), 87 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c0c1fb22..223bd50b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,8 +10,8 @@ platform: - x64 configuration: - - Debug(Release) - - Debug(Release)_StaticCrt + - Debug_VldRelease + - Debug_VldRelease_StaticCrt - Release - Release_StaticCrt @@ -76,4 +76,6 @@ test_script: } } - Run-Tests "$env:PLATFORM" "$env:CONFIGURATION-v140" + $folders = @{"Debug_VldRelease" = "Debug(Release)-v140"; "Debug_VldRelease_StaticCrt" = "Debug(Release)_StaticCrt-v140"; + "Release" = "Release-v140"; "Release_StaticCrt" = "Release_StaticCrt-v140"} + Run-Tests "$env:PLATFORM" "$($folders[$env:CONFIGURATION])" diff --git a/vld_vs14.sln b/vld_vs14.sln index 723006de..374db686 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -48,12 +48,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 - Debug(Release)_StaticCrt|x64 = Debug(Release)_StaticCrt|x64 - Debug(Release)|Win32 = Debug(Release)|Win32 - Debug(Release)|x64 = Debug(Release)|x64 Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 Debug_StaticCrt|x64 = Debug_StaticCrt|x64 + Debug_VldRelease_StaticCrt|Win32 = Debug_VldRelease_StaticCrt|Win32 + Debug_VldRelease_StaticCrt|x64 = Debug_VldRelease_StaticCrt|x64 + Debug_VldRelease|Win32 = Debug_VldRelease|Win32 + Debug_VldRelease|x64 = Debug_VldRelease|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release_StaticCrt|Win32 = Release_StaticCrt|Win32 @@ -62,18 +62,18 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 @@ -86,18 +86,18 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 @@ -110,18 +110,18 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 @@ -134,18 +134,18 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 @@ -158,18 +158,18 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 @@ -182,18 +182,18 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 @@ -206,18 +206,18 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 @@ -230,18 +230,18 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 @@ -254,18 +254,18 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.Build.0 = Debug|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.Build.0 = Debug|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 @@ -278,18 +278,18 @@ Global {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.Build.0 = Release|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.Build.0 = Release|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 From 45ec65de5b4a95dafcb626077fef76cfada73f46 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 4 Sep 2015 00:39:59 +0300 Subject: [PATCH 225/321] Build status added --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 764b93ff..4552d6aa 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Visual Leak Detector +# 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) ## Introduction @@ -25,8 +25,8 @@ We encourage developers who've added their own features, or fixed bugs they've f * [Source code at Codeplex](http://vld.codeplex.com/SourceControl/BrowseLatest) * [Source code at GitHub](https://github.com/KindDragon/vld) -Copyright © 2005-2014 VLD Team +Copyright © 2005-2015 VLD Team [1]: http://vld.codeplex.com/discussions [2]: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N3QTYHP9LH6UY&lc=GB&item_name=Visual%20Leak%20Detector¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted - [3]: http://vld.codeplex.com/license \ No newline at end of file + [3]: http://vld.codeplex.com/license From a2adea36a58e2ed9e73b33297c1320ee1095abbe Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 4 Sep 2015 00:18:10 +0300 Subject: [PATCH 226/321] Testing with VldStackWalkMethod = safe added --- appveyor.yml | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 223bd50b..96777b86 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,15 @@ branches: except: - gh-pages +os: Visual Studio 2015 + +environment: + GTEST_REPEAT: 1 + + matrix: + - VldStackWalkMethod: safe + - VldStackWalkMethod: fast + platform: - Win32 - x64 @@ -19,15 +28,13 @@ matrix: fast_finish: false build_script: -- ps: >- +- ps: | Write-Output "Configuration: $env:CONFIGURATION" - Write-Output "Platform: $env:PLATFORM" - msbuild /v:m /p:"Configuration=$env:CONFIGURATION" /p:Platform="$env:PLATFORM" "vld_vs14.sln" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" test_script: -- ps: >- +- ps: | cd src\ function Add-GTest-Result($testResult) @@ -52,28 +59,30 @@ test_script: } } } - - if ($anyFailures -eq $TRUE){ - Write-Output "Failing build as there are broken tests" - $host.SetShouldExit(1) - } + return $anyFailures } function Run-Tests($platform, $configuration) { + $anyFailures = $FALSE $tests_path = ".\bin\$platform\$configuration\" - $tests_path - # Run tests and ipload results to AppVeyor one by one + # Run tests and upload results to AppVeyor one by one Get-ChildItem "$tests_path\*.exe" | foreach { $testfile = "$($_.FullName).xml" & $_.FullName "--gtest_output=`"xml:$testfile`"" if (Test-Path $testfile) { - Add-GTest-Result($testfile) + $testsResult = Add-GTest-Result $testfile + $anyFailures = $anyFailures -or $testsResult } } + + if ($anyFailures -eq $TRUE){ + Write-Output "Failing build as there are broken tests" + $host.SetShouldExit(1) + } } $folders = @{"Debug_VldRelease" = "Debug(Release)-v140"; "Debug_VldRelease_StaticCrt" = "Debug(Release)_StaticCrt-v140"; From 778a1e95803b30a3e0918348504455c7343a0cdb Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 4 Oct 2015 01:44:47 +0300 Subject: [PATCH 227/321] Post build step fixed for tests --- src/tests/basics/basics.vcxproj | 60 +++++------------------ src/tests/copydlls.bat | 4 +- src/tests/corruption/corruption.vcxproj | 60 +++++------------------ src/tests/dynamic_app/dynamic_app.vcxproj | 60 +++++------------------ src/tests/mfc/vldmfc.vcxproj | 40 +++------------ src/tests/suite/testsuite.vcxproj | 60 +++++------------------ 6 files changed, 58 insertions(+), 226 deletions(-) diff --git a/src/tests/basics/basics.vcxproj b/src/tests/basics/basics.vcxproj index 05bad28c..8ffa710a 100644 --- a/src/tests/basics/basics.vcxproj +++ b/src/tests/basics/basics.vcxproj @@ -240,10 +240,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -260,10 +257,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -279,10 +273,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -299,10 +290,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -318,10 +306,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -338,10 +323,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -357,10 +339,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -377,10 +356,7 @@ NotSet %(AdditionalDependencies) - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -397,10 +373,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -418,10 +391,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -438,10 +408,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -459,10 +426,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + diff --git a/src/tests/copydlls.bat b/src/tests/copydlls.bat index 7c561a8e..8a3713ba 100644 --- a/src/tests/copydlls.bat +++ b/src/tests/copydlls.bat @@ -1,6 +1,6 @@ REM Copying over Visual Leak Detector Dependencies xcopy %~dp0\..\..\vld.ini %~dp0\..\bin\ /y /d -copy %~p0\..\bin\%1\vld_%2.dll %3\vld_%2.dll /y -copy %~p0\..\bin\%1\vld_%2.pdb %3\vld_%2.pdb /y +copy %~dp0\..\bin\%1\vld_%2.dll %3\vld_%2.dll /y +copy %~dp0\..\bin\%1\vld_%2.pdb %3\vld_%2.pdb /y copy %~dp0\..\..\setup\dbghelp\%2\dbghelp.dll %3\dbghelp.dll /y copy %~dp0\..\..\setup\dbghelp\%2\Microsoft.DTfW.DHL.manifest %3\Microsoft.DTfW.DHL.manifest /y \ No newline at end of file diff --git a/src/tests/corruption/corruption.vcxproj b/src/tests/corruption/corruption.vcxproj index ad3eadf7..3d71b76f 100644 --- a/src/tests/corruption/corruption.vcxproj +++ b/src/tests/corruption/corruption.vcxproj @@ -233,10 +233,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -250,10 +247,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -268,10 +262,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -286,10 +277,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -303,10 +291,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -320,10 +305,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -338,10 +320,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -356,10 +335,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -376,10 +352,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -397,10 +370,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -417,10 +387,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -438,10 +405,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + diff --git a/src/tests/dynamic_app/dynamic_app.vcxproj b/src/tests/dynamic_app/dynamic_app.vcxproj index 5a9f87a4..5b6a06fe 100644 --- a/src/tests/dynamic_app/dynamic_app.vcxproj +++ b/src/tests/dynamic_app/dynamic_app.vcxproj @@ -238,10 +238,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -260,10 +257,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -281,10 +275,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -299,10 +290,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -316,10 +304,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -334,10 +319,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -351,10 +333,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -369,10 +348,7 @@ Console true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -390,10 +366,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -412,10 +385,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -431,10 +401,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -451,10 +418,7 @@ true true - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + diff --git a/src/tests/mfc/vldmfc.vcxproj b/src/tests/mfc/vldmfc.vcxproj index e1c10713..793dbe5f 100644 --- a/src/tests/mfc/vldmfc.vcxproj +++ b/src/tests/mfc/vldmfc.vcxproj @@ -206,10 +206,7 @@ true .\Release/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -250,10 +247,7 @@ true .\Release/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -292,10 +286,7 @@ true .\Release/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -334,10 +325,7 @@ true .\Release/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -380,10 +368,7 @@ true .\Debug/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -426,10 +411,7 @@ true .\Debug/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -469,10 +451,7 @@ true .\Debug/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -512,10 +491,7 @@ true .\Debug/vldmfc.bsc - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + diff --git a/src/tests/suite/testsuite.vcxproj b/src/tests/suite/testsuite.vcxproj index 800d3a17..ba62eabe 100644 --- a/src/tests/suite/testsuite.vcxproj +++ b/src/tests/suite/testsuite.vcxproj @@ -238,10 +238,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -258,10 +255,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -277,10 +271,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -296,10 +287,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -316,10 +304,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -336,10 +321,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -361,10 +343,7 @@ Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -386,10 +365,7 @@ Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -409,10 +385,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -432,10 +405,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -457,10 +427,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + @@ -482,10 +449,7 @@ true Console - - call ..\copydlls.bat $(Platform)\$(VldConfiguration) $(NumericPlatform) $(Outdir) - Copying over Visual Leak Detector Dependencies - + From 09e436e872d809652326fc524d52bc66384c426a Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 12:10:30 +0300 Subject: [PATCH 228/321] Fix warning C4996: 'strdup': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _strdup. --- src/tests/basics/Allocs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/basics/Allocs.cpp b/src/tests/basics/Allocs.cpp index 65bb09db..0989cad1 100644 --- a/src/tests/basics/Allocs.cpp +++ b/src/tests/basics/Allocs.cpp @@ -161,9 +161,9 @@ static void alloc(LeakOption type, bool bFree) } else if (type == eStrdup) { - leaked_memory = (int*)strdup("strdup() leaks!"); + leaked_memory = (int*)_strdup("_strdup() leaks!"); leaked_memory_dbg = (int*)_strdup_dbg("_strdup_dbg() leaks!", _NORMAL_BLOCK, __FILE__, __LINE__); - void* leaked_wmemory = (int*)wcsdup(L"wcsdup() leaks!"); + void* leaked_wmemory = (int*)_wcsdup(L"_wcsdup() leaks!"); void* leaked_wmemory_dbg = (int*)_wcsdup_dbg(L"_wcsdup_dbg() leaks!", _NORMAL_BLOCK, __FILE__, __LINE__); if (bFree) { From 2dd976e6183be14418c43b6ba85483839d0e7074 Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 12:18:40 +0300 Subject: [PATCH 229/321] Fix warning C28251: Inconsistent annotation for 'NTSTATUS': this instance has no annotations. Fix warning C28204: 'Alloc', 'DidAlloc', 'Free', 'GetSize', 'Realloc' : Only one of this override is annotated: both or neither must be annotated. --- src/ntapi.h | 4 ++-- src/vld_hooks.cpp | 10 +++++----- src/vldint.h | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ntapi.h b/src/ntapi.h index 54f82cbb..c00c4679 100644 --- a/src/ntapi.h +++ b/src/ntapi.h @@ -32,8 +32,8 @@ Applications should never include this header." #include // Return code type used by LdrLoadDll. -typedef LONG NTSTATUS; -#define STATUS_SUCCESS 0 +typedef __success(return >= 0) LONG NTSTATUS; +#define STATUS_SUCCESS 0 // Unicode string structure used by NT APIs. struct unicodestring_t { diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index ce540bde..6815ac55 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -2069,7 +2069,7 @@ ULONG VisualLeakDetector::AddRef () // // Returns the value returned by the system's IMalloc::Alloc implementation. // -LPVOID VisualLeakDetector::Alloc (SIZE_T size) +LPVOID VisualLeakDetector::Alloc (_In_ SIZE_T size) { #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); @@ -2108,7 +2108,7 @@ LPVOID VisualLeakDetector::Alloc (SIZE_T size) // Returns the value returned by the system implementation of // IMalloc::DidAlloc. // -INT VisualLeakDetector::DidAlloc (LPVOID mem) +INT VisualLeakDetector::DidAlloc (_In_opt_ LPVOID mem) { #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); @@ -2126,7 +2126,7 @@ INT VisualLeakDetector::DidAlloc (LPVOID mem) // // None. // -VOID VisualLeakDetector::Free (LPVOID mem) +VOID VisualLeakDetector::Free (_In_opt_ LPVOID mem) { #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); @@ -2145,7 +2145,7 @@ VOID VisualLeakDetector::Free (LPVOID mem) // Returns the value returned by the system implementation of // IMalloc::GetSize. // -SIZE_T VisualLeakDetector::GetSize (LPVOID mem) +SIZE_T VisualLeakDetector::GetSize (_In_opt_ LPVOID mem) { #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); @@ -2207,7 +2207,7 @@ HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) // Returns the value returned by the system implementation of // IMalloc::Realloc. // -LPVOID VisualLeakDetector::Realloc (LPVOID mem, SIZE_T size) +LPVOID VisualLeakDetector::Realloc (_In_opt_ LPVOID mem, _In_ SIZE_T size) { #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); diff --git a/src/vldint.h b/src/vldint.h index 43836d8f..e82ebb7a 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -261,13 +261,13 @@ class VisualLeakDetector : public IMalloc // Public IMalloc methods - for support of COM-based memory leak detection. //////////////////////////////////////////////////////////////////////////////// ULONG __stdcall AddRef (); - LPVOID __stdcall Alloc (SIZE_T size); - INT __stdcall DidAlloc (LPVOID mem); - VOID __stdcall Free (LPVOID mem); - SIZE_T __stdcall GetSize (LPVOID mem); + LPVOID __stdcall Alloc (_In_ SIZE_T size); + INT __stdcall DidAlloc (_In_opt_ LPVOID mem); + VOID __stdcall Free (_In_opt_ LPVOID mem); + SIZE_T __stdcall GetSize (_In_opt_ LPVOID mem); VOID __stdcall HeapMinimize (); HRESULT __stdcall QueryInterface (REFIID iid, LPVOID *object); - LPVOID __stdcall Realloc (LPVOID mem, SIZE_T size); + LPVOID __stdcall Realloc (_In_opt_ LPVOID mem, _In_ SIZE_T size); ULONG __stdcall Release (); void DisableLeakDetection (); From 7a1b4bb34be7122035302ca862a9ffc2f518e54e Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 12:23:07 +0300 Subject: [PATCH 230/321] Fix warning C28125: The function 'InitializeCriticalSection' must be called from within a try/except block: The requirement might be conditional. Fix 'CriticalSectionLocker' class implements the '=' operator, but lacks a copy constructor. --- src/criticalsection.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/criticalsection.h b/src/criticalsection.h index 2d722acc..f9a03828 100644 --- a/src/criticalsection.h +++ b/src/criticalsection.h @@ -9,8 +9,16 @@ class CriticalSection { public: - void Initialize() { m_critRegion.OwningThread = 0; InitializeCriticalSection(&m_critRegion); } - void Delete() { DeleteCriticalSection(&m_critRegion); } + void Initialize() + { + m_critRegion.OwningThread = 0; + __try { + InitializeCriticalSection(&m_critRegion); + } __except (GetExceptionCode() == STATUS_NO_MEMORY ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) { + assert(FALSE); + } + } + void Delete() { DeleteCriticalSection(&m_critRegion); } // enter the section void Enter() @@ -34,10 +42,10 @@ class CriticalSection } // try enter the section - bool TryEnter() { return (TryEnterCriticalSection(&m_critRegion) != 0); } + bool TryEnter() { return (TryEnterCriticalSection(&m_critRegion) != 0); } // leave the critical section - void Leave() { LeaveCriticalSection(&m_critRegion); } + void Leave() { LeaveCriticalSection(&m_critRegion); } private: CRITICAL_SECTION m_critRegion; @@ -73,6 +81,7 @@ class CriticalSectionLocker } } CriticalSectionLocker(); // not allowed + CriticalSectionLocker( const CriticalSectionLocker & ); // not allowed CriticalSectionLocker & operator=( const CriticalSectionLocker & ); // not allowed bool m_leave; CriticalSection& m_critSect; From 035d746aecf1a97a5e771ca5dc6aa2f8d26e0918 Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 12:25:24 +0300 Subject: [PATCH 231/321] Fix warning C6102: Using 'protect' from failed function call --- src/utility.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/utility.cpp b/src/utility.cpp index ba58210a..055dab2b 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -589,9 +589,10 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *patchModule) *patchEntry->original = func; DWORD protect; - VirtualProtect(&thunk->u1.Function, sizeof(thunk->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - thunk->u1.Function = (DWORD_PTR)replacement; - VirtualProtect(&thunk->u1.Function, sizeof(thunk->u1.Function), protect, &protect); + if (VirtualProtect(&thunk->u1.Function, sizeof(thunk->u1.Function), PAGE_EXECUTE_READWRITE, &protect)) { + thunk->u1.Function = (DWORD_PTR)replacement; + VirtualProtect(&thunk->u1.Function, sizeof(thunk->u1.Function), protect, &protect); + } } // The patch has been installed in the import module. result++; @@ -885,9 +886,10 @@ VOID RestoreImport (HMODULE importmodule, moduleentry_t* module) // entry with the import's real address. Note that the IAT entry may // be write-protected, so we must first ensure that it is writable. DWORD protect; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect); - iate->u1.Function = (DWORD_PTR)original; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + if (VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect)) { + iate->u1.Function = (DWORD_PTR)original; + VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + } } result++; iate++; From f5527a616dca4e09567dc1046a45def5b66e9d57 Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 12:27:51 +0300 Subject: [PATCH 232/321] Fix warning C6001: Using uninitialized memory 'mem'. --- src/vld_hooks.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 6815ac55..5bb9ce4e 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -1750,10 +1750,9 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); #endif - LPVOID newmem; // Reallocate the block. - newmem = RtlReAllocateHeap(heap, flags, mem, size); + LPVOID newmem = RtlReAllocateHeap(heap, flags, mem, size); if ((newmem == NULL) || !g_vld.enabled()) return newmem; @@ -1802,10 +1801,9 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); #endif - LPVOID newmem; // Reallocate the block. - newmem = HeapReAlloc(heap, flags, mem, size); + LPVOID newmem = HeapReAlloc(heap, flags, mem, size); if ((newmem == NULL) || !g_vld.enabled()) return newmem; From 4c336c94061b6a6b3bace704708b9e1f4b98b09e Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 12:30:40 +0300 Subject: [PATCH 233/321] Fix warning C6387: 'm_reportFile' could be '0': this does not adhere to the specification for the function 'fwrite'. --- src/vld.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index dc51b4d8..e432ddaa 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -2389,8 +2389,10 @@ void VisualLeakDetector::setupReporting() WCHAR bom = BOM; // Unicode byte-order mark. //Close the previous report file if needed. - if ( m_reportFile ) + if (m_reportFile) { fclose(m_reportFile); + m_reportFile = NULL; + } // Reporting to file enabled. if (m_options & VLD_OPT_UNICODE_REPORT) { @@ -2401,7 +2403,7 @@ void VisualLeakDetector::setupReporting() // Couldn't open the file. m_reportFile = NULL; } - else { + else if (m_reportFile) { fwrite(&bom, sizeof(WCHAR), 1, m_reportFile); SetReportEncoding(unicode); } @@ -2412,7 +2414,7 @@ void VisualLeakDetector::setupReporting() // Couldn't open the file. m_reportFile = NULL; } - else { + else if (m_reportFile) { SetReportEncoding(ascii); } } From ed9543080d988c653f6851388657ea1fe2f32311 Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 12:36:52 +0300 Subject: [PATCH 234/321] Fix 'Tree' class implements a copy constructor, but lacks the '=' operator. --- src/tree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tree.h b/src/tree.h index 3514ccbf..c17a5f30 100644 --- a/src/tree.h +++ b/src/tree.h @@ -98,7 +98,7 @@ class Tree // Copy constructor - The sole purpose of this constructor's existence is // to ensure that trees are not being inadvertently copied. - Tree (const Tree& source) + Tree (const Tree& source) { assert(FALSE); // Do not make copies of trees! } From ceb1af9d7b99ff777695133e12d7d7c4bae89cc6 Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 12:42:51 +0300 Subject: [PATCH 235/321] Make comparisons to TRUE implicit to silence static analyser warnings --- src/tests/suite/testsuite.cpp | 6 +++--- src/utility.cpp | 6 +++--- src/vld.cpp | 18 +++++++++--------- src/vldheap.cpp | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/tests/suite/testsuite.cpp b/src/tests/suite/testsuite.cpp index d1f325a3..3017eae9 100644 --- a/src/tests/suite/testsuite.cpp +++ b/src/tests/suite/testsuite.cpp @@ -308,7 +308,7 @@ unsigned __stdcall threadproc_test (LPVOID param) srand(context->seed); BOOL allocate_more = TRUE; - while (allocate_more == TRUE) { + while (allocate_more) { // Select a random allocation action and a random size. action_e action = (action_e)random(numactions - 1); SIZE_T size = random(MAXSIZE); @@ -346,7 +346,7 @@ unsigned __stdcall threadproc_test (LPVOID param) } } - if (context->leaky == TRUE) { + if (context->leaky) { // This is the leaky thread. Randomly select one block to be leaked from // each type of allocation action. for (USHORT action_index = 0; action_index < numactions; action_index++) { @@ -371,7 +371,7 @@ unsigned __stdcall threadproc_test (LPVOID param) } // Do a sanity check. - if (context->leaky == TRUE) { + if (context->leaky) { assert(total_allocs == (numactions * (1 + NUMDUPLEAKS))); } else { diff --git a/src/utility.cpp b/src/utility.cpp index 055dab2b..915cada3 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -420,7 +420,7 @@ BOOL IsModulePatched (HMODULE importmodule, moduleentry_t patchtable [], UINT ta for (UINT index = 0; index < tablesize; index++) { moduleentry_t *entry = &patchtable[index]; found = FindPatch(importmodule, entry); - if (found == TRUE) { + if (found) { // Found one of the listed patches installed in the import module. return TRUE; } @@ -681,7 +681,7 @@ BOOL PatchModule (HMODULE importmodule, moduleentry_t patchtable [], UINT tables DbgTrace(L"dbghelp32.dll %i: PatchModule - ImageDirectoryEntryToDataEx\n", GetCurrentThreadId()); for (index = 0; index < tablesize; index++) { entry = &patchtable[index]; - if (PatchImport(importmodule, entry) == TRUE) { + if (PatchImport(importmodule, entry)) { patched = TRUE; } } @@ -757,7 +757,7 @@ VOID Print (LPWSTR messagew) else if (hook_retval == 1) __debugbreak(); - if (s_reportToDebugger && (s_reportDelay == TRUE)) { + if (s_reportToDebugger && (s_reportDelay)) { Sleep(10); // Workaround the Visual Studio 6 bug where debug strings are sometimes lost if they're sent too fast. } } diff --git a/src/vld.cpp b/src/vld.cpp index e432ddaa..1b99dc8e 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -81,7 +81,7 @@ bool IsWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wSer osvi.dwMinorVersion = wMinorVersion; osvi.wServicePackMajor = wServicePackMajor; - return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE; + return !!VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask); } bool IsWindows7OrGreater() @@ -432,7 +432,7 @@ VisualLeakDetector::~VisualLeakDetector () } delete m_tlsMap; - if (threadsactive == TRUE) { + if (threadsactive) { Report(L"WARNING: Visual Leak Detector: Some threads appear to have not terminated normally.\n" L" This could cause inaccurate leak detection results, including false positives.\n"); } @@ -840,27 +840,27 @@ VOID VisualLeakDetector::configure () return; } - if (LoadBoolOption(L"AggregateDuplicates", L"", inipath) == TRUE) { + if (LoadBoolOption(L"AggregateDuplicates", L"", inipath)) { m_options |= VLD_OPT_AGGREGATE_DUPLICATES; } - if (LoadBoolOption(L"SelfTest", L"", inipath) == TRUE) { + if (LoadBoolOption(L"SelfTest", L"", inipath)) { m_options |= VLD_OPT_SELF_TEST; } - if (LoadBoolOption(L"SlowDebuggerDump", L"", inipath) == TRUE) { + if (LoadBoolOption(L"SlowDebuggerDump", L"", inipath)) { m_options |= VLD_OPT_SLOW_DEBUGGER_DUMP; } - if (LoadBoolOption(L"StartDisabled", L"", inipath) == TRUE) { + if (LoadBoolOption(L"StartDisabled", L"", inipath)) { m_options |= VLD_OPT_START_DISABLED; } - if (LoadBoolOption(L"TraceInternalFrames", L"", inipath) == TRUE) { + if (LoadBoolOption(L"TraceInternalFrames", L"", inipath)) { m_options |= VLD_OPT_TRACE_INTERNAL_FRAMES; } - if (LoadBoolOption(L"SkipHeapFreeLeaks", L"", inipath) == TRUE) { + if (LoadBoolOption(L"SkipHeapFreeLeaks", L"", inipath)) { m_options |= VLD_OPT_SKIP_HEAPFREE_LEAKS; } @@ -921,7 +921,7 @@ VOID VisualLeakDetector::configure () m_options |= VLD_OPT_SAFE_STACK_WALK; } - if (LoadBoolOption(L"ValidateHeapAllocs", L"", inipath) == TRUE) { + if (LoadBoolOption(L"ValidateHeapAllocs", L"", inipath)) { m_options |= VLD_OPT_VALIDATE_HEAPFREE; } } diff --git a/src/vldheap.cpp b/src/vldheap.cpp index fe280db5..7615cfc2 100644 --- a/src/vldheap.cpp +++ b/src/vldheap.cpp @@ -213,5 +213,5 @@ void vlddelete (void *block) // Free the block. freed = RtlFreeHeap(g_vldHeap, 0x0, header); - assert(freed != FALSE); + assert(freed); } From da7e41a84d02c7ba553f833059cc86a28eafa0cc Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 12:45:53 +0300 Subject: [PATCH 236/321] Fix array 'ntdllPatch' being utilized as a pointer to single object. --- src/vld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vld.cpp b/src/vld.cpp index 1b99dc8e..0eeaab51 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -241,7 +241,7 @@ VisualLeakDetector::VisualLeakDetector () } delete [] symbolpath; - ntdllPatch->moduleBase = (UINT_PTR)ntdll; + ntdllPatch[0].moduleBase = (UINT_PTR)ntdll; PatchImport(kernel32, ntdllPatch); if (kernelBase != NULL) PatchImport(kernelBase, ntdllPatch); From 6b70d65ddb4fc8cae7f0997151a3dcd6758ef0b6 Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 12:54:44 +0300 Subject: [PATCH 237/321] Fix the destructor was not declared as a virtual one, although the 'CallStack' class contains virtual functions. Fix verifying that a pointer value is not NULL is not required. The 'if (m_resolved)' check can be removed. Fix 'm_resolved' pointer was utilized before it was verified against nullptr. --- src/callstack.cpp | 22 +++++++++++----------- src/callstack.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index 33eabe6e..d020fd2d 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -65,10 +65,7 @@ CallStack::~CallStack () delete temp; } - if (m_resolved) - { - delete [] m_resolved; - } + delete [] m_resolved; m_resolved = NULL; m_resolvedCapacity = 0; @@ -389,9 +386,11 @@ int CallStack::resolve(BOOL showInternalFrames) const size_t max_line_length = MAXREPORTLENGTH + 1; m_resolvedCapacity = m_size * max_line_length; - m_resolved = new WCHAR[m_resolvedCapacity]; const size_t allocedBytes = m_resolvedCapacity * sizeof(WCHAR); - ZeroMemory(m_resolved, allocedBytes); + m_resolved = new WCHAR[m_resolvedCapacity]; + if (m_resolved) { + ZeroMemory(m_resolved, allocedBytes); + } // Iterate through each frame in the call stack. for (UINT32 frame = 0; frame < m_size; frame++) @@ -407,7 +406,6 @@ int CallStack::resolve(BOOL showInternalFrames) // When that happens there is nothing we can do except crash. DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); BOOL foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); - assert(m_resolved != NULL); bool isFrameInternal = false; if (foundline && !showInternalFrames) { @@ -421,9 +419,10 @@ int CallStack::resolve(BOOL showInternalFrames) // show one allocation function for context if (NumChars >= 0 && !isFrameInternal && isPrevFrameInternal) { - assert(m_resolved != NULL); m_resolvedLength += NumChars; - wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); + if (m_resolved) { + wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); + } } isPrevFrameInternal = isFrameInternal; @@ -439,9 +438,10 @@ int CallStack::resolve(BOOL showInternalFrames) displacement, functionName, stack_line, _countof( stack_line )); if (NumChars >= 0 && !isFrameInternal) { - assert(m_resolved != NULL); m_resolvedLength += NumChars; - wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); + if (m_resolved) { + wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); + } } } // end for loop return unresolvedFunctionsCount; diff --git a/src/callstack.h b/src/callstack.h index 0a9d593d..772502c9 100644 --- a/src/callstack.h +++ b/src/callstack.h @@ -79,7 +79,7 @@ class CallStack { public: CallStack (); - ~CallStack (); + virtual ~CallStack (); static CallStack* Create(); // Public APIs - see each function definition for details. VOID clear (); From 61c62532d915b5614eec23f6d8d9ae9a1f4e700b Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 13:09:13 +0300 Subject: [PATCH 238/321] Append Visual Studio 2015/2013/2012/2010/2008 symbols cache directory. Remove windows and system directories from symbols path. Compare for duplicates before adding to symbols path. --- src/vld.cpp | 83 ++++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 46 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index 0eeaab51..c2cad2f9 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -674,7 +674,7 @@ LPWSTR VisualLeakDetector::buildSymbolSearchPath () // to the search path since that is often where the PDB will be located. WCHAR directory [_MAX_DIR] = {0}; WCHAR drive [_MAX_DRIVE] = {0}; - LPWSTR path = new WCHAR [MAX_PATH]; + LPWSTR path = new WCHAR [MAX_PATH * 4]; path[0] = L'\0'; HMODULE module = GetModuleHandleW(NULL); @@ -682,36 +682,23 @@ LPWSTR VisualLeakDetector::buildSymbolSearchPath () _wsplitpath_s(path, drive, _MAX_DRIVE, directory, _MAX_DIR, NULL, 0, NULL, 0); wcsncpy_s(path, MAX_PATH, drive, _TRUNCATE); path = AppendString(path, directory); + path = AppendString(path, L";"); // When the symbol handler is given a custom symbol search path, it will no - // longer search the default directories (working directory, system root, - // etc). But we'd like it to still search those directories, so we'll add + // longer search the default directories (working directory, _NT_SYMBOL_PATH, + // etc...). But we'd like it to still search those directories, so we'll add // them to our custom search path. - // - // Append the working directory. - path = AppendString(path, L";.\\"); - - // Append the Windows directory. - WCHAR windows [MAX_PATH] = {0}; - if (GetWindowsDirectory(windows, MAX_PATH) != 0) { - path = AppendString(path, L";"); - path = AppendString(path, windows); - } - // Append the system directory. - WCHAR system [MAX_PATH] = {0}; - if (GetSystemDirectory(system, MAX_PATH) != 0) { - path = AppendString(path, L";"); - path = AppendString(path, system); - } + // Append the working directory. + path = AppendString(path, L".\\;"); // Append %_NT_SYMBOL_PATH%. DWORD envlen = GetEnvironmentVariable(L"_NT_SYMBOL_PATH", NULL, 0); if (envlen != 0) { LPWSTR env = new WCHAR [envlen]; if (GetEnvironmentVariable(L"_NT_SYMBOL_PATH", env, envlen) != 0) { - path = AppendString(path, L";"); path = AppendString(path, env); + path = AppendString(path, L";"); } delete [] env; } @@ -721,8 +708,19 @@ LPWSTR VisualLeakDetector::buildSymbolSearchPath () if (envlen != 0) { LPWSTR env = new WCHAR [envlen]; if (GetEnvironmentVariable(L"_NT_ALT_SYMBOL_PATH", env, envlen) != 0) { + path = AppendString(path, env); path = AppendString(path, L";"); + } + delete [] env; + } + + // Append %_NT_ALTERNATE_SYMBOL_PATH%. + envlen = GetEnvironmentVariable(L"_NT_ALTERNATE_SYMBOL_PATH", NULL, 0); + if (envlen != 0) { + LPWSTR env = new WCHAR [envlen]; + if (GetEnvironmentVariable(L"_NT_ALTERNATE_SYMBOL_PATH", env, envlen) != 0) { path = AppendString(path, env); + path = AppendString(path, L";"); } delete [] env; } @@ -730,33 +728,26 @@ LPWSTR VisualLeakDetector::buildSymbolSearchPath () #if _MSC_VER > 1900 #error Not supported VS #endif - // Append Visual Studio symbols cache directory. - HKEY debuggerkey; - WCHAR symbolCacheDir [MAX_PATH] = {0}; - // VS2015 - LSTATUS regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\14.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); - if (regstatus != ERROR_SUCCESS) // VS2013 - regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\12.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); - if (regstatus != ERROR_SUCCESS) // VS2012 - regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\11.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); - if (regstatus != ERROR_SUCCESS) // VS2010 - regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\10.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); - if (regstatus != ERROR_SUCCESS) // VS2008 - regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\Microsoft\\VisualStudio\\9.0\\Debugger", 0, KEY_QUERY_VALUE, &debuggerkey); - - if (regstatus == ERROR_SUCCESS) - { - DWORD valuetype; - DWORD dirLength = MAX_PATH * sizeof(WCHAR); - regstatus = RegQueryValueEx(debuggerkey, L"SymbolCacheDir", NULL, &valuetype, (LPBYTE)&symbolCacheDir, &dirLength); - if (regstatus == ERROR_SUCCESS && valuetype == REG_SZ) - { - path = AppendString(path, L";"); - path = AppendString(path, symbolCacheDir); - path = AppendString(path, L"\\MicrosoftPublicSymbols;"); - path = AppendString(path, symbolCacheDir); + // Append Visual Studio 2015/2013/2012/2010/2008 symbols cache directory. + for (UINT n = 9; n <= 14; ++n) { + WCHAR debuggerpath[MAX_PATH] = { 0 }; + swprintf(debuggerpath, _countof(debuggerpath), L"Software\\Microsoft\\VisualStudio\\%u.0\\Debugger", n); + HKEY debuggerkey; + WCHAR symbolCacheDir[MAX_PATH] = { 0 }; + LSTATUS regstatus = RegOpenKeyExW(HKEY_CURRENT_USER, debuggerpath, 0, KEY_QUERY_VALUE, &debuggerkey); + + if (regstatus == ERROR_SUCCESS) { + DWORD valuetype; + DWORD dirLength = MAX_PATH * sizeof(WCHAR); + regstatus = RegQueryValueExW(debuggerkey, L"SymbolCacheDir", NULL, &valuetype, (LPBYTE)&symbolCacheDir, &dirLength); + if (regstatus == ERROR_SUCCESS && valuetype == REG_SZ && symbolCacheDir[0] != NULL && !wcsstr(path, symbolCacheDir)) { + path = AppendString(path, symbolCacheDir); + path = AppendString(path, L"\\MicrosoftPublicSymbols;"); + path = AppendString(path, symbolCacheDir); + path = AppendString(path, L";"); + } + RegCloseKey(debuggerkey); } - RegCloseKey(debuggerkey); } // Remove any quotes from the path. The symbol handler doesn't like them. From 38fc29a9abb9e7776ee72c4e7207604a49141892 Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 13:24:50 +0300 Subject: [PATCH 239/321] Optimize _GetProcAddress to properly test for ordinal vs function name --- src/vld.cpp | 65 ++++++++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index c2cad2f9..66b39af0 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -1756,57 +1756,46 @@ BOOL VisualLeakDetector::detachFromModule (PCWSTR /*modulepath*/, DWORD64 module // FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) { - // See if there is an entry in the patch table that matches the requested - // function. - UINT tablesize = _countof(g_vld.m_patchTable); - for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &g_vld.m_patchTable[index]; - if ((entry->moduleBase == 0x0) || ((HMODULE)entry->moduleBase != module)) { - // This patch table entry is for a different module. - continue; - } - - patchentry_t *patchentry = entry->patchTable; - while(patchentry->importName) - { - // This patch table entry is for the specified module. If the requested - // imports name matches the entry's import name (or ordinal), then - // return the address of the replacement instead of the address of the - // actual import. - if ((SIZE_T)patchentry->importName < (SIZE_T)g_vld.m_vldBase) { - // This entry's import name is not a valid pointer to data in - // vld.dll. It must be an ordinal value. - if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { - if (patchentry->original != NULL) - *patchentry->original = g_vld._RGetProcAddress(module, procname); - return (FARPROC)patchentry->replacement; - } + FARPROC original = g_vld._RGetProcAddress(module, procname); + if (original) { + // See if there is an entry in the patch table that matches the requested + // function. + UINT tablesize = _countof(g_vld.m_patchTable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &g_vld.m_patchTable[index]; + if ((entry->moduleBase == 0x0) || ((HMODULE)entry->moduleBase != module)) { + // This patch table entry is for a different module. + continue; } - else { - __try - { - if (strcmp(patchentry->importName, procname) == 0) { + + patchentry_t *patchentry = entry->patchTable; + while (patchentry->importName) { + // This patch table entry is for the specified module. If the requested + // imports name matches the entry's import name (or ordinal), then + // return the address of the replacement instead of the address of the + // actual import. + if (HIWORD(patchentry->importName) == 0) { + // Import name is a function ordinal value. + if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { if (patchentry->original != NULL) - *patchentry->original = g_vld._RGetProcAddress(module, procname); + *patchentry->original = original; return (FARPROC)patchentry->replacement; } - } - __except(FilterFunction(GetExceptionCode())) - { - if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { + } else { + // Import name is a function name value. + if (strcmp(patchentry->importName, procname) == 0) { if (patchentry->original != NULL) - *patchentry->original = g_vld._RGetProcAddress(module, procname); + *patchentry->original = original; return (FARPROC)patchentry->replacement; } } + patchentry++; } - patchentry++; } } - // The requested function is not a patched function. Just return the real // address of the requested function. - return g_vld._RGetProcAddress(module, procname); + return original; } FARPROC VisualLeakDetector::_RGetProcAddress(HMODULE module, LPCSTR procname) From 32521bdd4b1586bf4e11d4eeb435a59a43e99d2a Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 14:45:38 +0300 Subject: [PATCH 240/321] Optimize _GetProcAddressForCaller to properly test for ordinal vs function name --- src/vld.cpp | 88 ++++++++++++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 49 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index 66b39af0..60db86e8 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -1824,57 +1824,47 @@ FARPROC VisualLeakDetector::_RGetProcAddress(HMODULE module, LPCSTR procname) // FARPROC VisualLeakDetector::_GetProcAddressForCaller(HMODULE module, LPCSTR procname, LPVOID caller) { - // See if there is an entry in the patch table that matches the requested - // function. - UINT tablesize = _countof(g_vld.m_patchTable); - for (UINT index = 0; index < tablesize; index++) { - moduleentry_t *entry = &g_vld.m_patchTable[index]; - if ((entry->moduleBase == 0x0) || ((HMODULE)entry->moduleBase != module)) { - // This patch table entry is for a different module. - continue; - } + FARPROC original = g_vld._RGetProcAddressForCaller(module, procname, caller); + if (original) { + // See if there is an entry in the patch table that matches the requested + // function. + UINT tablesize = _countof(g_vld.m_patchTable); + for (UINT index = 0; index < tablesize; index++) { + moduleentry_t *entry = &g_vld.m_patchTable[index]; + if ((entry->moduleBase == 0x0) || ((HMODULE)entry->moduleBase != module)) { + // This patch table entry is for a different module. + continue; + } - patchentry_t *patchentry = entry->patchTable; - while (patchentry->importName) - { - // This patch table entry is for the specified module. If the requested - // imports name matches the entry's import name (or ordinal), then - // return the address of the replacement instead of the address of the - // actual import. - if ((SIZE_T)patchentry->importName < (SIZE_T)g_vld.m_vldBase) { - // This entry's import name is not a valid pointer to data in - // vld.dll. It must be an ordinal value. - if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { - if (patchentry->original != NULL) - *patchentry->original = g_vld._RGetProcAddress(module, procname); - return (FARPROC)patchentry->replacement; - } - } - else { - __try - { - if (strcmp(patchentry->importName, procname) == 0) { - if (patchentry->original != NULL) - *patchentry->original = g_vld._RGetProcAddress(module, procname); - return (FARPROC)patchentry->replacement; - } - } - __except (FilterFunction(GetExceptionCode())) - { - if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { - if (patchentry->original != NULL) - *patchentry->original = g_vld._RGetProcAddress(module, procname); - return (FARPROC)patchentry->replacement; - } - } - } - patchentry++; - } - } + patchentry_t *patchentry = entry->patchTable; + while (patchentry->importName) { + // This patch table entry is for the specified module. If the requested + // imports name matches the entry's import name (or ordinal), then + // return the address of the replacement instead of the address of the + // actual import. + if (HIWORD(patchentry->importName) == 0) { + // Import name is a function ordinal value. + if ((UINT_PTR)patchentry->importName == (UINT_PTR)procname) { + if (patchentry->original != NULL) + *patchentry->original = original; + return (FARPROC)patchentry->replacement; + } + } else { + // Import name is a function name value. + if (strcmp(patchentry->importName, procname) == 0) { + if (patchentry->original != NULL) + *patchentry->original = original; + return (FARPROC)patchentry->replacement; + } + } + patchentry++; + } + } + } - // The requested function is not a patched function. Just return the real - // address of the requested function. - return g_vld._RGetProcAddressForCaller(module, procname, caller); + // The requested function is not a patched function. Just return the real + // address of the requested function. + return original; } FARPROC VisualLeakDetector::_RGetProcAddressForCaller(HMODULE module, LPCSTR procname, LPVOID caller) From 5eda808f86a7a353138925ef3c1fc649a4ab2f9f Mon Sep 17 00:00:00 2001 From: ioannis Date: Sun, 13 Sep 2015 12:01:14 +0300 Subject: [PATCH 241/321] Save IniFile path in registry for both HKLM32 and HKLM64 as the registry key is being redirected during setup. Allow loading of vld.ini from the following locations in order: - current directory - directory where VLDDLL resides - directory where executable resides - path specified in registry HKCU - path specified in registry HKLM --- setup/vld-setup.iss | 13 +++-- src/vld.cpp | 114 ++++++++++++++++++++++++++++++-------------- src/vldint.h | 1 + 3 files changed, 87 insertions(+), 41 deletions(-) diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index 6e420768..d0f82d38 100644 --- a/setup/vld-setup.iss +++ b/setup/vld-setup.iss @@ -92,10 +92,15 @@ Name: "modifyVS2010Props"; Description: "Add VLD directory to VS 2010 - VS 2013" UseRelativePaths=True [Registry] -Root: "HKLM"; Subkey: "{#MyAppRegKey}"; Flags: uninsdeletekeyifempty -Root: "HKLM"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "InstalledVersion"; ValueData: "{#MyAppVersion}" -Root: "HKLM"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}" -Root: "HKLM"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "IniFile"; ValueData: "{app}\vld.ini" +Root: "HKLM32"; Subkey: "{#MyAppRegKey}"; Flags: uninsdeletekeyifempty +Root: "HKLM32"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "InstalledVersion"; ValueData: "{#MyAppVersion}" +Root: "HKLM32"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}" +Root: "HKLM32"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "IniFile"; ValueData: "{app}\vld.ini" + +Root: "HKLM64"; Subkey: "{#MyAppRegKey}"; Flags: uninsdeletekeyifempty +Root: "HKLM64"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "InstalledVersion"; ValueData: "{#MyAppVersion}" +Root: "HKLM64"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}" +Root: "HKLM64"; Subkey: "{#MyAppRegKey}"; ValueType: string; ValueName: "IniFile"; ValueData: "{app}\vld.ini" [Code] type diff --git a/src/vld.cpp b/src/vld.cpp index 60db86e8..a40f6364 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -35,6 +35,7 @@ #include "set.h" // Provides a lightweight STL-like set template. #include "utility.h" // Provides various utility functions. #include "vldint.h" // Provides access to the Visual Leak Detector internals. +#include "tchar.h" #define BLOCK_MAP_RESERVE 64 // This should strike a balance between memory use and a desire to minimize heap hits. #define HEAP_MAP_RESERVE 2 // Usually there won't be more than a few heaps in the process, so this should be small. @@ -765,58 +766,97 @@ LPWSTR VisualLeakDetector::buildSymbolSearchPath () return path; } -// configure - Configures VLD using values read from the vld.ini file. +// GetIniFilePath - Obtains vld.ini file path. // // Return Value: // -// None. +// Returns true if an actual vld.ini file was found +// Otherwise, returns false. // -VOID VisualLeakDetector::configure () +BOOL VisualLeakDetector::GetIniFilePath(LPTSTR lpPath, SIZE_T cchPath) { - WCHAR inipath [MAX_PATH] = {0}; + TCHAR path[MAX_PATH] = {0}; struct _stat s; - if (_wstat(L".\\vld.ini", &s) == 0) { - // Found a copy of vld.ini in the working directory. Use it. - wcsncpy_s(inipath, MAX_PATH, L".\\vld.ini", _TRUNCATE); + DWORD written = 0; + + // Get the location of the vld.ini file from current directory path. + if (0 < (written = GetCurrentDirectory(MAX_PATH, path))) { + _tcsncpy_s(&path[written], MAX_PATH - written, TEXT("\\vld.ini"), _TRUNCATE); + if (_tstat(path, &s) == 0) { + _tcsncpy_s(lpPath, cchPath, path, _TRUNCATE); + return TRUE; + } } - else { - BOOL keyopen = FALSE; - HKEY productkey = 0; - DWORD length = 0; - DWORD valuetype = 0; - // Get the location of the vld.ini file from the registry. - LONG regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); - if (regstatus == ERROR_SUCCESS) { - keyopen = TRUE; - length = MAX_PATH * sizeof(WCHAR); - regstatus = RegQueryValueExW(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); - } - if (keyopen) { - RegCloseKey(productkey); + // Get the location of the vld.ini file from VLDDLL file path. + HMODULE hModule = GetCallingModule((UINT_PTR)this); + if (0 < (written = GetModuleFileName(hModule, path, MAX_PATH))) { + LPTSTR p = _tcsrchr(path, TEXT('\\')); + written = (DWORD)(p - path); + if (p && 0 == _tcsncpy_s(p, MAX_PATH - written, TEXT("\\vld.ini"), _TRUNCATE)) { + if (_tstat(path, &s) == 0) { + _tcsncpy_s(lpPath, cchPath, path, _TRUNCATE); + return TRUE; + } } + } - if (!keyopen) - { - // Get the location of the vld.ini file from the registry. - regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); - if (regstatus == ERROR_SUCCESS) { - keyopen = TRUE; - length = MAX_PATH * sizeof(WCHAR); - regstatus = RegQueryValueEx(productkey, L"IniFile", NULL, &valuetype, (LPBYTE)&inipath, &length); - } - if (keyopen) { - RegCloseKey(productkey); + // Get the location of the vld.ini file from executable file path. + if (0 < (written = GetModuleFileName(NULL, path, MAX_PATH))) { + LPTSTR p = _tcsrchr(path, TEXT('\\')); + written = (DWORD)(p - path); + if (p && 0 == _tcsncpy_s(p, MAX_PATH - written, TEXT("\\vld.ini"), _TRUNCATE)) { + if (_tstat(path, &s) == 0) { + _tcsncpy_s(lpPath, cchPath, path, _TRUNCATE); + return TRUE; } } + } + + HKEY productkey = 0; + DWORD length = 0; + DWORD valuetype = 0; - if ((regstatus != ERROR_SUCCESS) || (_wstat(inipath, &s) != 0)) { - // The location of vld.ini could not be read from the registry. As a - // last resort, look in the Windows directory. - wcsncpy_s(inipath, MAX_PATH, L"vld.ini", _TRUNCATE); + // Get the location of the vld.ini file from the registry. + LONG regstatus = RegOpenKeyEx(HKEY_CURRENT_USER, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + if (regstatus == ERROR_SUCCESS) { + length = MAX_PATH * sizeof(TCHAR); + regstatus = RegQueryValueEx(productkey, TEXT("IniFile"), NULL, &valuetype, (LPBYTE)&path, &length); + RegCloseKey(productkey); + if (regstatus == ERROR_SUCCESS && (_tstat(path, &s) == 0)) { + _tcsncpy_s(lpPath, cchPath, path, _TRUNCATE); + return TRUE; } } - DbgReport(L"Visual Leak Detector read settings from file: %s\n", inipath); + + // Get the location of the vld.ini file from the registry. + regstatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, VLDREGKEYPRODUCT, 0, KEY_QUERY_VALUE, &productkey); + if (regstatus == ERROR_SUCCESS) { + length = MAX_PATH * sizeof(TCHAR); + regstatus = RegQueryValueEx(productkey, TEXT("IniFile"), NULL, &valuetype, (LPBYTE)&path, &length); + RegCloseKey(productkey); + if (regstatus == ERROR_SUCCESS && (_tstat(path, &s) == 0)) { + _tcsncpy_s(lpPath, cchPath, path, _TRUNCATE); + return TRUE; + } + } + + _tcsncpy_s(lpPath, cchPath, TEXT("vld.ini"), _TRUNCATE); + return FALSE; +} + +// configure - Configures VLD using values read from the vld.ini file. +// +// Return Value: +// +// None. +// +VOID VisualLeakDetector::configure () +{ + TCHAR inipath [MAX_PATH] = {0}; + BOOL found = GetIniFilePath(inipath, _countof(inipath)); + + Report(L"Visual Leak Detector read settings from: %s\n", found ? inipath : L"(default settings)"); // Read the boolean options. const UINT buffersize = 64; diff --git a/src/vldint.h b/src/vldint.h index e82ebb7a..0045ed5f 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -308,6 +308,7 @@ class VisualLeakDetector : public IMalloc VOID attachToLoadedModules (ModuleSet *newmodules); UINT32 getModuleState(ModuleSet::Iterator& it, UINT32 &moduleFlags); LPWSTR buildSymbolSearchPath(); + BOOL GetIniFilePath(LPTSTR lpPath, SIZE_T cchPath); VOID configure (); BOOL enabled (); SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); From 13a646f9f04884793a56dab26cfe54a6c3832234 Mon Sep 17 00:00:00 2001 From: ioannis Date: Mon, 7 Sep 2015 05:09:39 +0300 Subject: [PATCH 242/321] Improvements to vld tests Mark all previous memory leaks as reported which are not part of the current test. --- src/runalltests.bat | 15 ++++++++++++ src/runtests.bat | 35 ++++++++++++++++++++------- src/tests/basics/basics.cpp | 13 +++++----- src/tests/corruption/corruption.cpp | 13 ++++++++-- src/tests/dynamic_app/LoadTests.cpp | 5 ++-- src/tests/dynamic_app/ThreadTest.cpp | 8 +++--- src/tests/dynamic_app/dynamic_app.cpp | 33 ++++++++++++------------- src/tests/mfc_dll/mfc.cpp | 4 +-- src/tests/suite/testsuite.cpp | 7 +++--- 9 files changed, 86 insertions(+), 47 deletions(-) create mode 100644 src/runalltests.bat diff --git a/src/runalltests.bat b/src/runalltests.bat new file mode 100644 index 00000000..6528efdc --- /dev/null +++ b/src/runalltests.bat @@ -0,0 +1,15 @@ +@ECHO OFF +CLS +CMD /C "runtests Win32 Release-%1" +CMD /C "runtests Win32 Release_StaticCrt-%1" +CMD /C "runtests Win32 Debug-%1" +CMD /C "runtests Win32 Debug_StaticCrt-%1" +CMD /C "runtests Win32 Debug(Release)-%1" +CMD /C "runtests Win32 Debug(Release)_StaticCrt-%1" + +CMD /C "runtests x64 Release-%1" +CMD /C "runtests x64 Release_StaticCrt-%1" +CMD /C "runtests x64 Debug-%1" +CMD /C "runtests x64 Debug_StaticCrt-%1" +CMD /C "runtests x64 Debug(Release)-%1" +CMD /C "runtests x64 Debug(Release)_StaticCrt-%1" diff --git a/src/runtests.bat b/src/runtests.bat index 14a20f40..4b219191 100644 --- a/src/runtests.bat +++ b/src/runtests.bat @@ -1,13 +1,30 @@ -rem @echo off -setlocal enabledelayedexpansion -set tests_path=%~dp0\bin\%1\%~2 -echo %tests_path% -if not exist !tests_path!\ goto nodir +@ECHO OFF +SETLOCAL ENABLEDELAYEDEXPANSION + +SET tests_path=%~dp0\bin\%1\%~2 +IF NOT EXIST "!tests_path!\" GOTO nodir + +CD %~dp0\bin + +ECHO ------------------------------------------------------------------------------- +ECHO [ RUNNING ] %tests_path%\test_basics.exe +ECHO ------------------------------------------------------------------------------- !tests_path!\test_basics.exe --gtest_output="xml:!tests_path!\test_basics.exe.xml" +ECHO ------------------------------------------------------------------------------- +ECHO [ RUNNING ] %tests_path%\dynamic_app.exe +ECHO ------------------------------------------------------------------------------- !tests_path!\dynamic_app.exe --gtest_output="xml:!tests_path!\dynamic_app.exe.xml" +ECHO ------------------------------------------------------------------------------- +ECHO [ RUNNING ] %tests_path%\testsuite.exe +ECHO ------------------------------------------------------------------------------- !tests_path!\testsuite.exe --gtest_output="xml:!tests_path!\testsuite.exe.xml" -exit /b 0 -:nodir +ECHO ------------------------------------------------------------------------------- +ECHO [ RUNNING ] %tests_path%\corruption.exe +ECHO ------------------------------------------------------------------------------- +!tests_path!\corruption.exe --gtest_output="xml:!tests_path!\corruption.exe.xml" +ECHO ------------------------------------------------------------------------------- +EXIT /b 0 -echo No test dir "!tests_path!\" -exit /b 1 \ No newline at end of file +:nodir +ECHO No test dir: "!tests_path!\" +EXIT /b 1 \ No newline at end of file diff --git a/src/tests/basics/basics.cpp b/src/tests/basics/basics.cpp index 1bbd3d9c..7bcb3d22 100644 --- a/src/tests/basics/basics.cpp +++ b/src/tests/basics/basics.cpp @@ -122,13 +122,12 @@ TEST_P(TestBasics, HeapAlloc) TEST_P(TestBasics, IMalloc) { - int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eIMalloc, repeats, GetParam()); - int total = static_cast(VLDGetLeaksCount()); - int leaks = total - prev; - int correctLeaks = GetParam() ? 0 : repeats * 1; - VLDReportLeaks(); - ASSERT_EQ(correctLeaks, leaks); + int prev = static_cast(VLDGetLeaksCount()); + LeakMemory(eIMalloc, repeats, GetParam()); + int total = static_cast(VLDGetLeaksCount()); + int leaks = total - prev; + int correctLeaks = GetParam() ? 0 : repeats * 1; + ASSERT_EQ(correctLeaks, leaks); } TEST_P(TestBasics, GetProcMalloc) diff --git a/src/tests/corruption/corruption.cpp b/src/tests/corruption/corruption.cpp index b72ac568..d882ad70 100644 --- a/src/tests/corruption/corruption.cpp +++ b/src/tests/corruption/corruption.cpp @@ -21,8 +21,17 @@ int __cdecl ReportHook(int /*reportHook*/, wchar_t *message, int* /*returnValue* return 1; } +bool IgnoreExitCode(int exit_status) +{ + UNREFERENCED_PARAMETER(exit_status); + return true; +} + void TestCorruption( CorruptionType check ) { + // Mark all previous memory leaks as reported which are not part of the current test. + VLDMarkAllLeaksAsReported(); + if (check == eAllocMismatch) { TestAllocationMismatch_malloc_delete(); @@ -43,11 +52,11 @@ TEST(Corruption, AllocMismatch) TEST(CorruptionDeathTest, HeapMismatch) { - EXPECT_DEATH({ + EXPECT_EXIT({ VLDSetReportHook(VLD_RPTHOOK_INSTALL, ReportHook); TestCorruption(eHeapMismatch); VLDSetReportHook(VLD_RPTHOOK_REMOVE, ReportHook); - }, "CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another."); + }, IgnoreExitCode, "CRITICAL ERROR!: VLD reports that memory was allocated in one heap and freed in another."); } int main(int argc, char **argv) { diff --git a/src/tests/dynamic_app/LoadTests.cpp b/src/tests/dynamic_app/LoadTests.cpp index 6cdb3773..cec0eee8 100644 --- a/src/tests/dynamic_app/LoadTests.cpp +++ b/src/tests/dynamic_app/LoadTests.cpp @@ -22,6 +22,7 @@ void CallVLDExportedMethod(const CHAR* function) if (func) { int result = func(); + UNREFERENCED_PARAMETER(result); } } } @@ -86,9 +87,9 @@ HMODULE RunMFCLoaderTests(bool resolve) if (hmfcLib) { VLDEnableModule(hmfcLib); - // Should leak 7 memory allocations in total + // Should leak 11 memory allocations in total // This requires ansi, not Unicode strings - CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // Leaks 4 + CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // Leaks 4 x 2 = 8 CallLibraryMethods(hmfcLib, "MFC_LeakArray"); // leaks 3 if (resolve) diff --git a/src/tests/dynamic_app/ThreadTest.cpp b/src/tests/dynamic_app/ThreadTest.cpp index f310a95c..d2bfbd7b 100644 --- a/src/tests/dynamic_app/ThreadTest.cpp +++ b/src/tests/dynamic_app/ThreadTest.cpp @@ -19,12 +19,14 @@ void Call_LoaderLocks(bool resolve) HMODULE hmfcLib = RunMFCLoaderTests(resolve); // Leaks 11 allocs #ifndef STATIC_CRT FreeLibrary(hmfcLib); +#else + UNREFERENCED_PARAMETER(hmfcLib); #endif - //HMODULE this_app = NULL; - //WCHAR path_name[MAX_PATH] = {0}; + HMODULE this_app = NULL; + WCHAR path_name[MAX_PATH] = {0}; // This also acquires the loader lock - //GetModuleFileName(this_app, path_name, MAX_PATH); + GetModuleFileName(this_app, path_name, MAX_PATH); } void Call_Three(bool resolve) diff --git a/src/tests/dynamic_app/dynamic_app.cpp b/src/tests/dynamic_app/dynamic_app.cpp index 63b42021..3775b7ab 100644 --- a/src/tests/dynamic_app/dynamic_app.cpp +++ b/src/tests/dynamic_app/dynamic_app.cpp @@ -40,38 +40,36 @@ class DynamicLoader : public ::testing::TestWithParam { TEST_P(DynamicLoader, LoaderTests) { - int prevleaks = (int)VLDGetLeaksCount(); HMODULE hmfcLib = RunLoaderTests(GetParam()); // leaks 18 ASSERT_NE(0u, (UINT_PTR)hmfcLib); - int totalleaks = (int)VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; + int leaks = (int)VLDGetLeaksCount(); + if (18 != leaks) VLDReportLeaks(); ASSERT_EQ(18, leaks); } TEST_P(DynamicLoader, MFCLoaderTests) { - int prevleaks = (int)VLDGetLeaksCount(); HMODULE hmfcLib = RunMFCLoaderTests(GetParam()); // leaks 11 ASSERT_NE(0u, (UINT_PTR)hmfcLib); -#ifndef STATIC_CRT FreeLibrary(hmfcLib); -#endif - int totalleaks = (int)VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; + int leaks = (int)VLDGetLeaksCount(); + if (11 != leaks) VLDReportLeaks(); ASSERT_EQ(11, leaks); -#ifdef STATIC_CRT - FreeLibrary(hmfcLib); -#endif } TEST_P(DynamicLoader, Thread) { // Creates 64 threads that each leaks 11 allocations - int prevleaks = (int)VLDGetLeaksCount(); + DWORD start = GetTickCount(); RunLoaderLockTests(GetParam()); - int totalleaks = (int)VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; - ASSERT_EQ(leaks, 64 * 11); + DWORD duration = GetTickCount() - start; + _tprintf(_T("Thread Test took: %u ms\n"), duration); + start = GetTickCount(); + int leaks = (int)VLDGetLeaksCount(); + duration = GetTickCount() - start; + _tprintf(_T("VLDGetLeaksCount took: %u ms\n"), duration); + if (64 * 11 != leaks) VLDReportLeaks(); + ASSERT_EQ(64 * 11, leaks); } INSTANTIATE_TEST_CASE_P(ResolveVal, @@ -80,10 +78,9 @@ INSTANTIATE_TEST_CASE_P(ResolveVal, TEST(Dynamic, DuplicateLeaks) { - int prevleaks = (int)VLDGetLeaksCount(); + VLDMarkAllLeaksAsReported(); LeakDuplicateLeaks(); // leaks 6 - int totalleaks = (int)VLDGetLeaksCount(); - int leaks = totalleaks - prevleaks; + int leaks = (int)VLDGetLeaksCount(); ASSERT_EQ(6, leaks); } diff --git a/src/tests/mfc_dll/mfc.cpp b/src/tests/mfc_dll/mfc.cpp index 65df4e5f..d8dfaadd 100644 --- a/src/tests/mfc_dll/mfc.cpp +++ b/src/tests/mfc_dll/mfc.cpp @@ -71,7 +71,7 @@ int CmfcApp::ExitInstance() return 0; } -// Leaks 4 memory allocations +// Leaks 4 x 2 = 8 memory allocations (one by new operator and one by CString initialisation with string) extern "C" void __declspec(dllexport) MFC_LeakSimple() { AFX_MANAGE_STATE(AfxGetStaticModuleState()); @@ -83,7 +83,7 @@ extern "C" void __declspec(dllexport) MFC_LeakSimple() CString* str_d = new (_NORMAL_BLOCK, __FILE__, __LINE__) CString(_T("4 parameter new for mfc")); } -// Leaks 3 memory allocations +// Leaks 3 memory allocations, CString objects are initialised to empty state and do not allocate extra memory extern "C" void __declspec(dllexport) MFC_LeakArray() { AFX_MANAGE_STATE(AfxGetStaticModuleState()); diff --git a/src/tests/suite/testsuite.cpp b/src/tests/suite/testsuite.cpp index 3017eae9..4635def2 100644 --- a/src/tests/suite/testsuite.cpp +++ b/src/tests/suite/testsuite.cpp @@ -455,11 +455,10 @@ void RunTestSuite() TEST(TestSuit, MultiThread) { - int prevleaks = static_cast(VLDGetLeaksCount()); + VLDMarkAllLeaksAsReported(); RunTestSuite(); - int totalleaks = static_cast(VLDGetLeaksCount()); - int leaks = totalleaks - prevleaks; - ASSERT_EQ(leaks, leaks_count); + int leaks = static_cast(VLDGetLeaksCount()); + ASSERT_EQ(leaks_count, leaks); } int main(int argc, char **argv) { From 464ee1735a32e114d6ca64bb312fc4ec2d7d71c3 Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 25 Sep 2015 18:01:34 +0300 Subject: [PATCH 243/321] Set HeapEnableTerminationOnCorruption to ensure process termination on corruption test --- src/tests/corruption/Tests.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tests/corruption/Tests.cpp b/src/tests/corruption/Tests.cpp index ac182eff..d43a4d81 100644 --- a/src/tests/corruption/Tests.cpp +++ b/src/tests/corruption/Tests.cpp @@ -37,7 +37,9 @@ void TestHeapMismatch() HANDLE test_heap = HeapCreate(HEAP_GENERATE_EXCEPTIONS | HEAP_CREATE_ENABLE_EXECUTE, 0, // initialize reserved size; 0); // maximum size can grow + HeapSetInformation(test_heap, HeapEnableTerminationOnCorruption, NULL, 0); HANDLE default_heap = GetProcessHeap(); + HeapSetInformation(default_heap, HeapEnableTerminationOnCorruption, NULL, 0); // Have to initialize vld with something, so it doesn't dismiss // the default heap as having no memory allocs in it. void* aptr = HeapAlloc(default_heap, 0, 42); From 44cdcac22ca69a2321622b1227e2491a29adb91c Mon Sep 17 00:00:00 2001 From: ioannis Date: Mon, 7 Sep 2015 05:56:58 +0300 Subject: [PATCH 244/321] Correct variable name pcrtxxd_vector_new, pmfcd__vector_new_dbg_4p --- src/crtmfcpatch.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/crtmfcpatch.h b/src/crtmfcpatch.h index be1985fb..5522f2b3 100644 --- a/src/crtmfcpatch.h +++ b/src/crtmfcpatch.h @@ -901,13 +901,13 @@ void* CrtPatch::crtd_scalar_new (size_t size) template void* CrtPatch::crtd_vector_new (size_t size) { - new_t pcrtxxd_scalar_new = (new_t)data.pcrtd_vector_new; - assert(pcrtxxd_scalar_new); + new_t pcrtxxd_vector_new = (new_t)data.pcrtd_vector_new; + assert(pcrtxxd_vector_new); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_scalar_new); + CAPTURE_CONTEXT(context, pcrtxxd_vector_new); - return g_vld._new(pcrtxxd_scalar_new, context, debug, size); + return g_vld._new(pcrtxxd_vector_new, context, debug, size); } //////////////////////////////////////////////////////////////////////////////// @@ -997,7 +997,7 @@ void* MfcPatch::mfcd__vector_new_dbg_4p (size_t size, char const *file, int line) { - new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__scalar_new_dbg_4p; + new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__vector_new_dbg_4p; assert(pmfcxxd__new_dbg); context_t context; @@ -1157,7 +1157,7 @@ void* MfcPatch::mfcud__vector_new_dbg_4p (size_t size, char const *file, int line) { - new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__scalar_new_dbg_4p; + new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__vector_new_dbg_4p; assert(pmfcxxd__new_dbg); context_t context; From 8821601f51f9ae4d90aa33721440356571b82d8b Mon Sep 17 00:00:00 2001 From: ioannis Date: Sun, 13 Sep 2015 12:03:57 +0300 Subject: [PATCH 245/321] Fix #6359, #10553, Visual Leak Detector is unloaded before IMalloc interface is released. Capture IMalloc->Realloc context --- src/vld.cpp | 3 +++ src/vld_hooks.cpp | 34 +++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index a40f6364..f4bcb7aa 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -469,6 +469,9 @@ VisualLeakDetector::~VisualLeakDetector () if (m_reportFile != NULL) { fclose(m_reportFile); } + + // Decrement the library reference count. + FreeLibrary(m_vldBase); } diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 5bb9ce4e..a6c1c8de 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -1921,6 +1921,11 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) ole32 = GetModuleHandleW(L"ole32.dll"); pCoGetMalloc = (CoGetMalloc_t)g_vld._RGetProcAddress(ole32, "CoGetMalloc"); hr = pCoGetMalloc(context, &g_vld.m_iMalloc); + + // Increment the library reference count to defer unloading the library, + // since a call to CoGetMalloc returns the global pointer to the VisualLeakDetector object. + HMODULE module = NULL; + GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCTSTR)g_vld.m_vldBase, &module); } else { @@ -1935,6 +1940,9 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) hr = E_INVALIDARG; } + if (SUCCEEDED(hr)) { + g_vld.AddRef(); + } return hr; } @@ -2054,7 +2062,14 @@ ULONG VisualLeakDetector::AddRef () DbgReport(_T(__FUNCTION__ "\n")); #endif assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->AddRef() : 0; + if (m_iMalloc) { + // Increment the library reference count to defer unloading the library, + // since this function increments the reference count of the IMalloc interface. + HMODULE module = NULL; + GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCTSTR)m_vldBase, &module); + return m_iMalloc->AddRef(); + } + return 0; } // Alloc - Calls to IMalloc::Alloc end up here. This function is just a wrapper @@ -2081,8 +2096,8 @@ LPVOID VisualLeakDetector::Alloc (_In_ SIZE_T size) // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; - UINT_PTR allocFunc = cVtablePtr[3]; - CAPTURE_CONTEXT(context, allocFunc); + UINT_PTR iMallocAlloc = cVtablePtr[3]; + CAPTURE_CONTEXT(context, iMallocAlloc); tls->context = context; } @@ -2218,7 +2233,9 @@ LPVOID VisualLeakDetector::Realloc (_In_opt_ LPVOID mem, _In_ SIZE_T size) if (firstcall) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - CAPTURE_CONTEXT(context, NULL); + UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; + UINT_PTR iMallocRealloc = cVtablePtr[4]; + CAPTURE_CONTEXT(context, iMallocRealloc); tls->context = context; } @@ -2246,5 +2263,12 @@ ULONG VisualLeakDetector::Release () DbgReport(_T(__FUNCTION__ "\n")); #endif assert(m_iMalloc != NULL); - return (m_iMalloc) ? m_iMalloc->Release() : 0; + ULONG nCount = 0; + if (m_iMalloc) { + nCount = m_iMalloc->Release(); + + // Decrement the library reference count. + FreeLibrary(m_vldBase); + } + return nCount; } From 83b3f89ea2bc6963e77ffd0652487e512189892c Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 13:57:13 +0300 Subject: [PATCH 246/321] Patch ntdll to gain access to LdrpCallInitRoutine() and call RefreshModules() before calling dll entry point. Remove "CRT_USE_TYPE(crtheader->use) == CRT_USE_IGNORE ||" as it is causing the report of fewer leaks than expected in tests --- src/vld.cpp | 241 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 223 insertions(+), 18 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index f4bcb7aa..5446acb9 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -68,6 +68,220 @@ moduleentry_t ntdllPatch [] = { "ntdll.dll", FALSE, NULL, ldrLoadDllPatch, }; +///////////////////////////////////////////////////////// + +// We provide our own DllEntryPoint in order to capture the ReturnAddress of the function calling our DllEntryPoint. +// Then we patch this function namely ntdll.dll!LdrpCallInitRoutine or any equivalent NT loader function by calling +// our LdrpCallInitRoutine where we RefreshModules before calling the EntryPoint in order to hook all functions required +// to properly capture all _CRT_INIT memory allocations which include internal CRT startup memory allocations and all +// global and static initializers. +// +// In getLeaksCount(), reportLeaks() and resolveStacks(), we take extra measures to identify and exclude debug and release +// internal CRT allocations from reporting as real memory leaks. +// +// Global and static initializers *might* be reported as memory leaks based on the order being unintialised by _CRT_INIT. + +typedef BOOLEAN(NTAPI *PDLL_INIT_ROUTINE)(IN PVOID DllHandle, IN ULONG Reason, IN PCONTEXT Context OPTIONAL); +BOOLEAN WINAPI LdrpCallInitRoutine(IN PVOID BaseAddress, IN ULONG Reason, IN PVOID Context, IN PDLL_INIT_ROUTINE EntryPoint) +{ + if (Reason == DLL_PROCESS_ATTACH) { + g_vld.RefreshModules(); + } + + return EntryPoint(BaseAddress, Reason, (PCONTEXT)Context); +} + +PBYTE NtDllFindDetourAddress(const PBYTE pAddress, SIZE_T dwSize) +{ + MEMORY_BASIC_INFORMATION meminfo = { 0 }; + if (VirtualQuery(pAddress, &meminfo, sizeof(meminfo))) { + // Find spare bytes at the end of the memory region that are unused + // so we can jump to this address and set up the detour. + PBYTE end = (PBYTE)meminfo.BaseAddress + meminfo.RegionSize; + PBYTE begin = end; + + while (((SIZE_T)(end - begin) < dwSize) && (begin != pAddress)) { + if (*(--begin) != 0x00) + end = begin; + } + if (begin != pAddress) + return begin; + } + return NULL; +} + +PBYTE NtDllFindParamAddress(const PBYTE pAddress) +{ + PBYTE ptr = pAddress; + // Test previous 32 bytes to find the begining address we need to patch + // for 32bit find => push [ebp][14h] => parameters are pushed to stack + // for 64bit find => mov r8,... => parameters are moved to registers r8, rdx, rcx + while (pAddress - --ptr < 0x20) { +#ifdef _WIN64 + if (((ptr[0] & 0x4D) == ptr[0]) && (ptr[1] == 0x8B) && ((ptr[2] & 0xC7) == ptr[2])) { +#else + if ((ptr[0] == 0xFF) && (ptr[1] == 0x75) && (ptr[2] == 0x14)) { +#endif + return ptr; + } + } + return NULL; + } + +PBYTE NtDllFindCallAddress(const PBYTE pAddress) +{ + PBYTE ptr = pAddress; + // Test previous 32 bytes to find the begining address we need to patch + // for 32bit find => call [ebp][08h] + // for 64bit find => call + while (pAddress - --ptr < 0x20) { +#ifdef _WIN64 + if ((ptr[0] == 0xFF) && ((ptr[1] & 0xD7) == ptr[1])) { + if ((*(ptr - 1) & 0x41) == *(ptr - 1)) { + --ptr; + } +#else + if ((ptr[0] == 0xFF) && (ptr[1] == 0x55) && (ptr[2] == 0x08)) { +#endif + return ptr; + } + } + return NULL; + } + +typedef struct _NTDLL_LDR_PATCH { + PBYTE pPatchAddress; + SIZE_T nPatchSize; + BYTE pBackup[0x20]; + PBYTE pDetourAddress; + SIZE_T nDetourSize; + BOOL bState; +} NTDLL_LDR_PATCH, *PNTDLL_LDR_PATCH; + +NTDLL_LDR_PATCH patch; + + +BOOL NtDllPatch(const PBYTE pReturnAddress, NTDLL_LDR_PATCH &NtDllPatch) +{ + if (NtDllPatch.bState == FALSE) { +#ifdef _WIN64 + BYTE ptr[] = { '?', 0x8B, '?' }; // mov r9, r.. + BYTE mov[] = { 0x48, 0xB8, '?', '?', '?', '?', '?', '?', '?', '?' }; // mov rax, 0x0000000000000000 + BYTE call[] = { 0xFF, 0xD0 }; // call rax +#else + BYTE ptr[] = { 0xFF, 0x75, 0x08 }; // push [ebp][08h] + BYTE mov[] = { 0x90, 0xB8, '?', '?', '?', '?' }; // mov eax, 0x00000000 + BYTE call[] = { 0xFF, 0xD0 }; // call eax +#endif + BYTE jmp[] = { 0xE9, '?', '?', '?', '?' }; // jmp 0x00000000 + + NtDllPatch.pPatchAddress = NtDllFindParamAddress(pReturnAddress); + PBYTE pCallAddress = NtDllFindCallAddress(pReturnAddress); + NtDllPatch.nPatchSize = pReturnAddress - NtDllPatch.pPatchAddress; + SIZE_T nParamSize = pCallAddress - NtDllPatch.pPatchAddress; + + NtDllPatch.nDetourSize = _countof(ptr) + nParamSize + _countof(mov) + _countof(jmp); + NtDllPatch.pDetourAddress = NtDllFindDetourAddress(pReturnAddress, NtDllPatch.nDetourSize); + + if (NtDllPatch.pPatchAddress && NtDllPatch.pDetourAddress && ((_countof(jmp) + _countof(call)) <= NtDllPatch.nPatchSize)) { + memcpy(NtDllPatch.pBackup, NtDllPatch.pPatchAddress, NtDllPatch.nPatchSize); + + DWORD dwProtect = 0; + if (VirtualProtect(NtDllPatch.pDetourAddress, NtDllPatch.nDetourSize, PAGE_EXECUTE_READWRITE, &dwProtect)) { + memset(NtDllPatch.pDetourAddress, 0x90, NtDllPatch.nDetourSize); +#ifdef _WIN64 + // Copy original param instructions + memcpy(&NtDllPatch.pDetourAddress[0], NtDllPatch.pPatchAddress, nParamSize); + // Copy the register that holds the EntryPoint to r9 + BYTE reg = ((pCallAddress[0] & 0xF1) == 0x41 ? 0x08 : 0x00) + (pCallAddress[pReturnAddress - pCallAddress - 1] & 0x07); + ptr[0] = 0x4C + ((reg & 0x08) ? 0x01 : 0x00); + ptr[2] = 0xC8 + (reg & 0x07); + memcpy(&NtDllPatch.pDetourAddress[nParamSize], &ptr, _countof(ptr)); +#else + // Push EntryPoint as last parameter + memcpy(&NtDllPatch.pDetourAddress[0], &ptr, _countof(ptr)); + // Copy original param instructions + memcpy(&NtDllPatch.pDetourAddress[_countof(ptr)], NtDllPatch.pPatchAddress, nParamSize); +#endif + // Move LdrpCallInitRoutine to eax/rax + *(PSIZE_T)(&mov[2]) = (SIZE_T)LdrpCallInitRoutine; + memcpy(&NtDllPatch.pDetourAddress[_countof(ptr) + nParamSize], &mov, _countof(mov)); + + // Jump to original function + *(DWORD*)(&jmp[1]) = (DWORD)(pReturnAddress - _countof(call) - (NtDllPatch.pDetourAddress + NtDllPatch.nDetourSize)); + memcpy(&NtDllPatch.pDetourAddress[_countof(ptr) + nParamSize + _countof(mov)], &jmp, _countof(jmp)); + + VirtualProtect(NtDllPatch.pDetourAddress, NtDllPatch.nDetourSize, dwProtect, &dwProtect); + + if (VirtualProtect(NtDllPatch.pPatchAddress, NtDllPatch.nPatchSize, PAGE_EXECUTE_READWRITE, &dwProtect)) { + memset(NtDllPatch.pPatchAddress, 0x90, NtDllPatch.nPatchSize); + + // Jump to detour address + *(DWORD*)(&jmp[1]) = (DWORD)(NtDllPatch.pDetourAddress - (pReturnAddress - _countof(call))); + memcpy(pReturnAddress - _countof(call) - _countof(jmp), &jmp, _countof(jmp)); + + // Call LdrpCallInitRoutine from eax/rax + memcpy(pReturnAddress - _countof(call), &call, _countof(call)); + + VirtualProtect(NtDllPatch.pPatchAddress, NtDllPatch.nPatchSize, dwProtect, &dwProtect); + + NtDllPatch.bState = TRUE; + } + } + } + } + return NtDllPatch.bState; +} + + +BOOL NtDllRestore(NTDLL_LDR_PATCH &NtDllPatch) +{ + // Restore patched bytes + BOOL bResult = FALSE; + if (NtDllPatch.bState && NtDllPatch.nPatchSize && &NtDllPatch.pBackup[0]) { + DWORD dwProtect = 0; + if (VirtualProtect(NtDllPatch.pPatchAddress, NtDllPatch.nPatchSize, PAGE_EXECUTE_READWRITE, &dwProtect)) { + memcpy(NtDllPatch.pPatchAddress, NtDllPatch.pBackup, NtDllPatch.nPatchSize); + VirtualProtect(NtDllPatch.pPatchAddress, NtDllPatch.nPatchSize, dwProtect, &dwProtect); + + if (VirtualProtect(NtDllPatch.pDetourAddress, NtDllPatch.nDetourSize, PAGE_EXECUTE_READWRITE, &dwProtect)) { + memset(NtDllPatch.pDetourAddress, 0x00, NtDllPatch.nDetourSize); + VirtualProtect(NtDllPatch.pDetourAddress, NtDllPatch.nDetourSize, dwProtect, &dwProtect); + bResult = TRUE; + } + } + } + return bResult; +} + +#define _DECL_DLLMAIN // for _CRT_INIT +#include // for _CRT_INIT +#pragma comment(linker, "/entry:DllEntryPoint") + +__declspec(noinline) +BOOL WINAPI DllEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) +{ + // Patch/Restore ntdll address that calls the dll entry point + if (fdwReason == DLL_PROCESS_ATTACH) { + NtDllPatch((PBYTE)_ReturnAddress(), patch); + } + + if (fdwReason == DLL_PROCESS_ATTACH || fdwReason == DLL_THREAD_ATTACH) + if (!_CRT_INIT(hinstDLL, fdwReason, lpReserved)) + return(FALSE); + + if (fdwReason == DLL_PROCESS_DETACH || fdwReason == DLL_THREAD_DETACH) + if (!_CRT_INIT(hinstDLL, fdwReason, lpReserved)) + return(FALSE); + + if (fdwReason == DLL_PROCESS_DETACH) { + NtDllRestore(patch); + } + return(TRUE); +} + +///////////////////////////////////////////////////////// + bool IsWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor) { OSVERSIONINFOEXW osvi = { sizeof(osvi), 0, 0, 0, 0,{ 0 }, 0, 0 }; @@ -1457,8 +1671,9 @@ SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo, DWORD threadId) // This block is allocated to a CRT heap, so the block has a CRT // memory block header pretended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_IGNORE || - CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || + // Leaks identified as CRT_USE_IGNORE should not be ignored here otherwise + // DynamicLoader/Thread test will randomly fail with less leaks being reported. + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. @@ -1535,8 +1750,9 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S // This block is allocated to a CRT heap, so the block has a CRT // memory block header pretended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_IGNORE || - CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || + // Leaks identified as CRT_USE_IGNORE should not be ignored here otherwise + // DynamicLoader/Thread test will randomly fail with less leaks being reported. + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { // This block is marked as being used internally by the CRT. @@ -1941,13 +2157,7 @@ NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicod PHANDLE modulehandle) { // Load the DLL - g_loaderLock.Enter(); NTSTATUS status = LdrLoadDll(searchpath, flags, modulename, modulehandle); - g_loaderLock.Leave(); - - if (STATUS_SUCCESS == status) - g_vld.RefreshModules(); - return status; } @@ -1955,13 +2165,7 @@ NTSTATUS VisualLeakDetector::_LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, PHANDLE modulehandle) { // Load the DLL - g_loaderLock.Enter(); NTSTATUS status = LdrLoadDllWin8(reserved, flags, modulename, modulehandle); - g_loaderLock.Leave(); - - if (STATUS_SUCCESS == status) - g_vld.RefreshModules(); - return status; } @@ -2467,8 +2671,9 @@ int VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) if (!crtheader) continue; - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_IGNORE || - CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || + // Leaks identified as CRT_USE_IGNORE should not be ignored here otherwise + // DynamicLoader/Thread test will randomly fail with less leaks being reported. + if (CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { // This block is marked as being used internally by the CRT. From 62c799bfc75c58ae15d0551d7b962592c4e5ba93 Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 28 Aug 2015 14:37:40 +0300 Subject: [PATCH 247/321] Fix #9519, #9859, #10544, use LoaderLock to serialize any calls which load additional libraries or require access to the Loader Lock. --- src/loaderlock.h | 57 +++++++++++++++++++++++++++++++++++++++++++ src/ntapi.cpp | 6 +++++ src/ntapi.h | 14 ++++++++++- src/vld.cpp | 62 +++++++++++++++++++++++++++++++++++++++++------ src/vld_hooks.cpp | 5 ++++ src/vldint.h | 8 +++++- 6 files changed, 143 insertions(+), 9 deletions(-) create mode 100644 src/loaderlock.h diff --git a/src/loaderlock.h b/src/loaderlock.h new file mode 100644 index 00000000..5fdab5f4 --- /dev/null +++ b/src/loaderlock.h @@ -0,0 +1,57 @@ +#pragma once + +#define WIN32_LEAN_AND_MEAN +#define NOMINMAX +#include +#include "ntapi.h" + +// +// LdrLockLoaderLock Flags +// +#define LDR_LOCK_LOADER_LOCK_FLAG_DEFAULT 0x00000000 +#define LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS 0x00000001 +#define LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY 0x00000002 + +// +// LdrUnlockLoaderLock Flags +// +#define LDR_UNLOCK_LOADER_LOCK_FLAG_DEFAULT 0x00000000 +#define LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS 0x00000001 + +// +// LdrLockLoaderLock State +// +#define LDR_LOCK_LOADER_LOCK_STATE_INVALID 0 +#define LDR_LOCK_LOADER_LOCK_STATE_LOCK_ACQUIRED 1 +#define LDR_LOCK_LOADER_LOCK_STATE_LOCK_NOT_ACQUIRED 2 + +class LoaderLock +{ +public: + LoaderLock() : m_uCookie(NULL), m_hThreadId(NULL) { + ULONG uState = NULL; + NTSTATUS ntStatus = LdrLockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_DEFAULT, &uState, &m_uCookie); + if (ntStatus == STATUS_SUCCESS) { + m_hThreadId = GetCurrentThreadId(); + } + } + + ~LoaderLock() { + if (m_uCookie) { + NTSTATUS ntStatus = LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_DEFAULT, m_uCookie); + if (ntStatus == STATUS_SUCCESS) { + m_hThreadId = NULL; + m_uCookie = NULL; + } + } + } + +private: + // Disallow certain operations + LoaderLock(const LoaderLock&); + LoaderLock& operator=(const LoaderLock&); + +private: + DWORD m_hThreadId; + ULONG_PTR m_uCookie; +}; diff --git a/src/ntapi.cpp b/src/ntapi.cpp index fad6a8d6..437dc65d 100644 --- a/src/ntapi.cpp +++ b/src/ntapi.cpp @@ -32,3 +32,9 @@ LdrLoadDllWin8_t LdrLoadDllWin8; RtlAllocateHeap_t RtlAllocateHeap; RtlFreeHeap_t RtlFreeHeap; RtlReAllocateHeap_t RtlReAllocateHeap; + +LdrGetDllHandle_t LdrGetDllHandle; +LdrGetProcedureAddress_t LdrGetProcedureAddress; +LdrUnloadDll_t LdrUnloadDll; +LdrLockLoaderLock_t LdrLockLoaderLock; +LdrUnlockLoaderLock_t LdrUnlockLoaderLock; \ No newline at end of file diff --git a/src/ntapi.h b/src/ntapi.h index c00c4679..38220171 100644 --- a/src/ntapi.h +++ b/src/ntapi.h @@ -44,12 +44,18 @@ struct unicodestring_t { // Function pointer types for explicit dynamic linking with functions that can't // be load-time linked (no import library is available for these). -typedef NTSTATUS (__stdcall *LdrLoadDll_t) (LPWSTR, ULONG, unicodestring_t *, PHANDLE); +typedef NTSTATUS (__stdcall *LdrLoadDll_t) (LPWSTR, PULONG, unicodestring_t *, PHANDLE); typedef NTSTATUS (__stdcall *LdrLoadDllWin8_t) (DWORD_PTR, PULONG, unicodestring_t *, PHANDLE); typedef LPVOID (__stdcall *RtlAllocateHeap_t) (HANDLE, DWORD, SIZE_T); typedef BYTE (__stdcall *RtlFreeHeap_t) (HANDLE, DWORD, LPVOID); typedef LPVOID (__stdcall *RtlReAllocateHeap_t) (HANDLE, DWORD, LPVOID, SIZE_T); +typedef NTSTATUS(NTAPI *LdrGetDllHandle_t) (PWSTR, PULONG, PUNICODE_STRING, PVOID *); +typedef NTSTATUS(NTAPI *LdrGetProcedureAddress_t)(PVOID, PANSI_STRING, ULONG, PVOID *); +typedef NTSTATUS(NTAPI *LdrUnloadDll_t)(PVOID); +typedef NTSTATUS(NTAPI *LdrLockLoaderLock_t)(ULONG, PULONG, PULONG_PTR); +typedef NTSTATUS(NTAPI *LdrUnlockLoaderLock_t)(ULONG, ULONG_PTR); + // Provide forward declarations for the NT APIs for any source files that // include this header. extern LdrLoadDll_t LdrLoadDll; @@ -57,3 +63,9 @@ extern LdrLoadDllWin8_t LdrLoadDllWin8; extern RtlAllocateHeap_t RtlAllocateHeap; extern RtlFreeHeap_t RtlFreeHeap; extern RtlReAllocateHeap_t RtlReAllocateHeap; + +extern LdrGetDllHandle_t LdrGetDllHandle; +extern LdrGetProcedureAddress_t LdrGetProcedureAddress; +extern LdrUnloadDll_t LdrUnloadDll; +extern LdrLockLoaderLock_t LdrLockLoaderLock; +extern LdrUnlockLoaderLock_t LdrUnlockLoaderLock; diff --git a/src/vld.cpp b/src/vld.cpp index 5446acb9..04793c55 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -35,6 +35,7 @@ #include "set.h" // Provides a lightweight STL-like set template. #include "utility.h" // Provides various utility functions. #include "vldint.h" // Provides access to the Visual Leak Detector internals. +#include "loaderlock.h" #include "tchar.h" #define BLOCK_MAP_RESERVE 64 // This should strike a balance between memory use and a desire to minimize heap hits. @@ -53,7 +54,6 @@ CriticalSection g_imageLock; // Serializes calls to the Debug Help Library HANDLE g_processHeap; // Handle to the process's heap (COM allocations come from here). CriticalSection g_heapMapLock; // Serializes access to the heap and block maps. CriticalSection g_symbolLock; // Serializes calls to the Debug Help Library symbols handling APIs. -CriticalSection g_loaderLock; // Serializes calls to LdrLoadDll, GetProcAddress and EnumerateLoadedModulesW64(). ReportHookSet* g_pReportHooks; // The one and only VisualLeakDetector object instance. @@ -61,8 +61,12 @@ __declspec(dllexport) VisualLeakDetector g_vld; // Patch only this entries in Kernel32.dll and KernelBase.dll patchentry_t ldrLoadDllPatch [] = { - "LdrLoadDll", NULL, VisualLeakDetector::_LdrLoadDll, - NULL, NULL, NULL + "LdrLoadDll", NULL, VisualLeakDetector::_LdrLoadDll, + "LdrGetDllHandle", NULL, VisualLeakDetector::_LdrGetDllHandle, + "LdrGetProcedureAddress", NULL, VisualLeakDetector::_LdrGetProcedureAddress, + "LdrLockLoaderLock", NULL, VisualLeakDetector::_LdrLockLoaderLock, + "LdrUnlockLoaderLock", NULL, VisualLeakDetector::_LdrUnlockLoaderLock, + NULL, NULL, NULL }; moduleentry_t ntdllPatch [] = { "ntdll.dll", FALSE, NULL, ldrLoadDllPatch, @@ -373,12 +377,20 @@ VisualLeakDetector::VisualLeakDetector () RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); + + LdrGetDllHandle = (LdrGetDllHandle_t)GetProcAddress(ntdll, "LdrGetDllHandle"); + LdrGetProcedureAddress = (LdrGetProcedureAddress_t)GetProcAddress(ntdll, "LdrGetProcedureAddress"); + LdrUnloadDll = (LdrUnloadDll_t)GetProcAddress(ntdll, "LdrUnloadDll"); + LdrLockLoaderLock = (LdrLockLoaderLock_t)GetProcAddress(ntdll, "LdrLockLoaderLock"); + LdrUnlockLoaderLock = (LdrUnlockLoaderLock_t)GetProcAddress(ntdll, "LdrUnlockLoaderLock"); } + + LoaderLock ll; + g_heapMapLock.Initialize(); g_symbolLock.Initialize(); g_vldHeap = HeapCreate(0x0, 0, 0); g_vldHeapLock.Initialize(); - g_loaderLock.Initialize(); g_pReportHooks = new ReportHookSet; // Initialize remaining private data. @@ -583,6 +595,8 @@ void VisualLeakDetector::checkInternalMemoryLeaks() // VisualLeakDetector::~VisualLeakDetector () { + LoaderLock ll; + if (m_options & VLD_OPT_VLDOFF) { // VLD has been turned off. return; @@ -670,7 +684,6 @@ VisualLeakDetector::~VisualLeakDetector () m_optionsLock.Delete(); m_modulesLock.Delete(); m_tlsLock.Delete(); - g_loaderLock.Delete(); g_imageLock.Delete(); g_heapMapLock.Delete(); g_symbolLock.Delete(); @@ -755,6 +768,8 @@ static char dbghelp32_assert[sizeof(IMAGEHLP_MODULE64) == 3256 ? 1 : -1]; // VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) { + LoaderLock ll; + // Iterate through the supplied set, until all modules have been attached. for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { @@ -2153,7 +2168,7 @@ FARPROC VisualLeakDetector::_RGetProcAddressForCaller(HMODULE module, LPCSTR pro // // Returns the value returned by LdrLoadDll. // -NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, +NTSTATUS VisualLeakDetector::_LdrLoadDll (LPWSTR searchpath, PULONG flags, unicodestring_t *modulename, PHANDLE modulehandle) { // Load the DLL @@ -2169,15 +2184,46 @@ NTSTATUS VisualLeakDetector::_LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, return status; } +NTSTATUS VisualLeakDetector::_LdrGetDllHandle(IN PWSTR DllPath OPTIONAL, IN PULONG DllCharacteristics OPTIONAL, IN PUNICODE_STRING DllName, OUT PVOID *DllHandle OPTIONAL) +{ + LoaderLock ll; + + NTSTATUS status = LdrGetDllHandle(DllPath, DllCharacteristics, DllName, DllHandle); + return status; +} +NTSTATUS VisualLeakDetector::_LdrGetProcedureAddress(IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, OUT PVOID * ProcedureAddress) +{ + LoaderLock ll; + + NTSTATUS status = LdrGetProcedureAddress(BaseAddress, Name, Ordinal, ProcedureAddress); + return status; +} + +NTSTATUS VisualLeakDetector::_LdrLockLoaderLock(IN ULONG Flags, OUT PULONG Disposition OPTIONAL, OUT PULONG_PTR Cookie OPTIONAL) +{ + return LdrLockLoaderLock(Flags, Disposition, Cookie); +} + +NTSTATUS VisualLeakDetector::_LdrUnlockLoaderLock(IN ULONG Flags, IN ULONG_PTR Cookie OPTIONAL) +{ + return LdrUnlockLoaderLock(Flags, Cookie); +} + +NTSTATUS VisualLeakDetector::_LdrUnloadDll(IN PVOID BaseAddress) +{ + return LdrUnloadDll(BaseAddress); +} + VOID VisualLeakDetector::RefreshModules() { + LoaderLock ll; + if (m_options & VLD_OPT_VLDOFF) return; ModuleSet* newmodules = new ModuleSet(); newmodules->reserve(MODULE_SET_RESERVE); { - CriticalSectionLocker cs(g_loaderLock); // Duplicate code here in this method. Consider refactoring out to another method. // Create a new set of all loaded modules, including any newly loaded // modules. @@ -2693,6 +2739,8 @@ int VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) int VisualLeakDetector::ResolveCallstacks() { + LoaderLock ll; + if (m_options & VLD_OPT_VLDOFF) return 0; diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index a6c1c8de..268c440e 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -36,6 +36,7 @@ #include "utility.h" // Provides various utility functions. #include "vldheap.h" // Provides internal new and delete operators. #include "vldint.h" // Provides access to the Visual Leak Detector internals. +#include "loaderlock.h" //#define PRINTHOOKCALLS //#define PRINTHOOKCALLS2 @@ -1469,6 +1470,8 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, // HANDLE VisualLeakDetector::_GetProcessHeap() { + LoaderLock ll; + #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); #endif @@ -1502,6 +1505,8 @@ HANDLE VisualLeakDetector::_GetProcessHeap() // HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) { + LoaderLock ll; + #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); #endif diff --git a/src/vldint.h b/src/vldint.h index 0045ed5f..8f5210b4 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -294,13 +294,19 @@ class VisualLeakDetector : public IMalloc bool GetModulesList(WCHAR *modules, UINT size); int ResolveCallstacks(); - static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, ULONG flags, unicodestring_t *modulename, + static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, PULONG flags, unicodestring_t *modulename, PHANDLE modulehandle); static NTSTATUS __stdcall _LdrLoadDllWin8 (DWORD_PTR reserved, PULONG flags, unicodestring_t *modulename, PHANDLE modulehandle); static FARPROC __stdcall _RGetProcAddress(HMODULE module, LPCSTR procname); static FARPROC __stdcall _RGetProcAddressForCaller(HMODULE module, LPCSTR procname, LPVOID caller); + static NTSTATUS NTAPI _LdrGetDllHandle(IN PWSTR DllPath OPTIONAL, IN PULONG DllCharacteristics OPTIONAL, IN PUNICODE_STRING DllName, OUT PVOID *DllHandle OPTIONAL); + static NTSTATUS NTAPI _LdrGetProcedureAddress(IN PVOID BaseAddress, IN PANSI_STRING Name, IN ULONG Ordinal, OUT PVOID * ProcedureAddress); + static NTSTATUS NTAPI _LdrUnloadDll(IN PVOID BaseAddress); + static NTSTATUS NTAPI _LdrLockLoaderLock(IN ULONG Flags, OUT PULONG Disposition OPTIONAL, OUT PULONG_PTR Cookie OPTIONAL); + static NTSTATUS NTAPI _LdrUnlockLoaderLock(IN ULONG Flags, IN ULONG_PTR Cookie OPTIONAL); + private: //////////////////////////////////////////////////////////////////////////////// // Private leak detection functions - see each function definition for details. From 0c2c4368fdbc9e4b477e4b1e268e9c5e40ac2f70 Mon Sep 17 00:00:00 2001 From: ioannis Date: Thu, 3 Sep 2015 18:46:06 +0300 Subject: [PATCH 248/321] Improve thread synchronisation --- src/callstack.cpp | 13 ++++--- src/utility.cpp | 39 +++++++------------- src/vld.cpp | 90 ++++++++++++++++++++++++----------------------- src/vld_hooks.cpp | 3 +- src/vldheap.cpp | 6 ++-- 5 files changed, 68 insertions(+), 83 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index d020fd2d..dfe7de01 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -251,7 +251,7 @@ DWORD CallStack::resolveFunction(SIZE_T programCounter, IMAGEHLP_LINEW64* source moduleName, functionName, displacement); } } - DWORD NumChars = w.size(); + DWORD NumChars = (DWORD)w.size(); stack_line[NumChars] = '\0'; return NumChars; } @@ -298,12 +298,12 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const bool isPrevFrameInternal = false; // Iterate through each frame in the call stack. + CriticalSectionLocker cs(g_symbolLock); for (UINT32 frame = start_frame; frame < m_size; frame++) { // Try to get the source file and line number associated with // this program counter address. SIZE_T programCounter = (*this)[frame]; - g_symbolLock.Enter(); BOOL foundline = FALSE; DWORD displacement = 0; DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); @@ -329,12 +329,11 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); - g_symbolLock.Leave(); - if (!foundline) displacement = (DWORD)displacement64; DWORD NumChars = resolveFunction(programCounter, foundline ? &sourceInfo : NULL, displacement, functionName, stack_line, _countof(stack_line)); + UNREFERENCED_PARAMETER(NumChars); if (!isFrameInternal) Print(stack_line); @@ -393,12 +392,12 @@ int CallStack::resolve(BOOL showInternalFrames) } // Iterate through each frame in the call stack. + CriticalSectionLocker cs(g_symbolLock); for (UINT32 frame = 0; frame < m_size; frame++) { // Try to get the source file and line number associated with // this program counter address. SIZE_T programCounter = (*this)[frame]; - g_symbolLock.Enter(); DWORD displacement = 0; // It turns out that calls to SymGetLineFromAddrW64 may free the very memory we are scrutinizing here @@ -430,8 +429,6 @@ int CallStack::resolve(BOOL showInternalFrames) BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); - g_symbolLock.Leave(); - if (!foundline) displacement = (DWORD)displacement64; NumChars = resolveFunction( programCounter, foundline ? &sourceInfo : NULL, @@ -661,6 +658,8 @@ VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) // Walk the stack. CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker cs1(g_symbolLock); + while (count < maxdepth) { count++; DbgTrace(L"dbghelp32.dll %i: StackWalk64\n", GetCurrentThreadId()); diff --git a/src/utility.cpp b/src/utility.cpp index 915cada3..bf0bb6c4 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -217,17 +217,12 @@ IMAGE_IMPORT_DESCRIPTOR* FindOriginalImportDescriptor (HMODULE importmodule, LPC // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. - g_imageLock.Enter(); - __try { + CriticalSectionLocker cs(g_imageLock); idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } - __except(FilterFunction(GetExceptionCode())) - { - idte = NULL; - } - g_imageLock.Leave(); + if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return NULL; @@ -496,25 +491,20 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *patchModule) if (exportmodule == NULL) return FALSE; - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; + IMAGE_IMPORT_DESCRIPTOR *idte = NULL; + IMAGE_SECTION_HEADER *section = NULL; + ULONG size = 0; // Locate the importing module's Import Directory Table (IDT) entry for the // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. - g_imageLock.Enter(); - __try { + CriticalSectionLocker cs(g_imageLock); idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } - __except(FilterFunction(GetExceptionCode())) - { - idte = NULL; - } - g_imageLock.Leave(); + if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return FALSE; @@ -822,25 +812,20 @@ VOID RestoreImport (HMODULE importmodule, moduleentry_t* module) if (exportmodule == NULL) return; - IMAGE_IMPORT_DESCRIPTOR *idte; - IMAGE_SECTION_HEADER *section; - ULONG size; + IMAGE_IMPORT_DESCRIPTOR *idte = NULL; + IMAGE_SECTION_HEADER *section = NULL; + ULONG size = 0; // Locate the importing module's Import Directory Table (IDT) entry for the // exporting module. The importing module actually can have several IATs -- // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. - g_imageLock.Enter(); - __try { + CriticalSectionLocker cs(g_imageLock); idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } - __except(FilterFunction(GetExceptionCode())) - { - idte = NULL; - } - g_imageLock.Leave(); + if (idte == NULL) { // This module has no IDT (i.e. it imports nothing). return; diff --git a/src/vld.cpp b/src/vld.cpp index 04793c55..9bf72119 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -643,24 +643,28 @@ VisualLeakDetector::~VisualLeakDetector () GetLastError()); } - // Free internally allocated resources used by the heapmap and blockmap. - for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { - BlockMap *blockmap = &(*heapit).second->blockMap; - for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { - delete (*blockit).second; + { + // Free internally allocated resources used by the heapmap and blockmap. + CriticalSectionLocker cs(g_heapMapLock); + for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { + BlockMap *blockmap = &(*heapit).second->blockMap; + for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { + delete (*blockit).second; + } + delete blockmap; } - delete blockmap; + delete m_heapMap; } - delete m_heapMap; - delete m_loadedModules; - // Free internally allocated resources used for thread local storage. - for (TlsMap::Iterator tlsit = m_tlsMap->begin(); tlsit != m_tlsMap->end(); ++tlsit) { - delete (*tlsit).second; + { + // Free internally allocated resources used for thread local storage. + CriticalSectionLocker cs(m_tlsLock); + for (TlsMap::Iterator tlsit = m_tlsMap->begin(); tlsit != m_tlsMap->end(); ++tlsit) { + delete (*tlsit).second; + } + delete m_tlsMap; } - delete m_tlsMap; - if (threadsactive) { Report(L"WARNING: Visual Leak Detector: Some threads appear to have not terminated normally.\n" L" This could cause inaccurate leak detection results, including false positives.\n"); @@ -718,14 +722,13 @@ UINT32 VisualLeakDetector::getModuleState(ModuleSet::Iterator& it, UINT32& modul return 0; bool isNewModule = false; - m_modulesLock.Enter(); + CriticalSectionLocker cs(m_modulesLock); ModuleSet* oldmodules = m_loadedModules; ModuleSet::Iterator oldit = oldmodules->find(moduleinfo); if (oldit != oldmodules->end()) // We've seen this "new" module loaded in the process before. moduleFlags = (*oldit).flags; else // This is new loaded module isNewModule = true; - m_modulesLock.Leave(); if (isNewModule) return 1; @@ -771,6 +774,7 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) LoaderLock ll; // Iterate through the supplied set, until all modules have been attached. + CriticalSectionLocker cs(g_symbolLock); for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { UINT32 moduleFlags = 0x0; @@ -784,7 +788,6 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) LPCWSTR modulepath = (*newit).path.c_str(); DWORD modulesize = (DWORD)((*newit).addrHigh - (*newit).addrLow) + 1; - g_symbolLock.Enter(); if ((state == 3) && (moduleFlags & VLD_MODULE_SYMBOLSLOADED)) { // Discard the previously loaded symbols, so we can refresh them. DbgTrace(L"dbghelp32.dll %i: SymUnloadModule64\n", GetCurrentThreadId()); @@ -801,11 +804,9 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) IMAGEHLP_MODULE64 moduleimageinfo; moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); BOOL SymbolsLoaded = SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo); - g_symbolLock.Leave(); if (!SymbolsLoaded) { - CriticalSectionLocker cs(g_heapMapLock); // fix GetModuleFileName thread lock CriticalSectionLocker csSL(g_symbolLock); DbgTrace(L"dbghelp32.dll %i: SymLoadModuleEx\n", GetCurrentThreadId()); DWORD64 module = SymLoadModuleEx(g_currentProcess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0); @@ -1240,6 +1241,7 @@ SIZE_T VisualLeakDetector::eraseDuplicates (const BlockMap::Iterator &element, S SIZE_T erased = 0; // Iterate through all block maps, looking for blocks with the same size // and callstack as the specified element. + CriticalSectionLocker cs(g_heapMapLock); for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { BlockMap *blockmap = &(*heapit).second->blockMap; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { @@ -1281,28 +1283,25 @@ tls_t* VisualLeakDetector::getTls () if (tls == NULL) { DWORD threadId = GetCurrentThreadId(); - { - CriticalSectionLocker cs(m_tlsLock); - TlsMap::Iterator it = m_tlsMap->find(threadId); - if(it == m_tlsMap->end()) { - // This thread's thread local storage structure has not been allocated. - tls = new tls_t; + CriticalSectionLocker cs(m_tlsLock); + TlsMap::Iterator it = m_tlsMap->find(threadId); + if (it == m_tlsMap->end()) { + // This thread's thread local storage structure has not been allocated. + tls = new tls_t; - // Add this thread's TLS to the TlsSet. - m_tlsMap->insert(threadId,tls); - } - else { - // Already had a thread with this ID - tls = (*it).second; - } + // Add this thread's TLS to the TlsSet. + m_tlsMap->insert(threadId, tls); + } else { + // Already had a thread with this ID + tls = (*it).second; } - TlsSetValue(m_tlsIndex, tls); ZeroMemory(&tls->context, sizeof(tls->context)); tls->flags = 0x0; tls->oldFlags = 0x0; tls->threadId = threadId; tls->blockWithoutGuard = NULL; + TlsSetValue(m_tlsIndex, tls); } return tls; @@ -1330,6 +1329,8 @@ tls_t* VisualLeakDetector::getTls () // VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool debugcrtalloc, DWORD threadId, blockinfo_t* &pblockInfo) { + CriticalSectionLocker cs(g_heapMapLock); + // Record the block's information. blockinfo_t* blockinfo = new blockinfo_t(); blockinfo->callStack = NULL; @@ -1350,7 +1351,6 @@ VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool d m_maxAlloc = m_curAlloc; // Insert the block's information into the block map. - CriticalSectionLocker cs(g_heapMapLock); HeapMap::Iterator heapit = m_heapMap->find(heap); if (heapit == m_heapMap->end()) { // We haven't mapped this heap to a block map yet. Do it now. @@ -1366,11 +1366,12 @@ VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool d // mechanism unknown to VLD), or the heap wouldn't have allocated it // again. Replace the previously allocated info with the new info. blockit = blockmap->find(mem); - m_curAlloc -= (*blockit).second->size; - delete (*blockit).second; + blockinfo_t* info = (*blockit).second; + m_curAlloc -= info->size; + Report(L"VLD: New allocation at already allocated address: 0x%p with size: %u and new size: %u\n", mem, info->size, size); + delete info; blockmap->erase(blockit); blockmap->insert(mem, blockinfo); - pblockInfo = NULL; } } @@ -1386,11 +1387,13 @@ VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool d // VOID VisualLeakDetector::mapHeap (HANDLE heap) { + CriticalSectionLocker cs(g_heapMapLock); + // Create a new block map for this heap and insert it into the heap map. heapinfo_t* heapinfo = new heapinfo_t; heapinfo->blockMap.reserve(BLOCK_MAP_RESERVE); heapinfo->flags = 0x0; - CriticalSectionLocker cs(g_heapMapLock); + HeapMap::Iterator heapit = m_heapMap->insert(heap, heapinfo); if (heapit == m_heapMap->end()) { // Somehow this heap has been created twice without being destroyed, @@ -1541,6 +1544,8 @@ VOID VisualLeakDetector::unmapHeap (HANDLE heap) VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, bool debugcrtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context) { + CriticalSectionLocker cs(g_heapMapLock); + if (newmem != mem) { // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. @@ -1551,7 +1556,6 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was reallocated in-place. Find the existing blockinfo_t // entry in the block map and update it with the new callstack and size. - CriticalSectionLocker cs(g_heapMapLock); HeapMap::Iterator heapit = m_heapMap->find(heap); if (heapit == m_heapMap->end()) { // We haven't mapped this heap to a block map yet. Obviously the @@ -1866,6 +1870,7 @@ blockinfo_t* VisualLeakDetector::findAllocedBlock(LPCVOID mem, __out HANDLE& hea heap = NULL; blockinfo_t* result = NULL; // Iterate through all heaps + CriticalSectionLocker cs(g_heapMapLock); for (HeapMap::Iterator it = m_heapMap->begin(); it != m_heapMap->end(); ++it) @@ -2235,10 +2240,9 @@ VOID VisualLeakDetector::RefreshModules() } // Start using the new set of loaded modules. - m_modulesLock.Enter(); + CriticalSectionLocker cs(m_modulesLock); ModuleSet* oldmodules = m_loadedModules; m_loadedModules = newmodules; - m_modulesLock.Leave(); // Free resources used by the old module list. delete oldmodules; @@ -2481,9 +2485,8 @@ void VisualLeakDetector::GlobalDisableLeakDetection () return; } - m_optionsLock.Enter(); + CriticalSectionLocker cs(m_optionsLock); m_options |= VLD_OPT_START_DISABLED; - m_optionsLock.Leave(); // Disable memory leak detection for all threads. CriticalSectionLocker cstls(m_tlsLock); @@ -2502,10 +2505,9 @@ void VisualLeakDetector::GlobalEnableLeakDetection () return; } - m_optionsLock.Enter(); + CriticalSectionLocker cs(m_optionsLock); m_options &= ~VLD_OPT_START_DISABLED; m_status &= ~VLD_STATUS_NEVER_ENABLED; - m_optionsLock.Leave(); // Enable memory leak detection for all threads. CriticalSectionLocker cstls(m_tlsLock); diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 268c440e..b33527a4 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -1513,10 +1513,11 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m // Create the heap. HANDLE heap = m_HeapCreate(options, initsize, maxsize); + CriticalSectionLocker cs(g_heapMapLock); + // Map the created heap handle to a new block map. g_vld.mapHeap(heap); - CriticalSectionLocker cs(g_heapMapLock); HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); assert(heapit != g_vld.m_heapMap->end()); diff --git a/src/vldheap.cpp b/src/vldheap.cpp index 7615cfc2..df32b06f 100644 --- a/src/vldheap.cpp +++ b/src/vldheap.cpp @@ -167,14 +167,13 @@ void* vldnew (size_t size, const char *file, int line) header->size = size; // Link the block into the block list. - g_vldHeapLock.Enter(); + CriticalSectionLocker cs(g_vldHeapLock); header->next = g_vldBlockList; if (header->next != NULL) { header->next->prev = header; } header->prev = NULL; g_vldBlockList = header; - g_vldHeapLock.Leave(); // Return a pointer to the beginning of the data section of the block. return (void*)VLDBLOCKDATA(header); @@ -198,7 +197,7 @@ void vlddelete (void *block) vldblockheader_t *header = VLDBLOCKHEADER((LPVOID)block); // Unlink the block from the block list. - g_vldHeapLock.Enter(); + CriticalSectionLocker cs(g_vldHeapLock); if (header->prev) { header->prev->next = header->next; } @@ -209,7 +208,6 @@ void vlddelete (void *block) if (header->next) { header->next->prev = header->prev; } - g_vldHeapLock.Leave(); // Free the block. freed = RtlFreeHeap(g_vldHeap, 0x0, header); From 8d20b9f50670246b48e79c85ba92d74fc6ec01e8 Mon Sep 17 00:00:00 2001 From: ioannis Date: Thu, 17 Sep 2015 16:53:24 +0300 Subject: [PATCH 249/321] Clean up VS2013 and VS2015 project files --- lib/cppformat/format.vcxproj | 119 +------ lib/cppformat/format.vcxproj.filters | 2 +- lib/cppformat/format_vs12.vcxproj | 119 +------ lib/cppformat/format_vs12.vcxproj.filters | 2 +- lib/gtest/msvc/gtest.vcxproj | 154 +-------- lib/gtest/msvc/gtest_vs12.vcxproj | 153 +-------- src/tests/Common.props | 2 +- src/tests/basics/basics.vcxproj | 134 +------- src/tests/basics/basics_vs12.vcxproj | 134 +------- src/tests/corruption/corruption.vcxproj | 124 +------ src/tests/corruption/corruption_vs12.vcxproj | 125 +------ src/tests/dynamic_app/dynamic_app.vcxproj | 137 +------- .../dynamic_app/dynamic_app_vs12.vcxproj | 142 +------- src/tests/dynamic_dll/dynamic.vcxproj | 155 +-------- src/tests/dynamic_dll/dynamic_vs12.vcxproj | 155 +-------- src/tests/mfc/vldmfc.vcxproj | 316 +----------------- src/tests/mfc/vldmfc_vs12.vcxproj | 314 +---------------- src/tests/mfc_dll/mfc.vcxproj | 164 +-------- src/tests/mfc_dll/mfc_vs12.vcxproj | 162 +-------- src/tests/suite/testsuite.vcxproj | 176 +--------- src/tests/suite/testsuite_vs12.vcxproj | 177 +--------- src/vld.vcxproj | 45 +-- src/vld_vs12.vcxproj | 44 +-- vld_vs10.sln | 193 +++++++---- vld_vs11.sln | 193 +++++++---- vld_vs12.sln | 2 +- vld_vs14.sln | 92 ++--- 27 files changed, 453 insertions(+), 3082 deletions(-) diff --git a/lib/cppformat/format.vcxproj b/lib/cppformat/format.vcxproj index 53cf7dfb..529178a2 100644 --- a/lib/cppformat/format.vcxproj +++ b/lib/cppformat/format.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -26,27 +26,8 @@ 8.1 - + StaticLibrary - false - MultiByte - v140_xp - - - StaticLibrary - false - MultiByte - v140_xp - - - StaticLibrary - false - MultiByte - v140_xp - - - StaticLibrary - false MultiByte v140_xp @@ -59,136 +40,52 @@ <_ProjectFileVersion>10.0.20506.1 - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - $(ProjectName) - $(ProjectName) - .lib - .lib - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - $(ProjectName) - $(ProjectName) - .lib - .lib + $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - .;gmock;%(AdditionalIncludeDirectories) - Debug/ EnableFastChecks CompileAsCpp - EditAndContinue Sync - NotUsing MultiThreadedDebug true Level3 - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) - $(IntDir) + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) Disabled - - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - .;gmock;%(AdditionalIncludeDirectories) - - - .;gmock;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - .;gmock;%(AdditionalIncludeDirectories) - Debug/ EnableFastChecks CompileAsCpp - ProgramDatabase Sync - NotUsing MultiThreadedDebug true Level3 - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) - $(IntDir) + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) Disabled - - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - .;gmock;%(AdditionalIncludeDirectories) - - - .;gmock;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - .;gmock;%(AdditionalIncludeDirectories) - Release/ CompileAsCpp - ProgramDatabase Sync - NotUsing MultiThreaded true Level3 - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) - $(IntDir) + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - .;gmock;%(AdditionalIncludeDirectories) - - - .;gmock;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - .;gmock;%(AdditionalIncludeDirectories) - Release/ CompileAsCpp - ProgramDatabase Sync - NotUsing MultiThreaded true Level3 - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) - $(IntDir) + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - .;gmock;%(AdditionalIncludeDirectories) - - - .;gmock;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - diff --git a/lib/cppformat/format.vcxproj.filters b/lib/cppformat/format.vcxproj.filters index ce1d0af3..7d1e3d30 100644 --- a/lib/cppformat/format.vcxproj.filters +++ b/lib/cppformat/format.vcxproj.filters @@ -1,5 +1,5 @@  - + Source Files diff --git a/lib/cppformat/format_vs12.vcxproj b/lib/cppformat/format_vs12.vcxproj index f780bcfa..5a382c09 100644 --- a/lib/cppformat/format_vs12.vcxproj +++ b/lib/cppformat/format_vs12.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -26,27 +26,8 @@ 8.1 - + StaticLibrary - false - MultiByte - v120_xp - - - StaticLibrary - false - MultiByte - v120_xp - - - StaticLibrary - false - MultiByte - v120_xp - - - StaticLibrary - false MultiByte v120_xp @@ -59,136 +40,52 @@ <_ProjectFileVersion>10.0.20506.1 - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - $(ProjectName) - $(ProjectName) - .lib - .lib - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - $(ProjectName) - $(ProjectName) - .lib - .lib + $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - .;gmock;%(AdditionalIncludeDirectories) - Debug/ EnableFastChecks CompileAsCpp - EditAndContinue Sync - NotUsing MultiThreadedDebug true Level3 - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) - $(IntDir) + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) Disabled - - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - .;gmock;%(AdditionalIncludeDirectories) - - - .;gmock;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - .;gmock;%(AdditionalIncludeDirectories) - Debug/ EnableFastChecks CompileAsCpp - ProgramDatabase Sync - NotUsing MultiThreadedDebug true Level3 - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) - $(IntDir) + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) Disabled - - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - .;gmock;%(AdditionalIncludeDirectories) - - - .;gmock;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - .;gmock;%(AdditionalIncludeDirectories) - Release/ CompileAsCpp - ProgramDatabase Sync - NotUsing MultiThreaded true Level3 - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) - $(IntDir) + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - .;gmock;%(AdditionalIncludeDirectories) - - - .;gmock;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - .;gmock;%(AdditionalIncludeDirectories) - Release/ CompileAsCpp - ProgramDatabase Sync - NotUsing MultiThreaded true Level3 - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) - $(IntDir) + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - .;gmock;%(AdditionalIncludeDirectories) - - - .;gmock;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - diff --git a/lib/cppformat/format_vs12.vcxproj.filters b/lib/cppformat/format_vs12.vcxproj.filters index ce1d0af3..7d1e3d30 100644 --- a/lib/cppformat/format_vs12.vcxproj.filters +++ b/lib/cppformat/format_vs12.vcxproj.filters @@ -1,5 +1,5 @@  - + Source Files diff --git a/lib/gtest/msvc/gtest.vcxproj b/lib/gtest/msvc/gtest.vcxproj index 3994bdf4..69a54247 100644 --- a/lib/gtest/msvc/gtest.vcxproj +++ b/lib/gtest/msvc/gtest.vcxproj @@ -1,5 +1,5 @@  - + Debug_StaticCrt @@ -39,44 +39,10 @@ Win32Proj libgtest 8.1 + libgtest - - StaticLibrary - v140_xp - MultiByte - - - StaticLibrary - v140_xp - MultiByte - - - StaticLibrary - v140_xp - MultiByte - - - StaticLibrary - v140_xp - MultiByte - - - StaticLibrary - v140_xp - MultiByte - - - StaticLibrary - v140_xp - MultiByte - - - StaticLibrary - v140_xp - MultiByte - - + StaticLibrary v140_xp MultiByte @@ -84,96 +50,32 @@ - - - - - - - - - - - - - - - - - - - - - - + <_ProjectFileVersion>14.0.22823.1 - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ + $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ Disabled WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL - Level3 - EditAndContinue - - $(OutDir)gtestd.lib - Disabled WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug - - Level3 - EditAndContinue - - $(OutDir)gtestd.lib - @@ -181,14 +83,8 @@ WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL - - Level3 - ProgramDatabase - - $(OutDir)gtestd.lib - @@ -196,76 +92,40 @@ WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug - - Level3 - ProgramDatabase - - $(OutDir)gtestd.lib - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL - Level3 - ProgramDatabase - - $(OutDir)gtest.lib - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded - - Level3 - ProgramDatabase - - $(OutDir)gtest.lib - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL - - Level3 - ProgramDatabase - - $(OutDir)gtest.lib - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded - - Level3 - ProgramDatabase - - $(OutDir)gtest.lib - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) diff --git a/lib/gtest/msvc/gtest_vs12.vcxproj b/lib/gtest/msvc/gtest_vs12.vcxproj index 18f10f7e..914b78b8 100644 --- a/lib/gtest/msvc/gtest_vs12.vcxproj +++ b/lib/gtest/msvc/gtest_vs12.vcxproj @@ -1,5 +1,5 @@  - + Debug_StaticCrt @@ -42,42 +42,7 @@ libgtest - - StaticLibrary - v120_xp - MultiByte - - - StaticLibrary - v120_xp - MultiByte - - - StaticLibrary - v120_xp - MultiByte - - - StaticLibrary - v120_xp - MultiByte - - - StaticLibrary - v120_xp - MultiByte - - - StaticLibrary - v120_xp - MultiByte - - - StaticLibrary - v120_xp - MultiByte - - + StaticLibrary v120_xp MultiByte @@ -85,96 +50,32 @@ - - - - - - - - - - - - - - - - - - - - - - + <_ProjectFileVersion>14.0.22823.1 - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - bin\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\ - obj\$(Platform)-$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ + $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ Disabled WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL - Level3 - EditAndContinue - - $(OutDir)gtestd.lib - Disabled WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug - - Level3 - EditAndContinue - - $(OutDir)gtestd.lib - @@ -182,14 +83,8 @@ WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL - - Level3 - ProgramDatabase - - $(OutDir)gtestd.lib - @@ -197,76 +92,40 @@ WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug - - Level3 - ProgramDatabase - - $(OutDir)gtestd.lib - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL - Level3 - ProgramDatabase - - $(OutDir)gtest.lib - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded - - Level3 - ProgramDatabase - - $(OutDir)gtest.lib - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL - - Level3 - ProgramDatabase - - $(OutDir)gtest.lib - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded - - Level3 - ProgramDatabase - - $(OutDir)gtest.lib - - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) - ..;..\include;%(AdditionalIncludeDirectories) + ..;..\include;%(AdditionalIncludeDirectories) diff --git a/src/tests/Common.props b/src/tests/Common.props index 19f55a3b..ab6f0789 100644 --- a/src/tests/Common.props +++ b/src/tests/Common.props @@ -19,7 +19,7 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ diff --git a/src/tests/basics/basics.vcxproj b/src/tests/basics/basics.vcxproj index 8ffa710a..42865e30 100644 --- a/src/tests/basics/basics.vcxproj +++ b/src/tests/basics/basics.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -53,139 +53,60 @@ {0943354A-41E0-4215-878A-8D0FE758052C} Win32Proj - basics + test_basics test_basics 8.1 - + Application - true Unicode v140_xp + + true + - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - false - v140_xp - Application true - Unicode - false - v140_xp - Application true - Unicode - false - v140_xp - Application true - Unicode - false - v140_xp - Application false true - Unicode - v140_xp - Application false true - Unicode - v140_xp - Application false true - Unicode - v140_xp - Application false true - Unicode - v140_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -237,10 +158,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -254,10 +172,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -270,10 +185,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -287,10 +199,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -303,10 +212,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -320,10 +226,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -336,10 +239,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -353,10 +253,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -373,7 +270,6 @@ true true - @@ -391,7 +287,6 @@ true true - @@ -408,7 +303,6 @@ true true - @@ -426,7 +320,6 @@ true true - @@ -439,18 +332,7 @@ - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create + Create diff --git a/src/tests/basics/basics_vs12.vcxproj b/src/tests/basics/basics_vs12.vcxproj index e2bece88..e771f6da 100644 --- a/src/tests/basics/basics_vs12.vcxproj +++ b/src/tests/basics/basics_vs12.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -58,134 +58,55 @@ 8.1 - + Application - true Unicode v120_xp + + true + - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - false - v120_xp - Application true - Unicode - false - v120_xp - Application true - Unicode - false - v120_xp - Application true - Unicode - false - v120_xp - Application false true - Unicode - v120_xp - Application false true - Unicode - v120_xp - Application false true - Unicode - v120_xp - Application false true - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -237,10 +158,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -254,10 +172,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -270,10 +185,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -287,10 +199,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -303,10 +212,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -320,10 +226,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -336,10 +239,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -353,10 +253,7 @@ Console true - NotSet - %(AdditionalDependencies) - @@ -373,7 +270,6 @@ true true - @@ -391,7 +287,6 @@ true true - @@ -408,7 +303,6 @@ true true - @@ -426,7 +320,6 @@ true true - @@ -439,25 +332,14 @@ - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create + Create {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} false false diff --git a/src/tests/corruption/corruption.vcxproj b/src/tests/corruption/corruption.vcxproj index 3d71b76f..e5ebc986 100644 --- a/src/tests/corruption/corruption.vcxproj +++ b/src/tests/corruption/corruption.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -55,132 +55,58 @@ Win32Proj corruption 8.1 + corruption - + Application - true Unicode v140_xp + + true + - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application false true - Unicode - v140_xp - Application false true - Unicode - v140_xp - Application false true - Unicode - v140_xp - Application false true - Unicode - v140_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -223,8 +149,6 @@ - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -233,12 +157,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -247,12 +168,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -262,12 +180,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -277,12 +192,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -291,12 +203,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -305,12 +214,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -320,12 +226,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -335,13 +238,10 @@ Console true - Level3 - - true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -352,13 +252,10 @@ true true - Level3 - - true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -370,13 +267,10 @@ true true - Level3 - - true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -387,13 +281,10 @@ true true - Level3 - - true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -405,7 +296,6 @@ true true - diff --git a/src/tests/corruption/corruption_vs12.vcxproj b/src/tests/corruption/corruption_vs12.vcxproj index 11f07352..0b298452 100644 --- a/src/tests/corruption/corruption_vs12.vcxproj +++ b/src/tests/corruption/corruption_vs12.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -58,130 +58,55 @@ corruption - + Application - true Unicode v120_xp + + true + - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application false true - Unicode - v120_xp - Application false true - Unicode - v120_xp - Application false true - Unicode - v120_xp - Application false true - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -224,8 +149,6 @@ - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -234,12 +157,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -248,12 +168,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -263,12 +180,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -278,12 +192,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -292,12 +203,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -306,12 +214,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -321,12 +226,9 @@ Console true - - - Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -336,13 +238,10 @@ Console true - Level3 - - true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -353,13 +252,10 @@ true true - Level3 - - true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -371,13 +267,10 @@ true true - Level3 - - true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -388,13 +281,10 @@ true true - Level3 - - true true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -406,7 +296,6 @@ true true - @@ -422,7 +311,7 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} false false diff --git a/src/tests/dynamic_app/dynamic_app.vcxproj b/src/tests/dynamic_app/dynamic_app.vcxproj index 5b6a06fe..41521ddb 100644 --- a/src/tests/dynamic_app/dynamic_app.vcxproj +++ b/src/tests/dynamic_app/dynamic_app.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -55,144 +55,67 @@ Win32Proj dynamic_app 8.1 + dynamic_app - + Application - true Unicode v140_xp + + true + - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application true - Unicode - v140_xp - Application false true - Unicode - v140_xp - Application false true - Unicode - v140_xp - Application false true - Unicode - v140_xp - Application false true - Unicode - v140_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + true - - true - true @@ -202,11 +125,9 @@ true - true true - true true @@ -228,8 +149,6 @@ - - Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -238,16 +157,9 @@ Console true - - - - - - - Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -257,16 +169,9 @@ Console true - - - - - - - Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -275,12 +180,9 @@ Console true - - - Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -290,12 +192,9 @@ Console true - - - Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -304,12 +203,9 @@ Console true - - - Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -319,12 +215,9 @@ Console true - - - Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -333,12 +226,9 @@ Console true - - - Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -348,13 +238,10 @@ Console true - Level4 - - MaxSpeed true true @@ -366,13 +253,10 @@ true true - Level4 - - MaxSpeed true true @@ -385,13 +269,10 @@ true true - Level4 - - true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -401,13 +282,10 @@ true true - Level4 - - true STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded @@ -418,7 +296,6 @@ true true - diff --git a/src/tests/dynamic_app/dynamic_app_vs12.vcxproj b/src/tests/dynamic_app/dynamic_app_vs12.vcxproj index 38e5278b..cba6689b 100644 --- a/src/tests/dynamic_app/dynamic_app_vs12.vcxproj +++ b/src/tests/dynamic_app/dynamic_app_vs12.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -58,142 +58,64 @@ dynamic_app - + Application - true Unicode v120_xp + + true + - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application true - Unicode - v120_xp - Application false true - Unicode - v120_xp - Application false true - Unicode - v120_xp - Application false true - Unicode - v120_xp - Application false true - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + true - - true - true @@ -203,11 +125,9 @@ true - true true - true true @@ -229,8 +149,6 @@ - - Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -239,16 +157,9 @@ Console true - - - - - - - Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -258,16 +169,9 @@ Console true - - - - - - - Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -276,12 +180,9 @@ Console true - - - Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -291,12 +192,9 @@ Console true - - - Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -305,12 +203,9 @@ Console true - - - Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -320,12 +215,9 @@ Console true - - - Level4 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -334,12 +226,9 @@ Console true - - - Level4 Disabled STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -349,13 +238,10 @@ Console true - Level4 - - MaxSpeed true true @@ -367,13 +253,10 @@ true true - Level4 - - MaxSpeed true true @@ -386,13 +269,10 @@ true true - Level4 - - true VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) @@ -402,13 +282,10 @@ true true - Level4 - - true STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded @@ -419,7 +296,6 @@ true true - @@ -437,13 +313,13 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} false false false - + {3aea2aaf-3e9b-466f-b361-560b95ad88b4} false false @@ -451,7 +327,7 @@ false false - + {2178e5b2-1032-441f-a664-f3d8d1fd1913} false false diff --git a/src/tests/dynamic_dll/dynamic.vcxproj b/src/tests/dynamic_dll/dynamic.vcxproj index 0c1a106d..189f4881 100644 --- a/src/tests/dynamic_dll/dynamic.vcxproj +++ b/src/tests/dynamic_dll/dynamic.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -58,130 +58,55 @@ 8.1 - + DynamicLibrary - true Unicode v140_xp + + true + - DynamicLibrary true - Unicode - v140_xp - DynamicLibrary true - Unicode - v140_xp - DynamicLibrary true - Unicode - v140_xp - DynamicLibrary true - Unicode - v140_xp - DynamicLibrary true - Unicode - v140_xp - DynamicLibrary true - Unicode - v140_xp - DynamicLibrary true - Unicode - v140_xp - DynamicLibrary false true - Unicode - v140_xp - DynamicLibrary false true - Unicode - v140_xp - DynamicLibrary false true - Unicode - v140_xp - DynamicLibrary false true - Unicode - v140_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -232,8 +157,6 @@ Windows true - - @@ -247,8 +170,6 @@ Windows true - - @@ -261,8 +182,6 @@ Windows true - - @@ -275,8 +194,6 @@ Windows true - - @@ -289,8 +206,6 @@ Windows true - - @@ -304,8 +219,6 @@ Windows true - - @@ -318,8 +231,6 @@ Windows true - - @@ -332,8 +243,6 @@ Windows true - - @@ -410,58 +319,10 @@ - - false - false - false - false - false - false - false - false - - - - - - - - - - - - - - - - - false - false - false - false - - - - - - - - - + - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create + Create diff --git a/src/tests/dynamic_dll/dynamic_vs12.vcxproj b/src/tests/dynamic_dll/dynamic_vs12.vcxproj index 826dd205..70a123e2 100644 --- a/src/tests/dynamic_dll/dynamic_vs12.vcxproj +++ b/src/tests/dynamic_dll/dynamic_vs12.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -58,130 +58,55 @@ 8.1 - + DynamicLibrary - true Unicode v120_xp + + true + - DynamicLibrary true - Unicode - v120_xp - DynamicLibrary true - Unicode - v120_xp - DynamicLibrary true - Unicode - v120_xp - DynamicLibrary true - Unicode - v120_xp - DynamicLibrary true - Unicode - v120_xp - DynamicLibrary true - Unicode - v120_xp - DynamicLibrary true - Unicode - v120_xp - DynamicLibrary false true - Unicode - v120_xp - DynamicLibrary false true - Unicode - v120_xp - DynamicLibrary false true - Unicode - v120_xp - DynamicLibrary false true - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -232,8 +157,6 @@ Windows true - - @@ -247,8 +170,6 @@ Windows true - - @@ -261,8 +182,6 @@ Windows true - - @@ -275,8 +194,6 @@ Windows true - - @@ -289,8 +206,6 @@ Windows true - - @@ -304,8 +219,6 @@ Windows true - - @@ -318,8 +231,6 @@ Windows true - - @@ -332,8 +243,6 @@ Windows true - - @@ -410,58 +319,10 @@ - - false - false - false - false - false - false - false - false - - - - - - - - - - - - - - - - - false - false - false - false - - - - - - - - - + - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create + Create diff --git a/src/tests/mfc/vldmfc.vcxproj b/src/tests/mfc/vldmfc.vcxproj index 793dbe5f..9d2ddad3 100644 --- a/src/tests/mfc/vldmfc.vcxproj +++ b/src/tests/mfc/vldmfc.vcxproj @@ -1,5 +1,5 @@  - + Debug_StaticCrt @@ -38,88 +38,43 @@ {A231973E-072A-428E-982E-5363ADD1CDE2} MFCProj 8.1 + vldmfc + vldmfc - + Application - Dynamic Unicode v140_xp + + Dynamic + - Application Static - Unicode - v140_xp - Application Dynamic - Unicode - v140_xp - Application Static - Unicode - v140_xp - Application Dynamic - Unicode - v140_xp - Application Static - Unicode - v140_xp - Application Dynamic - Unicode - v140_xp - Application Static - Unicode - v140_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -159,24 +114,7 @@ - - - - - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/vldmfc.tlb - - - MaxSpeed OnlyExplicitInline @@ -185,39 +123,18 @@ MultiThreadedDLL true Level3 - true Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true Windows false - - - MachineX86 true - - true - .\Release/vldmfc.bsc - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/vldmfc.tlb - - - MaxSpeed OnlyExplicitInline @@ -226,38 +143,18 @@ MultiThreaded true Level3 - true Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true Windows false - - - MachineX86 true - - true - .\Release/vldmfc.bsc - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/vldmfc.tlb - - - MaxSpeed OnlyExplicitInline @@ -266,37 +163,18 @@ MultiThreadedDLL true Level3 - true Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true Windows false - - true - - true - .\Release/vldmfc.bsc - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/vldmfc.tlb - - - MaxSpeed OnlyExplicitInline @@ -305,81 +183,36 @@ MultiThreaded true Level3 - true Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true Windows false - - true - - true - .\Release/vldmfc.bsc - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/vldmfc.tlb - - - Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL Use - stdafx.h - .\Debug/vldmfc.pch Level3 - true - EditAndContinue _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true true Windows false - - - MachineX86 - - true - .\Debug/vldmfc.bsc - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/vldmfc.tlb - - - Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) @@ -387,187 +220,62 @@ EnableFastChecks MultiThreadedDebug Use - stdafx.h - .\Debug/vldmfc.pch Level3 - true - EditAndContinue _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true true Windows false - - - MachineX86 - - true - .\Debug/vldmfc.bsc - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/vldmfc.tlb - - - Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use - stdafx.h - .\Debug/vldmfc.pch Level3 - true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true true Windows false - - - - true - .\Debug/vldmfc.bsc - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/vldmfc.tlb - - - Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use - stdafx.h - .\Debug/vldmfc.pch Level3 - true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true true Windows false - - - - true - .\Debug/vldmfc.bsc - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - Create - Create - Create - Create - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - Create - Create - Create - Create - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) + Create + + - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - + diff --git a/src/tests/mfc/vldmfc_vs12.vcxproj b/src/tests/mfc/vldmfc_vs12.vcxproj index 57a4bbfe..7d1b33e2 100644 --- a/src/tests/mfc/vldmfc_vs12.vcxproj +++ b/src/tests/mfc/vldmfc_vs12.vcxproj @@ -1,5 +1,5 @@  - + Debug_StaticCrt @@ -42,86 +42,39 @@ vldmfc - + Application - Dynamic Unicode v120_xp + + Dynamic + - Application Static - Unicode - v120_xp - Application Dynamic - Unicode - v120_xp - Application Static - Unicode - v120_xp - Application Dynamic - Unicode - v120_xp - Application Static - Unicode - v120_xp - Application Dynamic - Unicode - v120_xp - Application Static - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -161,24 +114,7 @@ - - - - - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/vldmfc.tlb - - - MaxSpeed OnlyExplicitInline @@ -187,39 +123,18 @@ MultiThreadedDLL true Level3 - true Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true Windows false - - - MachineX86 true - - true - .\Release/vldmfc.bsc - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/vldmfc.tlb - - - MaxSpeed OnlyExplicitInline @@ -228,38 +143,18 @@ MultiThreaded true Level3 - true Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true Windows false - - - MachineX86 true - - true - .\Release/vldmfc.bsc - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/vldmfc.tlb - - - MaxSpeed OnlyExplicitInline @@ -268,37 +163,18 @@ MultiThreadedDLL true Level3 - true Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true Windows false - - true - - true - .\Release/vldmfc.bsc - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/vldmfc.tlb - - - MaxSpeed OnlyExplicitInline @@ -307,81 +183,36 @@ MultiThreaded true Level3 - true Use NDEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true Windows false - - true - - true - .\Release/vldmfc.bsc - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/vldmfc.tlb - - - Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL Use - stdafx.h - .\Debug/vldmfc.pch Level3 - true - EditAndContinue _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true true Windows false - - - MachineX86 - - true - .\Debug/vldmfc.bsc - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/vldmfc.tlb - - - Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) @@ -389,187 +220,62 @@ EnableFastChecks MultiThreadedDebug Use - stdafx.h - .\Debug/vldmfc.pch Level3 - true - EditAndContinue _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true true Windows false - - - MachineX86 - - true - .\Debug/vldmfc.bsc - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/vldmfc.tlb - - - Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use - stdafx.h - .\Debug/vldmfc.pch Level3 - true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true true Windows false - - - - true - .\Debug/vldmfc.bsc - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/vldmfc.tlb - - - Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use - stdafx.h - .\Debug/vldmfc.pch Level3 - true - ProgramDatabase _DEBUG;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)\vldmfc.exe - true true Windows false - - - - true - .\Debug/vldmfc.bsc - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - Create - Create - Create - Create - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - Create - Create - Create - Create - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) + Create + + - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - + diff --git a/src/tests/mfc_dll/mfc.vcxproj b/src/tests/mfc_dll/mfc.vcxproj index bcc0e7a1..7610e72d 100644 --- a/src/tests/mfc_dll/mfc.vcxproj +++ b/src/tests/mfc_dll/mfc.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -52,148 +52,73 @@ {2178E5B2-1032-441F-A664-F3D8D1FD1913} - mfc + test_mfc MFCDLLProj test_mfc 8.1 - + DynamicLibrary - true Unicode - Dynamic v140_xp + + true + Dynamic + - DynamicLibrary true - Unicode Static - v140_xp - DynamicLibrary true - Unicode Dynamic - v140_xp - DynamicLibrary true - Unicode Static - v140_xp - DynamicLibrary true - Unicode Dynamic - v140_xp - DynamicLibrary true - Unicode Static - v140_xp - DynamicLibrary true - Unicode Dynamic - v140_xp - DynamicLibrary true - Unicode Static - v140_xp - DynamicLibrary false true - Unicode Dynamic - v140_xp - DynamicLibrary false true - Unicode Static - v140_xp - DynamicLibrary false true - Unicode Dynamic - v140_xp - DynamicLibrary false true - Unicode Static - v140_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -246,12 +171,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -269,12 +189,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -291,12 +206,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -313,12 +223,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -335,12 +240,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -358,12 +258,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -380,12 +275,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -402,12 +292,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -428,12 +313,7 @@ true .\mfc.def - - false - NDEBUG;%(PreprocessorDefinitions) - - 0x0409 NDEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -455,12 +335,7 @@ true .\mfc.def - - false - NDEBUG;%(PreprocessorDefinitions) - - 0x0409 NDEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -481,12 +356,7 @@ true .\mfc.def - - false - NDEBUG;%(PreprocessorDefinitions) - - 0x0409 NDEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -508,12 +378,7 @@ true .\mfc.def - - false - NDEBUG;%(PreprocessorDefinitions) - - 0x0409 NDEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -525,18 +390,7 @@ - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create + Create diff --git a/src/tests/mfc_dll/mfc_vs12.vcxproj b/src/tests/mfc_dll/mfc_vs12.vcxproj index 49f4aa61..964c7bb1 100644 --- a/src/tests/mfc_dll/mfc_vs12.vcxproj +++ b/src/tests/mfc_dll/mfc_vs12.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -58,142 +58,67 @@ 8.1 - + DynamicLibrary - true Unicode - Dynamic v120_xp + + true + Dynamic + - DynamicLibrary true - Unicode Static - v120_xp - DynamicLibrary true - Unicode Dynamic - v120_xp - DynamicLibrary true - Unicode Static - v120_xp - DynamicLibrary true - Unicode Dynamic - v120_xp - DynamicLibrary true - Unicode Static - v120_xp - DynamicLibrary true - Unicode Dynamic - v120_xp - DynamicLibrary true - Unicode Static - v120_xp - DynamicLibrary false true - Unicode Dynamic - v120_xp - DynamicLibrary false true - Unicode Static - v120_xp - DynamicLibrary false true - Unicode Dynamic - v120_xp - DynamicLibrary false true - Unicode Static - v120_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -246,12 +171,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -269,12 +189,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -291,12 +206,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -313,12 +223,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -335,12 +240,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -358,12 +258,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -380,12 +275,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -402,12 +292,7 @@ true .\mfc.def - - false - _DEBUG;%(PreprocessorDefinitions) - - 0x0409 _DEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -428,12 +313,7 @@ true .\mfc.def - - false - NDEBUG;%(PreprocessorDefinitions) - - 0x0409 NDEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -455,12 +335,7 @@ true .\mfc.def - - false - NDEBUG;%(PreprocessorDefinitions) - - 0x0409 NDEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -481,12 +356,7 @@ true .\mfc.def - - false - NDEBUG;%(PreprocessorDefinitions) - - 0x0409 NDEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -508,12 +378,7 @@ true .\mfc.def - - false - NDEBUG;%(PreprocessorDefinitions) - - 0x0409 NDEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) @@ -525,18 +390,7 @@ - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create + Create diff --git a/src/tests/suite/testsuite.vcxproj b/src/tests/suite/testsuite.vcxproj index ba62eabe..632f8a1c 100644 --- a/src/tests/suite/testsuite.vcxproj +++ b/src/tests/suite/testsuite.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -53,73 +53,11 @@ {EE4A829C-5FD8-460B-8A90-B518B9BABB70} testsuite - - - - - - - - 8.1 + testsuite - - Application - NotSet - v140_xp - - - Application - NotSet - v140_xp - - - Application - NotSet - v140_xp - - - Application - NotSet - v140_xp - - - Application - NotSet - v140_xp - - - Application - NotSet - v140_xp - - - Application - NotSet - v140_xp - - - Application - NotSet - v140_xp - - - Application - NotSet - v140_xp - - - Application - NotSet - v140_xp - - - Application - NotSet - v140_xp - - + Application NotSet v140_xp @@ -127,51 +65,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -215,47 +109,33 @@ - - - - - - - - Disabled WIN32;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL false - EditAndContinue false true Console - Disabled WIN32;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug false - EditAndContinue false true Console - @@ -271,7 +151,6 @@ true Console - @@ -287,90 +166,64 @@ true Console - Disabled WIN32;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL false - EditAndContinue true true Console - Disabled WIN32;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug false - EditAndContinue true true Console - - - X64 - Disabled WIN64;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL false - ProgramDatabase false true - MachineX64 Console - - - - X64 - Disabled WIN64;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug false - ProgramDatabase false true - MachineX64 Console - - - - X64 - Full VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) @@ -381,16 +234,11 @@ true true - MachineX64 true Console - - - X64 - Full VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) @@ -401,55 +249,39 @@ true true - MachineX64 true Console - - - X64 - Disabled WIN64;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL false - ProgramDatabase true true - MachineX64 true Console - - - X64 - Disabled WIN64;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug false - ProgramDatabase true true - MachineX64 true Console - diff --git a/src/tests/suite/testsuite_vs12.vcxproj b/src/tests/suite/testsuite_vs12.vcxproj index d2491214..970ffcca 100644 --- a/src/tests/suite/testsuite_vs12.vcxproj +++ b/src/tests/suite/testsuite_vs12.vcxproj @@ -1,5 +1,5 @@  - + Debug(Release)_StaticCrt @@ -53,74 +53,11 @@ {EE4A829C-5FD8-460B-8A90-B518B9BABB70} testsuite - - - - - - - - 8.1 testsuite - - Application - NotSet - v120_xp - - - Application - NotSet - v120_xp - - - Application - NotSet - v120_xp - - - Application - NotSet - v120_xp - - - Application - NotSet - v120_xp - - - Application - NotSet - v120_xp - - - Application - NotSet - v120_xp - - - Application - NotSet - v120_xp - - - Application - NotSet - v120_xp - - - Application - NotSet - v120_xp - - - Application - NotSet - v120_xp - - + Application NotSet v120_xp @@ -128,51 +65,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -216,47 +109,33 @@ - - - - - - - - Disabled WIN32;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL false - EditAndContinue false true Console - Disabled WIN32;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug false - EditAndContinue false true Console - @@ -272,7 +151,6 @@ true Console - @@ -288,90 +166,64 @@ true Console - Disabled WIN32;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL false - EditAndContinue true true Console - Disabled WIN32;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug false - EditAndContinue true true Console - - - X64 - Disabled WIN64;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL false - ProgramDatabase false true - MachineX64 Console - - - - X64 - Disabled WIN64;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug false - ProgramDatabase false true - MachineX64 Console - - - - X64 - Full VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) @@ -382,16 +234,11 @@ true true - MachineX64 true Console - - - X64 - Full VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) @@ -402,55 +249,39 @@ true true - MachineX64 true Console - - - X64 - Disabled WIN64;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebugDLL false - ProgramDatabase true true - MachineX64 true Console - - - X64 - Disabled WIN64;%(PreprocessorDefinitions) - true EnableFastChecks MultiThreadedDebug false - ProgramDatabase true true - MachineX64 true Console - @@ -459,7 +290,7 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} false false diff --git a/src/vld.vcxproj b/src/vld.vcxproj index 97dc35a0..7753dc58 100644 --- a/src/vld.vcxproj +++ b/src/vld.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,33 +21,17 @@ {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} vld - - - - - - - - Unicode DynamicLibrary true x86 x64 8.1 + vld - - v140_xp - - - v140_xp - - - v140_xp - - + v140_xp @@ -55,10 +39,9 @@ <_ProjectFileVersion>10.0.30128.1 $(ProjectDir)bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ NativeRecommendedRules.ruleset $(ProjectName)_$(NumericPlatform) - .dll false @@ -85,10 +68,6 @@ false $(SolutionDir)\lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) - - - - copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y @@ -104,9 +83,8 @@ MultiThreadedDebug Level4 false - EditAndContinue false - 4201;4229 + 4201;4229;4091;4302;4311;4312;4127 psapi.lib;%(AdditionalDependencies) @@ -124,12 +102,10 @@ MultiThreadedDebug Level4 false - ProgramDatabase - 4201;4229 + 4201;4229;4091;4302;4311;4312;4127 false - MachineX64 psapi.lib;%(AdditionalDependencies) Windows @@ -150,15 +126,13 @@ MultiThreaded false Fast - OldStyle false - 4201;4229 + 4201;4229;4091;4302;4311;4312;4127 false true true - %(AdditionalDependencies) Windows @@ -175,18 +149,15 @@ MultiThreaded false Fast - OldStyle false false - 4201;4229 + 4201;4229;4091;4302;4311;4312;4127 false true true - MachineX64 true - %(AdditionalDependencies) Windows diff --git a/src/vld_vs12.vcxproj b/src/vld_vs12.vcxproj index ce66e3f7..5f1391e8 100644 --- a/src/vld_vs12.vcxproj +++ b/src/vld_vs12.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,14 +21,6 @@ {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} vld - - - - - - - - Unicode DynamicLibrary true @@ -39,16 +31,7 @@ - - v120_xp - - - v120_xp - - - v120_xp - - + v120_xp @@ -56,10 +39,9 @@ <_ProjectFileVersion>10.0.30128.1 $(ProjectDir)bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ NativeRecommendedRules.ruleset $(ProjectName)_$(NumericPlatform) - .dll false @@ -86,10 +68,6 @@ false $(SolutionDir)\lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) - - - - copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y @@ -105,9 +83,8 @@ MultiThreadedDebug Level4 false - EditAndContinue false - 4201;4229 + 4201;4229;4091;4302;4311;4312;4127 psapi.lib;%(AdditionalDependencies) @@ -125,12 +102,10 @@ MultiThreadedDebug Level4 false - ProgramDatabase - 4201;4229 + 4201;4229;4091;4302;4311;4312;4127 false - MachineX64 psapi.lib;%(AdditionalDependencies) Windows @@ -151,15 +126,13 @@ MultiThreaded false Fast - OldStyle false - 4201;4229 + 4201;4229;4091;4302;4311;4312;4127 false true true - %(AdditionalDependencies) Windows @@ -176,18 +149,15 @@ MultiThreaded false Fast - OldStyle false false - 4201;4229 + 4201;4229;4091;4302;4311;4312;4127 false true true - MachineX64 true - %(AdditionalDependencies) Windows diff --git a/vld_vs10.sln b/vld_vs10.sln index e6636c55..700b330d 100644 --- a/vld_vs10.sln +++ b/vld_vs10.sln @@ -38,22 +38,36 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\cor EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 + Debug(Release)_StaticCrt|x64 = Debug(Release)_StaticCrt|x64 + Debug(Release)|Win32 = Debug(Release)|Win32 + Debug(Release)|x64 = Debug(Release)|x64 Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 Debug_StaticCrt|x64 = Debug_StaticCrt|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - DebugRelease_StaticCrt|Win32 = DebugRelease_StaticCrt|Win32 - DebugRelease_StaticCrt|x64 = DebugRelease_StaticCrt|x64 - DebugRelease|Win32 = DebugRelease|Win32 - DebugRelease|x64 = DebugRelease|x64 Release_StaticCrt|Win32 = Release_StaticCrt|Win32 Release_StaticCrt|x64 = Release_StaticCrt|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 @@ -62,14 +76,6 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 @@ -78,6 +84,14 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -86,14 +100,6 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -102,6 +108,14 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -110,14 +124,6 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -126,6 +132,14 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -134,14 +148,6 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -150,6 +156,14 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -158,14 +172,6 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -174,6 +180,14 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -182,14 +196,6 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -198,6 +204,14 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -206,14 +220,6 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -222,6 +228,14 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -230,14 +244,6 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.ActiveCfg = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.ActiveCfg = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.Build.0 = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -246,6 +252,54 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -257,7 +311,10 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} EndGlobalSection EndGlobal diff --git a/vld_vs11.sln b/vld_vs11.sln index 4e09a56c..6073009f 100644 --- a/vld_vs11.sln +++ b/vld_vs11.sln @@ -38,22 +38,36 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\cor EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 + Debug(Release)_StaticCrt|x64 = Debug(Release)_StaticCrt|x64 + Debug(Release)|Win32 = Debug(Release)|Win32 + Debug(Release)|x64 = Debug(Release)|x64 Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 Debug_StaticCrt|x64 = Debug_StaticCrt|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - DebugRelease_StaticCrt|Win32 = DebugRelease_StaticCrt|Win32 - DebugRelease_StaticCrt|x64 = DebugRelease_StaticCrt|x64 - DebugRelease|Win32 = DebugRelease|Win32 - DebugRelease|x64 = DebugRelease|x64 Release_StaticCrt|Win32 = Release_StaticCrt|Win32 Release_StaticCrt|x64 = Release_StaticCrt|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 @@ -62,14 +76,6 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.DebugRelease|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 @@ -78,6 +84,14 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -86,14 +100,6 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -102,6 +108,14 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -110,14 +124,6 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -126,6 +132,14 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -134,14 +148,6 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -150,6 +156,14 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -158,14 +172,6 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -174,6 +180,14 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -182,14 +196,6 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|Win32.Build.0 = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.ActiveCfg = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.DebugRelease|x64.Build.0 = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -198,6 +204,14 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -206,14 +220,6 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.DebugRelease|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -222,6 +228,14 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -230,14 +244,6 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.ActiveCfg = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.ActiveCfg = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.DebugRelease|x64.Build.0 = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -246,6 +252,54 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -257,7 +311,10 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} EndGlobalSection EndGlobal diff --git a/vld_vs12.sln b/vld_vs12.sln index 31fef29e..804347cb 100644 --- a/vld_vs12.sln +++ b/vld_vs12.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld_vs12.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" EndProject diff --git a/vld_vs14.sln b/vld_vs14.sln index 374db686..13ad9fb2 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -48,12 +48,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 - Debug_StaticCrt|x64 = Debug_StaticCrt|x64 Debug_VldRelease_StaticCrt|Win32 = Debug_VldRelease_StaticCrt|Win32 Debug_VldRelease_StaticCrt|x64 = Debug_VldRelease_StaticCrt|x64 Debug_VldRelease|Win32 = Debug_VldRelease|Win32 Debug_VldRelease|x64 = Debug_VldRelease|x64 + Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 + Debug_StaticCrt|x64 = Debug_StaticCrt|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release_StaticCrt|Win32 = Release_StaticCrt|Win32 @@ -62,10 +62,6 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 @@ -74,6 +70,10 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 @@ -86,10 +86,6 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -98,6 +94,10 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 @@ -110,10 +110,6 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -122,6 +118,10 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 @@ -134,10 +134,6 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -146,6 +142,10 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 @@ -158,10 +158,6 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -170,6 +166,10 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 @@ -182,10 +182,6 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -194,6 +190,10 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 @@ -206,10 +206,6 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -218,6 +214,10 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 @@ -230,10 +230,6 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -242,6 +238,10 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 @@ -254,10 +254,6 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -266,6 +262,10 @@ Global {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.Build.0 = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.ActiveCfg = Debug|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 @@ -278,10 +278,6 @@ Global {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 @@ -290,6 +286,10 @@ Global {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.Build.0 = Release|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.ActiveCfg = Release|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 @@ -309,14 +309,14 @@ Global GlobalSection(NestedProjects) = preSolution {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} EndGlobalSection EndGlobal From ad0d2795b9fe5dd080931443805cc6f04b77fd88 Mon Sep 17 00:00:00 2001 From: ioannis Date: Thu, 24 Sep 2015 23:07:04 +0300 Subject: [PATCH 250/321] Fix building with source path with spaces Copy test dependencies prior to the build --- src/tests/Common.props | 6 +++--- src/tests/copydlls.bat | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/tests/Common.props b/src/tests/Common.props index ab6f0789..a01e9c3e 100644 --- a/src/tests/Common.props +++ b/src/tests/Common.props @@ -22,10 +22,10 @@ $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - call ..\copydlls.bat $(Platform)\$(VldConfiguration)-v$(PlatformToolsetVersion) $(NumericPlatform) $(Outdir) + + call ..\copydlls.bat $(Platform)\$(VldConfiguration)-v$(PlatformToolsetVersion) $(NumericPlatform) "$(Outdir)" Copying over Visual Leak Detector Dependencies - + $(SolutionDir)\src\;$(SolutionDir)\lib\gtest\include;%(AdditionalIncludeDirectories) _VARIADIC_MAX=10;%(PreprocessorDefinitions) diff --git a/src/tests/copydlls.bat b/src/tests/copydlls.bat index 8a3713ba..c84b0f27 100644 --- a/src/tests/copydlls.bat +++ b/src/tests/copydlls.bat @@ -1,6 +1,6 @@ REM Copying over Visual Leak Detector Dependencies -xcopy %~dp0\..\..\vld.ini %~dp0\..\bin\ /y /d -copy %~dp0\..\bin\%1\vld_%2.dll %3\vld_%2.dll /y -copy %~dp0\..\bin\%1\vld_%2.pdb %3\vld_%2.pdb /y -copy %~dp0\..\..\setup\dbghelp\%2\dbghelp.dll %3\dbghelp.dll /y -copy %~dp0\..\..\setup\dbghelp\%2\Microsoft.DTfW.DHL.manifest %3\Microsoft.DTfW.DHL.manifest /y \ No newline at end of file +xcopy "%~dp0\..\..\vld.ini" "%~dp0\..\bin\" /y /d +copy "%~dp0\..\bin\%1\vld_%2.dll" "%~3\vld_%2.dll" /y +copy "%~dp0\..\bin\%1\vld_%2.pdb" "%~3\vld_%2.pdb" /y +copy "%~dp0\..\..\setup\dbghelp\%2\dbghelp.dll" "%~3\dbghelp.dll" /y +copy "%~dp0\..\..\setup\dbghelp\%2\Microsoft.DTfW.DHL.manifest" "%~3\Microsoft.DTfW.DHL.manifest" /y \ No newline at end of file From 1af5dfbb7850de905b1f1eed88636dadea163822 Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 25 Sep 2015 17:56:25 +0300 Subject: [PATCH 251/321] Ignore CRT allocations in debug runtime --- src/vld.cpp | 27 +++++++++++++++++++++++++++ src/vldheap.h | 1 + 2 files changed, 28 insertions(+) diff --git a/src/vld.cpp b/src/vld.cpp index 9bf72119..4cd1cb7e 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -1686,6 +1686,15 @@ SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo, DWORD threadId) if (threadId != ((DWORD)-1) && info->threadId != threadId) continue; + if (!info->debugCrtAlloc) { + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + SIZE_T nSize = sizeof(crtdbgblockheader_t) + crtheader->size + GAPSIZE; + int nValid = _CrtIsValidPointer(block, (unsigned int)info->size, TRUE); + if (_BLOCK_TYPE_IS_VALID(crtheader->use) && nValid && (nSize == info->size)) { + info->debugCrtAlloc = true; + } + } + if (info->debugCrtAlloc) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header pretended to it. @@ -1765,6 +1774,15 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S LPCVOID address = block; SIZE_T size = info->size; + if (!info->debugCrtAlloc) { + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + SIZE_T nSize = sizeof(crtdbgblockheader_t) + crtheader->size + GAPSIZE; + int nValid = _CrtIsValidPointer(block, (unsigned int)info->size, TRUE); + if (_BLOCK_TYPE_IS_VALID(crtheader->use) && nValid && (nSize == info->size)) { + info->debugCrtAlloc = true; + } + } + if (info->debugCrtAlloc) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header pretended to it. @@ -2712,6 +2730,15 @@ int VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) const void* address = block; assert(address != NULL); + if (!info->debugCrtAlloc) { + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + SIZE_T nSize = sizeof(crtdbgblockheader_t) + crtheader->size + GAPSIZE; + int nValid = _CrtIsValidPointer(block, (unsigned int)info->size, TRUE); + if (_BLOCK_TYPE_IS_VALID(crtheader->use) && nValid && (nSize == info->size)) { + info->debugCrtAlloc = true; + } + } + if (info->debugCrtAlloc) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header prepended to it. diff --git a/src/vldheap.h b/src/vldheap.h index d5fd4fb0..beb86887 100644 --- a/src/vldheap.h +++ b/src/vldheap.h @@ -64,6 +64,7 @@ typedef char checkDebugHeapBlockAlignment[ // Macro to strip off any sub-type information stored in a block's "use type". #define CRT_USE_TYPE(use) (use & 0xFFFF) +#define _BLOCK_TYPE_IS_VALID(use) (_BLOCK_TYPE(use) == _CLIENT_BLOCK || (use) == _NORMAL_BLOCK || _BLOCK_TYPE(use) == _CRT_BLOCK || (use) == _IGNORE_BLOCK) // Memory block header structure used internally by VLD. All internally // allocated blocks are allocated from VLD's private heap and have this header From 39754a05a69c32b04d4a706035a18d1129541f6c Mon Sep 17 00:00:00 2001 From: ioannis Date: Mon, 28 Sep 2015 10:12:31 +0300 Subject: [PATCH 252/321] Add option to skip reporting crt startup allocations as memory leaks Optimise identification and cache of crt leaks Exclude internal modules stack lines for VS2013 Use beginWith and endWith to compare file paths to simplify and make code easier to maintain --- src/callstack.cpp | 199 ++++++++++++++++++++++++++++++++++++++-------- src/callstack.h | 80 ++++++++++--------- src/vld.cpp | 32 +++++++- src/vld_def.h | 1 + vld.ini | 9 +++ 5 files changed, 248 insertions(+), 73 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index dfe7de01..fb758260 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -36,6 +36,24 @@ extern CriticalSection g_heapMapLock; extern CriticalSection g_symbolLock; extern VisualLeakDetector g_vld; +// Helper function to compare the begin of a string with a substring +// +template +bool beginWith(const LPCWSTR filename, size_t len, wchar_t const (&substr)[N]) +{ + size_t count = N - 1; + return ((len > count) && wcsncmp(filename, substr, count) == 0); +} + +// Helper function to compare the end of a string with a substring +// +template +bool endWith(const LPCWSTR filename, size_t len, wchar_t const (&substr)[N]) +{ + size_t count = N - 1; + return ((len > count) && wcsncmp(filename + len - count, substr, count) == 0); +} + // Constructor - Initializes the CallStack with an initial size of zero and one // Chunk of capacity. // @@ -257,6 +275,56 @@ DWORD CallStack::resolveFunction(SIZE_T programCounter, IMAGEHLP_LINEW64* source } +// isCrtStartupAlloc - Determines whether the memory leak was generated from crt startup code. +// This is not an actual memory leaks as it is freed by crt after the VLD object has been destroyed. +// +// Return Value: +// +// true if isCrtStartupModule for any callstack frame returns true. +// +bool CallStack::isCrtStartupAlloc() +{ + if (m_status & CALLSTACK_STATUS_STARTUPCRT) { + return true; + } else if (m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) { + return false; + } + + IMAGEHLP_LINE64 sourceInfo = { 0 }; + sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); + + BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; + + // Iterate through each frame in the call stack. + CriticalSectionLocker cs(g_symbolLock); + for (UINT32 frame = 0; frame < m_size; frame++) { + // Try to get the source file and line number associated with + // this program counter address. + SIZE_T programCounter = (*this)[frame]; + BOOL foundline = FALSE; + DWORD displacement = 0; + DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); + foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + + if (foundline) { + DWORD64 displacement64; + LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); + if (beginWith(functionName, wcslen(functionName), L"`dynamic initializer for '")) { + break; + } + + if (isCrtStartupModule(sourceInfo.FileName)) { + m_status |= CALLSTACK_STATUS_STARTUPCRT; + return true; + } + } + } + + m_status |= CALLSTACK_STATUS_NOTSTARTUPCRT; + return false; +} + + // dump - Dumps a nicely formatted rendition of the CallStack, including // symbolic information (function names and line numbers) if available. // @@ -290,8 +358,6 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const IMAGEHLP_LINE64 sourceInfo = { 0 }; sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - WCHAR lowerCaseName [MAX_PATH]; - // Use static here to increase performance, and avoid heap allocs. // It's thread safe because of g_heapMapLock lock. static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; @@ -311,9 +377,7 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const bool isFrameInternal = false; if (foundline && !showInternalFrames) { - wcscpy_s(lowerCaseName, sourceInfo.FileName); - _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); - if (isInternalModule(lowerCaseName)) + if (isInternalModule(sourceInfo.FileName)) { // Don't show frames in files internal to the heap. isFrameInternal = true; @@ -363,6 +427,12 @@ int CallStack::resolve(BOOL showInternalFrames) // if the memory was leaked in a dynamic library that was already unloaded. return 0; } + + if (m_status & CALLSTACK_STATUS_STARTUPCRT) { + // there is no need to resolve a leak that will not be reported + return 0; + } + if (m_status & CALLSTACK_STATUS_INCOMPLETE) { // This call stack appears to be incomplete. Using StackWalk64 may be // more reliable. @@ -375,12 +445,13 @@ int CallStack::resolve(BOOL showInternalFrames) IMAGEHLP_LINE64 sourceInfo = { 0 }; sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - WCHAR lowerCaseName[MAX_PATH]; + bool skipStartupLeaks = !!(g_vld.GetOptions() & VLD_OPT_SKIP_CRTSTARTUP_LEAKS); // Use static here to increase performance, and avoid heap allocs. // It's thread safe because of g_heapMapLock lock. static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; bool isPrevFrameInternal = false; + bool isDynamicInitializer = false; DWORD NumChars = 0; const size_t max_line_length = MAXREPORTLENGTH + 1; @@ -406,11 +477,19 @@ int CallStack::resolve(BOOL showInternalFrames) DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); BOOL foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + if (skipStartupLeaks && foundline && !isDynamicInitializer && + !(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) && isCrtStartupModule(sourceInfo.FileName)) { + m_status |= CALLSTACK_STATUS_STARTUPCRT; + delete[] m_resolved; + m_resolved = NULL; + m_resolvedCapacity = 0; + m_resolvedLength = 0; + return 0; + } + bool isFrameInternal = false; if (foundline && !showInternalFrames) { - wcscpy_s(lowerCaseName, sourceInfo.FileName); - _wcslwr_s(lowerCaseName, wcslen(lowerCaseName) + 1); - if (isInternalModule(lowerCaseName)) { + if (isInternalModule(sourceInfo.FileName)) { // Don't show frames in files internal to the heap. isFrameInternal = true; } @@ -428,6 +507,10 @@ int CallStack::resolve(BOOL showInternalFrames) DWORD64 displacement64; BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); + + if (skipStartupLeaks && foundline && beginWith(functionName, wcslen(functionName), L"`dynamic initializer for '")) { + isDynamicInitializer = true; + } if (!foundline) displacement = (DWORD)displacement64; @@ -441,6 +524,8 @@ int CallStack::resolve(BOOL showInternalFrames) } } } // end for loop + + m_status |= CALLSTACK_STATUS_NOTSTARTUPCRT; return unresolvedFunctionsCount; } @@ -488,34 +573,80 @@ VOID CallStack::push_back (const UINT_PTR programcounter) m_size++; } +bool CallStack::isCrtStartupModule( const PWSTR filename ) const +{ + size_t len = wcslen(filename); + return + // VS2015 + endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\stdio\\_file.cpp") || + endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\startup\\onexit.cpp") || + endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\startup\\initterm.cpp") || + endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\startup\\argv_parsing.cpp") || + endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\internal\\initialization.cpp") || + endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\internal\\shared_initialization.cpp") || + endWith(filename, len, L"\\crts\\ucrt\\src\\desktopcrt\\env\\environment_initialization.cpp") || + // VS2013 + endWith(filename, len, L"\\crt\\crtw32\\startup\\crt0dat.c") || + endWith(filename, len, L"\\crt\\crtw32\\startup\\stdargv.c") || + endWith(filename, len, L"\\crt\\crtw32\\startup\\stdenvp.c") || + endWith(filename, len, L"\\crt\\crtw32\\lowio\\ioinit.c") || + // VS2010 + endWith(filename, len, L"\\crt\\src\\crt0dat.c") || //_cinit() + endWith(filename, len, L"\\crt\\src\\stdargv.c") || //_wsetargv() + endWith(filename, len, L"\\crt\\src\\stdenvp.c") || //_wsetenvp() + endWith(filename, len, L"\\crt\\src\\ioinit.c") || //_ioinit() + endWith(filename, len, L"\\crt\\src\\tidtable.c") || //_mtinit() + // default + (false); +} + bool CallStack::isInternalModule( const PWSTR filename ) const { - return wcsstr(filename, L"\\crt\\src\\afxmem.cpp") || - wcsstr(filename, L"\\crt\\src\\dbgheap.c") || - wcsstr(filename, L"\\crt\\src\\malloc.c") || - wcsstr(filename, L"\\crt\\src\\dbgmalloc.c") || - wcsstr(filename, L"\\crt\\src\\new.cpp") || - wcsstr(filename, L"\\crt\\src\\newaop.cpp") || - wcsstr(filename, L"\\crt\\src\\dbgnew.cpp") || - wcsstr(filename, L"\\crt\\src\\dbgcalloc.c") || - wcsstr(filename, L"\\crt\\src\\realloc.c") || - wcsstr(filename, L"\\crt\\src\\dbgrealloc.c") || - wcsstr(filename, L"\\crt\\src\\dbgdel.cp") || - wcsstr(filename, L"\\crt\\src\\free.c") || - wcsstr(filename, L"\\crt\\src\\strdup.c") || - wcsstr(filename, L"\\crt\\src\\wcsdup.c") || - wcsstr(filename, L"\\vc\\include\\xmemory0") || + size_t len = wcslen(filename); + return // VS2015 - wcsstr(filename, L"\\atlmfc\\include\\atlsimpstr.h") || - wcsstr(filename, L"\\atlmfc\\include\\cstringt.h") || - wcsstr(filename, L"\\atlmfc\\src\\mfc\\afxmem.cpp") || - wcsstr(filename, L"\\atlmfc\\src\\mfc\\strcore.cpp") || - wcsstr(filename, L"\\vcstartup\\src\\heap\\new_scalar.cpp") || - wcsstr(filename, L"\\vcstartup\\src\\heap\\new_array.cpp") || - wcsstr(filename, L"\\vcstartup\\src\\heap\\new_debug.cpp") || - wcsstr(filename, L"\\ucrt\\src\\appcrt\\heap\\align.cpp") || - wcsstr(filename, L"\\ucrt\\src\\appcrt\\heap\\malloc.cpp") || - wcsstr(filename, L"\\ucrt\\src\\appcrt\\heap\\debug_heap.cpp"); + endWith(filename, len, L"\\atlmfc\\include\\atlsimpstr.h") || + endWith(filename, len, L"\\atlmfc\\include\\cstringt.h") || + endWith(filename, len, L"\\atlmfc\\src\\mfc\\afxmem.cpp") || + endWith(filename, len, L"\\atlmfc\\src\\mfc\\strcore.cpp") || + endWith(filename, len, L"\\vcstartup\\src\\heap\\new_scalar.cpp") || + endWith(filename, len, L"\\vcstartup\\src\\heap\\new_array.cpp") || + endWith(filename, len, L"\\vcstartup\\src\\heap\\new_debug.cpp") || + endWith(filename, len, L"\\ucrt\\src\\appcrt\\heap\\align.cpp") || + endWith(filename, len, L"\\ucrt\\src\\appcrt\\heap\\malloc.cpp") || + endWith(filename, len, L"\\ucrt\\src\\appcrt\\heap\\debug_heap.cpp") || + // VS2013 + beginWith(filename, len, L"f:\\dd\\vctools\\crt\\crtw32\\") || + //endWith(filename, len, L"\\crt\\crtw32\\misc\\dbgheap.c") || + //endWith(filename, len, L"\\crt\\crtw32\\misc\\dbgnew.cpp") || + //endWith(filename, len, L"\\crt\\crtw32\\misc\\dbgmalloc.c") || + //endWith(filename, len, L"\\crt\\crtw32\\misc\\dbgrealloc.c") || + //endWith(filename, len, L"\\crt\\crtw32\\heap\\new.cpp") || + //endWith(filename, len, L"\\crt\\crtw32\\heap\\new2.cpp") || + //endWith(filename, len, L"\\crt\\crtw32\\heap\\malloc.c") || + //endWith(filename, len, L"\\crt\\crtw32\\heap\\realloc.c") || + //endWith(filename, len, L"\\crt\\crtw32\\heap\\calloc.c") || + //endWith(filename, len, L"\\crt\\crtw32\\heap\\calloc_impl.c") || + //endWith(filename, len, L"\\crt\\crtw32\\string\\strdup.c") || + //endWith(filename, len, L"\\crt\\crtw32\\string\\wcsdup.c") || + // VS2010 + endWith(filename, len, L"\\crt\\src\\afxmem.cpp") || + endWith(filename, len, L"\\crt\\src\\dbgheap.c") || + endWith(filename, len, L"\\crt\\src\\dbgnew.cpp") || + endWith(filename, len, L"\\crt\\src\\dbgmalloc.c") || + endWith(filename, len, L"\\crt\\src\\dbgcalloc.c") || + endWith(filename, len, L"\\crt\\src\\dbgrealloc.c") || + endWith(filename, len, L"\\crt\\src\\dbgdel.cp") || + endWith(filename, len, L"\\crt\\src\\new.cpp") || + endWith(filename, len, L"\\crt\\src\\newaop.cpp") || + endWith(filename, len, L"\\crt\\src\\malloc.c") || + endWith(filename, len, L"\\crt\\src\\realloc.c") || + endWith(filename, len, L"\\crt\\src\\free.c") || + endWith(filename, len, L"\\crt\\src\\strdup.c") || + endWith(filename, len, L"\\crt\\src\\wcsdup.c") || + endWith(filename, len, L"\\vc\\include\\xmemory0") || + // default + (false); } // getStackTrace - Traces the stack as far back as possible, or until 'maxdepth' diff --git a/src/callstack.h b/src/callstack.h index 772502c9..15cbd6eb 100644 --- a/src/callstack.h +++ b/src/callstack.h @@ -25,8 +25,8 @@ #ifndef VLDBUILD #error \ - "This header should only be included by Visual Leak Detector when building it from source. \ - Applications should never include this header." + "This header should only be included by Visual Leak Detector when building it from source. \ + Applications should never include this header." #endif #include @@ -78,50 +78,54 @@ class CallStack { public: - CallStack (); - virtual ~CallStack (); - static CallStack* Create(); - // Public APIs - see each function definition for details. - VOID clear (); - // Prints the call stack to one of either / or the debug output window and or - // a log file. - VOID dump (BOOL showinternalframes, UINT start_frame = 0) const; + CallStack (); + virtual ~CallStack (); + static CallStack* Create(); + // Public APIs - see each function definition for details. + VOID clear (); + // Prints the call stack to one of either / or the debug output window and or + // a log file. + VOID dump (BOOL showinternalframes, UINT start_frame = 0) const; // Formats the stack frame into a human readable format, and saves it for later retrieval. - int resolve(BOOL showinternalframes); + int resolve(BOOL showinternalframes); virtual DWORD getHashValue() const = 0; - virtual VOID getStackTrace (UINT32 maxdepth, const context_t& context) = 0; + virtual VOID getStackTrace (UINT32 maxdepth, const context_t& context) = 0; + bool isCrtStartupAlloc(); - BOOL operator == (const CallStack &other) const; - UINT_PTR operator [] (UINT32 index) const; - VOID push_back (const UINT_PTR programcounter); + BOOL operator == (const CallStack &other) const; + UINT_PTR operator [] (UINT32 index) const; + VOID push_back (const UINT_PTR programcounter); protected: - // Protected data. - UINT32 m_status; // Status flags: -#define CALLSTACK_STATUS_INCOMPLETE 0x1 // If set, the stack trace stored in this CallStack appears to be incomplete. + // Protected data. + UINT32 m_status; // Status flags: +#define CALLSTACK_STATUS_INCOMPLETE 0x1 // If set, the stack trace stored in this CallStack appears to be incomplete. +#define CALLSTACK_STATUS_STARTUPCRT 0x2 // If set, the stack trace is startup CRT. +#define CALLSTACK_STATUS_NOTSTARTUPCRT 0x4 // If set, the stack trace is not startup CRT. - // The chunk list is made of a linked list of Chunks. - struct chunk_t { - chunk_t* next; // Pointer to the next chunk in the chunk list. - UINT_PTR frames[CALLSTACK_CHUNK_SIZE]; // Pushed frames (program counter addresses) are stored in this array. - }; + // The chunk list is made of a linked list of Chunks. + struct chunk_t { + chunk_t* next; // Pointer to the next chunk in the chunk list. + UINT_PTR frames[CALLSTACK_CHUNK_SIZE]; // Pushed frames (program counter addresses) are stored in this array. + }; - // Private data. - UINT32 m_capacity; // Current capacity limit (in frames) - UINT32 m_size; // Current size (in frames) - CallStack::chunk_t m_store; // Pointer to the underlying data store (i.e. head of the chunk list) - CallStack::chunk_t* m_topChunk; // Pointer to the chunk at the top of the stack - UINT32 m_topIndex; // Index, within the top chunk, of the top of the stack + // Private data. + UINT32 m_capacity; // Current capacity limit (in frames) + UINT32 m_size; // Current size (in frames) + CallStack::chunk_t m_store; // Pointer to the underlying data store (i.e. head of the chunk list) + CallStack::chunk_t* m_topChunk; // Pointer to the chunk at the top of the stack + UINT32 m_topIndex; // Index, within the top chunk, of the top of the stack - // The string that contains the stack converted into a human readable format. - // This is always NULL if the callstack has not been 'converted'. - WCHAR* m_resolved; - int m_resolvedCapacity; - int m_resolvedLength; - // Prints out the strings in m_Resolved when the time comes to report the callstack in - // human readable form. Currently this is only called by the dump method. - void dumpResolved() const; - bool isInternalModule( const PWSTR filename ) const; + // The string that contains the stack converted into a human readable format. + // This is always NULL if the callstack has not been 'converted'. + WCHAR* m_resolved; + int m_resolvedCapacity; + int m_resolvedLength; + // Prints out the strings in m_Resolved when the time comes to report the callstack in + // human readable form. Currently this is only called by the dump method. + void dumpResolved() const; + bool isInternalModule( const PWSTR filename ) const; + bool isCrtStartupModule( const PWSTR filename ) const; LPCWSTR getFunctionName(SIZE_T programCounter, DWORD64& displacement64, SYMBOL_INFO* functionInfo) const; DWORD resolveFunction(SIZE_T programCounter, IMAGEHLP_LINEW64* sourceInfo, DWORD displacement, diff --git a/src/vld.cpp b/src/vld.cpp index 4cd1cb7e..089a4296 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -1128,6 +1128,10 @@ VOID VisualLeakDetector::configure () m_options |= VLD_OPT_SKIP_HEAPFREE_LEAKS; } + if (LoadBoolOption(L"SkipCrtStartupLeaks", L"yes", inipath)) { + m_options |= VLD_OPT_SKIP_CRTSTARTUP_LEAKS; + } + // Read the integer configuration options. m_maxDataDump = LoadIntOption(L"MaxDataDump", VLD_DEFAULT_MAX_DATA_DUMP, inipath); m_maxTraceFrames = LoadIntOption(L"MaxTraceFrames", VLD_DEFAULT_MAX_TRACE_FRAMES, inipath); @@ -1709,6 +1713,14 @@ SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo, DWORD threadId) } } + if (!info->debugCrtAlloc && (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS)) { + // Check for crt startup allocations + if (info->callStack && info->callStack->isCrtStartupAlloc()) { + info->reported = true; + continue; + } + } + memoryleaks ++; } @@ -1804,6 +1816,14 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S size = crtheader->size; } + if (!info->debugCrtAlloc && (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS)) { + // Check for crt startup allocations + if (info->callStack && info->callStack->isCrtStartupAlloc()) { + info->reported = true; + continue; + } + } + // It looks like a real memory leak. if (firstLeak) { // A confusing way to only display this message once Report(L"WARNING: Visual Leak Detector detected memory leaks!\n"); @@ -2539,7 +2559,8 @@ void VisualLeakDetector::GlobalEnableLeakDetection () CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_INCLUDE | VLD_OPT_SAFE_STACK_WALK | VLD_OPT_SLOW_DEBUGGER_DUMP | VLD_OPT_START_DISABLED | - VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS | VLD_OPT_VALIDATE_HEAPFREE; + VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_HEAPFREE_LEAKS | VLD_OPT_VALIDATE_HEAPFREE | + VLD_OPT_SKIP_CRTSTARTUP_LEAKS; UINT32 VisualLeakDetector::GetOptions() { @@ -2726,6 +2747,11 @@ int VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) { continue; } + + if (info->reported) { + continue; + } + // The actual memory address const void* address = block; assert(address != NULL); @@ -2761,6 +2787,10 @@ int VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) if (info->callStack) { unresolvedFunctionsCount += info->callStack->resolve(m_options & VLD_OPT_TRACE_INTERNAL_FRAMES); + if ((m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) && info->callStack->isCrtStartupAlloc()) { + info->reported = true; + continue; + } } } return unresolvedFunctionsCount; diff --git a/src/vld_def.h b/src/vld_def.h index 4b6d92ed..abe88fce 100644 --- a/src/vld_def.h +++ b/src/vld_def.h @@ -39,6 +39,7 @@ #define VLD_OPT_REPORT_TO_STDOUT 0x0800 // If set, the memory leak report is sent to stdout. #define VLD_OPT_SKIP_HEAPFREE_LEAKS 0x1000 // If set, VLD skip HeapFree memory leaks. #define VLD_OPT_VALIDATE_HEAPFREE 0x2000 // If set, VLD verifies and reports heap consistency for HeapFree calls. +#define VLD_OPT_SKIP_CRTSTARTUP_LEAKS 0x4000 // If set, VLD skip crt srtartup memory leaks. #define VLD_RPTHOOK_INSTALL 0 #define VLD_RPTHOOK_REMOVE 1 diff --git a/vld.ini b/vld.ini index a0b31230..53c19492 100644 --- a/vld.ini +++ b/vld.ini @@ -160,3 +160,12 @@ TraceInternalFrames = no ; Default: no ; SkipHeapFreeLeaks = no + +; Determines whether or not report memory leaks generated from crt startup code. +; These are not actual memory leaks as they are freed by crt after the VLD object +; has been destroyed. +; +; Valid Values: yes, no +; Default: yes +; +SkipCrtStartupLeaks = yes From cad4a84ecaf1c43206e425dd0023ef4d59a772c4 Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 25 Sep 2015 18:02:57 +0300 Subject: [PATCH 253/321] Add debug calls to msvcrt.dll as msvcrtd.dll is not distributed any more. --- src/dllspatches.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/dllspatches.cpp b/src/dllspatches.cpp index f1f7f142..4131b74e 100644 --- a/src/dllspatches.cpp +++ b/src/dllspatches.cpp @@ -370,6 +370,9 @@ static patchentry_t mfc140udPatch[] = { }; static patchentry_t msvcrtPatch [] = { + "_calloc_dbg", &VS60::data.pcrtd__calloc_dbg, VS60::crtd__calloc_dbg, + "_malloc_dbg", &VS60::data.pcrtd__malloc_dbg, VS60::crtd__malloc_dbg, + "_realloc_dbg", &VS60::data.pcrtd__realloc_dbg, VS60::crtd__realloc_dbg, scalar_new_dbg_name, &VS60::data.pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, //vector_new_dbg_name, &VS60::data.pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, "calloc", &VS60::data.pcrtd_calloc, VS60::crtd_calloc, From 572f66baf8211d6ba1aefccc08ea3127a6d750ae Mon Sep 17 00:00:00 2001 From: ioannis Date: Mon, 28 Sep 2015 10:32:38 +0300 Subject: [PATCH 254/321] Expression 'NumChars >= 0' is always true. Unsigned type value is always >= 0 --- src/callstack.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index fb758260..4bb9fbed 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -496,7 +496,7 @@ int CallStack::resolve(BOOL showInternalFrames) } // show one allocation function for context - if (NumChars >= 0 && !isFrameInternal && isPrevFrameInternal) { + if (NumChars > 0 && !isFrameInternal && isPrevFrameInternal) { m_resolvedLength += NumChars; if (m_resolved) { wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); @@ -517,7 +517,7 @@ int CallStack::resolve(BOOL showInternalFrames) NumChars = resolveFunction( programCounter, foundline ? &sourceInfo : NULL, displacement, functionName, stack_line, _countof( stack_line )); - if (NumChars >= 0 && !isFrameInternal) { + if (NumChars > 0 && !isFrameInternal) { m_resolvedLength += NumChars; if (m_resolved) { wcsncat_s(m_resolved, m_resolvedCapacity, stack_line, NumChars); From 523fd08eda95d4b3a133ae8ba629a20a882456e4 Mon Sep 17 00:00:00 2001 From: ioannis Date: Tue, 29 Sep 2015 01:28:18 +0300 Subject: [PATCH 255/321] Add vld_main test to ensure startup crt allocations are skipped, but dynamic initialization of static and global variables is not. Fix vld_main exit code and add a comment of expected behaviour. --- src/tests/vld_main/stdafx.cpp | 8 + src/tests/vld_main/stdafx.h | 15 ++ src/tests/vld_main/targetver.h | 8 + src/tests/vld_main/vld_main.cpp | 58 +++++++ src/tests/vld_main/vld_main.vcxproj | 149 ++++++++++++++++++ src/tests/vld_main/vld_main.vcxproj.filters | 33 ++++ src/tests/vld_main/vld_main_vs12.vcxproj | 149 ++++++++++++++++++ .../vld_main/vld_main_vs12.vcxproj.filters | 33 ++++ vld_vs12.sln | 27 ++++ vld_vs14.sln | 3 + 10 files changed, 483 insertions(+) create mode 100644 src/tests/vld_main/stdafx.cpp create mode 100644 src/tests/vld_main/stdafx.h create mode 100644 src/tests/vld_main/targetver.h create mode 100644 src/tests/vld_main/vld_main.cpp create mode 100644 src/tests/vld_main/vld_main.vcxproj create mode 100644 src/tests/vld_main/vld_main.vcxproj.filters create mode 100644 src/tests/vld_main/vld_main_vs12.vcxproj create mode 100644 src/tests/vld_main/vld_main_vs12.vcxproj.filters diff --git a/src/tests/vld_main/stdafx.cpp b/src/tests/vld_main/stdafx.cpp new file mode 100644 index 00000000..d5a2f158 --- /dev/null +++ b/src/tests/vld_main/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// vld_main.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/src/tests/vld_main/stdafx.h b/src/tests/vld_main/stdafx.h new file mode 100644 index 00000000..b005a839 --- /dev/null +++ b/src/tests/vld_main/stdafx.h @@ -0,0 +1,15 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#include +#include + + + +// TODO: reference additional headers your program requires here diff --git a/src/tests/vld_main/targetver.h b/src/tests/vld_main/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/src/tests/vld_main/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/src/tests/vld_main/vld_main.cpp b/src/tests/vld_main/vld_main.cpp new file mode 100644 index 00000000..93b62c28 --- /dev/null +++ b/src/tests/vld_main/vld_main.cpp @@ -0,0 +1,58 @@ +// vld_main.cpp : Defines the entry point for the console application. +// + +#include "stdafx.h" +#include +#include + +#define VLD_FORCE_ENABLE +#include + + +class MemoryLeak { +public: + MemoryLeak(size_t n) { l = malloc(n); } + ~MemoryLeak() { free(l); } +private: + void* l; +}; + +static void* s_m = malloc(10); +static char* s_n = new char[20]; + +static MemoryLeak* pml = new MemoryLeak(70); // leaks a new pointer and malloc(70) +static MemoryLeak ml{ 80 }; // *should* be freed and not report as a memory leak + +void* g_m = malloc(30); +char* g_n = new char[40]; + + +int _tmain(int argc, _TCHAR* argv[]) +{ + void* m = malloc(50); + char* n = new char[60]; + + // At this point VLDGetLeaksCount() and VLDReportLeaks() should report 9 leaks + // including a leak for ml which has not been freed yet. ml will be freed after + // _tmain exits but before VLDReportLeaks() is called internally by VLD and + // therefore correctly report 8 leaks. + // VLDReportLeaks(); // at this point should report 9 leaks; + return VLDGetLeaksCount() == 9 ? 0 : -1; +} + + +int WINAPI _tWinMain(__in HINSTANCE hInstance, + __in_opt HINSTANCE hPrevInstance, + __in LPWSTR lpCmdLine, + __in int nShowCmd) +{ + void* m = malloc(50); + char* n = new char[60]; + + // At this point VLDGetLeaksCount() and VLDReportLeaks() should report 9 leaks + // including a leak for ml which has not been freed yet. ml will be freed after + // _tWinMain exits but before VLDReportLeaks() is called internally by VLD and + // therefore correctly report 8 leaks. + // VLDReportLeaks(); // at this point should report 9 leaks; + return VLDGetLeaksCount() == 9 ? 0 : -1; +} diff --git a/src/tests/vld_main/vld_main.vcxproj b/src/tests/vld_main/vld_main.vcxproj new file mode 100644 index 00000000..b91cc5bd --- /dev/null +++ b/src/tests/vld_main/vld_main.vcxproj @@ -0,0 +1,149 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8C732490-DC1A-40C0-923F-1555B9141B80} + Win32Proj + vld_main + vld_main + + + + Application + v140_xp + Unicode + + + true + + + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + + + + + Create + + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_main/vld_main.vcxproj.filters b/src/tests/vld_main/vld_main.vcxproj.filters new file mode 100644 index 00000000..4644d1bb --- /dev/null +++ b/src/tests/vld_main/vld_main.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_main/vld_main_vs12.vcxproj b/src/tests/vld_main/vld_main_vs12.vcxproj new file mode 100644 index 00000000..14a884be --- /dev/null +++ b/src/tests/vld_main/vld_main_vs12.vcxproj @@ -0,0 +1,149 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8C732490-DC1A-40C0-923F-1555B9141B80} + Win32Proj + vld_main + vld_main + + + + Application + v120_xp + Unicode + + + true + + + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + + + + + Create + + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_main/vld_main_vs12.vcxproj.filters b/src/tests/vld_main/vld_main_vs12.vcxproj.filters new file mode 100644 index 00000000..4644d1bb --- /dev/null +++ b/src/tests/vld_main/vld_main_vs12.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/vld_vs12.sln b/vld_vs12.sln index 804347cb..eab82c20 100644 --- a/vld_vs12.sln +++ b/vld_vs12.sln @@ -46,6 +46,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format_vs12.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main_vs12.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 @@ -302,6 +304,30 @@ Global {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)|Win32.Build.0 = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)|x64.ActiveCfg = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.ActiveCfg = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.Build.0 = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.ActiveCfg = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.Build.0 = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.ActiveCfg = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.Build.0 = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.ActiveCfg = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -318,5 +344,6 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal diff --git a/vld_vs14.sln b/vld_vs14.sln index 13ad9fb2..798228f7 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -46,6 +46,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_VldRelease_StaticCrt|Win32 = Debug_VldRelease_StaticCrt|Win32 @@ -318,5 +320,6 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal From 3053f0af945fa861c67838b5e4264924d80de8bf Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 2 Oct 2015 16:34:33 +0300 Subject: [PATCH 256/321] Avoid access violation exceptions when calling ImageDirectoryEntryToDataEx in cases where the module has already unloaded by using parameter Base = NULL. --- src/utility.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utility.cpp b/src/utility.cpp index bf0bb6c4..d7b3d796 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -219,7 +219,7 @@ IMAGE_IMPORT_DESCRIPTOR* FindOriginalImportDescriptor (HMODULE importmodule, LPC // gives us the offset of the IAT for the module we are interested in. { CriticalSectionLocker cs(g_imageLock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } @@ -501,7 +501,7 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *patchModule) // gives us the offset of the IAT for the module we are interested in. { CriticalSectionLocker cs(g_imageLock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } @@ -822,7 +822,7 @@ VOID RestoreImport (HMODULE importmodule, moduleentry_t* module) // gives us the offset of the IAT for the module we are interested in. { CriticalSectionLocker cs(g_imageLock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)importmodule, TRUE, + idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } From 5c988df9dc6cd4fa41b86d2242f43e6f5222404c Mon Sep 17 00:00:00 2001 From: ioannis Date: Sat, 3 Oct 2015 19:05:10 +0300 Subject: [PATCH 257/321] In RestoreImport get the real address by calling g_vld._RGetProcAddress. Improve Debug Reports information to more readable format and display after hook or unhook was completed successfully. --- src/utility.cpp | 53 +++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/src/utility.cpp b/src/utility.cpp index d7b3d796..f953bcf4 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -34,6 +34,7 @@ // Imported Global Variables extern CriticalSection g_imageLock; extern ReportHookSet* g_pReportHooks; +extern VisualLeakDetector g_vld; // Global variables. static BOOL s_reportDelay = FALSE; // If TRUE, we sleep for a bit after calling OutputDebugString to give the debugger time to catch up. @@ -557,31 +558,23 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *patchModule) // writable. if (import != replacement) { -#ifdef PRINTHOOKINFO - if (!dllNamePrinted) - { - dllNamePrinted = true; - DbgReport(L"Hook dll \"%S\":\n", - strrchr(pszBuffer, '\\') + 1); - } - if (!IS_ORDINAL(importname)) - { - DbgReport(L"Hook import %S(\"%S\") for dll \"%S\".\n", - importname, patchModule->exportModuleName, importdllname); - } - else - { - DbgReport(L"Hook import %zu(\"%S\") for dll \"%S\".\n", - importname, patchModule->exportModuleName, importdllname); - } -#endif if (patchEntry->original != NULL) *patchEntry->original = func; DWORD protect; if (VirtualProtect(&thunk->u1.Function, sizeof(thunk->u1.Function), PAGE_EXECUTE_READWRITE, &protect)) { thunk->u1.Function = (DWORD_PTR)replacement; - VirtualProtect(&thunk->u1.Function, sizeof(thunk->u1.Function), protect, &protect); + if (VirtualProtect(&thunk->u1.Function, sizeof(thunk->u1.Function), protect, &protect)) { +#ifdef PRINTHOOKINFO + if (!IS_ORDINAL(importname)) { + DbgReport(L"Hook dll \"%S\" import %S!%S()\n", + strrchr(pszBuffer, '\\') + 1, patchModule->exportModuleName, importname); + } else { + DbgReport(L"Hook dll \"%S\" import %S!%zu()\n", + strrchr(pszBuffer, '\\') + 1, patchModule->exportModuleName, importname); + } +#endif + } } } // The patch has been installed in the import module. @@ -831,6 +824,14 @@ VOID RestoreImport (HMODULE importmodule, moduleentry_t* module) return; } +#ifdef PRINTHOOKINFO + bool dllNamePrinted = false; + CHAR cwBuffer[2048] = { 0 }; + LPSTR pszBuffer = cwBuffer; + DWORD dwMaxChars = _countof(cwBuffer); + DWORD dwLength = ::GetModuleFileNameA(importmodule, pszBuffer, dwMaxChars); +#endif + int result = 0; while (idte->OriginalFirstThunk != 0x0) { @@ -847,7 +848,7 @@ VOID RestoreImport (HMODULE importmodule, moduleentry_t* module) // Get the *real* address of the import. //LPCVOID original = entry->original; - LPCVOID original = GetProcAddress(exportmodule, importname); + LPCVOID original = g_vld._RGetProcAddress(exportmodule, importname); if (original == NULL) // Perhaps the named export module does not actually export the named import? { entry++; i++; @@ -873,7 +874,17 @@ VOID RestoreImport (HMODULE importmodule, moduleentry_t* module) DWORD protect; if (VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), PAGE_EXECUTE_READWRITE, &protect)) { iate->u1.Function = (DWORD_PTR)original; - VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect); + if (VirtualProtect(&iate->u1.Function, sizeof(iate->u1.Function), protect, &protect)) { +#ifdef PRINTHOOKINFO + if (!IS_ORDINAL(importname)) { + DbgReport(L"UnHook dll \"%S\" import %S!%S()\n", + strrchr(pszBuffer, '\\') + 1, module->exportModuleName, importname); + } else { + DbgReport(L"UnHook dll \"%S\" import %S!%zu()\n", + strrchr(pszBuffer, '\\') + 1, module->exportModuleName, importname); + } +#endif + } } } result++; From 2d94816ab2ca2159c5c4c94ab0bf915886283ea8 Mon Sep 17 00:00:00 2001 From: ioannis Date: Sun, 4 Oct 2015 01:17:30 +0300 Subject: [PATCH 258/321] Add vld_ComTest (after compilation the DLL should register successfully Add vld_unload test (loads and unloads two dlls and observes the loading/unloading behaviour of vld library) Fix build configurations Ignore ComTest generated files --- .gitignore | 3 + src/tests/vld_ComTest/ComTest.aps | Bin 0 -> 21292 bytes src/tests/vld_ComTest/ComTest.cpp | Bin 0 -> 3680 bytes src/tests/vld_ComTest/ComTest.def | Bin 0 -> 366 bytes src/tests/vld_ComTest/ComTest.idl | Bin 0 -> 1052 bytes src/tests/vld_ComTest/ComTest.rc | Bin 0 -> 6714 bytes src/tests/vld_ComTest/ComTest.rgs | 3 + src/tests/vld_ComTest/ComTest.sln | 22 ++ src/tests/vld_ComTest/ComTest_vs12.vcxproj | 232 ++++++++++++++++++ .../vld_ComTest/ComTest_vs12.vcxproj.filters | 86 +++++++ src/tests/vld_ComTest/ComTest_vs14.vcxproj | 232 ++++++++++++++++++ .../vld_ComTest/ComTest_vs14.vcxproj.filters | 86 +++++++ src/tests/vld_ComTest/MyMath.cpp | Bin 0 -> 444 bytes src/tests/vld_ComTest/MyMath.h | Bin 0 -> 2012 bytes src/tests/vld_ComTest/MyMath.rgs | 15 ++ src/tests/vld_ComTest/ReadMe.txt | 66 +++++ src/tests/vld_ComTest/Resource.h | Bin 0 -> 1080 bytes src/tests/vld_ComTest/dlldata.c | 37 +++ src/tests/vld_ComTest/dllmain.cpp | Bin 0 -> 1342 bytes src/tests/vld_ComTest/dllmain.h | Bin 0 -> 562 bytes src/tests/vld_ComTest/stdafx.cpp | Bin 0 -> 210 bytes src/tests/vld_ComTest/stdafx.h | Bin 0 -> 1708 bytes src/tests/vld_ComTest/targetver.h | Bin 0 -> 364 bytes src/tests/vld_ComTest/xdlldata.c | Bin 0 -> 828 bytes src/tests/vld_ComTest/xdlldata.h | 15 ++ src/tests/vld_dll1/dllmain.cpp | 29 +++ src/tests/vld_dll1/stdafx.cpp | 8 + src/tests/vld_dll1/stdafx.h | 17 ++ src/tests/vld_dll1/targetver.h | 8 + src/tests/vld_dll1/vld_dll1_vs12.vcxproj | 145 +++++++++++ .../vld_dll1/vld_dll1_vs12.vcxproj.filters | 33 +++ src/tests/vld_dll1/vld_dll1_vs14.vcxproj | 145 +++++++++++ .../vld_dll1/vld_dll1_vs14.vcxproj.filters | 33 +++ src/tests/vld_dll2/dllmain.cpp | 29 +++ src/tests/vld_dll2/stdafx.cpp | 8 + src/tests/vld_dll2/stdafx.h | 17 ++ src/tests/vld_dll2/targetver.h | 8 + src/tests/vld_dll2/vld_dll2_vs12.vcxproj | 145 +++++++++++ .../vld_dll2/vld_dll2_vs12.vcxproj.filters | 33 +++ src/tests/vld_dll2/vld_dll2_vs14.vcxproj | 145 +++++++++++ .../vld_dll2/vld_dll2_vs14.vcxproj.filters | 33 +++ ...vld_main.vcxproj => vld_main_vs14.vcxproj} | 0 ....filters => vld_main_vs14.vcxproj.filters} | 0 src/tests/vld_unload/stdafx.cpp | 8 + src/tests/vld_unload/stdafx.h | 15 ++ src/tests/vld_unload/targetver.h | 8 + src/tests/vld_unload/vld_unload.cpp | 120 +++++++++ src/tests/vld_unload/vld_unload_vs12.vcxproj | 147 +++++++++++ .../vld_unload_vs12.vcxproj.filters | 33 +++ src/tests/vld_unload/vld_unload_vs14.vcxproj | 147 +++++++++++ .../vld_unload_vs14.vcxproj.filters | 33 +++ vld_vs12.sln | 120 ++++++++- vld_vs14.sln | 146 ++++++++++- 53 files changed, 2401 insertions(+), 9 deletions(-) create mode 100644 src/tests/vld_ComTest/ComTest.aps create mode 100644 src/tests/vld_ComTest/ComTest.cpp create mode 100644 src/tests/vld_ComTest/ComTest.def create mode 100644 src/tests/vld_ComTest/ComTest.idl create mode 100644 src/tests/vld_ComTest/ComTest.rc create mode 100644 src/tests/vld_ComTest/ComTest.rgs create mode 100644 src/tests/vld_ComTest/ComTest.sln create mode 100644 src/tests/vld_ComTest/ComTest_vs12.vcxproj create mode 100644 src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters create mode 100644 src/tests/vld_ComTest/ComTest_vs14.vcxproj create mode 100644 src/tests/vld_ComTest/ComTest_vs14.vcxproj.filters create mode 100644 src/tests/vld_ComTest/MyMath.cpp create mode 100644 src/tests/vld_ComTest/MyMath.h create mode 100644 src/tests/vld_ComTest/MyMath.rgs create mode 100644 src/tests/vld_ComTest/ReadMe.txt create mode 100644 src/tests/vld_ComTest/Resource.h create mode 100644 src/tests/vld_ComTest/dlldata.c create mode 100644 src/tests/vld_ComTest/dllmain.cpp create mode 100644 src/tests/vld_ComTest/dllmain.h create mode 100644 src/tests/vld_ComTest/stdafx.cpp create mode 100644 src/tests/vld_ComTest/stdafx.h create mode 100644 src/tests/vld_ComTest/targetver.h create mode 100644 src/tests/vld_ComTest/xdlldata.c create mode 100644 src/tests/vld_ComTest/xdlldata.h create mode 100644 src/tests/vld_dll1/dllmain.cpp create mode 100644 src/tests/vld_dll1/stdafx.cpp create mode 100644 src/tests/vld_dll1/stdafx.h create mode 100644 src/tests/vld_dll1/targetver.h create mode 100644 src/tests/vld_dll1/vld_dll1_vs12.vcxproj create mode 100644 src/tests/vld_dll1/vld_dll1_vs12.vcxproj.filters create mode 100644 src/tests/vld_dll1/vld_dll1_vs14.vcxproj create mode 100644 src/tests/vld_dll1/vld_dll1_vs14.vcxproj.filters create mode 100644 src/tests/vld_dll2/dllmain.cpp create mode 100644 src/tests/vld_dll2/stdafx.cpp create mode 100644 src/tests/vld_dll2/stdafx.h create mode 100644 src/tests/vld_dll2/targetver.h create mode 100644 src/tests/vld_dll2/vld_dll2_vs12.vcxproj create mode 100644 src/tests/vld_dll2/vld_dll2_vs12.vcxproj.filters create mode 100644 src/tests/vld_dll2/vld_dll2_vs14.vcxproj create mode 100644 src/tests/vld_dll2/vld_dll2_vs14.vcxproj.filters rename src/tests/vld_main/{vld_main.vcxproj => vld_main_vs14.vcxproj} (100%) rename src/tests/vld_main/{vld_main.vcxproj.filters => vld_main_vs14.vcxproj.filters} (100%) create mode 100644 src/tests/vld_unload/stdafx.cpp create mode 100644 src/tests/vld_unload/stdafx.h create mode 100644 src/tests/vld_unload/targetver.h create mode 100644 src/tests/vld_unload/vld_unload.cpp create mode 100644 src/tests/vld_unload/vld_unload_vs12.vcxproj create mode 100644 src/tests/vld_unload/vld_unload_vs12.vcxproj.filters create mode 100644 src/tests/vld_unload/vld_unload_vs14.vcxproj create mode 100644 src/tests/vld_unload/vld_unload_vs14.vcxproj.filters diff --git a/.gitignore b/.gitignore index d0b7beb5..88a009ba 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,6 @@ lib/gtest/msvc/bin/ _ReSharper.Caches/ lib/cppformat/bin/ src/bin/vld.ini +/src/tests/vld_ComTest/ComTest_i.h +/src/tests/vld_ComTest/ComTest_p.c +/src/tests/vld_ComTest/ComTest_i.c diff --git a/src/tests/vld_ComTest/ComTest.aps b/src/tests/vld_ComTest/ComTest.aps new file mode 100644 index 0000000000000000000000000000000000000000..eeb1b0dbb031e67eb58c49bd0ed62927c2bf36fe GIT binary patch literal 21292 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 literal 0 HcmV?d00001 diff --git a/src/tests/vld_ComTest/ComTest.cpp b/src/tests/vld_ComTest/ComTest.cpp new file mode 100644 index 0000000000000000000000000000000000000000..4bb6388fcfb6f2f5fbf4c1eab7aa47e0d0a3f514 GIT binary patch literal 3680 zcmdT`O=}ZT6ur6|L2&P8Y(Yk`wyuPVXlzprrm0QRRtXyN)elV*$(O0AE~E>g#R`Io z3(*t^hiY+5jl|@NQN$S#& zlTwh|IBXflIVy1+w*1I^pIm9Z%)G7dA37)p#GL)IAQj9gOH+!lU`wB}Qk0y`N*mVZ z@r9#VxyIU^;RT+`x6vpmj+d$9J#NEK@jW&^LuAJthM5X;A z<1sThdo=web*gF01el6~fp+TNx@IW_R!1cwS0tvmq=yk$ugDb6GI-CyV*>X(;z$ek z1-u_qe09{-QoPOLYYBYXl9h4zNXkWAv#^_l*Q;_(=xItWxN|PydlcWMfGCYw^WfK( zvpBEdsSQlsksOmVuB8R#)p0ExQ8rTWJRz4|oR(OySpsWZ#fs}q&+o_g3b4}(dE{6N ze2f7zBZ(mPh#Lzdh~SKZiHOq9MP)Um)}sL%1q*jz>@ zXAzr;%$B1#$aVxC%09m*ftS(7fu$g~RQ5CxWkcbhl_8+9W%$!u7}=%;dYtV;!UJS8VLARTqJc9CJ4PPx=-_}rk>N;tU_jXR$;0GA-k(ZaNz{< zLEgwx5L*7rsyLgl(?Gnluo54BPS?Pyktc&-YhA2? zQ}Ruw9X!>*8Q0LPh$Xt_nY*9C?HVzdI_OjlIm(I`24&iQaq6RV!2lQ|Id%YK}tQRE}IRX3bG-BUqoe|GN7&p&;8_Txon z4aE!$J#FgyLFy=VVJCleQXg;R{ar&azXSOPFo#OB>L$oNgR~wvRO^}jYcj3&p*s^$ zuctR?(x?92WN)syJDE{I6_r)gJ(YNulvRs&Q&m>m+GVfBs={}boGke@_Ue4)$*Zu} z)DG{>Wo_d!)R@~MIK89?kzT=Rjt(`I>L* znY=076ZL$NO7 z4CGhc+;&k@%k%x;4e{9w?lI>NxMjqRMQ(}RmtL|Cmc9t+fOkO+4!hv5x$c?^%HV4{ zKWw8xoqc26a9*)!3w|YbtE|lvHF8?q67U$xAn9sACnt;%yrw+%C#^afXL?44?W$X> Tqbo06=Zm8}Xx+^Gd-69^;R8$K5uyA5UQ5_oEw^X(FoM-4h4U{k_F^q-d}h`| zEcYe+iXIlxs?N%1RZ2wZ_Tc9?X?hdiE&ndLTSxA8-i-IzZVp*O9P#~}|}i+L1T;=zuVuwHV8IPy#+ z)xpQb(=gdCKo(h<8X`o+@WhN1>8D7tcqUTIS-jdL@2NL`Nbxx^xp)O1U%;!l1C3vP z4}e@l{Plp4#4uJ(LlcL`_-5S~A0Z~P-^M6$u8r{|je}Ufg9x>6bxnH;{yt*04_gKs z%~0;g26dZ|?gZ%DLlxqH`wMvhUvC@kHhvXfnHN0ZNgsHUlr!RFIaJ@xAH$zk(9_NI zl^DIoXL5!Q`7G~;kde>B^&H1!1!^lmHA?@sboVpkHq#`jbme@MWM1;2S8B$E1R-#R zu|36_m)O}DcA7(53yfNMt>@=+)2K*tt;iQ$=buy~dX>@#`y@efL-IcJOt<>iPUt2S?xfnjKfC_s z$w$-1^q_mIl5f3y{n2-Lwp*g53~39cv3UfV*;f1W*ZZN*as{;*f5m;_{Z~50N(*Gx zYn&Ux%ubTN_Dkp2U|U~H^55MLqPj+HlI=;x=K#7|zSG<;@t%yz0NfanE7*f)`*^ev zeJvU=Myohu66xZ|5=k3>8rkom8>9pk;D#}c()GtuOF*_**TfSD?tTmdTs+n__XGZcf z7OlW4#?}~*F|P(|FuUYGX{}l`OnPc@ow)hAww!i}SAVMca!RVw>0LtYHSZFB@4cRv zaFqI}VM#a_&&2)AoID$$4LK^DTM)%|yB))q4rb VrLvV*gT)arN0rR~`fPe9@-NfUA*}!a literal 0 HcmV?d00001 diff --git a/src/tests/vld_ComTest/ComTest.rgs b/src/tests/vld_ComTest/ComTest.rgs new file mode 100644 index 00000000..e7d37400 --- /dev/null +++ b/src/tests/vld_ComTest/ComTest.rgs @@ -0,0 +1,3 @@ +HKCR +{ +} diff --git a/src/tests/vld_ComTest/ComTest.sln b/src/tests/vld_ComTest/ComTest.sln new file mode 100644 index 00000000..1324742f --- /dev/null +++ b/src/tests/vld_ComTest/ComTest.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "ComTest.vcxproj", "{3719F504-3DF0-45F8-BC7A-4415804AC7C9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.Build.0 = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.ActiveCfg = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/tests/vld_ComTest/ComTest_vs12.vcxproj b/src/tests/vld_ComTest/ComTest_vs12.vcxproj new file mode 100644 index 00000000..aa7b2caa --- /dev/null +++ b/src/tests/vld_ComTest/ComTest_vs12.vcxproj @@ -0,0 +1,232 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3719F504-3DF0-45F8-BC7A-4415804AC7C9} + AtlProj + ComTest + + + + DynamicLibrary + Dynamic + Unicode + Dynamic + v120_xp + + + true + + + true + + + false + + + false + + + + + + + + + + + true + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + + + + + + NotUsing + + + + + Create + + + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters b/src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters new file mode 100644 index 00000000..ef247b87 --- /dev/null +++ b/src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters @@ -0,0 +1,86 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {a27c1591-bff6-481d-8a73-f014c351a0f7} + False + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Generated Files + + + Source Files + + + Generated Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Generated Files + + + Header Files + + + + + Resource Files + + + + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/tests/vld_ComTest/ComTest_vs14.vcxproj b/src/tests/vld_ComTest/ComTest_vs14.vcxproj new file mode 100644 index 00000000..2cab25ee --- /dev/null +++ b/src/tests/vld_ComTest/ComTest_vs14.vcxproj @@ -0,0 +1,232 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3719F504-3DF0-45F8-BC7A-4415804AC7C9} + AtlProj + ComTest + + + + DynamicLibrary + Dynamic + Unicode + Dynamic + v140_xp + + + true + + + true + + + false + + + false + + + + + + + + + + + true + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + + + + + + NotUsing + + + + + Create + + + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_ComTest/ComTest_vs14.vcxproj.filters b/src/tests/vld_ComTest/ComTest_vs14.vcxproj.filters new file mode 100644 index 00000000..ef247b87 --- /dev/null +++ b/src/tests/vld_ComTest/ComTest_vs14.vcxproj.filters @@ -0,0 +1,86 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {a27c1591-bff6-481d-8a73-f014c351a0f7} + False + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Generated Files + + + Source Files + + + Generated Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Generated Files + + + Header Files + + + + + Resource Files + + + + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/tests/vld_ComTest/MyMath.cpp b/src/tests/vld_ComTest/MyMath.cpp new file mode 100644 index 0000000000000000000000000000000000000000..9fcfad2b77a1f54f643876a8508a3bbcddec714f GIT binary patch literal 444 zcmZ{g%}PR16oo&BSMVJ!HPK1VZFI@M2)&UP3L1!X6h*Vhs~FL&=ZGGmcj_^Mbe&yi za0xl=v(MQ-Yp=a_KXvNF^mvwy$eD7&9gjLO4cS>C7xT7xzx`ZQDC6yz8B5hKSmPM0 z{)m-OoUkTrg*8>=P-Ssys0`S@%!>0vF8Bc%O)+fAcS-d=*YENl?}m2C#Lsi9vf)9z z9W`V2Vs}JBn;VAePw2}!LLK5KB(j$J65FXGoLuqT^qOh=p75L$SSS3>~2BQ*i9{4eprfWyA>r!Vn{S8 zcN0zY5AfpAll}`{ymRp^@u1Oz_|1E}%a&5(!ECnscHhi5-+VLkdh|OXc^xG#bE1F z16CeZY{zk8*oj_>&6qyC{lg041kWMr#>@b3gKUZ1BnK7>HSh_Z>{~%3=2DS3F4l2) zEK-hix<*&!Izw4Xz-}0qputn@*}|a-Xk$Q~f3Z!|3@!ta9I|AzDZDd^P19szl?GlG zw*#wjx`lNHdlufAn}awuY!be*F7&G-?>ZR9fXb>Yb>ui|MeUKidqTE+DI`}VF8_geG4Z2Cs) z=vY?jnfqP8tnalrqrvs|;QSHP==Y1%;S2Ii|ICnZo|EVO4oH7lJn8sL>t z!x9iUPo|(W z8=-~eXTcq0W4>9%5_09v;@PXxO&a-Y433lu*)wwVY#ITZVSJmBlf)Af-R*^)>#$;t zwk3yXmOJ7EoYW|>J^&afkYr!cV=GB;@n+<3MvsFufyXCsFhjLTnB zGG78OuFkX{C8*vwY#E7XUrie4nWi~-ck)wbf)-k_j}32=CSkAUF)P0@BaR)_OL_A? zD|s@K+6_4IQ-fV+&U1)l$cTJmIf%*(_ykaRy01na=r-aXV`~1{XF;7A>mYi<=eFZN86|q&J3!#-soqIL7aRNhALSrRPiC-* OGb4VYhCCCeb;Tb=luz9N literal 0 HcmV?d00001 diff --git a/src/tests/vld_ComTest/MyMath.rgs b/src/tests/vld_ComTest/MyMath.rgs new file mode 100644 index 00000000..79a02165 --- /dev/null +++ b/src/tests/vld_ComTest/MyMath.rgs @@ -0,0 +1,15 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {B379BB26-80E6-4DCB-AD82-8F46BA81BBCF} = s 'MyMath Class' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + TypeLib = s '{68A502DA-EEB1-4B25-A0A4-3118922CBFE4}' + Version = s '1.0' + } + } +} diff --git a/src/tests/vld_ComTest/ReadMe.txt b/src/tests/vld_ComTest/ReadMe.txt new file mode 100644 index 00000000..a4280d23 --- /dev/null +++ b/src/tests/vld_ComTest/ReadMe.txt @@ -0,0 +1,66 @@ +======================================================================== + 活动模板库 : ComTest 项目概述 +======================================================================== + +应用程序向导已为您创建了此 ComTest 项目，作为编写动态链接库 (DLL) +的起点。 + +本文件概要介绍组成项目的每个文件的内容。 + +ComTest.vcxproj + 这是使用应用程序向导生成的 VC++ 项目的主项目文件， + 其中包含生成该文件的 Visual C++ 的版本信息， + 以及有关使用应用程序向导选择的平台、配置和项目功能的信息。 + +ComTest.vcxproj.filters + 这是使用“应用程序向导”生成的 VC++ 项目筛选器文件。 + 它包含有关项目文件与筛选器之间的关联信息。 在 IDE 中，通过这种关联， + 在特定节点下以分组形式显示具有相似扩展名的文件。 + 例如，“.cpp”文件与“源文件”筛选器关联。 + +ComTest.idl + 此文件包含项目中定义的类型库、接口和组件类的 IDL 定义。 + 此文件将由 MIDL 编译器处理以生成： + C++ 接口定义和 GUID 声明 (ComTest.h) + GUID 定义 (ComTest_i.c) + 类型库 (ComTest.tlb) + 封送处理代码 (ComTest_p.c 和 + dlldata.c） + +ComTest.h + 此文件包含 ComTest.idl 中定义的项目的 C++ 接口定义 + 和 GUID 声明。 它将在编译过程中由 MIDL 重新生成。 + +ComTest.cpp + 此文件包含对象映射和 DLL 导出的实现。 + +ComTest.rc + 这是程序使用的所有 Microsoft Windows 资源的列表。 + +ComTest.def + 此模块定义文件为链接器提供有关 DLL 所要求的导出的信息， + 它包含用于以下内容的导出： + DllGetClassObject + DllCanUnloadNow + DllRegisterServer + DllUnregisterServer + DllInstall + +///////////////////////////////////////////////////////////////////////////// +其他标准文件： + +StdAfx.h，StdAfx.cpp + 这些文件用于生成名为 ComTest.pch 的预编译头 (PCH) 文件和 + 名为 StdAfx.obj 的预编译类型文件。 + +Resource.h + 这是用于定义资源 ID 的标准头文件。 + + +///////////////////////////////////////////////////////////////////////////// +其他注释： + + + “MFC 支持”选项可用于将 Microsoft 基础类库构建到您的主干应用程序中， + 从而让您能够使用 MFC 类、对象和函数。 +///////////////////////////////////////////////////////////////////////////// diff --git a/src/tests/vld_ComTest/Resource.h b/src/tests/vld_ComTest/Resource.h new file mode 100644 index 0000000000000000000000000000000000000000..b182412e713e6a62f981916481e82b153ff20d6b GIT binary patch literal 1080 zcmb7@T}uK%6o%jHp#QMYWuR%G-EOOprK^}qT`l<)hPmLneGvWi>N&G!5o*e??3uG? zo;mZrv!5S%<@Lr0)l{U4s%r6sE(#T>#_U?}j6)qzo0q4CCK_n2SP9Qq3vxYjiBjEZ z$}G?^!_&P+n(@rZFL)2hO~?$WN|}wAkI77la=&)y!pf@qdUd>5kLr+1;N;*9R@K(m zkz*OjcJt`ELe~*zX>+bi&g0W{l`p%Ef=(El$Zg00+y)()I-MP(I-wyeo#%t$aaSf0V literal 0 HcmV?d00001 diff --git a/src/tests/vld_ComTest/dlldata.c b/src/tests/vld_ComTest/dlldata.c new file mode 100644 index 00000000..4638f411 --- /dev/null +++ b/src/tests/vld_ComTest/dlldata.c @@ -0,0 +1,37 @@ +/********************************************************* + DllData file -- generated by MIDL compiler + + DO NOT ALTER THIS FILE + + This file is regenerated by MIDL on every IDL file compile. + + To completely reconstruct this file, delete it and rerun MIDL + on all the IDL files in this DLL, specifying this file for the + /dlldata command line option + +*********************************************************/ + + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +EXTERN_PROXY_FILE( ComTest ) + + +PROXYFILE_LIST_START +/* Start of list */ + REFERENCE_PROXY_FILE( ComTest ), +/* End of list */ +PROXYFILE_LIST_END + + +DLLDATA_ROUTINES( aProxyFileList, GET_DLL_CLSID ) + +#ifdef __cplusplus +} /*extern "C" */ +#endif + +/* end of generated dlldata file */ diff --git a/src/tests/vld_ComTest/dllmain.cpp b/src/tests/vld_ComTest/dllmain.cpp new file mode 100644 index 0000000000000000000000000000000000000000..fd44887cd3e1f53a0eec8579479c0f27870c1a99 GIT binary patch literal 1342 zcmaizO-=$q5QSgdVd5P|-AH1@HLgZLG{Jw28W#ll2_%37(2y8+UcjXr&)`M8lKNHm zD8r9qDwFA%e(zP)tM0GQj4}#TSBL1Tsa%?%RWgoT zu)0S)6J@JCN5pd<@>Qqmj_bIh5Kc$&zdNpH^+IT5NDeTO=684dpw<+b%L`$cLyN?fJ=Z|;#$tjuI&l&vN?WEIb3f}G6F6OIB I(ur5~4GP-O9smFU literal 0 HcmV?d00001 diff --git a/src/tests/vld_ComTest/dllmain.h b/src/tests/vld_ComTest/dllmain.h new file mode 100644 index 0000000000000000000000000000000000000000..8abc486a83ebfae1b54393017e13a1e74b682579 GIT binary patch literal 562 zcmb7>-Acni5QPukS*x9E)snlSii}^v9q0*j z6k_*Oc9ju7t4%c03ykbnMJf_Z305eA0r!Ih>E5h@cx~>lXR6ewm6!x6$;M==p zbX)X@>5_m_(20)lNE=f)otr;q&Y?CJXc(nqG&;N@(FLl3&M>2z+CCkfss{>Tmc7iG zkPXSSscYHlEnc{;LauhnNAkG$;8eAvCTP#1I{GfigV6+6c|n7($$MCXxNi9q)XJ$R d+PBl2O=WuHA7^@GtIj|6X5M9XGri4H^#?qIS0n%c literal 0 HcmV?d00001 diff --git a/src/tests/vld_ComTest/stdafx.cpp b/src/tests/vld_ComTest/stdafx.cpp new file mode 100644 index 0000000000000000000000000000000000000000..46f0d784460405a9b54a924d106b8fa21c594ae5 GIT binary patch literal 210 zcmezWPoF`bL4l!|p@boYA(0`Cp@Kn=A(^272o)HtfcRA~Yw(*S_KahJtijqL?Wy1V zTFNHmfoNU^E}&kJZfAykhFpdahE%XQdO*F&3>iRiwwM@yE5DW*V)YlhO(GHMQEkg- xNMgtWs|MKsQC(fr9sbZiKLMl%gq0aG8S;Rp<}j23-I)qht%T<044?=|B>;lFFe?B6 literal 0 HcmV?d00001 diff --git a/src/tests/vld_ComTest/stdafx.h b/src/tests/vld_ComTest/stdafx.h new file mode 100644 index 0000000000000000000000000000000000000000..158cc233bdf8ac1e9f79df8f49f884696d30bedd GIT binary patch literal 1708 zcma)6&ubGw6#gzMip5*cOLGx~=2}Gxal6$(JKJWPR#6(#WOoxVZP@&%#nMs;coUDJ z|A2pqSN#vXd+;P)MCo;6c!6bfxO0!= zTIb{T&(kkwSG+qrulyfsGEV;8yj;KydW!GjK{@zzwz7Zj-X5*H3ug4UWaT-BRWt7lI#G6C(I9oWvAzJYDnK|z=t3zhzbG6`M2Q^e-b2aDYq)Qt= z_uSXs5+%J;tXp`Fk&bI&iS;*`N5~jMj5$Xdhoy|q^gRt!n85~Q-QuY6YZDF>*9ONU z?l|0EXpl0=s(8;n@dkv)Bn&3I`YvvRWk;-v79F&sRm_lAyG)fw8n zMa5Qiji$?tJzS4p^>g@MS={%CM+CtuB)XH(dh=_$?_YgZ4pxI(4fD#$J56JHKjzc1 z_7+yH>dZ^}JBxl|>63j!jr%;yBfgzq(6UY2kPI)9fmGUJrbTQ!%(chZMQmH-RF@ea z7qT{pHK~j~eT*XKArfd6_4FM^EyetLRDfthG&svUdEcxKh4<@ZmGD!T>ylj#R}XbE zZHwQch{Q9W8FKT0H5vph@+~fJycd@H6 Ulx{8P35K)$^J*S5t9B-@KZI!>5&!@I literal 0 HcmV?d00001 diff --git a/src/tests/vld_ComTest/targetver.h b/src/tests/vld_ComTest/targetver.h new file mode 100644 index 0000000000000000000000000000000000000000..beac0e63c9ed1154c75c7761cc6c0423e0402718 GIT binary patch literal 364 zcmezWPnn^Bp@<=oA)O%?NGdSoGvqNOGo&)`GH`*hK7&3`lr{KGk^)08gA0Q<5QE4t zpqe5EJ%$XREL+U1XivZQ!5XD4Wen*zW_c9pq_>nQFoZK?0!>Q+npw_J3{+Pf_aT_c z0M+EC$T{haomPHN{d|LP>5(rLNSYF-QOaG_AIJ0mdpE>25Yr)ULb!(Ke_0$`49E_M z%flHw8T=TG8H^a>f$jmZ{TM=kZt0KS*PT~y<=5D$pURlrQU-Dx&wsN*zL4HPe7;4v aUm5JXWQH7uQlKAGfo9s^2q8OgNCE)p_EE$D literal 0 HcmV?d00001 diff --git a/src/tests/vld_ComTest/xdlldata.c b/src/tests/vld_ComTest/xdlldata.c new file mode 100644 index 0000000000000000000000000000000000000000..c57bafcddb622c00eba82fff485125ec75adc515 GIT binary patch literal 828 zcmb7CO-n*S6g``wg0`&(+ZaSj9}BnXD<0_6d`iZH2EQsHP5gKWE!s%frXSG%dB3Fp z5VWbzol!I_B8Iuld-u+{=bX8p9|2i22c7d_R!P2wnxS=FY?wk8A^vHdb}qwG*Q95|E-V4IlFi`z&?A}vqudINsPFU zxRY2nYTkoqPq9Wg+L}W;m1ON!?J0;RkIZI}rV}~-8;7&n6j7{$-!+!WQrw$)mgSev zwW!s0jyzvKTrDz67o}SK6fmRl3qZ^e9f( zT6~FJW@4=CGT)(lqR3`qd?m~Jzc@YOFXQ~=fMa|ta&D|<2Pf25q2C2^8ZAtRcwQ&7 rp_xG8ygae7Dc|MVw9#Ioc9{=NwKCzh-trPx8gxWvTPF9f`IcK>28D+5 literal 0 HcmV?d00001 diff --git a/src/tests/vld_ComTest/xdlldata.h b/src/tests/vld_ComTest/xdlldata.h new file mode 100644 index 00000000..89313c5c --- /dev/null +++ b/src/tests/vld_ComTest/xdlldata.h @@ -0,0 +1,15 @@ +#pragma once + +#ifdef _MERGE_PROXYSTUB + +extern "C" +{ +BOOL WINAPI PrxDllMain(HINSTANCE hInstance, DWORD dwReason, + LPVOID lpReserved); +STDAPI PrxDllCanUnloadNow(void); +STDAPI PrxDllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv); +STDAPI PrxDllRegisterServer(void); +STDAPI PrxDllUnregisterServer(void); +} + +#endif diff --git a/src/tests/vld_dll1/dllmain.cpp b/src/tests/vld_dll1/dllmain.cpp new file mode 100644 index 00000000..5a1ee8c1 --- /dev/null +++ b/src/tests/vld_dll1/dllmain.cpp @@ -0,0 +1,29 @@ +// dllmain.cpp : Defines the entry point for the DLL application. +#include "stdafx.h" +#include +#include + +BOOL APIENTRY DllMain(HMODULE hModule, + DWORD ul_reason_for_call, + LPVOID lpReserved + ) +{ + switch (ul_reason_for_call) { + case DLL_PROCESS_ATTACH: { + void* leak = malloc(9); + break; + } + case DLL_THREAD_ATTACH: { + break; + } + case DLL_THREAD_DETACH: { + break; + } + case DLL_PROCESS_DETACH: { + //assert(1 == VLDGetThreadLeaksCount(GetCurrentThreadId())); + break; + } + } + return TRUE; +} + diff --git a/src/tests/vld_dll1/stdafx.cpp b/src/tests/vld_dll1/stdafx.cpp new file mode 100644 index 00000000..8cc80f5a --- /dev/null +++ b/src/tests/vld_dll1/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// vld_dll1.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/src/tests/vld_dll1/stdafx.h b/src/tests/vld_dll1/stdafx.h new file mode 100644 index 00000000..e91b8376 --- /dev/null +++ b/src/tests/vld_dll1/stdafx.h @@ -0,0 +1,17 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +// Windows Header Files: +#include +#include + + + +// TODO: reference additional headers your program requires here diff --git a/src/tests/vld_dll1/targetver.h b/src/tests/vld_dll1/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/src/tests/vld_dll1/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/src/tests/vld_dll1/vld_dll1_vs12.vcxproj b/src/tests/vld_dll1/vld_dll1_vs12.vcxproj new file mode 100644 index 00000000..3da3d106 --- /dev/null +++ b/src/tests/vld_dll1/vld_dll1_vs12.vcxproj @@ -0,0 +1,145 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} + Win32Proj + vld_dll1 + vld_dll1 + + + + DynamicLibrary + v120_xp + Unicode + + + true + + + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + + + + + + Create + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_dll1/vld_dll1_vs12.vcxproj.filters b/src/tests/vld_dll1/vld_dll1_vs12.vcxproj.filters new file mode 100644 index 00000000..95c6df39 --- /dev/null +++ b/src/tests/vld_dll1/vld_dll1_vs12.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_dll1/vld_dll1_vs14.vcxproj b/src/tests/vld_dll1/vld_dll1_vs14.vcxproj new file mode 100644 index 00000000..f0d9b5c1 --- /dev/null +++ b/src/tests/vld_dll1/vld_dll1_vs14.vcxproj @@ -0,0 +1,145 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} + Win32Proj + vld_dll1 + vld_dll1 + + + + DynamicLibrary + v140_xp + Unicode + + + true + + + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + + + + + + Create + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_dll1/vld_dll1_vs14.vcxproj.filters b/src/tests/vld_dll1/vld_dll1_vs14.vcxproj.filters new file mode 100644 index 00000000..95c6df39 --- /dev/null +++ b/src/tests/vld_dll1/vld_dll1_vs14.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_dll2/dllmain.cpp b/src/tests/vld_dll2/dllmain.cpp new file mode 100644 index 00000000..058cf3bc --- /dev/null +++ b/src/tests/vld_dll2/dllmain.cpp @@ -0,0 +1,29 @@ +// dllmain.cpp : Defines the entry point for the DLL application. +#include "stdafx.h" +#include +#include + +BOOL APIENTRY DllMain(HMODULE hModule, + DWORD ul_reason_for_call, + LPVOID lpReserved + ) +{ + switch (ul_reason_for_call) { + case DLL_PROCESS_ATTACH: { + void* leak = malloc(15); + break; + } + case DLL_THREAD_ATTACH: { + break; + } + case DLL_THREAD_DETACH: { + break; + } + case DLL_PROCESS_DETACH: { + //assert(1 == VLDGetThreadLeaksCount(GetCurrentThreadId())); + break; + } + } + return TRUE; +} + diff --git a/src/tests/vld_dll2/stdafx.cpp b/src/tests/vld_dll2/stdafx.cpp new file mode 100644 index 00000000..8cc80f5a --- /dev/null +++ b/src/tests/vld_dll2/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// vld_dll1.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/src/tests/vld_dll2/stdafx.h b/src/tests/vld_dll2/stdafx.h new file mode 100644 index 00000000..e91b8376 --- /dev/null +++ b/src/tests/vld_dll2/stdafx.h @@ -0,0 +1,17 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +// Windows Header Files: +#include +#include + + + +// TODO: reference additional headers your program requires here diff --git a/src/tests/vld_dll2/targetver.h b/src/tests/vld_dll2/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/src/tests/vld_dll2/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/src/tests/vld_dll2/vld_dll2_vs12.vcxproj b/src/tests/vld_dll2/vld_dll2_vs12.vcxproj new file mode 100644 index 00000000..f90119ae --- /dev/null +++ b/src/tests/vld_dll2/vld_dll2_vs12.vcxproj @@ -0,0 +1,145 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {33F98E06-F44C-4E22-9E16-4C20F8238A95} + Win32Proj + vld_dll1 + vld_dll2 + + + + DynamicLibrary + v120_xp + Unicode + + + true + + + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + + + + + + Create + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_dll2/vld_dll2_vs12.vcxproj.filters b/src/tests/vld_dll2/vld_dll2_vs12.vcxproj.filters new file mode 100644 index 00000000..95c6df39 --- /dev/null +++ b/src/tests/vld_dll2/vld_dll2_vs12.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_dll2/vld_dll2_vs14.vcxproj b/src/tests/vld_dll2/vld_dll2_vs14.vcxproj new file mode 100644 index 00000000..ad1752e8 --- /dev/null +++ b/src/tests/vld_dll2/vld_dll2_vs14.vcxproj @@ -0,0 +1,145 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {33F98E06-F44C-4E22-9E16-4C20F8238A95} + Win32Proj + vld_dll1 + vld_dll2 + + + + DynamicLibrary + v140_xp + Unicode + + + true + + + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + + + + + + Create + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_dll2/vld_dll2_vs14.vcxproj.filters b/src/tests/vld_dll2/vld_dll2_vs14.vcxproj.filters new file mode 100644 index 00000000..95c6df39 --- /dev/null +++ b/src/tests/vld_dll2/vld_dll2_vs14.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_main/vld_main.vcxproj b/src/tests/vld_main/vld_main_vs14.vcxproj similarity index 100% rename from src/tests/vld_main/vld_main.vcxproj rename to src/tests/vld_main/vld_main_vs14.vcxproj diff --git a/src/tests/vld_main/vld_main.vcxproj.filters b/src/tests/vld_main/vld_main_vs14.vcxproj.filters similarity index 100% rename from src/tests/vld_main/vld_main.vcxproj.filters rename to src/tests/vld_main/vld_main_vs14.vcxproj.filters diff --git a/src/tests/vld_unload/stdafx.cpp b/src/tests/vld_unload/stdafx.cpp new file mode 100644 index 00000000..e1e5b477 --- /dev/null +++ b/src/tests/vld_unload/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// vld_test.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/src/tests/vld_unload/stdafx.h b/src/tests/vld_unload/stdafx.h new file mode 100644 index 00000000..b005a839 --- /dev/null +++ b/src/tests/vld_unload/stdafx.h @@ -0,0 +1,15 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#include +#include + + + +// TODO: reference additional headers your program requires here diff --git a/src/tests/vld_unload/targetver.h b/src/tests/vld_unload/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/src/tests/vld_unload/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/src/tests/vld_unload/vld_unload.cpp b/src/tests/vld_unload/vld_unload.cpp new file mode 100644 index 00000000..d61c447f --- /dev/null +++ b/src/tests/vld_unload/vld_unload.cpp @@ -0,0 +1,120 @@ +// vld_unload.cpp : Defines the entry point for the console application. +// + +#include "stdafx.h" + +#include +#include +#include + +#ifdef _WIN64 +static const TCHAR* sVld_dll = _T("vld_x64.dll"); +#else +static const TCHAR* sVld_dll = _T("vld_x86.dll"); +#endif + +UINT VLDGetLeaksCount() +{ + HMODULE vld_module = GetModuleHandle(sVld_dll); + if (vld_module != NULL) { + typedef UINT(*VLDAPI_func)(); + VLDAPI_func func = (VLDAPI_func)GetProcAddress(vld_module, "VLDGetLeaksCount"); + assert(func); + if (func) { + return func(); + } + } + return -1; +} + +HMODULE GetModuleFromAddress(LPCVOID pAddress) +{ + HMODULE hModule = NULL; + MEMORY_BASIC_INFORMATION mbi; + if (VirtualQuery((LPCVOID)pAddress, &mbi, sizeof(MEMORY_BASIC_INFORMATION)) == sizeof(MEMORY_BASIC_INFORMATION)) { + // the allocation base is the beginning of a PE file + hModule = (HMODULE)mbi.AllocationBase; + } + return hModule; +} + + +int _tmain(int argc, _TCHAR* argv[]) +{ + int PASSED = 0; + { + HMODULE hModule1 = ::LoadLibrary(_T("vld_dll1.dll")); + int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + ::FreeLibrary(hModule1); // vld is unloaded here and reports the memory leak + int x = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks + + HMODULE hModule2 = ::LoadLibrary(_T("vld_dll2.dll")); + int y = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + ::FreeLibrary(hModule2); // vld is unloaded here and reports the memory leak + int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks + assert(w == 1 && x == -1 && y == 1 && z == -1); + if (w == 1 && x == -1 && y == 1 && z == -1) { + ++PASSED; + } + } + + { + HMODULE hModule3 = ::LoadLibrary(_T("vld_dll1.dll")); + int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + HMODULE hModule4 = ::LoadLibrary(_T("vld_dll2.dll")); + int x = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks + ::FreeLibrary(hModule4); // vld is *not* unloaded here + int y = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks + ::FreeLibrary(hModule3); // vld is unloaded here and reports 2 memory leaks + int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks + assert(w == 1 && x == 2 && y == 2 && z == -1); + if (w == 1 && x == 2 && y == 2 && z == -1) { + ++PASSED; + } + } + + { + HMODULE hModule5 = ::LoadLibrary(_T("vld_dll1.dll")); + int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + HMODULE hModule6 = ::LoadLibrary(_T("vld_dll2.dll")); + int x = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks + ::FreeLibrary(hModule5); // vld is *not* unloaded here + int y = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks + ::FreeLibrary(hModule6); // vld is unloaded here and reports 2 memory leaks + int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks + assert(w == 1 && x == 2 && y == 2 && z == -1); + if (w == 1 && x == 2 && y == 2 && z == -1) { + ++PASSED; + } + } + + { + typedef FARPROC(__stdcall *GetProcAddress_t) (HMODULE, LPCSTR); + + HMODULE kernel32 = GetModuleHandleW(L"KernelBase.dll"); + if (!kernel32) { + kernel32 = GetModuleHandleW(L"kernel32.dll"); + } + + // pGetProcAddress1 resolves to kernel32!GetProcAddress() + GetProcAddress_t pGetProcAddress1 = GetProcAddress; + + HMODULE hModule7 = ::LoadLibrary(_T("vld_dll1.dll")); + int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + + // pGetProcAddress2 resolves to vld_xXX.dll!VisualLeakDetector::_GetProcAddress() + GetProcAddress_t pGetProcAddress2 = GetProcAddress; + + ::FreeLibrary(hModule7); // vld is unloaded here and reports the memory leak + int x = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks + + //assert(pGetProcAddress1 == pGetProcAddress2); + GetProcAddress_t pGetProcAddress3 = (GetProcAddress_t)pGetProcAddress1(kernel32, "GetProcAddress"); + + // Following line raises 0xC0000005: Access violation exception + //GetProcAddress_t pGetProcAddress4 = (GetProcAddress_t)pGetProcAddress2(kernel32, "GetProcAddress"); + } + + // if PASSED == 3 return exit code 0; + return !(PASSED == 3); +} \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs12.vcxproj b/src/tests/vld_unload/vld_unload_vs12.vcxproj new file mode 100644 index 00000000..4bc0de80 --- /dev/null +++ b/src/tests/vld_unload/vld_unload_vs12.vcxproj @@ -0,0 +1,147 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} + Win32Proj + vld_unload + vld_unload + + + + Application + v120_xp + Unicode + + + true + + + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + false + + + false + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + + + + + + + {50c94b05-8c3e-49ed-b2b9-5715eb624d14} + true + false + false + false + + + {33f98e06-f44c-4e22-9e16-4c20f8238a95} + true + false + false + false + + + + + + \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs12.vcxproj.filters b/src/tests/vld_unload/vld_unload_vs12.vcxproj.filters new file mode 100644 index 00000000..43a60e40 --- /dev/null +++ b/src/tests/vld_unload/vld_unload_vs12.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs14.vcxproj b/src/tests/vld_unload/vld_unload_vs14.vcxproj new file mode 100644 index 00000000..b8f86ca5 --- /dev/null +++ b/src/tests/vld_unload/vld_unload_vs14.vcxproj @@ -0,0 +1,147 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} + Win32Proj + vld_unload + vld_unload + + + + Application + v140_xp + Unicode + + + true + + + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + false + + + false + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + + + + + + + {50c94b05-8c3e-49ed-b2b9-5715eb624d14} + true + false + false + false + + + {33f98e06-f44c-4e22-9e16-4c20f8238a95} + true + false + false + false + + + + + + \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs14.vcxproj.filters b/src/tests/vld_unload/vld_unload_vs14.vcxproj.filters new file mode 100644 index 00000000..43a60e40 --- /dev/null +++ b/src/tests/vld_unload/vld_unload_vs14.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/vld_vs12.sln b/vld_vs12.sln index eab82c20..54c11cb1 100644 --- a/vld_vs12.sln +++ b/vld_vs12.sln @@ -48,6 +48,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main_vs12.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_unload", "src\tests\vld_unload\vld_unload_vs12.vcxproj", "{A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}" + ProjectSection(ProjectDependencies) = postProject + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {50C94B05-8C3E-49ED-B2B9-5715EB624D14} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {33F98E06-F44C-4E22-9E16-4C20F8238A95} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll1", "src\tests\vld_dll1\vld_dll1_vs12.vcxproj", "{50C94B05-8C3E-49ED-B2B9-5715EB624D14}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_dll2\vld_dll2_vs12.vcxproj", "{33F98E06-F44C-4E22-9E16-4C20F8238A95}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_ComTest\ComTest_vs12.vcxproj", "{3719F504-3DF0-45F8-BC7A-4415804AC7C9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 @@ -328,6 +340,102 @@ Global {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.Build.0 = Release|Win32 {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.ActiveCfg = Release|x64 {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)|Win32.Build.0 = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)|x64.ActiveCfg = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.Build.0 = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.ActiveCfg = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.Build.0 = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.ActiveCfg = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.Build.0 = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.ActiveCfg = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)|Win32.Build.0 = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)|x64.ActiveCfg = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.ActiveCfg = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.Build.0 = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.ActiveCfg = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.Build.0 = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.ActiveCfg = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.Build.0 = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.ActiveCfg = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)|Win32.Build.0 = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)|x64.ActiveCfg = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.ActiveCfg = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.Build.0 = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.ActiveCfg = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.Build.0 = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.ActiveCfg = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)|Win32.ActiveCfg = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)|Win32.Build.0 = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)|x64.ActiveCfg = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.Build.0 = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.ActiveCfg = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.Build.0 = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.ActiveCfg = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -335,15 +443,19 @@ Global GlobalSection(NestedProjects) = preSolution {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal diff --git a/vld_vs14.sln b/vld_vs14.sln index 798228f7..40f8d875 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -46,7 +46,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main_vs14.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_unload", "src\tests\vld_unload\vld_unload_vs14.vcxproj", "{A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}" + ProjectSection(ProjectDependencies) = postProject + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {50C94B05-8C3E-49ED-B2B9-5715EB624D14} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {33F98E06-F44C-4E22-9E16-4C20F8238A95} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll1", "src\tests\vld_dll1\vld_dll1_vs14.vcxproj", "{50C94B05-8C3E-49ED-B2B9-5715EB624D14}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_dll2\vld_dll2_vs14.vcxproj", "{33F98E06-F44C-4E22-9E16-4C20F8238A95}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_ComTest\ComTest_vs14.vcxproj", "{3719F504-3DF0-45F8-BC7A-4415804AC7C9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -304,6 +316,126 @@ Global {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.ActiveCfg = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.Build.0 = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.ActiveCfg = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.Build.0 = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.ActiveCfg = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.Build.0 = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.ActiveCfg = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.Build.0 = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.ActiveCfg = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.Build.0 = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.ActiveCfg = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.Build.0 = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.ActiveCfg = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.ActiveCfg = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.Build.0 = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.ActiveCfg = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.Build.0 = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.ActiveCfg = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.Build.0 = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.ActiveCfg = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.ActiveCfg = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.Build.0 = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.ActiveCfg = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.Build.0 = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.ActiveCfg = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.Build.0 = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.ActiveCfg = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.Build.0 = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.ActiveCfg = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -311,15 +443,19 @@ Global GlobalSection(NestedProjects) = preSolution {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal From 2d27a9371d1c70540160801818fd8f37e27bc8cd Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 10 Oct 2015 01:40:23 +0300 Subject: [PATCH 259/321] Run vld_unload on AppVeyor --- src/runtests.bat | 9 + src/tests/vld_ComTest/ComTest_vs14.vcxproj | 80 +++++- .../vld_ComTest/ComTest_vs14.vcxproj.filters | 1 - src/tests/vld_ComTest/ReadMe.txt | 66 ----- src/tests/vld_dll1/vld_dll1_vs14.vcxproj | 200 +++++++++++++++ src/tests/vld_dll2/vld_dll2_vs14.vcxproj | 200 +++++++++++++++ src/tests/vld_main/vld_main_vs14.vcxproj | 198 +++++++++++++++ src/tests/vld_unload/vld_unload.cpp | 160 +++++++----- src/tests/vld_unload/vld_unload_vs14.vcxproj | 186 ++++++++++++++ vld_vs14.sln | 235 +++++++++--------- 10 files changed, 1080 insertions(+), 255 deletions(-) delete mode 100644 src/tests/vld_ComTest/ReadMe.txt diff --git a/src/runtests.bat b/src/runtests.bat index 4b219191..ef0c4866 100644 --- a/src/runtests.bat +++ b/src/runtests.bat @@ -23,6 +23,15 @@ ECHO [ RUNNING ] %tests_path%\corruption.exe ECHO ------------------------------------------------------------------------------- !tests_path!\corruption.exe --gtest_output="xml:!tests_path!\corruption.exe.xml" ECHO ------------------------------------------------------------------------------- +ECHO [ RUNNING ] %tests_path%\vld_unload.exe +ECHO ------------------------------------------------------------------------------- +!tests_path!\vld_unload.exe --gtest_output="xml:!tests_path!\vld_unload.exe.xml" +ECHO ------------------------------------------------------------------------------- +ECHO [ RUNNING ] %tests_path%\vld_main.exe +ECHO ------------------------------------------------------------------------------- +!tests_path!\vld_main.exe +if %errorlevel% neq 0 exit /b %errorlevel% +ECHO ------------------------------------------------------------------------------- EXIT /b 0 :nodir diff --git a/src/tests/vld_ComTest/ComTest_vs14.vcxproj b/src/tests/vld_ComTest/ComTest_vs14.vcxproj index 2cab25ee..ef29dd46 100644 --- a/src/tests/vld_ComTest/ComTest_vs14.vcxproj +++ b/src/tests/vld_ComTest/ComTest_vs14.vcxproj @@ -1,6 +1,14 @@  + + Debug(Release) + Win32 + + + Debug(Release) + x64 + Debug Win32 @@ -22,6 +30,7 @@ {3719F504-3DF0-45F8-BC7A-4415804AC7C9} AtlProj ComTest + 8.1 @@ -34,9 +43,15 @@ true + + true + true + + true + false @@ -57,9 +72,15 @@ true + + true + true + + true + false @@ -96,6 +117,36 @@ true + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + + Use @@ -124,6 +175,34 @@ true + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + + Use @@ -216,7 +295,6 @@ - diff --git a/src/tests/vld_ComTest/ComTest_vs14.vcxproj.filters b/src/tests/vld_ComTest/ComTest_vs14.vcxproj.filters index ef247b87..afccb08f 100644 --- a/src/tests/vld_ComTest/ComTest_vs14.vcxproj.filters +++ b/src/tests/vld_ComTest/ComTest_vs14.vcxproj.filters @@ -67,7 +67,6 @@ - Resource Files diff --git a/src/tests/vld_ComTest/ReadMe.txt b/src/tests/vld_ComTest/ReadMe.txt deleted file mode 100644 index a4280d23..00000000 --- a/src/tests/vld_ComTest/ReadMe.txt +++ /dev/null @@ -1,66 +0,0 @@ -======================================================================== - 活动模板库 : ComTest 项目概述 -======================================================================== - -应用程序向导已为您创建了此 ComTest 项目，作为编写动态链接库 (DLL) -的起点。 - -本文件概要介绍组成项目的每个文件的内容。 - -ComTest.vcxproj - 这是使用应用程序向导生成的 VC++ 项目的主项目文件， - 其中包含生成该文件的 Visual C++ 的版本信息， - 以及有关使用应用程序向导选择的平台、配置和项目功能的信息。 - -ComTest.vcxproj.filters - 这是使用“应用程序向导”生成的 VC++ 项目筛选器文件。 - 它包含有关项目文件与筛选器之间的关联信息。 在 IDE 中，通过这种关联， - 在特定节点下以分组形式显示具有相似扩展名的文件。 - 例如，“.cpp”文件与“源文件”筛选器关联。 - -ComTest.idl - 此文件包含项目中定义的类型库、接口和组件类的 IDL 定义。 - 此文件将由 MIDL 编译器处理以生成： - C++ 接口定义和 GUID 声明 (ComTest.h) - GUID 定义 (ComTest_i.c) - 类型库 (ComTest.tlb) - 封送处理代码 (ComTest_p.c 和 - dlldata.c） - -ComTest.h - 此文件包含 ComTest.idl 中定义的项目的 C++ 接口定义 - 和 GUID 声明。 它将在编译过程中由 MIDL 重新生成。 - -ComTest.cpp - 此文件包含对象映射和 DLL 导出的实现。 - -ComTest.rc - 这是程序使用的所有 Microsoft Windows 资源的列表。 - -ComTest.def - 此模块定义文件为链接器提供有关 DLL 所要求的导出的信息， - 它包含用于以下内容的导出： - DllGetClassObject - DllCanUnloadNow - DllRegisterServer - DllUnregisterServer - DllInstall - -///////////////////////////////////////////////////////////////////////////// -其他标准文件： - -StdAfx.h，StdAfx.cpp - 这些文件用于生成名为 ComTest.pch 的预编译头 (PCH) 文件和 - 名为 StdAfx.obj 的预编译类型文件。 - -Resource.h - 这是用于定义资源 ID 的标准头文件。 - - -///////////////////////////////////////////////////////////////////////////// -其他注释： - - - “MFC 支持”选项可用于将 Microsoft 基础类库构建到您的主干应用程序中， - 从而让您能够使用 MFC 类、对象和函数。 -///////////////////////////////////////////////////////////////////////////// diff --git a/src/tests/vld_dll1/vld_dll1_vs14.vcxproj b/src/tests/vld_dll1/vld_dll1_vs14.vcxproj index f0d9b5c1..c58ff22f 100644 --- a/src/tests/vld_dll1/vld_dll1_vs14.vcxproj +++ b/src/tests/vld_dll1/vld_dll1_vs14.vcxproj @@ -1,6 +1,30 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -9,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -33,17 +65,43 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false true + + false + true + false true + + false + true + @@ -55,15 +113,39 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false + + false + false + + false + Use @@ -77,6 +159,47 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + Use @@ -90,6 +213,47 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + Level3 @@ -107,6 +271,24 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + Level3 @@ -124,6 +306,24 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + diff --git a/src/tests/vld_dll2/vld_dll2_vs14.vcxproj b/src/tests/vld_dll2/vld_dll2_vs14.vcxproj index ad1752e8..23602e7e 100644 --- a/src/tests/vld_dll2/vld_dll2_vs14.vcxproj +++ b/src/tests/vld_dll2/vld_dll2_vs14.vcxproj @@ -1,6 +1,30 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -9,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -33,17 +65,43 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false true + + false + true + false true + + false + true + @@ -55,15 +113,39 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false + + false + false + + false + Use @@ -77,6 +159,47 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + Use @@ -90,6 +213,47 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + Level3 @@ -107,6 +271,24 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + Level3 @@ -124,6 +306,24 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + diff --git a/src/tests/vld_main/vld_main_vs14.vcxproj b/src/tests/vld_main/vld_main_vs14.vcxproj index b91cc5bd..d31dfd6d 100644 --- a/src/tests/vld_main/vld_main_vs14.vcxproj +++ b/src/tests/vld_main/vld_main_vs14.vcxproj @@ -1,6 +1,30 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -9,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -33,17 +65,43 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false true + + false + true + false true + + false + true + @@ -55,16 +113,81 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false + + false + false + + false + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + Use Level3 @@ -79,6 +202,47 @@ + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + Use Level3 @@ -93,6 +257,23 @@ + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + Level3 Use @@ -111,6 +292,23 @@ + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + Level3 Use diff --git a/src/tests/vld_unload/vld_unload.cpp b/src/tests/vld_unload/vld_unload.cpp index d61c447f..a1b19b65 100644 --- a/src/tests/vld_unload/vld_unload.cpp +++ b/src/tests/vld_unload/vld_unload.cpp @@ -7,6 +7,8 @@ #include #include +#include + #ifdef _WIN64 static const TCHAR* sVld_dll = _T("vld_x64.dll"); #else @@ -39,82 +41,106 @@ HMODULE GetModuleFromAddress(LPCVOID pAddress) } -int _tmain(int argc, _TCHAR* argv[]) +TEST(TestUnloadDlls, Sequence1) { - int PASSED = 0; - { - HMODULE hModule1 = ::LoadLibrary(_T("vld_dll1.dll")); - int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak - ::FreeLibrary(hModule1); // vld is unloaded here and reports the memory leak - int x = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks - - HMODULE hModule2 = ::LoadLibrary(_T("vld_dll2.dll")); - int y = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak - ::FreeLibrary(hModule2); // vld is unloaded here and reports the memory leak - int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks - assert(w == 1 && x == -1 && y == 1 && z == -1); - if (w == 1 && x == -1 && y == 1 && z == -1) { - ++PASSED; - } - } + HMODULE hModule1 = ::LoadLibrary(_T("vld_dll1.dll")); + int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + ::FreeLibrary(hModule1); // vld is unloaded here and reports the memory leak + int x = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks + + HMODULE hModule2 = ::LoadLibrary(_T("vld_dll2.dll")); + int y = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + ::FreeLibrary(hModule2); // vld is unloaded here and reports the memory leak + int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks +#ifdef _MT + ASSERT_EQ(3, w); + ASSERT_EQ(-1, x); + ASSERT_EQ(3, y); + ASSERT_EQ(-1, z); +#else + ASSERT_EQ(1, w); + ASSERT_EQ(-1, x); + ASSERT_EQ(1, y); + ASSERT_EQ(-1, z); +#endif +} - { - HMODULE hModule3 = ::LoadLibrary(_T("vld_dll1.dll")); - int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak - HMODULE hModule4 = ::LoadLibrary(_T("vld_dll2.dll")); - int x = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks - ::FreeLibrary(hModule4); // vld is *not* unloaded here - int y = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks - ::FreeLibrary(hModule3); // vld is unloaded here and reports 2 memory leaks - int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks - assert(w == 1 && x == 2 && y == 2 && z == -1); - if (w == 1 && x == 2 && y == 2 && z == -1) { - ++PASSED; - } - } +TEST(TestUnloadDlls, Sequence2) +{ + HMODULE hModule3 = ::LoadLibrary(_T("vld_dll1.dll")); + int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + HMODULE hModule4 = ::LoadLibrary(_T("vld_dll2.dll")); + int x = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks + ::FreeLibrary(hModule4); // vld is *not* unloaded here + int y = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks + ::FreeLibrary(hModule3); // vld is unloaded here and reports 2 memory leaks + int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks +#ifdef _MT + ASSERT_EQ(3, w); + ASSERT_EQ(6, x); + ASSERT_EQ(4, y); + ASSERT_EQ(-1, z); +#else + ASSERT_EQ(1, w); + ASSERT_EQ(2, x); + ASSERT_EQ(2, y); + ASSERT_EQ(-1, z); +#endif +} - { - HMODULE hModule5 = ::LoadLibrary(_T("vld_dll1.dll")); - int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak - HMODULE hModule6 = ::LoadLibrary(_T("vld_dll2.dll")); - int x = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks - ::FreeLibrary(hModule5); // vld is *not* unloaded here - int y = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks - ::FreeLibrary(hModule6); // vld is unloaded here and reports 2 memory leaks - int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks - assert(w == 1 && x == 2 && y == 2 && z == -1); - if (w == 1 && x == 2 && y == 2 && z == -1) { - ++PASSED; - } - } +TEST(TestUnloadDlls, Sequence3) +{ + HMODULE hModule5 = ::LoadLibrary(_T("vld_dll1.dll")); + int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + HMODULE hModule6 = ::LoadLibrary(_T("vld_dll2.dll")); + int x = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks + ::FreeLibrary(hModule5); // vld is *not* unloaded here + int y = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks + ::FreeLibrary(hModule6); // vld is unloaded here and reports 2 memory leaks + int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks +#ifdef _MT + ASSERT_EQ(3, w); + ASSERT_EQ(6, x); + ASSERT_EQ(4, y); + ASSERT_EQ(-1, z); +#else + ASSERT_EQ(1, w); + ASSERT_EQ(2, x); + ASSERT_EQ(2, y); + ASSERT_EQ(-1, z); +#endif +} - { - typedef FARPROC(__stdcall *GetProcAddress_t) (HMODULE, LPCSTR); +TEST(TestUnloadDlls, Sequence4) +{ + typedef FARPROC(__stdcall *GetProcAddress_t) (HMODULE, LPCSTR); - HMODULE kernel32 = GetModuleHandleW(L"KernelBase.dll"); - if (!kernel32) { - kernel32 = GetModuleHandleW(L"kernel32.dll"); - } + HMODULE kernel32 = GetModuleHandleW(L"KernelBase.dll"); + if (!kernel32) { + kernel32 = GetModuleHandleW(L"kernel32.dll"); + } - // pGetProcAddress1 resolves to kernel32!GetProcAddress() - GetProcAddress_t pGetProcAddress1 = GetProcAddress; + // pGetProcAddress1 resolves to kernel32!GetProcAddress() + GetProcAddress_t pGetProcAddress1 = GetProcAddress; - HMODULE hModule7 = ::LoadLibrary(_T("vld_dll1.dll")); - int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + HMODULE hModule7 = ::LoadLibrary(_T("vld_dll1.dll")); + int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak - // pGetProcAddress2 resolves to vld_xXX.dll!VisualLeakDetector::_GetProcAddress() - GetProcAddress_t pGetProcAddress2 = GetProcAddress; + // pGetProcAddress2 resolves to vld_xXX.dll!VisualLeakDetector::_GetProcAddress() + GetProcAddress_t pGetProcAddress2 = GetProcAddress; - ::FreeLibrary(hModule7); // vld is unloaded here and reports the memory leak - int x = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks + ::FreeLibrary(hModule7); // vld is unloaded here and reports the memory leak + int x = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks - //assert(pGetProcAddress1 == pGetProcAddress2); - GetProcAddress_t pGetProcAddress3 = (GetProcAddress_t)pGetProcAddress1(kernel32, "GetProcAddress"); - - // Following line raises 0xC0000005: Access violation exception - //GetProcAddress_t pGetProcAddress4 = (GetProcAddress_t)pGetProcAddress2(kernel32, "GetProcAddress"); - } + //assert(pGetProcAddress1 == pGetProcAddress2); + GetProcAddress_t pGetProcAddress3 = (GetProcAddress_t)pGetProcAddress1(kernel32, "GetProcAddress"); + + // Following line raises 0xC0000005: Access violation exception + //GetProcAddress_t pGetProcAddress4 = (GetProcAddress_t)pGetProcAddress2(kernel32, "GetProcAddress"); +} - // if PASSED == 3 return exit code 0; - return !(PASSED == 3); +int _tmain(int argc, _TCHAR* argv[]) +{ + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs14.vcxproj b/src/tests/vld_unload/vld_unload_vs14.vcxproj index b8f86ca5..deaa8ae0 100644 --- a/src/tests/vld_unload/vld_unload_vs14.vcxproj +++ b/src/tests/vld_unload/vld_unload_vs14.vcxproj @@ -1,6 +1,30 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -9,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -33,17 +65,43 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false true + + false + true + false true + + false + true + @@ -55,15 +113,39 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false + + false + false + + false + Level3 @@ -75,7 +157,76 @@ true + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + Level3 Disabled @@ -102,6 +253,22 @@ true + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + Level3 @@ -117,6 +284,22 @@ true + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + @@ -126,6 +309,9 @@ + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + {50c94b05-8c3e-49ed-b2b9-5715eb624d14} true diff --git a/vld_vs14.sln b/vld_vs14.sln index 40f8d875..b2189aa6 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -62,12 +62,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_Co EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 + Debug_StaticCrt|x64 = Debug_StaticCrt|x64 Debug_VldRelease_StaticCrt|Win32 = Debug_VldRelease_StaticCrt|Win32 Debug_VldRelease_StaticCrt|x64 = Debug_VldRelease_StaticCrt|x64 Debug_VldRelease|Win32 = Debug_VldRelease|Win32 Debug_VldRelease|x64 = Debug_VldRelease|x64 - Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 - Debug_StaticCrt|x64 = Debug_StaticCrt|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release_StaticCrt|Win32 = Release_StaticCrt|Win32 @@ -76,6 +76,10 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 @@ -84,10 +88,6 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 @@ -100,6 +100,10 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -108,10 +112,6 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 @@ -124,6 +124,11 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Deploy.0 = Debug_StaticCrt|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -132,10 +137,6 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 @@ -148,6 +149,10 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -156,10 +161,6 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 @@ -172,6 +173,10 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -180,10 +185,6 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 @@ -196,6 +197,10 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -204,10 +209,6 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 @@ -220,6 +221,10 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 @@ -228,10 +233,6 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 @@ -244,6 +245,10 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -252,10 +257,6 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 @@ -268,6 +269,10 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 @@ -276,10 +281,6 @@ Global {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.Build.0 = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.ActiveCfg = Debug|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 @@ -292,6 +293,10 @@ Global {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 @@ -300,10 +305,6 @@ Global {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.Build.0 = Release|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.ActiveCfg = Release|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 @@ -316,122 +317,116 @@ Global {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.Build.0 = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.ActiveCfg = Debug|Win32 {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.Build.0 = Debug|Win32 {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.ActiveCfg = Debug|x64 {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.Build.0 = Debug|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.ActiveCfg = Release|Win32 {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.Build.0 = Release|Win32 {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.ActiveCfg = Release|x64 {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.Build.0 = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.Build.0 = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.ActiveCfg = Debug|Win32 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.Build.0 = Debug|Win32 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.ActiveCfg = Debug|x64 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.Build.0 = Debug|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.ActiveCfg = Release|Win32 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.Build.0 = Release|Win32 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.ActiveCfg = Release|x64 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.Build.0 = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.Build.0 = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.ActiveCfg = Debug|Win32 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.Build.0 = Debug|Win32 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.ActiveCfg = Debug|x64 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.Build.0 = Debug|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.ActiveCfg = Release|Win32 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.Build.0 = Release|Win32 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.ActiveCfg = Release|x64 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.Build.0 = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.Build.0 = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.ActiveCfg = Debug|Win32 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.Build.0 = Debug|Win32 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.ActiveCfg = Debug|x64 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.Build.0 = Debug|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.ActiveCfg = Release|Win32 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.Build.0 = Release|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.ActiveCfg = Debug|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.Build.0 = Debug|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.ActiveCfg = Debug|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.Build.0 = Debug|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.Build.0 = Release|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.Build.0 = Release|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.ActiveCfg = Release|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 @@ -454,8 +449,8 @@ Global {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal From cb85ae53f0fdab05e0509c45e633466539cec0bf Mon Sep 17 00:00:00 2001 From: ioannis Date: Sat, 10 Oct 2015 18:14:55 +0300 Subject: [PATCH 260/321] Improvements to vld_unload test --- src/tests/vld_dll1/stdafx.h | 2 ++ src/tests/vld_dll2/stdafx.h | 2 ++ src/tests/vld_unload/vld_unload.cpp | 33 +++++++------------- src/tests/vld_unload/vld_unload_vs12.vcxproj | 3 ++ 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/tests/vld_dll1/stdafx.h b/src/tests/vld_dll1/stdafx.h index e91b8376..b9e5bc15 100644 --- a/src/tests/vld_dll1/stdafx.h +++ b/src/tests/vld_dll1/stdafx.h @@ -10,6 +10,8 @@ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers // Windows Header Files: #include + +#define VLD_FORCE_ENABLE #include diff --git a/src/tests/vld_dll2/stdafx.h b/src/tests/vld_dll2/stdafx.h index e91b8376..b9e5bc15 100644 --- a/src/tests/vld_dll2/stdafx.h +++ b/src/tests/vld_dll2/stdafx.h @@ -10,6 +10,8 @@ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers // Windows Header Files: #include + +#define VLD_FORCE_ENABLE #include diff --git a/src/tests/vld_unload/vld_unload.cpp b/src/tests/vld_unload/vld_unload.cpp index a1b19b65..9b2a8f85 100644 --- a/src/tests/vld_unload/vld_unload.cpp +++ b/src/tests/vld_unload/vld_unload.cpp @@ -43,6 +43,7 @@ HMODULE GetModuleFromAddress(LPCVOID pAddress) TEST(TestUnloadDlls, Sequence1) { + ASSERT_EQ(NULL, GetModuleHandle(sVld_dll)); HMODULE hModule1 = ::LoadLibrary(_T("vld_dll1.dll")); int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak ::FreeLibrary(hModule1); // vld is unloaded here and reports the memory leak @@ -52,21 +53,17 @@ TEST(TestUnloadDlls, Sequence1) int y = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak ::FreeLibrary(hModule2); // vld is unloaded here and reports the memory leak int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks -#ifdef _MT - ASSERT_EQ(3, w); - ASSERT_EQ(-1, x); - ASSERT_EQ(3, y); - ASSERT_EQ(-1, z); -#else + + assert(w == 1 && x == -1 && y == 1 && z == -1); ASSERT_EQ(1, w); ASSERT_EQ(-1, x); ASSERT_EQ(1, y); ASSERT_EQ(-1, z); -#endif } TEST(TestUnloadDlls, Sequence2) { + ASSERT_EQ(NULL, GetModuleHandle(sVld_dll)); HMODULE hModule3 = ::LoadLibrary(_T("vld_dll1.dll")); int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak HMODULE hModule4 = ::LoadLibrary(_T("vld_dll2.dll")); @@ -75,21 +72,17 @@ TEST(TestUnloadDlls, Sequence2) int y = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks ::FreeLibrary(hModule3); // vld is unloaded here and reports 2 memory leaks int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks -#ifdef _MT - ASSERT_EQ(3, w); - ASSERT_EQ(6, x); - ASSERT_EQ(4, y); - ASSERT_EQ(-1, z); -#else + + assert(w == 1 && x == 2 && y == 2 && z == -1); ASSERT_EQ(1, w); ASSERT_EQ(2, x); ASSERT_EQ(2, y); ASSERT_EQ(-1, z); -#endif } TEST(TestUnloadDlls, Sequence3) { + ASSERT_EQ(NULL, GetModuleHandle(sVld_dll)); HMODULE hModule5 = ::LoadLibrary(_T("vld_dll1.dll")); int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak HMODULE hModule6 = ::LoadLibrary(_T("vld_dll2.dll")); @@ -98,21 +91,17 @@ TEST(TestUnloadDlls, Sequence3) int y = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks ::FreeLibrary(hModule6); // vld is unloaded here and reports 2 memory leaks int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks -#ifdef _MT - ASSERT_EQ(3, w); - ASSERT_EQ(6, x); - ASSERT_EQ(4, y); - ASSERT_EQ(-1, z); -#else + + assert(w == 1 && x == 2 && y == 2 && z == -1); ASSERT_EQ(1, w); ASSERT_EQ(2, x); ASSERT_EQ(2, y); ASSERT_EQ(-1, z); -#endif } TEST(TestUnloadDlls, Sequence4) { + ASSERT_EQ(NULL, GetModuleHandle(sVld_dll)); typedef FARPROC(__stdcall *GetProcAddress_t) (HMODULE, LPCSTR); HMODULE kernel32 = GetModuleHandleW(L"KernelBase.dll"); @@ -133,7 +122,7 @@ TEST(TestUnloadDlls, Sequence4) int x = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks //assert(pGetProcAddress1 == pGetProcAddress2); - GetProcAddress_t pGetProcAddress3 = (GetProcAddress_t)pGetProcAddress1(kernel32, "GetProcAddress"); + //GetProcAddress_t pGetProcAddress3 = (GetProcAddress_t)pGetProcAddress1(kernel32, "GetProcAddress"); // Following line raises 0xC0000005: Access violation exception //GetProcAddress_t pGetProcAddress4 = (GetProcAddress_t)pGetProcAddress2(kernel32, "GetProcAddress"); diff --git a/src/tests/vld_unload/vld_unload_vs12.vcxproj b/src/tests/vld_unload/vld_unload_vs12.vcxproj index 4bc0de80..8875c24a 100644 --- a/src/tests/vld_unload/vld_unload_vs12.vcxproj +++ b/src/tests/vld_unload/vld_unload_vs12.vcxproj @@ -126,6 +126,9 @@ + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + {50c94b05-8c3e-49ed-b2b9-5715eb624d14} true From f1ba62bcd2a0ea06ddaea598859a8dad2d7431b3 Mon Sep 17 00:00:00 2001 From: ioannis Date: Sat, 10 Oct 2015 21:23:58 +0300 Subject: [PATCH 261/321] Update VS2013 and 2015 projects and solutions --- src/tests/mfc/vldmfc.vcxproj | 5 + src/tests/mfc/vldmfc_vs12.vcxproj | 5 + src/tests/vld_ComTest/ComTest_vs12.vcxproj | 343 +++++++++++++++++- .../vld_ComTest/ComTest_vs12.vcxproj.filters | 1 - src/tests/vld_ComTest/ComTest_vs14.vcxproj | 265 +++++++++++++- src/tests/vld_dll1/vld_dll1_vs12.vcxproj | 200 ++++++++++ src/tests/vld_dll2/vld_dll2_vs12.vcxproj | 200 ++++++++++ src/tests/vld_main/vld_main_vs12.vcxproj | 198 ++++++++++ src/tests/vld_unload/vld_unload_vs12.vcxproj | 183 ++++++++++ vld_vs12.sln | 333 ++++++++--------- vld_vs14.sln | 18 +- 11 files changed, 1572 insertions(+), 179 deletions(-) diff --git a/src/tests/mfc/vldmfc.vcxproj b/src/tests/mfc/vldmfc.vcxproj index 9d2ddad3..3890ad96 100644 --- a/src/tests/mfc/vldmfc.vcxproj +++ b/src/tests/mfc/vldmfc.vcxproj @@ -287,6 +287,11 @@ + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + diff --git a/src/tests/mfc/vldmfc_vs12.vcxproj b/src/tests/mfc/vldmfc_vs12.vcxproj index 7d1b33e2..5906c117 100644 --- a/src/tests/mfc/vldmfc_vs12.vcxproj +++ b/src/tests/mfc/vldmfc_vs12.vcxproj @@ -287,6 +287,11 @@ + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + diff --git a/src/tests/vld_ComTest/ComTest_vs12.vcxproj b/src/tests/vld_ComTest/ComTest_vs12.vcxproj index aa7b2caa..8e59adca 100644 --- a/src/tests/vld_ComTest/ComTest_vs12.vcxproj +++ b/src/tests/vld_ComTest/ComTest_vs12.vcxproj @@ -1,6 +1,30 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -9,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -26,22 +58,56 @@ DynamicLibrary - Dynamic Unicode - Dynamic v120_xp true + Dynamic + + + true + Static + + + true + Dynamic + + + true + Static true + Dynamic + + + true + Static + + + true + Dynamic + + + true + Static false + Dynamic + + + false + Static false + Dynamic + + + false + Static @@ -57,15 +123,39 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false + + false + false + + false + Use @@ -94,6 +184,100 @@ .\ComTest.def true true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true @@ -122,6 +306,94 @@ .\ComTest.def true true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true @@ -154,6 +426,40 @@ true true true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + true @@ -184,6 +490,38 @@ true true true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + true @@ -216,7 +554,6 @@ - diff --git a/src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters b/src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters index ef247b87..afccb08f 100644 --- a/src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters +++ b/src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters @@ -67,7 +67,6 @@ - Resource Files diff --git a/src/tests/vld_ComTest/ComTest_vs14.vcxproj b/src/tests/vld_ComTest/ComTest_vs14.vcxproj index ef29dd46..6827de2b 100644 --- a/src/tests/vld_ComTest/ComTest_vs14.vcxproj +++ b/src/tests/vld_ComTest/ComTest_vs14.vcxproj @@ -1,6 +1,14 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + Debug(Release) Win32 @@ -9,6 +17,14 @@ Debug(Release) x64 + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -17,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -30,33 +54,60 @@ {3719F504-3DF0-45F8-BC7A-4415804AC7C9} AtlProj ComTest - 8.1 DynamicLibrary - Dynamic Unicode - Dynamic v140_xp true + Dynamic + + + true + Static true + Dynamic + + + true + Static true + Dynamic + + + true + Static true + Dynamic + + + true + Static false + Dynamic + + + false + Static false + Dynamic + + + false + Static @@ -72,21 +123,39 @@ true + + true + true + + true + true + + true + true + + true + false + + false + false + + false + Use @@ -115,6 +184,38 @@ .\ComTest.def true true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true @@ -145,6 +246,38 @@ .\ComTest.def true true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true @@ -173,6 +306,36 @@ .\ComTest.def true true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true @@ -201,6 +364,36 @@ .\ComTest.def true true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true @@ -233,6 +426,40 @@ true true true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + true @@ -263,6 +490,38 @@ true true true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + true diff --git a/src/tests/vld_dll1/vld_dll1_vs12.vcxproj b/src/tests/vld_dll1/vld_dll1_vs12.vcxproj index 3da3d106..2709040d 100644 --- a/src/tests/vld_dll1/vld_dll1_vs12.vcxproj +++ b/src/tests/vld_dll1/vld_dll1_vs12.vcxproj @@ -1,6 +1,30 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -9,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -33,17 +65,43 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false true + + false + true + false true + + false + true + @@ -55,15 +113,39 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false + + false + false + + false + Use @@ -77,6 +159,47 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + Use @@ -90,6 +213,47 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + Level3 @@ -107,6 +271,24 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + Level3 @@ -124,6 +306,24 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + diff --git a/src/tests/vld_dll2/vld_dll2_vs12.vcxproj b/src/tests/vld_dll2/vld_dll2_vs12.vcxproj index f90119ae..23c7a6eb 100644 --- a/src/tests/vld_dll2/vld_dll2_vs12.vcxproj +++ b/src/tests/vld_dll2/vld_dll2_vs12.vcxproj @@ -1,6 +1,30 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -9,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -33,17 +65,43 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false true + + false + true + false true + + false + true + @@ -55,15 +113,39 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false + + false + false + + false + Use @@ -77,6 +159,47 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + Use @@ -90,6 +213,47 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + Level3 @@ -107,6 +271,24 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + Level3 @@ -124,6 +306,24 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + diff --git a/src/tests/vld_main/vld_main_vs12.vcxproj b/src/tests/vld_main/vld_main_vs12.vcxproj index 14a884be..582bfe87 100644 --- a/src/tests/vld_main/vld_main_vs12.vcxproj +++ b/src/tests/vld_main/vld_main_vs12.vcxproj @@ -1,6 +1,30 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -9,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -33,17 +65,43 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false true + + false + true + false true + + false + true + @@ -55,16 +113,81 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false + + false + false + + false + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + Use Level3 @@ -79,6 +202,47 @@ + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + Use Level3 @@ -93,6 +257,23 @@ + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + Level3 Use @@ -111,6 +292,23 @@ + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + Level3 Use diff --git a/src/tests/vld_unload/vld_unload_vs12.vcxproj b/src/tests/vld_unload/vld_unload_vs12.vcxproj index 8875c24a..76975b20 100644 --- a/src/tests/vld_unload/vld_unload_vs12.vcxproj +++ b/src/tests/vld_unload/vld_unload_vs12.vcxproj @@ -1,6 +1,30 @@  + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + Debug Win32 @@ -9,6 +33,14 @@ Debug x64 + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + Release Win32 @@ -33,17 +65,43 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false true + + false + true + false true + + false + true + @@ -55,15 +113,39 @@ true + + true + + + true + + + true + true + + true + + + true + + + true + false + + false + false + + false + Level3 @@ -75,7 +157,76 @@ true + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + Level3 Disabled @@ -102,6 +253,22 @@ true + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + Level3 @@ -117,6 +284,22 @@ true + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + diff --git a/vld_vs12.sln b/vld_vs12.sln index 54c11cb1..4659c38e 100644 --- a/vld_vs12.sln +++ b/vld_vs12.sln @@ -62,12 +62,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_Co EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 - Debug(Release)_StaticCrt|x64 = Debug(Release)_StaticCrt|x64 - Debug(Release)|Win32 = Debug(Release)|Win32 - Debug(Release)|x64 = Debug(Release)|x64 Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 Debug_StaticCrt|x64 = Debug_StaticCrt|x64 + Debug_VldRelease_StaticCrt|Win32 = Debug_VldRelease_StaticCrt|Win32 + Debug_VldRelease_StaticCrt|x64 = Debug_VldRelease_StaticCrt|x64 + Debug_VldRelease|Win32 = Debug_VldRelease|Win32 + Debug_VldRelease|x64 = Debug_VldRelease|x64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release_StaticCrt|Win32 = Release_StaticCrt|Win32 @@ -76,18 +76,18 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.Build.0 = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 @@ -100,18 +100,18 @@ Global {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 @@ -124,18 +124,19 @@ Global {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Deploy.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 @@ -148,18 +149,18 @@ Global {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 @@ -172,18 +173,18 @@ Global {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 @@ -196,18 +197,18 @@ Global {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 @@ -220,18 +221,18 @@ Global {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.Build.0 = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 @@ -244,18 +245,18 @@ Global {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 @@ -268,18 +269,18 @@ Global {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.Build.0 = Debug|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.Build.0 = Debug|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 @@ -292,18 +293,18 @@ Global {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.Build.0 = Release|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.Build.0 = Release|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 @@ -316,122 +317,122 @@ Global {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)|Win32.Build.0 = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)|x64.ActiveCfg = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug(Release)|x64.Build.0 = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.ActiveCfg = Debug|Win32 {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.Build.0 = Debug|Win32 {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.ActiveCfg = Debug|x64 {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.Build.0 = Debug|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.ActiveCfg = Release|Win32 {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.Build.0 = Release|Win32 {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.ActiveCfg = Release|x64 {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.Build.0 = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)|Win32.Build.0 = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)|x64.ActiveCfg = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug(Release)|x64.Build.0 = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.ActiveCfg = Debug|Win32 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.Build.0 = Debug|Win32 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.ActiveCfg = Debug|x64 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.Build.0 = Debug|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.ActiveCfg = Release|Win32 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.Build.0 = Release|Win32 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.ActiveCfg = Release|x64 {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.Build.0 = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)|Win32.Build.0 = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)|x64.ActiveCfg = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug(Release)|x64.Build.0 = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.ActiveCfg = Debug|Win32 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.Build.0 = Debug|Win32 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.ActiveCfg = Debug|x64 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.Build.0 = Debug|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.ActiveCfg = Release|Win32 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.Build.0 = Release|Win32 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.ActiveCfg = Release|x64 {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.Build.0 = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)|Win32.Build.0 = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)|x64.ActiveCfg = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug(Release)|x64.Build.0 = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.ActiveCfg = Debug|Win32 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.Build.0 = Debug|Win32 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.ActiveCfg = Debug|x64 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.Build.0 = Debug|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.ActiveCfg = Release|Win32 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)|Win32.Build.0 = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)|x64.ActiveCfg = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug(Release)|x64.Build.0 = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.ActiveCfg = Debug|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.Build.0 = Debug|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.ActiveCfg = Debug|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.Build.0 = Debug|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.ActiveCfg = Release|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 @@ -454,8 +455,8 @@ Global {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal diff --git a/vld_vs14.sln b/vld_vs14.sln index b2189aa6..ab18749a 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -413,20 +413,26 @@ Global {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.ActiveCfg = Debug|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.Build.0 = Debug|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.ActiveCfg = Debug|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.Build.0 = Debug|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.ActiveCfg = Release|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 From 83585888e66186c0d4367bcc348d3a2e6adb7ea1 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Wed, 14 Oct 2015 02:34:30 +0300 Subject: [PATCH 262/321] DllMain test improved --- src/runtests.bat | 5 +- src/tests/vld_main/vld_main.cpp | 4 +- src/tests/vld_main_test/stdafx.cpp | 8 + src/tests/vld_main_test/stdafx.h | 15 + src/tests/vld_main_test/targetver.h | 8 + src/tests/vld_main_test/vld_main_test.cpp | 46 ++ .../vld_main_test/vld_main_test_vs12.vcxproj | 419 ++++++++++++++++++ .../vld_main_test_vs12.vcxproj.filters | 33 ++ .../vld_main_test/vld_main_test_vs14.vcxproj | 419 ++++++++++++++++++ .../vld_main_test_vs14.vcxproj.filters | 33 ++ src/tests/vld_unload/vld_unload_vs12.vcxproj | 72 +++ src/tests/vld_unload/vld_unload_vs14.vcxproj | 72 +++ vld_vs10.sln | 320 ------------- vld_vs10.vssscc | 10 - vld_vs11.sln | 320 ------------- vld_vs12.sln | 52 ++- vld_vs14.sln | 38 +- 17 files changed, 1204 insertions(+), 670 deletions(-) create mode 100644 src/tests/vld_main_test/stdafx.cpp create mode 100644 src/tests/vld_main_test/stdafx.h create mode 100644 src/tests/vld_main_test/targetver.h create mode 100644 src/tests/vld_main_test/vld_main_test.cpp create mode 100644 src/tests/vld_main_test/vld_main_test_vs12.vcxproj create mode 100644 src/tests/vld_main_test/vld_main_test_vs12.vcxproj.filters create mode 100644 src/tests/vld_main_test/vld_main_test_vs14.vcxproj create mode 100644 src/tests/vld_main_test/vld_main_test_vs14.vcxproj.filters delete mode 100644 vld_vs10.sln delete mode 100644 vld_vs10.vssscc delete mode 100644 vld_vs11.sln diff --git a/src/runtests.bat b/src/runtests.bat index ef0c4866..b4c4fbef 100644 --- a/src/runtests.bat +++ b/src/runtests.bat @@ -27,10 +27,9 @@ ECHO [ RUNNING ] %tests_path%\vld_unload.exe ECHO ------------------------------------------------------------------------------- !tests_path!\vld_unload.exe --gtest_output="xml:!tests_path!\vld_unload.exe.xml" ECHO ------------------------------------------------------------------------------- -ECHO [ RUNNING ] %tests_path%\vld_main.exe +ECHO [ RUNNING ] %tests_path%\vld_main_test.exe ECHO ------------------------------------------------------------------------------- -!tests_path!\vld_main.exe -if %errorlevel% neq 0 exit /b %errorlevel% +!tests_path!\vld_main_test.exe --gtest_output="xml:!tests_path!\vld_main_test.exe.xml" ECHO ------------------------------------------------------------------------------- EXIT /b 0 diff --git a/src/tests/vld_main/vld_main.cpp b/src/tests/vld_main/vld_main.cpp index 93b62c28..933bd621 100644 --- a/src/tests/vld_main/vld_main.cpp +++ b/src/tests/vld_main/vld_main.cpp @@ -37,7 +37,7 @@ int _tmain(int argc, _TCHAR* argv[]) // _tmain exits but before VLDReportLeaks() is called internally by VLD and // therefore correctly report 8 leaks. // VLDReportLeaks(); // at this point should report 9 leaks; - return VLDGetLeaksCount() == 9 ? 0 : -1; + return VLDGetLeaksCount(); } @@ -54,5 +54,5 @@ int WINAPI _tWinMain(__in HINSTANCE hInstance, // _tWinMain exits but before VLDReportLeaks() is called internally by VLD and // therefore correctly report 8 leaks. // VLDReportLeaks(); // at this point should report 9 leaks; - return VLDGetLeaksCount() == 9 ? 0 : -1; + return VLDGetLeaksCount(); } diff --git a/src/tests/vld_main_test/stdafx.cpp b/src/tests/vld_main_test/stdafx.cpp new file mode 100644 index 00000000..d5a2f158 --- /dev/null +++ b/src/tests/vld_main_test/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// vld_main.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/src/tests/vld_main_test/stdafx.h b/src/tests/vld_main_test/stdafx.h new file mode 100644 index 00000000..b005a839 --- /dev/null +++ b/src/tests/vld_main_test/stdafx.h @@ -0,0 +1,15 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#include +#include + + + +// TODO: reference additional headers your program requires here diff --git a/src/tests/vld_main_test/targetver.h b/src/tests/vld_main_test/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/src/tests/vld_main_test/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/src/tests/vld_main_test/vld_main_test.cpp b/src/tests/vld_main_test/vld_main_test.cpp new file mode 100644 index 00000000..4884757f --- /dev/null +++ b/src/tests/vld_main_test/vld_main_test.cpp @@ -0,0 +1,46 @@ +// vld_main.cpp : Defines the entry point for the console application. +// + +#include "stdafx.h" +#include +#include +#include + +std::wstring dir; + +TEST(TestWinMain, RunExe) +{ + PROCESS_INFORMATION processInformation = { 0 }; + STARTUPINFO startupInfo = { 0 }; + startupInfo.cb = sizeof(startupInfo); + + std::wstring exe = dir + _T("vld_main.exe"); + + // Create the process + BOOL result = CreateProcess(exe.c_str(), NULL, + NULL, NULL, FALSE, + NORMAL_PRIORITY_CLASS | CREATE_NO_WINDOW, + NULL, NULL, &startupInfo, &processInformation); + EXPECT_NE(0, result); + + // Successfully created the process. Wait for it to finish. + EXPECT_EQ(WAIT_OBJECT_0, WaitForSingleObject(processInformation.hProcess, INFINITE)); + + // Get the exit code. + DWORD exitCode = 0; + result = GetExitCodeProcess(processInformation.hProcess, &exitCode); + EXPECT_NE(0, result); + + // Close the handles. + CloseHandle(processInformation.hProcess); + CloseHandle(processInformation.hThread); + ASSERT_EQ(9, exitCode); +} + +int _tmain(int argc, _TCHAR* argv[]) +{ + dir = argv[0]; + dir.resize(dir.find_last_of(_T("\\")) + 1); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} \ No newline at end of file diff --git a/src/tests/vld_main_test/vld_main_test_vs12.vcxproj b/src/tests/vld_main_test/vld_main_test_vs12.vcxproj new file mode 100644 index 00000000..a50ba7e7 --- /dev/null +++ b/src/tests/vld_main_test/vld_main_test_vs12.vcxproj @@ -0,0 +1,419 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9} + Win32Proj + vld_main + vld_main_test + + + + Application + v120_xp + Unicode + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + true + + + false + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + + + + + Create + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_main_test/vld_main_test_vs12.vcxproj.filters b/src/tests/vld_main_test/vld_main_test_vs12.vcxproj.filters new file mode 100644 index 00000000..9c309eb7 --- /dev/null +++ b/src/tests/vld_main_test/vld_main_test_vs12.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_main_test/vld_main_test_vs14.vcxproj b/src/tests/vld_main_test/vld_main_test_vs14.vcxproj new file mode 100644 index 00000000..2e44ec80 --- /dev/null +++ b/src/tests/vld_main_test/vld_main_test_vs14.vcxproj @@ -0,0 +1,419 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} + Win32Proj + vld_main + vld_main_test + + + + Application + v140_xp + Unicode + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + true + + + false + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + + + + + Create + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_main_test/vld_main_test_vs14.vcxproj.filters b/src/tests/vld_main_test/vld_main_test_vs14.vcxproj.filters new file mode 100644 index 00000000..9c309eb7 --- /dev/null +++ b/src/tests/vld_main_test/vld_main_test_vs14.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs12.vcxproj b/src/tests/vld_unload/vld_unload_vs12.vcxproj index 76975b20..a624b7fe 100644 --- a/src/tests/vld_unload/vld_unload_vs12.vcxproj +++ b/src/tests/vld_unload/vld_unload_vs12.vcxproj @@ -156,6 +156,12 @@ Console true + + + + + + @@ -167,6 +173,12 @@ Console true + + + + + + @@ -179,6 +191,12 @@ Console true + + + + + + @@ -191,6 +209,12 @@ Console true + + + + + + @@ -202,6 +226,12 @@ Console true + + + + + + @@ -213,6 +243,12 @@ Console true + + + + + + @@ -225,6 +261,12 @@ Console true + + + + + + @@ -237,6 +279,12 @@ Console true + + + + + + @@ -252,6 +300,12 @@ true true + + + + + + @@ -268,6 +322,12 @@ true true + + + + + + @@ -283,6 +343,12 @@ true true + + + + + + @@ -299,6 +365,12 @@ true true + + + + + + diff --git a/src/tests/vld_unload/vld_unload_vs14.vcxproj b/src/tests/vld_unload/vld_unload_vs14.vcxproj index deaa8ae0..611d7232 100644 --- a/src/tests/vld_unload/vld_unload_vs14.vcxproj +++ b/src/tests/vld_unload/vld_unload_vs14.vcxproj @@ -156,6 +156,12 @@ Console true + + + + + + @@ -167,6 +173,12 @@ Console true + + + + + + @@ -179,6 +191,12 @@ Console true + + + + + + @@ -191,6 +209,12 @@ Console true + + + + + + @@ -202,6 +226,12 @@ Console true + + + + + + @@ -213,6 +243,12 @@ Console true + + + + + + @@ -225,6 +261,12 @@ Console true + + + + + + @@ -237,6 +279,12 @@ Console true + + + + + + @@ -252,6 +300,12 @@ true true + + + + + + @@ -268,6 +322,12 @@ true true + + + + + + @@ -283,6 +343,12 @@ true true + + + + + + @@ -299,6 +365,12 @@ true true + + + + + + diff --git a/vld_vs10.sln b/vld_vs10.sln deleted file mode 100644 index 700b330d..00000000 --- a/vld_vs10.sln +++ /dev/null @@ -1,320 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" - ProjectSection(ProjectDependencies) = postProject - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "src\tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "src\tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 - Debug(Release)_StaticCrt|x64 = Debug(Release)_StaticCrt|x64 - Debug(Release)|Win32 = Debug(Release)|Win32 - Debug(Release)|x64 = Debug(Release)|x64 - Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 - Debug_StaticCrt|x64 = Debug_StaticCrt|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_StaticCrt|Win32 = Release_StaticCrt|Win32 - Release_StaticCrt|x64 = Release_StaticCrt|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - EndGlobalSection -EndGlobal diff --git a/vld_vs10.vssscc b/vld_vs10.vssscc deleted file mode 100644 index 6cb031bc..00000000 --- a/vld_vs10.vssscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROJECT" -} diff --git a/vld_vs11.sln b/vld_vs11.sln deleted file mode 100644 index 6073009f..00000000 --- a/vld_vs11.sln +++ /dev/null @@ -1,320 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" - ProjectSection(ProjectDependencies) = postProject - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "src\tests\mfc_dll\mfc.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "src\tests\mfc\vldmfc.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug(Release)_StaticCrt|Win32 = Debug(Release)_StaticCrt|Win32 - Debug(Release)_StaticCrt|x64 = Debug(Release)_StaticCrt|x64 - Debug(Release)|Win32 = Debug(Release)|Win32 - Debug(Release)|x64 = Debug(Release)|x64 - Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 - Debug_StaticCrt|x64 = Debug_StaticCrt|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_StaticCrt|Win32 = Release_StaticCrt|Win32 - Release_StaticCrt|x64 = Release_StaticCrt|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug(Release)|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug(Release)|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.ActiveCfg = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|Win32.Build.0 = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.ActiveCfg = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug(Release)|x64.Build.0 = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug(Release)|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug(Release)|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - EndGlobalSection -EndGlobal diff --git a/vld_vs12.sln b/vld_vs12.sln index 4659c38e..2573ed2c 100644 --- a/vld_vs12.sln +++ b/vld_vs12.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld_vs12.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" EndProject @@ -60,6 +60,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_d EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_ComTest\ComTest_vs12.vcxproj", "{3719F504-3DF0-45F8-BC7A-4415804AC7C9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs12.vcxproj", "{D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}" + ProjectSection(ProjectDependencies) = postProject + {8C732490-DC1A-40C0-923F-1555B9141B80} = {8C732490-DC1A-40C0-923F-1555B9141B80} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 @@ -413,6 +418,10 @@ Global {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -421,10 +430,6 @@ Global {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.ActiveCfg = Debug|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.Build.0 = Debug|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.ActiveCfg = Debug|x64 @@ -437,6 +442,30 @@ Global {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.Build.0 = Release|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|Win32.ActiveCfg = Debug|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|Win32.Build.0 = Debug|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|x64.ActiveCfg = Debug|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|x64.Build.0 = Debug|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|Win32.ActiveCfg = Release|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|Win32.Build.0 = Release|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|x64.ActiveCfg = Release|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -444,19 +473,20 @@ Global GlobalSection(NestedProjects) = preSolution {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} EndGlobalSection EndGlobal diff --git a/vld_vs14.sln b/vld_vs14.sln index ab18749a..aa6d5cad 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -60,6 +60,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_d EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_ComTest\ComTest_vs14.vcxproj", "{3719F504-3DF0-45F8-BC7A-4415804AC7C9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs14.vcxproj", "{BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}" + ProjectSection(ProjectDependencies) = postProject + {8C732490-DC1A-40C0-923F-1555B9141B80} = {8C732490-DC1A-40C0-923F-1555B9141B80} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 @@ -413,6 +418,10 @@ Global {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 @@ -421,10 +430,6 @@ Global {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.ActiveCfg = Debug|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.Build.0 = Debug|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.ActiveCfg = Debug|x64 @@ -437,6 +442,30 @@ Global {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.Build.0 = Release|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.ActiveCfg = Debug|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.Build.0 = Debug|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.ActiveCfg = Debug|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.Build.0 = Debug|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.ActiveCfg = Release|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.Build.0 = Release|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.ActiveCfg = Release|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -458,5 +487,6 @@ Global {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal From c4c877049191ec97a4c4ccd8858f9b0454d7b1dd Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Thu, 15 Oct 2015 00:47:29 +0300 Subject: [PATCH 263/321] Test fixed on x64 Release --- src/tests/vld_main/vld_main.cpp | 16 ++++++++-------- src/tests/vld_main_test/vld_main_test.cpp | 6 +++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/tests/vld_main/vld_main.cpp b/src/tests/vld_main/vld_main.cpp index 933bd621..a09d0386 100644 --- a/src/tests/vld_main/vld_main.cpp +++ b/src/tests/vld_main/vld_main.cpp @@ -11,26 +11,26 @@ class MemoryLeak { public: - MemoryLeak(size_t n) { l = malloc(n); } + MemoryLeak(size_t n) { l = malloc(n); } // 4,5 ~MemoryLeak() { free(l); } private: void* l; }; -static void* s_m = malloc(10); -static char* s_n = new char[20]; +static void* s_m = malloc(10); // 1 +static char* s_n = new char[20]; // 2 -static MemoryLeak* pml = new MemoryLeak(70); // leaks a new pointer and malloc(70) +static MemoryLeak* pml = new MemoryLeak(70); // 3: leaks a new pointer and malloc(70) static MemoryLeak ml{ 80 }; // *should* be freed and not report as a memory leak -void* g_m = malloc(30); -char* g_n = new char[40]; +void* g_m = malloc(30); // 6 +char* g_n = new char[40]; // 7 int _tmain(int argc, _TCHAR* argv[]) { - void* m = malloc(50); - char* n = new char[60]; + void* m = malloc(50); // 8 + char* n = new char[60]; // 9 // At this point VLDGetLeaksCount() and VLDReportLeaks() should report 9 leaks // including a leak for ml which has not been freed yet. ml will be freed after diff --git a/src/tests/vld_main_test/vld_main_test.cpp b/src/tests/vld_main_test/vld_main_test.cpp index 4884757f..7277195d 100644 --- a/src/tests/vld_main_test/vld_main_test.cpp +++ b/src/tests/vld_main_test/vld_main_test.cpp @@ -34,7 +34,11 @@ TEST(TestWinMain, RunExe) // Close the handles. CloseHandle(processInformation.hProcess); CloseHandle(processInformation.hThread); +#if !defined(_WIN64) || defined(_DEBUG) ASSERT_EQ(9, exitCode); +#else + ASSERT_EQ(7, exitCode); +#endif } int _tmain(int argc, _TCHAR* argv[]) @@ -43,4 +47,4 @@ int _tmain(int argc, _TCHAR* argv[]) dir.resize(dir.find_last_of(_T("\\")) + 1); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -} \ No newline at end of file +} From b8ff3b1915b7eadb6cca8633119ee7ec04d03a9c Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 16 Oct 2015 00:17:09 +0300 Subject: [PATCH 264/321] VS2013/2015 VLD Main leaks count fixed --- src/callstack.cpp | 1 + src/crtmfcpatch.h | 4 ++-- src/tests/vld_main_test/vld_main_test.cpp | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index 4bb9fbed..17bcc4ca 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -587,6 +587,7 @@ bool CallStack::isCrtStartupModule( const PWSTR filename ) const endWith(filename, len, L"\\crts\\ucrt\\src\\desktopcrt\\env\\environment_initialization.cpp") || // VS2013 endWith(filename, len, L"\\crt\\crtw32\\startup\\crt0dat.c") || + endWith(filename, len, L"\\crt\\crtw32\\startup\\crt0.c") || endWith(filename, len, L"\\crt\\crtw32\\startup\\stdargv.c") || endWith(filename, len, L"\\crt\\crtw32\\startup\\stdenvp.c") || endWith(filename, len, L"\\crt\\crtw32\\lowio\\ioinit.c") || diff --git a/src/crtmfcpatch.h b/src/crtmfcpatch.h index 5522f2b3..d958df65 100644 --- a/src/crtmfcpatch.h +++ b/src/crtmfcpatch.h @@ -1277,9 +1277,9 @@ typedef CrtPatch<120> typedef CrtPatch<120, true> VS120d; // Visual Studio 2015 and higher -typedef CrtPatch<130> +typedef CrtPatch<140> UCRT; -typedef CrtPatch<130, true> +typedef CrtPatch<140, true> UCRTd; VS60 VS60::data; diff --git a/src/tests/vld_main_test/vld_main_test.cpp b/src/tests/vld_main_test/vld_main_test.cpp index 7277195d..8324ea19 100644 --- a/src/tests/vld_main_test/vld_main_test.cpp +++ b/src/tests/vld_main_test/vld_main_test.cpp @@ -34,10 +34,24 @@ TEST(TestWinMain, RunExe) // Close the handles. CloseHandle(processInformation.hProcess); CloseHandle(processInformation.hThread); +#if _MSC_VER == 1800 //VC2013 + +#if !defined(_WIN64) || defined(_DEBUG) || defined(_DLL) + ASSERT_EQ(9, exitCode); +#else + // Test doesn't work +#endif + +#elif _MSC_VER == 1900 //VC2015 + #if !defined(_WIN64) || defined(_DEBUG) ASSERT_EQ(9, exitCode); #else - ASSERT_EQ(7, exitCode); + // Test doesn't work +#endif + +#else + ASSERT_EQ(9, exitCode); #endif } From 41bd39244a0bcf033bb09925b923b8da4172a05d Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 16 Oct 2015 01:11:08 +0300 Subject: [PATCH 265/321] Fix for FindRealCode function in Win64 by @Ghoort --- src/utility.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/utility.cpp b/src/utility.cpp index f953bcf4..6d10c21b 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -431,20 +431,21 @@ LPVOID FindRealCode(LPVOID pCode) LPVOID result = pCode; if (pCode != NULL) { - if (*(WORD *)pCode == 0x25ff) // jmp + if (*(WORD *)pCode == 0x25ff) // JMP r/m32 { - DWORD addr = *((DWORD *)((ULONG_PTR)pCode + 2)); #ifdef _WIN64 + LONG offset = *((LONG *)((ULONG_PTR)pCode + 2)); // RIP relative addressing PBYTE pNextInst = (PBYTE)((ULONG_PTR)pCode + 6); - pCode = *(LPVOID*)(pNextInst + addr); + pCode = *(LPVOID*)(pNextInst + offset); return pCode; #else + DWORD addr = *((DWORD *)((ULONG_PTR)pCode + 2)); pCode = *(LPVOID*)(addr); return FindRealCode(pCode); #endif } - if (*(BYTE *)pCode == 0xE9) // jmp + if (*(BYTE *)pCode == 0xE9) // JMP rel32 { // Relative next instruction PBYTE pNextInst = (PBYTE)((ULONG_PTR)pCode + 5); From a58c068f0231add11cddd6e2fffc02edc8434584 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 17 Oct 2015 00:30:28 +0300 Subject: [PATCH 266/321] Build also using VS2013 --- appveyor.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 96777b86..4fe20efc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,8 +11,14 @@ environment: GTEST_REPEAT: 1 matrix: + - VldStackWalkMethod: fast + Solution: vld_vs14.sln - VldStackWalkMethod: safe + Solution: vld_vs14.sln - VldStackWalkMethod: fast + Solution: vld_vs12.sln + - VldStackWalkMethod: safe + Solution: vld_vs12.sln platform: - Win32 @@ -31,7 +37,7 @@ build_script: - ps: | Write-Output "Configuration: $env:CONFIGURATION" Write-Output "Platform: $env:PLATFORM" - msbuild /v:m /p:"Configuration=$env:CONFIGURATION" /p:Platform="$env:PLATFORM" "vld_vs14.sln" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + msbuild /v:m /p:"Configuration=$env:CONFIGURATION" /p:Platform="$env:PLATFORM" "$env:Solution" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" test_script: - ps: | @@ -85,6 +91,7 @@ test_script: } } - $folders = @{"Debug_VldRelease" = "Debug(Release)-v140"; "Debug_VldRelease_StaticCrt" = "Debug(Release)_StaticCrt-v140"; - "Release" = "Release-v140"; "Release_StaticCrt" = "Release_StaticCrt-v140"} + $suffix = if ($env:Solution -eq "vld_vs14.sln") { "v140" } else { "v120" } + $folders = @{"Debug_VldRelease" = "Debug(Release)-$suffix"; "Debug_VldRelease_StaticCrt" = "Debug(Release)_StaticCrt-$suffix"; + "Release" = "Release-$suffix"; "Release_StaticCrt" = "Release_StaticCrt-$suffix"} Run-Tests "$env:PLATFORM" "$($folders[$env:CONFIGURATION])" From 211573edfda2da4a1b90487b51c6a81c2f88954b Mon Sep 17 00:00:00 2001 From: ioannis Date: Sat, 17 Oct 2015 14:58:02 +0300 Subject: [PATCH 267/321] Fix crt leaks detection for all configurations --- src/callstack.cpp | 5 ++-- src/tests/vld_main/vld_main.cpp | 31 ++++++++++++++--------- src/tests/vld_main_test/vld_main_test.cpp | 18 ------------- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index 17bcc4ca..3cf04d54 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -507,7 +507,7 @@ int CallStack::resolve(BOOL showInternalFrames) DWORD64 displacement64; BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); - + if (skipStartupLeaks && foundline && beginWith(functionName, wcslen(functionName), L"`dynamic initializer for '")) { isDynamicInitializer = true; } @@ -587,10 +587,11 @@ bool CallStack::isCrtStartupModule( const PWSTR filename ) const endWith(filename, len, L"\\crts\\ucrt\\src\\desktopcrt\\env\\environment_initialization.cpp") || // VS2013 endWith(filename, len, L"\\crt\\crtw32\\startup\\crt0dat.c") || - endWith(filename, len, L"\\crt\\crtw32\\startup\\crt0.c") || endWith(filename, len, L"\\crt\\crtw32\\startup\\stdargv.c") || endWith(filename, len, L"\\crt\\crtw32\\startup\\stdenvp.c") || endWith(filename, len, L"\\crt\\crtw32\\lowio\\ioinit.c") || + endWith(filename, len, L"\\crt\\crtw32\\startup\\tidtable.c") || + endWith(filename, len, L"\\crt\\crtw32\\mbstring\\mbctype.c") || // VS2010 endWith(filename, len, L"\\crt\\src\\crt0dat.c") || //_cinit() endWith(filename, len, L"\\crt\\src\\stdargv.c") || //_wsetargv() diff --git a/src/tests/vld_main/vld_main.cpp b/src/tests/vld_main/vld_main.cpp index a09d0386..7a23d344 100644 --- a/src/tests/vld_main/vld_main.cpp +++ b/src/tests/vld_main/vld_main.cpp @@ -11,7 +11,7 @@ class MemoryLeak { public: - MemoryLeak(size_t n) { l = malloc(n); } // 4,5 + MemoryLeak(size_t n) { l = malloc(n); memset(l, 0x30 + (n / 10), n); } // 4,5 ~MemoryLeak() { free(l); } private: void* l; @@ -27,11 +27,21 @@ void* g_m = malloc(30); // 6 char* g_n = new char[40]; // 7 -int _tmain(int argc, _TCHAR* argv[]) +int Test() { + VLDSetOptions(VLD_OPT_TRACE_INTERNAL_FRAMES | VLD_OPT_SKIP_CRTSTARTUP_LEAKS, 256, 64); + void* m = malloc(50); // 8 char* n = new char[60]; // 9 + memset(s_m, '1', 10); + memset(s_n, '2', 20); + memset(g_m, '3', 30); + memset(g_n, '4', 40); + memset(m, '5', 50); + memset(n, '6', 60); + + // At this point VLDGetLeaksCount() and VLDReportLeaks() should report 9 leaks // including a leak for ml which has not been freed yet. ml will be freed after // _tmain exits but before VLDReportLeaks() is called internally by VLD and @@ -40,19 +50,16 @@ int _tmain(int argc, _TCHAR* argv[]) return VLDGetLeaksCount(); } +int _tmain(int argc, _TCHAR* argv[]) +{ + return Test(); +} + int WINAPI _tWinMain(__in HINSTANCE hInstance, __in_opt HINSTANCE hPrevInstance, __in LPWSTR lpCmdLine, __in int nShowCmd) { - void* m = malloc(50); - char* n = new char[60]; - - // At this point VLDGetLeaksCount() and VLDReportLeaks() should report 9 leaks - // including a leak for ml which has not been freed yet. ml will be freed after - // _tWinMain exits but before VLDReportLeaks() is called internally by VLD and - // therefore correctly report 8 leaks. - // VLDReportLeaks(); // at this point should report 9 leaks; - return VLDGetLeaksCount(); -} + return Test(); +} \ No newline at end of file diff --git a/src/tests/vld_main_test/vld_main_test.cpp b/src/tests/vld_main_test/vld_main_test.cpp index 8324ea19..a6d191b9 100644 --- a/src/tests/vld_main_test/vld_main_test.cpp +++ b/src/tests/vld_main_test/vld_main_test.cpp @@ -34,25 +34,7 @@ TEST(TestWinMain, RunExe) // Close the handles. CloseHandle(processInformation.hProcess); CloseHandle(processInformation.hThread); -#if _MSC_VER == 1800 //VC2013 - -#if !defined(_WIN64) || defined(_DEBUG) || defined(_DLL) - ASSERT_EQ(9, exitCode); -#else - // Test doesn't work -#endif - -#elif _MSC_VER == 1900 //VC2015 - -#if !defined(_WIN64) || defined(_DEBUG) - ASSERT_EQ(9, exitCode); -#else - // Test doesn't work -#endif - -#else ASSERT_EQ(9, exitCode); -#endif } int _tmain(int argc, _TCHAR* argv[]) From f259d4691dbd81e6d41e416ba4b94729dd48e04d Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 17 Oct 2015 15:01:33 +0300 Subject: [PATCH 268/321] Check vs2013 first --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4fe20efc..ad2b960e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,14 +11,14 @@ environment: GTEST_REPEAT: 1 matrix: - - VldStackWalkMethod: fast - Solution: vld_vs14.sln - - VldStackWalkMethod: safe - Solution: vld_vs14.sln - VldStackWalkMethod: fast Solution: vld_vs12.sln - VldStackWalkMethod: safe Solution: vld_vs12.sln + - VldStackWalkMethod: fast + Solution: vld_vs14.sln + - VldStackWalkMethod: safe + Solution: vld_vs14.sln platform: - Win32 From 1b523d5c1076704a8a3cc94976d1ef6bb58a3038 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 17 Oct 2015 15:11:26 +0300 Subject: [PATCH 269/321] VS2012 solution added --- appveyor.yml | 16 +- lib/cppformat/format_vs11.vcxproj | 99 +++ lib/cppformat/format_vs11.vcxproj.filters | 27 + lib/gtest/msvc/gtest_vs11.vcxproj | 134 +++++ lib/gtest/msvc/gtest_vs11.vcxproj.filters | 18 + src/tests/basics/basics_vs11.vcxproj | 353 +++++++++++ src/tests/basics/basics_vs11.vcxproj.filters | 45 ++ src/tests/corruption/corruption_vs11.vcxproj | 324 ++++++++++ .../corruption_vs11.vcxproj.filters | 39 ++ .../dynamic_app/dynamic_app_vs11.vcxproj | 341 +++++++++++ .../dynamic_app_vs11.vcxproj.filters | 45 ++ src/tests/dynamic_dll/dynamic_vs11.vcxproj | 331 ++++++++++ .../dynamic_dll/dynamic_vs11.vcxproj.filters | 45 ++ src/tests/mfc/vldmfc_vs11.vcxproj | 298 +++++++++ src/tests/mfc/vldmfc_vs11.vcxproj.filters | 55 ++ src/tests/mfc_dll/mfc_vs11.vcxproj | 408 +++++++++++++ src/tests/mfc_dll/mfc_vs11.vcxproj.filters | 52 ++ src/tests/suite/testsuite_vs11.vcxproj | 304 ++++++++++ .../suite/testsuite_vs11.vcxproj.filters | 22 + src/tests/vld_ComTest/ComTest_vs11.vcxproj | 569 ++++++++++++++++++ .../vld_ComTest/ComTest_vs11.vcxproj.filters | 85 +++ src/tests/vld_dll1/vld_dll1_vs11.vcxproj | 345 +++++++++++ .../vld_dll1/vld_dll1_vs11.vcxproj.filters | 33 + src/tests/vld_dll2/vld_dll2_vs11.vcxproj | 345 +++++++++++ .../vld_dll2/vld_dll2_vs11.vcxproj.filters | 33 + src/tests/vld_main/vld_main.cpp | 2 + src/tests/vld_main/vld_main_vs11.vcxproj | 347 +++++++++++ .../vld_main/vld_main_vs11.vcxproj.filters | 33 + src/tests/vld_main_test/vld_main_test.cpp | 4 + .../vld_main_test/vld_main_test_vs11.vcxproj | 419 +++++++++++++ .../vld_main_test_vs11.vcxproj.filters | 33 + src/tests/vld_unload/vld_unload_vs11.vcxproj | 405 +++++++++++++ .../vld_unload_vs11.vcxproj.filters | 33 + src/vld_vs11.vcxproj | 215 +++++++ src/vld_vs11.vcxproj.filters | 104 ++++ vld_vs11.sln | 490 +++++++++++++++ 36 files changed, 6447 insertions(+), 4 deletions(-) create mode 100644 lib/cppformat/format_vs11.vcxproj create mode 100644 lib/cppformat/format_vs11.vcxproj.filters create mode 100644 lib/gtest/msvc/gtest_vs11.vcxproj create mode 100644 lib/gtest/msvc/gtest_vs11.vcxproj.filters create mode 100644 src/tests/basics/basics_vs11.vcxproj create mode 100644 src/tests/basics/basics_vs11.vcxproj.filters create mode 100644 src/tests/corruption/corruption_vs11.vcxproj create mode 100644 src/tests/corruption/corruption_vs11.vcxproj.filters create mode 100644 src/tests/dynamic_app/dynamic_app_vs11.vcxproj create mode 100644 src/tests/dynamic_app/dynamic_app_vs11.vcxproj.filters create mode 100644 src/tests/dynamic_dll/dynamic_vs11.vcxproj create mode 100644 src/tests/dynamic_dll/dynamic_vs11.vcxproj.filters create mode 100644 src/tests/mfc/vldmfc_vs11.vcxproj create mode 100644 src/tests/mfc/vldmfc_vs11.vcxproj.filters create mode 100644 src/tests/mfc_dll/mfc_vs11.vcxproj create mode 100644 src/tests/mfc_dll/mfc_vs11.vcxproj.filters create mode 100644 src/tests/suite/testsuite_vs11.vcxproj create mode 100644 src/tests/suite/testsuite_vs11.vcxproj.filters create mode 100644 src/tests/vld_ComTest/ComTest_vs11.vcxproj create mode 100644 src/tests/vld_ComTest/ComTest_vs11.vcxproj.filters create mode 100644 src/tests/vld_dll1/vld_dll1_vs11.vcxproj create mode 100644 src/tests/vld_dll1/vld_dll1_vs11.vcxproj.filters create mode 100644 src/tests/vld_dll2/vld_dll2_vs11.vcxproj create mode 100644 src/tests/vld_dll2/vld_dll2_vs11.vcxproj.filters create mode 100644 src/tests/vld_main/vld_main_vs11.vcxproj create mode 100644 src/tests/vld_main/vld_main_vs11.vcxproj.filters create mode 100644 src/tests/vld_main_test/vld_main_test_vs11.vcxproj create mode 100644 src/tests/vld_main_test/vld_main_test_vs11.vcxproj.filters create mode 100644 src/tests/vld_unload/vld_unload_vs11.vcxproj create mode 100644 src/tests/vld_unload/vld_unload_vs11.vcxproj.filters create mode 100644 src/vld_vs11.vcxproj create mode 100644 src/vld_vs11.vcxproj.filters create mode 100644 vld_vs11.sln diff --git a/appveyor.yml b/appveyor.yml index ad2b960e..fb065f49 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,14 +11,14 @@ environment: GTEST_REPEAT: 1 matrix: - - VldStackWalkMethod: fast + - VldStackWalkMethod: safe Solution: vld_vs12.sln - VldStackWalkMethod: safe + Solution: vld_vs14.sln + - VldStackWalkMethod: fast Solution: vld_vs12.sln - VldStackWalkMethod: fast Solution: vld_vs14.sln - - VldStackWalkMethod: safe - Solution: vld_vs14.sln platform: - Win32 @@ -91,7 +91,15 @@ test_script: } } - $suffix = if ($env:Solution -eq "vld_vs14.sln") { "v140" } else { "v120" } + $suffix= switch ($env:Solution) + { + vld_vs14.sln { "v140" } + vld_vs12.sln { "v120" } + vld_vs11.sln { "v110" } + default { + throw "No matching environment for $env:Solution" + } + } $folders = @{"Debug_VldRelease" = "Debug(Release)-$suffix"; "Debug_VldRelease_StaticCrt" = "Debug(Release)_StaticCrt-$suffix"; "Release" = "Release-$suffix"; "Release_StaticCrt" = "Release_StaticCrt-$suffix"} Run-Tests "$env:PLATFORM" "$($folders[$env:CONFIGURATION])" diff --git a/lib/cppformat/format_vs11.vcxproj b/lib/cppformat/format_vs11.vcxproj new file mode 100644 index 00000000..34370f2d --- /dev/null +++ b/lib/cppformat/format_vs11.vcxproj @@ -0,0 +1,99 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} + Win32Proj + Win32 + libformat + 8.1 + + + + StaticLibrary + MultiByte + v110 + + + + + + + + + + <_ProjectFileVersion>10.0.20506.1 + $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ + + + + EnableFastChecks + CompileAsCpp + Sync + MultiThreadedDebug + true + Level3 + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) + Disabled + + + + + EnableFastChecks + CompileAsCpp + Sync + MultiThreadedDebug + true + Level3 + WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) + Disabled + + + + + CompileAsCpp + Sync + MultiThreaded + true + Level3 + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) + + + + + CompileAsCpp + Sync + MultiThreaded + true + Level3 + WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/cppformat/format_vs11.vcxproj.filters b/lib/cppformat/format_vs11.vcxproj.filters new file mode 100644 index 00000000..7d1e3d30 --- /dev/null +++ b/lib/cppformat/format_vs11.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + + + {915FED9B-B1C3-4F90-BF61-CF9EE0706F01} + + + {FB559997-0E66-467B-B839-27310F735431} + + + \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_vs11.vcxproj b/lib/gtest/msvc/gtest_vs11.vcxproj new file mode 100644 index 00000000..18768e0a --- /dev/null +++ b/lib/gtest/msvc/gtest_vs11.vcxproj @@ -0,0 +1,134 @@ + + + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} + Win32Proj + libgtest + 8.1 + libgtest + + + + StaticLibrary + v110 + MultiByte + + + + + + + + + + <_ProjectFileVersion>14.0.22823.1 + $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + + + + + Disabled + WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + + + + + WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + Level3 + + + + + ..;..\include;%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_vs11.vcxproj.filters b/lib/gtest/msvc/gtest_vs11.vcxproj.filters new file mode 100644 index 00000000..b566f891 --- /dev/null +++ b/lib/gtest/msvc/gtest_vs11.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/basics/basics_vs11.vcxproj b/src/tests/basics/basics_vs11.vcxproj new file mode 100644 index 00000000..be028fa4 --- /dev/null +++ b/src/tests/basics/basics_vs11.vcxproj @@ -0,0 +1,353 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {0943354A-41E0-4215-878A-8D0FE758052C} + Win32Proj + test_basics + test_basics + 8.1 + + + + Application + Unicode + v110 + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + true + + + false + true + + + false + true + + + false + true + + + + + + + + + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + MultiThreadedDebug + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + MultiThreadedDebug + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + MultiThreadedDebug + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + + + Console + true + + + + + Use + Level3 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ProgramDatabase + MultiThreadedDebug + + + Console + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + + + + Create + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + false + true + + + + + + \ No newline at end of file diff --git a/src/tests/basics/basics_vs11.vcxproj.filters b/src/tests/basics/basics_vs11.vcxproj.filters new file mode 100644 index 00000000..fdb7dc5a --- /dev/null +++ b/src/tests/basics/basics_vs11.vcxproj.filters @@ -0,0 +1,45 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/corruption/corruption_vs11.vcxproj b/src/tests/corruption/corruption_vs11.vcxproj new file mode 100644 index 00000000..b893027c --- /dev/null +++ b/src/tests/corruption/corruption_vs11.vcxproj @@ -0,0 +1,324 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} + Win32Proj + corruption + 8.1 + corruption + + + + Application + Unicode + v110 + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + true + + + false + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level3 + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + Level3 + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + + + Level3 + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + Level3 + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + false + + + + + + \ No newline at end of file diff --git a/src/tests/corruption/corruption_vs11.vcxproj.filters b/src/tests/corruption/corruption_vs11.vcxproj.filters new file mode 100644 index 00000000..9194b4d8 --- /dev/null +++ b/src/tests/corruption/corruption_vs11.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/dynamic_app/dynamic_app_vs11.vcxproj b/src/tests/dynamic_app/dynamic_app_vs11.vcxproj new file mode 100644 index 00000000..9a9c9738 --- /dev/null +++ b/src/tests/dynamic_app/dynamic_app_vs11.vcxproj @@ -0,0 +1,341 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} + Win32Proj + dynamic_app + 8.1 + dynamic_app + + + + Application + Unicode + v110 + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + true + + + false + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + + + + + Level4 + Disabled + STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + Level4 + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + Level4 + MaxSpeed + true + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + + + Level4 + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + Level4 + true + STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + false + + + {3aea2aaf-3e9b-466f-b361-560b95ad88b4} + false + false + false + false + false + + + {2178e5b2-1032-441f-a664-f3d8d1fd1913} + false + false + false + false + + + + + + \ No newline at end of file diff --git a/src/tests/dynamic_app/dynamic_app_vs11.vcxproj.filters b/src/tests/dynamic_app/dynamic_app_vs11.vcxproj.filters new file mode 100644 index 00000000..72fba51d --- /dev/null +++ b/src/tests/dynamic_app/dynamic_app_vs11.vcxproj.filters @@ -0,0 +1,45 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/dynamic_dll/dynamic_vs11.vcxproj b/src/tests/dynamic_dll/dynamic_vs11.vcxproj new file mode 100644 index 00000000..a4ebe6dd --- /dev/null +++ b/src/tests/dynamic_dll/dynamic_vs11.vcxproj @@ -0,0 +1,331 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + Win32Proj + dynamic + dynamic + 8.1 + + + + DynamicLibrary + Unicode + v110 + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + true + + + false + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + + + + + + + + + + + + + + Create + + + + + + \ No newline at end of file diff --git a/src/tests/dynamic_dll/dynamic_vs11.vcxproj.filters b/src/tests/dynamic_dll/dynamic_vs11.vcxproj.filters new file mode 100644 index 00000000..52e065e3 --- /dev/null +++ b/src/tests/dynamic_dll/dynamic_vs11.vcxproj.filters @@ -0,0 +1,45 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/mfc/vldmfc_vs11.vcxproj b/src/tests/mfc/vldmfc_vs11.vcxproj new file mode 100644 index 00000000..94ec78bd --- /dev/null +++ b/src/tests/mfc/vldmfc_vs11.vcxproj @@ -0,0 +1,298 @@ + + + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {A231973E-072A-428E-982E-5363ADD1CDE2} + MFCProj + 8.1 + vldmfc + vldmfc + + + + Application + Unicode + v110 + + + Dynamic + + + Static + + + Dynamic + + + Static + + + Dynamic + + + Static + + + Dynamic + + + Static + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + false + false + false + false + true + true + true + true + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + + + + + + + + MaxSpeed + OnlyExplicitInline + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + Use + + + NDEBUG;%(PreprocessorDefinitions) + + + Windows + false + true + + + + + MaxSpeed + OnlyExplicitInline + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + Use + + + NDEBUG;%(PreprocessorDefinitions) + + + Windows + false + true + + + + + MaxSpeed + OnlyExplicitInline + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + Use + + + NDEBUG;%(PreprocessorDefinitions) + + + Windows + false + true + + + + + MaxSpeed + OnlyExplicitInline + VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + Level3 + Use + + + NDEBUG;%(PreprocessorDefinitions) + + + Windows + false + true + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + Level3 + + + _DEBUG;%(PreprocessorDefinitions) + + + true + Windows + false + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + Level3 + + + _DEBUG;%(PreprocessorDefinitions) + + + true + Windows + false + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + Level3 + + + _DEBUG;%(PreprocessorDefinitions) + + + true + Windows + false + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + Level3 + + + _DEBUG;%(PreprocessorDefinitions) + + + true + Windows + false + + + + + Create + + + + + + + + + + + + + + + + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/mfc/vldmfc_vs11.vcxproj.filters b/src/tests/mfc/vldmfc_vs11.vcxproj.filters new file mode 100644 index 00000000..2aeb011e --- /dev/null +++ b/src/tests/mfc/vldmfc_vs11.vcxproj.filters @@ -0,0 +1,55 @@ + + + + + {34f1f2ae-d745-4d33-82c0-d281bca28a63} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {716aeea6-27e4-47d9-9d4e-4a9d35551f9c} + h;hpp;hxx;hm;inl + + + {468ee78d-f409-4040-95ff-fd2928868302} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/src/tests/mfc_dll/mfc_vs11.vcxproj b/src/tests/mfc_dll/mfc_vs11.vcxproj new file mode 100644 index 00000000..af107774 --- /dev/null +++ b/src/tests/mfc_dll/mfc_vs11.vcxproj @@ -0,0 +1,408 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {2178E5B2-1032-441F-A664-F3D8D1FD1913} + test_mfc + MFCDLLProj + test_mfc + 8.1 + + + + DynamicLibrary + Unicode + v110 + + + true + Dynamic + + + true + Static + + + true + Dynamic + + + true + Static + + + true + Dynamic + + + true + Static + + + true + Dynamic + + + true + Static + + + false + true + Dynamic + + + false + true + Static + + + false + true + Dynamic + + + false + true + Static + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + .\mfc.def + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Windows + true + .\mfc.def + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + .\mfc.def + + + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + true + true + .\mfc.def + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + .\mfc.def + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + Windows + true + true + true + .\mfc.def + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + + + Windows + true + true + true + .\mfc.def + + + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + Create + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/tests/mfc_dll/mfc_vs11.vcxproj.filters b/src/tests/mfc_dll/mfc_vs11.vcxproj.filters new file mode 100644 index 00000000..656c5de1 --- /dev/null +++ b/src/tests/mfc_dll/mfc_vs11.vcxproj.filters @@ -0,0 +1,52 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Resource Files + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/tests/suite/testsuite_vs11.vcxproj b/src/tests/suite/testsuite_vs11.vcxproj new file mode 100644 index 00000000..19251a8d --- /dev/null +++ b/src/tests/suite/testsuite_vs11.vcxproj @@ -0,0 +1,304 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} + testsuite + 8.1 + testsuite + + + + Application + NotSet + v110 + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + NativeRecommendedRules.ruleset + NativeRecommendedRules.ruleset + + + + + + + + Disabled + WIN32;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + false + false + + + true + Console + + + + + Disabled + WIN32;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + false + false + + + true + Console + + + + + Full + VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) + MultiThreadedDLL + true + true + + + true + true + true + Console + + + + + Full + VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + true + true + true + Console + + + + + Disabled + WIN32;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + false + true + + + true + Console + + + + + Disabled + WIN32;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + false + true + + + true + Console + + + + + Disabled + WIN64;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + false + false + + + true + Console + + + + + Disabled + WIN64;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + false + false + + + true + Console + + + + + Full + VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) + MultiThreadedDLL + true + true + + + true + true + true + Console + + + + + Full + VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + true + true + true + Console + + + + + Disabled + WIN64;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + false + true + + + true + true + Console + + + + + Disabled + WIN64;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + false + true + + + true + true + Console + + + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + false + false + true + false + + + + + + \ No newline at end of file diff --git a/src/tests/suite/testsuite_vs11.vcxproj.filters b/src/tests/suite/testsuite_vs11.vcxproj.filters new file mode 100644 index 00000000..31a8fddb --- /dev/null +++ b/src/tests/suite/testsuite_vs11.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_ComTest/ComTest_vs11.vcxproj b/src/tests/vld_ComTest/ComTest_vs11.vcxproj new file mode 100644 index 00000000..d1427051 --- /dev/null +++ b/src/tests/vld_ComTest/ComTest_vs11.vcxproj @@ -0,0 +1,569 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {3719F504-3DF0-45F8-BC7A-4415804AC7C9} + AtlProj + ComTest + + + + DynamicLibrary + Unicode + v110 + + + true + Dynamic + + + true + Static + + + true + Dynamic + + + true + Static + + + true + Dynamic + + + true + Static + + + true + Dynamic + + + true + Static + + + false + Dynamic + + + false + Static + + + false + Dynamic + + + false + Static + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + _DEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + Win32 + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + true + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + true + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + + + false + NDEBUG;%(PreprocessorDefinitions) + ComTest_i.h + ComTest_i.c + ComTest_p.c + true + $(IntDir)ComTest.tlb + + + 0x0804 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\ComTest.def + true + true + true + true + true + + + + + + NotUsing + + + + + Create + + + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_ComTest/ComTest_vs11.vcxproj.filters b/src/tests/vld_ComTest/ComTest_vs11.vcxproj.filters new file mode 100644 index 00000000..afccb08f --- /dev/null +++ b/src/tests/vld_ComTest/ComTest_vs11.vcxproj.filters @@ -0,0 +1,85 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {a27c1591-bff6-481d-8a73-f014c351a0f7} + False + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Generated Files + + + Source Files + + + Generated Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Generated Files + + + Header Files + + + + + Resource Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/tests/vld_dll1/vld_dll1_vs11.vcxproj b/src/tests/vld_dll1/vld_dll1_vs11.vcxproj new file mode 100644 index 00000000..fa81e693 --- /dev/null +++ b/src/tests/vld_dll1/vld_dll1_vs11.vcxproj @@ -0,0 +1,345 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} + Win32Proj + vld_dll1 + vld_dll1 + + + + DynamicLibrary + v110 + Unicode + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + true + + + false + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + + + + + + + + + Create + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_dll1/vld_dll1_vs11.vcxproj.filters b/src/tests/vld_dll1/vld_dll1_vs11.vcxproj.filters new file mode 100644 index 00000000..95c6df39 --- /dev/null +++ b/src/tests/vld_dll1/vld_dll1_vs11.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_dll2/vld_dll2_vs11.vcxproj b/src/tests/vld_dll2/vld_dll2_vs11.vcxproj new file mode 100644 index 00000000..b8cc9b83 --- /dev/null +++ b/src/tests/vld_dll2/vld_dll2_vs11.vcxproj @@ -0,0 +1,345 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {33F98E06-F44C-4E22-9E16-4C20F8238A95} + Win32Proj + vld_dll1 + vld_dll2 + + + + DynamicLibrary + v110 + Unicode + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + true + + + false + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + + + + + + + + + + Create + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_dll2/vld_dll2_vs11.vcxproj.filters b/src/tests/vld_dll2/vld_dll2_vs11.vcxproj.filters new file mode 100644 index 00000000..95c6df39 --- /dev/null +++ b/src/tests/vld_dll2/vld_dll2_vs11.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_main/vld_main.cpp b/src/tests/vld_main/vld_main.cpp index 7a23d344..9cddd24f 100644 --- a/src/tests/vld_main/vld_main.cpp +++ b/src/tests/vld_main/vld_main.cpp @@ -21,7 +21,9 @@ static void* s_m = malloc(10); // 1 static char* s_n = new char[20]; // 2 static MemoryLeak* pml = new MemoryLeak(70); // 3: leaks a new pointer and malloc(70) +#if _MSC_VER > 1700 static MemoryLeak ml{ 80 }; // *should* be freed and not report as a memory leak +#endif void* g_m = malloc(30); // 6 char* g_n = new char[40]; // 7 diff --git a/src/tests/vld_main/vld_main_vs11.vcxproj b/src/tests/vld_main/vld_main_vs11.vcxproj new file mode 100644 index 00000000..b4843687 --- /dev/null +++ b/src/tests/vld_main/vld_main_vs11.vcxproj @@ -0,0 +1,347 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {8C732490-DC1A-40C0-923F-1555B9141B80} + Win32Proj + vld_main + vld_main + + + + Application + v110 + Unicode + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + true + + + false + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + + + + + Create + + + + + + {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_main/vld_main_vs11.vcxproj.filters b/src/tests/vld_main/vld_main_vs11.vcxproj.filters new file mode 100644 index 00000000..4644d1bb --- /dev/null +++ b/src/tests/vld_main/vld_main_vs11.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_main_test/vld_main_test.cpp b/src/tests/vld_main_test/vld_main_test.cpp index a6d191b9..95d1da18 100644 --- a/src/tests/vld_main_test/vld_main_test.cpp +++ b/src/tests/vld_main_test/vld_main_test.cpp @@ -34,7 +34,11 @@ TEST(TestWinMain, RunExe) // Close the handles. CloseHandle(processInformation.hProcess); CloseHandle(processInformation.hThread); +#if _MSC_VER > 1700 ASSERT_EQ(9, exitCode); +#else + ASSERT_EQ(8, exitCode); +#endif } int _tmain(int argc, _TCHAR* argv[]) diff --git a/src/tests/vld_main_test/vld_main_test_vs11.vcxproj b/src/tests/vld_main_test/vld_main_test_vs11.vcxproj new file mode 100644 index 00000000..fb53bb96 --- /dev/null +++ b/src/tests/vld_main_test/vld_main_test_vs11.vcxproj @@ -0,0 +1,419 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9} + Win32Proj + vld_main + vld_main_test + + + + Application + v110 + Unicode + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + true + + + false + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + + + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + + + + + Create + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + + + + \ No newline at end of file diff --git a/src/tests/vld_main_test/vld_main_test_vs11.vcxproj.filters b/src/tests/vld_main_test/vld_main_test_vs11.vcxproj.filters new file mode 100644 index 00000000..9c309eb7 --- /dev/null +++ b/src/tests/vld_main_test/vld_main_test_vs11.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs11.vcxproj b/src/tests/vld_unload/vld_unload_vs11.vcxproj new file mode 100644 index 00000000..2b636a0c --- /dev/null +++ b/src/tests/vld_unload/vld_unload_vs11.vcxproj @@ -0,0 +1,405 @@ + + + + + Debug(Release)_StaticCrt + Win32 + + + Debug(Release)_StaticCrt + x64 + + + Debug(Release) + Win32 + + + Debug(Release) + x64 + + + Debug_StaticCrt + Win32 + + + Debug_StaticCrt + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_StaticCrt + Win32 + + + Release_StaticCrt + x64 + + + Release + Win32 + + + Release + x64 + + + + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} + Win32Proj + vld_unload + vld_unload + + + + Application + v110 + Unicode + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + true + + + false + true + + + false + true + + + false + true + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + false + + + false + + + false + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + + + + + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Console + true + + + + + + + + + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + + + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + Console + true + true + true + + + + + + + + + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + + + + + + + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + + {50c94b05-8c3e-49ed-b2b9-5715eb624d14} + true + false + false + false + + + {33f98e06-f44c-4e22-9e16-4c20f8238a95} + true + false + false + false + + + + + + \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs11.vcxproj.filters b/src/tests/vld_unload/vld_unload_vs11.vcxproj.filters new file mode 100644 index 00000000..43a60e40 --- /dev/null +++ b/src/tests/vld_unload/vld_unload_vs11.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/vld_vs11.vcxproj b/src/vld_vs11.vcxproj new file mode 100644 index 00000000..fd16ed71 --- /dev/null +++ b/src/vld_vs11.vcxproj @@ -0,0 +1,215 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + vld + Unicode + DynamicLibrary + true + x86 + x64 + 8.1 + vld + + + + + v110 + + + + + <_ProjectFileVersion>10.0.30128.1 + $(ProjectDir)bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ + NativeRecommendedRules.ruleset + $(ProjectName)_$(NumericPlatform) + + + false + + + false + + + false + NativeRecommendedRules.ruleset + + + false + NativeRecommendedRules.ruleset + + + + $(SolutionDir)\lib\;$(SolutionDir)\lib\dbghelp\include;$(SolutionDir)\setup;%(AdditionalIncludeDirectories) + Use + + + true + 0x03200000 + false + $(SolutionDir)\lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) + + + copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y + + + $(SolutionDir)\setup + + + + + Disabled + _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + false + 4201;4229;4091;4302;4311;4312;4127 + + + psapi.lib;%(AdditionalDependencies) + Windows + + + vld.dll.dependency.x86.manifest + + + + + Disabled + _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level4 + false + 4201;4229;4091;4302;4311;4312;4127 + false + + + psapi.lib;%(AdditionalDependencies) + Windows + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + false + 4201;4229;4091;4302;4311;4312;4127 + false + + + true + true + Windows + + + vld.dll.dependency.x86.manifest + + + + + Full + Speed + true + NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) + true + MultiThreaded + false + Fast + false + false + 4201;4229;4091;4302;4311;4312;4127 + false + + + true + true + true + Windows + + + vld.dll.dependency.x64.manifest + + + _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {4adfd279-56c6-4b1d-ba9e-b815e81c1b17} + + + + + + \ No newline at end of file diff --git a/src/vld_vs11.vcxproj.filters b/src/vld_vs11.vcxproj.filters new file mode 100644 index 00000000..02ecff1d --- /dev/null +++ b/src/vld_vs11.vcxproj.filters @@ -0,0 +1,104 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + + \ No newline at end of file diff --git a/vld_vs11.sln b/vld_vs11.sln new file mode 100644 index 00000000..d7879cce --- /dev/null +++ b/vld_vs11.sln @@ -0,0 +1,490 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld_vs11.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics_vs11.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite_vs11.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic_vs11.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app_vs11.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" + ProjectSection(ProjectDependencies) = postProject + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "src\tests\mfc_dll\mfc_vs11.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "src\tests\mfc\vldmfc_vs11.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption_vs11.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest_vs11.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format_vs11.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main_vs11.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_unload", "src\tests\vld_unload\vld_unload_vs11.vcxproj", "{A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}" + ProjectSection(ProjectDependencies) = postProject + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {50C94B05-8C3E-49ED-B2B9-5715EB624D14} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {33F98E06-F44C-4E22-9E16-4C20F8238A95} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll1", "src\tests\vld_dll1\vld_dll1_vs11.vcxproj", "{50C94B05-8C3E-49ED-B2B9-5715EB624D14}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_dll2\vld_dll2_vs11.vcxproj", "{33F98E06-F44C-4E22-9E16-4C20F8238A95}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_ComTest\ComTest_vs11.vcxproj", "{3719F504-3DF0-45F8-BC7A-4415804AC7C9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs11.vcxproj", "{D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}" + ProjectSection(ProjectDependencies) = postProject + {8C732490-DC1A-40C0-923F-1555B9141B80} = {8C732490-DC1A-40C0-923F-1555B9141B80} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 + Debug_StaticCrt|x64 = Debug_StaticCrt|x64 + Debug_VldRelease_StaticCrt|Win32 = Debug_VldRelease_StaticCrt|Win32 + Debug_VldRelease_StaticCrt|x64 = Debug_VldRelease_StaticCrt|x64 + Debug_VldRelease|Win32 = Debug_VldRelease|Win32 + Debug_VldRelease|x64 = Debug_VldRelease|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_StaticCrt|Win32 = Release_StaticCrt|Win32 + Release_StaticCrt|x64 = Release_StaticCrt|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Deploy.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 + {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.Build.0 = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 + {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.ActiveCfg = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.Build.0 = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.ActiveCfg = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.Build.0 = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.ActiveCfg = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.Build.0 = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.ActiveCfg = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.Build.0 = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.ActiveCfg = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.Build.0 = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.ActiveCfg = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.Build.0 = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.ActiveCfg = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.ActiveCfg = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.Build.0 = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.ActiveCfg = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.Build.0 = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.ActiveCfg = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.Build.0 = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.ActiveCfg = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.ActiveCfg = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.Build.0 = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.ActiveCfg = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.Build.0 = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.ActiveCfg = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.Build.0 = Debug|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.ActiveCfg = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.Build.0 = Debug|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.ActiveCfg = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 + {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.Build.0 = Release|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|Win32.ActiveCfg = Debug|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|Win32.Build.0 = Debug|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|x64.ActiveCfg = Debug|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|x64.Build.0 = Debug|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|Win32.ActiveCfg = Release|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|Win32.Build.0 = Release|Win32 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|x64.ActiveCfg = Release|x64 + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + EndGlobalSection +EndGlobal From ec546e351eab9ad0fab3f23f0d4cd9a35ba431f5 Mon Sep 17 00:00:00 2001 From: ioannis Date: Mon, 19 Oct 2015 09:57:27 +0300 Subject: [PATCH 270/321] Update dependencies in solutions --- lib/cppformat/format.vcxproj | 1 + lib/cppformat/format_vs11.vcxproj | 1 + lib/cppformat/format_vs12.vcxproj | 1 + src/tests/vld_ComTest/ComTest_vs11.vcxproj | 1 + src/tests/vld_ComTest/ComTest_vs12.vcxproj | 1 + src/tests/vld_ComTest/ComTest_vs14.vcxproj | 1 + src/tests/vld_dll2/vld_dll2_vs11.vcxproj | 2 +- src/tests/vld_dll2/vld_dll2_vs12.vcxproj | 2 +- src/tests/vld_dll2/vld_dll2_vs14.vcxproj | 2 +- .../vld_main_test/vld_main_test_vs11.vcxproj | 7 +- .../vld_main_test/vld_main_test_vs12.vcxproj | 7 +- .../vld_main_test/vld_main_test_vs14.vcxproj | 5 +- vld_vs11.sln | 64 +++++++++---------- vld_vs12.sln | 64 +++++++++---------- 14 files changed, 87 insertions(+), 72 deletions(-) diff --git a/lib/cppformat/format.vcxproj b/lib/cppformat/format.vcxproj index 529178a2..64e3a81c 100644 --- a/lib/cppformat/format.vcxproj +++ b/lib/cppformat/format.vcxproj @@ -24,6 +24,7 @@ Win32 libformat 8.1 + libformat diff --git a/lib/cppformat/format_vs11.vcxproj b/lib/cppformat/format_vs11.vcxproj index 34370f2d..25bf9ff3 100644 --- a/lib/cppformat/format_vs11.vcxproj +++ b/lib/cppformat/format_vs11.vcxproj @@ -24,6 +24,7 @@ Win32 libformat 8.1 + libformat diff --git a/lib/cppformat/format_vs12.vcxproj b/lib/cppformat/format_vs12.vcxproj index 5a382c09..f582a983 100644 --- a/lib/cppformat/format_vs12.vcxproj +++ b/lib/cppformat/format_vs12.vcxproj @@ -24,6 +24,7 @@ Win32 libformat 8.1 + libformat diff --git a/src/tests/vld_ComTest/ComTest_vs11.vcxproj b/src/tests/vld_ComTest/ComTest_vs11.vcxproj index d1427051..9679b253 100644 --- a/src/tests/vld_ComTest/ComTest_vs11.vcxproj +++ b/src/tests/vld_ComTest/ComTest_vs11.vcxproj @@ -54,6 +54,7 @@ {3719F504-3DF0-45F8-BC7A-4415804AC7C9} AtlProj ComTest + ComTest diff --git a/src/tests/vld_ComTest/ComTest_vs12.vcxproj b/src/tests/vld_ComTest/ComTest_vs12.vcxproj index 8e59adca..991eb6b2 100644 --- a/src/tests/vld_ComTest/ComTest_vs12.vcxproj +++ b/src/tests/vld_ComTest/ComTest_vs12.vcxproj @@ -54,6 +54,7 @@ {3719F504-3DF0-45F8-BC7A-4415804AC7C9} AtlProj ComTest + ComTest diff --git a/src/tests/vld_ComTest/ComTest_vs14.vcxproj b/src/tests/vld_ComTest/ComTest_vs14.vcxproj index 6827de2b..659cb9df 100644 --- a/src/tests/vld_ComTest/ComTest_vs14.vcxproj +++ b/src/tests/vld_ComTest/ComTest_vs14.vcxproj @@ -54,6 +54,7 @@ {3719F504-3DF0-45F8-BC7A-4415804AC7C9} AtlProj ComTest + ComTest diff --git a/src/tests/vld_dll2/vld_dll2_vs11.vcxproj b/src/tests/vld_dll2/vld_dll2_vs11.vcxproj index b8cc9b83..63c13b27 100644 --- a/src/tests/vld_dll2/vld_dll2_vs11.vcxproj +++ b/src/tests/vld_dll2/vld_dll2_vs11.vcxproj @@ -53,7 +53,7 @@ {33F98E06-F44C-4E22-9E16-4C20F8238A95} Win32Proj - vld_dll1 + vld_dll2 vld_dll2 diff --git a/src/tests/vld_dll2/vld_dll2_vs12.vcxproj b/src/tests/vld_dll2/vld_dll2_vs12.vcxproj index 23c7a6eb..f3961f0d 100644 --- a/src/tests/vld_dll2/vld_dll2_vs12.vcxproj +++ b/src/tests/vld_dll2/vld_dll2_vs12.vcxproj @@ -53,7 +53,7 @@ {33F98E06-F44C-4E22-9E16-4C20F8238A95} Win32Proj - vld_dll1 + vld_dll2 vld_dll2 diff --git a/src/tests/vld_dll2/vld_dll2_vs14.vcxproj b/src/tests/vld_dll2/vld_dll2_vs14.vcxproj index 23602e7e..c23b1372 100644 --- a/src/tests/vld_dll2/vld_dll2_vs14.vcxproj +++ b/src/tests/vld_dll2/vld_dll2_vs14.vcxproj @@ -53,7 +53,7 @@ {33F98E06-F44C-4E22-9E16-4C20F8238A95} Win32Proj - vld_dll1 + vld_dll2 vld_dll2 diff --git a/src/tests/vld_main_test/vld_main_test_vs11.vcxproj b/src/tests/vld_main_test/vld_main_test_vs11.vcxproj index fb53bb96..4d8185e9 100644 --- a/src/tests/vld_main_test/vld_main_test_vs11.vcxproj +++ b/src/tests/vld_main_test/vld_main_test_vs11.vcxproj @@ -51,9 +51,9 @@ - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9} + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} Win32Proj - vld_main + vld_main_test vld_main_test @@ -412,6 +412,9 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + {8c732490-dc1a-40c0-923f-1555b9141b80} + diff --git a/src/tests/vld_main_test/vld_main_test_vs12.vcxproj b/src/tests/vld_main_test/vld_main_test_vs12.vcxproj index a50ba7e7..bfac5b7d 100644 --- a/src/tests/vld_main_test/vld_main_test_vs12.vcxproj +++ b/src/tests/vld_main_test/vld_main_test_vs12.vcxproj @@ -51,9 +51,9 @@ - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9} + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} Win32Proj - vld_main + vld_main_test vld_main_test @@ -412,6 +412,9 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + {8c732490-dc1a-40c0-923f-1555b9141b80} + diff --git a/src/tests/vld_main_test/vld_main_test_vs14.vcxproj b/src/tests/vld_main_test/vld_main_test_vs14.vcxproj index 2e44ec80..16469d70 100644 --- a/src/tests/vld_main_test/vld_main_test_vs14.vcxproj +++ b/src/tests/vld_main_test/vld_main_test_vs14.vcxproj @@ -53,7 +53,7 @@ {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} Win32Proj - vld_main + vld_main_test vld_main_test @@ -412,6 +412,9 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + {8c732490-dc1a-40c0-923f-1555b9141b80} + diff --git a/vld_vs11.sln b/vld_vs11.sln index d7879cce..ea4a3fc9 100644 --- a/vld_vs11.sln +++ b/vld_vs11.sln @@ -58,7 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_d EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_ComTest\ComTest_vs11.vcxproj", "{3719F504-3DF0-45F8-BC7A-4415804AC7C9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs11.vcxproj", "{D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs11.vcxproj", "{BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}" ProjectSection(ProjectDependencies) = postProject {8C732490-DC1A-40C0-923F-1555B9141B80} = {8C732490-DC1A-40C0-923F-1555B9141B80} EndProjectSection @@ -440,30 +440,30 @@ Global {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.Build.0 = Release|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|Win32.ActiveCfg = Debug|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|Win32.Build.0 = Debug|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|x64.ActiveCfg = Debug|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|x64.Build.0 = Debug|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|Win32.ActiveCfg = Release|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|Win32.Build.0 = Release|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|x64.ActiveCfg = Release|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|x64.Build.0 = Release|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.ActiveCfg = Debug|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.Build.0 = Debug|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.ActiveCfg = Debug|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.Build.0 = Debug|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.ActiveCfg = Release|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.Build.0 = Release|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.ActiveCfg = Release|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -471,20 +471,20 @@ Global GlobalSection(NestedProjects) = preSolution {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal diff --git a/vld_vs12.sln b/vld_vs12.sln index 2573ed2c..502db988 100644 --- a/vld_vs12.sln +++ b/vld_vs12.sln @@ -60,7 +60,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_d EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_ComTest\ComTest_vs12.vcxproj", "{3719F504-3DF0-45F8-BC7A-4415804AC7C9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs12.vcxproj", "{D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs12.vcxproj", "{BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}" ProjectSection(ProjectDependencies) = postProject {8C732490-DC1A-40C0-923F-1555B9141B80} = {8C732490-DC1A-40C0-923F-1555B9141B80} EndProjectSection @@ -442,30 +442,30 @@ Global {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.Build.0 = Release|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|Win32.ActiveCfg = Debug|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|Win32.Build.0 = Debug|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|x64.ActiveCfg = Debug|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Debug|x64.Build.0 = Debug|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|Win32.ActiveCfg = Release|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|Win32.Build.0 = Release|Win32 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|x64.ActiveCfg = Release|x64 - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9}.Release|x64.Build.0 = Release|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.ActiveCfg = Debug|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.Build.0 = Debug|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.ActiveCfg = Debug|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.Build.0 = Debug|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.ActiveCfg = Release|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.Build.0 = Release|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.ActiveCfg = Release|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -473,20 +473,20 @@ Global GlobalSection(NestedProjects) = preSolution {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {D6BB7E57-C9CA-4E99-AA3D-90294BDCCFD9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} EndGlobalSection EndGlobal From ad435ea2b4e4d91a6f7b0baf819d8f73c0fdb527 Mon Sep 17 00:00:00 2001 From: ioannis Date: Mon, 19 Oct 2015 10:00:40 +0300 Subject: [PATCH 271/321] Fix build warning in vld_main for truncation of size_t to int --- src/tests/vld_main/vld_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/vld_main/vld_main.cpp b/src/tests/vld_main/vld_main.cpp index 9cddd24f..4ad54cf3 100644 --- a/src/tests/vld_main/vld_main.cpp +++ b/src/tests/vld_main/vld_main.cpp @@ -11,7 +11,7 @@ class MemoryLeak { public: - MemoryLeak(size_t n) { l = malloc(n); memset(l, 0x30 + (n / 10), n); } // 4,5 + MemoryLeak(size_t n) { l = malloc(n); memset(l, 0x30 + ((int)n / 10), n); } // 4,5 ~MemoryLeak() { free(l); } private: void* l; From 9d41f40bfbd0e51a154d465904606ea7c9c0a891 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 17 Oct 2015 23:19:15 +0300 Subject: [PATCH 272/321] LoaderLock added to SafeCallStack::getStackTrace --- src/vld.cpp | 2 ++ src/vld_hooks.cpp | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index 089a4296..18d74cf9 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -88,6 +88,8 @@ moduleentry_t ntdllPatch [] = { typedef BOOLEAN(NTAPI *PDLL_INIT_ROUTINE)(IN PVOID DllHandle, IN ULONG Reason, IN PCONTEXT Context OPTIONAL); BOOLEAN WINAPI LdrpCallInitRoutine(IN PVOID BaseAddress, IN ULONG Reason, IN PVOID Context, IN PDLL_INIT_ROUTINE EntryPoint) { + LoaderLock ll; + if (Reason == DLL_PROCESS_ATTACH) { g_vld.RefreshModules(); } diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index b33527a4..16d1e4a8 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -1470,8 +1470,6 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, // HANDLE VisualLeakDetector::_GetProcessHeap() { - LoaderLock ll; - #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); #endif @@ -1505,8 +1503,6 @@ HANDLE VisualLeakDetector::_GetProcessHeap() // HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) { - LoaderLock ll; - #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__ "\n")); #endif From 16b5bd140270a1662343b65f268dd24b7b42ce9c Mon Sep 17 00:00:00 2001 From: ioannis Date: Tue, 20 Oct 2015 02:40:10 +0300 Subject: [PATCH 273/321] Wrapper class for DbgHelp functions to ensure thread-safe operation --- src/callstack.cpp | 23 +++++-------- src/dbghelp.hpp | 84 +++++++++++++++++++++++++++++++++++++++++++++++ src/stdafx.h | 2 +- src/utility.cpp | 11 +++---- src/vld.cpp | 53 +++++++++++++----------------- src/vld_hooks.cpp | 6 ++-- 6 files changed, 123 insertions(+), 56 deletions(-) create mode 100644 src/dbghelp.hpp diff --git a/src/callstack.cpp b/src/callstack.cpp index 3cf04d54..5d2b9e54 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -33,8 +33,8 @@ extern HANDLE g_currentProcess; extern HANDLE g_currentThread; extern CriticalSection g_heapMapLock; -extern CriticalSection g_symbolLock; extern VisualLeakDetector g_vld; +extern DgbHelp g_DbgHelp; // Helper function to compare the begin of a string with a substring // @@ -208,7 +208,7 @@ LPCWSTR CallStack::getFunctionName(SIZE_T programCounter, DWORD64& displacement6 displacement64 = 0; LPCWSTR functionName; DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); - if (SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { + if (g_DbgHelp.SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { functionName = functionInfo->Name; } else { @@ -296,7 +296,6 @@ bool CallStack::isCrtStartupAlloc() BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; // Iterate through each frame in the call stack. - CriticalSectionLocker cs(g_symbolLock); for (UINT32 frame = 0; frame < m_size; frame++) { // Try to get the source file and line number associated with // this program counter address. @@ -304,7 +303,7 @@ bool CallStack::isCrtStartupAlloc() BOOL foundline = FALSE; DWORD displacement = 0; DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); - foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); if (foundline) { DWORD64 displacement64; @@ -364,7 +363,6 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const bool isPrevFrameInternal = false; // Iterate through each frame in the call stack. - CriticalSectionLocker cs(g_symbolLock); for (UINT32 frame = start_frame; frame < m_size; frame++) { // Try to get the source file and line number associated with @@ -373,7 +371,7 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const BOOL foundline = FALSE; DWORD displacement = 0; DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); - foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); bool isFrameInternal = false; if (foundline && !showInternalFrames) { @@ -463,7 +461,6 @@ int CallStack::resolve(BOOL showInternalFrames) } // Iterate through each frame in the call stack. - CriticalSectionLocker cs(g_symbolLock); for (UINT32 frame = 0; frame < m_size; frame++) { // Try to get the source file and line number associated with @@ -475,7 +472,7 @@ int CallStack::resolve(BOOL showInternalFrames) // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. // When that happens there is nothing we can do except crash. DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); - BOOL foundline = SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + BOOL foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); if (skipStartupLeaks && foundline && !isDynamicInitializer && !(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) && isCrtStartupModule(sourceInfo.FileName)) { @@ -586,10 +583,11 @@ bool CallStack::isCrtStartupModule( const PWSTR filename ) const endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\internal\\shared_initialization.cpp") || endWith(filename, len, L"\\crts\\ucrt\\src\\desktopcrt\\env\\environment_initialization.cpp") || // VS2013 - endWith(filename, len, L"\\crt\\crtw32\\startup\\crt0dat.c") || + endWith(filename, len, L"\\crt\\crtw32\\lowio\\ioinit.c") || + endWith(filename, len, L"\\crt\\crtw32\\misc\\onexit.c") || + endWith(filename, len, L"\\crt\\crtw32\\stdio\\_file.c") || endWith(filename, len, L"\\crt\\crtw32\\startup\\stdargv.c") || endWith(filename, len, L"\\crt\\crtw32\\startup\\stdenvp.c") || - endWith(filename, len, L"\\crt\\crtw32\\lowio\\ioinit.c") || endWith(filename, len, L"\\crt\\crtw32\\startup\\tidtable.c") || endWith(filename, len, L"\\crt\\crtw32\\mbstring\\mbctype.c") || // VS2010 @@ -790,13 +788,10 @@ VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) frame.Virtual = TRUE; // Walk the stack. - CriticalSectionLocker cs(g_heapMapLock); - CriticalSectionLocker cs1(g_symbolLock); - while (count < maxdepth) { count++; DbgTrace(L"dbghelp32.dll %i: StackWalk64\n", GetCurrentThreadId()); - if (!StackWalk64(architecture, g_currentProcess, g_currentThread, &frame, ¤tContext, NULL, + if (!g_DbgHelp.StackWalk64(architecture, g_currentProcess, g_currentThread, &frame, ¤tContext, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { // Couldn't trace back through any more frames. break; diff --git a/src/dbghelp.hpp b/src/dbghelp.hpp new file mode 100644 index 00000000..f7ce4829 --- /dev/null +++ b/src/dbghelp.hpp @@ -0,0 +1,84 @@ +#pragma once + +#define WIN32_LEAN_AND_MEAN +#include +#include +#include "criticalsection.h" + +class DgbHelp +{ +public: + DgbHelp() { + m_lock.Initialize(); + m_lock1.Initialize(); + m_lock2.Initialize(); + m_lock3.Initialize(); + } + ~DgbHelp() { + m_lock.Delete(); + m_lock1.Delete(); + m_lock2.Delete(); + m_lock3.Delete(); + } + BOOL IsLockedByCurrentThread() { + return + m_lock.IsLockedByCurrentThread() || + m_lock1.IsLockedByCurrentThread() || + m_lock2.IsLockedByCurrentThread() || + m_lock3.IsLockedByCurrentThread(); + } + BOOL SymInitializeW(_In_ HANDLE hProcess, _In_opt_ PCWSTR UserSearchPath, _In_ BOOL fInvadeProcess) { + CriticalSectionLocker cs(m_lock); + return ::SymInitializeW(hProcess, UserSearchPath, fInvadeProcess); + } + BOOL SymCleanup(_In_ HANDLE hProcess) { + CriticalSectionLocker cs(m_lock); + return ::SymCleanup(hProcess); + } + DWORD SymSetOptions(__in DWORD SymOptions) { + CriticalSectionLocker cs(m_lock); + return ::SymSetOptions(SymOptions); + } + BOOL SymFromAddrW(_In_ HANDLE hProcess, _In_ DWORD64 Address, _Out_opt_ PDWORD64 Displacement, _Inout_ PSYMBOL_INFOW Symbol) { + CriticalSectionLocker cs(m_lock); + return ::SymFromAddrW(hProcess, Address, Displacement, Symbol); + } + BOOL SymGetLineFromAddrW64(_In_ HANDLE hProcess, _In_ DWORD64 dwAddr, _Out_ PDWORD pdwDisplacement, _Out_ PIMAGEHLP_LINEW64 Line) { + CriticalSectionLocker cs(m_lock); + return ::SymGetLineFromAddrW64(hProcess, dwAddr, pdwDisplacement, Line); + } + BOOL SymGetModuleInfoW64(_In_ HANDLE hProcess, _In_ DWORD64 qwAddr, _Out_ PIMAGEHLP_MODULEW64 ModuleInfo) { + CriticalSectionLocker cs(m_lock); + return ::SymGetModuleInfoW64(hProcess, qwAddr, ModuleInfo); + } + DWORD64 SymLoadModuleExW(_In_ HANDLE hProcess, _In_opt_ HANDLE hFile, _In_opt_ PCWSTR ImageName, _In_opt_ PCWSTR ModuleName, _In_ DWORD64 BaseOfDll, _In_ DWORD DllSize, _In_opt_ PMODLOAD_DATA Data, _In_opt_ DWORD Flags) { + CriticalSectionLocker cs(m_lock); + return ::SymLoadModuleExW(hProcess, hFile, ImageName, ModuleName, BaseOfDll, DllSize, Data, Flags); + } + BOOL SymUnloadModule64(_In_ HANDLE hProcess, _In_ DWORD64 BaseOfDll) { + CriticalSectionLocker cs(m_lock); + return ::SymUnloadModule64(hProcess, BaseOfDll); + } + BOOL StackWalk64(__in DWORD MachineType, __in HANDLE hProcess, __in HANDLE hThread, __inout LPSTACKFRAME64 StackFrame, __inout PVOID ContextRecord, __in_opt PREAD_PROCESS_MEMORY_ROUTINE64 ReadMemoryRoutine, __in_opt PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine, __in_opt PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine, __in_opt PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress) { + CriticalSectionLocker cs(m_lock1); + return ::StackWalk64(MachineType, hProcess, hThread, StackFrame, ContextRecord, ReadMemoryRoutine, FunctionTableAccessRoutine, GetModuleBaseRoutine, TranslateAddress); + } + PVOID ImageDirectoryEntryToDataEx(__in PVOID Base, __in BOOLEAN MappedAsImage, __in USHORT DirectoryEntry, __out PULONG Size, __out_opt PIMAGE_SECTION_HEADER *FoundHeader) { + CriticalSectionLocker cs(m_lock2); + return ::ImageDirectoryEntryToDataEx(Base, MappedAsImage, DirectoryEntry, Size, FoundHeader); + } + BOOL EnumerateLoadedModulesW64(__in HANDLE hProcess, __in PENUMLOADED_MODULES_CALLBACKW64 EnumLoadedModulesCallback, __in_opt PVOID UserContext) { + CriticalSectionLocker cs(m_lock3); + return ::EnumerateLoadedModulesW64(hProcess, EnumLoadedModulesCallback, UserContext); + } +private: + // Disallow certain operations + DgbHelp(const DgbHelp&); + DgbHelp& operator=(const DgbHelp&); + +private: + CriticalSection m_lock; + CriticalSection m_lock1; + CriticalSection m_lock2; + CriticalSection m_lock3; +}; diff --git a/src/stdafx.h b/src/stdafx.h index 1bc8a1b8..b95cd7b2 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -11,4 +11,4 @@ #define __out_xcount(x) // Workaround for the specstrings.h bug in the Platform SDK. #endif #define DBGHELP_TRANSLATE_TCHAR -#include // Provides portable executable (PE) image access functions. +#include "dbghelp.hpp" // Provides portable executable (PE) image access functions. diff --git a/src/utility.cpp b/src/utility.cpp index 6d10c21b..09ad89c4 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -32,9 +32,9 @@ //#define PRINTHOOKINFO // Imported Global Variables -extern CriticalSection g_imageLock; extern ReportHookSet* g_pReportHooks; extern VisualLeakDetector g_vld; +extern DgbHelp g_DbgHelp; // Global variables. static BOOL s_reportDelay = FALSE; // If TRUE, we sleep for a bit after calling OutputDebugString to give the debugger time to catch up. @@ -219,8 +219,7 @@ IMAGE_IMPORT_DESCRIPTOR* FindOriginalImportDescriptor (HMODULE importmodule, LPC // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. { - CriticalSectionLocker cs(g_imageLock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, + idte = (IMAGE_IMPORT_DESCRIPTOR*)g_DbgHelp.ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } @@ -502,8 +501,7 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *patchModule) // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. { - CriticalSectionLocker cs(g_imageLock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, + idte = (IMAGE_IMPORT_DESCRIPTOR*)g_DbgHelp.ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } @@ -815,8 +813,7 @@ VOID RestoreImport (HMODULE importmodule, moduleentry_t* module) // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. { - CriticalSectionLocker cs(g_imageLock); - idte = (IMAGE_IMPORT_DESCRIPTOR*)ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, + idte = (IMAGE_IMPORT_DESCRIPTOR*)g_DbgHelp.ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } diff --git a/src/vld.cpp b/src/vld.cpp index 18d74cf9..5328a910 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -50,11 +50,10 @@ extern CriticalSection g_vldHeapLock; // Global variables. HANDLE g_currentProcess; // Pseudo-handle for the current process. HANDLE g_currentThread; // Pseudo-handle for the current thread. -CriticalSection g_imageLock; // Serializes calls to the Debug Help Library PE image access APIs. HANDLE g_processHeap; // Handle to the process's heap (COM allocations come from here). CriticalSection g_heapMapLock; // Serializes access to the heap and block maps. -CriticalSection g_symbolLock; // Serializes calls to the Debug Help Library symbols handling APIs. ReportHookSet* g_pReportHooks; +DgbHelp g_DbgHelp; // The one and only VisualLeakDetector object instance. __declspec(dllexport) VisualLeakDetector g_vld; @@ -362,7 +361,6 @@ VisualLeakDetector::VisualLeakDetector () // Initialize global variables. g_currentProcess = GetCurrentProcess(); g_currentThread = GetCurrentThread(); - g_imageLock.Initialize(); g_processHeap = GetProcessHeap(); HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); if (ntdll) @@ -390,7 +388,6 @@ VisualLeakDetector::VisualLeakDetector () LoaderLock ll; g_heapMapLock.Initialize(); - g_symbolLock.Initialize(); g_vldHeap = HeapCreate(0x0, 0, 0); g_vldHeapLock.Initialize(); g_pReportHooks = new ReportHookSet; @@ -459,12 +456,12 @@ VisualLeakDetector::VisualLeakDetector () set the DBGHELP_DBGOUT environment variable to a non-NULL value before calling the SymInitialize function. To log the information to a file, set the DBGHELP_LOG environment variable to the name of the log file to be used. */ - SymSetOptions(SYMOPT_DEBUG | SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS | SYMOPT_LOAD_LINES); + g_DbgHelp.SymSetOptions(SYMOPT_DEBUG | SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS | SYMOPT_LOAD_LINES); #else - SymSetOptions(SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS | SYMOPT_LOAD_LINES); + g_DbgHelp.SymSetOptions(SYMOPT_UNDNAME | SYMOPT_DEFERRED_LOADS | SYMOPT_LOAD_LINES); #endif DbgTrace(L"dbghelp32.dll %i: SymInitializeW\n", GetCurrentThreadId()); - if (!SymInitializeW(g_currentProcess, symbolpath, FALSE)) { + if (!g_DbgHelp.SymInitializeW(g_currentProcess, symbolpath, FALSE)) { Report(L"WARNING: Visual Leak Detector: The symbol handler failed to initialize (error=%lu).\n" L" File and function names will probably not be available in call stacks.\n", GetLastError()); } @@ -479,7 +476,7 @@ VisualLeakDetector::VisualLeakDetector () ModuleSet* newmodules = new ModuleSet(); newmodules->reserve(MODULE_SET_RESERVE); DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); - EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); + g_DbgHelp.EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); attachToLoadedModules(newmodules); ModuleSet* oldmodules = m_loadedModules; m_loadedModules = newmodules; @@ -607,7 +604,7 @@ VisualLeakDetector::~VisualLeakDetector () if (m_status & VLD_STATUS_INSTALLED) { // Detach Visual Leak Detector from all previously attached modules. DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); - EnumerateLoadedModulesW64(g_currentProcess, detachFromModule, NULL); + g_DbgHelp.EnumerateLoadedModulesW64(g_currentProcess, detachFromModule, NULL); HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); HMODULE kernelBase = GetModuleHandleW(L"KernelBase.dll"); @@ -640,7 +637,7 @@ VisualLeakDetector::~VisualLeakDetector () // Free resources used by the symbol handler. DbgTrace(L"dbghelp32.dll %i: SymCleanup\n", GetCurrentThreadId()); - if (!SymCleanup(g_currentProcess)) { + if (!g_DbgHelp.SymCleanup(g_currentProcess)) { Report(L"WARNING: Visual Leak Detector: The symbol handler failed to deallocate resources (error=%lu).\n", GetLastError()); } @@ -690,9 +687,7 @@ VisualLeakDetector::~VisualLeakDetector () m_optionsLock.Delete(); m_modulesLock.Delete(); m_tlsLock.Delete(); - g_imageLock.Delete(); g_heapMapLock.Delete(); - g_symbolLock.Delete(); g_vldHeapLock.Delete(); if (m_tlsIndex != TLS_OUT_OF_INDEXES) { @@ -720,20 +715,18 @@ UINT32 VisualLeakDetector::getModuleState(ModuleSet::Iterator& it, UINT32& modul DWORD64 modulebase = (DWORD64) moduleinfo.addrLow; moduleFlags = 0; - if (IsBadReadPtr((UINT*) modulebase, sizeof(UINT*))) // module unloaded + if (!GetCallingModule((UINT_PTR)modulebase)) // module unloaded return 0; - bool isNewModule = false; - CriticalSectionLocker cs(m_modulesLock); - ModuleSet* oldmodules = m_loadedModules; - ModuleSet::Iterator oldit = oldmodules->find(moduleinfo); - if (oldit != oldmodules->end()) // We've seen this "new" module loaded in the process before. - moduleFlags = (*oldit).flags; - else // This is new loaded module - isNewModule = true; - - if (isNewModule) - return 1; + { + CriticalSectionLocker cs(m_modulesLock); + ModuleSet* oldmodules = m_loadedModules; + ModuleSet::Iterator oldit = oldmodules->find(moduleinfo); + if (oldit != oldmodules->end()) // We've seen this "new" module loaded in the process before. + moduleFlags = (*oldit).flags; + else // This is new loaded module + return 1; + } if (IsModulePatched((HMODULE) modulebase, m_patchTable, _countof(m_patchTable))) { @@ -776,7 +769,6 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) LoaderLock ll; // Iterate through the supplied set, until all modules have been attached. - CriticalSectionLocker cs(g_symbolLock); for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) { UINT32 moduleFlags = 0x0; @@ -793,7 +785,7 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) if ((state == 3) && (moduleFlags & VLD_MODULE_SYMBOLSLOADED)) { // Discard the previously loaded symbols, so we can refresh them. DbgTrace(L"dbghelp32.dll %i: SymUnloadModule64\n", GetCurrentThreadId()); - if (SymUnloadModule64(g_currentProcess, modulebase) == false) { + if (g_DbgHelp.SymUnloadModule64(g_currentProcess, modulebase) == false) { Report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" L" numbers shown in the memory leak report for %s may be inaccurate.\n", modulename, modulename); } @@ -805,17 +797,16 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) // leak report. IMAGEHLP_MODULE64 moduleimageinfo; moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); - BOOL SymbolsLoaded = SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo); + BOOL SymbolsLoaded = g_DbgHelp.SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo); if (!SymbolsLoaded) { - CriticalSectionLocker csSL(g_symbolLock); DbgTrace(L"dbghelp32.dll %i: SymLoadModuleEx\n", GetCurrentThreadId()); - DWORD64 module = SymLoadModuleEx(g_currentProcess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0); + DWORD64 module = g_DbgHelp.SymLoadModuleExW(g_currentProcess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0); if (module == modulebase) { DbgTrace(L"dbghelp32.dll %i: SymGetModuleInfoW64\n", GetCurrentThreadId()); - SymbolsLoaded = SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo); + SymbolsLoaded = g_DbgHelp.SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo); } } if (SymbolsLoaded) @@ -2273,7 +2264,7 @@ VOID VisualLeakDetector::RefreshModules() // Create a new set of all loaded modules, including any newly loaded // modules. DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); - EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); + g_DbgHelp.EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); // Attach to all modules included in the set. attachToLoadedModules(newmodules); diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 16d1e4a8..62ca4141 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -44,7 +44,7 @@ extern HANDLE g_currentProcess; extern CriticalSection g_heapMapLock; -extern CriticalSection g_symbolLock; +extern DgbHelp g_DbgHelp; void VisualLeakDetector::firstAllocCall(tls_t * tls) { @@ -1689,7 +1689,7 @@ BYTE VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) #endif BYTE status; - if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls + if (!g_DbgHelp.IsLockedByCurrentThread()) // skip dbghelp.dll calls { context_t context; // Record the current frame pointer. @@ -1712,7 +1712,7 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) #endif BOOL status; - if (!g_symbolLock.IsLockedByCurrentThread()) // skip dbghelp.dll calls + if (!g_DbgHelp.IsLockedByCurrentThread()) // skip dbghelp.dll calls { context_t context; // Record the current frame pointer. From 215185d7e33fe219dc54c382c0dff3d5ebe623fc Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 31 Oct 2015 20:04:30 +0300 Subject: [PATCH 274/321] Reduced locks count --- src/callstack.cpp | 27 +++-- src/callstack.h | 2 +- src/criticalsection.h | 7 +- src/dbghelp.h | 211 ++++++++++++++++++++++++++++++++++++++++ src/dbghelp.hpp | 84 ---------------- src/stdafx.h | 2 +- src/tree.h | 20 ++-- src/utility.cpp | 8 +- src/vld.cpp | 88 +++++++++-------- src/vld.vcxproj | 1 + src/vld.vcxproj.filters | 3 + src/vld_hooks.cpp | 6 +- src/vldheap.cpp | 4 +- 13 files changed, 303 insertions(+), 160 deletions(-) create mode 100644 src/dbghelp.h delete mode 100644 src/dbghelp.hpp diff --git a/src/callstack.cpp b/src/callstack.cpp index 5d2b9e54..30a46274 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -34,7 +34,8 @@ extern HANDLE g_currentProcess; extern HANDLE g_currentThread; extern CriticalSection g_heapMapLock; extern VisualLeakDetector g_vld; -extern DgbHelp g_DbgHelp; +extern DbgHelp g_DbgHelp; +extern DHStackWalk g_StackWalk; // Helper function to compare the begin of a string with a substring // @@ -197,7 +198,7 @@ VOID CallStack::clear () } LPCWSTR CallStack::getFunctionName(SIZE_T programCounter, DWORD64& displacement64, - SYMBOL_INFO* functionInfo) const + SYMBOL_INFO* functionInfo, CriticalSectionLocker& locker) const { // Initialize structures passed to the symbol handler. functionInfo->SizeOfStruct = sizeof(SYMBOL_INFO); @@ -208,7 +209,7 @@ LPCWSTR CallStack::getFunctionName(SIZE_T programCounter, DWORD64& displacement6 displacement64 = 0; LPCWSTR functionName; DbgTrace(L"dbghelp32.dll %i: SymFromAddrW\n", GetCurrentThreadId()); - if (g_DbgHelp.SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo)) { + if (g_DbgHelp.SymFromAddrW(g_currentProcess, programCounter, &displacement64, functionInfo, locker)) { functionName = functionInfo->Name; } else { @@ -294,6 +295,7 @@ bool CallStack::isCrtStartupAlloc() sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE] = { 0 }; + CriticalSectionLocker locker(g_DbgHelp); // Iterate through each frame in the call stack. for (UINT32 frame = 0; frame < m_size; frame++) { @@ -307,7 +309,7 @@ bool CallStack::isCrtStartupAlloc() if (foundline) { DWORD64 displacement64; - LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); + LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); if (beginWith(functionName, wcslen(functionName), L"`dynamic initializer for '")) { break; } @@ -361,6 +363,7 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const // It's thread safe because of g_heapMapLock lock. static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; bool isPrevFrameInternal = false; + CriticalSectionLocker locker(g_DbgHelp); // Iterate through each frame in the call stack. for (UINT32 frame = start_frame; frame < m_size; frame++) @@ -371,7 +374,7 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const BOOL foundline = FALSE; DWORD displacement = 0; DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); - foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo, locker); bool isFrameInternal = false; if (foundline && !showInternalFrames) { @@ -389,7 +392,7 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const DWORD64 displacement64; BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; - LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); + LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); if (!foundline) displacement = (DWORD)displacement64; @@ -451,6 +454,7 @@ int CallStack::resolve(BOOL showInternalFrames) bool isPrevFrameInternal = false; bool isDynamicInitializer = false; DWORD NumChars = 0; + CriticalSectionLocker locker(g_DbgHelp); const size_t max_line_length = MAXREPORTLENGTH + 1; m_resolvedCapacity = m_size * max_line_length; @@ -472,7 +476,7 @@ int CallStack::resolve(BOOL showInternalFrames) // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. // When that happens there is nothing we can do except crash. DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); - BOOL foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); + BOOL foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo, locker); if (skipStartupLeaks && foundline && !isDynamicInitializer && !(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) && isCrtStartupModule(sourceInfo.FileName)) { @@ -503,7 +507,7 @@ int CallStack::resolve(BOOL showInternalFrames) DWORD64 displacement64; BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; - LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer); + LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); if (skipStartupLeaks && foundline && beginWith(functionName, wcslen(functionName), L"`dynamic initializer for '")) { isDynamicInitializer = true; @@ -787,12 +791,15 @@ VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) frame.AddrFrame.Mode = AddrModeFlat; frame.Virtual = TRUE; + CriticalSectionLocker<> cs(g_heapMapLock); + CriticalSectionLocker locker(g_StackWalk); + // Walk the stack. while (count < maxdepth) { count++; DbgTrace(L"dbghelp32.dll %i: StackWalk64\n", GetCurrentThreadId()); - if (!g_DbgHelp.StackWalk64(architecture, g_currentProcess, g_currentThread, &frame, ¤tContext, NULL, - SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { + if (!g_StackWalk.StackWalk64(architecture, g_currentProcess, g_currentThread, &frame, ¤tContext, NULL, + SymFunctionTableAccess64, SymGetModuleBase64, NULL, locker)) { // Couldn't trace back through any more frames. break; } diff --git a/src/callstack.h b/src/callstack.h index 15cbd6eb..de959df9 100644 --- a/src/callstack.h +++ b/src/callstack.h @@ -127,7 +127,7 @@ class CallStack bool isInternalModule( const PWSTR filename ) const; bool isCrtStartupModule( const PWSTR filename ) const; LPCWSTR getFunctionName(SIZE_T programCounter, DWORD64& displacement64, - SYMBOL_INFO* functionInfo) const; + SYMBOL_INFO* functionInfo, CriticalSectionLocker& locker) const; DWORD resolveFunction(SIZE_T programCounter, IMAGEHLP_LINEW64* sourceInfo, DWORD displacement, LPCWSTR functionName, LPWSTR stack_line, DWORD stackLineSize) const; diff --git a/src/criticalsection.h b/src/criticalsection.h index f9a03828..76607bf7 100644 --- a/src/criticalsection.h +++ b/src/criticalsection.h @@ -4,7 +4,7 @@ #define NOMINMAX #include -// you should consider CriticalSectionLocker whenever possible instead of +// you should consider CriticalSectionLocker<> whenever possible instead of // directly working with CriticalSection class - it is safer class CriticalSection { @@ -51,10 +51,11 @@ class CriticalSection CRITICAL_SECTION m_critRegion; }; +template class CriticalSectionLocker { public: - CriticalSectionLocker(CriticalSection& cs) + CriticalSectionLocker(T& cs) : m_leave(false) , m_critSect(cs) { @@ -84,5 +85,5 @@ class CriticalSectionLocker CriticalSectionLocker( const CriticalSectionLocker & ); // not allowed CriticalSectionLocker & operator=( const CriticalSectionLocker & ); // not allowed bool m_leave; - CriticalSection& m_critSect; + T& m_critSect; }; diff --git a/src/dbghelp.h b/src/dbghelp.h new file mode 100644 index 00000000..e5671c52 --- /dev/null +++ b/src/dbghelp.h @@ -0,0 +1,211 @@ +#pragma once + +#define WIN32_LEAN_AND_MEAN +#include +#include +#include "criticalsection.h" + +class DbgHelp +{ +public: + DbgHelp() { + m_lock.Initialize(); + } + ~DbgHelp() { + m_lock.Delete(); + } + void Enter() + { + m_lock.Enter(); + } + void Leave() + { + m_lock.Leave(); + } + BOOL IsLockedByCurrentThread() { + return + m_lock.IsLockedByCurrentThread(); + } + BOOL SymInitializeW(_In_ HANDLE hProcess, _In_opt_ PCWSTR UserSearchPath, _In_ BOOL fInvadeProcess, CriticalSectionLocker&) { + return ::SymInitializeW(hProcess, UserSearchPath, fInvadeProcess); + } + BOOL SymInitializeW(_In_ HANDLE hProcess, _In_opt_ PCWSTR UserSearchPath, _In_ BOOL fInvadeProcess) { + CriticalSectionLocker cs(m_lock); + return ::SymInitializeW(hProcess, UserSearchPath, fInvadeProcess); + } + BOOL SymCleanup(_In_ HANDLE hProcess, CriticalSectionLocker&) { + return ::SymCleanup(hProcess); + } + BOOL SymCleanup(_In_ HANDLE hProcess) { + CriticalSectionLocker cs(m_lock); + return ::SymCleanup(hProcess); + } + DWORD SymSetOptions(__in DWORD SymOptions, CriticalSectionLocker&) { + return ::SymSetOptions(SymOptions); + } + DWORD SymSetOptions(__in DWORD SymOptions) { + CriticalSectionLocker cs(m_lock); + return ::SymSetOptions(SymOptions); + } + BOOL SymFromAddrW(_In_ HANDLE hProcess, _In_ DWORD64 Address, _Out_opt_ PDWORD64 Displacement, _Inout_ PSYMBOL_INFOW Symbol, CriticalSectionLocker&) { + return ::SymFromAddrW(hProcess, Address, Displacement, Symbol); + } + BOOL SymFromAddrW(_In_ HANDLE hProcess, _In_ DWORD64 Address, _Out_opt_ PDWORD64 Displacement, _Inout_ PSYMBOL_INFOW Symbol) { + CriticalSectionLocker cs(m_lock); + return ::SymFromAddrW(hProcess, Address, Displacement, Symbol); + } + BOOL SymGetLineFromAddrW64(_In_ HANDLE hProcess, _In_ DWORD64 dwAddr, _Out_ PDWORD pdwDisplacement, _Out_ PIMAGEHLP_LINEW64 Line, CriticalSectionLocker&) { + return ::SymGetLineFromAddrW64(hProcess, dwAddr, pdwDisplacement, Line); + } + BOOL SymGetLineFromAddrW64(_In_ HANDLE hProcess, _In_ DWORD64 dwAddr, _Out_ PDWORD pdwDisplacement, _Out_ PIMAGEHLP_LINEW64 Line) { + CriticalSectionLocker cs(m_lock); + return ::SymGetLineFromAddrW64(hProcess, dwAddr, pdwDisplacement, Line); + } + BOOL SymGetModuleInfoW64(_In_ HANDLE hProcess, _In_ DWORD64 qwAddr, _Out_ PIMAGEHLP_MODULEW64 ModuleInfo, CriticalSectionLocker&) { + return ::SymGetModuleInfoW64(hProcess, qwAddr, ModuleInfo); + } + BOOL SymGetModuleInfoW64(_In_ HANDLE hProcess, _In_ DWORD64 qwAddr, _Out_ PIMAGEHLP_MODULEW64 ModuleInfo) { + CriticalSectionLocker cs(m_lock); + return ::SymGetModuleInfoW64(hProcess, qwAddr, ModuleInfo); + } + DWORD64 SymLoadModuleExW(_In_ HANDLE hProcess, _In_opt_ HANDLE hFile, _In_opt_ PCWSTR ImageName, _In_opt_ PCWSTR ModuleName, _In_ DWORD64 BaseOfDll, _In_ DWORD DllSize, _In_opt_ PMODLOAD_DATA Data, _In_opt_ DWORD Flags, CriticalSectionLocker&) { + return ::SymLoadModuleExW(hProcess, hFile, ImageName, ModuleName, BaseOfDll, DllSize, Data, Flags); + } + DWORD64 SymLoadModuleExW(_In_ HANDLE hProcess, _In_opt_ HANDLE hFile, _In_opt_ PCWSTR ImageName, _In_opt_ PCWSTR ModuleName, _In_ DWORD64 BaseOfDll, _In_ DWORD DllSize, _In_opt_ PMODLOAD_DATA Data, _In_opt_ DWORD Flags) { + CriticalSectionLocker cs(m_lock); + return ::SymLoadModuleExW(hProcess, hFile, ImageName, ModuleName, BaseOfDll, DllSize, Data, Flags); + } + BOOL SymUnloadModule64(_In_ HANDLE hProcess, _In_ DWORD64 BaseOfDll, CriticalSectionLocker&) { + return ::SymUnloadModule64(hProcess, BaseOfDll); + } + BOOL SymUnloadModule64(_In_ HANDLE hProcess, _In_ DWORD64 BaseOfDll) { + CriticalSectionLocker cs(m_lock); + return ::SymUnloadModule64(hProcess, BaseOfDll); + } +private: + // Disallow certain operations + DbgHelp(const DbgHelp&); + DbgHelp& operator=(const DbgHelp&); + +private: + CriticalSection m_lock; +}; + +class DHStackWalk +{ +public: + DHStackWalk() { + m_lock.Initialize(); + } + ~DHStackWalk() { + m_lock.Delete(); + } + void Enter() + { + m_lock.Enter(); + } + void Leave() + { + m_lock.Leave(); + } + BOOL IsLockedByCurrentThread() { + return + m_lock.IsLockedByCurrentThread() ; + } + BOOL StackWalk64(__in DWORD MachineType, __in HANDLE hProcess, __in HANDLE hThread, + __inout LPSTACKFRAME64 StackFrame, __inout PVOID ContextRecord, + __in_opt PREAD_PROCESS_MEMORY_ROUTINE64 ReadMemoryRoutine, + __in_opt PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine, + __in_opt PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine, + __in_opt PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress, CriticalSectionLocker&) + { + return ::StackWalk64(MachineType, hProcess, hThread, StackFrame, ContextRecord, ReadMemoryRoutine, + FunctionTableAccessRoutine, GetModuleBaseRoutine, TranslateAddress); + } + BOOL StackWalk64(__in DWORD MachineType, __in HANDLE hProcess, __in HANDLE hThread, + __inout LPSTACKFRAME64 StackFrame, __inout PVOID ContextRecord, + __in_opt PREAD_PROCESS_MEMORY_ROUTINE64 ReadMemoryRoutine, + __in_opt PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine, + __in_opt PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine, + __in_opt PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress) + { + CriticalSectionLocker cs(m_lock); + return ::StackWalk64(MachineType, hProcess, hThread, StackFrame, ContextRecord, ReadMemoryRoutine, + FunctionTableAccessRoutine, GetModuleBaseRoutine, TranslateAddress); + } +private: + // Disallow certain operations + DHStackWalk(const DHStackWalk&); + DHStackWalk& operator=(const DHStackWalk&); + +private: + CriticalSection m_lock; +}; + +class ImageDirectoryEntries +{ +public: + ImageDirectoryEntries() { + m_lock.Initialize(); + } + ~ImageDirectoryEntries() { + m_lock.Delete(); + } + void Enter() + { + m_lock.Enter(); + } + void Leave() + { + m_lock.Leave(); + } + BOOL IsLockedByCurrentThread() { + return + m_lock.IsLockedByCurrentThread(); + } + PVOID ImageDirectoryEntryToDataEx(__in PVOID Base, __in BOOLEAN MappedAsImage, __in USHORT DirectoryEntry, __out PULONG Size, __out_opt PIMAGE_SECTION_HEADER *FoundHeader) { + CriticalSectionLocker cs(m_lock); + return ::ImageDirectoryEntryToDataEx(Base, MappedAsImage, DirectoryEntry, Size, FoundHeader); + } +private: + // Disallow certain operations + ImageDirectoryEntries(const ImageDirectoryEntries&); + ImageDirectoryEntries& operator=(const ImageDirectoryEntries&); + +private: + CriticalSection m_lock; +}; + +class LoadedModules +{ +public: + LoadedModules() { + m_lock.Initialize(); + } + ~LoadedModules() { + m_lock.Delete(); + } + void Enter() + { + m_lock.Enter(); + } + void Leave() + { + m_lock.Leave(); + } + BOOL IsLockedByCurrentThread() { + return + m_lock.IsLockedByCurrentThread(); + } + BOOL EnumerateLoadedModulesW64(__in HANDLE hProcess, __in PENUMLOADED_MODULES_CALLBACKW64 EnumLoadedModulesCallback, __in_opt PVOID UserContext) { + CriticalSectionLocker cs(m_lock); + return ::EnumerateLoadedModulesW64(hProcess, EnumLoadedModulesCallback, UserContext); + } +private: + // Disallow certain operations + LoadedModules(const LoadedModules&); + LoadedModules& operator=(const LoadedModules&); + +private: + CriticalSection m_lock; +}; diff --git a/src/dbghelp.hpp b/src/dbghelp.hpp deleted file mode 100644 index f7ce4829..00000000 --- a/src/dbghelp.hpp +++ /dev/null @@ -1,84 +0,0 @@ -#pragma once - -#define WIN32_LEAN_AND_MEAN -#include -#include -#include "criticalsection.h" - -class DgbHelp -{ -public: - DgbHelp() { - m_lock.Initialize(); - m_lock1.Initialize(); - m_lock2.Initialize(); - m_lock3.Initialize(); - } - ~DgbHelp() { - m_lock.Delete(); - m_lock1.Delete(); - m_lock2.Delete(); - m_lock3.Delete(); - } - BOOL IsLockedByCurrentThread() { - return - m_lock.IsLockedByCurrentThread() || - m_lock1.IsLockedByCurrentThread() || - m_lock2.IsLockedByCurrentThread() || - m_lock3.IsLockedByCurrentThread(); - } - BOOL SymInitializeW(_In_ HANDLE hProcess, _In_opt_ PCWSTR UserSearchPath, _In_ BOOL fInvadeProcess) { - CriticalSectionLocker cs(m_lock); - return ::SymInitializeW(hProcess, UserSearchPath, fInvadeProcess); - } - BOOL SymCleanup(_In_ HANDLE hProcess) { - CriticalSectionLocker cs(m_lock); - return ::SymCleanup(hProcess); - } - DWORD SymSetOptions(__in DWORD SymOptions) { - CriticalSectionLocker cs(m_lock); - return ::SymSetOptions(SymOptions); - } - BOOL SymFromAddrW(_In_ HANDLE hProcess, _In_ DWORD64 Address, _Out_opt_ PDWORD64 Displacement, _Inout_ PSYMBOL_INFOW Symbol) { - CriticalSectionLocker cs(m_lock); - return ::SymFromAddrW(hProcess, Address, Displacement, Symbol); - } - BOOL SymGetLineFromAddrW64(_In_ HANDLE hProcess, _In_ DWORD64 dwAddr, _Out_ PDWORD pdwDisplacement, _Out_ PIMAGEHLP_LINEW64 Line) { - CriticalSectionLocker cs(m_lock); - return ::SymGetLineFromAddrW64(hProcess, dwAddr, pdwDisplacement, Line); - } - BOOL SymGetModuleInfoW64(_In_ HANDLE hProcess, _In_ DWORD64 qwAddr, _Out_ PIMAGEHLP_MODULEW64 ModuleInfo) { - CriticalSectionLocker cs(m_lock); - return ::SymGetModuleInfoW64(hProcess, qwAddr, ModuleInfo); - } - DWORD64 SymLoadModuleExW(_In_ HANDLE hProcess, _In_opt_ HANDLE hFile, _In_opt_ PCWSTR ImageName, _In_opt_ PCWSTR ModuleName, _In_ DWORD64 BaseOfDll, _In_ DWORD DllSize, _In_opt_ PMODLOAD_DATA Data, _In_opt_ DWORD Flags) { - CriticalSectionLocker cs(m_lock); - return ::SymLoadModuleExW(hProcess, hFile, ImageName, ModuleName, BaseOfDll, DllSize, Data, Flags); - } - BOOL SymUnloadModule64(_In_ HANDLE hProcess, _In_ DWORD64 BaseOfDll) { - CriticalSectionLocker cs(m_lock); - return ::SymUnloadModule64(hProcess, BaseOfDll); - } - BOOL StackWalk64(__in DWORD MachineType, __in HANDLE hProcess, __in HANDLE hThread, __inout LPSTACKFRAME64 StackFrame, __inout PVOID ContextRecord, __in_opt PREAD_PROCESS_MEMORY_ROUTINE64 ReadMemoryRoutine, __in_opt PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine, __in_opt PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine, __in_opt PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress) { - CriticalSectionLocker cs(m_lock1); - return ::StackWalk64(MachineType, hProcess, hThread, StackFrame, ContextRecord, ReadMemoryRoutine, FunctionTableAccessRoutine, GetModuleBaseRoutine, TranslateAddress); - } - PVOID ImageDirectoryEntryToDataEx(__in PVOID Base, __in BOOLEAN MappedAsImage, __in USHORT DirectoryEntry, __out PULONG Size, __out_opt PIMAGE_SECTION_HEADER *FoundHeader) { - CriticalSectionLocker cs(m_lock2); - return ::ImageDirectoryEntryToDataEx(Base, MappedAsImage, DirectoryEntry, Size, FoundHeader); - } - BOOL EnumerateLoadedModulesW64(__in HANDLE hProcess, __in PENUMLOADED_MODULES_CALLBACKW64 EnumLoadedModulesCallback, __in_opt PVOID UserContext) { - CriticalSectionLocker cs(m_lock3); - return ::EnumerateLoadedModulesW64(hProcess, EnumLoadedModulesCallback, UserContext); - } -private: - // Disallow certain operations - DgbHelp(const DgbHelp&); - DgbHelp& operator=(const DgbHelp&); - -private: - CriticalSection m_lock; - CriticalSection m_lock1; - CriticalSection m_lock2; - CriticalSection m_lock3; -}; diff --git a/src/stdafx.h b/src/stdafx.h index b95cd7b2..a968c068 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -11,4 +11,4 @@ #define __out_xcount(x) // Workaround for the specstrings.h bug in the Platform SDK. #endif #define DBGHELP_TRANSLATE_TCHAR -#include "dbghelp.hpp" // Provides portable executable (PE) image access functions. +#include "dbghelp.h" // Provides portable executable (PE) image access functions. diff --git a/src/tree.h b/src/tree.h index c17a5f30..94c44954 100644 --- a/src/tree.h +++ b/src/tree.h @@ -141,12 +141,12 @@ class Tree // Return Value: // // Returns a pointer to the first node in the tree. - // + // typename Tree::node_t* begin () const { node_t *cur; - CriticalSectionLocker cs(m_lock); + CriticalSectionLocker<> cs(m_lock); if (m_root == &m_nil) { return NULL; } @@ -177,7 +177,7 @@ class Tree node_t *erasure; node_t *sibling; - CriticalSectionLocker cs(m_lock); + CriticalSectionLocker<> cs(m_lock); if ((node->left == &m_nil) || (node->right == &m_nil)) { // The node to be erased has less than two children. It can be directly @@ -317,7 +317,7 @@ class Tree node_t *node; // Find the node to erase. - CriticalSectionLocker cs(m_lock); + CriticalSectionLocker<> cs(m_lock); node = m_root; while (node != &m_nil) { if (node->key < key) { @@ -353,7 +353,7 @@ class Tree { node_t *cur; - CriticalSectionLocker cs(m_lock); + CriticalSectionLocker<> cs(m_lock); cur = m_root; while (cur != &m_nil) { if (cur->key < key) { @@ -388,7 +388,7 @@ class Tree // typename Tree::node_t* insert (const T &key) { - CriticalSectionLocker cs(m_lock); + CriticalSectionLocker<> cs(m_lock); // Find the location where the new node should be inserted.. node_t *cur = m_root; @@ -489,7 +489,7 @@ class Tree // The root node is always colored black. m_root->color = black; - return node; + return node; } // next - Obtains a pointer to the in-order successor of the specified @@ -508,7 +508,7 @@ class Tree if (node == NULL) return NULL; - CriticalSectionLocker cs(m_lock); + CriticalSectionLocker<> cs(m_lock); node_t* cur; if (node->right != &m_nil) { // 'node' has a right child. Successor is the far left node in @@ -567,7 +567,7 @@ class Tree return NULL; } - CriticalSectionLocker cs(m_lock); + CriticalSectionLocker<> cs(m_lock); node_t* cur; if (node->left != &m_nil) { // 'node' has left child. Predecessor is the far right node in the @@ -642,7 +642,7 @@ class Tree } } - CriticalSectionLocker cs(m_lock); + CriticalSectionLocker<> cs(m_lock); if (m_freelist == NULL) { // Allocate additional storage. // Link a new chunk into the chunk list. diff --git a/src/utility.cpp b/src/utility.cpp index 09ad89c4..e3c32fe4 100644 --- a/src/utility.cpp +++ b/src/utility.cpp @@ -34,7 +34,7 @@ // Imported Global Variables extern ReportHookSet* g_pReportHooks; extern VisualLeakDetector g_vld; -extern DgbHelp g_DbgHelp; +extern ImageDirectoryEntries g_Ide; // Global variables. static BOOL s_reportDelay = FALSE; // If TRUE, we sleep for a bit after calling OutputDebugString to give the debugger time to catch up. @@ -219,7 +219,7 @@ IMAGE_IMPORT_DESCRIPTOR* FindOriginalImportDescriptor (HMODULE importmodule, LPC // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. { - idte = (IMAGE_IMPORT_DESCRIPTOR*)g_DbgHelp.ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, + idte = (IMAGE_IMPORT_DESCRIPTOR*)g_Ide.ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } @@ -501,7 +501,7 @@ BOOL PatchImport (HMODULE importmodule, moduleentry_t *patchModule) // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. { - idte = (IMAGE_IMPORT_DESCRIPTOR*)g_DbgHelp.ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, + idte = (IMAGE_IMPORT_DESCRIPTOR*)g_Ide.ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } @@ -813,7 +813,7 @@ VOID RestoreImport (HMODULE importmodule, moduleentry_t* module) // one for each export module that it imports something from. The IDT entry // gives us the offset of the IAT for the module we are interested in. { - idte = (IMAGE_IMPORT_DESCRIPTOR*)g_DbgHelp.ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, + idte = (IMAGE_IMPORT_DESCRIPTOR*)g_Ide.ImageDirectoryEntryToDataEx((PVOID)GetCallingModule((UINT_PTR)importmodule), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size, §ion); } diff --git a/src/vld.cpp b/src/vld.cpp index 5328a910..731e1199 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -53,7 +53,10 @@ HANDLE g_currentThread; // Pseudo-handle for the current thread. HANDLE g_processHeap; // Handle to the process's heap (COM allocations come from here). CriticalSection g_heapMapLock; // Serializes access to the heap and block maps. ReportHookSet* g_pReportHooks; -DgbHelp g_DbgHelp; +DbgHelp g_DbgHelp; +DHStackWalk g_StackWalk; +ImageDirectoryEntries g_Ide; +LoadedModules g_LoadedModules; // The one and only VisualLeakDetector object instance. __declspec(dllexport) VisualLeakDetector g_vld; @@ -476,7 +479,7 @@ VisualLeakDetector::VisualLeakDetector () ModuleSet* newmodules = new ModuleSet(); newmodules->reserve(MODULE_SET_RESERVE); DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); - g_DbgHelp.EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); + g_LoadedModules.EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); attachToLoadedModules(newmodules); ModuleSet* oldmodules = m_loadedModules; m_loadedModules = newmodules; @@ -505,7 +508,7 @@ bool VisualLeakDetector::waitForAllVLDThreads() int waitcount = 0; // See if any threads that have ever entered VLD's code are still active. - CriticalSectionLocker cs(m_tlsLock); + CriticalSectionLocker<> cs(m_tlsLock); for (TlsMap::Iterator tlsit = m_tlsMap->begin(); tlsit != m_tlsMap->end(); ++tlsit) { if ((*tlsit).second->threadId == GetCurrentThreadId()) { // Don't wait for the current thread to exit. @@ -604,7 +607,7 @@ VisualLeakDetector::~VisualLeakDetector () if (m_status & VLD_STATUS_INSTALLED) { // Detach Visual Leak Detector from all previously attached modules. DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); - g_DbgHelp.EnumerateLoadedModulesW64(g_currentProcess, detachFromModule, NULL); + g_LoadedModules.EnumerateLoadedModulesW64(g_currentProcess, detachFromModule, NULL); HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); HMODULE kernelBase = GetModuleHandleW(L"KernelBase.dll"); @@ -644,7 +647,7 @@ VisualLeakDetector::~VisualLeakDetector () { // Free internally allocated resources used by the heapmap and blockmap. - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { BlockMap *blockmap = &(*heapit).second->blockMap; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { @@ -658,7 +661,7 @@ VisualLeakDetector::~VisualLeakDetector () { // Free internally allocated resources used for thread local storage. - CriticalSectionLocker cs(m_tlsLock); + CriticalSectionLocker<> cs(m_tlsLock); for (TlsMap::Iterator tlsit = m_tlsMap->begin(); tlsit != m_tlsMap->end(); ++tlsit) { delete (*tlsit).second; } @@ -719,7 +722,7 @@ UINT32 VisualLeakDetector::getModuleState(ModuleSet::Iterator& it, UINT32& modul return 0; { - CriticalSectionLocker cs(m_modulesLock); + CriticalSectionLocker<> cs(m_modulesLock); ModuleSet* oldmodules = m_loadedModules; ModuleSet::Iterator oldit = oldmodules->find(moduleinfo); if (oldit != oldmodules->end()) // We've seen this "new" module loaded in the process before. @@ -767,6 +770,7 @@ static char dbghelp32_assert[sizeof(IMAGEHLP_MODULE64) == 3256 ? 1 : -1]; VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) { LoaderLock ll; + CriticalSectionLocker locker(g_DbgHelp); // Iterate through the supplied set, until all modules have been attached. for (ModuleSet::Iterator newit = newmodules->begin(); newit != newmodules->end(); ++newit) @@ -785,7 +789,7 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) if ((state == 3) && (moduleFlags & VLD_MODULE_SYMBOLSLOADED)) { // Discard the previously loaded symbols, so we can refresh them. DbgTrace(L"dbghelp32.dll %i: SymUnloadModule64\n", GetCurrentThreadId()); - if (g_DbgHelp.SymUnloadModule64(g_currentProcess, modulebase) == false) { + if (g_DbgHelp.SymUnloadModule64(g_currentProcess, modulebase, locker) == false) { Report(L"WARNING: Visual Leak Detector: Failed to unload the symbols for %s. Function names and line" L" numbers shown in the memory leak report for %s may be inaccurate.\n", modulename, modulename); } @@ -797,16 +801,16 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) // leak report. IMAGEHLP_MODULE64 moduleimageinfo; moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); - BOOL SymbolsLoaded = g_DbgHelp.SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo); + BOOL SymbolsLoaded = g_DbgHelp.SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo, locker); if (!SymbolsLoaded) { DbgTrace(L"dbghelp32.dll %i: SymLoadModuleEx\n", GetCurrentThreadId()); - DWORD64 module = g_DbgHelp.SymLoadModuleExW(g_currentProcess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0); + DWORD64 module = g_DbgHelp.SymLoadModuleExW(g_currentProcess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0, locker); if (module == modulebase) { DbgTrace(L"dbghelp32.dll %i: SymGetModuleInfoW64\n", GetCurrentThreadId()); - SymbolsLoaded = g_DbgHelp.SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo); + SymbolsLoaded = g_DbgHelp.SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo, locker); } } if (SymbolsLoaded) @@ -1238,7 +1242,7 @@ SIZE_T VisualLeakDetector::eraseDuplicates (const BlockMap::Iterator &element, S SIZE_T erased = 0; // Iterate through all block maps, looking for blocks with the same size // and callstack as the specified element. - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { BlockMap *blockmap = &(*heapit).second->blockMap; for (BlockMap::Iterator blockit = blockmap->begin(); blockit != blockmap->end(); ++blockit) { @@ -1280,7 +1284,7 @@ tls_t* VisualLeakDetector::getTls () if (tls == NULL) { DWORD threadId = GetCurrentThreadId(); - CriticalSectionLocker cs(m_tlsLock); + CriticalSectionLocker<> cs(m_tlsLock); TlsMap::Iterator it = m_tlsMap->find(threadId); if (it == m_tlsMap->end()) { // This thread's thread local storage structure has not been allocated. @@ -1326,7 +1330,7 @@ tls_t* VisualLeakDetector::getTls () // VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool debugcrtalloc, DWORD threadId, blockinfo_t* &pblockInfo) { - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); // Record the block's information. blockinfo_t* blockinfo = new blockinfo_t(); @@ -1384,7 +1388,7 @@ VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool d // VOID VisualLeakDetector::mapHeap (HANDLE heap) { - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); // Create a new block map for this heap and insert it into the heap map. heapinfo_t* heapinfo = new heapinfo_t; @@ -1420,7 +1424,7 @@ VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t & return; // Find this heap's block map. - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); HeapMap::Iterator heapit = m_heapMap->find(heap); if (heapit == m_heapMap->end()) { // We don't have a block map for this heap. We must not have monitored @@ -1490,7 +1494,7 @@ VOID VisualLeakDetector::unmapBlock (HANDLE heap, LPCVOID mem, const context_t & VOID VisualLeakDetector::unmapHeap (HANDLE heap) { // Find this heap's block map. - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); HeapMap::Iterator heapit = m_heapMap->find(heap); if (heapit == m_heapMap->end()) { // This heap hasn't been mapped. We must not have monitored this heap's @@ -1541,7 +1545,7 @@ VOID VisualLeakDetector::unmapHeap (HANDLE heap) VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, bool debugcrtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context) { - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); if (newmem != mem) { // The block was not reallocated in-place. Instead the old block was @@ -1734,7 +1738,7 @@ SIZE_T VisualLeakDetector::reportHeapLeaks (HANDLE heap) assert(heap != NULL); // Find the heap's information (blockmap, etc). - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); HeapMap::Iterator heapit = m_heapMap->find(heap); if (heapit == m_heapMap->end()) { // Nothing is allocated from this heap. No leaks. @@ -1901,7 +1905,7 @@ blockinfo_t* VisualLeakDetector::findAllocedBlock(LPCVOID mem, __out HANDLE& hea heap = NULL; blockinfo_t* result = NULL; // Iterate through all heaps - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); for (HeapMap::Iterator it = m_heapMap->begin(); it != m_heapMap->end(); ++it) @@ -2264,14 +2268,14 @@ VOID VisualLeakDetector::RefreshModules() // Create a new set of all loaded modules, including any newly loaded // modules. DbgTrace(L"dbghelp32.dll %i: EnumerateLoadedModulesW64\n", GetCurrentThreadId()); - g_DbgHelp.EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); + g_LoadedModules.EnumerateLoadedModulesW64(g_currentProcess, addLoadedModule, newmodules); // Attach to all modules included in the set. attachToLoadedModules(newmodules); } // Start using the new set of loaded modules. - CriticalSectionLocker cs(m_modulesLock); + CriticalSectionLocker<> cs(m_modulesLock); ModuleSet* oldmodules = m_loadedModules; m_loadedModules = newmodules; @@ -2295,7 +2299,7 @@ bool VisualLeakDetector::isModuleExcluded(UINT_PTR address) moduleinfo.addrHigh = address + 1024; moduleinfo.flags = 0; - CriticalSectionLocker cs(g_vld.m_modulesLock); + CriticalSectionLocker<> cs(g_vld.m_modulesLock); moduleit = g_vld.m_loadedModules->find(moduleinfo); if (moduleit != g_vld.m_loadedModules->end()) return (*moduleit).flags & VLD_MODULE_EXCLUDED ? true : false; @@ -2311,7 +2315,7 @@ SIZE_T VisualLeakDetector::GetLeaksCount() SIZE_T leaksCount = 0; // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); @@ -2330,7 +2334,7 @@ SIZE_T VisualLeakDetector::GetThreadLeaksCount(DWORD threadId) SIZE_T leaksCount = 0; // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); @@ -2349,7 +2353,7 @@ SIZE_T VisualLeakDetector::ReportLeaks( ) // Generate a memory leak report for each heap in the process. SIZE_T leaksCount = 0; - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); bool firstLeak = true; Set aggregatedLeaks; for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { @@ -2370,7 +2374,7 @@ SIZE_T VisualLeakDetector::ReportThreadLeaks( DWORD threadId ) // Generate a memory leak report for each heap in the process. SIZE_T leaksCount = 0; - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); bool firstLeak = true; Set aggregatedLeaks; for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { @@ -2390,7 +2394,7 @@ VOID VisualLeakDetector::MarkAllLeaksAsReported( ) } // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); @@ -2407,7 +2411,7 @@ VOID VisualLeakDetector::MarkThreadLeaksAsReported( DWORD threadId ) } // Generate a memory leak report for each heap in the process. - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); for (HeapMap::Iterator heapit = m_heapMap->begin(); heapit != m_heapMap->end(); ++heapit) { HANDLE heap = (*heapit).first; UNREFERENCED_PARAMETER(heap); @@ -2420,7 +2424,7 @@ void VisualLeakDetector::ChangeModuleState(HMODULE module, bool on) { ModuleSet::Iterator moduleit; - CriticalSectionLocker cs(m_modulesLock); + CriticalSectionLocker<> cs(m_modulesLock); moduleit = m_loadedModules->begin(); while( moduleit != m_loadedModules->end() ) { @@ -2516,11 +2520,11 @@ void VisualLeakDetector::GlobalDisableLeakDetection () return; } - CriticalSectionLocker cs(m_optionsLock); + CriticalSectionLocker<> cs(m_optionsLock); m_options |= VLD_OPT_START_DISABLED; // Disable memory leak detection for all threads. - CriticalSectionLocker cstls(m_tlsLock); + CriticalSectionLocker<> cstls(m_tlsLock); TlsMap::Iterator tlsit; for (tlsit = m_tlsMap->begin(); tlsit != m_tlsMap->end(); ++tlsit) { (*tlsit).second->oldFlags = (*tlsit).second->flags; @@ -2536,12 +2540,12 @@ void VisualLeakDetector::GlobalEnableLeakDetection () return; } - CriticalSectionLocker cs(m_optionsLock); + CriticalSectionLocker<> cs(m_optionsLock); m_options &= ~VLD_OPT_START_DISABLED; m_status &= ~VLD_STATUS_NEVER_ENABLED; // Enable memory leak detection for all threads. - CriticalSectionLocker cstls(m_tlsLock); + CriticalSectionLocker<> cstls(m_tlsLock); TlsMap::Iterator tlsit; for (tlsit = m_tlsMap->begin(); tlsit != m_tlsMap->end(); ++tlsit) { (*tlsit).second->oldFlags = (*tlsit).second->flags; @@ -2557,7 +2561,7 @@ CONST UINT32 OptionsMask = VLD_OPT_AGGREGATE_DUPLICATES | VLD_OPT_MODULE_LIST_IN UINT32 VisualLeakDetector::GetOptions() { - CriticalSectionLocker cs(m_optionsLock); + CriticalSectionLocker<> cs(m_optionsLock); return m_options & OptionsMask; } @@ -2568,7 +2572,7 @@ void VisualLeakDetector::SetOptions(UINT32 option_mask, SIZE_T maxDataDump, UINT return; } - CriticalSectionLocker cs(m_optionsLock); + CriticalSectionLocker<> cs(m_optionsLock); m_options &= ~OptionsMask; // clear used bits m_options |= option_mask & OptionsMask; @@ -2590,7 +2594,7 @@ void VisualLeakDetector::SetModulesList(CONST WCHAR *modules, BOOL includeModule return; } - CriticalSectionLocker cs(m_optionsLock); + CriticalSectionLocker<> cs(m_optionsLock); wcsncpy_s(m_forcedModuleList, MAXMODULELISTLENGTH, modules, _TRUNCATE); _wcslwr_s(m_forcedModuleList, MAXMODULELISTLENGTH); if (includeModules) @@ -2607,7 +2611,7 @@ bool VisualLeakDetector::GetModulesList(WCHAR *modules, UINT size) return true; } - CriticalSectionLocker cs(m_optionsLock); + CriticalSectionLocker<> cs(m_optionsLock); wcsncpy_s(modules, size, m_forcedModuleList, _TRUNCATE); return (m_options & VLD_OPT_MODULE_LIST_INCLUDE) > 0; } @@ -2620,7 +2624,7 @@ void VisualLeakDetector::GetReportFilename(WCHAR *filename) return; } - CriticalSectionLocker cs(m_optionsLock); + CriticalSectionLocker<> cs(m_optionsLock); wcsncpy_s(filename, MAX_PATH, m_reportFilePath, _TRUNCATE); } @@ -2631,7 +2635,7 @@ void VisualLeakDetector::SetReportOptions(UINT32 option_mask, CONST WCHAR *filen return; } - CriticalSectionLocker cs(m_optionsLock); + CriticalSectionLocker<> cs(m_optionsLock); m_options &= ~(VLD_OPT_REPORT_TO_DEBUGGER | VLD_OPT_REPORT_TO_FILE | VLD_OPT_REPORT_TO_STDOUT | VLD_OPT_UNICODE_REPORT); // clear used bits @@ -2667,7 +2671,7 @@ int VisualLeakDetector::SetReportHook(int mode, VLD_REPORT_HOOK pfnNewHook) // VLD has been turned off. return -1; } - CriticalSectionLocker cs(m_optionsLock); + CriticalSectionLocker<> cs(m_optionsLock); if (mode == VLD_RPTHOOK_INSTALL) { ReportHookSet::Iterator it = g_pReportHooks->insert(pfnNewHook); @@ -2798,7 +2802,7 @@ int VisualLeakDetector::ResolveCallstacks() int unresolvedFunctionsCount = 0; // Generate the Callstacks early - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); for (HeapMap::Iterator heapiter = m_heapMap->begin(); heapiter != m_heapMap->end(); ++heapiter) { HANDLE heap = (*heapiter).first; diff --git a/src/vld.vcxproj b/src/vld.vcxproj index 7753dc58..691bf72f 100644 --- a/src/vld.vcxproj +++ b/src/vld.vcxproj @@ -184,6 +184,7 @@ + diff --git a/src/vld.vcxproj.filters b/src/vld.vcxproj.filters index 02ecff1d..34a0105d 100644 --- a/src/vld.vcxproj.filters +++ b/src/vld.vcxproj.filters @@ -92,6 +92,9 @@ Header Files + + Header Files + diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 62ca4141..7459a3e6 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -44,7 +44,7 @@ extern HANDLE g_currentProcess; extern CriticalSection g_heapMapLock; -extern DgbHelp g_DbgHelp; +extern DbgHelp g_DbgHelp; void VisualLeakDetector::firstAllocCall(tls_t * tls) { @@ -1476,7 +1476,7 @@ HANDLE VisualLeakDetector::_GetProcessHeap() // Get the process heap. HANDLE heap = m_GetProcessHeap(); - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); HeapMap::Iterator heapit = g_vld.m_heapMap->find(heap); if (heapit == g_vld.m_heapMap->end()) { @@ -1509,7 +1509,7 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m // Create the heap. HANDLE heap = m_HeapCreate(options, initsize, maxsize); - CriticalSectionLocker cs(g_heapMapLock); + CriticalSectionLocker<> cs(g_heapMapLock); // Map the created heap handle to a new block map. g_vld.mapHeap(heap); diff --git a/src/vldheap.cpp b/src/vldheap.cpp index df32b06f..249e91f1 100644 --- a/src/vldheap.cpp +++ b/src/vldheap.cpp @@ -167,7 +167,7 @@ void* vldnew (size_t size, const char *file, int line) header->size = size; // Link the block into the block list. - CriticalSectionLocker cs(g_vldHeapLock); + CriticalSectionLocker<> cs(g_vldHeapLock); header->next = g_vldBlockList; if (header->next != NULL) { header->next->prev = header; @@ -197,7 +197,7 @@ void vlddelete (void *block) vldblockheader_t *header = VLDBLOCKHEADER((LPVOID)block); // Unlink the block from the block list. - CriticalSectionLocker cs(g_vldHeapLock); + CriticalSectionLocker<> cs(g_vldHeapLock); if (header->prev) { header->prev->next = header->next; } From add471b0b1fe7743a95ee05420118b85f7587273 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Mon, 2 Nov 2015 02:47:59 +0300 Subject: [PATCH 275/321] Support VS2012 solution without MFC (for express studio) --- appveyor.yml | 7 + src/tests/dynamic_app/ThreadTest.cpp | 41 +- src/tests/dynamic_app/ThreadTests.h | 2 +- src/tests/dynamic_app/dynamic_app.cpp | 21 +- .../dynamic_app/dynamic_app_vs11.vcxproj | 7 - vld_vs11_wo_mfc.sln | 404 ++++++++++++++++++ 6 files changed, 457 insertions(+), 25 deletions(-) create mode 100644 vld_vs11_wo_mfc.sln diff --git a/appveyor.yml b/appveyor.yml index fb065f49..01883b1b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,10 +11,16 @@ environment: GTEST_REPEAT: 1 matrix: + - VldStackWalkMethod: safe + Solution: vld_vs11_wo_mfc.sln + GTEST_FILTER: -*.Mfc* - VldStackWalkMethod: safe Solution: vld_vs12.sln - VldStackWalkMethod: safe Solution: vld_vs14.sln + - VldStackWalkMethod: fast + Solution: vld_vs11_wo_mfc.sln + GTEST_FILTER: -*.Mfc* - VldStackWalkMethod: fast Solution: vld_vs12.sln - VldStackWalkMethod: fast @@ -96,6 +102,7 @@ test_script: vld_vs14.sln { "v140" } vld_vs12.sln { "v120" } vld_vs11.sln { "v110" } + vld_vs11_wo_mfc.sln { "v110" } default { throw "No matching environment for $env:Solution" } diff --git a/src/tests/dynamic_app/ThreadTest.cpp b/src/tests/dynamic_app/ThreadTest.cpp index d2bfbd7b..348fdf4a 100644 --- a/src/tests/dynamic_app/ThreadTest.cpp +++ b/src/tests/dynamic_app/ThreadTest.cpp @@ -3,6 +3,12 @@ #include "LoadTests.h" #include +struct ThreadData +{ + bool resolve; + bool mfc; +}; + void RunPSApiLoaderTests() { HMODULE hModule = ::LoadLibrary(_T("psapi.dll")); @@ -13,10 +19,14 @@ void RunPSApiLoaderTests() } } -void Call_LoaderLocks(bool resolve) +void Call_LoaderLocks(const ThreadData& threadData) { - RunPSApiLoaderTests(); // will not crash - HMODULE hmfcLib = RunMFCLoaderTests(resolve); // Leaks 11 allocs + RunPSApiLoaderTests(); // will not crash + HMODULE hmfcLib; + if (threadData.mfc) + hmfcLib = RunMFCLoaderTests(threadData.resolve); // Leaks 11 allocs + else + hmfcLib = RunLoaderTests(threadData.resolve); // Leaks 18 allocs #ifndef STATIC_CRT FreeLibrary(hmfcLib); #else @@ -29,40 +39,43 @@ void Call_LoaderLocks(bool resolve) GetModuleFileName(this_app, path_name, MAX_PATH); } -void Call_Three(bool resolve) +void Call_Three(const ThreadData& threadData) { - Call_LoaderLocks(resolve); + Call_LoaderLocks(threadData); } -void Call_Two(bool resolve) +void Call_Two(const ThreadData& threadData) { - Call_Three(resolve); + Call_Three(threadData); } -void Call_One(bool resolve) +void Call_One(const ThreadData& threadData) { - Call_Two(resolve); + Call_Two(threadData); } unsigned __stdcall Dynamic_Thread_Procedure(LPVOID foo) { - bool* resolve = (bool*)(foo); - Call_One(*resolve); + ThreadData& threadData = *(ThreadData*)(foo); + Call_One(threadData); return 0; } -void RunLoaderLockTests(bool resolve) +void RunLoaderLockTests(bool resolve, bool mfc) { static const int NUMTHREADS = 64; HANDLE threads[NUMTHREADS] = {0}; unsigned thread_id = NULL; + ThreadData threadData; + threadData.resolve = resolve; + threadData.mfc = mfc; for (UINT i = 0; i < NUMTHREADS; ++i) { threads[i] = (HANDLE)_beginthreadex(NULL, // security attribute 0, // stack size - Dynamic_Thread_Procedure, // start function - &resolve, // thread parameters + Dynamic_Thread_Procedure, // start function + &threadData, // thread parameters 0, // creation flags &thread_id); // thread id } diff --git a/src/tests/dynamic_app/ThreadTests.h b/src/tests/dynamic_app/ThreadTests.h index f7d8bdd2..36d560ce 100644 --- a/src/tests/dynamic_app/ThreadTests.h +++ b/src/tests/dynamic_app/ThreadTests.h @@ -1,4 +1,4 @@ #pragma once -void RunLoaderLockTests(bool); +void RunLoaderLockTests(bool, bool); diff --git a/src/tests/dynamic_app/dynamic_app.cpp b/src/tests/dynamic_app/dynamic_app.cpp index 3775b7ab..8784291d 100644 --- a/src/tests/dynamic_app/dynamic_app.cpp +++ b/src/tests/dynamic_app/dynamic_app.cpp @@ -47,7 +47,22 @@ TEST_P(DynamicLoader, LoaderTests) ASSERT_EQ(18, leaks); } -TEST_P(DynamicLoader, MFCLoaderTests) +TEST_P(DynamicLoader, MultithreadLoadingTests) +{ + // Creates 64 threads that each leaks 18 allocations + DWORD start = GetTickCount(); + RunLoaderLockTests(GetParam(), false); + DWORD duration = GetTickCount() - start; + _tprintf(_T("Thread Test took: %u ms\n"), duration); + start = GetTickCount(); + int leaks = (int)VLDGetLeaksCount(); + duration = GetTickCount() - start; + _tprintf(_T("VLDGetLeaksCount took: %u ms\n"), duration); + if (64 * 18 != leaks) VLDReportLeaks(); + ASSERT_EQ(64 * 18, leaks); +} + +TEST_P(DynamicLoader, MfcLoaderTests) { HMODULE hmfcLib = RunMFCLoaderTests(GetParam()); // leaks 11 ASSERT_NE(0u, (UINT_PTR)hmfcLib); @@ -57,11 +72,11 @@ TEST_P(DynamicLoader, MFCLoaderTests) ASSERT_EQ(11, leaks); } -TEST_P(DynamicLoader, Thread) +TEST_P(DynamicLoader, MfcMultithreadLoadingTests) { // Creates 64 threads that each leaks 11 allocations DWORD start = GetTickCount(); - RunLoaderLockTests(GetParam()); + RunLoaderLockTests(GetParam(), true); DWORD duration = GetTickCount() - start; _tprintf(_T("Thread Test took: %u ms\n"), duration); start = GetTickCount(); diff --git a/src/tests/dynamic_app/dynamic_app_vs11.vcxproj b/src/tests/dynamic_app/dynamic_app_vs11.vcxproj index 9a9c9738..14d7d76f 100644 --- a/src/tests/dynamic_app/dynamic_app_vs11.vcxproj +++ b/src/tests/dynamic_app/dynamic_app_vs11.vcxproj @@ -327,13 +327,6 @@ false false - - {2178e5b2-1032-441f-a664-f3d8d1fd1913} - false - false - false - false - diff --git a/vld_vs11_wo_mfc.sln b/vld_vs11_wo_mfc.sln new file mode 100644 index 00000000..c618ebc8 --- /dev/null +++ b/vld_vs11_wo_mfc.sln @@ -0,0 +1,404 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld_vs11.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics_vs11.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite_vs11.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic_vs11.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app_vs11.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" + ProjectSection(ProjectDependencies) = postProject + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption_vs11.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest_vs11.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format_vs11.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main_vs11.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_unload", "src\tests\vld_unload\vld_unload_vs11.vcxproj", "{A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}" + ProjectSection(ProjectDependencies) = postProject + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {50C94B05-8C3E-49ED-B2B9-5715EB624D14} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {33F98E06-F44C-4E22-9E16-4C20F8238A95} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll1", "src\tests\vld_dll1\vld_dll1_vs11.vcxproj", "{50C94B05-8C3E-49ED-B2B9-5715EB624D14}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_dll2\vld_dll2_vs11.vcxproj", "{33F98E06-F44C-4E22-9E16-4C20F8238A95}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs11.vcxproj", "{BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}" + ProjectSection(ProjectDependencies) = postProject + {8C732490-DC1A-40C0-923F-1555B9141B80} = {8C732490-DC1A-40C0-923F-1555B9141B80} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 + Debug_StaticCrt|x64 = Debug_StaticCrt|x64 + Debug_VldRelease_StaticCrt|Win32 = Debug_VldRelease_StaticCrt|Win32 + Debug_VldRelease_StaticCrt|x64 = Debug_VldRelease_StaticCrt|x64 + Debug_VldRelease|Win32 = Debug_VldRelease|Win32 + Debug_VldRelease|x64 = Debug_VldRelease|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_StaticCrt|Win32 = Release_StaticCrt|Win32 + Release_StaticCrt|x64 = Release_StaticCrt|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Deploy.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.ActiveCfg = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.Build.0 = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.ActiveCfg = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.Build.0 = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.ActiveCfg = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.Build.0 = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.ActiveCfg = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.Build.0 = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.ActiveCfg = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.Build.0 = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.ActiveCfg = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.Build.0 = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.ActiveCfg = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.ActiveCfg = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.Build.0 = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.ActiveCfg = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.Build.0 = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.ActiveCfg = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.Build.0 = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.ActiveCfg = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.ActiveCfg = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.Build.0 = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.ActiveCfg = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.Build.0 = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.ActiveCfg = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.ActiveCfg = Debug|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.Build.0 = Debug|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.ActiveCfg = Debug|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.Build.0 = Debug|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.ActiveCfg = Release|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.Build.0 = Release|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.ActiveCfg = Release|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + EndGlobalSection +EndGlobal From b195c320ab11f82ce30d308ad8affaf675f4d1b9 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 6 Nov 2015 02:55:22 +0300 Subject: [PATCH 276/321] Build with all toolsets --- appveyor.yml | 46 ++- change_toolset.ps1 | 26 ++ setup/version.h | 8 +- setup/vld-setup.iss | 2 +- src/tests/Common.props | 5 +- src/tests/basics/Allocs.cpp | 16 + src/tests/console/vldconsole.vcxproj | 5 + src/tests/dynamic_app/dynamic_app.vcxproj | 7 - vld_vs14_wo_mfc.sln | 407 ++++++++++++++++++++++ 9 files changed, 493 insertions(+), 29 deletions(-) create mode 100644 change_toolset.ps1 create mode 100644 vld_vs14_wo_mfc.sln diff --git a/appveyor.yml b/appveyor.yml index 01883b1b..52838315 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,18 +12,41 @@ environment: matrix: - VldStackWalkMethod: safe - Solution: vld_vs11_wo_mfc.sln + Toolset: v90 + Solution: vld_vs14_wo_mfc.sln GTEST_FILTER: -*.Mfc* - VldStackWalkMethod: safe - Solution: vld_vs12.sln + Toolset: v100 + Solution: vld_vs14_wo_mfc.sln + GTEST_FILTER: -*.Mfc* + - VldStackWalkMethod: safe + Toolset: v110 + Solution: vld_vs14_wo_mfc.sln + GTEST_FILTER: -*.Mfc* - VldStackWalkMethod: safe + Toolset: v120_xp Solution: vld_vs14.sln + - VldStackWalkMethod: safe + Toolset: v140_xp + Solution: vld_vs14.sln + + - VldStackWalkMethod: fast + Toolset: v90 + Solution: vld_vs14_wo_mfc.sln + GTEST_FILTER: -*.Mfc* + - VldStackWalkMethod: fast + Toolset: v100 + Solution: vld_vs14_wo_mfc.sln + GTEST_FILTER: -*.Mfc* - VldStackWalkMethod: fast - Solution: vld_vs11_wo_mfc.sln + Toolset: v110 + Solution: vld_vs14_wo_mfc.sln GTEST_FILTER: -*.Mfc* - VldStackWalkMethod: fast - Solution: vld_vs12.sln + Toolset: v120_xp + Solution: vld_vs14.sln - VldStackWalkMethod: fast + Toolset: v140_xp Solution: vld_vs14.sln platform: @@ -43,6 +66,7 @@ build_script: - ps: | Write-Output "Configuration: $env:CONFIGURATION" Write-Output "Platform: $env:PLATFORM" + & .\change_toolset.ps1 $env:Toolset msbuild /v:m /p:"Configuration=$env:CONFIGURATION" /p:Platform="$env:PLATFORM" "$env:Solution" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" test_script: @@ -74,7 +98,6 @@ test_script: return $anyFailures } - function Run-Tests($platform, $configuration) { $anyFailures = $FALSE @@ -97,16 +120,9 @@ test_script: } } - $suffix= switch ($env:Solution) - { - vld_vs14.sln { "v140" } - vld_vs12.sln { "v120" } - vld_vs11.sln { "v110" } - vld_vs11_wo_mfc.sln { "v110" } - default { - throw "No matching environment for $env:Solution" - } - } + $pos = $env:Toolset.IndexOf("_") + if ($pos -eq -1) { $pos = $env:Toolset.length } + $suffix = $env:Toolset.Substring(0, $pos ) $folders = @{"Debug_VldRelease" = "Debug(Release)-$suffix"; "Debug_VldRelease_StaticCrt" = "Debug(Release)_StaticCrt-$suffix"; "Release" = "Release-$suffix"; "Release_StaticCrt" = "Release_StaticCrt-$suffix"} Run-Tests "$env:PLATFORM" "$($folders[$env:CONFIGURATION])" diff --git a/change_toolset.ps1 b/change_toolset.ps1 new file mode 100644 index 00000000..2574baf0 --- /dev/null +++ b/change_toolset.ps1 @@ -0,0 +1,26 @@ +Param( + [Parameter(Mandatory=$True,Position=1)] + [string]$toolset +) + +$files = Get-ChildItem -path . -filter *.vcxproj -recurse +foreach ($file in $files) { + if (($file.basename -eq "vld") -or ($file.basename -eq "format")) + { + "Skip $($file.name)" + continue + } + $content = gc $file.fullname + $regex = [regex]"(v[\d\w_]+)<\/PlatformToolset>" + $oldtoolset = $regex.matches($content) + if ($oldtoolset.groups.count -ge 1) + { + " $($file.name) ($($oldtoolset.groups[1].value) - $toolset)" + $content = $content -replace "(v[\d\w_]+)<\/PlatformToolset>","$toolset" + $content | sc $file.fullname + } + else + { + "Toolset not set for $($file.name)" + } +} diff --git a/setup/version.h b/setup/version.h index 3828c96e..a355c08e 100644 --- a/setup/version.h +++ b/setup/version.h @@ -1,9 +1,9 @@ -#define VLDVERSION L"2.4RC2" -#define VERSION_NUMBER 2,4,1,0 -#define VERSION_STRING "2.4.1.0" +#define VLDVERSION L"2.5RC" +#define VERSION_NUMBER 2,5,0,0 +#define VERSION_STRING "2.5.0.0" #define VERSION_COPYRIGHT "Copyright (C) 2005-2014" #ifndef __FILE__ -!define VLD_VERSION "2.4RC2" // NSIS Script +!define VLD_VERSION "2.5RC" // NSIS Script #endif diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index d0f82d38..bcd60c80 100644 --- a/setup/vld-setup.iss +++ b/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.4rc2" +#define MyAppVersion "2.5rc" #define MyAppPublisher "VLD Team" #define MyAppURL "http://vld.codeplex.com/" #define MyAppRegKey "Software\Visual Leak Detector" diff --git a/src/tests/Common.props b/src/tests/Common.props index a01e9c3e..51d0be5c 100644 --- a/src/tests/Common.props +++ b/src/tests/Common.props @@ -15,6 +15,7 @@ Release Release Release + v140 <_ProjectFileVersion>10.0.40219.1 @@ -23,7 +24,7 @@ - call ..\copydlls.bat $(Platform)\$(VldConfiguration)-v$(PlatformToolsetVersion) $(NumericPlatform) "$(Outdir)" + call ..\copydlls.bat $(Platform)\$(VldConfiguration)-$(VldToolset) $(NumericPlatform) "$(Outdir)" Copying over Visual Leak Detector Dependencies @@ -31,7 +32,7 @@ _VARIADIC_MAX=10;%(PreprocessorDefinitions) - $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration)-v$(PlatformToolsetVersion);%(AdditionalLibraryDirectories) + $(ProjectDir)..\..\bin\$(Platform)\$(VldConfiguration)-$(VldToolset);%(AdditionalLibraryDirectories) \ No newline at end of file diff --git a/src/tests/basics/Allocs.cpp b/src/tests/basics/Allocs.cpp index 0989cad1..b12f0a6b 100644 --- a/src/tests/basics/Allocs.cpp +++ b/src/tests/basics/Allocs.cpp @@ -10,9 +10,17 @@ // Name of the debug C Runtime Library DLL on this system #ifdef _DEBUG #if _MSC_VER == 1400 // VS 2005 +#ifdef _DLL #define CRTDLLNAME _T("msvcr80d.dll") +#else +#define CRTDLLNAME _T("msvcrt.dll") +#endif #elif _MSC_VER == 1500 // VS 2008 +#ifdef _DLL #define CRTDLLNAME _T("msvcr90d.dll") +#else +#define CRTDLLNAME _T("msvcrt.dll") +#endif #elif _MSC_VER == 1600 // VS 2010 #define CRTDLLNAME _T("msvcr100d.dll") #elif _MSC_VER == 1700 // VS 2012 @@ -26,9 +34,17 @@ #endif #else #if _MSC_VER == 1400 // VS 2005 +#ifdef _DLL #define CRTDLLNAME _T("msvcr80.dll") +#else +#define CRTDLLNAME _T("msvcrt.dll") +#endif #elif _MSC_VER == 1500 // VS 2008 +#ifdef _DLL #define CRTDLLNAME _T("msvcr90.dll") +#else +#define CRTDLLNAME _T("msvcrt.dll") +#endif #elif _MSC_VER == 1600 // VS 2010 #define CRTDLLNAME _T("msvcr100.dll") #elif _MSC_VER == 1700 // VS 2012 diff --git a/src/tests/console/vldconsole.vcxproj b/src/tests/console/vldconsole.vcxproj index 0e0e4134..9ff05621 100644 --- a/src/tests/console/vldconsole.vcxproj +++ b/src/tests/console/vldconsole.vcxproj @@ -20,27 +20,32 @@ {23F66B23-5893-429F-BA3E-5F61EB3ED2A2} + 8.1 Application false NotSet + v140_xp Application false NotSet + v140_xp Application false NotSet + v140_xp Application false NotSet + v140_xp diff --git a/src/tests/dynamic_app/dynamic_app.vcxproj b/src/tests/dynamic_app/dynamic_app.vcxproj index 41521ddb..becf13c6 100644 --- a/src/tests/dynamic_app/dynamic_app.vcxproj +++ b/src/tests/dynamic_app/dynamic_app.vcxproj @@ -327,13 +327,6 @@ false false - - {2178e5b2-1032-441f-a664-f3d8d1fd1913} - false - false - false - false - diff --git a/vld_vs14_wo_mfc.sln b/vld_vs14_wo_mfc.sln new file mode 100644 index 00000000..7a86cba1 --- /dev/null +++ b/vld_vs14_wo_mfc.sln @@ -0,0 +1,407 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" + ProjectSection(ProjectDependencies) = postProject + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main_vs14.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_unload", "src\tests\vld_unload\vld_unload_vs14.vcxproj", "{A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}" + ProjectSection(ProjectDependencies) = postProject + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {50C94B05-8C3E-49ED-B2B9-5715EB624D14} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {33F98E06-F44C-4E22-9E16-4C20F8238A95} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll1", "src\tests\vld_dll1\vld_dll1_vs14.vcxproj", "{50C94B05-8C3E-49ED-B2B9-5715EB624D14}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_dll2\vld_dll2_vs14.vcxproj", "{33F98E06-F44C-4E22-9E16-4C20F8238A95}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs14.vcxproj", "{BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}" + ProjectSection(ProjectDependencies) = postProject + {8C732490-DC1A-40C0-923F-1555B9141B80} = {8C732490-DC1A-40C0-923F-1555B9141B80} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 + Debug_StaticCrt|x64 = Debug_StaticCrt|x64 + Debug_VldRelease_StaticCrt|Win32 = Debug_VldRelease_StaticCrt|Win32 + Debug_VldRelease_StaticCrt|x64 = Debug_VldRelease_StaticCrt|x64 + Debug_VldRelease|Win32 = Debug_VldRelease|Win32 + Debug_VldRelease|x64 = Debug_VldRelease|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_StaticCrt|Win32 = Release_StaticCrt|Win32 + Release_StaticCrt|x64 = Release_StaticCrt|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 + {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Deploy.0 = Debug_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 + {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 + {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.ActiveCfg = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.Build.0 = Debug|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.ActiveCfg = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.Build.0 = Debug|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.ActiveCfg = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.Build.0 = Release|Win32 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.ActiveCfg = Release|x64 + {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.Build.0 = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.Build.0 = Debug|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.ActiveCfg = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.Build.0 = Debug|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.ActiveCfg = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.Build.0 = Release|Win32 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.ActiveCfg = Release|x64 + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.Build.0 = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.ActiveCfg = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.Build.0 = Debug|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.ActiveCfg = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.Build.0 = Debug|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.ActiveCfg = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.Build.0 = Release|Win32 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.ActiveCfg = Release|x64 + {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.Build.0 = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.ActiveCfg = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.Build.0 = Debug|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.ActiveCfg = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.Build.0 = Debug|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.ActiveCfg = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 + {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.ActiveCfg = Debug|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.Build.0 = Debug|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.ActiveCfg = Debug|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.Build.0 = Debug|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.ActiveCfg = Release|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.Build.0 = Release|Win32 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.ActiveCfg = Release|x64 + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} + {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} + {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} + EndGlobalSection +EndGlobal From 03aa5cbe60a0c09166110291cb6cec2cb56586ab Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 6 Nov 2015 10:45:40 +0300 Subject: [PATCH 277/321] Removed old VS projects --- appveyor.yml | 39 +- lib/cppformat/format_vs11.vcxproj | 100 --- lib/cppformat/format_vs11.vcxproj.filters | 27 - lib/cppformat/format_vs12.vcxproj | 100 --- lib/cppformat/format_vs12.vcxproj.filters | 27 - lib/gtest/msvc/gtest_vs11.vcxproj | 134 ---- lib/gtest/msvc/gtest_vs11.vcxproj.filters | 18 - lib/gtest/msvc/gtest_vs12.vcxproj | 134 ---- lib/gtest/msvc/gtest_vs12.vcxproj.filters | 18 - src/tests/basics/basics_vs11.vcxproj | 353 ----------- src/tests/basics/basics_vs11.vcxproj.filters | 45 -- src/tests/basics/basics_vs12.vcxproj | 353 ----------- src/tests/basics/basics_vs12.vcxproj.filters | 45 -- src/tests/corruption/corruption_vs11.vcxproj | 324 ---------- .../corruption_vs11.vcxproj.filters | 39 -- src/tests/corruption/corruption_vs12.vcxproj | 324 ---------- .../corruption_vs12.vcxproj.filters | 39 -- .../dynamic_app/dynamic_app_vs11.vcxproj | 334 ---------- .../dynamic_app_vs11.vcxproj.filters | 45 -- .../dynamic_app/dynamic_app_vs12.vcxproj | 341 ----------- .../dynamic_app_vs12.vcxproj.filters | 45 -- src/tests/dynamic_dll/dynamic_vs11.vcxproj | 331 ---------- .../dynamic_dll/dynamic_vs11.vcxproj.filters | 45 -- src/tests/dynamic_dll/dynamic_vs12.vcxproj | 331 ---------- .../dynamic_dll/dynamic_vs12.vcxproj.filters | 45 -- src/tests/mfc/vldmfc_vs11.vcxproj | 298 --------- src/tests/mfc/vldmfc_vs11.vcxproj.filters | 55 -- src/tests/mfc/vldmfc_vs12.vcxproj | 298 --------- src/tests/mfc/vldmfc_vs12.vcxproj.filters | 55 -- src/tests/mfc_dll/mfc_vs11.vcxproj | 408 ------------- src/tests/mfc_dll/mfc_vs11.vcxproj.filters | 52 -- src/tests/mfc_dll/mfc_vs12.vcxproj | 408 ------------- src/tests/mfc_dll/mfc_vs12.vcxproj.filters | 52 -- src/tests/suite/testsuite_vs11.vcxproj | 304 ---------- .../suite/testsuite_vs11.vcxproj.filters | 22 - src/tests/suite/testsuite_vs12.vcxproj | 304 ---------- .../suite/testsuite_vs12.vcxproj.filters | 22 - src/tests/vld_ComTest/ComTest_vs11.vcxproj | 570 ------------------ .../vld_ComTest/ComTest_vs11.vcxproj.filters | 85 --- src/tests/vld_ComTest/ComTest_vs12.vcxproj | 570 ------------------ .../vld_ComTest/ComTest_vs12.vcxproj.filters | 85 --- src/tests/vld_dll1/vld_dll1_vs11.vcxproj | 345 ----------- .../vld_dll1/vld_dll1_vs11.vcxproj.filters | 33 - src/tests/vld_dll1/vld_dll1_vs12.vcxproj | 345 ----------- .../vld_dll1/vld_dll1_vs12.vcxproj.filters | 33 - src/tests/vld_dll2/vld_dll2_vs11.vcxproj | 345 ----------- .../vld_dll2/vld_dll2_vs11.vcxproj.filters | 33 - src/tests/vld_dll2/vld_dll2_vs12.vcxproj | 345 ----------- .../vld_dll2/vld_dll2_vs12.vcxproj.filters | 33 - src/tests/vld_main/vld_main_vs11.vcxproj | 347 ----------- .../vld_main/vld_main_vs11.vcxproj.filters | 33 - src/tests/vld_main/vld_main_vs12.vcxproj | 347 ----------- .../vld_main/vld_main_vs12.vcxproj.filters | 33 - .../vld_main_test/vld_main_test_vs11.vcxproj | 422 ------------- .../vld_main_test_vs11.vcxproj.filters | 33 - .../vld_main_test/vld_main_test_vs12.vcxproj | 422 ------------- .../vld_main_test_vs12.vcxproj.filters | 33 - src/tests/vld_unload/vld_unload_vs11.vcxproj | 405 ------------- .../vld_unload_vs11.vcxproj.filters | 33 - src/tests/vld_unload/vld_unload_vs12.vcxproj | 405 ------------- .../vld_unload_vs12.vcxproj.filters | 33 - src/vld_vs11.vcxproj | 215 ------- src/vld_vs11.vcxproj.filters | 104 ---- src/vld_vs12.vcxproj | 215 ------- src/vld_vs12.vcxproj.filters | 104 ---- vld_vs11.sln | 490 --------------- vld_vs11_wo_mfc.sln | 404 ------------- vld_vs12.sln | 492 --------------- 68 files changed, 10 insertions(+), 13296 deletions(-) delete mode 100644 lib/cppformat/format_vs11.vcxproj delete mode 100644 lib/cppformat/format_vs11.vcxproj.filters delete mode 100644 lib/cppformat/format_vs12.vcxproj delete mode 100644 lib/cppformat/format_vs12.vcxproj.filters delete mode 100644 lib/gtest/msvc/gtest_vs11.vcxproj delete mode 100644 lib/gtest/msvc/gtest_vs11.vcxproj.filters delete mode 100644 lib/gtest/msvc/gtest_vs12.vcxproj delete mode 100644 lib/gtest/msvc/gtest_vs12.vcxproj.filters delete mode 100644 src/tests/basics/basics_vs11.vcxproj delete mode 100644 src/tests/basics/basics_vs11.vcxproj.filters delete mode 100644 src/tests/basics/basics_vs12.vcxproj delete mode 100644 src/tests/basics/basics_vs12.vcxproj.filters delete mode 100644 src/tests/corruption/corruption_vs11.vcxproj delete mode 100644 src/tests/corruption/corruption_vs11.vcxproj.filters delete mode 100644 src/tests/corruption/corruption_vs12.vcxproj delete mode 100644 src/tests/corruption/corruption_vs12.vcxproj.filters delete mode 100644 src/tests/dynamic_app/dynamic_app_vs11.vcxproj delete mode 100644 src/tests/dynamic_app/dynamic_app_vs11.vcxproj.filters delete mode 100644 src/tests/dynamic_app/dynamic_app_vs12.vcxproj delete mode 100644 src/tests/dynamic_app/dynamic_app_vs12.vcxproj.filters delete mode 100644 src/tests/dynamic_dll/dynamic_vs11.vcxproj delete mode 100644 src/tests/dynamic_dll/dynamic_vs11.vcxproj.filters delete mode 100644 src/tests/dynamic_dll/dynamic_vs12.vcxproj delete mode 100644 src/tests/dynamic_dll/dynamic_vs12.vcxproj.filters delete mode 100644 src/tests/mfc/vldmfc_vs11.vcxproj delete mode 100644 src/tests/mfc/vldmfc_vs11.vcxproj.filters delete mode 100644 src/tests/mfc/vldmfc_vs12.vcxproj delete mode 100644 src/tests/mfc/vldmfc_vs12.vcxproj.filters delete mode 100644 src/tests/mfc_dll/mfc_vs11.vcxproj delete mode 100644 src/tests/mfc_dll/mfc_vs11.vcxproj.filters delete mode 100644 src/tests/mfc_dll/mfc_vs12.vcxproj delete mode 100644 src/tests/mfc_dll/mfc_vs12.vcxproj.filters delete mode 100644 src/tests/suite/testsuite_vs11.vcxproj delete mode 100644 src/tests/suite/testsuite_vs11.vcxproj.filters delete mode 100644 src/tests/suite/testsuite_vs12.vcxproj delete mode 100644 src/tests/suite/testsuite_vs12.vcxproj.filters delete mode 100644 src/tests/vld_ComTest/ComTest_vs11.vcxproj delete mode 100644 src/tests/vld_ComTest/ComTest_vs11.vcxproj.filters delete mode 100644 src/tests/vld_ComTest/ComTest_vs12.vcxproj delete mode 100644 src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters delete mode 100644 src/tests/vld_dll1/vld_dll1_vs11.vcxproj delete mode 100644 src/tests/vld_dll1/vld_dll1_vs11.vcxproj.filters delete mode 100644 src/tests/vld_dll1/vld_dll1_vs12.vcxproj delete mode 100644 src/tests/vld_dll1/vld_dll1_vs12.vcxproj.filters delete mode 100644 src/tests/vld_dll2/vld_dll2_vs11.vcxproj delete mode 100644 src/tests/vld_dll2/vld_dll2_vs11.vcxproj.filters delete mode 100644 src/tests/vld_dll2/vld_dll2_vs12.vcxproj delete mode 100644 src/tests/vld_dll2/vld_dll2_vs12.vcxproj.filters delete mode 100644 src/tests/vld_main/vld_main_vs11.vcxproj delete mode 100644 src/tests/vld_main/vld_main_vs11.vcxproj.filters delete mode 100644 src/tests/vld_main/vld_main_vs12.vcxproj delete mode 100644 src/tests/vld_main/vld_main_vs12.vcxproj.filters delete mode 100644 src/tests/vld_main_test/vld_main_test_vs11.vcxproj delete mode 100644 src/tests/vld_main_test/vld_main_test_vs11.vcxproj.filters delete mode 100644 src/tests/vld_main_test/vld_main_test_vs12.vcxproj delete mode 100644 src/tests/vld_main_test/vld_main_test_vs12.vcxproj.filters delete mode 100644 src/tests/vld_unload/vld_unload_vs11.vcxproj delete mode 100644 src/tests/vld_unload/vld_unload_vs11.vcxproj.filters delete mode 100644 src/tests/vld_unload/vld_unload_vs12.vcxproj delete mode 100644 src/tests/vld_unload/vld_unload_vs12.vcxproj.filters delete mode 100644 src/vld_vs11.vcxproj delete mode 100644 src/vld_vs11.vcxproj.filters delete mode 100644 src/vld_vs12.vcxproj delete mode 100644 src/vld_vs12.vcxproj.filters delete mode 100644 vld_vs11.sln delete mode 100644 vld_vs11_wo_mfc.sln delete mode 100644 vld_vs12.sln diff --git a/appveyor.yml b/appveyor.yml index 52838315..723c987b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,45 +8,22 @@ branches: os: Visual Studio 2015 environment: + VldStackWalkMethod: safe GTEST_REPEAT: 1 matrix: - - VldStackWalkMethod: safe - Toolset: v90 + - Toolset: v90 Solution: vld_vs14_wo_mfc.sln GTEST_FILTER: -*.Mfc* - - VldStackWalkMethod: safe - Toolset: v100 + - Toolset: v100 Solution: vld_vs14_wo_mfc.sln GTEST_FILTER: -*.Mfc* - - VldStackWalkMethod: safe - Toolset: v110 + - Toolset: v110 Solution: vld_vs14_wo_mfc.sln GTEST_FILTER: -*.Mfc* - - VldStackWalkMethod: safe - Toolset: v120_xp + - Toolset: v120_xp Solution: vld_vs14.sln - - VldStackWalkMethod: safe - Toolset: v140_xp - Solution: vld_vs14.sln - - - VldStackWalkMethod: fast - Toolset: v90 - Solution: vld_vs14_wo_mfc.sln - GTEST_FILTER: -*.Mfc* - - VldStackWalkMethod: fast - Toolset: v100 - Solution: vld_vs14_wo_mfc.sln - GTEST_FILTER: -*.Mfc* - - VldStackWalkMethod: fast - Toolset: v110 - Solution: vld_vs14_wo_mfc.sln - GTEST_FILTER: -*.Mfc* - - VldStackWalkMethod: fast - Toolset: v120_xp - Solution: vld_vs14.sln - - VldStackWalkMethod: fast - Toolset: v140_xp + - Toolset: v140_xp Solution: vld_vs14.sln platform: @@ -66,6 +43,10 @@ build_script: - ps: | Write-Output "Configuration: $env:CONFIGURATION" Write-Output "Platform: $env:PLATFORM" + <#if (($env:Toolset -eq "v100") -and ($env:PLATFORM -eq "x64")) + { + return + }#> & .\change_toolset.ps1 $env:Toolset msbuild /v:m /p:"Configuration=$env:CONFIGURATION" /p:Platform="$env:PLATFORM" "$env:Solution" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" diff --git a/lib/cppformat/format_vs11.vcxproj b/lib/cppformat/format_vs11.vcxproj deleted file mode 100644 index 25bf9ff3..00000000 --- a/lib/cppformat/format_vs11.vcxproj +++ /dev/null @@ -1,100 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} - Win32Proj - Win32 - libformat - 8.1 - libformat - - - - StaticLibrary - MultiByte - v110 - - - - - - - - - - <_ProjectFileVersion>10.0.20506.1 - $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ - $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - - EnableFastChecks - CompileAsCpp - Sync - MultiThreadedDebug - true - Level3 - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - Disabled - - - - - EnableFastChecks - CompileAsCpp - Sync - MultiThreadedDebug - true - Level3 - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - Disabled - - - - - CompileAsCpp - Sync - MultiThreaded - true - Level3 - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - - - - - CompileAsCpp - Sync - MultiThreaded - true - Level3 - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/cppformat/format_vs11.vcxproj.filters b/lib/cppformat/format_vs11.vcxproj.filters deleted file mode 100644 index 7d1e3d30..00000000 --- a/lib/cppformat/format_vs11.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - - - {915FED9B-B1C3-4F90-BF61-CF9EE0706F01} - - - {FB559997-0E66-467B-B839-27310F735431} - - - \ No newline at end of file diff --git a/lib/cppformat/format_vs12.vcxproj b/lib/cppformat/format_vs12.vcxproj deleted file mode 100644 index f582a983..00000000 --- a/lib/cppformat/format_vs12.vcxproj +++ /dev/null @@ -1,100 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} - Win32Proj - Win32 - libformat - 8.1 - libformat - - - - StaticLibrary - MultiByte - v120_xp - - - - - - - - - - <_ProjectFileVersion>10.0.20506.1 - $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ - $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - - EnableFastChecks - CompileAsCpp - Sync - MultiThreadedDebug - true - Level3 - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - Disabled - - - - - EnableFastChecks - CompileAsCpp - Sync - MultiThreadedDebug - true - Level3 - WIN32;_WINDOWS;_DEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - Disabled - - - - - CompileAsCpp - Sync - MultiThreaded - true - Level3 - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - - - - - CompileAsCpp - Sync - MultiThreaded - true - Level3 - WIN32;_WINDOWS;NDEBUG;FMT_USE_FILE_DESCRIPTORS=1;GTEST_LANG_CXX11=0;%(PreprocessorDefinitions) - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/cppformat/format_vs12.vcxproj.filters b/lib/cppformat/format_vs12.vcxproj.filters deleted file mode 100644 index 7d1e3d30..00000000 --- a/lib/cppformat/format_vs12.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - - - {915FED9B-B1C3-4F90-BF61-CF9EE0706F01} - - - {FB559997-0E66-467B-B839-27310F735431} - - - \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_vs11.vcxproj b/lib/gtest/msvc/gtest_vs11.vcxproj deleted file mode 100644 index 18768e0a..00000000 --- a/lib/gtest/msvc/gtest_vs11.vcxproj +++ /dev/null @@ -1,134 +0,0 @@ - - - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} - Win32Proj - libgtest - 8.1 - libgtest - - - - StaticLibrary - v110 - MultiByte - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ - $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level3 - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level3 - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level3 - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level3 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - - - ..;..\include;%(AdditionalIncludeDirectories) - - - - - - \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_vs11.vcxproj.filters b/lib/gtest/msvc/gtest_vs11.vcxproj.filters deleted file mode 100644 index b566f891..00000000 --- a/lib/gtest/msvc/gtest_vs11.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_vs12.vcxproj b/lib/gtest/msvc/gtest_vs12.vcxproj deleted file mode 100644 index 914b78b8..00000000 --- a/lib/gtest/msvc/gtest_vs12.vcxproj +++ /dev/null @@ -1,134 +0,0 @@ - - - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} - Win32Proj - libgtest - 8.1 - libgtest - - - - StaticLibrary - v120_xp - MultiByte - - - - - - - - - - <_ProjectFileVersion>14.0.22823.1 - $(SolutionDir)src\bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ - $(SolutionDir)src\obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level3 - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level3 - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level3 - - - - - Disabled - WIN32;_VARIADIC_MAX=10;_DEBUG;_LIB;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level3 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - - - - - WIN32;_VARIADIC_MAX=10;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - Level3 - - - - - ..;..\include;%(AdditionalIncludeDirectories) - - - - - - \ No newline at end of file diff --git a/lib/gtest/msvc/gtest_vs12.vcxproj.filters b/lib/gtest/msvc/gtest_vs12.vcxproj.filters deleted file mode 100644 index b566f891..00000000 --- a/lib/gtest/msvc/gtest_vs12.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/basics/basics_vs11.vcxproj b/src/tests/basics/basics_vs11.vcxproj deleted file mode 100644 index be028fa4..00000000 --- a/src/tests/basics/basics_vs11.vcxproj +++ /dev/null @@ -1,353 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {0943354A-41E0-4215-878A-8D0FE758052C} - Win32Proj - test_basics - test_basics - 8.1 - - - - Application - Unicode - v110 - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Console - true - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Console - true - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Console - true - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Console - true - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - MultiThreadedDebug - - - Console - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - - - - Create - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - false - true - - - - - - \ No newline at end of file diff --git a/src/tests/basics/basics_vs11.vcxproj.filters b/src/tests/basics/basics_vs11.vcxproj.filters deleted file mode 100644 index fdb7dc5a..00000000 --- a/src/tests/basics/basics_vs11.vcxproj.filters +++ /dev/null @@ -1,45 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/basics/basics_vs12.vcxproj b/src/tests/basics/basics_vs12.vcxproj deleted file mode 100644 index e771f6da..00000000 --- a/src/tests/basics/basics_vs12.vcxproj +++ /dev/null @@ -1,353 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {0943354A-41E0-4215-878A-8D0FE758052C} - Win32Proj - test_basics - test_basics - 8.1 - - - - Application - Unicode - v120_xp - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Console - true - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Console - true - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Console - true - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - - - Console - true - - - - - Use - Level3 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ProgramDatabase - MultiThreadedDebug - - - Console - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - - - - Create - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - false - true - - - - - - \ No newline at end of file diff --git a/src/tests/basics/basics_vs12.vcxproj.filters b/src/tests/basics/basics_vs12.vcxproj.filters deleted file mode 100644 index fdb7dc5a..00000000 --- a/src/tests/basics/basics_vs12.vcxproj.filters +++ /dev/null @@ -1,45 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/corruption/corruption_vs11.vcxproj b/src/tests/corruption/corruption_vs11.vcxproj deleted file mode 100644 index b893027c..00000000 --- a/src/tests/corruption/corruption_vs11.vcxproj +++ /dev/null @@ -1,324 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {87911ED6-84BC-4526-9654-A4FF4E0EDF52} - Win32Proj - corruption - 8.1 - corruption - - - - Application - Unicode - v110 - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level3 - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - Level3 - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - false - - - - - - \ No newline at end of file diff --git a/src/tests/corruption/corruption_vs11.vcxproj.filters b/src/tests/corruption/corruption_vs11.vcxproj.filters deleted file mode 100644 index 9194b4d8..00000000 --- a/src/tests/corruption/corruption_vs11.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/corruption/corruption_vs12.vcxproj b/src/tests/corruption/corruption_vs12.vcxproj deleted file mode 100644 index 0b298452..00000000 --- a/src/tests/corruption/corruption_vs12.vcxproj +++ /dev/null @@ -1,324 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {87911ED6-84BC-4526-9654-A4FF4E0EDF52} - Win32Proj - corruption - 8.1 - corruption - - - - Application - Unicode - v120_xp - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level3 - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - Level3 - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level3 - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - false - - - - - - \ No newline at end of file diff --git a/src/tests/corruption/corruption_vs12.vcxproj.filters b/src/tests/corruption/corruption_vs12.vcxproj.filters deleted file mode 100644 index 9194b4d8..00000000 --- a/src/tests/corruption/corruption_vs12.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/dynamic_app/dynamic_app_vs11.vcxproj b/src/tests/dynamic_app/dynamic_app_vs11.vcxproj deleted file mode 100644 index 14d7d76f..00000000 --- a/src/tests/dynamic_app/dynamic_app_vs11.vcxproj +++ /dev/null @@ -1,334 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} - Win32Proj - dynamic_app - 8.1 - dynamic_app - - - - Application - Unicode - v110 - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level4 - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level4 - MaxSpeed - true - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - Level4 - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level4 - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - false - - - {3aea2aaf-3e9b-466f-b361-560b95ad88b4} - false - false - false - false - false - - - - - - \ No newline at end of file diff --git a/src/tests/dynamic_app/dynamic_app_vs11.vcxproj.filters b/src/tests/dynamic_app/dynamic_app_vs11.vcxproj.filters deleted file mode 100644 index 72fba51d..00000000 --- a/src/tests/dynamic_app/dynamic_app_vs11.vcxproj.filters +++ /dev/null @@ -1,45 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/dynamic_app/dynamic_app_vs12.vcxproj b/src/tests/dynamic_app/dynamic_app_vs12.vcxproj deleted file mode 100644 index cba6689b..00000000 --- a/src/tests/dynamic_app/dynamic_app_vs12.vcxproj +++ /dev/null @@ -1,341 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} - Win32Proj - dynamic_app - 8.1 - dynamic_app - - - - Application - Unicode - v120_xp - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - - - - - Level4 - Disabled - STATIC_CRT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - Level4 - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level4 - MaxSpeed - true - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - Level4 - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - Level4 - true - STATIC_CRT;VLD_FORCE_ENABLE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - false - - - {3aea2aaf-3e9b-466f-b361-560b95ad88b4} - false - false - false - false - false - - - {2178e5b2-1032-441f-a664-f3d8d1fd1913} - false - false - false - false - - - - - - \ No newline at end of file diff --git a/src/tests/dynamic_app/dynamic_app_vs12.vcxproj.filters b/src/tests/dynamic_app/dynamic_app_vs12.vcxproj.filters deleted file mode 100644 index 72fba51d..00000000 --- a/src/tests/dynamic_app/dynamic_app_vs12.vcxproj.filters +++ /dev/null @@ -1,45 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/dynamic_dll/dynamic_vs11.vcxproj b/src/tests/dynamic_dll/dynamic_vs11.vcxproj deleted file mode 100644 index a4ebe6dd..00000000 --- a/src/tests/dynamic_dll/dynamic_vs11.vcxproj +++ /dev/null @@ -1,331 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} - Win32Proj - dynamic - dynamic - 8.1 - - - - DynamicLibrary - Unicode - v110 - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - - - - - - - - - - - - - - Create - - - - - - \ No newline at end of file diff --git a/src/tests/dynamic_dll/dynamic_vs11.vcxproj.filters b/src/tests/dynamic_dll/dynamic_vs11.vcxproj.filters deleted file mode 100644 index 52e065e3..00000000 --- a/src/tests/dynamic_dll/dynamic_vs11.vcxproj.filters +++ /dev/null @@ -1,45 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/dynamic_dll/dynamic_vs12.vcxproj b/src/tests/dynamic_dll/dynamic_vs12.vcxproj deleted file mode 100644 index 70a123e2..00000000 --- a/src/tests/dynamic_dll/dynamic_vs12.vcxproj +++ /dev/null @@ -1,331 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} - Win32Proj - dynamic - dynamic - 8.1 - - - - DynamicLibrary - Unicode - v120_xp - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - - - - - - - - - - - - - - Create - - - - - - \ No newline at end of file diff --git a/src/tests/dynamic_dll/dynamic_vs12.vcxproj.filters b/src/tests/dynamic_dll/dynamic_vs12.vcxproj.filters deleted file mode 100644 index 52e065e3..00000000 --- a/src/tests/dynamic_dll/dynamic_vs12.vcxproj.filters +++ /dev/null @@ -1,45 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/mfc/vldmfc_vs11.vcxproj b/src/tests/mfc/vldmfc_vs11.vcxproj deleted file mode 100644 index 94ec78bd..00000000 --- a/src/tests/mfc/vldmfc_vs11.vcxproj +++ /dev/null @@ -1,298 +0,0 @@ - - - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {A231973E-072A-428E-982E-5363ADD1CDE2} - MFCProj - 8.1 - vldmfc - vldmfc - - - - Application - Unicode - v110 - - - Dynamic - - - Static - - - Dynamic - - - Static - - - Dynamic - - - Static - - - Dynamic - - - Static - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - false - false - false - false - true - true - true - true - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - - - - - - - - MaxSpeed - OnlyExplicitInline - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Level3 - Use - - - NDEBUG;%(PreprocessorDefinitions) - - - Windows - false - true - - - - - MaxSpeed - OnlyExplicitInline - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - Level3 - Use - - - NDEBUG;%(PreprocessorDefinitions) - - - Windows - false - true - - - - - MaxSpeed - OnlyExplicitInline - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Level3 - Use - - - NDEBUG;%(PreprocessorDefinitions) - - - Windows - false - true - - - - - MaxSpeed - OnlyExplicitInline - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - Level3 - Use - - - NDEBUG;%(PreprocessorDefinitions) - - - Windows - false - true - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - - - _DEBUG;%(PreprocessorDefinitions) - - - true - Windows - false - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Use - Level3 - - - _DEBUG;%(PreprocessorDefinitions) - - - true - Windows - false - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - - - _DEBUG;%(PreprocessorDefinitions) - - - true - Windows - false - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - - - _DEBUG;%(PreprocessorDefinitions) - - - true - Windows - false - - - - - Create - - - - - - - - - - - - - - - - - - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - - - - - \ No newline at end of file diff --git a/src/tests/mfc/vldmfc_vs11.vcxproj.filters b/src/tests/mfc/vldmfc_vs11.vcxproj.filters deleted file mode 100644 index 2aeb011e..00000000 --- a/src/tests/mfc/vldmfc_vs11.vcxproj.filters +++ /dev/null @@ -1,55 +0,0 @@ - - - - - {34f1f2ae-d745-4d33-82c0-d281bca28a63} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {716aeea6-27e4-47d9-9d4e-4a9d35551f9c} - h;hpp;hxx;hm;inl - - - {468ee78d-f409-4040-95ff-fd2928868302} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/src/tests/mfc/vldmfc_vs12.vcxproj b/src/tests/mfc/vldmfc_vs12.vcxproj deleted file mode 100644 index 5906c117..00000000 --- a/src/tests/mfc/vldmfc_vs12.vcxproj +++ /dev/null @@ -1,298 +0,0 @@ - - - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {A231973E-072A-428E-982E-5363ADD1CDE2} - MFCProj - 8.1 - vldmfc - vldmfc - - - - Application - Unicode - v120_xp - - - Dynamic - - - Static - - - Dynamic - - - Static - - - Dynamic - - - Static - - - Dynamic - - - Static - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - false - false - false - false - true - true - true - true - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - - - - - - - - MaxSpeed - OnlyExplicitInline - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Level3 - Use - - - NDEBUG;%(PreprocessorDefinitions) - - - Windows - false - true - - - - - MaxSpeed - OnlyExplicitInline - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - Level3 - Use - - - NDEBUG;%(PreprocessorDefinitions) - - - Windows - false - true - - - - - MaxSpeed - OnlyExplicitInline - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - Level3 - Use - - - NDEBUG;%(PreprocessorDefinitions) - - - Windows - false - true - - - - - MaxSpeed - OnlyExplicitInline - VLD_FORCE_ENABLE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - Level3 - Use - - - NDEBUG;%(PreprocessorDefinitions) - - - Windows - false - true - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - - - _DEBUG;%(PreprocessorDefinitions) - - - true - Windows - false - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Use - Level3 - - - _DEBUG;%(PreprocessorDefinitions) - - - true - Windows - false - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - - - _DEBUG;%(PreprocessorDefinitions) - - - true - Windows - false - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Use - Level3 - - - _DEBUG;%(PreprocessorDefinitions) - - - true - Windows - false - - - - - Create - - - - - - - - - - - - - - - - - - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - - - - - \ No newline at end of file diff --git a/src/tests/mfc/vldmfc_vs12.vcxproj.filters b/src/tests/mfc/vldmfc_vs12.vcxproj.filters deleted file mode 100644 index 2aeb011e..00000000 --- a/src/tests/mfc/vldmfc_vs12.vcxproj.filters +++ /dev/null @@ -1,55 +0,0 @@ - - - - - {34f1f2ae-d745-4d33-82c0-d281bca28a63} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {716aeea6-27e4-47d9-9d4e-4a9d35551f9c} - h;hpp;hxx;hm;inl - - - {468ee78d-f409-4040-95ff-fd2928868302} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/src/tests/mfc_dll/mfc_vs11.vcxproj b/src/tests/mfc_dll/mfc_vs11.vcxproj deleted file mode 100644 index af107774..00000000 --- a/src/tests/mfc_dll/mfc_vs11.vcxproj +++ /dev/null @@ -1,408 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {2178E5B2-1032-441F-A664-F3D8D1FD1913} - test_mfc - MFCDLLProj - test_mfc - 8.1 - - - - DynamicLibrary - Unicode - v110 - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - false - true - Dynamic - - - false - true - Static - - - false - true - Dynamic - - - false - true - Static - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - true - true - .\mfc.def - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - .\mfc.def - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - true - true - .\mfc.def - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - .\mfc.def - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - - - - - - Create - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/tests/mfc_dll/mfc_vs11.vcxproj.filters b/src/tests/mfc_dll/mfc_vs11.vcxproj.filters deleted file mode 100644 index 656c5de1..00000000 --- a/src/tests/mfc_dll/mfc_vs11.vcxproj.filters +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Resource Files - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/src/tests/mfc_dll/mfc_vs12.vcxproj b/src/tests/mfc_dll/mfc_vs12.vcxproj deleted file mode 100644 index 964c7bb1..00000000 --- a/src/tests/mfc_dll/mfc_vs12.vcxproj +++ /dev/null @@ -1,408 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {2178E5B2-1032-441F-A664-F3D8D1FD1913} - test_mfc - MFCDLLProj - test_mfc - 8.1 - - - - DynamicLibrary - Unicode - v120_xp - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - false - true - Dynamic - - - false - true - Static - - - false - true - Dynamic - - - false - true - Static - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - .\mfc.def - - - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - true - true - .\mfc.def - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - .\mfc.def - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - Windows - true - true - true - .\mfc.def - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - true - true - true - .\mfc.def - - - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - - - - - - Create - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/tests/mfc_dll/mfc_vs12.vcxproj.filters b/src/tests/mfc_dll/mfc_vs12.vcxproj.filters deleted file mode 100644 index 656c5de1..00000000 --- a/src/tests/mfc_dll/mfc_vs12.vcxproj.filters +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Resource Files - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/src/tests/suite/testsuite_vs11.vcxproj b/src/tests/suite/testsuite_vs11.vcxproj deleted file mode 100644 index 19251a8d..00000000 --- a/src/tests/suite/testsuite_vs11.vcxproj +++ /dev/null @@ -1,304 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {EE4A829C-5FD8-460B-8A90-B518B9BABB70} - testsuite - 8.1 - testsuite - - - - Application - NotSet - v110 - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - - - - Disabled - WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - false - false - - - true - Console - - - - - Disabled - WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - false - false - - - true - Console - - - - - Full - VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - true - true - - - true - true - true - Console - - - - - Full - VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) - MultiThreaded - true - true - - - true - true - true - Console - - - - - Disabled - WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - false - true - - - true - Console - - - - - Disabled - WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - false - true - - - true - Console - - - - - Disabled - WIN64;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - false - false - - - true - Console - - - - - Disabled - WIN64;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - false - false - - - true - Console - - - - - Full - VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) - MultiThreadedDLL - true - true - - - true - true - true - Console - - - - - Full - VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) - MultiThreaded - true - true - - - true - true - true - Console - - - - - Disabled - WIN64;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - false - true - - - true - true - Console - - - - - Disabled - WIN64;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - false - true - - - true - true - Console - - - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - true - false - - - - - - \ No newline at end of file diff --git a/src/tests/suite/testsuite_vs11.vcxproj.filters b/src/tests/suite/testsuite_vs11.vcxproj.filters deleted file mode 100644 index 31a8fddb..00000000 --- a/src/tests/suite/testsuite_vs11.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/suite/testsuite_vs12.vcxproj b/src/tests/suite/testsuite_vs12.vcxproj deleted file mode 100644 index 970ffcca..00000000 --- a/src/tests/suite/testsuite_vs12.vcxproj +++ /dev/null @@ -1,304 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {EE4A829C-5FD8-460B-8A90-B518B9BABB70} - testsuite - 8.1 - testsuite - - - - Application - NotSet - v120_xp - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - NativeRecommendedRules.ruleset - NativeRecommendedRules.ruleset - - - - - - - - Disabled - WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - false - false - - - true - Console - - - - - Disabled - WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - false - false - - - true - Console - - - - - Full - VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - true - true - - - true - true - true - Console - - - - - Full - VLD_FORCE_ENABLE;NDEBUG;WIN32;%(PreprocessorDefinitions) - MultiThreaded - true - true - - - true - true - true - Console - - - - - Disabled - WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - false - true - - - true - Console - - - - - Disabled - WIN32;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - false - true - - - true - Console - - - - - Disabled - WIN64;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - false - false - - - true - Console - - - - - Disabled - WIN64;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - false - false - - - true - Console - - - - - Full - VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) - MultiThreadedDLL - true - true - - - true - true - true - Console - - - - - Full - VLD_FORCE_ENABLE;NDEBUG;WIN64;%(PreprocessorDefinitions) - MultiThreaded - true - true - - - true - true - true - Console - - - - - Disabled - WIN64;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - false - true - - - true - true - Console - - - - - Disabled - WIN64;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - false - true - - - true - true - Console - - - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - true - false - - - - - - \ No newline at end of file diff --git a/src/tests/suite/testsuite_vs12.vcxproj.filters b/src/tests/suite/testsuite_vs12.vcxproj.filters deleted file mode 100644 index 31a8fddb..00000000 --- a/src/tests/suite/testsuite_vs12.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/vld_ComTest/ComTest_vs11.vcxproj b/src/tests/vld_ComTest/ComTest_vs11.vcxproj deleted file mode 100644 index 9679b253..00000000 --- a/src/tests/vld_ComTest/ComTest_vs11.vcxproj +++ /dev/null @@ -1,570 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {3719F504-3DF0-45F8-BC7A-4415804AC7C9} - AtlProj - ComTest - ComTest - - - - DynamicLibrary - Unicode - v110 - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - false - Dynamic - - - false - Static - - - false - Dynamic - - - false - Static - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - MaxSpeed - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - NDEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - true - true - - - - - Use - Level3 - MaxSpeed - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - NDEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - true - true - - - - - Use - Level3 - MaxSpeed - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - NDEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - true - true - - - - - Use - Level3 - MaxSpeed - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - NDEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - true - true - - - - - - NotUsing - - - - - Create - - - NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - - - - - \ No newline at end of file diff --git a/src/tests/vld_ComTest/ComTest_vs11.vcxproj.filters b/src/tests/vld_ComTest/ComTest_vs11.vcxproj.filters deleted file mode 100644 index afccb08f..00000000 --- a/src/tests/vld_ComTest/ComTest_vs11.vcxproj.filters +++ /dev/null @@ -1,85 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {a27c1591-bff6-481d-8a73-f014c351a0f7} - False - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Generated Files - - - Source Files - - - Generated Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Generated Files - - - Header Files - - - - - Resource Files - - - - - Resource Files - - - Resource Files - - - Resource Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/src/tests/vld_ComTest/ComTest_vs12.vcxproj b/src/tests/vld_ComTest/ComTest_vs12.vcxproj deleted file mode 100644 index 991eb6b2..00000000 --- a/src/tests/vld_ComTest/ComTest_vs12.vcxproj +++ /dev/null @@ -1,570 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {3719F504-3DF0-45F8-BC7A-4415804AC7C9} - AtlProj - ComTest - ComTest - - - - DynamicLibrary - Unicode - v120_xp - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - true - Dynamic - - - true - Static - - - false - Dynamic - - - false - Static - - - false - Dynamic - - - false - Static - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - _DEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - _DEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - - - - - Use - Level3 - MaxSpeed - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - NDEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - true - true - - - - - Use - Level3 - MaxSpeed - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - Win32 - NDEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - true - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - true - true - - - - - Use - Level3 - MaxSpeed - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - NDEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - true - true - - - - - Use - Level3 - MaxSpeed - WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - - - false - NDEBUG;%(PreprocessorDefinitions) - ComTest_i.h - ComTest_i.c - ComTest_p.c - true - $(IntDir)ComTest.tlb - - - 0x0804 - $(IntDir);%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - - - Windows - .\ComTest.def - true - true - true - true - true - - - - - - NotUsing - - - - - Create - - - NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - - - - - \ No newline at end of file diff --git a/src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters b/src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters deleted file mode 100644 index afccb08f..00000000 --- a/src/tests/vld_ComTest/ComTest_vs12.vcxproj.filters +++ /dev/null @@ -1,85 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {a27c1591-bff6-481d-8a73-f014c351a0f7} - False - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Generated Files - - - Source Files - - - Generated Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Generated Files - - - Header Files - - - - - Resource Files - - - - - Resource Files - - - Resource Files - - - Resource Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/src/tests/vld_dll1/vld_dll1_vs11.vcxproj b/src/tests/vld_dll1/vld_dll1_vs11.vcxproj deleted file mode 100644 index fa81e693..00000000 --- a/src/tests/vld_dll1/vld_dll1_vs11.vcxproj +++ /dev/null @@ -1,345 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {50C94B05-8C3E-49ED-B2B9-5715EB624D14} - Win32Proj - vld_dll1 - vld_dll1 - - - - DynamicLibrary - v110 - Unicode - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - - - Windows - true - true - true - - - - - - - - - - Create - - - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - - - - - \ No newline at end of file diff --git a/src/tests/vld_dll1/vld_dll1_vs11.vcxproj.filters b/src/tests/vld_dll1/vld_dll1_vs11.vcxproj.filters deleted file mode 100644 index 95c6df39..00000000 --- a/src/tests/vld_dll1/vld_dll1_vs11.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/vld_dll1/vld_dll1_vs12.vcxproj b/src/tests/vld_dll1/vld_dll1_vs12.vcxproj deleted file mode 100644 index 2709040d..00000000 --- a/src/tests/vld_dll1/vld_dll1_vs12.vcxproj +++ /dev/null @@ -1,345 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {50C94B05-8C3E-49ED-B2B9-5715EB624D14} - Win32Proj - vld_dll1 - vld_dll1 - - - - DynamicLibrary - v120_xp - Unicode - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - - - Windows - true - true - true - - - - - - - - - - Create - - - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - - - - - \ No newline at end of file diff --git a/src/tests/vld_dll1/vld_dll1_vs12.vcxproj.filters b/src/tests/vld_dll1/vld_dll1_vs12.vcxproj.filters deleted file mode 100644 index 95c6df39..00000000 --- a/src/tests/vld_dll1/vld_dll1_vs12.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/vld_dll2/vld_dll2_vs11.vcxproj b/src/tests/vld_dll2/vld_dll2_vs11.vcxproj deleted file mode 100644 index 63c13b27..00000000 --- a/src/tests/vld_dll2/vld_dll2_vs11.vcxproj +++ /dev/null @@ -1,345 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {33F98E06-F44C-4E22-9E16-4C20F8238A95} - Win32Proj - vld_dll2 - vld_dll2 - - - - DynamicLibrary - v110 - Unicode - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - - - Windows - true - true - true - - - - - - - - - - Create - - - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - - - - - \ No newline at end of file diff --git a/src/tests/vld_dll2/vld_dll2_vs11.vcxproj.filters b/src/tests/vld_dll2/vld_dll2_vs11.vcxproj.filters deleted file mode 100644 index 95c6df39..00000000 --- a/src/tests/vld_dll2/vld_dll2_vs11.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/vld_dll2/vld_dll2_vs12.vcxproj b/src/tests/vld_dll2/vld_dll2_vs12.vcxproj deleted file mode 100644 index f3961f0d..00000000 --- a/src/tests/vld_dll2/vld_dll2_vs12.vcxproj +++ /dev/null @@ -1,345 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {33F98E06-F44C-4E22-9E16-4C20F8238A95} - Win32Proj - vld_dll2 - vld_dll2 - - - - DynamicLibrary - v120_xp - Unicode - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;VLD_DLL2_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Windows - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;VLD_DLL1_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - - - Windows - true - true - true - - - - - - - - - - Create - - - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - - - - - \ No newline at end of file diff --git a/src/tests/vld_dll2/vld_dll2_vs12.vcxproj.filters b/src/tests/vld_dll2/vld_dll2_vs12.vcxproj.filters deleted file mode 100644 index 95c6df39..00000000 --- a/src/tests/vld_dll2/vld_dll2_vs12.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/vld_main/vld_main_vs11.vcxproj b/src/tests/vld_main/vld_main_vs11.vcxproj deleted file mode 100644 index b4843687..00000000 --- a/src/tests/vld_main/vld_main_vs11.vcxproj +++ /dev/null @@ -1,347 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {8C732490-DC1A-40C0-923F-1555B9141B80} - Win32Proj - vld_main - vld_main - - - - Application - v110 - Unicode - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebugDLL - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebugDLL - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - - - - - Create - - - - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - - - - - \ No newline at end of file diff --git a/src/tests/vld_main/vld_main_vs11.vcxproj.filters b/src/tests/vld_main/vld_main_vs11.vcxproj.filters deleted file mode 100644 index 4644d1bb..00000000 --- a/src/tests/vld_main/vld_main_vs11.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/vld_main/vld_main_vs12.vcxproj b/src/tests/vld_main/vld_main_vs12.vcxproj deleted file mode 100644 index 582bfe87..00000000 --- a/src/tests/vld_main/vld_main_vs12.vcxproj +++ /dev/null @@ -1,347 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {8C732490-DC1A-40C0-923F-1555B9141B80} - Win32Proj - vld_main - vld_main - - - - Application - v120_xp - Unicode - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebugDLL - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebugDLL - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - - - - - Create - - - - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - - - - - \ No newline at end of file diff --git a/src/tests/vld_main/vld_main_vs12.vcxproj.filters b/src/tests/vld_main/vld_main_vs12.vcxproj.filters deleted file mode 100644 index 4644d1bb..00000000 --- a/src/tests/vld_main/vld_main_vs12.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/vld_main_test/vld_main_test_vs11.vcxproj b/src/tests/vld_main_test/vld_main_test_vs11.vcxproj deleted file mode 100644 index 4d8185e9..00000000 --- a/src/tests/vld_main_test/vld_main_test_vs11.vcxproj +++ /dev/null @@ -1,422 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} - Win32Proj - vld_main_test - vld_main_test - - - - Application - v110 - Unicode - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebugDLL - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebugDLL - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - - - - - Create - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {8c732490-dc1a-40c0-923f-1555b9141b80} - - - - - - \ No newline at end of file diff --git a/src/tests/vld_main_test/vld_main_test_vs11.vcxproj.filters b/src/tests/vld_main_test/vld_main_test_vs11.vcxproj.filters deleted file mode 100644 index 9c309eb7..00000000 --- a/src/tests/vld_main_test/vld_main_test_vs11.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/vld_main_test/vld_main_test_vs12.vcxproj b/src/tests/vld_main_test/vld_main_test_vs12.vcxproj deleted file mode 100644 index bfac5b7d..00000000 --- a/src/tests/vld_main_test/vld_main_test_vs12.vcxproj +++ /dev/null @@ -1,422 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} - Win32Proj - vld_main_test - vld_main_test - - - - Application - v120_xp - Unicode - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebugDLL - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebugDLL - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - - - - - Create - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {8c732490-dc1a-40c0-923f-1555b9141b80} - - - - - - \ No newline at end of file diff --git a/src/tests/vld_main_test/vld_main_test_vs12.vcxproj.filters b/src/tests/vld_main_test/vld_main_test_vs12.vcxproj.filters deleted file mode 100644 index 9c309eb7..00000000 --- a/src/tests/vld_main_test/vld_main_test_vs12.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs11.vcxproj b/src/tests/vld_unload/vld_unload_vs11.vcxproj deleted file mode 100644 index 2b636a0c..00000000 --- a/src/tests/vld_unload/vld_unload_vs11.vcxproj +++ /dev/null @@ -1,405 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} - Win32Proj - vld_unload - vld_unload - - - - Application - v110 - Unicode - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - - - - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {50c94b05-8c3e-49ed-b2b9-5715eb624d14} - true - false - false - false - - - {33f98e06-f44c-4e22-9e16-4c20f8238a95} - true - false - false - false - - - - - - \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs11.vcxproj.filters b/src/tests/vld_unload/vld_unload_vs11.vcxproj.filters deleted file mode 100644 index 43a60e40..00000000 --- a/src/tests/vld_unload/vld_unload_vs11.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs12.vcxproj b/src/tests/vld_unload/vld_unload_vs12.vcxproj deleted file mode 100644 index a624b7fe..00000000 --- a/src/tests/vld_unload/vld_unload_vs12.vcxproj +++ /dev/null @@ -1,405 +0,0 @@ - - - - - Debug(Release)_StaticCrt - Win32 - - - Debug(Release)_StaticCrt - x64 - - - Debug(Release) - Win32 - - - Debug(Release) - x64 - - - Debug_StaticCrt - Win32 - - - Debug_StaticCrt - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_StaticCrt - Win32 - - - Release_StaticCrt - x64 - - - Release - Win32 - - - Release - x64 - - - - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} - Win32Proj - vld_unload - vld_unload - - - - Application - v120_xp - Unicode - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - true - - - false - true - - - false - true - - - false - true - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - false - - - false - - - false - - - false - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug - - - Console - true - - - - - - - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - - - - Level3 - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - - Console - true - true - true - - - - - - - - - - - - - - - - - - - {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - - {50c94b05-8c3e-49ed-b2b9-5715eb624d14} - true - false - false - false - - - {33f98e06-f44c-4e22-9e16-4c20f8238a95} - true - false - false - false - - - - - - \ No newline at end of file diff --git a/src/tests/vld_unload/vld_unload_vs12.vcxproj.filters b/src/tests/vld_unload/vld_unload_vs12.vcxproj.filters deleted file mode 100644 index 43a60e40..00000000 --- a/src/tests/vld_unload/vld_unload_vs12.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/src/vld_vs11.vcxproj b/src/vld_vs11.vcxproj deleted file mode 100644 index fd16ed71..00000000 --- a/src/vld_vs11.vcxproj +++ /dev/null @@ -1,215 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - vld - Unicode - DynamicLibrary - true - x86 - x64 - 8.1 - vld - - - - - v110 - - - - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - NativeRecommendedRules.ruleset - $(ProjectName)_$(NumericPlatform) - - - false - - - false - - - false - NativeRecommendedRules.ruleset - - - false - NativeRecommendedRules.ruleset - - - - $(SolutionDir)\lib\;$(SolutionDir)\lib\dbghelp\include;$(SolutionDir)\setup;%(AdditionalIncludeDirectories) - Use - - - true - 0x03200000 - false - $(SolutionDir)\lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) - - - copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y - - - $(SolutionDir)\setup - - - - - Disabled - _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level4 - false - false - 4201;4229;4091;4302;4311;4312;4127 - - - psapi.lib;%(AdditionalDependencies) - Windows - - - vld.dll.dependency.x86.manifest - - - - - Disabled - _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level4 - false - 4201;4229;4091;4302;4311;4312;4127 - false - - - psapi.lib;%(AdditionalDependencies) - Windows - - - vld.dll.dependency.x64.manifest - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - - - - - Full - Speed - true - NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - false - 4201;4229;4091;4302;4311;4312;4127 - false - - - true - true - Windows - - - vld.dll.dependency.x86.manifest - - - - - Full - Speed - true - NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - false - false - 4201;4229;4091;4302;4311;4312;4127 - false - - - true - true - true - Windows - - - vld.dll.dependency.x64.manifest - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4adfd279-56c6-4b1d-ba9e-b815e81c1b17} - - - - - - \ No newline at end of file diff --git a/src/vld_vs11.vcxproj.filters b/src/vld_vs11.vcxproj.filters deleted file mode 100644 index 02ecff1d..00000000 --- a/src/vld_vs11.vcxproj.filters +++ /dev/null @@ -1,104 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - - \ No newline at end of file diff --git a/src/vld_vs12.vcxproj b/src/vld_vs12.vcxproj deleted file mode 100644 index 5f1391e8..00000000 --- a/src/vld_vs12.vcxproj +++ /dev/null @@ -1,215 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - vld - Unicode - DynamicLibrary - true - x86 - x64 - 8.1 - vld - - - - - v120_xp - - - - - <_ProjectFileVersion>10.0.30128.1 - $(ProjectDir)bin\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\ - $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ - NativeRecommendedRules.ruleset - $(ProjectName)_$(NumericPlatform) - - - false - - - false - - - false - NativeRecommendedRules.ruleset - - - false - NativeRecommendedRules.ruleset - - - - $(SolutionDir)\lib\;$(SolutionDir)\lib\dbghelp\include;$(SolutionDir)\setup;%(AdditionalIncludeDirectories) - Use - - - true - 0x03200000 - false - $(SolutionDir)\lib\dbghelp\lib\$(PlatformName);%(AdditionalLibraryDirectories) - - - copy "$(OutDir)$(TargetName).lib" "$(OutDir)vld.lib" /y - - - $(SolutionDir)\setup - - - - - Disabled - _DEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level4 - false - false - 4201;4229;4091;4302;4311;4312;4127 - - - psapi.lib;%(AdditionalDependencies) - Windows - - - vld.dll.dependency.x86.manifest - - - - - Disabled - _DEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - Level4 - false - 4201;4229;4091;4302;4311;4312;4127 - false - - - psapi.lib;%(AdditionalDependencies) - Windows - - - vld.dll.dependency.x64.manifest - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - - - - - Full - Speed - true - NDEBUG;_USRDLL;WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - false - 4201;4229;4091;4302;4311;4312;4127 - false - - - true - true - Windows - - - vld.dll.dependency.x86.manifest - - - - - Full - Speed - true - NDEBUG;_USRDLL;WIN64;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions) - true - MultiThreaded - false - Fast - false - false - 4201;4229;4091;4302;4311;4312;4127 - false - - - true - true - true - Windows - - - vld.dll.dependency.x64.manifest - - - _UNICODE;UNICODE;WIN64;%(PreprocessorDefinitions) - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4adfd279-56c6-4b1d-ba9e-b815e81c1b17} - - - - - - \ No newline at end of file diff --git a/src/vld_vs12.vcxproj.filters b/src/vld_vs12.vcxproj.filters deleted file mode 100644 index 02ecff1d..00000000 --- a/src/vld_vs12.vcxproj.filters +++ /dev/null @@ -1,104 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - - \ No newline at end of file diff --git a/vld_vs11.sln b/vld_vs11.sln deleted file mode 100644 index ea4a3fc9..00000000 --- a/vld_vs11.sln +++ /dev/null @@ -1,490 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld_vs11.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics_vs11.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite_vs11.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic_vs11.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app_vs11.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" - ProjectSection(ProjectDependencies) = postProject - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "src\tests\mfc_dll\mfc_vs11.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "src\tests\mfc\vldmfc_vs11.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption_vs11.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest_vs11.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format_vs11.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main_vs11.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_unload", "src\tests\vld_unload\vld_unload_vs11.vcxproj", "{A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}" - ProjectSection(ProjectDependencies) = postProject - {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {50C94B05-8C3E-49ED-B2B9-5715EB624D14} - {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {33F98E06-F44C-4E22-9E16-4C20F8238A95} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll1", "src\tests\vld_dll1\vld_dll1_vs11.vcxproj", "{50C94B05-8C3E-49ED-B2B9-5715EB624D14}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_dll2\vld_dll2_vs11.vcxproj", "{33F98E06-F44C-4E22-9E16-4C20F8238A95}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_ComTest\ComTest_vs11.vcxproj", "{3719F504-3DF0-45F8-BC7A-4415804AC7C9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs11.vcxproj", "{BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}" - ProjectSection(ProjectDependencies) = postProject - {8C732490-DC1A-40C0-923F-1555B9141B80} = {8C732490-DC1A-40C0-923F-1555B9141B80} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 - Debug_StaticCrt|x64 = Debug_StaticCrt|x64 - Debug_VldRelease_StaticCrt|Win32 = Debug_VldRelease_StaticCrt|Win32 - Debug_VldRelease_StaticCrt|x64 = Debug_VldRelease_StaticCrt|x64 - Debug_VldRelease|Win32 = Debug_VldRelease|Win32 - Debug_VldRelease|x64 = Debug_VldRelease|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_StaticCrt|Win32 = Release_StaticCrt|Win32 - Release_StaticCrt|x64 = Release_StaticCrt|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Deploy.0 = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.ActiveCfg = Debug|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.Build.0 = Debug|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.ActiveCfg = Debug|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.Build.0 = Debug|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.ActiveCfg = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.Build.0 = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.ActiveCfg = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.Build.0 = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.ActiveCfg = Debug|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.Build.0 = Debug|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.ActiveCfg = Debug|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.Build.0 = Debug|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.ActiveCfg = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.Build.0 = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.ActiveCfg = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.Build.0 = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.ActiveCfg = Debug|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.Build.0 = Debug|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.ActiveCfg = Debug|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.Build.0 = Debug|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.ActiveCfg = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.Build.0 = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.ActiveCfg = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.Build.0 = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.ActiveCfg = Debug|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.Build.0 = Debug|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.ActiveCfg = Debug|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.Build.0 = Debug|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.ActiveCfg = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.Build.0 = Debug|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.ActiveCfg = Debug|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.Build.0 = Debug|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.ActiveCfg = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.Build.0 = Release|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.Build.0 = Debug|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.ActiveCfg = Debug|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.Build.0 = Debug|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.ActiveCfg = Release|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.Build.0 = Release|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.ActiveCfg = Release|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - EndGlobalSection -EndGlobal diff --git a/vld_vs11_wo_mfc.sln b/vld_vs11_wo_mfc.sln deleted file mode 100644 index c618ebc8..00000000 --- a/vld_vs11_wo_mfc.sln +++ /dev/null @@ -1,404 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld_vs11.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics_vs11.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite_vs11.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic_vs11.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app_vs11.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" - ProjectSection(ProjectDependencies) = postProject - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption_vs11.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest_vs11.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format_vs11.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main_vs11.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_unload", "src\tests\vld_unload\vld_unload_vs11.vcxproj", "{A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}" - ProjectSection(ProjectDependencies) = postProject - {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {50C94B05-8C3E-49ED-B2B9-5715EB624D14} - {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {33F98E06-F44C-4E22-9E16-4C20F8238A95} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll1", "src\tests\vld_dll1\vld_dll1_vs11.vcxproj", "{50C94B05-8C3E-49ED-B2B9-5715EB624D14}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_dll2\vld_dll2_vs11.vcxproj", "{33F98E06-F44C-4E22-9E16-4C20F8238A95}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs11.vcxproj", "{BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}" - ProjectSection(ProjectDependencies) = postProject - {8C732490-DC1A-40C0-923F-1555B9141B80} = {8C732490-DC1A-40C0-923F-1555B9141B80} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 - Debug_StaticCrt|x64 = Debug_StaticCrt|x64 - Debug_VldRelease_StaticCrt|Win32 = Debug_VldRelease_StaticCrt|Win32 - Debug_VldRelease_StaticCrt|x64 = Debug_VldRelease_StaticCrt|x64 - Debug_VldRelease|Win32 = Debug_VldRelease|Win32 - Debug_VldRelease|x64 = Debug_VldRelease|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_StaticCrt|Win32 = Release_StaticCrt|Win32 - Release_StaticCrt|x64 = Release_StaticCrt|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Deploy.0 = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.ActiveCfg = Debug|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.Build.0 = Debug|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.ActiveCfg = Debug|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.Build.0 = Debug|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.ActiveCfg = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.Build.0 = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.ActiveCfg = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.Build.0 = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.ActiveCfg = Debug|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.Build.0 = Debug|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.ActiveCfg = Debug|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.Build.0 = Debug|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.ActiveCfg = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.Build.0 = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.ActiveCfg = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.Build.0 = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.ActiveCfg = Debug|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.Build.0 = Debug|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.ActiveCfg = Debug|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.Build.0 = Debug|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.ActiveCfg = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.Build.0 = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.ActiveCfg = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.Build.0 = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.ActiveCfg = Debug|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.Build.0 = Debug|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.ActiveCfg = Debug|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.Build.0 = Debug|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.ActiveCfg = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.Build.0 = Debug|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.ActiveCfg = Debug|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.Build.0 = Debug|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.ActiveCfg = Release|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.Build.0 = Release|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.ActiveCfg = Release|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - EndGlobalSection -EndGlobal diff --git a/vld_vs12.sln b/vld_vs12.sln deleted file mode 100644 index 502db988..00000000 --- a/vld_vs12.sln +++ /dev/null @@ -1,492 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld_vs12.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_basics", "src\tests\basics\basics_vs12.vcxproj", "{0943354A-41E0-4215-878A-8D0FE758052C}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "src\tests\suite\testsuite_vs12.vcxproj", "{EE4A829C-5FD8-460B-8A90-B518B9BABB70}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic", "src\tests\dynamic_dll\dynamic_vs12.vcxproj", "{3AEA2AAF-3E9B-466F-B361-560B95AD88B4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_app", "src\tests\dynamic_app\dynamic_app_vs12.vcxproj", "{5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}" - ProjectSection(ProjectDependencies) = postProject - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {2178E5B2-1032-441F-A664-F3D8D1FD1913} - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_mfc", "src\tests\mfc_dll\mfc_vs12.vcxproj", "{2178E5B2-1032-441F-A664-F3D8D1FD1913}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vldmfc", "src\tests\mfc\vldmfc_vs12.vcxproj", "{A231973E-072A-428E-982E-5363ADD1CDE2}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corruption", "src\tests\corruption\corruption_vs12.vcxproj", "{87911ED6-84BC-4526-9654-A4FF4E0EDF52}" - ProjectSection(ProjectDependencies) = postProject - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dlls", "Dlls", "{281D5ACB-9ED2-496B-B19E-A75F4D4DA111}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtest", "lib\gtest\msvc\gtest_vs12.vcxproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format_vs12.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main_vs12.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_unload", "src\tests\vld_unload\vld_unload_vs12.vcxproj", "{A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}" - ProjectSection(ProjectDependencies) = postProject - {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {50C94B05-8C3E-49ED-B2B9-5715EB624D14} - {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {33F98E06-F44C-4E22-9E16-4C20F8238A95} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll1", "src\tests\vld_dll1\vld_dll1_vs12.vcxproj", "{50C94B05-8C3E-49ED-B2B9-5715EB624D14}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_dll2\vld_dll2_vs12.vcxproj", "{33F98E06-F44C-4E22-9E16-4C20F8238A95}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_ComTest\ComTest_vs12.vcxproj", "{3719F504-3DF0-45F8-BC7A-4415804AC7C9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs12.vcxproj", "{BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}" - ProjectSection(ProjectDependencies) = postProject - {8C732490-DC1A-40C0-923F-1555B9141B80} = {8C732490-DC1A-40C0-923F-1555B9141B80} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_StaticCrt|Win32 = Debug_StaticCrt|Win32 - Debug_StaticCrt|x64 = Debug_StaticCrt|x64 - Debug_VldRelease_StaticCrt|Win32 = Debug_VldRelease_StaticCrt|Win32 - Debug_VldRelease_StaticCrt|x64 = Debug_VldRelease_StaticCrt|x64 - Debug_VldRelease|Win32 = Debug_VldRelease|Win32 - Debug_VldRelease|x64 = Debug_VldRelease|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_StaticCrt|Win32 = Release_StaticCrt|Win32 - Release_StaticCrt|x64 = Release_StaticCrt|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_StaticCrt|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug_VldRelease|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.ActiveCfg = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|Win32.Build.0 = Debug|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.ActiveCfg = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Debug|x64.Build.0 = Debug|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release_StaticCrt|x64.Build.0 = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.ActiveCfg = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|Win32.Build.0 = Release|Win32 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.ActiveCfg = Release|x64 - {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}.Release|x64.Build.0 = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.ActiveCfg = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|Win32.Build.0 = Debug|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.ActiveCfg = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Debug|x64.Build.0 = Debug|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.ActiveCfg = Release|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|Win32.Build.0 = Release|Win32 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.ActiveCfg = Release|x64 - {0943354A-41E0-4215-878A-8D0FE758052C}.Release|x64.Build.0 = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_StaticCrt|x64.Deploy.0 = Debug_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|Win32.Build.0 = Debug|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.ActiveCfg = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Debug|x64.Build.0 = Debug|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.ActiveCfg = Release|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|Win32.Build.0 = Release|Win32 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.ActiveCfg = Release|x64 - {EE4A829C-5FD8-460B-8A90-B518B9BABB70}.Release|x64.Build.0 = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.ActiveCfg = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|Win32.Build.0 = Debug|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.ActiveCfg = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Debug|x64.Build.0 = Debug|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.ActiveCfg = Release|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|Win32.Build.0 = Release|Win32 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.ActiveCfg = Release|x64 - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4}.Release|x64.Build.0 = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.ActiveCfg = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|Win32.Build.0 = Debug|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.ActiveCfg = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Debug|x64.Build.0 = Debug|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.ActiveCfg = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|Win32.Build.0 = Release|Win32 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.ActiveCfg = Release|x64 - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA}.Release|x64.Build.0 = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.ActiveCfg = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|Win32.Build.0 = Debug|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.ActiveCfg = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Debug|x64.Build.0 = Debug|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.ActiveCfg = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|Win32.Build.0 = Release|Win32 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.ActiveCfg = Release|x64 - {2178E5B2-1032-441F-A664-F3D8D1FD1913}.Release|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug_VldRelease|x64.Build.0 = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|Win32.Build.0 = Debug|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.ActiveCfg = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Debug|x64.Build.0 = Debug|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.ActiveCfg = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|Win32.Build.0 = Release|Win32 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.ActiveCfg = Release|x64 - {A231973E-072A-428E-982E-5363ADD1CDE2}.Release|x64.Build.0 = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.ActiveCfg = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|Win32.Build.0 = Debug|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.ActiveCfg = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Debug|x64.Build.0 = Debug|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.ActiveCfg = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|Win32.Build.0 = Release|Win32 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.ActiveCfg = Release|x64 - {87911ED6-84BC-4526-9654-A4FF4E0EDF52}.Release|x64.Build.0 = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug_VldRelease|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|Win32.Build.0 = Debug|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.ActiveCfg = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug|x64.Build.0 = Debug|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.ActiveCfg = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|Win32.Build.0 = Release|Win32 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.ActiveCfg = Release|x64 - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_StaticCrt|x64.Build.0 = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug_VldRelease|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.ActiveCfg = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|Win32.Build.0 = Debug|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.ActiveCfg = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Debug|x64.Build.0 = Debug|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release_StaticCrt|x64.Build.0 = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.ActiveCfg = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|Win32.Build.0 = Release|Win32 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.ActiveCfg = Release|x64 - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}.Release|x64.Build.0 = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.ActiveCfg = Debug|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|Win32.Build.0 = Debug|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.ActiveCfg = Debug|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Debug|x64.Build.0 = Debug|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.ActiveCfg = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|Win32.Build.0 = Release|Win32 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.ActiveCfg = Release|x64 - {8C732490-DC1A-40C0-923F-1555B9141B80}.Release|x64.Build.0 = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.ActiveCfg = Debug|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|Win32.Build.0 = Debug|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.ActiveCfg = Debug|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Debug|x64.Build.0 = Debug|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.ActiveCfg = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|Win32.Build.0 = Release|Win32 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.ActiveCfg = Release|x64 - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}.Release|x64.Build.0 = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.ActiveCfg = Debug|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|Win32.Build.0 = Debug|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.ActiveCfg = Debug|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Debug|x64.Build.0 = Debug|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.ActiveCfg = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|Win32.Build.0 = Release|Win32 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.ActiveCfg = Release|x64 - {50C94B05-8C3E-49ED-B2B9-5715EB624D14}.Release|x64.Build.0 = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.ActiveCfg = Debug|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|Win32.Build.0 = Debug|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.ActiveCfg = Debug|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Debug|x64.Build.0 = Debug|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.ActiveCfg = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|Win32.Build.0 = Release|Win32 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.ActiveCfg = Release|x64 - {33F98E06-F44C-4E22-9E16-4C20F8238A95}.Release|x64.Build.0 = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|Win32.Build.0 = Debug|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.ActiveCfg = Debug|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Debug|x64.Build.0 = Debug|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.ActiveCfg = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|Win32.Build.0 = Release|Win32 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.ActiveCfg = Release|x64 - {3719F504-3DF0-45F8-BC7A-4415804AC7C9}.Release|x64.Build.0 = Release|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.ActiveCfg = Debug_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|Win32.Build.0 = Debug_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.ActiveCfg = Debug_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_StaticCrt|x64.Build.0 = Debug_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.ActiveCfg = Debug(Release)_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|Win32.Build.0 = Debug(Release)_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.ActiveCfg = Debug(Release)_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease_StaticCrt|x64.Build.0 = Debug(Release)_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.ActiveCfg = Debug(Release)|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|Win32.Build.0 = Debug(Release)|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.ActiveCfg = Debug(Release)|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug_VldRelease|x64.Build.0 = Debug(Release)|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|Win32.Build.0 = Debug|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.ActiveCfg = Debug|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Debug|x64.Build.0 = Debug|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.ActiveCfg = Release_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|Win32.Build.0 = Release_StaticCrt|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.ActiveCfg = Release_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release_StaticCrt|x64.Build.0 = Release_StaticCrt|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.ActiveCfg = Release|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|Win32.Build.0 = Release|Win32 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.ActiveCfg = Release|x64 - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {0943354A-41E0-4215-878A-8D0FE758052C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {EE4A829C-5FD8-460B-8A90-B518B9BABB70} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {3AEA2AAF-3E9B-466F-B361-560B95AD88B4} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {5C25E1C8-00CB-4E0A-9BEC-952F0A6E5DCA} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {2178E5B2-1032-441F-A664-F3D8D1FD1913} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {A231973E-072A-428E-982E-5363ADD1CDE2} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {87911ED6-84BC-4526-9654-A4FF4E0EDF52} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {4ADFD279-56C6-4B1D-BA9E-B815E81C1B17} = {9FD1911C-3FAB-48DE-BE31-9F2C7B1EB58C} - {8C732490-DC1A-40C0-923F-1555B9141B80} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {50C94B05-8C3E-49ED-B2B9-5715EB624D14} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {33F98E06-F44C-4E22-9E16-4C20F8238A95} = {281D5ACB-9ED2-496B-B19E-A75F4D4DA111} - {3719F504-3DF0-45F8-BC7A-4415804AC7C9} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - {BB99EDE9-D039-4169-B26B-6BFD93C6AF8E} = {9F9CFA3A-F154-4069-89E3-19BDC6BD3A7D} - EndGlobalSection -EndGlobal From b6bef88a8e908e2936e001cbe3109bfb51b5cff8 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 6 Nov 2015 10:51:20 +0300 Subject: [PATCH 278/321] StaticCrt test fixed for VS2008-2012 --- src/callstack.cpp | 4 ++- src/tests/suite/testsuite.cpp | 16 ++++++++++++ src/tests/vld_unload/vld_unload.cpp | 40 +++++++++++++++-------------- 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index 30a46274..98558fed 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -594,12 +594,14 @@ bool CallStack::isCrtStartupModule( const PWSTR filename ) const endWith(filename, len, L"\\crt\\crtw32\\startup\\stdenvp.c") || endWith(filename, len, L"\\crt\\crtw32\\startup\\tidtable.c") || endWith(filename, len, L"\\crt\\crtw32\\mbstring\\mbctype.c") || - // VS2010 + // VS2012 and bellow endWith(filename, len, L"\\crt\\src\\crt0dat.c") || //_cinit() + endWith(filename, len, L"\\crt\\src\\onexit.c") || //__onexitinit() endWith(filename, len, L"\\crt\\src\\stdargv.c") || //_wsetargv() endWith(filename, len, L"\\crt\\src\\stdenvp.c") || //_wsetenvp() endWith(filename, len, L"\\crt\\src\\ioinit.c") || //_ioinit() endWith(filename, len, L"\\crt\\src\\tidtable.c") || //_mtinit() + endWith(filename, len, L"\\crt\\src\\mbctype.c") || //__initmbctable() // default (false); } diff --git a/src/tests/suite/testsuite.cpp b/src/tests/suite/testsuite.cpp index 4635def2..81e63e0e 100644 --- a/src/tests/suite/testsuite.cpp +++ b/src/tests/suite/testsuite.cpp @@ -52,9 +52,17 @@ enum action_e { // Name of the debug C Runtime Library DLL on this system #ifdef _DEBUG #if _MSC_VER == 1400 // VS 2005 +#ifdef _DLL #define CRTDLLNAME _T("msvcr80d.dll") +#else +#define CRTDLLNAME _T("msvcrt.dll") +#endif #elif _MSC_VER == 1500 // VS 2008 +#ifdef _DLL #define CRTDLLNAME _T("msvcr90d.dll") +#else +#define CRTDLLNAME _T("msvcrt.dll") +#endif #elif _MSC_VER == 1600 // VS 2010 #define CRTDLLNAME _T("msvcr100d.dll") #elif _MSC_VER == 1700 // VS 2012 @@ -68,9 +76,17 @@ enum action_e { #endif #else #if _MSC_VER == 1400 // VS 2005 +#ifdef _DLL #define CRTDLLNAME _T("msvcr80.dll") +#else +#define CRTDLLNAME _T("msvcrt.dll") +#endif #elif _MSC_VER == 1500 // VS 2008 +#ifdef _DLL #define CRTDLLNAME _T("msvcr90.dll") +#else +#define CRTDLLNAME _T("msvcrt.dll") +#endif #elif _MSC_VER == 1600 // VS 2010 #define CRTDLLNAME _T("msvcr100.dll") #elif _MSC_VER == 1700 // VS 2012 diff --git a/src/tests/vld_unload/vld_unload.cpp b/src/tests/vld_unload/vld_unload.cpp index 9b2a8f85..eb322724 100644 --- a/src/tests/vld_unload/vld_unload.cpp +++ b/src/tests/vld_unload/vld_unload.cpp @@ -46,19 +46,17 @@ TEST(TestUnloadDlls, Sequence1) ASSERT_EQ(NULL, GetModuleHandle(sVld_dll)); HMODULE hModule1 = ::LoadLibrary(_T("vld_dll1.dll")); int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + EXPECT_EQ(1, w); ::FreeLibrary(hModule1); // vld is unloaded here and reports the memory leak int x = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks + EXPECT_EQ(-1, x); HMODULE hModule2 = ::LoadLibrary(_T("vld_dll2.dll")); int y = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + EXPECT_EQ(1, y); ::FreeLibrary(hModule2); // vld is unloaded here and reports the memory leak int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks - - assert(w == 1 && x == -1 && y == 1 && z == -1); - ASSERT_EQ(1, w); - ASSERT_EQ(-1, x); - ASSERT_EQ(1, y); - ASSERT_EQ(-1, z); + EXPECT_EQ(-1, z); } TEST(TestUnloadDlls, Sequence2) @@ -66,18 +64,20 @@ TEST(TestUnloadDlls, Sequence2) ASSERT_EQ(NULL, GetModuleHandle(sVld_dll)); HMODULE hModule3 = ::LoadLibrary(_T("vld_dll1.dll")); int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + EXPECT_EQ(1, w); HMODULE hModule4 = ::LoadLibrary(_T("vld_dll2.dll")); int x = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks + EXPECT_EQ(2, x); ::FreeLibrary(hModule4); // vld is *not* unloaded here - int y = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks + int y = VLDGetLeaksCount(); +#if _MSC_VER <= 1600 && !defined(_DLL) // VS 2010 and bellow + EXPECT_EQ(1, y); // vld is still loaded and counts 1 memory leaks +#else + EXPECT_EQ(2, y); // vld is still loaded and counts 2 memory leaks +#endif ::FreeLibrary(hModule3); // vld is unloaded here and reports 2 memory leaks int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks - - assert(w == 1 && x == 2 && y == 2 && z == -1); - ASSERT_EQ(1, w); - ASSERT_EQ(2, x); - ASSERT_EQ(2, y); - ASSERT_EQ(-1, z); + EXPECT_EQ(-1, z); } TEST(TestUnloadDlls, Sequence3) @@ -85,18 +85,20 @@ TEST(TestUnloadDlls, Sequence3) ASSERT_EQ(NULL, GetModuleHandle(sVld_dll)); HMODULE hModule5 = ::LoadLibrary(_T("vld_dll1.dll")); int w = VLDGetLeaksCount(); // vld is loaded and counts 1 memory leak + EXPECT_EQ(1, w); HMODULE hModule6 = ::LoadLibrary(_T("vld_dll2.dll")); int x = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks + EXPECT_EQ(2, x); ::FreeLibrary(hModule5); // vld is *not* unloaded here int y = VLDGetLeaksCount(); // vld is still loaded and counts 2 memory leaks +#if _MSC_VER <= 1600 && !defined(_DLL) // VS 2010 and bellow + EXPECT_EQ(1, y); // vld is still loaded and counts 1 memory leaks +#else + EXPECT_EQ(2, y); // vld is still loaded and counts 2 memory leaks +#endif ::FreeLibrary(hModule6); // vld is unloaded here and reports 2 memory leaks int z = VLDGetLeaksCount(); // vld is unloaded and cannot count any memory leaks - - assert(w == 1 && x == 2 && y == 2 && z == -1); - ASSERT_EQ(1, w); - ASSERT_EQ(2, x); - ASSERT_EQ(2, y); - ASSERT_EQ(-1, z); + EXPECT_EQ(-1, z); } TEST(TestUnloadDlls, Sequence4) From 984e7665f5fa36361e916779dc558952eb335b5b Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 6 Nov 2015 20:02:27 +0300 Subject: [PATCH 279/321] Disable VS2010 x64 configuration --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 723c987b..2aae93ea 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,10 +43,10 @@ build_script: - ps: | Write-Output "Configuration: $env:CONFIGURATION" Write-Output "Platform: $env:PLATFORM" - <#if (($env:Toolset -eq "v100") -and ($env:PLATFORM -eq "x64")) + if (($env:Toolset -eq "v100") -and ($env:PLATFORM -eq "x64")) { return - }#> + } & .\change_toolset.ps1 $env:Toolset msbuild /v:m /p:"Configuration=$env:CONFIGURATION" /p:Platform="$env:PLATFORM" "$env:Solution" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" From 43e659e09a76ac455a2065c7e242fdf2f9577f43 Mon Sep 17 00:00:00 2001 From: ioannis Date: Sat, 7 Nov 2015 13:59:01 +0200 Subject: [PATCH 280/321] Fix #define PRINTHOOKCALLS --- src/vld_hooks.cpp | 100 +++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 7459a3e6..79e38726 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -109,7 +109,7 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, size_t size) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -150,7 +150,7 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -191,7 +191,7 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool de void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntime, size_t size) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t* tls = g_vld.getTls(); @@ -238,7 +238,7 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, size_t size) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -286,7 +286,7 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, size_t size) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -313,7 +313,7 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, char* VisualLeakDetector::__strdup( _strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src ) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -340,7 +340,7 @@ char* VisualLeakDetector::__strdup( _strdup_t pstrdup, context_t& context, bool wchar_t* VisualLeakDetector::__wcsdup( _wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src ) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -382,7 +382,7 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t size_t size, size_t alignment) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -424,7 +424,7 @@ void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmal size_t size, size_t alignment, size_t offset) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -472,7 +472,7 @@ void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, size_t alignment) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -521,7 +521,7 @@ void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t p size_t offset) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -572,7 +572,7 @@ void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, size_t alignment) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -624,7 +624,7 @@ void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t size_t offset) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -680,7 +680,7 @@ void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_ int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -737,7 +737,7 @@ void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_db int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -796,7 +796,7 @@ void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_reall int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -856,7 +856,7 @@ void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_ int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -918,7 +918,7 @@ void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_rec int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -981,7 +981,7 @@ void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recallo int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -1047,7 +1047,7 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -1102,7 +1102,7 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -1135,7 +1135,7 @@ char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -1168,7 +1168,7 @@ wchar_t* VisualLeakDetector::__wcsdup_dbg (_wcsdup_dbg_t p_wcsdup_dbg, int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -1223,7 +1223,7 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -1277,7 +1277,7 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -1324,7 +1324,7 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -1378,7 +1378,7 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -1437,7 +1437,7 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, int line) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif tls_t *tls = g_vld.getTls(); @@ -1471,7 +1471,7 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, HANDLE VisualLeakDetector::_GetProcessHeap() { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif // Get the process heap. HANDLE heap = m_GetProcessHeap(); @@ -1504,7 +1504,7 @@ HANDLE VisualLeakDetector::_GetProcessHeap() HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif // Create the heap. HANDLE heap = m_HeapCreate(options, initsize, maxsize); @@ -1533,7 +1533,7 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif // After this heap is destroyed, the heap's address space will be unmapped // from the process's address space. So, we'd better generate a leak report @@ -1566,7 +1566,7 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) { #ifdef PRINTHOOKCALLS2 - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif // Allocate the block. LPVOID block = RtlAllocateHeap(heap, flags, size); @@ -1614,7 +1614,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) { #ifdef PRINTHOOKCALLS2 - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif // Allocate the block. LPVOID block = HeapAlloc(heap, flags, size); @@ -1685,7 +1685,7 @@ void VisualLeakDetector::AllocateHeap (tls_t* tls, blockinfo_t* &pblockInfo) BYTE VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) { #ifdef PRINTHOOKCALLS2 - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif BYTE status; @@ -1708,7 +1708,7 @@ BYTE VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) { #ifdef PRINTHOOKCALLS2 - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif BOOL status; @@ -1750,7 +1750,7 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif // Reallocate the block. @@ -1801,7 +1801,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif // Reallocate the block. @@ -1851,7 +1851,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S void VisualLeakDetector::ReAllocateHeap (tls_t *tls, blockinfo_t* &pblockInfo) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif bool crtalloc = (tls->flags & VLD_TLS_DEBUGCRTALLOC) ? true : false; @@ -1906,7 +1906,7 @@ void VisualLeakDetector::ReAllocateHeap (tls_t *tls, blockinfo_t* &pblockInfo) HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif static CoGetMalloc_t pCoGetMalloc = NULL; @@ -1962,7 +1962,7 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; @@ -2011,7 +2011,7 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; @@ -2061,7 +2061,7 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) ULONG VisualLeakDetector::AddRef () { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif assert(m_iMalloc != NULL); if (m_iMalloc) { @@ -2087,7 +2087,7 @@ ULONG VisualLeakDetector::AddRef () LPVOID VisualLeakDetector::Alloc (_In_ SIZE_T size) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif LPVOID block; context_t context; @@ -2126,7 +2126,7 @@ LPVOID VisualLeakDetector::Alloc (_In_ SIZE_T size) INT VisualLeakDetector::DidAlloc (_In_opt_ LPVOID mem) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif assert(m_iMalloc != NULL); return (m_iMalloc) ? m_iMalloc->DidAlloc(mem) : 0; @@ -2144,7 +2144,7 @@ INT VisualLeakDetector::DidAlloc (_In_opt_ LPVOID mem) VOID VisualLeakDetector::Free (_In_opt_ LPVOID mem) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif assert(m_iMalloc != NULL); if (m_iMalloc) m_iMalloc->Free(mem); @@ -2163,7 +2163,7 @@ VOID VisualLeakDetector::Free (_In_opt_ LPVOID mem) SIZE_T VisualLeakDetector::GetSize (_In_opt_ LPVOID mem) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif assert(m_iMalloc != NULL); return (m_iMalloc) ? m_iMalloc->GetSize(mem) : 0; @@ -2179,7 +2179,7 @@ SIZE_T VisualLeakDetector::GetSize (_In_opt_ LPVOID mem) VOID VisualLeakDetector::HeapMinimize () { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif assert(m_iMalloc != NULL); if (m_iMalloc) m_iMalloc->HeapMinimize(); @@ -2202,7 +2202,7 @@ VOID VisualLeakDetector::HeapMinimize () HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif assert(m_iMalloc != NULL); return (m_iMalloc) ? m_iMalloc->QueryInterface(iid, object) : E_UNEXPECTED; @@ -2225,7 +2225,7 @@ HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) LPVOID VisualLeakDetector::Realloc (_In_opt_ LPVOID mem, _In_ SIZE_T size) { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif LPVOID block; context_t context; @@ -2262,7 +2262,7 @@ LPVOID VisualLeakDetector::Realloc (_In_opt_ LPVOID mem, _In_ SIZE_T size) ULONG VisualLeakDetector::Release () { #ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__ "\n")); + DbgReport(_T(__FUNCTION__) _T( "\n")); #endif assert(m_iMalloc != NULL); ULONG nCount = 0; From f28f7f421d02d276354bce4a12fb957de7ca6b36 Mon Sep 17 00:00:00 2001 From: ioannis Date: Sat, 7 Nov 2015 14:16:46 +0200 Subject: [PATCH 281/321] Improve beginWith and endWith to test for same size strings --- src/callstack.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index 98558fed..b95530ba 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -43,7 +43,7 @@ template bool beginWith(const LPCWSTR filename, size_t len, wchar_t const (&substr)[N]) { size_t count = N - 1; - return ((len > count) && wcsncmp(filename, substr, count) == 0); + return ((len >= count) && wcsncmp(filename, substr, count) == 0); } // Helper function to compare the end of a string with a substring @@ -52,7 +52,7 @@ template bool endWith(const LPCWSTR filename, size_t len, wchar_t const (&substr)[N]) { size_t count = N - 1; - return ((len > count) && wcsncmp(filename + len - count, substr, count) == 0); + return ((len >= count) && wcsncmp(filename + len - count, substr, count) == 0); } // Constructor - Initializes the CallStack with an initial size of zero and one From d1c9f273c5b0d67b5ba905fa19fc6b1dab8d6159 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Wed, 11 Nov 2015 23:26:22 +0300 Subject: [PATCH 282/321] Added force parameter to change_toolset.ps1 --- change_toolset.ps1 | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/change_toolset.ps1 b/change_toolset.ps1 index 2574baf0..7dad60a5 100644 --- a/change_toolset.ps1 +++ b/change_toolset.ps1 @@ -1,11 +1,12 @@ Param( [Parameter(Mandatory=$True,Position=1)] - [string]$toolset + [string]$toolset, + [switch]$force ) $files = Get-ChildItem -path . -filter *.vcxproj -recurse foreach ($file in $files) { - if (($file.basename -eq "vld") -or ($file.basename -eq "format")) + if (!$force.IsPresent -and (($file.basename -eq "vld") -or ($file.basename -eq "format"))) { "Skip $($file.name)" continue @@ -24,3 +25,21 @@ foreach ($file in $files) { "Toolset not set for $($file.name)" } } + +$commonProps = ".\src\tests\Common.props" +if ($force.IsPresent -and (Test-Path $commonProps)) +{ + $content = gc $commonProps + $regex = [regex]"(v[\d\w_]+)<\/VldToolset>" + $oldtoolset = $regex.matches($content) + if ($oldtoolset.groups.count -ge 1) + { + " Common.props ($($oldtoolset.groups[1].value) - $toolset)" + $content = $content -replace "(v[\d\w_]+)<\/VldToolset>","$toolset" + $content | sc $commonProps + } + else + { + "Toolset not set for $commonProps" + } +} \ No newline at end of file From 0c74f246d58793b2aa1ddd0fc5dd264f5a356d55 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Wed, 11 Nov 2015 23:26:56 +0300 Subject: [PATCH 283/321] Installer fixed --- setup/WizSmallImage.bmp | Bin 0 -> 4158 bytes setup/vld-setup.iss | 12 +++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 setup/WizSmallImage.bmp diff --git a/setup/WizSmallImage.bmp b/setup/WizSmallImage.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c9191cb56e1eeeb627c51fdc84f2a200969afad1 GIT binary patch literal 4158 zcmeH}OGuSL6vw|?R+i=5Ywx$c?d79Pn~mPwv?z%Pf*@MAt6i-kT9uJzDbZsSk&B>B zK|w7NAuvt7P(lz_OQ?h^n1(NsPV@fG%)OJ=qLl-4=RE$ubLN|G__$To712P9vaBE| zU{<-Bkswch}<;y64#dj_7LKL@Q> zD&b8{CA_?Nf!T3rt%)-~4sC3vXCj9u}BBA`IQZ8GJs)?-Vp>L=cXN9cs30@V8yFW*skT#J*}ZKX$Qg<~Al{V2_f zMAlP^6|rrlh0Ab2*)~VZ|xW@;j%PmqA3-`%gr6Zf^ zc44X?y!|BtL(eCCAHf4iXW0o;X6vu@>8wO7ycLSZdjp zN^p5NWNER3MZ`T9;(x#l94~9WU$_UdcVRA9_7iCxM_O#^v{?21#2^+UdrHoHBN0TY zb$06gDS@t7VgXK)Pe^lotjjkPMCfsr3@`# z>xwXEqF#=Wd?DH$Ld;6%)>?U=lg^=2@j*PUL9@?ka%8I{LvFfY8YjWMEIy5mqJDHg z({B;w@CU~(qW_X$jyICKpgBmrl*g2xtMd51=#W@LPKJv`Ae7ks!nomdhy}FCR}Z%+ gjl+ Date: Fri, 13 Nov 2015 01:00:38 +0300 Subject: [PATCH 284/321] Updated Change Log --- CHANGES.txt | 61 ++++++++++++++++++++++++++--------- src/tests/suite/testsuite.cpp | 5 +-- 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index f280f419..6441ccdc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,37 @@ -Visual Leak Detector (VLD) Version 2.4.0 +Visual Leak Detector (VLD) Version 2.5.0 + - Change Log / Release Notes +2.5 (2015) +---------------------------- + Enhancements: + + VS2015 support added. + + Windows 10 support added. + + Support MFC 12 MBCS (thanks to mnissl). + + VLD config through env. vars (thanks to akaStiX). + + Support detection DllMain allocations (thanks to ioannis-e). + + Add option to skip reporting crt startup allocations as memory leaks (thanks to ioannis-e). + + Improve the vld.ini searching from additional locations (thanks to ioannis-e). + + Changed implementation of FastCallStack::getStackTrace for 32-bit code. + + Bugs Fixed: + + Fix #9519, #9859, #10544, use LoaderLock to serialize any calls which load additional libraries or require access to the Loader Lock (thanks to ioannis-e). + + Fix #6359, #10553, fix crashes and failure to register COM dlls where Visual Leak Detector is unloaded before IMalloc interface is released (thanks to ioannis-e). + + Fix #10548, vld.ini search path (thanks to ioannis-e). + + Fix #10587, Visual Leak Detector reporting strange leaks in CRT module of VC++ (thanks to ioannis-e). + + Fix #10588, false positives from CRT in VS2013 with /MTd (thanks to ioannis-e). + + Deadlock fixed with StackWalkMethod=safe. + +2.4RC2 (07 April 2014) +---------------------------- + Enhancements: + + VLD will display last internal frame. + + Installer also add path for static library. + + Bugs Fixed: + + Internal memory leak fixed. + 2.4RC (23 March 2014) ---------------------------- Enhancements: @@ -29,7 +58,7 @@ Visual Leak Detector (VLD) Version 2.4.0 ---------------------------- Enhancements: + New option VLD_OPT_RELEASE_CRT_RUNTIME added. Useful only with define VLD_FORCE_ENABLE. - + Bugs Fixed: + Memory leaks with static linking fixed finally. @@ -68,7 +97,7 @@ Visual Leak Detector (VLD) Version 2.4.0 + Adding Heap Validation. + _aligned... functions and _recalloc support added. + Memory leaks additional statistic added. - + Bugs Fixed: + Issue fixed with loading wrong version of dbghelp.dll on Windows XP and bellow. + VLDReportLeaks with aggregate duplicate links fixed. @@ -84,13 +113,13 @@ Visual Leak Detector (VLD) Version 2.4.0 2.1 (26 March 2011) ---------------------------- Enhancements: - + New functions added: VLDGlobalDisable, VLDGlobalEnable, VLDGetOptions, + + New functions added: VLDGlobalDisable, VLDGlobalEnable, VLDGetOptions, VLDGetReportFilename, VLDSetOptions, VLDSetModulesList, VLDGetModulesList, VLDResolveCallstacks (see vld.h). + Option VLD_OPT_SKIP_HEAPFREE_LEAKS added. + Hash for each leak added + Supported loading symbols from Visual Studio symbol cache directory - + Bugs Fixed: + Improved LdrLoadDll, GetProcAddress hooking on Windows 7. + "HMODULE not founded" bug fixed. @@ -101,13 +130,13 @@ Visual Leak Detector (VLD) Version 2.4.0 2.1 (26 March 2011) ---------------------------- Enhancements: - + New functions added: VLDGlobalDisable, VLDGlobalEnable, VLDGetOptions, + + New functions added: VLDGlobalDisable, VLDGlobalEnable, VLDGetOptions, VLDGetReportFilename, VLDSetOptions, VLDSetModulesList, VLDGetModulesList, VLDResolveCallstacks (see vld.h). + Option VLD_OPT_SKIP_HEAPFREE_LEAKS added. + Hash for each leak added + Supported loading symbols from Visual Studio symbol cache directory - + Bugs Fixed: + Improved LdrLoadDll, GetProcAddress hooking on Windows 7. + "HMODULE not founded" bug fixed. @@ -120,7 +149,7 @@ Visual Leak Detector (VLD) Version 2.4.0 Enhancements: + Added new commands: VLDReportLeaks, VLDRefreshModules, VLDEnableModule, VLDDisableModule, VLDSetReportOptions (see vld.h). - + Bugs Fixed: + Problems with MSVC 2008 SP1 fixed. Thanks to Laurent Lessieux for contributing this patch. @@ -128,7 +157,7 @@ Visual Leak Detector (VLD) Version 2.4.0 ---------------------------- Enhancements: + Renamed vld dll files. - + Bugs Fixed: + Problem with MSVC 2010 Unicode library fixed. @@ -167,7 +196,7 @@ Visual Leak Detector (VLD) Version 2.4.0 + In multithreaded programs, if the main thread terminates before other threads in the process, then Visual Leak Detector may cause an access violation while generating the memory leak report. - + Known Bugs/Restrictions: + Memory allocations made through calls to functions loaded from a DLL using delayed loading may not be detected. @@ -184,13 +213,13 @@ Visual Leak Detector (VLD) Version 2.4.0 than one copy of the C Runtime DLL into a process at the same time is probably a bad idea to begin with). - + 1.9e beta (16 November 2006) ---------------------------- New Features/Enhancements: + Added a master on/off switch configuration option to vld.ini that can be used to completely disable Visual Leak Detector. - + Bugs Fixed: + Numerous deadlock situations. The multithread synchronization scheme has been completely re-written which should make deadlocks in VLD much less @@ -207,7 +236,7 @@ Visual Leak Detector (VLD) Version 2.4.0 + The copy of vld.ini installed in VLD's installation directory overrides any other copies of vld.ini that are created, even copies placed in the working directory of the program being debugged. - + Known Bugs/Restrictions: + Memory allocations made through calls to functions loaded from a DLL using delayed loading may not be detected. @@ -220,7 +249,7 @@ Visual Leak Detector (VLD) Version 2.4.0 than one copy of the C Runtime DLL into a process at the same time is probably a bad idea to begin with). - + 1.9d beta (12 November 2006) ---------------------------- Bugs Fixed: @@ -255,7 +284,7 @@ Visual Leak Detector (VLD) Version 2.4.0 Support has been added, through a new configuration option, to slow down the report output for older versions of Visual Studio that have trouble when it is written too quickly. - + Bugs Fixed: + All known compatibilities with Visual Studio 2005 have been eliminated. diff --git a/src/tests/suite/testsuite.cpp b/src/tests/suite/testsuite.cpp index 81e63e0e..c91b5053 100644 --- a/src/tests/suite/testsuite.cpp +++ b/src/tests/suite/testsuite.cpp @@ -100,8 +100,6 @@ enum action_e { #endif #endif -//#define FASTSTACKWALK - static int MAXALLOC = 0; // Maximum number of allocations of each type to perform, per thread static int NUMTHREADS = 0; // Number of threads to run simultaneously static int MAXBLOCKS = 0; // Total maximum number of allocations, per thread @@ -410,6 +408,7 @@ void RunTestSuite() MAXALLOC = 10; NUMTHREADS = 15; } + _ASSERT(NUMTHREADS <= MAXIMUM_WAIT_OBJECTS); MAXBLOCKS = (MAXALLOC * numactions); threadcontext_t* contexts = new threadcontext_t[NUMTHREADS]; @@ -471,6 +470,8 @@ void RunTestSuite() TEST(TestSuit, MultiThread) { + leaks_count = 0; + VLDMarkAllLeaksAsReported(); RunTestSuite(); int leaks = static_cast(VLDGetLeaksCount()); From 843803a8608535ffb3d6557512bfdcb9c9492e3f Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 13 Nov 2015 01:36:56 +0300 Subject: [PATCH 285/321] Also run tests for VldStackWalkMethod: fast --- appveyor.yml | 35 +++++++++++++++++++++++++++++------ src/tests/suite/testsuite.cpp | 3 +++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2aae93ea..00a1dc91 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,22 +8,45 @@ branches: os: Visual Studio 2015 environment: - VldStackWalkMethod: safe GTEST_REPEAT: 1 matrix: - - Toolset: v90 + - VldStackWalkMethod: safe + Toolset: v90 Solution: vld_vs14_wo_mfc.sln GTEST_FILTER: -*.Mfc* - - Toolset: v100 + - VldStackWalkMethod: safe + Toolset: v100 Solution: vld_vs14_wo_mfc.sln GTEST_FILTER: -*.Mfc* - - Toolset: v110 + - VldStackWalkMethod: safe + Toolset: v110 Solution: vld_vs14_wo_mfc.sln GTEST_FILTER: -*.Mfc* - - Toolset: v120_xp + - VldStackWalkMethod: safe + Toolset: v120_xp Solution: vld_vs14.sln - - Toolset: v140_xp + - VldStackWalkMethod: safe + Toolset: v140_xp + Solution: vld_vs14.sln + + - VldStackWalkMethod: fast + Toolset: v90 + Solution: vld_vs14_wo_mfc.sln + GTEST_FILTER: -*.Mfc* + - VldStackWalkMethod: fast + Toolset: v100 + Solution: vld_vs14_wo_mfc.sln + GTEST_FILTER: -*.Mfc* + - VldStackWalkMethod: fast + Toolset: v110 + Solution: vld_vs14_wo_mfc.sln + GTEST_FILTER: -*.Mfc* + - VldStackWalkMethod: fast + Toolset: v120_xp + Solution: vld_vs14.sln + - VldStackWalkMethod: fast + Toolset: v140_xp Solution: vld_vs14.sln platform: diff --git a/src/tests/suite/testsuite.cpp b/src/tests/suite/testsuite.cpp index c91b5053..ede70168 100644 --- a/src/tests/suite/testsuite.cpp +++ b/src/tests/suite/testsuite.cpp @@ -237,6 +237,7 @@ VOID allocateblock (action_e action, SIZE_T size) default: assert(FALSE); } + assert(*pblock != NULL); counts[action]++; total_allocs++; @@ -475,6 +476,8 @@ TEST(TestSuit, MultiThread) VLDMarkAllLeaksAsReported(); RunTestSuite(); int leaks = static_cast(VLDGetLeaksCount()); + if (leaks_count != leaks) + VLDReportLeaks(); ASSERT_EQ(leaks_count, leaks); } From f7838926fc044a61be13f2c98428c90785d1585a Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 13 Nov 2015 01:58:56 +0300 Subject: [PATCH 286/321] Report leaks to std output --- src/tests/dynamic_app/dynamic_app.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/dynamic_app/dynamic_app.cpp b/src/tests/dynamic_app/dynamic_app.cpp index 8784291d..ffdb0bec 100644 --- a/src/tests/dynamic_app/dynamic_app.cpp +++ b/src/tests/dynamic_app/dynamic_app.cpp @@ -102,7 +102,7 @@ TEST(Dynamic, DuplicateLeaks) int __cdecl ReportHook(int /*reportHook*/, wchar_t *message, int* /*returnValue*/) { OutputDebugString(message); - return 1; + return 0; } int main(int argc, char **argv) { From 3647f971d01af6f561a20d3bc1381d2dce22864a Mon Sep 17 00:00:00 2001 From: ioannis Date: Wed, 11 Nov 2015 00:53:41 +0200 Subject: [PATCH 287/321] Document special case in vld_unload test --- src/tests/vld_main/vld_main.cpp | 5 +++-- src/tests/vld_unload/vld_unload.cpp | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/tests/vld_main/vld_main.cpp b/src/tests/vld_main/vld_main.cpp index 4ad54cf3..ad0161ce 100644 --- a/src/tests/vld_main/vld_main.cpp +++ b/src/tests/vld_main/vld_main.cpp @@ -48,8 +48,9 @@ int Test() // including a leak for ml which has not been freed yet. ml will be freed after // _tmain exits but before VLDReportLeaks() is called internally by VLD and // therefore correctly report 8 leaks. - // VLDReportLeaks(); // at this point should report 9 leaks; - return VLDGetLeaksCount(); + int leaks = VLDGetLeaksCount(); + VLDReportLeaks(); // at this point should report 9 leaks; + return leaks; } int _tmain(int argc, _TCHAR* argv[]) diff --git a/src/tests/vld_unload/vld_unload.cpp b/src/tests/vld_unload/vld_unload.cpp index eb322724..0bb99dac 100644 --- a/src/tests/vld_unload/vld_unload.cpp +++ b/src/tests/vld_unload/vld_unload.cpp @@ -71,6 +71,10 @@ TEST(TestUnloadDlls, Sequence2) ::FreeLibrary(hModule4); // vld is *not* unloaded here int y = VLDGetLeaksCount(); #if _MSC_VER <= 1600 && !defined(_DLL) // VS 2010 and bellow + // The reason for reporting 1 leak at this point is that the vld_dll1 module build with Date: Wed, 11 Nov 2015 00:58:00 +0200 Subject: [PATCH 288/321] Enable capturing vector_new... in msvcrtPatch Skip stack trace for frames internal to vld --- src/callstack.cpp | 44 +++++++++++++++++++++++++++++++++----------- src/dllspatches.cpp | 8 ++++---- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index b95530ba..0c80db52 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -302,18 +302,25 @@ bool CallStack::isCrtStartupAlloc() // Try to get the source file and line number associated with // this program counter address. SIZE_T programCounter = (*this)[frame]; + DWORD64 displacement64; + LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); + if (beginWith(functionName, wcslen(functionName), L"`dynamic initializer for '")) { + m_status |= CALLSTACK_STATUS_NOTSTARTUPCRT; + return false; + } + + // We need to detect both "_CRT_INIT" for most x86 and x64 modules + // and "CRT_INIT" for some x64 modules + if (endWith(functionName, wcslen(functionName), L"CRT_INIT")) { + m_status |= CALLSTACK_STATUS_STARTUPCRT; + return true; + } BOOL foundline = FALSE; DWORD displacement = 0; DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); if (foundline) { - DWORD64 displacement64; - LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); - if (beginWith(functionName, wcslen(functionName), L"`dynamic initializer for '")) { - break; - } - if (isCrtStartupModule(sourceInfo.FileName)) { m_status |= CALLSTACK_STATUS_STARTUPCRT; return true; @@ -371,6 +378,9 @@ void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const // Try to get the source file and line number associated with // this program counter address. SIZE_T programCounter = (*this)[frame]; + if (GetCallingModule(programCounter) == g_vld.m_vldBase) + continue; + BOOL foundline = FALSE; DWORD displacement = 0; DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); @@ -452,7 +462,6 @@ int CallStack::resolve(BOOL showInternalFrames) // It's thread safe because of g_heapMapLock lock. static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; bool isPrevFrameInternal = false; - bool isDynamicInitializer = false; DWORD NumChars = 0; CriticalSectionLocker locker(g_DbgHelp); @@ -470,6 +479,9 @@ int CallStack::resolve(BOOL showInternalFrames) // Try to get the source file and line number associated with // this program counter address. SIZE_T programCounter = (*this)[frame]; + if (GetCallingModule(programCounter) == g_vld.m_vldBase) + continue; + DWORD displacement = 0; // It turns out that calls to SymGetLineFromAddrW64 may free the very memory we are scrutinizing here @@ -478,8 +490,8 @@ int CallStack::resolve(BOOL showInternalFrames) DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); BOOL foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo, locker); - if (skipStartupLeaks && foundline && !isDynamicInitializer && - !(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) && isCrtStartupModule(sourceInfo.FileName)) { + if (skipStartupLeaks && foundline && !(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) && + isCrtStartupModule(sourceInfo.FileName)) { m_status |= CALLSTACK_STATUS_STARTUPCRT; delete[] m_resolved; m_resolved = NULL; @@ -509,8 +521,18 @@ int CallStack::resolve(BOOL showInternalFrames) BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); - if (skipStartupLeaks && foundline && beginWith(functionName, wcslen(functionName), L"`dynamic initializer for '")) { - isDynamicInitializer = true; + if (skipStartupLeaks && beginWith(functionName, wcslen(functionName), L"`dynamic initializer for '")) { + m_status |= CALLSTACK_STATUS_NOTSTARTUPCRT; + } + + if (skipStartupLeaks && !(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) && + endWith(functionName, wcslen(functionName), L"CRT_INIT")) { + m_status |= CALLSTACK_STATUS_STARTUPCRT; + delete[] m_resolved; + m_resolved = NULL; + m_resolvedCapacity = 0; + m_resolvedLength = 0; + return 0; } if (!foundline) diff --git a/src/dllspatches.cpp b/src/dllspatches.cpp index 4131b74e..a997995f 100644 --- a/src/dllspatches.cpp +++ b/src/dllspatches.cpp @@ -374,13 +374,13 @@ static patchentry_t msvcrtPatch [] = { "_malloc_dbg", &VS60::data.pcrtd__malloc_dbg, VS60::crtd__malloc_dbg, "_realloc_dbg", &VS60::data.pcrtd__realloc_dbg, VS60::crtd__realloc_dbg, scalar_new_dbg_name, &VS60::data.pcrtd__scalar_new_dbg, VS60::crtd__scalar_new_dbg, - //vector_new_dbg_name, &VS60::data.pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, + vector_new_dbg_name, &VS60::data.pcrtd__vector_new_dbg, VS60::crtd__vector_new_dbg, "calloc", &VS60::data.pcrtd_calloc, VS60::crtd_calloc, "malloc", &VS60::data.pcrtd_malloc, VS60::crtd_malloc, "realloc", &VS60::data.pcrtd_realloc, VS60::crtd_realloc, "_strdup", &VS60::data.pcrtd__strdup, VS60::crtd__strdup, scalar_new_name, &VS60::data.pcrtd_scalar_new, VS60::crtd_scalar_new, - //vector_new_name, &VS60::data.pcrtd_vector_new, VS60::crtd_vector_new, + vector_new_name, &VS60::data.pcrtd_vector_new, VS60::crtd_vector_new, NULL, NULL, NULL }; @@ -389,13 +389,13 @@ static patchentry_t msvcrtdPatch [] = { "_malloc_dbg", &VS60d::data.pcrtd__malloc_dbg, VS60d::crtd__malloc_dbg, "_realloc_dbg", &VS60d::data.pcrtd__realloc_dbg, VS60d::crtd__realloc_dbg, scalar_new_dbg_name, &VS60d::data.pcrtd__scalar_new_dbg, VS60d::crtd__scalar_new_dbg, - //vector_new_dbg_name, &VS60d::data.pcrtd__vector_new_dbg, VS60d::crtd__vector_new_dbg, + vector_new_dbg_name, &VS60d::data.pcrtd__vector_new_dbg, VS60d::crtd__vector_new_dbg, "calloc", &VS60d::data.pcrtd_calloc, VS60d::crtd_calloc, "malloc", &VS60d::data.pcrtd_malloc, VS60d::crtd_malloc, "realloc", &VS60d::data.pcrtd_realloc, VS60d::crtd_realloc, "_strdup", &VS60d::data.pcrtd__strdup, VS60d::crtd__strdup, scalar_new_name, &VS60d::data.pcrtd_scalar_new, VS60d::crtd_scalar_new, - //vector_new_name, &VS60d::data.pcrtd_vector_new, VS60d::crtd_vector_new, + vector_new_name, &VS60d::data.pcrtd_vector_new, VS60d::crtd_vector_new, NULL, NULL, NULL }; From a190ad287f3e97079f9c31c1d7832f4865690bdc Mon Sep 17 00:00:00 2001 From: ioannis Date: Wed, 11 Nov 2015 00:59:27 +0200 Subject: [PATCH 289/321] Use CaptureContext class to simplify code in hooks --- src/crtmfcpatch.h | 188 ++++------ src/vld.cpp | 96 +++++- src/vld_hooks.cpp | 862 +++++----------------------------------------- src/vldint.h | 27 +- 4 files changed, 276 insertions(+), 897 deletions(-) diff --git a/src/crtmfcpatch.h b/src/crtmfcpatch.h index d958df65..9064ab13 100644 --- a/src/crtmfcpatch.h +++ b/src/crtmfcpatch.h @@ -183,7 +183,7 @@ void* CrtPatch::crtd__calloc_dbg (size_t num, assert(pcrtxxd__calloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__calloc_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__calloc_dbg); return g_vld.__calloc_dbg(pcrtxxd__calloc_dbg, context, debug, num, size, type, file, line); } @@ -214,7 +214,7 @@ void* CrtPatch::crtd__malloc_dbg (size_t size, assert(pcrtxxd__malloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__malloc_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__malloc_dbg); return g_vld.__malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, type, file, line); } @@ -248,7 +248,7 @@ void* CrtPatch::crtd__realloc_dbg (void *mem, assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__realloc_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__realloc_dbg); return g_vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, type, file, line); } @@ -283,7 +283,7 @@ void* CrtPatch::crtd__recalloc_dbg (void *mem, assert(pcrtxxd__recalloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__recalloc_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__recalloc_dbg); return g_vld.__recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, type, file, line); } @@ -299,7 +299,7 @@ char* CrtPatch::crtd__strdup_dbg (const char* src, assert(pcrtxxd__strdup_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__strdup_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__strdup_dbg); return g_vld.__strdup_dbg(pcrtxxd__strdup_dbg, context, debug, src, type, file, line); } @@ -315,7 +315,7 @@ wchar_t* CrtPatch::crtd__wcsdup_dbg (const wchar_t* src, assert(pcrtxxd__wcsdup_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__wcsdup_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__wcsdup_dbg); return g_vld.__wcsdup_dbg(pcrtxxd__wcsdup_dbg, context, debug, src, type, file, line); } @@ -346,7 +346,7 @@ void* CrtPatch::crtd__scalar_new_dbg (size_t size, assert(pcrtxxd_new_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_new_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd_new_dbg); return g_vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); } @@ -377,7 +377,7 @@ void* CrtPatch::crtd__vector_new_dbg (size_t size, assert(pcrtxxd_new_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_new_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd_new_dbg); return g_vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); } @@ -402,7 +402,7 @@ void* CrtPatch::crtd_calloc (size_t num, size_t size) assert(pcrtxxd_calloc); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_calloc); + CaptureContext cc(context, debug, (void*)pcrtxxd_calloc); return g_vld._calloc(pcrtxxd_calloc, context, debug, num, size); } @@ -425,7 +425,7 @@ void* CrtPatch::crtd_malloc (size_t size) assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_malloc); + CaptureContext cc(context, debug, (void*)pcrtxxd_malloc); return g_vld._malloc(pcrtxxd_malloc, context, debug, size); } @@ -450,7 +450,7 @@ void* CrtPatch::crtd_realloc (void *mem, size_t size) assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_realloc); + CaptureContext cc(context, debug, (void*)pcrtxxd_realloc); return g_vld._realloc(pcrtxxd_realloc, context, debug, mem, size); } @@ -475,7 +475,7 @@ void* CrtPatch::crtd__recalloc (void *mem, size_t num, size_t assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_recalloc); + CaptureContext cc(context, debug, (void*)pcrtxxd_recalloc); return g_vld.__recalloc(pcrtxxd_recalloc, context, debug, mem, num, size); } @@ -488,7 +488,7 @@ char* CrtPatch::crtd__strdup (const char* src) assert(pcrtxxd_strdup); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_strdup); + CaptureContext cc(context, debug, (void*)pcrtxxd_strdup); return g_vld.__strdup(pcrtxxd_strdup, context, debug, src); } @@ -500,7 +500,7 @@ wchar_t* CrtPatch::crtd__wcsdup (const wchar_t* src) assert(pcrtxxd_wcsdup); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_wcsdup); + CaptureContext cc(context, debug, (void*)pcrtxxd_wcsdup); return g_vld.__wcsdup(pcrtxxd_wcsdup, context, debug, src); } @@ -532,7 +532,7 @@ void* CrtPatch::crtd__aligned_malloc_dbg (size_t size, assert(pcrtxxd__aligned_malloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__aligned_malloc_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__aligned_malloc_dbg); return g_vld.__aligned_malloc_dbg(pcrtxxd__aligned_malloc_dbg, context, debug, size, alignment, type, file, line); } @@ -565,7 +565,7 @@ void* CrtPatch::crtd__aligned_offset_malloc_dbg (size_t assert(pcrtxxd__malloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__malloc_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__malloc_dbg); return g_vld.__aligned_offset_malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, alignment, offset, type, file, line); } @@ -600,7 +600,7 @@ void* CrtPatch::crtd__aligned_realloc_dbg (void *mem, assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__realloc_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__realloc_dbg); return g_vld.__aligned_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, type, file, line); } @@ -636,7 +636,7 @@ void* CrtPatch::crtd__aligned_offset_realloc_dbg (void assert(pcrtxxd__realloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__realloc_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__realloc_dbg); return g_vld.__aligned_offset_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, offset, type, file, line); } @@ -674,7 +674,7 @@ void* CrtPatch::crtd__aligned_recalloc_dbg (void *mem, assert(pcrtxxd__recalloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__recalloc_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__recalloc_dbg); return g_vld.__aligned_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, type, file, line); } @@ -713,7 +713,7 @@ void* CrtPatch::crtd__aligned_offset_recalloc_dbg (void assert(pcrtxxd__recalloc_dbg); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd__recalloc_dbg); + CaptureContext cc(context, debug, (void*)pcrtxxd__recalloc_dbg); return g_vld.__aligned_offset_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, offset, type, file, line); } @@ -736,7 +736,7 @@ void* CrtPatch::crtd__aligned_malloc (size_t size, size_t ali assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_malloc); + CaptureContext cc(context, debug, (void*)pcrtxxd_malloc); return g_vld.__aligned_malloc(pcrtxxd_malloc, context, debug, size, alignment); } @@ -759,7 +759,7 @@ void* CrtPatch::crtd__aligned_offset_malloc (size_t size, siz assert(pcrtxxd_malloc); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_malloc); + CaptureContext cc(context, debug, (void*)pcrtxxd_malloc); return g_vld.__aligned_offset_malloc(pcrtxxd_malloc, context, debug, size, alignment, offset); } @@ -784,7 +784,7 @@ void* CrtPatch::crtd__aligned_realloc (void *mem, size_t size assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_realloc); + CaptureContext cc(context, debug, (void*)pcrtxxd_realloc); return g_vld.__aligned_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment); } @@ -809,7 +809,7 @@ void* CrtPatch::crtd__aligned_offset_realloc (void *mem, size assert(pcrtxxd_realloc); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_realloc); + CaptureContext cc(context, debug, (void*)pcrtxxd_realloc); return g_vld.__aligned_offset_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment, offset); } @@ -836,7 +836,7 @@ void* CrtPatch::crtd__aligned_recalloc (void *mem, size_t num assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_recalloc); + CaptureContext cc(context, debug, (void*)pcrtxxd_recalloc); return g_vld.__aligned_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment); } @@ -863,7 +863,7 @@ void* CrtPatch::crtd__aligned_offset_recalloc (void *mem, siz assert(pcrtxxd_recalloc); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_recalloc); + CaptureContext cc(context, debug, (void*)pcrtxxd_recalloc); return g_vld.__aligned_offset_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment, offset); } @@ -884,7 +884,7 @@ void* CrtPatch::crtd_scalar_new (size_t size) assert(pcrtxxd_scalar_new); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_scalar_new); + CaptureContext cc(context, debug, (void*)pcrtxxd_scalar_new); return g_vld._new(pcrtxxd_scalar_new, context, debug, size); } @@ -905,7 +905,7 @@ void* CrtPatch::crtd_vector_new (size_t size) assert(pcrtxxd_vector_new); context_t context; - CAPTURE_CONTEXT(context, pcrtxxd_vector_new); + CaptureContext cc(context, debug, (void*)pcrtxxd_vector_new); return g_vld._new(pcrtxxd_vector_new, context, debug, size); } @@ -942,7 +942,7 @@ void* MfcPatch::mfcd__scalar_new_dbg_4p (size_t size, assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -970,7 +970,7 @@ void* MfcPatch::mfcd__scalar_new_dbg_3p (size_t size, assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -1001,7 +1001,7 @@ void* MfcPatch::mfcd__vector_new_dbg_4p (size_t size, assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -1029,7 +1029,7 @@ void* MfcPatch::mfcd__vector_new_dbg_3p (size_t size, assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -1050,7 +1050,7 @@ void* MfcPatch::mfcd_scalar_new (size_t size) assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd_new); + CaptureContext cc(context, debug, (void*)pmfcxxd_new); return g_vld._new(pmfcxxd_new, context, debug, size); } @@ -1071,7 +1071,7 @@ void* MfcPatch::mfcd_vector_new (size_t size) assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd_new); + CaptureContext cc(context, debug, (void*)pmfcxxd_new); return g_vld._new(pmfcxxd_new, context, debug, size); } @@ -1102,7 +1102,7 @@ void* MfcPatch::mfcud__scalar_new_dbg_4p (size_t size, assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -1130,7 +1130,7 @@ void* MfcPatch::mfcud__scalar_new_dbg_3p (size_t size, assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -1161,7 +1161,7 @@ void* MfcPatch::mfcud__vector_new_dbg_4p (size_t size, assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); } @@ -1189,7 +1189,7 @@ void* MfcPatch::mfcud__vector_new_dbg_3p (size_t size, assert(pmfcxxd__new_dbg); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); } @@ -1210,7 +1210,7 @@ void* MfcPatch::mfcud_scalar_new (size_t size) assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd_new); + CaptureContext cc(context, debug, (void*)pmfcxxd_new); return g_vld._new(pmfcxxd_new, context, debug, size); } @@ -1231,56 +1231,38 @@ void* MfcPatch::mfcud_vector_new (size_t size) assert(pmfcxxd_new); context_t context; - CAPTURE_CONTEXT(context, pmfcxxd_new); + CaptureContext cc(context, debug, (void*)pmfcxxd_new); return g_vld._new(pmfcxxd_new, context, debug, size); } // Visual Studio 6.0 -typedef CrtPatch<60> - VS60; -typedef CrtPatch<60, true> - VS60d; +typedef CrtPatch<60> VS60; +typedef CrtPatch<60, true> VS60d; // Visual Studio .NET 2002 -typedef CrtPatch<70> - VS70; -typedef CrtPatch<70, true> - VS70d; +typedef CrtPatch<70> VS70; +typedef CrtPatch<70, true> VS70d; // Visual Studio .NET 2003 -typedef CrtPatch<71> - VS71; -typedef CrtPatch<71, true> - VS71d; +typedef CrtPatch<71> VS71; +typedef CrtPatch<71, true> VS71d; // Visual Studio 2005 -typedef CrtPatch<80> - VS80; -typedef CrtPatch<80, true> - VS80d; +typedef CrtPatch<80> VS80; +typedef CrtPatch<80, true> VS80d; // Visual Studio 2008 -typedef CrtPatch<90> - VS90; -typedef CrtPatch<90, true> - VS90d; +typedef CrtPatch<90> VS90; +typedef CrtPatch<90, true> VS90d; // Visual Studio 2010 -typedef CrtPatch<100> - VS100; -typedef CrtPatch<100, true> - VS100d; +typedef CrtPatch<100> VS100; +typedef CrtPatch<100, true> VS100d; // Visual Studio 2012 -typedef CrtPatch<110> - VS110; -typedef CrtPatch<110, true> - VS110d; +typedef CrtPatch<110> VS110; +typedef CrtPatch<110, true> VS110d; // Visual Studio 2013 -typedef CrtPatch<120> - VS120; -typedef CrtPatch<120, true> - VS120d; +typedef CrtPatch<120> VS120; +typedef CrtPatch<120, true> VS120d; // Visual Studio 2015 and higher -typedef CrtPatch<140> - UCRT; -typedef CrtPatch<140, true> - UCRTd; +typedef CrtPatch<140> UCRT; +typedef CrtPatch<140, true> UCRTd; VS60 VS60::data; VS60d VS60d::data; @@ -1303,50 +1285,32 @@ UCRTd UCRTd::data; // Visual Studio 6.0 -typedef MfcPatch<60> - Mfc60; -typedef MfcPatch<60, true> - Mfc60d; +typedef MfcPatch<60> Mfc60; +typedef MfcPatch<60, true> Mfc60d; // Visual Studio .NET 2002 -typedef MfcPatch<70> - Mfc70; -typedef MfcPatch<70, true> - Mfc70d; +typedef MfcPatch<70> Mfc70; +typedef MfcPatch<70, true> Mfc70d; // Visual Studio .NET 2003 -typedef MfcPatch<71> - Mfc71; -typedef MfcPatch<71, true> - Mfc71d; +typedef MfcPatch<71> Mfc71; +typedef MfcPatch<71, true> Mfc71d; // Visual Studio 2005 -typedef MfcPatch<80> - Mfc80; -typedef MfcPatch<80, true> - Mfc80d; +typedef MfcPatch<80> Mfc80; +typedef MfcPatch<80, true> Mfc80d; // Visual Studio 2008 -typedef MfcPatch<90> - Mfc90; -typedef MfcPatch<90, true> - Mfc90d; +typedef MfcPatch<90> Mfc90; +typedef MfcPatch<90, true> Mfc90d; // Visual Studio 2010 -typedef MfcPatch<100> - Mfc100; -typedef MfcPatch<100, true> - Mfc100d; +typedef MfcPatch<100> Mfc100; +typedef MfcPatch<100, true> Mfc100d; // Visual Studio 2012 -typedef MfcPatch<110> - Mfc110; -typedef MfcPatch<110, true> - Mfc110d; +typedef MfcPatch<110> Mfc110; +typedef MfcPatch<110, true> Mfc110d; // Visual Studio 2013 -typedef MfcPatch<120> - Mfc120; -typedef MfcPatch<120, true> - Mfc120d; +typedef MfcPatch<120> Mfc120; +typedef MfcPatch<120, true> Mfc120d; // Visual Studio 2015 -typedef MfcPatch<140> - Mfc140; -typedef MfcPatch<140, true> - Mfc140d; +typedef MfcPatch<140> Mfc140; +typedef MfcPatch<140, true> Mfc140d; Mfc60 Mfc60::data; Mfc60d Mfc60d::data; diff --git a/src/vld.cpp b/src/vld.cpp index 731e1199..18b4adda 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -2283,13 +2283,6 @@ VOID VisualLeakDetector::RefreshModules() delete oldmodules; } -void VisualLeakDetector::getCallStack( CallStack *&pcallstack, context_t &context ) -{ - CallStack* callstack = CallStack::Create(); - pcallstack = callstack; - callstack->getStackTrace(g_vld.m_maxTraceFrames, context); -} - // Find the information for the module that initiated this reallocation. bool VisualLeakDetector::isModuleExcluded(UINT_PTR address) { @@ -2812,3 +2805,92 @@ int VisualLeakDetector::ResolveCallstacks() } return unresolvedFunctionsCount; } + + +CaptureContext::CaptureContext(context_t &context, BOOL debug, void* func, UINT_PTR fp) : m_func(func), m_fp(fp) { + m_tls = g_vld.getTls(); + + if (debug) { + m_tls->flags |= VLD_TLS_DEBUGCRTALLOC; + } + + m_bFirst = (GET_RETURN_ADDRESS(m_tls->context) == NULL); + m_bExclude = g_vld.isModuleExcluded(fp); + if (m_bFirst) { + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + if (func) { + Capture(context); + } + m_tls->context = context; + } +} + +CaptureContext::~CaptureContext() { + if (m_bFirst) { + if ((!m_bExclude) && (m_tls->blockWithoutGuard)) { + blockinfo_t* pblockInfo = NULL; + if (m_tls->newBlockWithoutGuard == NULL) { + g_vld.mapBlock(m_tls->heap, + m_tls->blockWithoutGuard, + m_tls->size, + (m_tls->flags & VLD_TLS_DEBUGCRTALLOC), + m_tls->threadId, + pblockInfo); + } else { + g_vld.remapBlock(m_tls->heap, + m_tls->blockWithoutGuard, + m_tls->newBlockWithoutGuard, + m_tls->size, + (m_tls->flags & VLD_TLS_DEBUGCRTALLOC), + m_tls->threadId, + pblockInfo, m_tls->context); + } + + CallStack* callstack = CallStack::Create(); + callstack->getStackTrace(g_vld.m_maxTraceFrames, m_tls->context); + pblockInfo->callStack.reset(callstack); + } + + // Reset thread local flags and variables for the next allocation. + Reset(); + } +} + +void CaptureContext::Capture(context_t &context) { + context.fp = m_fp; + context.func = (UINT_PTR)(m_func); + + CONTEXT _ctx; + RtlCaptureContext(&_ctx); +#if defined(_M_IX86) + context.Ebp = _ctx.Ebp; context.Esp = _ctx.Esp; context.Eip = _ctx.Eip; +#elif defined(_M_X64) + context.Rbp = _ctx.Rbp; context.Rsp = _ctx.Rsp; context.Rip = _ctx.Rip; +#else + // If you want to retarget Visual Leak Detector to another processor + // architecture then you'll need to provide an architecture-specific macro to + // obtain the frame pointer (or other address) which can be used to obtain the + // return address and stack pointer of the calling frame. +#error "Visual Leak Detector is not supported on this architecture." +#endif // _M_IX86 || _M_X64 +} + +void CaptureContext::Set(HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size) { + m_tls->heap = heap; + m_tls->blockWithoutGuard = mem; + m_tls->newBlockWithoutGuard = newmem; + m_tls->size = size; + + if ((m_tls->blockWithoutGuard) && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { + // If VLD_OPT_TRACE_INTERNAL_FRAMES is specified then we capture the frame pointer upto the function that acutally + // performs the allocation to the heap being: HeapAlloc, HeapReAlloc, RtlAllocateHeap, RtlReAllocateHeap. + Capture(m_tls->context); + } +} + +void CaptureContext::Reset() { + m_tls->context = { NULL }; + m_tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; + Set(NULL, NULL, NULL, NULL); +} diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 79e38726..311fc79a 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -46,36 +46,6 @@ extern HANDLE g_currentProcess; extern CriticalSection g_heapMapLock; extern DbgHelp g_DbgHelp; -void VisualLeakDetector::firstAllocCall(tls_t * tls) -{ - if (tls->blockWithoutGuard) - { - context_t context = tls->context; - blockinfo_t* pblockInfo = NULL; - if (tls->newBlockWithoutGuard == NULL) - AllocateHeap(tls, pblockInfo); - else - ReAllocateHeap(tls, pblockInfo); - - // Reset thread local flags and variables in case dbghelp.dll try allocate some data. - tls->context.fp = NULL; - tls->context.func = 0x0; - tls->blockWithoutGuard = NULL; - tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; - - CallStack* callstack; - getCallStack(callstack, context); - pblockInfo->callStack.reset(callstack); - return; - } - - // Reset thread local flags and variables for the next allocation. - tls->context.fp = NULL; - tls->context.func = 0x0; - tls->blockWithoutGuard = NULL; - tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; -} - //////////////////////////////////////////////////////////////////////////////// // // Standard CRT and MFC IAT Replacement Functions @@ -111,26 +81,10 @@ void* VisualLeakDetector::_calloc (calloc_t pcalloc, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pcalloc(num, size); - - if (firstcall) - firstAllocCall(tls); - - return block; + return pcalloc(num, size); } // _malloc - This function is just a wrapper around the real malloc that sets @@ -152,26 +106,10 @@ void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool de #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size); - - if (firstcall) - firstAllocCall(tls); - - return block; + return pmalloc(size); } // _new - This function is just a wrapper around the real CRT and MFC new @@ -193,26 +131,10 @@ void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntim #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t* tls = g_vld.getTls(); - - // The new operator is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == NULL); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew(size); - - if (firstcall) - firstAllocCall(tls); - - return block; + // Do the allocation. The block will be mapped by _RtlAllocateHeap. + return pnew(size); } // _realloc - This function is just a wrapper around the real realloc that sets @@ -240,26 +162,10 @@ void* VisualLeakDetector::_realloc (realloc_t prealloc, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size); - - if (firstcall) - firstAllocCall(tls); - - return block; + return prealloc(mem, size); } // _recalloc - This function is just a wrapper around the real _recalloc that sets @@ -288,26 +194,10 @@ void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size); - - if (firstcall) - firstAllocCall(tls); - - return block; + return precalloc(mem, num, size); } char* VisualLeakDetector::__strdup( _strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src ) @@ -315,26 +205,10 @@ char* VisualLeakDetector::__strdup( _strdup_t pstrdup, context_t& context, bool #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - char* block = pstrdup(src); - - if (firstcall) - firstAllocCall(tls); - - return block; + return pstrdup(src); } wchar_t* VisualLeakDetector::__wcsdup( _wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src ) @@ -342,26 +216,10 @@ wchar_t* VisualLeakDetector::__wcsdup( _wcsdup_t pwcsdup, context_t& context, bo #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - wchar_t* block = pwcsdup(src); - - if (firstcall) - firstAllocCall(tls); - - return block; + return pwcsdup(src); } // __aligned_malloc - This function is just a wrapper around the real malloc that sets @@ -384,26 +242,10 @@ void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size, alignment); - - if (firstcall) - firstAllocCall(tls); - - return block; + return pmalloc(size, alignment); } // __aligned_offset_malloc - This function is just a wrapper around the real malloc that sets @@ -426,26 +268,10 @@ void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmal #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // malloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pmalloc(size, alignment, offset); - - if (firstcall) - firstAllocCall(tls); - - return block; + return pmalloc(size, alignment, offset); } // __aligned_realloc - This function is just a wrapper around the real realloc that sets @@ -474,26 +300,10 @@ void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size, alignment); - - if (firstcall) - firstAllocCall(tls); - - return block; + return prealloc(mem, size, alignment); } // __aligned_offset_realloc - This function is just a wrapper around the real realloc that sets @@ -523,26 +333,10 @@ void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t p #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = prealloc(mem, size, alignment, offset); - - if (firstcall) - firstAllocCall(tls); - - return block; + return prealloc(mem, size, alignment, offset); } // __aligned_recalloc - This function is just a wrapper around the real recalloc that sets @@ -574,26 +368,10 @@ void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size, alignment); - - if (firstcall) - firstAllocCall(tls); - - return block; + return precalloc(mem, num, size, alignment); } // __aligned_offset_recalloc - This function is just a wrapper around the real recalloc that sets @@ -626,26 +404,10 @@ void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // realloc is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = precalloc(mem, num, size, alignment, offset); - - if (firstcall) - firstAllocCall(tls); - - return block; + return precalloc(mem, num, size, alignment, offset); } // __aligned_malloc_dbg - This function is just a wrapper around the real _aligned_malloc_dbg @@ -682,26 +444,10 @@ void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_ #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, alignment, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_malloc_dbg(size, alignment, type, file, line); } // __aligned_offset_malloc_dbg - This function is just a wrapper around the real @@ -739,26 +485,10 @@ void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_db #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, alignment, offset, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_malloc_dbg(size, alignment, offset, type, file, line); } // _aligned_realloc_debug - This function is just a wrapper around the real @@ -798,26 +528,10 @@ void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_reall #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, alignment, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_realloc_dbg(mem, size, alignment, type, file, line); } // _aligned_offset_realloc_debug - This function is just a wrapper around the real @@ -858,26 +572,10 @@ void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_ #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, alignment, offset, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_realloc_dbg(mem, size, alignment, offset, type, file, line); } // _aligned_recalloc_debug - This function is just a wrapper around the real @@ -920,26 +618,10 @@ void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_rec #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, alignment, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_recalloc_dbg(mem, num, size, alignment, type, file, line); } // _aligned_offset_recalloc_debug - This function is just a wrapper around the real @@ -983,26 +665,10 @@ void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recallo #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, alignment, offset, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_recalloc_dbg(mem, num, size, alignment, offset, type, file, line); } //////////////////////////////////////////////////////////////////////////////// @@ -1049,26 +715,10 @@ void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_calloc_dbg(num, size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_calloc_dbg(num, size, type, file, line); } // __malloc_dbg - This function is just a wrapper around the real _malloc_dbg @@ -1104,26 +754,10 @@ void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = p_malloc_dbg(size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_malloc_dbg(size, type, file, line); } char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, @@ -1137,26 +771,10 @@ char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - char* block = p_strdup_dbg(src, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_strdup_dbg(src, type, file, line); } wchar_t* VisualLeakDetector::__wcsdup_dbg (_wcsdup_dbg_t p_wcsdup_dbg, @@ -1170,26 +788,10 @@ wchar_t* VisualLeakDetector::__wcsdup_dbg (_wcsdup_dbg_t p_wcsdup_dbg, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _malloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - wchar_t* block = p_wcsdup_dbg(src, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_wcsdup_dbg(src, type, file, line); } // new_dbg_crt - This function is just a wrapper around the real CRT debug new @@ -1225,26 +827,10 @@ void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // The debug new operator is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg_crt(size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return pnew_dbg_crt(size, type, file, line); } // new_dbg_mfc - This function is just a wrapper around the real MFC debug new @@ -1279,22 +865,10 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, TRUE, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg(size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return pnew_dbg(size, type, file, line); } // new_dbg_mfc - This function is just a wrapper around the real MFC debug new @@ -1326,22 +900,10 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, TRUE, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - void* block = pnew_dbg_mfc(size, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return pnew_dbg_mfc(size, file, line); } // __realloc_debug - This function is just a wrapper around the real @@ -1380,26 +942,10 @@ void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_realloc_dbg(mem, size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_realloc_dbg(mem, size, type, file, line); } // __recalloc_debug - This function is just a wrapper around the real @@ -1439,26 +985,10 @@ void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - tls_t *tls = g_vld.getTls(); - - // _realloc_dbg is a CRT function and allocates from the CRT heap. - if (debugRuntime) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - tls->context = context; - } + CaptureContext cc(context, debugRuntime, NULL); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - void* block = p_recalloc_dbg(mem, num, size, type, file, line); - - if (firstcall) - firstAllocCall(tls); - - return block; + return p_recalloc_dbg(mem, num, size, type, file, line); } // GetProcessHeap - Calls to GetProcessHeap are patched through to this function. This @@ -1574,39 +1104,12 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si if ((block == NULL) || !g_vld.enabled()) return block; - tls_t* tls = g_vld.getTls(); - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context, RtlAllocateHeap); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - { - assert(tls->blockWithoutGuard == NULL); - return block; - } - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context, RtlAllocateHeap); + if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls + context_t context; + CaptureContext cc(context, FALSE, RtlAllocateHeap); + cc.Set(heap, block, NULL, size); } - tls->context = context; - tls->heap = heap; - tls->blockWithoutGuard = block; - tls->newBlockWithoutGuard = NULL; - tls->size = size; - - if (firstcall) - firstAllocCall(tls); - return block; } @@ -1622,51 +1125,15 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) if ((block == NULL) || !g_vld.enabled()) return block; - tls_t* tls = g_vld.getTls(); - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context, HeapAlloc); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - { - assert(tls->blockWithoutGuard == NULL); - return block; - } - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context, HeapAlloc); + if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls + context_t context; + CaptureContext cc(context, FALSE, HeapAlloc); + cc.Set(heap, block, NULL, size); } - tls->context = context; - tls->heap = heap; - tls->blockWithoutGuard = block; - tls->newBlockWithoutGuard = NULL; - tls->size = size; - - if (firstcall) - firstAllocCall(tls); - return block; } -void VisualLeakDetector::AllocateHeap (tls_t* tls, blockinfo_t* &pblockInfo) -{ - bool debugcrtalloc = (tls->flags & VLD_TLS_DEBUGCRTALLOC) ? true : false; - - // The module that initiated this allocation is included in leak - // detection. Map this block to the specified heap. - g_vld.mapBlock(tls->heap, tls->blockWithoutGuard, tls->size, debugcrtalloc, tls->threadId, pblockInfo); -} - // _RtlFreeHeap - Calls to RtlFreeHeap are patched through to this function. // This function calls VLD's free tracking function and then invokes the real // RtlFreeHeap. Pretty much all memory frees will eventually result in a call @@ -1758,40 +1225,10 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID if ((newmem == NULL) || !g_vld.enabled()) return newmem; - tls_t *tls = g_vld.getTls(); - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context, RtlReAllocateHeap); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - { - assert(tls->blockWithoutGuard == NULL); - return newmem; - } - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context, RtlReAllocateHeap); - } - - tls->context = context; - tls->heap = heap; - tls->blockWithoutGuard = mem; - tls->newBlockWithoutGuard = newmem; - tls->size = size; - - if (firstcall) - { - firstAllocCall(tls); - tls->blockWithoutGuard = NULL; + if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls + context_t context; + CaptureContext cc(context, FALSE, RtlReAllocateHeap); + cc.Set(heap, mem, newmem, size); } return newmem; @@ -1809,78 +1246,15 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S if ((newmem == NULL) || !g_vld.enabled()) return newmem; - tls_t *tls = g_vld.getTls(); - bool firstcall = (tls->context.fp == 0x0); - context_t context; - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context, HeapReAlloc); - } - else - context = tls->context; - - if (isModuleExcluded(GET_RETURN_ADDRESS(context))) - { - assert(tls->blockWithoutGuard == NULL); - return newmem; - } - - if (!firstcall && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // Begin the stack trace with the current frame. Obtain the current - // frame pointer. - firstcall = true; - CAPTURE_CONTEXT(context, HeapReAlloc); - } - - tls->context = context; - tls->heap = heap; - tls->blockWithoutGuard = mem; - tls->newBlockWithoutGuard = newmem; - tls->size = size; - - if (firstcall) - { - firstAllocCall(tls); - tls->blockWithoutGuard = NULL; + if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls + context_t context; + CaptureContext cc(context, FALSE, HeapReAlloc); + cc.Set(heap, mem, newmem, size); } return newmem; } -void VisualLeakDetector::ReAllocateHeap (tls_t *tls, blockinfo_t* &pblockInfo) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - bool crtalloc = (tls->flags & VLD_TLS_DEBUGCRTALLOC) ? true : false; - - context_t context = tls->context; - HANDLE heap = tls->heap; - LPVOID mem = tls->blockWithoutGuard; - LPVOID newmem = tls->newBlockWithoutGuard; - SIZE_T size = tls->size; - - // Reset thread local flags and variables, in case any libraries called - // into while remapping the block allocate some memory. - tls->context.fp = NULL; - tls->context.func = 0x0; - tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; - - // The module that initiated this allocation is included in leak - // detection. Remap the block. - g_vld.remapBlock(heap, mem, newmem, size, crtalloc, tls->threadId, pblockInfo, context); - -#ifdef _DEBUG - if(tls->context.fp != 0) - __debugbreak(); -#endif - if (crtalloc) - tls->flags |= VLD_TLS_DEBUGCRTALLOC; - - tls->context = context; -} - //////////////////////////////////////////////////////////////////////////////// // // COM IAT Replacement Functions @@ -1966,33 +1340,18 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) #endif static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; - LPVOID block; - context_t context; - HMODULE ole32; - tls_t *tls = g_vld.getTls(); - if (pCoTaskMemAlloc == NULL) { // This is the first call to this function. Link to the real // CoTaskMemAlloc. - ole32 = GetModuleHandleW(L"ole32.dll"); + HMODULE ole32 = GetModuleHandleW(L"ole32.dll"); pCoTaskMemAlloc = (CoTaskMemAlloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); } - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context, pCoTaskMemAlloc); - tls->context = context; - } + context_t context; + CaptureContext cc(context, FALSE, (void*)pCoTaskMemAlloc); // Do the allocation. The block will be mapped by _RtlAllocateHeap. - block = pCoTaskMemAlloc(size); - - if (firstcall) - firstAllocCall(tls); - - return block; + return pCoTaskMemAlloc(size); } // _CoTaskMemRealloc - Calls to CoTaskMemRealloc are patched through to this @@ -2015,33 +1374,18 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) #endif static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; - LPVOID block; - context_t context; - HMODULE ole32; - tls_t *tls = g_vld.getTls(); - if (pCoTaskMemRealloc == NULL) { // This is the first call to this function. Link to the real // CoTaskMemRealloc. - ole32 = GetModuleHandleW(L"ole32.dll"); + HMODULE ole32 = GetModuleHandleW(L"ole32.dll"); pCoTaskMemRealloc = (CoTaskMemRealloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); } - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - CAPTURE_CONTEXT(context, pCoTaskMemRealloc); - tls->context = context; - } + context_t context; + CaptureContext cc(context, FALSE, (void*)pCoTaskMemRealloc); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - block = pCoTaskMemRealloc(mem, size); - - if (firstcall) - firstAllocCall(tls); - - return block; + return pCoTaskMemRealloc(mem, size); } //////////////////////////////////////////////////////////////////////////////// @@ -2089,28 +1433,14 @@ LPVOID VisualLeakDetector::Alloc (_In_ SIZE_T size) #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - LPVOID block; context_t context; - tls_t *tls = getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; - UINT_PTR iMallocAlloc = cVtablePtr[3]; - CAPTURE_CONTEXT(context, iMallocAlloc); - tls->context = context; - } + UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; + UINT_PTR iMallocAlloc = cVtablePtr[3]; + CaptureContext cc(context, FALSE, (void*)iMallocAlloc); // Do the allocation. The block will be mapped by _RtlAllocateHeap. assert(m_iMalloc != NULL); - block = (m_iMalloc) ? m_iMalloc->Alloc(size) : NULL; - - if (firstcall) - firstAllocCall(tls); - - return block; + return (m_iMalloc) ? m_iMalloc->Alloc(size) : NULL; } // DidAlloc - Calls to IMalloc::DidAlloc will end up here. This function is just @@ -2227,28 +1557,14 @@ LPVOID VisualLeakDetector::Realloc (_In_opt_ LPVOID mem, _In_ SIZE_T size) #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - LPVOID block; context_t context; - tls_t *tls = getTls(); - - bool firstcall = (tls->context.fp == 0x0); - if (firstcall) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; - UINT_PTR iMallocRealloc = cVtablePtr[4]; - CAPTURE_CONTEXT(context, iMallocRealloc); - tls->context = context; - } + UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; + UINT_PTR iMallocRealloc = cVtablePtr[4]; + CaptureContext cc(context, FALSE, (void*)iMallocRealloc); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. assert(m_iMalloc != NULL); - block = (m_iMalloc) ? m_iMalloc->Realloc(mem, size) : NULL; - - if (firstcall) - firstAllocCall(tls); - - return block; + return (m_iMalloc) ? m_iMalloc->Realloc(mem, size) : NULL; } // Release - Calls to IMalloc::Release will end up here. This function is just diff --git a/src/vldint.h b/src/vldint.h index 8f5210b4..8001dc27 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -182,6 +182,26 @@ struct tls_t { // allocated in the process. typedef Map TlsMap; +class CaptureContext { +public: + CaptureContext(context_t &context, BOOL debug, void* func, UINT_PTR fp = (UINT_PTR)_ReturnAddress()); + ~CaptureContext(); + void Set(HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size); + void Reset(); +private: + // Disallow certain operations + CaptureContext(); + CaptureContext(const CaptureContext&); + CaptureContext& operator=(const CaptureContext&); + inline void Capture(context_t &context); +private: + tls_t *m_tls; + BOOL m_bFirst; + BOOL m_bExclude; + UINT_PTR m_fp; + void* m_func; +}; + class CallStack; //////////////////////////////////////////////////////////////////////////////// @@ -212,6 +232,8 @@ class CallStack; // class VisualLeakDetector : public IMalloc { + friend class CallStack; + friend class CaptureContext; public: VisualLeakDetector(); ~VisualLeakDetector(); @@ -339,8 +361,6 @@ class VisualLeakDetector : public IMalloc // Utils static bool isModuleExcluded (UINT_PTR returnaddress); blockinfo_t* findAllocedBlock(LPCVOID, __out HANDLE& heap); - static void getCallStack( CallStack *&pcallstack, context_t &context ); - static void firstAllocCall(tls_t * tls); void setupReporting(); void checkInternalMemoryLeaks(); bool waitForAllVLDThreads(); @@ -373,9 +393,6 @@ class VisualLeakDetector : public IMalloc static LPVOID __stdcall _CoTaskMemAlloc (SIZE_T size); static LPVOID __stdcall _CoTaskMemRealloc (LPVOID mem, SIZE_T size); - static void AllocateHeap (tls_t* tls, blockinfo_t* &pblockInfo); - static void ReAllocateHeap (tls_t *tls, blockinfo_t* &pblockInfo); - //////////////////////////////////////////////////////////////////////////////// // Private data //////////////////////////////////////////////////////////////////////////////// From ba0feaef945bfdf5060a4554ebc2121bb6105c2b Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 13 Nov 2015 01:25:41 +0200 Subject: [PATCH 290/321] Test debugCrtAlloc leaks with isCrtStartupAlloc() --- src/callstack.cpp | 60 +++++++++++++++++++++-------------------------- src/vld.cpp | 21 ++++++++++++----- src/vldint.h | 7 +++--- 3 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index 0c80db52..a32e43b7 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -304,27 +304,28 @@ bool CallStack::isCrtStartupAlloc() SIZE_T programCounter = (*this)[frame]; DWORD64 displacement64; LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); - if (beginWith(functionName, wcslen(functionName), L"`dynamic initializer for '")) { + size_t len = wcslen(functionName); + + if (beginWith(functionName, len, L"`dynamic initializer for '")) { m_status |= CALLSTACK_STATUS_NOTSTARTUPCRT; return false; } // We need to detect both "_CRT_INIT" for most x86 and x64 modules // and "CRT_INIT" for some x64 modules - if (endWith(functionName, wcslen(functionName), L"CRT_INIT")) { + if (endWith(functionName, len, L"CRT_INIT")) { m_status |= CALLSTACK_STATUS_STARTUPCRT; return true; } + BOOL foundline = FALSE; DWORD displacement = 0; DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); - if (foundline) { - if (isCrtStartupModule(sourceInfo.FileName)) { - m_status |= CALLSTACK_STATUS_STARTUPCRT; - return true; - } + if (foundline && isCrtStartupModule(sourceInfo.FileName)) { + m_status |= CALLSTACK_STATUS_STARTUPCRT; + return true; } } @@ -490,14 +491,25 @@ int CallStack::resolve(BOOL showInternalFrames) DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); BOOL foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo, locker); - if (skipStartupLeaks && foundline && !(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) && - isCrtStartupModule(sourceInfo.FileName)) { - m_status |= CALLSTACK_STATUS_STARTUPCRT; - delete[] m_resolved; - m_resolved = NULL; - m_resolvedCapacity = 0; - m_resolvedLength = 0; - return 0; + DWORD64 displacement64; + BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; + LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); + + if (skipStartupLeaks && !(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT)) { + size_t len = wcslen(functionName); + if (beginWith(functionName, len, L"`dynamic initializer for '")) { + m_status |= CALLSTACK_STATUS_NOTSTARTUPCRT; + } + + if (!(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) && + (endWith(functionName, len, L"CRT_INIT") || (foundline && isCrtStartupModule(sourceInfo.FileName)))) { + m_status |= CALLSTACK_STATUS_STARTUPCRT; + delete[] m_resolved; + m_resolved = NULL; + m_resolvedCapacity = 0; + m_resolvedLength = 0; + return 0; + } } bool isFrameInternal = false; @@ -517,24 +529,6 @@ int CallStack::resolve(BOOL showInternalFrames) } isPrevFrameInternal = isFrameInternal; - DWORD64 displacement64; - BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; - LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); - - if (skipStartupLeaks && beginWith(functionName, wcslen(functionName), L"`dynamic initializer for '")) { - m_status |= CALLSTACK_STATUS_NOTSTARTUPCRT; - } - - if (skipStartupLeaks && !(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) && - endWith(functionName, wcslen(functionName), L"CRT_INIT")) { - m_status |= CALLSTACK_STATUS_STARTUPCRT; - delete[] m_resolved; - m_resolved = NULL; - m_resolvedCapacity = 0; - m_resolvedLength = 0; - return 0; - } - if (!foundline) displacement = (DWORD)displacement64; NumChars = resolveFunction( programCounter, foundline ? &sourceInfo : NULL, diff --git a/src/vld.cpp b/src/vld.cpp index 18b4adda..6c28a55b 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -1707,10 +1707,14 @@ SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo, DWORD threadId) // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. continue; + } else if (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) { + // Check for crt startup allocations + if (info->callStack && info->callStack->isCrtStartupAlloc()) { + info->reported = true; + continue; + } } - } - - if (!info->debugCrtAlloc && (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS)) { + } else if (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) { // Check for crt startup allocations if (info->callStack && info->callStack->isCrtStartupAlloc()) { info->reported = true; @@ -1804,16 +1808,21 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. continue; + } else if (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) { + // Check for crt startup allocations + if (info->callStack && info->callStack->isCrtStartupAlloc()) { + info->reported = true; + continue; + } } + // The CRT header is more or less transparent to the user, so // the information about the contained block will probably be // more useful to the user. Accordingly, that's the information // we'll include in the report. address = CRTDBGBLOCKDATA(block); size = crtheader->size; - } - - if (!info->debugCrtAlloc && (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS)) { + } else if (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) { // Check for crt startup allocations if (info->callStack && info->callStack->isCrtStartupAlloc()) { info->reported = true; diff --git a/src/vldint.h b/src/vldint.h index 8001dc27..9aa00eb7 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -186,14 +186,15 @@ class CaptureContext { public: CaptureContext(context_t &context, BOOL debug, void* func, UINT_PTR fp = (UINT_PTR)_ReturnAddress()); ~CaptureContext(); - void Set(HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size); - void Reset(); + __forceinline void Set(HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size); private: // Disallow certain operations CaptureContext(); CaptureContext(const CaptureContext&); CaptureContext& operator=(const CaptureContext&); - inline void Capture(context_t &context); +private: + __forceinline void Capture(context_t &context); + void Reset(); private: tls_t *m_tls; BOOL m_bFirst; From 8010efe514a6fb181eaa6666596687fbf665d028 Mon Sep 17 00:00:00 2001 From: ioannis Date: Sun, 22 Nov 2015 18:23:03 +0200 Subject: [PATCH 291/321] Try identifying CRT start-up leaks by function --- src/callstack.cpp | 86 ++++++++++++++++++----------------------------- src/callstack.h | 2 +- src/vld.cpp | 54 +++++++++++++++++------------ src/vld_hooks.cpp | 4 +-- src/vldint.h | 2 ++ 5 files changed, 70 insertions(+), 78 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index a32e43b7..344cbfc1 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -304,28 +304,13 @@ bool CallStack::isCrtStartupAlloc() SIZE_T programCounter = (*this)[frame]; DWORD64 displacement64; LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); - size_t len = wcslen(functionName); - if (beginWith(functionName, len, L"`dynamic initializer for '")) { - m_status |= CALLSTACK_STATUS_NOTSTARTUPCRT; - return false; - } - - // We need to detect both "_CRT_INIT" for most x86 and x64 modules - // and "CRT_INIT" for some x64 modules - if (endWith(functionName, len, L"CRT_INIT")) { - m_status |= CALLSTACK_STATUS_STARTUPCRT; - return true; - } - - BOOL foundline = FALSE; - DWORD displacement = 0; - DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); - foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo); - - if (foundline && isCrtStartupModule(sourceInfo.FileName)) { + UINT status = isCrtStartupFunction(functionName); + if (status == CALLSTACK_STATUS_STARTUPCRT) { m_status |= CALLSTACK_STATUS_STARTUPCRT; return true; + } else if (status == CALLSTACK_STATUS_NOTSTARTUPCRT) { + break; } } @@ -496,19 +481,16 @@ int CallStack::resolve(BOOL showInternalFrames) LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); if (skipStartupLeaks && !(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT)) { - size_t len = wcslen(functionName); - if (beginWith(functionName, len, L"`dynamic initializer for '")) { - m_status |= CALLSTACK_STATUS_NOTSTARTUPCRT; - } - - if (!(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) && - (endWith(functionName, len, L"CRT_INIT") || (foundline && isCrtStartupModule(sourceInfo.FileName)))) { + UINT status = isCrtStartupFunction(functionName); + if (status == CALLSTACK_STATUS_STARTUPCRT) { m_status |= CALLSTACK_STATUS_STARTUPCRT; delete[] m_resolved; m_resolved = NULL; m_resolvedCapacity = 0; m_resolvedLength = 0; return 0; + } else if (status == CALLSTACK_STATUS_NOTSTARTUPCRT) { + m_status |= CALLSTACK_STATUS_NOTSTARTUPCRT; } } @@ -590,36 +572,32 @@ VOID CallStack::push_back (const UINT_PTR programcounter) m_size++; } -bool CallStack::isCrtStartupModule( const PWSTR filename ) const +UINT CallStack::isCrtStartupFunction( LPCWSTR functionName ) const { - size_t len = wcslen(filename); - return + size_t len = wcslen(functionName); + + if (beginWith(functionName, len, L"_malloc_crt") + || beginWith(functionName, len, L"_calloc_crt") + || endWith(functionName, len, L"CRT_INIT") + || endWith(functionName, len, L"initterm_e") // VS2015 - endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\stdio\\_file.cpp") || - endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\startup\\onexit.cpp") || - endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\startup\\initterm.cpp") || - endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\startup\\argv_parsing.cpp") || - endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\internal\\initialization.cpp") || - endWith(filename, len, L"\\crts\\ucrt\\src\\appcrt\\internal\\shared_initialization.cpp") || - endWith(filename, len, L"\\crts\\ucrt\\src\\desktopcrt\\env\\environment_initialization.cpp") || - // VS2013 - endWith(filename, len, L"\\crt\\crtw32\\lowio\\ioinit.c") || - endWith(filename, len, L"\\crt\\crtw32\\misc\\onexit.c") || - endWith(filename, len, L"\\crt\\crtw32\\stdio\\_file.c") || - endWith(filename, len, L"\\crt\\crtw32\\startup\\stdargv.c") || - endWith(filename, len, L"\\crt\\crtw32\\startup\\stdenvp.c") || - endWith(filename, len, L"\\crt\\crtw32\\startup\\tidtable.c") || - endWith(filename, len, L"\\crt\\crtw32\\mbstring\\mbctype.c") || - // VS2012 and bellow - endWith(filename, len, L"\\crt\\src\\crt0dat.c") || //_cinit() - endWith(filename, len, L"\\crt\\src\\onexit.c") || //__onexitinit() - endWith(filename, len, L"\\crt\\src\\stdargv.c") || //_wsetargv() - endWith(filename, len, L"\\crt\\src\\stdenvp.c") || //_wsetenvp() - endWith(filename, len, L"\\crt\\src\\ioinit.c") || //_ioinit() - endWith(filename, len, L"\\crt\\src\\tidtable.c") || //_mtinit() - endWith(filename, len, L"\\crt\\src\\mbctype.c") || //__initmbctable() - // default - (false); + || beginWith(functionName, len, L"common_initialize_environment_nolock<") + || beginWith(functionName, len, L"common_configure_argv<") + || beginWith(functionName, len, L"__acrt_initialize") + || beginWith(functionName, len, L"__acrt_allocate_buffer_for_argv") + || beginWith(functionName, len, L"_register_onexit_function") + ) { + return CALLSTACK_STATUS_STARTUPCRT; + } + + if (endWith(functionName, len, L"DllMainCRTStartup") + || endWith(functionName, len, L"mainCRTStartup") + || beginWith(functionName, len, L"`dynamic initializer for '")) { + // When we reach this point there is no reason going furhter down the stack + return CALLSTACK_STATUS_NOTSTARTUPCRT; + } + + return NULL; } bool CallStack::isInternalModule( const PWSTR filename ) const diff --git a/src/callstack.h b/src/callstack.h index de959df9..72dbd097 100644 --- a/src/callstack.h +++ b/src/callstack.h @@ -125,7 +125,7 @@ class CallStack // human readable form. Currently this is only called by the dump method. void dumpResolved() const; bool isInternalModule( const PWSTR filename ) const; - bool isCrtStartupModule( const PWSTR filename ) const; + UINT isCrtStartupFunction( LPCWSTR functionName ) const; LPCWSTR getFunctionName(SIZE_T programCounter, DWORD64& displacement64, SYMBOL_INFO* functionInfo, CriticalSectionLocker& locker) const; DWORD resolveFunction(SIZE_T programCounter, IMAGEHLP_LINEW64* sourceInfo, DWORD displacement, diff --git a/src/vld.cpp b/src/vld.cpp index 6c28a55b..cbb3ea32 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -486,9 +486,9 @@ VisualLeakDetector::VisualLeakDetector () delete oldmodules; m_status |= VLD_STATUS_INSTALLED; - HMODULE dbghelp = GetModuleHandleW(L"dbghelp.dll"); - if (dbghelp) - ChangeModuleState(dbghelp, false); + m_dbghlpBase = GetModuleHandleW(L"dbghelp.dll"); + if (m_dbghlpBase) + ChangeModuleState(m_dbghlpBase, false); Report(L"Visual Leak Detector Version " VLDVERSION L" installed.\n"); if (m_status & VLD_STATUS_FORCE_REPORT_TO_FILE) { @@ -803,7 +803,7 @@ VOID VisualLeakDetector::attachToLoadedModules (ModuleSet *newmodules) moduleimageinfo.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); BOOL SymbolsLoaded = g_DbgHelp.SymGetModuleInfoW64(g_currentProcess, modulebase, &moduleimageinfo, locker); - if (!SymbolsLoaded) + if (!SymbolsLoaded || moduleimageinfo.BaseOfImage != modulebase) { DbgTrace(L"dbghelp32.dll %i: SymLoadModuleEx\n", GetCurrentThreadId()); DWORD64 module = g_DbgHelp.SymLoadModuleExW(g_currentProcess, NULL, modulepath, NULL, modulebase, modulesize, NULL, 0, locker); @@ -1707,14 +1707,10 @@ SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo, DWORD threadId) // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. continue; - } else if (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) { - // Check for crt startup allocations - if (info->callStack && info->callStack->isCrtStartupAlloc()) { - info->reported = true; - continue; - } } - } else if (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) { + } + + if (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) { // Check for crt startup allocations if (info->callStack && info->callStack->isCrtStartupAlloc()) { info->reported = true; @@ -1808,12 +1804,6 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. continue; - } else if (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) { - // Check for crt startup allocations - if (info->callStack && info->callStack->isCrtStartupAlloc()) { - info->reported = true; - continue; - } } // The CRT header is more or less transparent to the user, so @@ -1822,7 +1812,9 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S // we'll include in the report. address = CRTDBGBLOCKDATA(block); size = crtheader->size; - } else if (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) { + } + + if (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) { // Check for crt startup allocations if (info->callStack && info->callStack->isCrtStartupAlloc()) { info->reported = true; @@ -2824,7 +2816,6 @@ CaptureContext::CaptureContext(context_t &context, BOOL debug, void* func, UINT_ } m_bFirst = (GET_RETURN_ADDRESS(m_tls->context) == NULL); - m_bExclude = g_vld.isModuleExcluded(fp); if (m_bFirst) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. @@ -2837,7 +2828,7 @@ CaptureContext::CaptureContext(context_t &context, BOOL debug, void* func, UINT_ CaptureContext::~CaptureContext() { if (m_bFirst) { - if ((!m_bExclude) && (m_tls->blockWithoutGuard)) { + if ((m_tls->blockWithoutGuard) && (!IsExcludedModule())) { blockinfo_t* pblockInfo = NULL; if (m_tls->newBlockWithoutGuard == NULL) { g_vld.mapBlock(m_tls->heap, @@ -2899,7 +2890,28 @@ void CaptureContext::Set(HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size) { } void CaptureContext::Reset() { - m_tls->context = { NULL }; + m_tls->context.func = NULL; + m_tls->context.fp = NULL; +#if defined(_M_IX86) + m_tls->context.Ebp = m_tls->context.Esp = m_tls->context.Eip = NULL; +#elif defined(_M_X64) + m_tls->context.Rbp = m_tls->context.Rsp = m_tls->context.Rip = NULL; +#endif m_tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; Set(NULL, NULL, NULL, NULL); } + +BOOL CaptureContext::IsExcludedModule() { + HMODULE hModule = GetCallingModule(m_fp); + if (hModule == g_vld.m_dbghlpBase) + return TRUE; + + UINT tablesize = _countof(g_vld.m_patchTable); + for (UINT index = 0; index < tablesize; index++) { + if (((HMODULE)g_vld.m_patchTable[index].moduleBase == hModule)) { + return !g_vld.m_patchTable[index].reportLeaks; + } + } + + return g_vld.isModuleExcluded((UINT_PTR)hModule); +} \ No newline at end of file diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 311fc79a..38c95429 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -865,7 +865,7 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - CaptureContext cc(context, TRUE, NULL); + CaptureContext cc(context, FALSE, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. return pnew_dbg(size, type, file, line); @@ -900,7 +900,7 @@ void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - CaptureContext cc(context, TRUE, NULL); + CaptureContext cc(context, FALSE, NULL); // Do the allocation. The block will be mapped by _RtlAllocateHeap. return pnew_dbg_mfc(size, file, line); diff --git a/src/vldint.h b/src/vldint.h index 9aa00eb7..bee2f924 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -194,6 +194,7 @@ class CaptureContext { CaptureContext& operator=(const CaptureContext&); private: __forceinline void Capture(context_t &context); + BOOL IsExcludedModule(); void Reset(); private: tls_t *m_tls; @@ -430,6 +431,7 @@ class VisualLeakDetector : public IMalloc CriticalSection m_tlsLock; // Protects accesses to the Set of TLS structures. TlsMap *m_tlsMap; // Set of all thread-local storage structures for the process. HMODULE m_vldBase; // Visual Leak Detector's own module handle (base address). + HMODULE m_dbghlpBase; VOID __stdcall ChangeModuleState(HMODULE module, bool on); static GetProcAddress_t m_GetProcAddress; From 1ad587e8a1d5809a3ed5aa113c183aab431d335a Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Tue, 24 Nov 2015 03:27:46 +0300 Subject: [PATCH 292/321] Memory block size reporting for UCRT 32bit fixed --- src/crtmfcpatch.h | 280 ++++++++++---- src/vld.cpp | 189 +++++---- src/vld_hooks.cpp | 951 +--------------------------------------------- src/vldheap.h | 23 +- src/vldint.h | 55 +-- 5 files changed, 358 insertions(+), 1140 deletions(-) diff --git a/src/crtmfcpatch.h b/src/crtmfcpatch.h index 9064ab13..6320d11f 100644 --- a/src/crtmfcpatch.h +++ b/src/crtmfcpatch.h @@ -179,13 +179,16 @@ void* CrtPatch::crtd__calloc_dbg (size_t num, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _calloc_dbg_t pcrtxxd__calloc_dbg = (_calloc_dbg_t)data.pcrtd__calloc_dbg; assert(pcrtxxd__calloc_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__calloc_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__calloc_dbg); - return g_vld.__calloc_dbg(pcrtxxd__calloc_dbg, context, debug, num, size, type, file, line); + return pcrtxxd__calloc_dbg(num, size, type, file, line); } // crtd__malloc_dbg - Calls to _malloc_dbg from msvcrXXd.dll are patched @@ -210,13 +213,16 @@ void* CrtPatch::crtd__malloc_dbg (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _malloc_dbg_t pcrtxxd__malloc_dbg = (_malloc_dbg_t)data.pcrtd__malloc_dbg; assert(pcrtxxd__malloc_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__malloc_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__malloc_dbg); - return g_vld.__malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, type, file, line); + return pcrtxxd__malloc_dbg(size, type, file, line); } // crtd__realloc_dbg - Calls to _realloc_dbg from msvcrXXd.dll are patched @@ -244,13 +250,16 @@ void* CrtPatch::crtd__realloc_dbg (void *mem, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _realloc_dbg_t pcrtxxd__realloc_dbg = (_realloc_dbg_t)data.pcrtd__realloc_dbg; assert(pcrtxxd__realloc_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__realloc_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__realloc_dbg); - return g_vld.__realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, type, file, line); + return pcrtxxd__realloc_dbg(mem, size, type, file, line); } // crtd__recalloc_dbg - Calls to _recalloc_dbg from msvcrXXd.dll are patched @@ -279,13 +288,16 @@ void* CrtPatch::crtd__recalloc_dbg (void *mem, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _recalloc_dbg_t pcrtxxd__recalloc_dbg = (_recalloc_dbg_t)data.pcrtd__recalloc_dbg; assert(pcrtxxd__recalloc_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__recalloc_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__recalloc_dbg); - return g_vld.__recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, type, file, line); + return pcrtxxd__recalloc_dbg(mem, num, size, type, file, line); } @@ -295,13 +307,16 @@ char* CrtPatch::crtd__strdup_dbg (const char* src, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _strdup_dbg_t pcrtxxd__strdup_dbg = (_strdup_dbg_t)data.pcrtd__strdup_dbg; assert(pcrtxxd__strdup_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__strdup_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__strdup_dbg); - return g_vld.__strdup_dbg(pcrtxxd__strdup_dbg, context, debug, src, type, file, line); + return pcrtxxd__strdup_dbg(src, type, file, line); } @@ -311,13 +326,16 @@ wchar_t* CrtPatch::crtd__wcsdup_dbg (const wchar_t* src, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _wcsdup_dbg_t pcrtxxd__wcsdup_dbg = (_wcsdup_dbg_t)data.pcrtd__wcsdup_dbg; assert(pcrtxxd__wcsdup_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__wcsdup_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__wcsdup_dbg); - return g_vld.__wcsdup_dbg(pcrtxxd__wcsdup_dbg, context, debug, src, type, file, line); + return pcrtxxd__wcsdup_dbg(src, type, file, line); } // crtd__scalar_new_dbg - Calls to the CRT's debug scalar new operator from @@ -342,13 +360,16 @@ void* CrtPatch::crtd__scalar_new_dbg (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)data.pcrtd__scalar_new_dbg; assert(pcrtxxd_new_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_new_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_new_dbg); - return g_vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); + return pcrtxxd_new_dbg(size, type, file, line); } // crtd__vector_new_dbg - Calls to the CRT's debug vector new operator from @@ -373,13 +394,16 @@ void* CrtPatch::crtd__vector_new_dbg (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)data.pcrtd__vector_new_dbg; assert(pcrtxxd_new_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_new_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_new_dbg); - return g_vld.__new_dbg_crt(pcrtxxd_new_dbg, context, debug, size, type, file, line); + return pcrtxxd_new_dbg(size, type, file, line); } // crtd_calloc - Calls to calloc from msvcrXXd.dll are patched through to @@ -398,13 +422,16 @@ void* CrtPatch::crtd__vector_new_dbg (size_t size, template void* CrtPatch::crtd_calloc (size_t num, size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif calloc_t pcrtxxd_calloc = (calloc_t)data.pcrtd_calloc; assert(pcrtxxd_calloc); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_calloc); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_calloc); - return g_vld._calloc(pcrtxxd_calloc, context, debug, num, size); + return pcrtxxd_calloc(num, size); } // crtd_malloc - Calls to malloc from msvcrXXd.dll are patched through to @@ -421,13 +448,16 @@ void* CrtPatch::crtd_calloc (size_t num, size_t size) template void* CrtPatch::crtd_malloc (size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif malloc_t pcrtxxd_malloc = (malloc_t)data.pcrtd_malloc; assert(pcrtxxd_malloc); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_malloc); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_malloc); - return g_vld._malloc(pcrtxxd_malloc, context, debug, size); + return pcrtxxd_malloc(size); } // crtd_realloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -446,13 +476,16 @@ void* CrtPatch::crtd_malloc (size_t size) template void* CrtPatch::crtd_realloc (void *mem, size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif realloc_t pcrtxxd_realloc = (realloc_t)data.pcrtd_realloc; assert(pcrtxxd_realloc); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_realloc); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_realloc); - return g_vld._realloc(pcrtxxd_realloc, context, debug, mem, size); + return pcrtxxd_realloc(mem, size); } // crtd__recalloc - Calls to _recalloc from msvcrXXd.dll are patched through to @@ -471,38 +504,47 @@ void* CrtPatch::crtd_realloc (void *mem, size_t size) template void* CrtPatch::crtd__recalloc (void *mem, size_t num, size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _recalloc_t pcrtxxd_recalloc = (_recalloc_t)data.pcrtd_recalloc; assert(pcrtxxd_recalloc); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_recalloc); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_recalloc); - return g_vld.__recalloc(pcrtxxd_recalloc, context, debug, mem, num, size); + return pcrtxxd_recalloc(mem, num, size); } template char* CrtPatch::crtd__strdup (const char* src) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _strdup_t pcrtxxd_strdup = (_strdup_t)data.pcrtd__strdup; assert(pcrtxxd_strdup); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_strdup); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_strdup); - return g_vld.__strdup(pcrtxxd_strdup, context, debug, src); + return pcrtxxd_strdup(src); } template wchar_t* CrtPatch::crtd__wcsdup (const wchar_t* src) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _wcsdup_t pcrtxxd_wcsdup = (_wcsdup_t)data.pcrtd__wcsdup; assert(pcrtxxd_wcsdup); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_wcsdup); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_wcsdup); - return g_vld.__wcsdup(pcrtxxd_wcsdup, context, debug, src); + return pcrtxxd_wcsdup(src); } // crtd__aligned_malloc_dbg - Calls to _aligned_malloc_dbg from msvcrXXd.dll are patched @@ -528,13 +570,16 @@ void* CrtPatch::crtd__aligned_malloc_dbg (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_malloc_dbg_t pcrtxxd__aligned_malloc_dbg = (_aligned_malloc_dbg_t)data.pcrtd__aligned_malloc_dbg; assert(pcrtxxd__aligned_malloc_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__aligned_malloc_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__aligned_malloc_dbg); - return g_vld.__aligned_malloc_dbg(pcrtxxd__aligned_malloc_dbg, context, debug, size, alignment, type, file, line); + return pcrtxxd__aligned_malloc_dbg(size, alignment, type, file, line); } // crtd__aligned_offset_malloc_dbg - Calls to _aligned_offset_malloc_dbg from msvcrXXd.dll are patched @@ -561,13 +606,16 @@ void* CrtPatch::crtd__aligned_offset_malloc_dbg (size_t char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_offset_malloc_dbg_t pcrtxxd__malloc_dbg = (_aligned_offset_malloc_dbg_t)data.pcrtd__aligned_offset_malloc_dbg; assert(pcrtxxd__malloc_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__malloc_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__malloc_dbg); - return g_vld.__aligned_offset_malloc_dbg(pcrtxxd__malloc_dbg, context, debug, size, alignment, offset, type, file, line); + return pcrtxxd__malloc_dbg(size, alignment, offset, type, file, line); } // crtd__aligned_realloc_dbg - Calls to _aligned_realloc_dbg from msvcrXXd.dll are patched @@ -596,13 +644,16 @@ void* CrtPatch::crtd__aligned_realloc_dbg (void *mem, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_realloc_dbg_t)data.pcrtd__aligned_realloc_dbg; assert(pcrtxxd__realloc_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__realloc_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__realloc_dbg); - return g_vld.__aligned_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, type, file, line); + return pcrtxxd__realloc_dbg(mem, size, alignment, type, file, line); } // crtd__aligned_offset_realloc_dbg - Calls to _aligned_offset_realloc_dbg from msvcrXXd.dll are patched @@ -632,13 +683,16 @@ void* CrtPatch::crtd__aligned_offset_realloc_dbg (void char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_offset_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_offset_realloc_dbg_t)data.pcrtd__aligned_offset_realloc_dbg; assert(pcrtxxd__realloc_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__realloc_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__realloc_dbg); - return g_vld.__aligned_offset_realloc_dbg(pcrtxxd__realloc_dbg, context, debug, mem, size, alignment, offset, type, file, line); + return pcrtxxd__realloc_dbg(mem, size, alignment, offset, type, file, line); } // crtd__aligned_recalloc_dbg - Calls to _aligned_recalloc_dbg from msvcrXXd.dll are patched @@ -670,13 +724,16 @@ void* CrtPatch::crtd__aligned_recalloc_dbg (void *mem, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_recalloc_dbg_t)data.pcrtd__aligned_recalloc_dbg; assert(pcrtxxd__recalloc_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__recalloc_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__recalloc_dbg); - return g_vld.__aligned_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, type, file, line); + return pcrtxxd__recalloc_dbg(mem, num, size, alignment, type, file, line); } // crtd__aligned_offset_recalloc_dbg - Calls to _aligned_offset_realloc_dbg from msvcrXXd.dll are patched @@ -709,13 +766,16 @@ void* CrtPatch::crtd__aligned_offset_recalloc_dbg (void char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_offset_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_offset_recalloc_dbg_t)data.pcrtd__aligned_offset_recalloc_dbg; assert(pcrtxxd__recalloc_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd__recalloc_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__recalloc_dbg); - return g_vld.__aligned_offset_recalloc_dbg(pcrtxxd__recalloc_dbg, context, debug, mem, num, size, alignment, offset, type, file, line); + return pcrtxxd__recalloc_dbg(mem, num, size, alignment, offset, type, file, line); } // crtd__aligned_malloc - Calls to malloc from msvcrXXd.dll are patched through to @@ -732,13 +792,16 @@ void* CrtPatch::crtd__aligned_offset_recalloc_dbg (void template void* CrtPatch::crtd__aligned_malloc (size_t size, size_t alignment) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_malloc_t pcrtxxd_malloc = (_aligned_malloc_t)data.pcrtd_aligned_malloc; assert(pcrtxxd_malloc); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_malloc); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_malloc); - return g_vld.__aligned_malloc(pcrtxxd_malloc, context, debug, size, alignment); + return pcrtxxd_malloc(size, alignment); } // crtd__aligned_offset_malloc - Calls to malloc from msvcrXXd.dll are patched through to @@ -755,13 +818,16 @@ void* CrtPatch::crtd__aligned_malloc (size_t size, size_t ali template void* CrtPatch::crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_offset_malloc_t pcrtxxd_malloc = (_aligned_offset_malloc_t)data.pcrtd_aligned_offset_malloc; assert(pcrtxxd_malloc); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_malloc); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_malloc); - return g_vld.__aligned_offset_malloc(pcrtxxd_malloc, context, debug, size, alignment, offset); + return pcrtxxd_malloc(size, alignment, offset); } // crtd__aligned_realloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -780,13 +846,16 @@ void* CrtPatch::crtd__aligned_offset_malloc (size_t size, siz template void* CrtPatch::crtd__aligned_realloc (void *mem, size_t size, size_t alignment) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_realloc_t pcrtxxd_realloc = (_aligned_realloc_t)data.pcrtd_aligned_realloc; assert(pcrtxxd_realloc); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_realloc); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_realloc); - return g_vld.__aligned_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment); + return pcrtxxd_realloc(mem, size, alignment); } // crtd__aligned_offset_realloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -805,13 +874,16 @@ void* CrtPatch::crtd__aligned_realloc (void *mem, size_t size template void* CrtPatch::crtd__aligned_offset_realloc (void *mem, size_t size, size_t alignment, size_t offset) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_offset_realloc_t pcrtxxd_realloc = (_aligned_offset_realloc_t)data.pcrtd_aligned_offset_realloc; assert(pcrtxxd_realloc); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_realloc); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_realloc); - return g_vld.__aligned_offset_realloc(pcrtxxd_realloc, context, debug, mem, size, alignment, offset); + return pcrtxxd_realloc(mem, size, alignment, offset); } // crtd__aligned_recalloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -832,13 +904,16 @@ void* CrtPatch::crtd__aligned_offset_realloc (void *mem, size template void* CrtPatch::crtd__aligned_recalloc (void *mem, size_t num, size_t size, size_t alignment) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_recalloc_t pcrtxxd_recalloc = (_aligned_recalloc_t)data.pcrtd_aligned_recalloc; assert(pcrtxxd_recalloc); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_recalloc); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_recalloc); - return g_vld.__aligned_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment); + return pcrtxxd_recalloc(mem, num, size, alignment); } // crtd__aligned_offset_recalloc - Calls to realloc from msvcrXXd.dll are patched through to @@ -859,13 +934,16 @@ void* CrtPatch::crtd__aligned_recalloc (void *mem, size_t num template void* CrtPatch::crtd__aligned_offset_recalloc (void *mem, size_t num, size_t size, size_t alignment, size_t offset) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif _aligned_offset_recalloc_t pcrtxxd_recalloc = (_aligned_offset_recalloc_t)data.pcrtd_aligned_offset_recalloc; assert(pcrtxxd_recalloc); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_recalloc); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_recalloc); - return g_vld.__aligned_offset_recalloc(pcrtxxd_recalloc, context, debug, mem, num, size, alignment, offset); + return pcrtxxd_recalloc(mem, num, size, alignment, offset); } // crtd_scalar_new - Calls to the CRT's scalar new operator from msvcrXXd.dll @@ -880,13 +958,16 @@ void* CrtPatch::crtd__aligned_offset_recalloc (void *mem, siz template void* CrtPatch::crtd_scalar_new (size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_t pcrtxxd_scalar_new = (new_t)data.pcrtd_scalar_new; assert(pcrtxxd_scalar_new); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_scalar_new); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_scalar_new); - return g_vld._new(pcrtxxd_scalar_new, context, debug, size); + return pcrtxxd_scalar_new(size); } // crtd_vector_new - Calls to the CRT's vector new operator from msvcrXXd.dll @@ -901,13 +982,16 @@ void* CrtPatch::crtd_scalar_new (size_t size) template void* CrtPatch::crtd_vector_new (size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_t pcrtxxd_vector_new = (new_t)data.pcrtd_vector_new; assert(pcrtxxd_vector_new); context_t context; - CaptureContext cc(context, debug, (void*)pcrtxxd_vector_new); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_vector_new); - return g_vld._new(pcrtxxd_vector_new, context, debug, size); + return pcrtxxd_vector_new(size); } //////////////////////////////////////////////////////////////////////////////// @@ -938,13 +1022,16 @@ void* MfcPatch::mfcd__scalar_new_dbg_4p (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); - return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); + return pmfcxxd__new_dbg(size, type, file, line); } // mfcd__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from @@ -966,13 +1053,16 @@ void* MfcPatch::mfcd__scalar_new_dbg_3p (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcd__scalar_new_dbg_3p; assert(pmfcxxd__new_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); - return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); + return pmfcxxd__new_dbg(size, file, line); } // mfcd__vector_new_dbg_4p - Calls to the MFC debug vector new operator from @@ -997,13 +1087,16 @@ void* MfcPatch::mfcd__vector_new_dbg_4p (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__vector_new_dbg_4p; assert(pmfcxxd__new_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); - return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); + return pmfcxxd__new_dbg(size, type, file, line); } // mfcd__vector_new_dbg_3p - Calls to the MFC debug vector new operator from @@ -1025,13 +1118,16 @@ void* MfcPatch::mfcd__vector_new_dbg_3p (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcd__vector_new_dbg_3p; assert(pmfcxxd__new_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); - return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); + return pmfcxxd__new_dbg(size, file, line); } // mfcd_scalar_new - Calls to the MFC scalar new operator from mfcXXd.dll are @@ -1046,13 +1142,16 @@ void* MfcPatch::mfcd__vector_new_dbg_3p (size_t size, template void* MfcPatch::mfcd_scalar_new (size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_t pmfcxxd_new = (new_t)data.pmfcd_scalar_new; assert(pmfcxxd_new); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd_new); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd_new); - return g_vld._new(pmfcxxd_new, context, debug, size); + return pmfcxxd_new(size); } // mfcd_vector_new - Calls to the MFC vector new operator from mfcXXd.dll are @@ -1067,13 +1166,16 @@ void* MfcPatch::mfcd_scalar_new (size_t size) template void* MfcPatch::mfcd_vector_new (size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_t pmfcxxd_new = (new_t)data.pmfcd_vector_new; assert(pmfcxxd_new); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd_new); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd_new); - return g_vld._new(pmfcxxd_new, context, debug, size); + return pmfcxxd_new(size); } // mfcud__scalar_new_dbg_4p - Calls to the MFC debug scalar new operator from @@ -1098,13 +1200,16 @@ void* MfcPatch::mfcud__scalar_new_dbg_4p (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); - return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); + return pmfcxxd__new_dbg(size, type, file, line); } // mfcud__scalar_new_dbg_3p - Calls to the MFC debug scalar new operator from @@ -1126,13 +1231,16 @@ void* MfcPatch::mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcud__scalar_new_dbg_3p; assert(pmfcxxd__new_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); - return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); + return pmfcxxd__new_dbg(size, file, line); } // mfcud__vector_new_dbg_4p - Calls to the MFC debug vector new operator from @@ -1157,13 +1265,16 @@ void* MfcPatch::mfcud__vector_new_dbg_4p (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__vector_new_dbg_4p; assert(pmfcxxd__new_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); - return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, type, file, line); + return pmfcxxd__new_dbg(size, type, file, line); } // mfcud__vector_new_dbg_3p - Calls to the MFC debug vector new operator from @@ -1185,13 +1296,16 @@ void* MfcPatch::mfcud__vector_new_dbg_3p (size_t size, char const *file, int line) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcud__vector_new_dbg_3p; assert(pmfcxxd__new_dbg); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd__new_dbg); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); - return g_vld.__new_dbg_mfc(pmfcxxd__new_dbg, context, size, file, line); + return pmfcxxd__new_dbg(size, file, line); } // mfcud_scalar_new - Calls to the MFC scalar new operator from mfcXXud.dll are @@ -1206,13 +1320,16 @@ void* MfcPatch::mfcud__vector_new_dbg_3p (size_t size, template void* MfcPatch::mfcud_scalar_new (size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_t pmfcxxd_new = (new_t)data.pmfcud_scalar_new; assert(pmfcxxd_new); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd_new); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd_new); - return g_vld._new(pmfcxxd_new, context, debug, size); + return pmfcxxd_new(size); } // mfcud_vector_new - Calls to the MFC vector new operator from mfcXXud.dll are @@ -1227,13 +1344,16 @@ void* MfcPatch::mfcud_scalar_new (size_t size) template void* MfcPatch::mfcud_vector_new (size_t size) { +#ifdef PRINTHOOKCALLS + DbgReport(_T(__FUNCTION__) _T("\n")); +#endif new_t pmfcxxd_new = (new_t)data.pmfcud_vector_new; assert(pmfcxxd_new); context_t context; - CaptureContext cc(context, debug, (void*)pmfcxxd_new); + CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd_new); - return g_vld._new(pmfcxxd_new, context, debug, size); + return pmfcxxd_new(size); } // Visual Studio 6.0 diff --git a/src/vld.cpp b/src/vld.cpp index cbb3ea32..14875157 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -1328,7 +1328,7 @@ tls_t* VisualLeakDetector::getTls () // // None. // -VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool debugcrtalloc, DWORD threadId, blockinfo_t* &pblockInfo) +VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool debugcrtalloc, bool ucrt, DWORD threadId, blockinfo_t* &pblockInfo) { CriticalSectionLocker<> cs(g_heapMapLock); @@ -1341,6 +1341,7 @@ VOID VisualLeakDetector::mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool d blockinfo->size = size; blockinfo->reported = false; blockinfo->debugCrtAlloc = debugcrtalloc; + blockinfo->ucrt = ucrt; if (SIZE_MAX - m_totalAlloc > size) m_totalAlloc += size; @@ -1543,7 +1544,7 @@ VOID VisualLeakDetector::unmapHeap (HANDLE heap) // None. // VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - bool debugcrtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context) + bool debugcrtalloc, bool ucrt, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context) { CriticalSectionLocker<> cs(g_heapMapLock); @@ -1551,7 +1552,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // The block was not reallocated in-place. Instead the old block was // freed and a new block allocated to satisfy the new size. unmapBlock(heap, mem, context); - mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo); + mapBlock(heap, newmem, size, debugcrtalloc, ucrt, threadId, pblockInfo); return; } @@ -1563,7 +1564,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S // block has also not been mapped to a blockinfo_t entry yet either, // so treat this reallocation as a brand-new allocation (this will // also map the heap to a new block map). - mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo); + mapBlock(heap, newmem, size, debugcrtalloc, ucrt, threadId, pblockInfo); return; } @@ -1573,7 +1574,7 @@ VOID VisualLeakDetector::remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, S if (blockit == blockmap->end()) { // The block hasn't been mapped to a blockinfo_t entry yet. // Treat this reallocation as a new allocation. - mapBlock(heap, newmem, size, debugcrtalloc, threadId, pblockInfo); + mapBlock(heap, newmem, size, debugcrtalloc, ucrt, threadId, pblockInfo); return; } @@ -1661,6 +1662,32 @@ VOID VisualLeakDetector::reportConfig () } } +bool VisualLeakDetector::isDebugCrtAlloc( LPCVOID block, blockinfo_t* info ) +{ + // Autodetection allocations from statically linked CRT + if (!info->debugCrtAlloc) { + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + SIZE_T nSize = sizeof(crtdbgblockheader_t) + crtheader->size + GAPSIZE; + int nValid = _CrtIsValidPointer(block, (unsigned int)info->size, TRUE); + if (_BLOCK_TYPE_IS_VALID(crtheader->use) && nValid && (nSize == info->size)) { + info->debugCrtAlloc = true; + info->ucrt = false; + } + } + + if (!info->debugCrtAlloc) { + crtdbgblockheaderucrt_t* crtheader = (crtdbgblockheaderucrt_t*)block; + SIZE_T nSize = sizeof(crtdbgblockheaderucrt_t) + crtheader->size + GAPSIZE; + int nValid = _CrtIsValidPointer(block, (unsigned int)info->size, TRUE); + if (_BLOCK_TYPE_IS_VALID(crtheader->use) && nValid && (nSize == info->size)) { + info->debugCrtAlloc = true; + info->ucrt = true; + } + } + + return info->debugCrtAlloc; +} + // getleakscount - Calculate number of memory leaks. // // - heap (IN): Handle to the heap for which to generate a memory leak @@ -1687,23 +1714,14 @@ SIZE_T VisualLeakDetector::getLeaksCount (heapinfo_t* heapinfo, DWORD threadId) if (threadId != ((DWORD)-1) && info->threadId != threadId) continue; - if (!info->debugCrtAlloc) { - crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - SIZE_T nSize = sizeof(crtdbgblockheader_t) + crtheader->size + GAPSIZE; - int nValid = _CrtIsValidPointer(block, (unsigned int)info->size, TRUE); - if (_BLOCK_TYPE_IS_VALID(crtheader->use) && nValid && (nSize == info->size)) { - info->debugCrtAlloc = true; - } - } - - if (info->debugCrtAlloc) { + if (isDebugCrtAlloc(block, info)) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header pretended to it. - crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + int blockUse = getCrtBlockUse(block, info->ucrt); // Leaks identified as CRT_USE_IGNORE should not be ignored here otherwise // DynamicLoader/Thread test will randomly fail with less leaks being reported. - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || - CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) { + if (CRT_USE_TYPE(blockUse) == CRT_USE_FREE || + CRT_USE_TYPE(blockUse) == CRT_USE_INTERNAL) { // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. continue; @@ -1759,6 +1777,34 @@ SIZE_T VisualLeakDetector::reportHeapLeaks (HANDLE heap) return leaks_count; } +int VisualLeakDetector::getCrtBlockUse(LPCVOID block, bool ucrt) +{ + if (!ucrt) + { + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + return crtheader->use; + } + else + { + crtdbgblockheaderucrt_t* crtheader = (crtdbgblockheaderucrt_t*)block; + return crtheader->use; + } +} + +size_t VisualLeakDetector::getCrtBlockSize(LPCVOID block, bool ucrt) +{ + if (!ucrt) + { + crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + return crtheader->size; + } + else + { + crtdbgblockheaderucrt_t* crtheader = (crtdbgblockheaderucrt_t*)block; + return crtheader->size; + } +} + SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, Set &aggregatedLeaks, DWORD threadId) { BlockMap* blockmap = &heapinfo->blockMap; @@ -1783,23 +1829,14 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S LPCVOID address = block; SIZE_T size = info->size; - if (!info->debugCrtAlloc) { - crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - SIZE_T nSize = sizeof(crtdbgblockheader_t) + crtheader->size + GAPSIZE; - int nValid = _CrtIsValidPointer(block, (unsigned int)info->size, TRUE); - if (_BLOCK_TYPE_IS_VALID(crtheader->use) && nValid && (nSize == info->size)) { - info->debugCrtAlloc = true; - } - } - - if (info->debugCrtAlloc) { + if (isDebugCrtAlloc( block, info )) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header pretended to it. - crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; + int blockUse = getCrtBlockUse( block, info->ucrt ); // Leaks identified as CRT_USE_IGNORE should not be ignored here otherwise // DynamicLoader/Thread test will randomly fail with less leaks being reported. - if (CRT_USE_TYPE(crtheader->use) == CRT_USE_FREE || - CRT_USE_TYPE(crtheader->use) == CRT_USE_INTERNAL) + if (CRT_USE_TYPE(blockUse) == CRT_USE_FREE || + CRT_USE_TYPE(blockUse) == CRT_USE_INTERNAL) { // This block is marked as being used internally by the CRT. // The CRT will free the block after VLD is destroyed. @@ -1811,7 +1848,7 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S // more useful to the user. Accordingly, that's the information // we'll include in the report. address = CRTDBGBLOCKDATA(block); - size = crtheader->size; + size = getCrtBlockSize(block, info->ucrt); } if (m_options & VLD_OPT_SKIP_CRTSTARTUP_LEAKS) { @@ -1834,7 +1871,7 @@ SIZE_T VisualLeakDetector::reportLeaks (heapinfo_t* heapinfo, bool &firstLeak, S { crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; Report(L" CRT Alloc ID: %Iu\n", crtheader->request); - assert(size == crtheader->size); + assert(size == getCrtBlockSize(block, info->ucrt)); } #endif assert(info->callStack); @@ -2747,16 +2784,7 @@ int VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) const void* address = block; assert(address != NULL); - if (!info->debugCrtAlloc) { - crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; - SIZE_T nSize = sizeof(crtdbgblockheader_t) + crtheader->size + GAPSIZE; - int nValid = _CrtIsValidPointer(block, (unsigned int)info->size, TRUE); - if (_BLOCK_TYPE_IS_VALID(crtheader->use) && nValid && (nSize == info->size)) { - info->debugCrtAlloc = true; - } - } - - if (info->debugCrtAlloc) { + if (isDebugCrtAlloc(block, info)) { // This block is allocated to a CRT heap, so the block has a CRT // memory block header prepended to it. crtdbgblockheader_t* crtheader = (crtdbgblockheader_t*)block; @@ -2807,14 +2835,17 @@ int VisualLeakDetector::ResolveCallstacks() return unresolvedFunctionsCount; } - -CaptureContext::CaptureContext(context_t &context, BOOL debug, void* func, UINT_PTR fp) : m_func(func), m_fp(fp) { +CaptureContext::CaptureContext(context_t &context, BOOL debug, BOOL ucrt, void* func, UINT_PTR fp) : m_fp(fp), m_func(func) { m_tls = g_vld.getTls(); if (debug) { m_tls->flags |= VLD_TLS_DEBUGCRTALLOC; } + if (ucrt) { + m_tls->flags |= VLD_TLS_UCRT; + } + m_bFirst = (GET_RETURN_ADDRESS(m_tls->context) == NULL); if (m_bFirst) { // This is the first call to enter VLD for the current allocation. @@ -2826,35 +2857,53 @@ CaptureContext::CaptureContext(context_t &context, BOOL debug, void* func, UINT_ } } -CaptureContext::~CaptureContext() { +CaptureContext::CaptureContext(context_t &context, void* func, UINT_PTR fp) : m_fp(fp), m_func(func) { + m_tls = g_vld.getTls(); + + m_bFirst = (GET_RETURN_ADDRESS(m_tls->context) == NULL); if (m_bFirst) { - if ((m_tls->blockWithoutGuard) && (!IsExcludedModule())) { - blockinfo_t* pblockInfo = NULL; - if (m_tls->newBlockWithoutGuard == NULL) { - g_vld.mapBlock(m_tls->heap, - m_tls->blockWithoutGuard, - m_tls->size, - (m_tls->flags & VLD_TLS_DEBUGCRTALLOC), - m_tls->threadId, - pblockInfo); - } else { - g_vld.remapBlock(m_tls->heap, - m_tls->blockWithoutGuard, - m_tls->newBlockWithoutGuard, - m_tls->size, - (m_tls->flags & VLD_TLS_DEBUGCRTALLOC), - m_tls->threadId, - pblockInfo, m_tls->context); - } + // This is the first call to enter VLD for the current allocation. + // Record the current frame pointer. + if (func) { + Capture(context); + } + m_tls->context = context; + } +} + +CaptureContext::~CaptureContext() { + if (!m_bFirst) + return; - CallStack* callstack = CallStack::Create(); - callstack->getStackTrace(g_vld.m_maxTraceFrames, m_tls->context); - pblockInfo->callStack.reset(callstack); + if ((m_tls->blockWithoutGuard) && (!IsExcludedModule())) { + blockinfo_t* pblockInfo = NULL; + if (m_tls->newBlockWithoutGuard == NULL) { + g_vld.mapBlock(m_tls->heap, + m_tls->blockWithoutGuard, + m_tls->size, + (m_tls->flags & VLD_TLS_DEBUGCRTALLOC) != 0, + (m_tls->flags & VLD_TLS_UCRT) != 0, + m_tls->threadId, + pblockInfo); + } + else { + g_vld.remapBlock(m_tls->heap, + m_tls->blockWithoutGuard, + m_tls->newBlockWithoutGuard, + m_tls->size, + (m_tls->flags & VLD_TLS_DEBUGCRTALLOC) != 0, + (m_tls->flags & VLD_TLS_UCRT) != 0, + m_tls->threadId, + pblockInfo, m_tls->context); } - // Reset thread local flags and variables for the next allocation. - Reset(); + CallStack* callstack = CallStack::Create(); + callstack->getStackTrace(g_vld.m_maxTraceFrames, m_tls->context); + pblockInfo->callStack.reset(callstack); } + + // Reset thread local flags and variables for the next allocation. + Reset(); } void CaptureContext::Capture(context_t &context) { @@ -2897,7 +2946,7 @@ void CaptureContext::Reset() { #elif defined(_M_X64) m_tls->context.Rbp = m_tls->context.Rsp = m_tls->context.Rip = NULL; #endif - m_tls->flags &= ~VLD_TLS_DEBUGCRTALLOC; + m_tls->flags &= ~(VLD_TLS_DEBUGCRTALLOC | VLD_TLS_UCRT); Set(NULL, NULL, NULL, NULL); } diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index 38c95429..c267f6d6 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -46,631 +46,6 @@ extern HANDLE g_currentProcess; extern CriticalSection g_heapMapLock; extern DbgHelp g_DbgHelp; -//////////////////////////////////////////////////////////////////////////////// -// -// Standard CRT and MFC IAT Replacement Functions -// -// The addresses of these functions are not actually directly patched into the -// import address tables, but these functions do get indirectly called by the -// patch functions that are placed in the import address tables. -// -//////////////////////////////////////////////////////////////////////////////// - -// _calloc - This function is just a wrapper around the real calloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - pcalloc (IN): Pointer to the particular calloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - num (IN): The number of blocks, of size 'size', to be allocated. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned from the specified calloc. -// -void* VisualLeakDetector::_calloc (calloc_t pcalloc, - context_t& context, - bool debugRuntime, - size_t num, - size_t size) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return pcalloc(num, size); -} - -// _malloc - This function is just a wrapper around the real malloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - pmalloc (IN): Pointer to the particular malloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned from the specified malloc. -// -void *VisualLeakDetector::_malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return pmalloc(size); -} - -// _new - This function is just a wrapper around the real CRT and MFC new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - pnew (IN): Pointer to the particular new implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned by the specified CRT new operator. -// -void* VisualLeakDetector::_new (new_t pnew, context_t& context, bool debugRuntime, size_t size) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return pnew(size); -} - -// _realloc - This function is just a wrapper around the real realloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - prealloc (IN): Pointer to the particular realloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified realloc. -// -void* VisualLeakDetector::_realloc (realloc_t prealloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t size) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return prealloc(mem, size); -} - -// _recalloc - This function is just a wrapper around the real _recalloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - prealloc (IN): Pointer to the particular realloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified realloc. -// -void* VisualLeakDetector::__recalloc (_recalloc_t precalloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return precalloc(mem, num, size); -} - -char* VisualLeakDetector::__strdup( _strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src ) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return pstrdup(src); -} - -wchar_t* VisualLeakDetector::__wcsdup( _wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src ) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return pwcsdup(src); -} - -// __aligned_malloc - This function is just a wrapper around the real malloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - pmalloc (IN): Pointer to the particular malloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned from the specified malloc. -// -void *VisualLeakDetector::__aligned_malloc (_aligned_malloc_t pmalloc, context_t& context, bool debugRuntime, - size_t size, size_t alignment) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return pmalloc(size, alignment); -} - -// __aligned_offset_malloc - This function is just a wrapper around the real malloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - pmalloc (IN): Pointer to the particular malloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// Return Value: -// -// Returns the value returned from the specified _aligned_offset_malloc. -// -void *VisualLeakDetector::__aligned_offset_malloc (_aligned_offset_malloc_t pmalloc, context_t& context, bool debugRuntime, - size_t size, size_t alignment, size_t offset) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return pmalloc(size, alignment, offset); -} - -// __aligned_realloc - This function is just a wrapper around the real realloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - prealloc (IN): Pointer to the particular realloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified _aligned_realloc. -// -void* VisualLeakDetector::__aligned_realloc (_aligned_realloc_t prealloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return prealloc(mem, size, alignment); -} - -// __aligned_offset_realloc - This function is just a wrapper around the real realloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - prealloc (IN): Pointer to the particular realloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified _aligned_offset_realloc. -// -void* VisualLeakDetector::__aligned_offset_realloc (_aligned_offset_realloc_t prealloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment, - size_t offset) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return prealloc(mem, size, alignment, offset); -} - -// __aligned_recalloc - This function is just a wrapper around the real recalloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - precalloc (IN): Pointer to the particular recalloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - num (IN): Count of the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified _aligned_realloc. -// -void* VisualLeakDetector::__aligned_recalloc (_aligned_recalloc_t precalloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return precalloc(mem, num, size, alignment); -} - -// __aligned_offset_recalloc - This function is just a wrapper around the real recalloc that sets -// appropriate flags to be consulted when the memory is actually allocated by -// RtlAllocateHeap. -// -// - precalloc (IN): Pointer to the particular realloc implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to reallocate. -// -// - num (IN): Count of the memory block to reallocate. -// -// - size (IN): Size of the memory block to reallocate. -// -// Return Value: -// -// Returns the value returned from the specified _aligned_offset_realloc. -// -void* VisualLeakDetector::__aligned_offset_recalloc (_aligned_offset_recalloc_t precalloc, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment, - size_t offset) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return precalloc(mem, num, size, alignment, offset); -} - -// __aligned_malloc_dbg - This function is just a wrapper around the real _aligned_malloc_dbg -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to -// call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _aligned_malloc_dbg. -// -void* VisualLeakDetector::__aligned_malloc_dbg (_aligned_malloc_dbg_t p_malloc_dbg, - context_t& context, - bool debugRuntime, - size_t size, - size_t alignment, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return p_malloc_dbg(size, alignment, type, file, line); -} - -// __aligned_offset_malloc_dbg - This function is just a wrapper around the real -// _aligned_offset_malloc_dbg that sets appropriate flags to be consulted when -// the memory is actually allocated by RtlAllocateHeap. -// -// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to -// call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _aligned_malloc_dbg. -// -void* VisualLeakDetector::__aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_malloc_dbg, - context_t& context, - bool debugRuntime, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return p_malloc_dbg(size, alignment, offset, type, file, line); -} - -// _aligned_realloc_debug - This function is just a wrapper around the real -// _aligned_realloc_dbg that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__aligned_realloc_dbg (_aligned_realloc_dbg_t p_realloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return p_realloc_dbg(mem, size, alignment, type, file, line); -} - -// _aligned_offset_realloc_debug - This function is just a wrapper around the real -// _aligned_offset_realloc_dbg that sets appropriate flags to be consulted when -// the memory is actually allocated by RtlAllocateHeap. -// -// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_realloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return p_realloc_dbg(mem, size, alignment, offset, type, file, line); -} - -// _aligned_recalloc_debug - This function is just a wrapper around the real -// _aligned_realloc_dbg that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - p_recalloc_dbg (IN): Pointer to the particular __recalloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - num (IN): The number of memory blocks to reallocate. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return p_recalloc_dbg(mem, num, size, alignment, type, file, line); -} - -// _aligned_offset_recalloc_debug - This function is just a wrapper around the real -// _aligned_offset_recalloc_dbg that sets appropriate flags to be consulted when -// the memory is actually allocated by RtlAllocateHeap. -// -// - p_recalloc_dbg (IN): Pointer to the particular __recalloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - num (IN): The number of memory blocks to reallocate. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - size_t alignment, - size_t offset, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return p_recalloc_dbg(mem, num, size, alignment, offset, type, file, line); -} - //////////////////////////////////////////////////////////////////////////////// // // Debug CRT and MFC IAT Replacement Functions @@ -681,316 +56,6 @@ void* VisualLeakDetector::__aligned_offset_recalloc_dbg (_aligned_offset_recallo // //////////////////////////////////////////////////////////////////////////////// -// __calloc_dbg - This function is just a wrapper around the real _calloc_dbg -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - p_calloc_dbg: Pointer to the particular _calloc_dbg implementation to -// call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _calloc_dbg. -// -void* VisualLeakDetector::__calloc_dbg (_calloc_dbg_t p_calloc_dbg, - context_t& context, - bool debugRuntime, - size_t num, - size_t size, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return p_calloc_dbg(num, size, type, file, line); -} - -// __malloc_dbg - This function is just a wrapper around the real _malloc_dbg -// that sets appropriate flags to be consulted when the memory is actually -// allocated by RtlAllocateHeap. -// -// - p_malloc_dbg (IN): Pointer to the particular _malloc_dbg implementation to -// call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _malloc_dbg. -// -void* VisualLeakDetector::__malloc_dbg (_malloc_dbg_t p_malloc_dbg, - context_t& context, - bool debugRuntime, - size_t size, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return p_malloc_dbg(size, type, file, line); -} - -char* VisualLeakDetector::__strdup_dbg (_strdup_dbg_t p_strdup_dbg, - context_t& context, - bool debugRuntime, - const char* src, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return p_strdup_dbg(src, type, file, line); -} - -wchar_t* VisualLeakDetector::__wcsdup_dbg (_wcsdup_dbg_t p_wcsdup_dbg, - context_t& context, - bool debugRuntime, - const wchar_t* src, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return p_wcsdup_dbg(src, type, file, line); -} - -// new_dbg_crt - This function is just a wrapper around the real CRT debug new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - pnew_dbg_crt (IN): Pointer to the particular CRT new operator -// implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified CRT debug new operator. -// -void* VisualLeakDetector::__new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, - context_t& context, - bool debugRuntime, - size_t size, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return pnew_dbg_crt(size, type, file, line); -} - -// new_dbg_mfc - This function is just a wrapper around the real MFC debug new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - pnew_dbg (IN): Pointer to the particular CRT new operator -// implementation to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - type (IN): The CRT "use type" of the block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified CRT debug new operator. -// -void* VisualLeakDetector::__new_dbg_mfc (new_dbg_crt_t pnew_dbg, - context_t& context, - size_t size, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, FALSE, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return pnew_dbg(size, type, file, line); -} - -// new_dbg_mfc - This function is just a wrapper around the real MFC debug new -// operators that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - pnew_dbg_mfc (IN): Pointer to the particular MFC new operator -// implementation to call. -// -// - fp (IN): Frame pointer of the call that initiated this allocation. -// -// - size (IN): The size, in bytes, of the memory block to be allocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified MFC debug new operator. -// -void* VisualLeakDetector::__new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, - context_t& context, - size_t size, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, FALSE, NULL); - - // Do the allocation. The block will be mapped by _RtlAllocateHeap. - return pnew_dbg_mfc(size, file, line); -} - -// __realloc_debug - This function is just a wrapper around the real -// _realloc_dbg that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - p_realloc_dbg (IN): Pointer to the particular __realloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__realloc_dbg (_realloc_dbg_t p_realloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t size, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return p_realloc_dbg(mem, size, type, file, line); -} - -// __recalloc_debug - This function is just a wrapper around the real -// _recalloc_dbg that sets appropriate flags to be consulted when the memory is -// actually allocated by RtlAllocateHeap. -// -// - p_recalloc_dbg (IN): Pointer to the particular __realloc_dbg implementation -// to call. -// -// - fp (IN): Frame pointer from the call that initiated this allocation. -// -// - mem (IN): Pointer to the memory block to be reallocated. -// -// - size (IN): The size of the memory block to reallocate. -// -// - type (IN): The CRT "use type" of the block to be reallocated. -// -// - file (IN): The name of the file from which this function is being called. -// -// - line (IN): The line number, in the above file, at which this function is -// being called. -// -// Return Value: -// -// Returns the value returned by the specified _realloc_dbg. -// -void* VisualLeakDetector::__recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, - context_t& context, - bool debugRuntime, - void *mem, - size_t num, - size_t size, - int type, - char const *file, - int line) -{ -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif - CaptureContext cc(context, debugRuntime, NULL); - - // Do the allocation. The block will be mapped by _RtlReAllocateHeap. - return p_recalloc_dbg(mem, num, size, type, file, line); -} - // GetProcessHeap - Calls to GetProcessHeap are patched through to this function. This // function is just a wrapper around the real GetProcessHeap. // @@ -1106,7 +171,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls context_t context; - CaptureContext cc(context, FALSE, RtlAllocateHeap); + CaptureContext cc(context, RtlAllocateHeap); cc.Set(heap, block, NULL, size); } @@ -1127,7 +192,7 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls context_t context; - CaptureContext cc(context, FALSE, HeapAlloc); + CaptureContext cc(context, HeapAlloc); cc.Set(heap, block, NULL, size); } @@ -1227,7 +292,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls context_t context; - CaptureContext cc(context, FALSE, RtlReAllocateHeap); + CaptureContext cc(context, RtlReAllocateHeap); cc.Set(heap, mem, newmem, size); } @@ -1248,7 +313,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls context_t context; - CaptureContext cc(context, FALSE, HeapReAlloc); + CaptureContext cc(context, HeapReAlloc); cc.Set(heap, mem, newmem, size); } @@ -1348,7 +413,7 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) } context_t context; - CaptureContext cc(context, FALSE, (void*)pCoTaskMemAlloc); + CaptureContext cc(context, (void*)pCoTaskMemAlloc); // Do the allocation. The block will be mapped by _RtlAllocateHeap. return pCoTaskMemAlloc(size); @@ -1382,7 +447,7 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) } context_t context; - CaptureContext cc(context, FALSE, (void*)pCoTaskMemRealloc); + CaptureContext cc(context, (void*)pCoTaskMemRealloc); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. return pCoTaskMemRealloc(mem, size); @@ -1436,7 +501,7 @@ LPVOID VisualLeakDetector::Alloc (_In_ SIZE_T size) context_t context; UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; UINT_PTR iMallocAlloc = cVtablePtr[3]; - CaptureContext cc(context, FALSE, (void*)iMallocAlloc); + CaptureContext cc(context, (void*)iMallocAlloc); // Do the allocation. The block will be mapped by _RtlAllocateHeap. assert(m_iMalloc != NULL); @@ -1560,7 +625,7 @@ LPVOID VisualLeakDetector::Realloc (_In_opt_ LPVOID mem, _In_ SIZE_T size) context_t context; UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; UINT_PTR iMallocRealloc = cVtablePtr[4]; - CaptureContext cc(context, FALSE, (void*)iMallocRealloc); + CaptureContext cc(context, (void*)iMallocRealloc); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. assert(m_iMalloc != NULL); diff --git a/src/vldheap.h b/src/vldheap.h index beb86887..34469d6c 100644 --- a/src/vldheap.h +++ b/src/vldheap.h @@ -62,6 +62,25 @@ struct crtdbgblockheader_t typedef char checkDebugHeapBlockAlignment[ (sizeof(crtdbgblockheader_t) % MEMORY_ALLOCATION_ALIGNMENT == 0) ? 1 : -1]; +// Same for UCRT. +struct crtdbgblockheaderucrt_t +{ + struct crtdbgblockheaderucrt_t *next; // Pointer to the next block in the list of blocks allocated from the CRT heap. + struct crtdbgblockheaderucrt_t *prev; // Pointer to the previous block in the list of blocks allocated from the CRT heap. + char const *file; // Source file where this block was allocated. + int line; // Line of code, within the above file, where this block was allocated. + int use; // This block's "use type": see below. + size_t size; // Size of the data portion of the block. + long request; // This block's "request" number. Basically a serial number. + unsigned char gap[GAPSIZE]; // No-man's land buffer zone, for buffer overrun/underrun checking. +}; + +typedef char checkDebugUcrtHeapBlockAlignment[ + (sizeof(crtdbgblockheaderucrt_t) % MEMORY_ALLOCATION_ALIGNMENT == 0) ? 1 : -1]; + +typedef char checkDebugHeapBlockSize[ + (sizeof(crtdbgblockheader_t) == sizeof(crtdbgblockheaderucrt_t)) ? 1 : -1]; + // Macro to strip off any sub-type information stored in a block's "use type". #define CRT_USE_TYPE(use) (use & 0xFFFF) #define _BLOCK_TYPE_IS_VALID(use) (_BLOCK_TYPE(use) == _CLIENT_BLOCK || (use) == _NORMAL_BLOCK || _BLOCK_TYPE(use) == _CRT_BLOCK || (use) == _IGNORE_BLOCK) @@ -80,10 +99,10 @@ struct vldblockheader_t }; // Data-to-Header and Header-to-Data conversion -#define CRTDBGBLOCKHEADER(d) (crtdbgblockheader_t*)(((PBYTE)d) - sizeof(crtdbgblockheader_t)) -#define CRTDBGBLOCKDATA(h) (LPVOID)(((PBYTE)h) + sizeof(crtdbgblockheader_t)) #define VLDBLOCKHEADER(d) (vldblockheader_t*)(((PBYTE)d) - sizeof(vldblockheader_t)) #define VLDBLOCKDATA(h) (LPVOID)(((PBYTE)h) + sizeof(vldblockheader_t)) +#define CRTDBGBLOCKHEADER(d) (crtdbgblockheader_t*)(((PBYTE)d) - sizeof(crtdbgblockheader_t)) +#define CRTDBGBLOCKDATA(h) (LPVOID)(((PBYTE)h) + sizeof(crtdbgblockheader_t)) // new and delete operators for allocating from VLD's private heap. void operator delete (void *block); diff --git a/src/vldint.h b/src/vldint.h index bee2f924..c56580b5 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -110,6 +110,7 @@ struct blockinfo_t { SIZE_T size; bool reported; bool debugCrtAlloc; + bool ucrt; }; // BlockMaps map memory blocks (via their addresses) to blockinfo_t structures. @@ -162,9 +163,10 @@ typedef Set ReportHookSet; struct tls_t { context_t context; // Address of return address at the first call that entered VLD's code for the current allocation. UINT32 flags; // Thread-local status flags: -#define VLD_TLS_DEBUGCRTALLOC 0x1 // If set, the current allocation is a CRT allocation. +#define VLD_TLS_DEBUGCRTALLOC 0x1 // If set, the current allocation is a CRT allocation. #define VLD_TLS_DISABLED 0x2 // If set, memory leak detection is disabled for the current thread. #define VLD_TLS_ENABLED 0x4 // If set, memory leak detection is enabled for the current thread. +#define VLD_TLS_UCRT 0x8 // If set, the current allocation is a UCRT allocation. UINT32 oldFlags; // Thread-local status old flags DWORD threadId; // Thread ID of the thread that owns this TLS structure. HANDLE heap; @@ -184,7 +186,8 @@ typedef Map TlsMap; class CaptureContext { public: - CaptureContext(context_t &context, BOOL debug, void* func, UINT_PTR fp = (UINT_PTR)_ReturnAddress()); + CaptureContext(context_t &context, BOOL debug, BOOL ucrt, void* func, UINT_PTR fp = (UINT_PTR)_ReturnAddress()); + CaptureContext(context_t &context, void* func, UINT_PTR fp = (UINT_PTR)_ReturnAddress()); ~CaptureContext(); __forceinline void Set(HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size); private: @@ -240,47 +243,6 @@ class VisualLeakDetector : public IMalloc VisualLeakDetector(); ~VisualLeakDetector(); - //////////////////////////////////////////////////////////////////////////////// - // Public CRT and MFC Common Handlers - // - // Many heap functions are indirectly rerouted to these handlers. One common - // function exists for each heap function with a given signature. These - // handlers are not direct IAT replacements, but are called by the individual - // IAT replacement functions. - //////////////////////////////////////////////////////////////////////////////// - // Standard CRT and MFC common handlers - void* _calloc (calloc_t pcalloc, context_t& context, bool debugRuntime, size_t num, size_t size); - void* _malloc (malloc_t pmalloc, context_t& context, bool debugRuntime, size_t size); - void* _new (new_t pnew, context_t& context, bool debugRuntime, size_t size); - void* _realloc (realloc_t prealloc, context_t& context, bool debugRuntime, void *mem, size_t size); - void* __recalloc (_recalloc_t precalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size); - char* __strdup(_strdup_t pstrdup, context_t& context, bool debugRuntime, const char* src); - wchar_t* __wcsdup(_wcsdup_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src); - - // Debug CRT and MFC common handlers - void* __calloc_dbg (_calloc_dbg_t p_calloc_dbg, context_t& context, bool debugRuntime, size_t num, size_t size, int type, char const *file, int line); - void* __malloc_dbg (_malloc_dbg_t p_malloc_dbg, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); - void* __new_dbg_crt (new_dbg_crt_t pnew_dbg_crt, context_t& context, bool debugRuntime, size_t size, int type, char const *file, int line); - void* __new_dbg_mfc (new_dbg_crt_t pnew_dbg, context_t& context, size_t size, int type, char const *file, int line); - void* __new_dbg_mfc (new_dbg_mfc_t pnew_dbg_mfc, context_t& context, size_t size, char const *file, int line); - void* __realloc_dbg (_realloc_dbg_t p_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, int type, char const *file, int line); - void* __recalloc_dbg (_recalloc_dbg_t p_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, int type, char const *file, int line); - char* __strdup_dbg(_strdup_dbg_t pstrdup, context_t& context, bool debugRuntime, const char* src, int type, char const *file, int line); - wchar_t* __wcsdup_dbg(_wcsdup_dbg_t pwcsdup, context_t& context, bool debugRuntime, const wchar_t* src, int type, char const *file, int line); - - void *__aligned_malloc (_aligned_malloc_t p_aligned_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment); - void *__aligned_offset_malloc (_aligned_offset_malloc_t p_aligned_offset_malloc, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset); - void *__aligned_realloc (_aligned_realloc_t p_aligned_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment); - void *__aligned_offset_realloc (_aligned_offset_realloc_t p_aligned_offset_realloc, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset); - void *__aligned_recalloc (_aligned_recalloc_t p_aligned_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment); - void *__aligned_offset_recalloc (_aligned_offset_recalloc_t p_aligned_offset_recalloc, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset); - void* __aligned_malloc_dbg (_aligned_malloc_dbg_t p_aligned_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_malloc_dbg (_aligned_offset_malloc_dbg_t p_aligned_offset_malloc_dbg, context_t& context, bool debugRuntime, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - void* __aligned_realloc_dbg (_aligned_realloc_dbg_t p_aligned_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_realloc_dbg (_aligned_offset_realloc_dbg_t p_aligned_offset_realloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - void* __aligned_recalloc_dbg (_aligned_recalloc_dbg_t p_aligned_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, int type, char const *file, int line); - void* __aligned_offset_recalloc_dbg (_aligned_offset_recalloc_dbg_t p_aligned_offset_recalloc_dbg, context_t& context, bool debugRuntime, void *mem, size_t num, size_t size, size_t alignment, size_t offset, int type, char const *file, int line); - //////////////////////////////////////////////////////////////////////////////// // Public IMalloc methods - for support of COM-based memory leak detection. //////////////////////////////////////////////////////////////////////////////// @@ -343,12 +305,15 @@ class VisualLeakDetector : public IMalloc BOOL enabled (); SIZE_T eraseDuplicates (const BlockMap::Iterator &element, Set &aggregatedLeak); tls_t* getTls (); - VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo); + VOID mapBlock (HANDLE heap, LPCVOID mem, SIZE_T size, bool crtalloc, bool ucrt, DWORD threadId, blockinfo_t* &pblockInfo); VOID mapHeap (HANDLE heap); VOID remapBlock (HANDLE heap, LPCVOID mem, LPCVOID newmem, SIZE_T size, - bool crtalloc, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context); + bool crtalloc, bool ucrt, DWORD threadId, blockinfo_t* &pblockInfo, const context_t &context); VOID reportConfig (); + static bool isDebugCrtAlloc(LPCVOID block, blockinfo_t* info); SIZE_T reportHeapLeaks (HANDLE heap); + static int getCrtBlockUse (LPCVOID block, bool ucrt); + static size_t getCrtBlockSize(LPCVOID block, bool ucrt); SIZE_T getLeaksCount (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); SIZE_T reportLeaks(heapinfo_t* heapinfo, bool &firstLeak, Set &aggregatedLeaks, DWORD threadId = (DWORD)-1); VOID markAllLeaksAsReported (heapinfo_t* heapinfo, DWORD threadId = (DWORD)-1); From f7abad0b0a2a612203bcdbc4501247d4276a17cd Mon Sep 17 00:00:00 2001 From: "dmitriy.vovk" Date: Wed, 25 Nov 2015 14:16:56 +0100 Subject: [PATCH 293/321] Fixed crash, when VLD is turned off through config --- src/vld.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index 14875157..57c1b6eb 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -335,6 +335,28 @@ VisualLeakDetector::VisualLeakDetector () wcsncpy_s(m_reportFilePath, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); m_status = 0x0; + HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); + if (ntdll) + { + if (!IsWindows8OrGreater()) + { + LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); + } else + { + LdrLoadDllWin8 = (LdrLoadDllWin8_t)GetProcAddress(ntdll, "LdrLoadDll"); + ldrLoadDllPatch[0].replacement = _LdrLoadDllWin8; + } + RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); + RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); + RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); + + LdrGetDllHandle = (LdrGetDllHandle_t)GetProcAddress(ntdll, "LdrGetDllHandle"); + LdrGetProcedureAddress = (LdrGetProcedureAddress_t)GetProcAddress(ntdll, "LdrGetProcedureAddress"); + LdrUnloadDll = (LdrUnloadDll_t)GetProcAddress(ntdll, "LdrUnloadDll"); + LdrLockLoaderLock = (LdrLockLoaderLock_t)GetProcAddress(ntdll, "LdrLockLoaderLock"); + LdrUnlockLoaderLock = (LdrUnlockLoaderLock_t)GetProcAddress(ntdll, "LdrUnlockLoaderLock"); + } + // Load configuration options. configure(); if (m_options & VLD_OPT_VLDOFF) { @@ -365,28 +387,6 @@ VisualLeakDetector::VisualLeakDetector () g_currentProcess = GetCurrentProcess(); g_currentThread = GetCurrentThread(); g_processHeap = GetProcessHeap(); - HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); - if (ntdll) - { - if (!IsWindows8OrGreater()) - { - LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); - } - else - { - LdrLoadDllWin8 = (LdrLoadDllWin8_t)GetProcAddress(ntdll, "LdrLoadDll"); - ldrLoadDllPatch[0].replacement = _LdrLoadDllWin8; - } - RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); - RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); - RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); - - LdrGetDllHandle = (LdrGetDllHandle_t)GetProcAddress(ntdll, "LdrGetDllHandle"); - LdrGetProcedureAddress = (LdrGetProcedureAddress_t)GetProcAddress(ntdll, "LdrGetProcedureAddress"); - LdrUnloadDll = (LdrUnloadDll_t)GetProcAddress(ntdll, "LdrUnloadDll"); - LdrLockLoaderLock = (LdrLockLoaderLock_t)GetProcAddress(ntdll, "LdrLockLoaderLock"); - LdrUnlockLoaderLock = (LdrUnlockLoaderLock_t)GetProcAddress(ntdll, "LdrUnlockLoaderLock"); - } LoaderLock ll; From 2e2dac90e7de8c99850fab70df8fcf07b5f1c7ca Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 27 Nov 2015 02:16:30 +0300 Subject: [PATCH 294/321] Check number of tests --- appveyor.yml | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 00a1dc91..9933459e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -75,15 +75,21 @@ build_script: test_script: - ps: | + if (($env:Toolset -eq "v100") -and ($env:PLATFORM -eq "x64")) + { + return + } cd src\ function Add-GTest-Result($testResult) { $testsuites = ([xml](get-content $testResult)).testsuites + $testsCount = 0 $anyFailures = $FALSE foreach ($testsuite in $testsuites.testsuite) { foreach ($testcase in $testsuite.testcase) { + $testsCount++ if ($testcase.failure) { $time = ([double]$testcase.time * 1000) Add-AppveyorTest $testcase.name -Outcome Failed -FileName $testsuite.name -Duration $time -ErrorMessage $testcase.failure.message @@ -99,11 +105,12 @@ test_script: } } } - return $anyFailures + return $testsCount, $anyFailures } - function Run-Tests($platform, $configuration) + function Run-Tests($platform, $configuration, $correctTestCount) { + $testsCount = 0 $anyFailures = $FALSE $tests_path = ".\bin\$platform\$configuration\" @@ -113,7 +120,9 @@ test_script: & $_.FullName "--gtest_output=`"xml:$testfile`"" if (Test-Path $testfile) { - $testsResult = Add-GTest-Result $testfile + $count, $testsResult = Add-GTest-Result $testfile + Write-Output "Found $testfile with $count tests" + $testsCount = $testsCount + $count $anyFailures = $anyFailures -or $testsResult } } @@ -122,6 +131,11 @@ test_script: Write-Output "Failing build as there are broken tests" $host.SetShouldExit(1) } + + if ($testsCount -lt $correctTestCount){ + Write-Output "Failing build as there the number of tests decreased from $correctTestCount" + $host.SetShouldExit(2) + } } $pos = $env:Toolset.IndexOf("_") @@ -129,4 +143,5 @@ test_script: $suffix = $env:Toolset.Substring(0, $pos ) $folders = @{"Debug_VldRelease" = "Debug(Release)-$suffix"; "Debug_VldRelease_StaticCrt" = "Debug(Release)_StaticCrt-$suffix"; "Release" = "Release-$suffix"; "Release_StaticCrt" = "Release_StaticCrt-$suffix"} - Run-Tests "$env:PLATFORM" "$($folders[$env:CONFIGURATION])" + $correctTestCount = if ($env:GTEST_FILTER -like '*Mfc*') { 49 } else { 53 } + Run-Tests "$env:PLATFORM" "$($folders[$env:CONFIGURATION])" $correctTestCount From c30f3c9202b92b89622c668aab6237f73b47ef53 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 27 Nov 2015 09:42:44 +0300 Subject: [PATCH 295/321] Crash fixed dynamic_app test, Release, StackWalkMethod=safe; v140. Closes #17 --- src/callstack.cpp | 5 ++--- src/dbghelp.h | 36 +++--------------------------------- src/vld.cpp | 1 - 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index 344cbfc1..9cd6fb1e 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -35,7 +35,6 @@ extern HANDLE g_currentThread; extern CriticalSection g_heapMapLock; extern VisualLeakDetector g_vld; extern DbgHelp g_DbgHelp; -extern DHStackWalk g_StackWalk; // Helper function to compare the begin of a string with a substring // @@ -788,13 +787,13 @@ VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) frame.Virtual = TRUE; CriticalSectionLocker<> cs(g_heapMapLock); - CriticalSectionLocker locker(g_StackWalk); + CriticalSectionLocker locker(g_DbgHelp); // Walk the stack. while (count < maxdepth) { count++; DbgTrace(L"dbghelp32.dll %i: StackWalk64\n", GetCurrentThreadId()); - if (!g_StackWalk.StackWalk64(architecture, g_currentProcess, g_currentThread, &frame, ¤tContext, NULL, + if (!g_DbgHelp.StackWalk64(architecture, g_currentProcess, g_currentThread, &frame, ¤tContext, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL, locker)) { // Couldn't trace back through any more frames. break; diff --git a/src/dbghelp.h b/src/dbghelp.h index e5671c52..23b54d88 100644 --- a/src/dbghelp.h +++ b/src/dbghelp.h @@ -82,42 +82,12 @@ class DbgHelp CriticalSectionLocker cs(m_lock); return ::SymUnloadModule64(hProcess, BaseOfDll); } -private: - // Disallow certain operations - DbgHelp(const DbgHelp&); - DbgHelp& operator=(const DbgHelp&); - -private: - CriticalSection m_lock; -}; - -class DHStackWalk -{ -public: - DHStackWalk() { - m_lock.Initialize(); - } - ~DHStackWalk() { - m_lock.Delete(); - } - void Enter() - { - m_lock.Enter(); - } - void Leave() - { - m_lock.Leave(); - } - BOOL IsLockedByCurrentThread() { - return - m_lock.IsLockedByCurrentThread() ; - } BOOL StackWalk64(__in DWORD MachineType, __in HANDLE hProcess, __in HANDLE hThread, __inout LPSTACKFRAME64 StackFrame, __inout PVOID ContextRecord, __in_opt PREAD_PROCESS_MEMORY_ROUTINE64 ReadMemoryRoutine, __in_opt PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine, __in_opt PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine, - __in_opt PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress, CriticalSectionLocker&) + __in_opt PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress, CriticalSectionLocker&) { return ::StackWalk64(MachineType, hProcess, hThread, StackFrame, ContextRecord, ReadMemoryRoutine, FunctionTableAccessRoutine, GetModuleBaseRoutine, TranslateAddress); @@ -135,8 +105,8 @@ class DHStackWalk } private: // Disallow certain operations - DHStackWalk(const DHStackWalk&); - DHStackWalk& operator=(const DHStackWalk&); + DbgHelp(const DbgHelp&); + DbgHelp& operator=(const DbgHelp&); private: CriticalSection m_lock; diff --git a/src/vld.cpp b/src/vld.cpp index 57c1b6eb..d2670210 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -54,7 +54,6 @@ HANDLE g_processHeap; // Handle to the process's heap (COM allocati CriticalSection g_heapMapLock; // Serializes access to the heap and block maps. ReportHookSet* g_pReportHooks; DbgHelp g_DbgHelp; -DHStackWalk g_StackWalk; ImageDirectoryEntries g_Ide; LoadedModules g_LoadedModules; From 8f5b0c2c042951f724160f34d07fc076dc14d67e Mon Sep 17 00:00:00 2001 From: ioannis Date: Wed, 25 Nov 2015 12:38:36 +0200 Subject: [PATCH 296/321] Simplify the CaptureContext constructor and remove the unnecessary context parameter --- src/crtmfcpatch.h | 120 ++++++++++++++++------------------------------ src/vld.cpp | 33 ++++--------- src/vld_hooks.cpp | 24 ++++------ src/vldint.h | 5 +- 4 files changed, 58 insertions(+), 124 deletions(-) diff --git a/src/crtmfcpatch.h b/src/crtmfcpatch.h index 6320d11f..9b20e016 100644 --- a/src/crtmfcpatch.h +++ b/src/crtmfcpatch.h @@ -185,8 +185,7 @@ void* CrtPatch::crtd__calloc_dbg (size_t num, _calloc_dbg_t pcrtxxd__calloc_dbg = (_calloc_dbg_t)data.pcrtd__calloc_dbg; assert(pcrtxxd__calloc_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__calloc_dbg); + CaptureContext cc((void*)pcrtxxd__calloc_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__calloc_dbg(num, size, type, file, line); } @@ -219,8 +218,7 @@ void* CrtPatch::crtd__malloc_dbg (size_t size, _malloc_dbg_t pcrtxxd__malloc_dbg = (_malloc_dbg_t)data.pcrtd__malloc_dbg; assert(pcrtxxd__malloc_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__malloc_dbg); + CaptureContext cc((void*)pcrtxxd__malloc_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__malloc_dbg(size, type, file, line); } @@ -256,8 +254,7 @@ void* CrtPatch::crtd__realloc_dbg (void *mem, _realloc_dbg_t pcrtxxd__realloc_dbg = (_realloc_dbg_t)data.pcrtd__realloc_dbg; assert(pcrtxxd__realloc_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__realloc_dbg); + CaptureContext cc((void*)pcrtxxd__realloc_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__realloc_dbg(mem, size, type, file, line); } @@ -294,8 +291,7 @@ void* CrtPatch::crtd__recalloc_dbg (void *mem, _recalloc_dbg_t pcrtxxd__recalloc_dbg = (_recalloc_dbg_t)data.pcrtd__recalloc_dbg; assert(pcrtxxd__recalloc_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__recalloc_dbg); + CaptureContext cc((void*)pcrtxxd__recalloc_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__recalloc_dbg(mem, num, size, type, file, line); } @@ -313,8 +309,7 @@ char* CrtPatch::crtd__strdup_dbg (const char* src, _strdup_dbg_t pcrtxxd__strdup_dbg = (_strdup_dbg_t)data.pcrtd__strdup_dbg; assert(pcrtxxd__strdup_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__strdup_dbg); + CaptureContext cc((void*)pcrtxxd__strdup_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__strdup_dbg(src, type, file, line); } @@ -332,8 +327,7 @@ wchar_t* CrtPatch::crtd__wcsdup_dbg (const wchar_t* src, _wcsdup_dbg_t pcrtxxd__wcsdup_dbg = (_wcsdup_dbg_t)data.pcrtd__wcsdup_dbg; assert(pcrtxxd__wcsdup_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__wcsdup_dbg); + CaptureContext cc((void*)pcrtxxd__wcsdup_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__wcsdup_dbg(src, type, file, line); } @@ -366,8 +360,7 @@ void* CrtPatch::crtd__scalar_new_dbg (size_t size, new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)data.pcrtd__scalar_new_dbg; assert(pcrtxxd_new_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_new_dbg); + CaptureContext cc((void*)pcrtxxd_new_dbg, debug, (CRTVersion >= 140)); return pcrtxxd_new_dbg(size, type, file, line); } @@ -400,8 +393,7 @@ void* CrtPatch::crtd__vector_new_dbg (size_t size, new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)data.pcrtd__vector_new_dbg; assert(pcrtxxd_new_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_new_dbg); + CaptureContext cc((void*)pcrtxxd_new_dbg, debug, (CRTVersion >= 140)); return pcrtxxd_new_dbg(size, type, file, line); } @@ -428,8 +420,7 @@ void* CrtPatch::crtd_calloc (size_t num, size_t size) calloc_t pcrtxxd_calloc = (calloc_t)data.pcrtd_calloc; assert(pcrtxxd_calloc); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_calloc); + CaptureContext cc((void*)pcrtxxd_calloc, debug, (CRTVersion >= 140)); return pcrtxxd_calloc(num, size); } @@ -454,8 +445,7 @@ void* CrtPatch::crtd_malloc (size_t size) malloc_t pcrtxxd_malloc = (malloc_t)data.pcrtd_malloc; assert(pcrtxxd_malloc); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_malloc); + CaptureContext cc((void*)pcrtxxd_malloc, debug, (CRTVersion >= 140)); return pcrtxxd_malloc(size); } @@ -482,8 +472,7 @@ void* CrtPatch::crtd_realloc (void *mem, size_t size) realloc_t pcrtxxd_realloc = (realloc_t)data.pcrtd_realloc; assert(pcrtxxd_realloc); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_realloc); + CaptureContext cc((void*)pcrtxxd_realloc, debug, (CRTVersion >= 140)); return pcrtxxd_realloc(mem, size); } @@ -510,8 +499,7 @@ void* CrtPatch::crtd__recalloc (void *mem, size_t num, size_t _recalloc_t pcrtxxd_recalloc = (_recalloc_t)data.pcrtd_recalloc; assert(pcrtxxd_recalloc); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_recalloc); + CaptureContext cc((void*)pcrtxxd_recalloc, debug, (CRTVersion >= 140)); return pcrtxxd_recalloc(mem, num, size); } @@ -526,8 +514,7 @@ char* CrtPatch::crtd__strdup (const char* src) _strdup_t pcrtxxd_strdup = (_strdup_t)data.pcrtd__strdup; assert(pcrtxxd_strdup); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_strdup); + CaptureContext cc((void*)pcrtxxd_strdup, debug, (CRTVersion >= 140)); return pcrtxxd_strdup(src); } @@ -541,8 +528,7 @@ wchar_t* CrtPatch::crtd__wcsdup (const wchar_t* src) _wcsdup_t pcrtxxd_wcsdup = (_wcsdup_t)data.pcrtd__wcsdup; assert(pcrtxxd_wcsdup); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_wcsdup); + CaptureContext cc((void*)pcrtxxd_wcsdup, debug, (CRTVersion >= 140)); return pcrtxxd_wcsdup(src); } @@ -576,8 +562,7 @@ void* CrtPatch::crtd__aligned_malloc_dbg (size_t size, _aligned_malloc_dbg_t pcrtxxd__aligned_malloc_dbg = (_aligned_malloc_dbg_t)data.pcrtd__aligned_malloc_dbg; assert(pcrtxxd__aligned_malloc_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__aligned_malloc_dbg); + CaptureContext cc((void*)pcrtxxd__aligned_malloc_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__aligned_malloc_dbg(size, alignment, type, file, line); } @@ -612,8 +597,7 @@ void* CrtPatch::crtd__aligned_offset_malloc_dbg (size_t _aligned_offset_malloc_dbg_t pcrtxxd__malloc_dbg = (_aligned_offset_malloc_dbg_t)data.pcrtd__aligned_offset_malloc_dbg; assert(pcrtxxd__malloc_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__malloc_dbg); + CaptureContext cc((void*)pcrtxxd__malloc_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__malloc_dbg(size, alignment, offset, type, file, line); } @@ -650,8 +634,7 @@ void* CrtPatch::crtd__aligned_realloc_dbg (void *mem, _aligned_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_realloc_dbg_t)data.pcrtd__aligned_realloc_dbg; assert(pcrtxxd__realloc_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__realloc_dbg); + CaptureContext cc((void*)pcrtxxd__realloc_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__realloc_dbg(mem, size, alignment, type, file, line); } @@ -689,8 +672,7 @@ void* CrtPatch::crtd__aligned_offset_realloc_dbg (void _aligned_offset_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_offset_realloc_dbg_t)data.pcrtd__aligned_offset_realloc_dbg; assert(pcrtxxd__realloc_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__realloc_dbg); + CaptureContext cc((void*)pcrtxxd__realloc_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__realloc_dbg(mem, size, alignment, offset, type, file, line); } @@ -730,8 +712,7 @@ void* CrtPatch::crtd__aligned_recalloc_dbg (void *mem, _aligned_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_recalloc_dbg_t)data.pcrtd__aligned_recalloc_dbg; assert(pcrtxxd__recalloc_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__recalloc_dbg); + CaptureContext cc((void*)pcrtxxd__recalloc_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__recalloc_dbg(mem, num, size, alignment, type, file, line); } @@ -772,8 +753,7 @@ void* CrtPatch::crtd__aligned_offset_recalloc_dbg (void _aligned_offset_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_offset_recalloc_dbg_t)data.pcrtd__aligned_offset_recalloc_dbg; assert(pcrtxxd__recalloc_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd__recalloc_dbg); + CaptureContext cc((void*)pcrtxxd__recalloc_dbg, debug, (CRTVersion >= 140)); return pcrtxxd__recalloc_dbg(mem, num, size, alignment, offset, type, file, line); } @@ -798,8 +778,7 @@ void* CrtPatch::crtd__aligned_malloc (size_t size, size_t ali _aligned_malloc_t pcrtxxd_malloc = (_aligned_malloc_t)data.pcrtd_aligned_malloc; assert(pcrtxxd_malloc); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_malloc); + CaptureContext cc((void*)pcrtxxd_malloc, debug, (CRTVersion >= 140)); return pcrtxxd_malloc(size, alignment); } @@ -824,8 +803,7 @@ void* CrtPatch::crtd__aligned_offset_malloc (size_t size, siz _aligned_offset_malloc_t pcrtxxd_malloc = (_aligned_offset_malloc_t)data.pcrtd_aligned_offset_malloc; assert(pcrtxxd_malloc); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_malloc); + CaptureContext cc((void*)pcrtxxd_malloc, debug, (CRTVersion >= 140)); return pcrtxxd_malloc(size, alignment, offset); } @@ -852,8 +830,7 @@ void* CrtPatch::crtd__aligned_realloc (void *mem, size_t size _aligned_realloc_t pcrtxxd_realloc = (_aligned_realloc_t)data.pcrtd_aligned_realloc; assert(pcrtxxd_realloc); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_realloc); + CaptureContext cc((void*)pcrtxxd_realloc, debug, (CRTVersion >= 140)); return pcrtxxd_realloc(mem, size, alignment); } @@ -880,8 +857,7 @@ void* CrtPatch::crtd__aligned_offset_realloc (void *mem, size _aligned_offset_realloc_t pcrtxxd_realloc = (_aligned_offset_realloc_t)data.pcrtd_aligned_offset_realloc; assert(pcrtxxd_realloc); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_realloc); + CaptureContext cc((void*)pcrtxxd_realloc, debug, (CRTVersion >= 140)); return pcrtxxd_realloc(mem, size, alignment, offset); } @@ -910,8 +886,7 @@ void* CrtPatch::crtd__aligned_recalloc (void *mem, size_t num _aligned_recalloc_t pcrtxxd_recalloc = (_aligned_recalloc_t)data.pcrtd_aligned_recalloc; assert(pcrtxxd_recalloc); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_recalloc); + CaptureContext cc((void*)pcrtxxd_recalloc, debug, (CRTVersion >= 140)); return pcrtxxd_recalloc(mem, num, size, alignment); } @@ -940,8 +915,7 @@ void* CrtPatch::crtd__aligned_offset_recalloc (void *mem, siz _aligned_offset_recalloc_t pcrtxxd_recalloc = (_aligned_offset_recalloc_t)data.pcrtd_aligned_offset_recalloc; assert(pcrtxxd_recalloc); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_recalloc); + CaptureContext cc((void*)pcrtxxd_recalloc, debug, (CRTVersion >= 140)); return pcrtxxd_recalloc(mem, num, size, alignment, offset); } @@ -964,8 +938,7 @@ void* CrtPatch::crtd_scalar_new (size_t size) new_t pcrtxxd_scalar_new = (new_t)data.pcrtd_scalar_new; assert(pcrtxxd_scalar_new); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_scalar_new); + CaptureContext cc((void*)pcrtxxd_scalar_new, debug, (CRTVersion >= 140)); return pcrtxxd_scalar_new(size); } @@ -988,8 +961,7 @@ void* CrtPatch::crtd_vector_new (size_t size) new_t pcrtxxd_vector_new = (new_t)data.pcrtd_vector_new; assert(pcrtxxd_vector_new); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pcrtxxd_vector_new); + CaptureContext cc((void*)pcrtxxd_vector_new, debug, (CRTVersion >= 140)); return pcrtxxd_vector_new(size); } @@ -1028,8 +1000,7 @@ void* MfcPatch::mfcd__scalar_new_dbg_4p (size_t size, new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); + CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, type, file, line); } @@ -1059,8 +1030,7 @@ void* MfcPatch::mfcd__scalar_new_dbg_3p (size_t size, new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcd__scalar_new_dbg_3p; assert(pmfcxxd__new_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); + CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, file, line); } @@ -1093,8 +1063,7 @@ void* MfcPatch::mfcd__vector_new_dbg_4p (size_t size, new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__vector_new_dbg_4p; assert(pmfcxxd__new_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); + CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, type, file, line); } @@ -1124,8 +1093,7 @@ void* MfcPatch::mfcd__vector_new_dbg_3p (size_t size, new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcd__vector_new_dbg_3p; assert(pmfcxxd__new_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); + CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, file, line); } @@ -1148,8 +1116,7 @@ void* MfcPatch::mfcd_scalar_new (size_t size) new_t pmfcxxd_new = (new_t)data.pmfcd_scalar_new; assert(pmfcxxd_new); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd_new); + CaptureContext cc((void*)pmfcxxd_new, debug, (CRTVersion >= 140)); return pmfcxxd_new(size); } @@ -1172,8 +1139,7 @@ void* MfcPatch::mfcd_vector_new (size_t size) new_t pmfcxxd_new = (new_t)data.pmfcd_vector_new; assert(pmfcxxd_new); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd_new); + CaptureContext cc((void*)pmfcxxd_new, debug, (CRTVersion >= 140)); return pmfcxxd_new(size); } @@ -1206,8 +1172,7 @@ void* MfcPatch::mfcud__scalar_new_dbg_4p (size_t size, new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); + CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, type, file, line); } @@ -1237,8 +1202,7 @@ void* MfcPatch::mfcud__scalar_new_dbg_3p (size_t size, new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcud__scalar_new_dbg_3p; assert(pmfcxxd__new_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); + CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, file, line); } @@ -1271,8 +1235,7 @@ void* MfcPatch::mfcud__vector_new_dbg_4p (size_t size, new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__vector_new_dbg_4p; assert(pmfcxxd__new_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); + CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, type, file, line); } @@ -1302,8 +1265,7 @@ void* MfcPatch::mfcud__vector_new_dbg_3p (size_t size, new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcud__vector_new_dbg_3p; assert(pmfcxxd__new_dbg); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd__new_dbg); + CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, file, line); } @@ -1326,8 +1288,7 @@ void* MfcPatch::mfcud_scalar_new (size_t size) new_t pmfcxxd_new = (new_t)data.pmfcud_scalar_new; assert(pmfcxxd_new); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd_new); + CaptureContext cc((void*)pmfcxxd_new, debug, (CRTVersion >= 140)); return pmfcxxd_new(size); } @@ -1350,8 +1311,7 @@ void* MfcPatch::mfcud_vector_new (size_t size) new_t pmfcxxd_new = (new_t)data.pmfcud_vector_new; assert(pmfcxxd_new); - context_t context; - CaptureContext cc(context, debug, (CRTVersion >= 140), (void*)pmfcxxd_new); + CaptureContext cc((void*)pmfcxxd_new, debug, (CRTVersion >= 140)); return pmfcxxd_new(size); } diff --git a/src/vld.cpp b/src/vld.cpp index d2670210..ecc66022 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -2834,7 +2834,7 @@ int VisualLeakDetector::ResolveCallstacks() return unresolvedFunctionsCount; } -CaptureContext::CaptureContext(context_t &context, BOOL debug, BOOL ucrt, void* func, UINT_PTR fp) : m_fp(fp), m_func(func) { +CaptureContext::CaptureContext(void* func, BOOL debug, BOOL ucrt, UINT_PTR fp) : m_fp(fp), m_func(func) { m_tls = g_vld.getTls(); if (debug) { @@ -2849,24 +2849,7 @@ CaptureContext::CaptureContext(context_t &context, BOOL debug, BOOL ucrt, void* if (m_bFirst) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - if (func) { - Capture(context); - } - m_tls->context = context; - } -} - -CaptureContext::CaptureContext(context_t &context, void* func, UINT_PTR fp) : m_fp(fp), m_func(func) { - m_tls = g_vld.getTls(); - - m_bFirst = (GET_RETURN_ADDRESS(m_tls->context) == NULL); - if (m_bFirst) { - // This is the first call to enter VLD for the current allocation. - // Record the current frame pointer. - if (func) { - Capture(context); - } - m_tls->context = context; + Capture(); } } @@ -2905,16 +2888,16 @@ CaptureContext::~CaptureContext() { Reset(); } -void CaptureContext::Capture(context_t &context) { - context.fp = m_fp; - context.func = (UINT_PTR)(m_func); +void CaptureContext::Capture() { + m_tls->context.fp = m_fp; + m_tls->context.func = (UINT_PTR)(m_func); CONTEXT _ctx; RtlCaptureContext(&_ctx); #if defined(_M_IX86) - context.Ebp = _ctx.Ebp; context.Esp = _ctx.Esp; context.Eip = _ctx.Eip; + m_tls->context.Ebp = _ctx.Ebp; m_tls->context.Esp = _ctx.Esp; m_tls->context.Eip = _ctx.Eip; #elif defined(_M_X64) - context.Rbp = _ctx.Rbp; context.Rsp = _ctx.Rsp; context.Rip = _ctx.Rip; + m_tls->context.Rbp = _ctx.Rbp; m_tls->context.Rsp = _ctx.Rsp; m_tls->context.Rip = _ctx.Rip; #else // If you want to retarget Visual Leak Detector to another processor // architecture then you'll need to provide an architecture-specific macro to @@ -2933,7 +2916,7 @@ void CaptureContext::Set(HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size) { if ((m_tls->blockWithoutGuard) && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { // If VLD_OPT_TRACE_INTERNAL_FRAMES is specified then we capture the frame pointer upto the function that acutally // performs the allocation to the heap being: HeapAlloc, HeapReAlloc, RtlAllocateHeap, RtlReAllocateHeap. - Capture(m_tls->context); + Capture(); } } diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index c267f6d6..df8693dd 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -170,8 +170,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si return block; if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls - context_t context; - CaptureContext cc(context, RtlAllocateHeap); + CaptureContext cc(RtlAllocateHeap); cc.Set(heap, block, NULL, size); } @@ -191,8 +190,7 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) return block; if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls - context_t context; - CaptureContext cc(context, HeapAlloc); + CaptureContext cc(HeapAlloc); cc.Set(heap, block, NULL, size); } @@ -291,8 +289,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID return newmem; if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls - context_t context; - CaptureContext cc(context, RtlReAllocateHeap); + CaptureContext cc(RtlReAllocateHeap); cc.Set(heap, mem, newmem, size); } @@ -312,8 +309,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S return newmem; if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls - context_t context; - CaptureContext cc(context, HeapReAlloc); + CaptureContext cc(HeapReAlloc); cc.Set(heap, mem, newmem, size); } @@ -412,8 +408,7 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) pCoTaskMemAlloc = (CoTaskMemAlloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); } - context_t context; - CaptureContext cc(context, (void*)pCoTaskMemAlloc); + CaptureContext cc((void*)pCoTaskMemAlloc); // Do the allocation. The block will be mapped by _RtlAllocateHeap. return pCoTaskMemAlloc(size); @@ -446,8 +441,7 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) pCoTaskMemRealloc = (CoTaskMemRealloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); } - context_t context; - CaptureContext cc(context, (void*)pCoTaskMemRealloc); + CaptureContext cc((void*)pCoTaskMemRealloc); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. return pCoTaskMemRealloc(mem, size); @@ -498,10 +492,9 @@ LPVOID VisualLeakDetector::Alloc (_In_ SIZE_T size) #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - context_t context; UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; UINT_PTR iMallocAlloc = cVtablePtr[3]; - CaptureContext cc(context, (void*)iMallocAlloc); + CaptureContext cc((void*)iMallocAlloc); // Do the allocation. The block will be mapped by _RtlAllocateHeap. assert(m_iMalloc != NULL); @@ -622,10 +615,9 @@ LPVOID VisualLeakDetector::Realloc (_In_opt_ LPVOID mem, _In_ SIZE_T size) #ifdef PRINTHOOKCALLS DbgReport(_T(__FUNCTION__) _T( "\n")); #endif - context_t context; UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; UINT_PTR iMallocRealloc = cVtablePtr[4]; - CaptureContext cc(context, (void*)iMallocRealloc); + CaptureContext cc((void*)iMallocRealloc); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. assert(m_iMalloc != NULL); diff --git a/src/vldint.h b/src/vldint.h index c56580b5..9b73d517 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -186,8 +186,7 @@ typedef Map TlsMap; class CaptureContext { public: - CaptureContext(context_t &context, BOOL debug, BOOL ucrt, void* func, UINT_PTR fp = (UINT_PTR)_ReturnAddress()); - CaptureContext(context_t &context, void* func, UINT_PTR fp = (UINT_PTR)_ReturnAddress()); + CaptureContext(void* func, BOOL debug = FALSE, BOOL ucrt = FALSE, UINT_PTR fp = (UINT_PTR)_ReturnAddress()); ~CaptureContext(); __forceinline void Set(HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size); private: @@ -196,7 +195,7 @@ class CaptureContext { CaptureContext(const CaptureContext&); CaptureContext& operator=(const CaptureContext&); private: - __forceinline void Capture(context_t &context); + __forceinline void Capture(); BOOL IsExcludedModule(); void Reset(); private: From af71538309e694f1a61d396354bdea8072b23578 Mon Sep 17 00:00:00 2001 From: ioannis Date: Wed, 25 Nov 2015 12:44:30 +0200 Subject: [PATCH 297/321] Test for "std::`dynamic initializer for '" false positive leak in Release_StaticCrt --- src/callstack.cpp | 39 ++++++++++++++++----------------- src/tests/vld_main/vld_main.cpp | 6 +++++ 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index 9cd6fb1e..fae1eced 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -304,12 +304,11 @@ bool CallStack::isCrtStartupAlloc() DWORD64 displacement64; LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); - UINT status = isCrtStartupFunction(functionName); - if (status == CALLSTACK_STATUS_STARTUPCRT) { - m_status |= CALLSTACK_STATUS_STARTUPCRT; + m_status |= isCrtStartupFunction(functionName); + if (m_status & CALLSTACK_STATUS_STARTUPCRT) { return true; - } else if (status == CALLSTACK_STATUS_NOTSTARTUPCRT) { - break; + } else if (m_status & CALLSTACK_STATUS_NOTSTARTUPCRT) { + return false; } } @@ -467,32 +466,30 @@ int CallStack::resolve(BOOL showInternalFrames) if (GetCallingModule(programCounter) == g_vld.m_vldBase) continue; - DWORD displacement = 0; - - // It turns out that calls to SymGetLineFromAddrW64 may free the very memory we are scrutinizing here - // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. - // When that happens there is nothing we can do except crash. - DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); - BOOL foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo, locker); - DWORD64 displacement64; BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); - if (skipStartupLeaks && !(m_status & CALLSTACK_STATUS_NOTSTARTUPCRT)) { - UINT status = isCrtStartupFunction(functionName); - if (status == CALLSTACK_STATUS_STARTUPCRT) { - m_status |= CALLSTACK_STATUS_STARTUPCRT; + if (skipStartupLeaks) { + if (!(m_status & (CALLSTACK_STATUS_STARTUPCRT | CALLSTACK_STATUS_NOTSTARTUPCRT))) { + m_status |= isCrtStartupFunction(functionName); + } + if (m_status & CALLSTACK_STATUS_STARTUPCRT) { delete[] m_resolved; m_resolved = NULL; m_resolvedCapacity = 0; m_resolvedLength = 0; return 0; - } else if (status == CALLSTACK_STATUS_NOTSTARTUPCRT) { - m_status |= CALLSTACK_STATUS_NOTSTARTUPCRT; } } + // It turns out that calls to SymGetLineFromAddrW64 may free the very memory we are scrutinizing here + // in this method. If this is the case, m_Resolved will be null after SymGetLineFromAddrW64 returns. + // When that happens there is nothing we can do except crash. + DWORD displacement = 0; + DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); + BOOL foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo, locker); + bool isFrameInternal = false; if (foundline && !showInternalFrames) { if (isInternalModule(sourceInfo.FileName)) { @@ -579,6 +576,8 @@ UINT CallStack::isCrtStartupFunction( LPCWSTR functionName ) const || beginWith(functionName, len, L"_calloc_crt") || endWith(functionName, len, L"CRT_INIT") || endWith(functionName, len, L"initterm_e") + || beginWith(functionName, len, L"_cinit") + || beginWith(functionName, len, L"std::`dynamic initializer for '") // VS2015 || beginWith(functionName, len, L"common_initialize_environment_nolock<") || beginWith(functionName, len, L"common_configure_argv<") @@ -592,7 +591,7 @@ UINT CallStack::isCrtStartupFunction( LPCWSTR functionName ) const if (endWith(functionName, len, L"DllMainCRTStartup") || endWith(functionName, len, L"mainCRTStartup") || beginWith(functionName, len, L"`dynamic initializer for '")) { - // When we reach this point there is no reason going furhter down the stack + // When we reach this point there is no reason going further down the stack return CALLSTACK_STATUS_NOTSTARTUPCRT; } diff --git a/src/tests/vld_main/vld_main.cpp b/src/tests/vld_main/vld_main.cpp index ad0161ce..cd22b6c6 100644 --- a/src/tests/vld_main/vld_main.cpp +++ b/src/tests/vld_main/vld_main.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include #include +#include #define VLD_FORCE_ENABLE #include @@ -43,6 +44,11 @@ int Test() memset(m, '5', 50); memset(n, '6', 60); + // std libary dynamically initializes the objects "cout" and "cerr", which + // produce false positive leaks in Release_StaticCrt because we doesn't have + // debug CRT allocation header. + std::cout << "Test: cout"; + //std::cerr << "Test: cerr"; // At this point VLDGetLeaksCount() and VLDReportLeaks() should report 9 leaks // including a leak for ml which has not been freed yet. ml will be freed after From a8c37d13de4ef3a3a33b6c058a63283f8d817cb3 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Fri, 27 Nov 2015 22:29:27 +0300 Subject: [PATCH 298/321] Debuging macroses improved --- src/crtmfcpatch.h | 175 +++++++++++++++------------------------------- src/vld_hooks.cpp | 88 ++++++----------------- 2 files changed, 76 insertions(+), 187 deletions(-) diff --git a/src/crtmfcpatch.h b/src/crtmfcpatch.h index 9b20e016..f90487db 100644 --- a/src/crtmfcpatch.h +++ b/src/crtmfcpatch.h @@ -32,6 +32,21 @@ Applications should never include this header." #include "vldint.h" extern __declspec(dllexport) VisualLeakDetector g_vld; +//#define PRINTHOOKCALLS +//#define PRINTHOOKCALLS2 +#include + +#ifdef PRINTHOOKCALLS +#define PRINT_HOOKED_FUNCTION() DbgReport(_T(__FUNCTION__) _T( "\n")) +#else +#define PRINT_HOOKED_FUNCTION() +#endif +#ifdef PRINTHOOKCALLS2 +#define PRINT_HOOKED_FUNCTION2() DbgReport(_T(__FUNCTION__) _T( "\n")) +#else +#define PRINT_HOOKED_FUNCTION2() +#endif + template class CrtPatch { @@ -179,9 +194,7 @@ void* CrtPatch::crtd__calloc_dbg (size_t num, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _calloc_dbg_t pcrtxxd__calloc_dbg = (_calloc_dbg_t)data.pcrtd__calloc_dbg; assert(pcrtxxd__calloc_dbg); @@ -212,9 +225,7 @@ void* CrtPatch::crtd__malloc_dbg (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _malloc_dbg_t pcrtxxd__malloc_dbg = (_malloc_dbg_t)data.pcrtd__malloc_dbg; assert(pcrtxxd__malloc_dbg); @@ -248,9 +259,7 @@ void* CrtPatch::crtd__realloc_dbg (void *mem, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _realloc_dbg_t pcrtxxd__realloc_dbg = (_realloc_dbg_t)data.pcrtd__realloc_dbg; assert(pcrtxxd__realloc_dbg); @@ -285,9 +294,7 @@ void* CrtPatch::crtd__recalloc_dbg (void *mem, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _recalloc_dbg_t pcrtxxd__recalloc_dbg = (_recalloc_dbg_t)data.pcrtd__recalloc_dbg; assert(pcrtxxd__recalloc_dbg); @@ -303,9 +310,7 @@ char* CrtPatch::crtd__strdup_dbg (const char* src, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _strdup_dbg_t pcrtxxd__strdup_dbg = (_strdup_dbg_t)data.pcrtd__strdup_dbg; assert(pcrtxxd__strdup_dbg); @@ -321,9 +326,7 @@ wchar_t* CrtPatch::crtd__wcsdup_dbg (const wchar_t* src, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _wcsdup_dbg_t pcrtxxd__wcsdup_dbg = (_wcsdup_dbg_t)data.pcrtd__wcsdup_dbg; assert(pcrtxxd__wcsdup_dbg); @@ -354,9 +357,7 @@ void* CrtPatch::crtd__scalar_new_dbg (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)data.pcrtd__scalar_new_dbg; assert(pcrtxxd_new_dbg); @@ -387,9 +388,7 @@ void* CrtPatch::crtd__vector_new_dbg (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)data.pcrtd__vector_new_dbg; assert(pcrtxxd_new_dbg); @@ -414,9 +413,7 @@ void* CrtPatch::crtd__vector_new_dbg (size_t size, template void* CrtPatch::crtd_calloc (size_t num, size_t size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); calloc_t pcrtxxd_calloc = (calloc_t)data.pcrtd_calloc; assert(pcrtxxd_calloc); @@ -439,9 +436,7 @@ void* CrtPatch::crtd_calloc (size_t num, size_t size) template void* CrtPatch::crtd_malloc (size_t size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); malloc_t pcrtxxd_malloc = (malloc_t)data.pcrtd_malloc; assert(pcrtxxd_malloc); @@ -466,9 +461,7 @@ void* CrtPatch::crtd_malloc (size_t size) template void* CrtPatch::crtd_realloc (void *mem, size_t size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); realloc_t pcrtxxd_realloc = (realloc_t)data.pcrtd_realloc; assert(pcrtxxd_realloc); @@ -493,9 +486,7 @@ void* CrtPatch::crtd_realloc (void *mem, size_t size) template void* CrtPatch::crtd__recalloc (void *mem, size_t num, size_t size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _recalloc_t pcrtxxd_recalloc = (_recalloc_t)data.pcrtd_recalloc; assert(pcrtxxd_recalloc); @@ -508,9 +499,7 @@ void* CrtPatch::crtd__recalloc (void *mem, size_t num, size_t template char* CrtPatch::crtd__strdup (const char* src) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _strdup_t pcrtxxd_strdup = (_strdup_t)data.pcrtd__strdup; assert(pcrtxxd_strdup); @@ -522,9 +511,7 @@ char* CrtPatch::crtd__strdup (const char* src) template wchar_t* CrtPatch::crtd__wcsdup (const wchar_t* src) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _wcsdup_t pcrtxxd_wcsdup = (_wcsdup_t)data.pcrtd__wcsdup; assert(pcrtxxd_wcsdup); @@ -556,9 +543,7 @@ void* CrtPatch::crtd__aligned_malloc_dbg (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_malloc_dbg_t pcrtxxd__aligned_malloc_dbg = (_aligned_malloc_dbg_t)data.pcrtd__aligned_malloc_dbg; assert(pcrtxxd__aligned_malloc_dbg); @@ -591,9 +576,7 @@ void* CrtPatch::crtd__aligned_offset_malloc_dbg (size_t char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_offset_malloc_dbg_t pcrtxxd__malloc_dbg = (_aligned_offset_malloc_dbg_t)data.pcrtd__aligned_offset_malloc_dbg; assert(pcrtxxd__malloc_dbg); @@ -628,9 +611,7 @@ void* CrtPatch::crtd__aligned_realloc_dbg (void *mem, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_realloc_dbg_t)data.pcrtd__aligned_realloc_dbg; assert(pcrtxxd__realloc_dbg); @@ -666,9 +647,7 @@ void* CrtPatch::crtd__aligned_offset_realloc_dbg (void char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_offset_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_offset_realloc_dbg_t)data.pcrtd__aligned_offset_realloc_dbg; assert(pcrtxxd__realloc_dbg); @@ -706,9 +685,7 @@ void* CrtPatch::crtd__aligned_recalloc_dbg (void *mem, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_recalloc_dbg_t)data.pcrtd__aligned_recalloc_dbg; assert(pcrtxxd__recalloc_dbg); @@ -747,9 +724,7 @@ void* CrtPatch::crtd__aligned_offset_recalloc_dbg (void char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_offset_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_offset_recalloc_dbg_t)data.pcrtd__aligned_offset_recalloc_dbg; assert(pcrtxxd__recalloc_dbg); @@ -772,9 +747,7 @@ void* CrtPatch::crtd__aligned_offset_recalloc_dbg (void template void* CrtPatch::crtd__aligned_malloc (size_t size, size_t alignment) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_malloc_t pcrtxxd_malloc = (_aligned_malloc_t)data.pcrtd_aligned_malloc; assert(pcrtxxd_malloc); @@ -797,9 +770,7 @@ void* CrtPatch::crtd__aligned_malloc (size_t size, size_t ali template void* CrtPatch::crtd__aligned_offset_malloc (size_t size, size_t alignment, size_t offset) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_offset_malloc_t pcrtxxd_malloc = (_aligned_offset_malloc_t)data.pcrtd_aligned_offset_malloc; assert(pcrtxxd_malloc); @@ -824,9 +795,7 @@ void* CrtPatch::crtd__aligned_offset_malloc (size_t size, siz template void* CrtPatch::crtd__aligned_realloc (void *mem, size_t size, size_t alignment) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_realloc_t pcrtxxd_realloc = (_aligned_realloc_t)data.pcrtd_aligned_realloc; assert(pcrtxxd_realloc); @@ -851,9 +820,7 @@ void* CrtPatch::crtd__aligned_realloc (void *mem, size_t size template void* CrtPatch::crtd__aligned_offset_realloc (void *mem, size_t size, size_t alignment, size_t offset) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_offset_realloc_t pcrtxxd_realloc = (_aligned_offset_realloc_t)data.pcrtd_aligned_offset_realloc; assert(pcrtxxd_realloc); @@ -880,9 +847,7 @@ void* CrtPatch::crtd__aligned_offset_realloc (void *mem, size template void* CrtPatch::crtd__aligned_recalloc (void *mem, size_t num, size_t size, size_t alignment) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_recalloc_t pcrtxxd_recalloc = (_aligned_recalloc_t)data.pcrtd_aligned_recalloc; assert(pcrtxxd_recalloc); @@ -909,9 +874,7 @@ void* CrtPatch::crtd__aligned_recalloc (void *mem, size_t num template void* CrtPatch::crtd__aligned_offset_recalloc (void *mem, size_t num, size_t size, size_t alignment, size_t offset) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); _aligned_offset_recalloc_t pcrtxxd_recalloc = (_aligned_offset_recalloc_t)data.pcrtd_aligned_offset_recalloc; assert(pcrtxxd_recalloc); @@ -932,9 +895,7 @@ void* CrtPatch::crtd__aligned_offset_recalloc (void *mem, siz template void* CrtPatch::crtd_scalar_new (size_t size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_t pcrtxxd_scalar_new = (new_t)data.pcrtd_scalar_new; assert(pcrtxxd_scalar_new); @@ -955,9 +916,7 @@ void* CrtPatch::crtd_scalar_new (size_t size) template void* CrtPatch::crtd_vector_new (size_t size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_t pcrtxxd_vector_new = (new_t)data.pcrtd_vector_new; assert(pcrtxxd_vector_new); @@ -994,9 +953,7 @@ void* MfcPatch::mfcd__scalar_new_dbg_4p (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); @@ -1024,9 +981,7 @@ void* MfcPatch::mfcd__scalar_new_dbg_3p (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcd__scalar_new_dbg_3p; assert(pmfcxxd__new_dbg); @@ -1057,9 +1012,7 @@ void* MfcPatch::mfcd__vector_new_dbg_4p (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__vector_new_dbg_4p; assert(pmfcxxd__new_dbg); @@ -1087,9 +1040,7 @@ void* MfcPatch::mfcd__vector_new_dbg_3p (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcd__vector_new_dbg_3p; assert(pmfcxxd__new_dbg); @@ -1110,9 +1061,7 @@ void* MfcPatch::mfcd__vector_new_dbg_3p (size_t size, template void* MfcPatch::mfcd_scalar_new (size_t size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_t pmfcxxd_new = (new_t)data.pmfcd_scalar_new; assert(pmfcxxd_new); @@ -1133,9 +1082,7 @@ void* MfcPatch::mfcd_scalar_new (size_t size) template void* MfcPatch::mfcd_vector_new (size_t size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_t pmfcxxd_new = (new_t)data.pmfcd_vector_new; assert(pmfcxxd_new); @@ -1166,9 +1113,7 @@ void* MfcPatch::mfcud__scalar_new_dbg_4p (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); @@ -1196,9 +1141,7 @@ void* MfcPatch::mfcud__scalar_new_dbg_3p (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcud__scalar_new_dbg_3p; assert(pmfcxxd__new_dbg); @@ -1229,9 +1172,7 @@ void* MfcPatch::mfcud__vector_new_dbg_4p (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__vector_new_dbg_4p; assert(pmfcxxd__new_dbg); @@ -1259,9 +1200,7 @@ void* MfcPatch::mfcud__vector_new_dbg_3p (size_t size, char const *file, int line) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcud__vector_new_dbg_3p; assert(pmfcxxd__new_dbg); @@ -1282,9 +1221,7 @@ void* MfcPatch::mfcud__vector_new_dbg_3p (size_t size, template void* MfcPatch::mfcud_scalar_new (size_t size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_t pmfcxxd_new = (new_t)data.pmfcud_scalar_new; assert(pmfcxxd_new); @@ -1305,9 +1242,7 @@ void* MfcPatch::mfcud_scalar_new (size_t size) template void* MfcPatch::mfcud_vector_new (size_t size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T("\n")); -#endif + PRINT_HOOKED_FUNCTION(); new_t pmfcxxd_new = (new_t)data.pmfcud_vector_new; assert(pmfcxxd_new); diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index df8693dd..df6fda2f 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -38,10 +38,6 @@ #include "vldint.h" // Provides access to the Visual Leak Detector internals. #include "loaderlock.h" -//#define PRINTHOOKCALLS -//#define PRINTHOOKCALLS2 -#include - extern HANDLE g_currentProcess; extern CriticalSection g_heapMapLock; extern DbgHelp g_DbgHelp; @@ -65,9 +61,7 @@ extern DbgHelp g_DbgHelp; // HANDLE VisualLeakDetector::_GetProcessHeap() { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); // Get the process heap. HANDLE heap = m_GetProcessHeap(); @@ -98,9 +92,7 @@ HANDLE VisualLeakDetector::_GetProcessHeap() // HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T maxsize) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); // Create the heap. HANDLE heap = m_HeapCreate(options, initsize, maxsize); @@ -127,9 +119,7 @@ HANDLE VisualLeakDetector::_HeapCreate (DWORD options, SIZE_T initsize, SIZE_T m // BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); // After this heap is destroyed, the heap's address space will be unmapped // from the process's address space. So, we'd better generate a leak report // for this heap now, while we can still read from the memory blocks @@ -160,9 +150,7 @@ BOOL VisualLeakDetector::_HeapDestroy (HANDLE heap) // LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T size) { -#ifdef PRINTHOOKCALLS2 - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION2(); // Allocate the block. LPVOID block = RtlAllocateHeap(heap, flags, size); @@ -180,9 +168,7 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si // HeapAlloc (kernel32.dll) call RtlAllocateHeap (ntdll.dll) LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) { -#ifdef PRINTHOOKCALLS2 - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION2(); // Allocate the block. LPVOID block = HeapAlloc(heap, flags, size); @@ -214,9 +200,7 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) // BYTE VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) { -#ifdef PRINTHOOKCALLS2 - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION2(); BYTE status; if (!g_DbgHelp.IsLockedByCurrentThread()) // skip dbghelp.dll calls @@ -237,9 +221,7 @@ BYTE VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) // HeapFree (kernel32.dll) call RtlFreeHeap (ntdll.dll) BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) { -#ifdef PRINTHOOKCALLS2 - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION2(); BOOL status; if (!g_DbgHelp.IsLockedByCurrentThread()) // skip dbghelp.dll calls @@ -279,9 +261,7 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) // LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); // Reallocate the block. LPVOID newmem = RtlReAllocateHeap(heap, flags, mem, size); @@ -299,9 +279,7 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID // for kernel32.dll LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, SIZE_T size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); // Reallocate the block. LPVOID newmem = HeapReAlloc(heap, flags, mem, size); @@ -340,9 +318,7 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S // HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); static CoGetMalloc_t pCoGetMalloc = NULL; HRESULT hr = S_OK; @@ -396,9 +372,7 @@ HRESULT VisualLeakDetector::_CoGetMalloc (DWORD context, LPMALLOC *imalloc) // LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); static CoTaskMemAlloc_t pCoTaskMemAlloc = NULL; if (pCoTaskMemAlloc == NULL) { @@ -429,9 +403,7 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) // LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); static CoTaskMemRealloc_t pCoTaskMemRealloc = NULL; if (pCoTaskMemRealloc == NULL) { @@ -463,9 +435,7 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) // ULONG VisualLeakDetector::AddRef () { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); assert(m_iMalloc != NULL); if (m_iMalloc) { // Increment the library reference count to defer unloading the library, @@ -489,9 +459,7 @@ ULONG VisualLeakDetector::AddRef () // LPVOID VisualLeakDetector::Alloc (_In_ SIZE_T size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; UINT_PTR iMallocAlloc = cVtablePtr[3]; CaptureContext cc((void*)iMallocAlloc); @@ -513,9 +481,7 @@ LPVOID VisualLeakDetector::Alloc (_In_ SIZE_T size) // INT VisualLeakDetector::DidAlloc (_In_opt_ LPVOID mem) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); assert(m_iMalloc != NULL); return (m_iMalloc) ? m_iMalloc->DidAlloc(mem) : 0; } @@ -531,9 +497,7 @@ INT VisualLeakDetector::DidAlloc (_In_opt_ LPVOID mem) // VOID VisualLeakDetector::Free (_In_opt_ LPVOID mem) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); assert(m_iMalloc != NULL); if (m_iMalloc) m_iMalloc->Free(mem); } @@ -550,9 +514,7 @@ VOID VisualLeakDetector::Free (_In_opt_ LPVOID mem) // SIZE_T VisualLeakDetector::GetSize (_In_opt_ LPVOID mem) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); assert(m_iMalloc != NULL); return (m_iMalloc) ? m_iMalloc->GetSize(mem) : 0; } @@ -566,9 +528,7 @@ SIZE_T VisualLeakDetector::GetSize (_In_opt_ LPVOID mem) // VOID VisualLeakDetector::HeapMinimize () { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); assert(m_iMalloc != NULL); if (m_iMalloc) m_iMalloc->HeapMinimize(); } @@ -589,9 +549,7 @@ VOID VisualLeakDetector::HeapMinimize () // HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); assert(m_iMalloc != NULL); return (m_iMalloc) ? m_iMalloc->QueryInterface(iid, object) : E_UNEXPECTED; } @@ -612,9 +570,7 @@ HRESULT VisualLeakDetector::QueryInterface (REFIID iid, LPVOID *object) // LPVOID VisualLeakDetector::Realloc (_In_opt_ LPVOID mem, _In_ SIZE_T size) { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; UINT_PTR iMallocRealloc = cVtablePtr[4]; CaptureContext cc((void*)iMallocRealloc); @@ -634,9 +590,7 @@ LPVOID VisualLeakDetector::Realloc (_In_opt_ LPVOID mem, _In_ SIZE_T size) // ULONG VisualLeakDetector::Release () { -#ifdef PRINTHOOKCALLS - DbgReport(_T(__FUNCTION__) _T( "\n")); -#endif + PRINT_HOOKED_FUNCTION(); assert(m_iMalloc != NULL); ULONG nCount = 0; if (m_iMalloc) { From bdae26bd9c641a48d97c24e62272a96c334d1ceb Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 28 Nov 2015 01:17:00 +0300 Subject: [PATCH 299/321] Added Donate button --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4552d6aa..f9d73b5c 100644 --- a/README.md +++ b/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) +# 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) PayPal donate button ## Introduction From 5a08ef0c704821203b96f947d26763b3875eba56 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 28 Nov 2015 01:46:42 +0300 Subject: [PATCH 300/321] Added Gitter notification: https://gitter.im/KindDragon/vld --- appveyor.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 9933459e..f445db2b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -62,6 +62,13 @@ configuration: matrix: fast_finish: false +notifications: +- provider: Webhook + url: https://webhooks.gitter.im/e/f26eac97358590c8feca + on_build_success: true + on_build_failure: true + on_build_status_changed: true + build_script: - ps: | Write-Output "Configuration: $env:CONFIGURATION" From 09478143be9516eb32275a7feb7c338ae2717b83 Mon Sep 17 00:00:00 2001 From: ioannis Date: Wed, 25 Nov 2015 15:23:19 +0200 Subject: [PATCH 301/321] Remove duplication of callstack resolve implementation in Callstack::dump --- src/callstack.cpp | 78 +++++------------------------------------------ src/callstack.h | 6 ++-- 2 files changed, 9 insertions(+), 75 deletions(-) diff --git a/src/callstack.cpp b/src/callstack.cpp index fae1eced..698e7161 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -330,78 +330,21 @@ bool CallStack::isCrtStartupAlloc() // // None. // -void CallStack::dump(BOOL showInternalFrames, UINT start_frame) const +void CallStack::dump(BOOL showInternalFrames) { - // The stack was dumped already - if (m_resolved) - { - dumpResolved(); - return; + if (!m_resolved) { + resolve(showInternalFrames); } - if (m_status & CALLSTACK_STATUS_INCOMPLETE) { - // This call stack appears to be incomplete. Using StackWalk64 may be - // more reliable. - Report(L" HINT: The following call stack may be incomplete. Setting \"StackWalkMethod\"\n" - L" in the vld.ini file to \"safe\" instead of \"fast\" may result in a more\n" - L" complete stack trace.\n"); - } - - IMAGEHLP_LINE64 sourceInfo = { 0 }; - sourceInfo.SizeOfStruct = sizeof(IMAGEHLP_LINE64); - - // Use static here to increase performance, and avoid heap allocs. - // It's thread safe because of g_heapMapLock lock. - static WCHAR stack_line[MAXREPORTLENGTH + 1] = L""; - bool isPrevFrameInternal = false; - CriticalSectionLocker locker(g_DbgHelp); - - // Iterate through each frame in the call stack. - for (UINT32 frame = start_frame; frame < m_size; frame++) - { - // Try to get the source file and line number associated with - // this program counter address. - SIZE_T programCounter = (*this)[frame]; - if (GetCallingModule(programCounter) == g_vld.m_vldBase) - continue; - - BOOL foundline = FALSE; - DWORD displacement = 0; - DbgTrace(L"dbghelp32.dll %i: SymGetLineFromAddrW64\n", GetCurrentThreadId()); - foundline = g_DbgHelp.SymGetLineFromAddrW64(g_currentProcess, programCounter, &displacement, &sourceInfo, locker); - - bool isFrameInternal = false; - if (foundline && !showInternalFrames) { - if (isInternalModule(sourceInfo.FileName)) - { - // Don't show frames in files internal to the heap. - isFrameInternal = true; - } - } - - // show one allocation function for context - if (!isFrameInternal && isPrevFrameInternal) - Print(stack_line); - isPrevFrameInternal = isFrameInternal; - - DWORD64 displacement64; - BYTE symbolBuffer[sizeof(SYMBOL_INFO) + MAX_SYMBOL_NAME_SIZE]; - LPCWSTR functionName = getFunctionName(programCounter, displacement64, (SYMBOL_INFO*)&symbolBuffer, locker); - - if (!foundline) - displacement = (DWORD)displacement64; - DWORD NumChars = resolveFunction(programCounter, foundline ? &sourceInfo : NULL, - displacement, functionName, stack_line, _countof(stack_line)); - UNREFERENCED_PARAMETER(NumChars); - - if (!isFrameInternal) - Print(stack_line); + // The stack was reoslved already + if (m_resolved) { + return Print(m_resolved); } } // Resolve - Creates a nicely formatted rendition of the CallStack, including // symbolic information (function names and line numbers) if available. and -// saves it for later retrieval. This is almost identical to Callstack::dump above. +// saves it for later retrieval. // // Note: The symbol handler must be initialized prior to calling this // function. @@ -524,13 +467,6 @@ int CallStack::resolve(BOOL showInternalFrames) return unresolvedFunctionsCount; } -// DumpResolve -void CallStack::dumpResolved() const -{ - if (m_resolved) - Print(m_resolved); -} - // push_back - Pushes a frame's program counter onto the CallStack. Pushes are // always appended to the back of the chunk list (aka the "top" chunk). // diff --git a/src/callstack.h b/src/callstack.h index 72dbd097..8a6a347d 100644 --- a/src/callstack.h +++ b/src/callstack.h @@ -85,7 +85,7 @@ class CallStack VOID clear (); // Prints the call stack to one of either / or the debug output window and or // a log file. - VOID dump (BOOL showinternalframes, UINT start_frame = 0) const; + VOID dump (BOOL showinternalframes); // Formats the stack frame into a human readable format, and saves it for later retrieval. int resolve(BOOL showinternalframes); virtual DWORD getHashValue() const = 0; @@ -121,9 +121,7 @@ class CallStack WCHAR* m_resolved; int m_resolvedCapacity; int m_resolvedLength; - // Prints out the strings in m_Resolved when the time comes to report the callstack in - // human readable form. Currently this is only called by the dump method. - void dumpResolved() const; + bool isInternalModule( const PWSTR filename ) const; UINT isCrtStartupFunction( LPCWSTR functionName ) const; LPCWSTR getFunctionName(SIZE_T programCounter, DWORD64& displacement64, From 8d77ca9aeba3856aa664d89c7b6c12e9f7afed4d Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 13 Dec 2015 16:32:54 +0300 Subject: [PATCH 302/321] VS2012 Release leaks count fix --- src/callstack.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/callstack.cpp b/src/callstack.cpp index 698e7161..d97f0918 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -514,6 +514,9 @@ UINT CallStack::isCrtStartupFunction( LPCWSTR functionName ) const || endWith(functionName, len, L"initterm_e") || beginWith(functionName, len, L"_cinit") || beginWith(functionName, len, L"std::`dynamic initializer for '") + // VS2012 Release + || beginWith(functionName, len, L"std::locale::_Init()") + || beginWith(functionName, len, L"std::basic_streambuf<") // VS2015 || beginWith(functionName, len, L"common_initialize_environment_nolock<") || beginWith(functionName, len, L"common_configure_argv<") From e1692257ce18e5749de50a2e747b18c492c5caa5 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 26 Dec 2015 19:10:31 +0300 Subject: [PATCH 303/321] Correct unload dynamic.dll after test --- .gitignore | 1 + appveyor.yml | 4 ++ src/tests/dynamic_app/LoadTests.cpp | 56 ++++++++++++++++----------- src/tests/dynamic_app/LoadTests.h | 6 ++- src/tests/dynamic_app/ThreadTest.cpp | 21 ++++++---- src/tests/dynamic_app/ThreadTests.h | 3 +- src/tests/dynamic_app/dynamic_app.cpp | 52 +++++++++++++++++++------ src/tests/dynamic_dll/dynamic.vcxproj | 2 + 8 files changed, 101 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 88a009ba..fbfae2dd 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ src/bin/vld.ini /src/tests/vld_ComTest/ComTest_i.h /src/tests/vld_ComTest/ComTest_p.c /src/tests/vld_ComTest/ComTest_i.c +*.VC.opendb diff --git a/appveyor.yml b/appveyor.yml index f445db2b..e1621f8c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -62,6 +62,10 @@ configuration: matrix: fast_finish: false +nuget: + project_feed: true + disable_publish_on_pr: true + notifications: - provider: Webhook url: https://webhooks.gitter.im/e/f26eac97358590c8feca diff --git a/src/tests/dynamic_app/LoadTests.cpp b/src/tests/dynamic_app/LoadTests.cpp index cec0eee8..c6dca567 100644 --- a/src/tests/dynamic_app/LoadTests.cpp +++ b/src/tests/dynamic_app/LoadTests.cpp @@ -42,25 +42,32 @@ void CallDynamicMethods(HMODULE module, const CHAR* function) } } -HMODULE RunLoaderTests(bool resolve) +HMODULE LoadDynamicTests() { HMODULE hdyn = LoadLibrary(_T("dynamic.dll")); if (hdyn) { VLDEnableModule(hdyn); + } + return hdyn; +} - // Should leak 18 memory allocations in total - // These requires ansi, not Unicode strings - CallDynamicMethods(hdyn, "SimpleLeak_Malloc"); // leaks 6 - CallDynamicMethods(hdyn, "SimpleLeak_New"); // leaks 6 - CallDynamicMethods(hdyn, "SimpleLeak_New_Array"); // leaks 6 +void RunLoaderTests(HMODULE hdyn, bool resolve) +{ + if (!hdyn) + return; + VLDEnableModule(hdyn); - if (resolve) - { - CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings - } + // Should leak 18 memory allocations in total + // These requires ansi, not Unicode strings + CallDynamicMethods(hdyn, "SimpleLeak_Malloc"); // leaks 6 + CallDynamicMethods(hdyn, "SimpleLeak_New"); // leaks 6 + CallDynamicMethods(hdyn, "SimpleLeak_New_Array"); // leaks 6 + + if (resolve) + { + CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings } - return hdyn; } void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function ) @@ -80,23 +87,28 @@ void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function ) } } - -HMODULE RunMFCLoaderTests(bool resolve) +HMODULE LoadMFCTests() { HMODULE hmfcLib = LoadLibrary(_T("test_mfc.dll")); if (hmfcLib) { VLDEnableModule(hmfcLib); - // Should leak 11 memory allocations in total - // This requires ansi, not Unicode strings - CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // Leaks 4 x 2 = 8 - CallLibraryMethods(hmfcLib, "MFC_LeakArray"); // leaks 3 - - if (resolve) - { - CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings - } } return hmfcLib; } +void RunMFCLoaderTests(HMODULE hmfcLib, bool resolve) +{ + if (!hmfcLib) + return; + // Should leak 11 memory allocations in total + // This requires ansi, not Unicode strings + CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // Leaks 4 x 2 = 8 + CallLibraryMethods(hmfcLib, "MFC_LeakArray"); // leaks 3 + + if (resolve) + { + CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings + } +} + diff --git a/src/tests/dynamic_app/LoadTests.h b/src/tests/dynamic_app/LoadTests.h index 2ef4fd95..61956f23 100644 --- a/src/tests/dynamic_app/LoadTests.h +++ b/src/tests/dynamic_app/LoadTests.h @@ -1,4 +1,6 @@ #pragma once -HMODULE RunLoaderTests( bool resolve ); -HMODULE RunMFCLoaderTests( bool resolve ); +HMODULE LoadDynamicTests(); +void RunLoaderTests(HMODULE hdyn, bool resolve); +HMODULE LoadMFCTests(); +void RunMFCLoaderTests(HMODULE hmfcLib, bool resolve); diff --git a/src/tests/dynamic_app/ThreadTest.cpp b/src/tests/dynamic_app/ThreadTest.cpp index 348fdf4a..3f65cceb 100644 --- a/src/tests/dynamic_app/ThreadTest.cpp +++ b/src/tests/dynamic_app/ThreadTest.cpp @@ -22,15 +22,21 @@ void RunPSApiLoaderTests() void Call_LoaderLocks(const ThreadData& threadData) { RunPSApiLoaderTests(); // will not crash - HMODULE hmfcLib; - if (threadData.mfc) - hmfcLib = RunMFCLoaderTests(threadData.resolve); // Leaks 11 allocs - else - hmfcLib = RunLoaderTests(threadData.resolve); // Leaks 18 allocs + HMODULE hlib; + if (threadData.mfc) + { + hlib = LoadMFCTests(); + RunMFCLoaderTests(hlib, threadData.resolve); // Leaks 11 allocs + } + else + { + hlib = LoadDynamicTests(); + RunLoaderTests(hlib, threadData.resolve); // Leaks 18 allocs + } #ifndef STATIC_CRT - FreeLibrary(hmfcLib); + FreeLibrary(hlib); #else - UNREFERENCED_PARAMETER(hmfcLib); + UNREFERENCED_PARAMETER(hlib); #endif HMODULE this_app = NULL; @@ -63,7 +69,6 @@ unsigned __stdcall Dynamic_Thread_Procedure(LPVOID foo) void RunLoaderLockTests(bool resolve, bool mfc) { - static const int NUMTHREADS = 64; HANDLE threads[NUMTHREADS] = {0}; unsigned thread_id = NULL; ThreadData threadData; diff --git a/src/tests/dynamic_app/ThreadTests.h b/src/tests/dynamic_app/ThreadTests.h index 36d560ce..5f3a5472 100644 --- a/src/tests/dynamic_app/ThreadTests.h +++ b/src/tests/dynamic_app/ThreadTests.h @@ -1,4 +1,5 @@ #pragma once -void RunLoaderLockTests(bool, bool); +static const int NUMTHREADS = 64; +void RunLoaderLockTests(bool, bool); diff --git a/src/tests/dynamic_app/dynamic_app.cpp b/src/tests/dynamic_app/dynamic_app.cpp index ffdb0bec..887dbdb7 100644 --- a/src/tests/dynamic_app/dynamic_app.cpp +++ b/src/tests/dynamic_app/dynamic_app.cpp @@ -40,16 +40,26 @@ class DynamicLoader : public ::testing::TestWithParam { TEST_P(DynamicLoader, LoaderTests) { - HMODULE hmfcLib = RunLoaderTests(GetParam()); // leaks 18 - ASSERT_NE(0u, (UINT_PTR)hmfcLib); - int leaks = (int)VLDGetLeaksCount(); + HMODULE hdynLib = LoadDynamicTests(); + ASSERT_NE(0u, reinterpret_cast(hdynLib)); +#ifdef STATIC_CRT // Toolset <= v100 use own heap + VLDMarkAllLeaksAsReported(); + RunLoaderTests(hdynLib, GetParam()); // leaks 18 + int leaks = static_cast(VLDGetLeaksCount()); + FreeLibrary(hdynLib); +#else + //VLDMarkAllLeaksAsReported(); + RunLoaderTests(hdynLib, GetParam()); // leaks 18 + FreeLibrary(hdynLib); + int leaks = static_cast(VLDGetLeaksCount()); +#endif if (18 != leaks) VLDReportLeaks(); ASSERT_EQ(18, leaks); } TEST_P(DynamicLoader, MultithreadLoadingTests) { - // Creates 64 threads that each leaks 18 allocations + // Creates NUMTHREADS threads that each leaks 18 allocations DWORD start = GetTickCount(); RunLoaderLockTests(GetParam(), false); DWORD duration = GetTickCount() - start; @@ -58,23 +68,38 @@ TEST_P(DynamicLoader, MultithreadLoadingTests) int leaks = (int)VLDGetLeaksCount(); duration = GetTickCount() - start; _tprintf(_T("VLDGetLeaksCount took: %u ms\n"), duration); - if (64 * 18 != leaks) VLDReportLeaks(); - ASSERT_EQ(64 * 18, leaks); + int correctLeaks = NUMTHREADS * 18; + if (correctLeaks != leaks) VLDReportLeaks(); +#ifdef STATIC_CRT // One leak from dll static allocation + HMODULE hlib = LoadDynamicTests(); + for (int i = 0; i < NUMTHREADS + 1; i++) + FreeLibrary(hlib); +#endif + ASSERT_EQ(correctLeaks, leaks); } TEST_P(DynamicLoader, MfcLoaderTests) { - HMODULE hmfcLib = RunMFCLoaderTests(GetParam()); // leaks 11 - ASSERT_NE(0u, (UINT_PTR)hmfcLib); + HMODULE hmfcLib = LoadMFCTests(); + ASSERT_NE(0u, reinterpret_cast(hmfcLib)); +#ifdef STATIC_CRT // Toolset <= v100 use own heap + VLDMarkAllLeaksAsReported(); + RunMFCLoaderTests(hmfcLib, GetParam()); // leaks 11 + int leaks = (int)VLDGetLeaksCount(); + FreeLibrary(hmfcLib); +#else + //VLDMarkAllLeaksAsReported(); + RunMFCLoaderTests(hmfcLib, GetParam()); // leaks 11 FreeLibrary(hmfcLib); int leaks = (int)VLDGetLeaksCount(); +#endif if (11 != leaks) VLDReportLeaks(); ASSERT_EQ(11, leaks); } TEST_P(DynamicLoader, MfcMultithreadLoadingTests) { - // Creates 64 threads that each leaks 11 allocations + // Creates NUMTHREADS threads that each leaks 11 allocations DWORD start = GetTickCount(); RunLoaderLockTests(GetParam(), true); DWORD duration = GetTickCount() - start; @@ -83,8 +108,13 @@ TEST_P(DynamicLoader, MfcMultithreadLoadingTests) int leaks = (int)VLDGetLeaksCount(); duration = GetTickCount() - start; _tprintf(_T("VLDGetLeaksCount took: %u ms\n"), duration); - if (64 * 11 != leaks) VLDReportLeaks(); - ASSERT_EQ(64 * 11, leaks); + if (NUMTHREADS * 11 != leaks) VLDReportLeaks(); +#ifdef STATIC_CRT // One leak from dll static allocation + HMODULE hlib = LoadMFCTests(); + for (int i = 0; i < NUMTHREADS + 1; i++) + FreeLibrary(hlib); +#endif + ASSERT_EQ(NUMTHREADS * 11, leaks); } INSTANTIATE_TEST_CASE_P(ResolveVal, diff --git a/src/tests/dynamic_dll/dynamic.vcxproj b/src/tests/dynamic_dll/dynamic.vcxproj index 189f4881..b452292a 100644 --- a/src/tests/dynamic_dll/dynamic.vcxproj +++ b/src/tests/dynamic_dll/dynamic.vcxproj @@ -190,6 +190,7 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug Windows @@ -239,6 +240,7 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebug Windows From beac1f1e5959611784c4ef9c671e4eabd277f4de Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 26 Dec 2015 19:11:37 +0300 Subject: [PATCH 304/321] Some STD methods marked as CRT methods for VS2015 Release --- src/callstack.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/callstack.cpp b/src/callstack.cpp index d97f0918..ef0d01ce 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -523,6 +523,12 @@ UINT CallStack::isCrtStartupFunction( LPCWSTR functionName ) const || beginWith(functionName, len, L"__acrt_initialize") || beginWith(functionName, len, L"__acrt_allocate_buffer_for_argv") || beginWith(functionName, len, L"_register_onexit_function") + // VS2015 Release + || (wcscmp(functionName, L"setlocale") == 0) + || (wcscmp(functionName, L"_wsetlocale") == 0) + || (wcscmp(functionName, L"_Getctype") == 0) + || (wcscmp(functionName, L"std::_Facet_Register") == 0) + || endWith(functionName, len, L">::_Getcat") ) { return CALLSTACK_STATUS_STARTUPCRT; } From 95c4c87958322ecdeafd65780db472629a3db848 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 26 Dec 2015 19:15:24 +0300 Subject: [PATCH 305/321] Internal api added to get last leak callstack for testing purpose --- src/callstack.cpp | 6 ++++++ src/callstack.h | 2 ++ src/vld.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++++++ src/vldapi.cpp | 6 ++++++ src/vldint.h | 2 ++ 5 files changed, 65 insertions(+) diff --git a/src/callstack.cpp b/src/callstack.cpp index ef0d01ce..e3cbbc2e 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -467,6 +467,12 @@ int CallStack::resolve(BOOL showInternalFrames) return unresolvedFunctionsCount; } +const WCHAR* CallStack::getResolvedCallstack( BOOL showinternalframes ) +{ + resolve(showinternalframes); + return m_resolved; +} + // push_back - Pushes a frame's program counter onto the CallStack. Pushes are // always appended to the back of the chunk list (aka the "top" chunk). // diff --git a/src/callstack.h b/src/callstack.h index 8a6a347d..9dfa353e 100644 --- a/src/callstack.h +++ b/src/callstack.h @@ -88,6 +88,8 @@ class CallStack VOID dump (BOOL showinternalframes); // Formats the stack frame into a human readable format, and saves it for later retrieval. int resolve(BOOL showinternalframes); + // Formats the stack frame into a human readable format, and saves it for later retrieval. + CONST WCHAR* getResolvedCallstack(BOOL showinternalframes); virtual DWORD getHashValue() const = 0; virtual VOID getStackTrace (UINT32 maxdepth, const context_t& context) = 0; bool isCrtStartupAlloc(); diff --git a/src/vld.cpp b/src/vld.cpp index ecc66022..ed26eff8 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -2759,6 +2759,55 @@ void VisualLeakDetector::setupReporting() } } +blockinfo_t* VisualLeakDetector::getAllocationBlockInfo(void* alloc) +{ + // should be called under g_heapMapLock + for (HeapMap::Iterator heapiter = m_heapMap->begin(); heapiter != m_heapMap->end(); ++heapiter) + { + HANDLE heap = (*heapiter).first; + UNREFERENCED_PARAMETER(heap); + heapinfo_t* heapinfo = (*heapiter).second; + BlockMap& blockmap = heapinfo->blockMap; + + for (BlockMap::Iterator blockit = blockmap.begin(); blockit != blockmap.end(); ++blockit) { + // Found a block which is still in the BlockMap. We've identified a + // potential memory leak. + LPCVOID block = (*blockit).first; + blockinfo_t* info = (*blockit).second; + if (block == alloc) + return info; + + if (isDebugCrtAlloc(block, info)) { + // The CRT header is more or less transparent to the user, so + // the information about the contained block will probably be + // more useful to the user. Accordingly, that's the information + // we'll include in the report. + if (CRTDBGBLOCKDATA(block) == alloc) + return info; + } + } + } + return NULL; +} + +const wchar_t* VisualLeakDetector::GetAllocationResolveResults(void* alloc, BOOL showInternalFrames) +{ + LoaderLock ll; + + if (m_options & VLD_OPT_VLDOFF) + return NULL; + + CriticalSectionLocker<> cs(g_heapMapLock); + blockinfo_t* info = getAllocationBlockInfo(alloc); + if (info != NULL) + { + int unresolvedFunctionsCount = info->callStack->resolve(showInternalFrames); + _ASSERT(unresolvedFunctionsCount == 0); + return info->callStack->getResolvedCallstack(showInternalFrames); + } + return NULL; +} + int VisualLeakDetector::resolveStacks(heapinfo_t* heapinfo) { int unresolvedFunctionsCount = 0; diff --git a/src/vldapi.cpp b/src/vldapi.cpp index fb0e57a8..15396556 100644 --- a/src/vldapi.cpp +++ b/src/vldapi.cpp @@ -147,4 +147,10 @@ __declspec(dllexport) int VLDResolveCallstacks() return g_vld.ResolveCallstacks(); } +/// Internal function for tests. Not safe to use because Vld own returned string +__declspec(dllexport) const wchar_t* VldInternalGetAllocationCallstack(void* alloc, BOOL showInternalFrames) +{ + return g_vld.GetAllocationResolveResults(alloc, showInternalFrames); +} + } diff --git a/src/vldint.h b/src/vldint.h index 9b73d517..af4ad48a 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -278,6 +278,7 @@ class VisualLeakDetector : public IMalloc VOID SetModulesList(CONST WCHAR *modules, BOOL includeModules); bool GetModulesList(WCHAR *modules, UINT size); int ResolveCallstacks(); + const wchar_t* GetAllocationResolveResults(void* alloc, BOOL showInternalFrames); static NTSTATUS __stdcall _LdrLoadDll (LPWSTR searchpath, PULONG flags, unicodestring_t *modulename, PHANDLE modulehandle); @@ -327,6 +328,7 @@ class VisualLeakDetector : public IMalloc // Utils static bool isModuleExcluded (UINT_PTR returnaddress); blockinfo_t* findAllocedBlock(LPCVOID, __out HANDLE& heap); + blockinfo_t* getAllocationBlockInfo(void* alloc); void setupReporting(); void checkInternalMemoryLeaks(); bool waitForAllVLDThreads(); From fa25a239b245a95bc490615248453ae5e466b086 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Mon, 28 Dec 2015 09:40:13 +0300 Subject: [PATCH 306/321] Refactored allocs.cpp --- src/tests/basics/Allocs.cpp | 447 +++++++++++++++--------- src/tests/basics/Allocs.h | 14 +- src/tests/basics/LeakOption.h | 22 -- src/tests/basics/basics.cpp | 24 +- src/tests/basics/basics.vcxproj | 3 +- src/tests/basics/basics.vcxproj.filters | 3 - src/tests/basics/basics_disabled.cpp | 24 +- src/tests/dynamic_dll/dynamic.cpp | 7 +- 8 files changed, 322 insertions(+), 222 deletions(-) delete mode 100644 src/tests/basics/LeakOption.h diff --git a/src/tests/basics/Allocs.cpp b/src/tests/basics/Allocs.cpp index b12f0a6b..0a6ecec3 100644 --- a/src/tests/basics/Allocs.cpp +++ b/src/tests/basics/Allocs.cpp @@ -58,197 +58,314 @@ #endif #endif +// Vld shouldn't report this leak because we enable Vld after executing DllMain +class MemoryLeak { +public: + MemoryLeak() { l = malloc(7); memset(l, 0x30 + ((int)7 / 10), 7); } + ~MemoryLeak() { free(l); } +private: + void* l; +}; + +static MemoryLeak ml; + typedef void* (__cdecl *free_t) (void* mem); typedef void* (__cdecl *malloc_t) (size_t size); +typedef void (*allocFunc_t) (bool bFree); static const int recursion = 3; +__declspec(noinline) void allocMalloc(bool bFree) +{ + int* leaked_memory = (int*)malloc(78); + int* leaked_memory_dbg = (int*)_malloc_dbg(80, _NORMAL_BLOCK, __FILE__, __LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); + } +} + +void allocNew(bool bFree) +{ + int* leaked_memory = (int*)malloc(78); + int* leaked_memory_dbg = (int*)_malloc_dbg(80, _NORMAL_BLOCK, __FILE__, __LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); + } +} + +void allocNewArray(bool bFree) +{ + int* leaked_memory = new int[3]; + int* leaked_memory_dbg = new (_NORMAL_BLOCK, __FILE__, __LINE__) int[4]; + + // placement new operator + int temp[3]; + void* place = temp; + float* placed_mem = new (place) float[3]; // doesn't work. Nothing gets patched by vld + if (bFree) + { + delete[] leaked_memory; + delete[] leaked_memory_dbg; + } +} + +void allocCalloc(bool bFree) +{ + int* leaked_memory = (int*)calloc(47, sizeof(int)); + int* leaked_memory_dbg = (int*)_calloc_dbg(39, sizeof(int), _NORMAL_BLOCK, __FILE__, __LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); + } +} + +void allocRealloc(bool bFree) +{ + int* temp = (int*)malloc(17); + int* old_leaked_memory = (int*)realloc(temp, 23); + int* leaked_memory = (int*)_recalloc(old_leaked_memory, 1, 31); + int* old_leaked_memory_dbg = (int*)malloc(9); + int* leaked_memory_dbg = (int*)_realloc_dbg(old_leaked_memory_dbg, 21, _NORMAL_BLOCK, __FILE__, __LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); + } +} + +void allocCoTaskMem(bool bFree) +{ + void* leaked = CoTaskMemAlloc(7); + if (bFree) + { + CoTaskMemFree(leaked); + } + void* leaked2 = CoTaskMemAlloc(7); + void* realloced = CoTaskMemRealloc(leaked2, 29); + if (bFree) + { + CoTaskMemFree(realloced); + } +} + +void allocAlignedMalloc(bool bFree) +{ + void* leaked = _aligned_offset_malloc(64, 16, 1); + int* leaked_memory = (int*)_aligned_malloc(64, 16); + int* leaked_memory_dbg = (int*)_aligned_malloc_dbg(32, 16, __FILE__, __LINE__); + if (bFree) + { + _aligned_free(leaked); + _aligned_free(leaked_memory); + _aligned_free_dbg(leaked_memory_dbg); + } +} + +void allocAlignedRealloc(bool bFree) +{ + void* leaked = _aligned_offset_malloc(64, 16, 1); + int* leaked_memory = (int*)_aligned_malloc(64, 16); + int* leaked_memory_dbg = (int*)_aligned_malloc_dbg(32, 16, __FILE__, __LINE__); + leaked = (int*)_aligned_offset_realloc(leaked, 48, 16, 2); + leaked_memory = (int*)_aligned_realloc(leaked_memory, 128, 16); + leaked_memory_dbg = (int*)_aligned_realloc_dbg(leaked_memory_dbg, 48, 16, __FILE__, __LINE__); + leaked = (int*)_aligned_offset_recalloc(leaked, 1, 52, 16, 2); + leaked_memory = (int*)_aligned_recalloc(leaked_memory, 1, 132, 16); + leaked_memory_dbg = (int*)_aligned_recalloc_dbg(leaked_memory_dbg, 1, 64, 16, __FILE__, __LINE__); + if (bFree) + { + _aligned_free(leaked); + _aligned_free(leaked_memory); + _aligned_free_dbg(leaked_memory_dbg); + } +} + +void allocStrdup(bool bFree) +{ + int* leaked_memory = (int*)_strdup("_strdup() leaks!"); + int* leaked_memory_dbg = (int*)_strdup_dbg("_strdup_dbg() leaks!", _NORMAL_BLOCK, __FILE__, __LINE__); + void* leaked_wmemory = (int*)_wcsdup(L"_wcsdup() leaks!"); + void* leaked_wmemory_dbg = (int*)_wcsdup_dbg(L"_wcsdup_dbg() leaks!", _NORMAL_BLOCK, __FILE__, __LINE__); + if (bFree) + { + free(leaked_memory); + _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); + free(leaked_wmemory); + _free_dbg(leaked_wmemory_dbg, _NORMAL_BLOCK); + } +} + +void allocHeapAlloc(bool bFree) +{ + HANDLE heap = HeapCreate(0x0, 0, 0); + int* leaked_memory = (int*)HeapAlloc(heap, 0x0, 15); + if (bFree) + { + HeapFree(heap, 0, leaked_memory); + HeapDestroy(heap); + } +} + +void allocIMalloc(bool bFree) +{ + IMalloc *imalloc = NULL; + HRESULT hr = CoGetMalloc(1, &imalloc); + assert(SUCCEEDED(hr)); + int* leaked_memory = static_cast(imalloc->Alloc(34)); + if (bFree) + { + imalloc->Free(leaked_memory); + } +} + +void allocGetProcMalloc(bool bFree) +{ + malloc_t pmalloc = NULL; + free_t pfree = NULL; + HMODULE crt = LoadLibrary(CRTDLLNAME); + assert(crt != NULL); + pmalloc = reinterpret_cast(GetProcAddress(crt, "malloc")); + assert(pmalloc != NULL); + int* leaked_memory = static_cast(pmalloc(64)); + if (bFree) + { + pfree = reinterpret_cast(GetProcAddress(crt, "free")); + pfree(leaked_memory); + FreeLibrary(crt); + } +} + +#pragma optimize( "", off ) + template struct allocator; template<> struct allocator<0> { -static void alloc(LeakOption type, bool bFree) -{ - int* leaked_memory = NULL; - int* leaked_memory_dbg = NULL; - if (type == eMalloc) - { - leaked_memory = (int*)malloc(78); - leaked_memory_dbg = (int*)_malloc_dbg(80, _NORMAL_BLOCK, __FILE__, __LINE__); - if (bFree) - { - free(leaked_memory); - _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); - } - } - else if (type == eNew) - { - leaked_memory = new int(4); - leaked_memory_dbg = new (_NORMAL_BLOCK, __FILE__, __LINE__) int(7); - if (bFree) - { - delete leaked_memory; - delete leaked_memory_dbg; - } - } - else if (type == eNewArray) - { - leaked_memory = new int[3]; - leaked_memory_dbg = new (_NORMAL_BLOCK, __FILE__, __LINE__) int[4]; - - // placement new operator - int temp[3]; - void* place = temp; - float* placed_mem = new (place) float[3]; // doesn't work. Nothing gets patched by vld - if (bFree) - { - delete[] leaked_memory; - delete[] leaked_memory_dbg; - } - } - else if (type == eCalloc) - { - leaked_memory = (int*)calloc(47, sizeof(int)); - leaked_memory_dbg = (int*)_calloc_dbg(39, sizeof(int), _NORMAL_BLOCK, __FILE__, __LINE__); - if (bFree) - { - free(leaked_memory); - _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); - } - } - else if (type == eRealloc) - { - int* temp = (int*)malloc(17); - int* old_leaked_memory = (int*)realloc(temp, 23); - leaked_memory = (int*)_recalloc(old_leaked_memory, 1, 31); - int* old_leaked_memory_dbg = (int*)malloc(9); - leaked_memory_dbg = (int*)_realloc_dbg(old_leaked_memory_dbg, 21, _NORMAL_BLOCK, __FILE__, __LINE__); - if (bFree) - { - free(leaked_memory); - _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); - } - } - else if (type == eCoTaskMem) - { - void* leaked = CoTaskMemAlloc(7); - if (bFree) - { - CoTaskMemFree(leaked); - } - void* leaked2 = CoTaskMemAlloc(7); - void* realloced = CoTaskMemRealloc(leaked2, 29); - if (bFree) - { - CoTaskMemFree(realloced); - } - } - else if (type == eAlignedMalloc) - { - void* leaked = _aligned_offset_malloc(64, 16, 1); - leaked_memory = (int*)_aligned_malloc(64, 16); - leaked_memory_dbg = (int*)_aligned_malloc_dbg(32, 16, __FILE__, __LINE__); - if (bFree) - { - _aligned_free(leaked); - _aligned_free(leaked_memory); - _aligned_free_dbg(leaked_memory_dbg); - } - } - else if (type == eAlignedRealloc) - { - void* leaked = _aligned_offset_malloc(64, 16, 1); - leaked_memory = (int*)_aligned_malloc(64, 16); - leaked_memory_dbg = (int*)_aligned_malloc_dbg(32, 16, __FILE__, __LINE__); - leaked = (int*)_aligned_offset_realloc(leaked, 48, 16, 2); - leaked_memory = (int*)_aligned_realloc(leaked_memory, 128, 16); - leaked_memory_dbg = (int*)_aligned_realloc_dbg(leaked_memory_dbg, 48, 16, __FILE__, __LINE__); - leaked = (int*)_aligned_offset_recalloc(leaked, 1, 52, 16, 2); - leaked_memory = (int*)_aligned_recalloc(leaked_memory, 1, 132, 16); - leaked_memory_dbg = (int*)_aligned_recalloc_dbg(leaked_memory_dbg, 1, 64, 16, __FILE__, __LINE__); - if (bFree) - { - _aligned_free(leaked); - _aligned_free(leaked_memory); - _aligned_free_dbg(leaked_memory_dbg); - } - } - else if (type == eStrdup) - { - leaked_memory = (int*)_strdup("_strdup() leaks!"); - leaked_memory_dbg = (int*)_strdup_dbg("_strdup_dbg() leaks!", _NORMAL_BLOCK, __FILE__, __LINE__); - void* leaked_wmemory = (int*)_wcsdup(L"_wcsdup() leaks!"); - void* leaked_wmemory_dbg = (int*)_wcsdup_dbg(L"_wcsdup_dbg() leaks!", _NORMAL_BLOCK, __FILE__, __LINE__); - if (bFree) - { - free(leaked_memory); - _free_dbg(leaked_memory_dbg, _NORMAL_BLOCK); - free(leaked_wmemory); - _free_dbg(leaked_wmemory_dbg, _NORMAL_BLOCK); - } - } - else if (type == eHeapAlloc) - { - HANDLE heap = HeapCreate(0x0, 0, 0); - leaked_memory = (int*)HeapAlloc(heap, 0x0, 15); - if (bFree) - { - HeapFree(heap, 0, leaked_memory); - HeapDestroy(heap); - } - } - else if (type == eIMalloc) - { - IMalloc *imalloc = NULL; - HRESULT hr = CoGetMalloc(1, &imalloc); - assert(SUCCEEDED(hr)); - leaked_memory = (int*)imalloc->Alloc(34); - if (bFree) - { - imalloc->Free(leaked_memory); - } - } - else if (type == eGetProcMalloc) - { - malloc_t pmalloc = NULL; - free_t pfree = NULL; - HMODULE crt = LoadLibrary(CRTDLLNAME); - assert(crt != NULL); - pmalloc = (malloc_t)GetProcAddress(crt, "malloc"); - assert(pmalloc != NULL); - leaked_memory = (int*)pmalloc(64); - if (bFree) - { - pfree = (free_t)GetProcAddress(crt, "free"); - pfree(leaked_memory); - FreeLibrary(crt); - } - } +__declspec(noinline) static void alloc(allocFunc_t func, bool bFree) +{ + func(bFree); } }; template struct allocator { - static void alloc(LeakOption type, bool bFree) - { - allocator::alloc(type, bFree); - } + +__declspec(noinline) static void alloc(allocFunc_t func, bool bFree) +{ + allocator::alloc(func, bFree); +} + }; -void alloc(LeakOption type, bool bFree) +#pragma optimize( "", on ) + +__declspec(noinline) void alloc(allocFunc_t func, bool bFree) { - allocator::alloc(type, bFree); + allocator::alloc(func, bFree); } const int repeats = 1; -void LeakMemory(LeakOption type, int repeat, bool bFree) +void LeakMemoryMalloc(int repeat, bool bFree) +{ + for (int i = 0; i < repeat; i++) + { + alloc(allocMalloc, bFree); + } +} + +void LeakMemoryNew(int repeat, bool bFree) +{ + for (int i = 0; i < repeat; i++) + { + alloc(allocNew, bFree); + } +} + +void LeakMemoryNewArray(int repeat, bool bFree) +{ + for (int i = 0; i < repeat; i++) + { + alloc(allocNewArray, bFree); + } +} + +void LeakMemoryCalloc(int repeat, bool bFree) +{ + for (int i = 0; i < repeat; i++) + { + alloc(allocCalloc, bFree); + } +} + +void LeakMemoryRealloc(int repeat, bool bFree) +{ + for (int i = 0; i < repeat; i++) + { + alloc(allocRealloc, bFree); + } +} + +void LeakMemoryCoTaskMem(int repeat, bool bFree) +{ + for (int i = 0; i < repeat; i++) + { + alloc(allocCoTaskMem, bFree); + } +} + +void LeakMemoryAlignedMalloc(int repeat, bool bFree) +{ + for (int i = 0; i < repeat; i++) + { + alloc(allocAlignedMalloc, bFree); + } +} + +void LeakMemoryAlignedRealloc(int repeat, bool bFree) +{ + for (int i = 0; i < repeat; i++) + { + alloc(allocAlignedRealloc, bFree); + } +} + +void LeakMemoryStrdup(int repeat, bool bFree) +{ + for (int i = 0; i < repeat; i++) + { + alloc(allocStrdup, bFree); + } +} + +void LeakMemoryHeapAlloc(int repeat, bool bFree) +{ + for (int i = 0; i < repeat; i++) + { + alloc(allocHeapAlloc, bFree); + } +} + +void LeakMemoryIMalloc(int repeat, bool bFree) +{ + for (int i = 0; i < repeat; i++) + { + alloc(allocIMalloc, bFree); + } +} + +void LeakMemoryGetProcMalloc(int repeat, bool bFree) { for (int i = 0; i < repeat; i++) { - alloc(type, bFree); + alloc(allocGetProcMalloc, bFree); } } diff --git a/src/tests/basics/Allocs.h b/src/tests/basics/Allocs.h index a1b8211a..90991749 100644 --- a/src/tests/basics/Allocs.h +++ b/src/tests/basics/Allocs.h @@ -1,6 +1,16 @@ #pragma once -#include "LeakOption.h" -extern void LeakMemory(LeakOption type, int repeat, bool bFree = false); +extern void LeakMemoryMalloc(int repeat, bool bFree = false); +extern void LeakMemoryNew(int repeat, bool bFree = false); +extern void LeakMemoryNewArray(int repeat, bool bFree = false); +extern void LeakMemoryCalloc(int repeat, bool bFree = false); +extern void LeakMemoryRealloc(int repeat, bool bFree = false); +extern void LeakMemoryCoTaskMem(int repeat, bool bFree = false); +extern void LeakMemoryAlignedMalloc(int repeat, bool bFree = false); +extern void LeakMemoryAlignedRealloc(int repeat, bool bFree = false); +extern void LeakMemoryStrdup(int repeat, bool bFree = false); +extern void LeakMemoryHeapAlloc(int repeat, bool bFree = false); +extern void LeakMemoryIMalloc(int repeat, bool bFree = false); +extern void LeakMemoryGetProcMalloc(int repeat, bool bFree = false); extern const int repeats; diff --git a/src/tests/basics/LeakOption.h b/src/tests/basics/LeakOption.h deleted file mode 100644 index caef110d..00000000 --- a/src/tests/basics/LeakOption.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - - -enum LeakOption -{ - eMalloc, // "malloc" - eNew, // "new" - eNewArray,// "new_array" - eCalloc, // "calloc" - eRealloc, // "realloc" - eCoTaskMem, // For COM, use "CoTaskMem" - eAlignedMalloc, // "_aligned_malloc" - eAlignedRealloc, // "_aligned_realloc" - eStrdup, // "strdup" - eHeapAlloc, - eIMalloc, - eGetProcMalloc, - eCount, -}; - - - diff --git a/src/tests/basics/basics.cpp b/src/tests/basics/basics.cpp index 7bcb3d22..ce92100f 100644 --- a/src/tests/basics/basics.cpp +++ b/src/tests/basics/basics.cpp @@ -23,7 +23,7 @@ class TestBasics : public ::testing::TestWithParam TEST_P(TestBasics, Malloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eMalloc, repeats, GetParam()); + LeakMemoryMalloc(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; @@ -33,7 +33,7 @@ TEST_P(TestBasics, Malloc) TEST_P(TestBasics, New) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eNew, repeats, GetParam()); + LeakMemoryNew(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; @@ -43,7 +43,7 @@ TEST_P(TestBasics, New) TEST_P(TestBasics, NewArray) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eNewArray, repeats, GetParam()); + LeakMemoryNewArray(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; @@ -53,7 +53,7 @@ TEST_P(TestBasics, NewArray) TEST_P(TestBasics, Calloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eCalloc, repeats, GetParam()); + LeakMemoryCalloc(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; @@ -63,7 +63,7 @@ TEST_P(TestBasics, Calloc) TEST_P(TestBasics, Realloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eRealloc, repeats, GetParam()); + LeakMemoryRealloc(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; @@ -73,7 +73,7 @@ TEST_P(TestBasics, Realloc) TEST_P(TestBasics, CoTaskMem) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eCoTaskMem, repeats, GetParam()); + LeakMemoryCoTaskMem(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 2; @@ -83,7 +83,7 @@ TEST_P(TestBasics, CoTaskMem) TEST_P(TestBasics, AlignedMalloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eAlignedMalloc, repeats, GetParam()); + LeakMemoryAlignedMalloc(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 3; @@ -93,7 +93,7 @@ TEST_P(TestBasics, AlignedMalloc) TEST_P(TestBasics, AlignedRealloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eAlignedRealloc, repeats, GetParam()); + LeakMemoryAlignedRealloc(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 3; @@ -103,7 +103,7 @@ TEST_P(TestBasics, AlignedRealloc) TEST_P(TestBasics, Strdup) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eStrdup, repeats, GetParam()); + LeakMemoryStrdup(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 4; @@ -113,7 +113,7 @@ TEST_P(TestBasics, Strdup) TEST_P(TestBasics, HeapAlloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eHeapAlloc, repeats, GetParam()); + LeakMemoryHeapAlloc(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 1; @@ -123,7 +123,7 @@ TEST_P(TestBasics, HeapAlloc) TEST_P(TestBasics, IMalloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eIMalloc, repeats, GetParam()); + LeakMemoryIMalloc(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 1; @@ -133,7 +133,7 @@ TEST_P(TestBasics, IMalloc) TEST_P(TestBasics, GetProcMalloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eGetProcMalloc, repeats, GetParam()); + LeakMemoryGetProcMalloc(repeats, GetParam()); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; int correctLeaks = GetParam() ? 0 : repeats * 1; diff --git a/src/tests/basics/basics.vcxproj b/src/tests/basics/basics.vcxproj index 42865e30..c5cfc640 100644 --- a/src/tests/basics/basics.vcxproj +++ b/src/tests/basics/basics.vcxproj @@ -179,8 +179,8 @@ Use Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ProgramDatabase + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) Console @@ -323,7 +323,6 @@ - diff --git a/src/tests/basics/basics.vcxproj.filters b/src/tests/basics/basics.vcxproj.filters index fdb7dc5a..92eab5f7 100644 --- a/src/tests/basics/basics.vcxproj.filters +++ b/src/tests/basics/basics.vcxproj.filters @@ -24,9 +24,6 @@ Header Files - - Header Files - diff --git a/src/tests/basics/basics_disabled.cpp b/src/tests/basics/basics_disabled.cpp index 26cef6c6..a5b094be 100644 --- a/src/tests/basics/basics_disabled.cpp +++ b/src/tests/basics/basics_disabled.cpp @@ -23,7 +23,7 @@ class TestBasicsDisabled : public ::testing::Test TEST_F(TestBasicsDisabled, Malloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eMalloc, repeats, false); + LeakMemoryMalloc(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); @@ -32,7 +32,7 @@ TEST_F(TestBasicsDisabled, Malloc) TEST_F(TestBasicsDisabled, New) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eNew, repeats, false); + LeakMemoryNew(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); @@ -41,7 +41,7 @@ TEST_F(TestBasicsDisabled, New) TEST_F(TestBasicsDisabled, NewArray) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eNewArray, repeats, false); + LeakMemoryNewArray(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); @@ -50,7 +50,7 @@ TEST_F(TestBasicsDisabled, NewArray) TEST_F(TestBasicsDisabled, Calloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eCalloc, repeats, false); + LeakMemoryCalloc(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); @@ -59,7 +59,7 @@ TEST_F(TestBasicsDisabled, Calloc) TEST_F(TestBasicsDisabled, Realloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eRealloc, repeats, false); + LeakMemoryRealloc(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); @@ -68,7 +68,7 @@ TEST_F(TestBasicsDisabled, Realloc) TEST_F(TestBasicsDisabled, CoTaskMem) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eCoTaskMem, repeats, false); + LeakMemoryCoTaskMem(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); @@ -77,7 +77,7 @@ TEST_F(TestBasicsDisabled, CoTaskMem) TEST_F(TestBasicsDisabled, AlignedMalloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eAlignedMalloc, repeats, false); + LeakMemoryAlignedMalloc(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); @@ -86,7 +86,7 @@ TEST_F(TestBasicsDisabled, AlignedMalloc) TEST_F(TestBasicsDisabled, AlignedRealloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eAlignedRealloc, repeats, false); + LeakMemoryAlignedRealloc(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); @@ -95,7 +95,7 @@ TEST_F(TestBasicsDisabled, AlignedRealloc) TEST_F(TestBasicsDisabled, Strdup) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eStrdup, repeats, false); + LeakMemoryStrdup(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); @@ -104,7 +104,7 @@ TEST_F(TestBasicsDisabled, Strdup) TEST_F(TestBasicsDisabled, HeapAlloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eHeapAlloc, repeats, false); + LeakMemoryHeapAlloc(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); @@ -113,7 +113,7 @@ TEST_F(TestBasicsDisabled, HeapAlloc) TEST_F(TestBasicsDisabled, GetProcMalloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eGetProcMalloc, repeats, false); + LeakMemoryGetProcMalloc(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); @@ -122,7 +122,7 @@ TEST_F(TestBasicsDisabled, GetProcMalloc) TEST_F(TestBasicsDisabled, IMalloc) { int prev = static_cast(VLDGetLeaksCount()); - LeakMemory(eIMalloc, repeats, false); + LeakMemoryIMalloc(repeats, false); int total = static_cast(VLDGetLeaksCount()); int leaks = total - prev; ASSERT_EQ(0, leaks); diff --git a/src/tests/dynamic_dll/dynamic.cpp b/src/tests/dynamic_dll/dynamic.cpp index e9570b1e..1aa234be 100644 --- a/src/tests/dynamic_dll/dynamic.cpp +++ b/src/tests/dynamic_dll/dynamic.cpp @@ -4,7 +4,6 @@ #include "stdafx.h" #include "dynamic.h" #include "../basics/Allocs.h" -#include "../basics/LeakOption.h" extern "C" { // This is an example of an exported variable @@ -14,17 +13,17 @@ DYNAMIC_API int ndynamic = 0; void SimpleLeak_Malloc(void) { - LeakMemory(eMalloc, 3); // leaks 6 + LeakMemoryMalloc(3); // leaks 6 } void SimpleLeak_New(void) { - LeakMemory(eNew, 3); // leaks 6 + LeakMemoryNew(3); // leaks 6 } void SimpleLeak_New_Array(void) { - LeakMemory(eNewArray, 3); // leaks 6 + LeakMemoryNewArray(3); // leaks 6 } // This is the constructor of a class that has been exported. From 963ef39cd3771ebd2a9b231ad87c1f9dd9217f1f Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sun, 29 Nov 2015 02:48:16 +0300 Subject: [PATCH 307/321] Call CaptureContext from macros (fix Vld report for StackWalk=safe) --- src/crtmfcpatch.h | 158 +++++++++++++++++++++++----------------------- src/utility.h | 26 ++++---- src/vld.cpp | 30 ++------- src/vld_hooks.cpp | 36 +++++++---- src/vldint.h | 7 +- 5 files changed, 123 insertions(+), 134 deletions(-) diff --git a/src/crtmfcpatch.h b/src/crtmfcpatch.h index f90487db..ef3a1fbb 100644 --- a/src/crtmfcpatch.h +++ b/src/crtmfcpatch.h @@ -198,7 +198,8 @@ void* CrtPatch::crtd__calloc_dbg (size_t num, _calloc_dbg_t pcrtxxd__calloc_dbg = (_calloc_dbg_t)data.pcrtd__calloc_dbg; assert(pcrtxxd__calloc_dbg); - CaptureContext cc((void*)pcrtxxd__calloc_dbg, debug, (CRTVersion >= 140)); + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__calloc_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__calloc_dbg(num, size, type, file, line); } @@ -229,8 +230,8 @@ void* CrtPatch::crtd__malloc_dbg (size_t size, _malloc_dbg_t pcrtxxd__malloc_dbg = (_malloc_dbg_t)data.pcrtd__malloc_dbg; assert(pcrtxxd__malloc_dbg); - CaptureContext cc((void*)pcrtxxd__malloc_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__malloc_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__malloc_dbg(size, type, file, line); } @@ -263,8 +264,8 @@ void* CrtPatch::crtd__realloc_dbg (void *mem, _realloc_dbg_t pcrtxxd__realloc_dbg = (_realloc_dbg_t)data.pcrtd__realloc_dbg; assert(pcrtxxd__realloc_dbg); - CaptureContext cc((void*)pcrtxxd__realloc_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__realloc_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__realloc_dbg(mem, size, type, file, line); } @@ -298,8 +299,8 @@ void* CrtPatch::crtd__recalloc_dbg (void *mem, _recalloc_dbg_t pcrtxxd__recalloc_dbg = (_recalloc_dbg_t)data.pcrtd__recalloc_dbg; assert(pcrtxxd__recalloc_dbg); - CaptureContext cc((void*)pcrtxxd__recalloc_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__recalloc_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__recalloc_dbg(mem, num, size, type, file, line); } @@ -314,8 +315,8 @@ char* CrtPatch::crtd__strdup_dbg (const char* src, _strdup_dbg_t pcrtxxd__strdup_dbg = (_strdup_dbg_t)data.pcrtd__strdup_dbg; assert(pcrtxxd__strdup_dbg); - CaptureContext cc((void*)pcrtxxd__strdup_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__strdup_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__strdup_dbg(src, type, file, line); } @@ -330,8 +331,8 @@ wchar_t* CrtPatch::crtd__wcsdup_dbg (const wchar_t* src, _wcsdup_dbg_t pcrtxxd__wcsdup_dbg = (_wcsdup_dbg_t)data.pcrtd__wcsdup_dbg; assert(pcrtxxd__wcsdup_dbg); - CaptureContext cc((void*)pcrtxxd__wcsdup_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__wcsdup_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__wcsdup_dbg(src, type, file, line); } @@ -361,8 +362,8 @@ void* CrtPatch::crtd__scalar_new_dbg (size_t size, new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)data.pcrtd__scalar_new_dbg; assert(pcrtxxd_new_dbg); - CaptureContext cc((void*)pcrtxxd_new_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_new_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd_new_dbg(size, type, file, line); } @@ -392,8 +393,8 @@ void* CrtPatch::crtd__vector_new_dbg (size_t size, new_dbg_crt_t pcrtxxd_new_dbg = (new_dbg_crt_t)data.pcrtd__vector_new_dbg; assert(pcrtxxd_new_dbg); - CaptureContext cc((void*)pcrtxxd_new_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_new_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd_new_dbg(size, type, file, line); } @@ -417,8 +418,8 @@ void* CrtPatch::crtd_calloc (size_t num, size_t size) calloc_t pcrtxxd_calloc = (calloc_t)data.pcrtd_calloc; assert(pcrtxxd_calloc); - CaptureContext cc((void*)pcrtxxd_calloc, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_calloc, context_, debug, (CRTVersion >= 140)); return pcrtxxd_calloc(num, size); } @@ -440,8 +441,8 @@ void* CrtPatch::crtd_malloc (size_t size) malloc_t pcrtxxd_malloc = (malloc_t)data.pcrtd_malloc; assert(pcrtxxd_malloc); - CaptureContext cc((void*)pcrtxxd_malloc, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_malloc, context_, debug, (CRTVersion >= 140)); return pcrtxxd_malloc(size); } @@ -465,8 +466,8 @@ void* CrtPatch::crtd_realloc (void *mem, size_t size) realloc_t pcrtxxd_realloc = (realloc_t)data.pcrtd_realloc; assert(pcrtxxd_realloc); - CaptureContext cc((void*)pcrtxxd_realloc, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_realloc, context_, debug, (CRTVersion >= 140)); return pcrtxxd_realloc(mem, size); } @@ -490,8 +491,8 @@ void* CrtPatch::crtd__recalloc (void *mem, size_t num, size_t _recalloc_t pcrtxxd_recalloc = (_recalloc_t)data.pcrtd_recalloc; assert(pcrtxxd_recalloc); - CaptureContext cc((void*)pcrtxxd_recalloc, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_recalloc, context_, debug, (CRTVersion >= 140)); return pcrtxxd_recalloc(mem, num, size); } @@ -503,8 +504,8 @@ char* CrtPatch::crtd__strdup (const char* src) _strdup_t pcrtxxd_strdup = (_strdup_t)data.pcrtd__strdup; assert(pcrtxxd_strdup); - CaptureContext cc((void*)pcrtxxd_strdup, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_strdup, context_, debug, (CRTVersion >= 140)); return pcrtxxd_strdup(src); } @@ -515,8 +516,8 @@ wchar_t* CrtPatch::crtd__wcsdup (const wchar_t* src) _wcsdup_t pcrtxxd_wcsdup = (_wcsdup_t)data.pcrtd__wcsdup; assert(pcrtxxd_wcsdup); - CaptureContext cc((void*)pcrtxxd_wcsdup, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_wcsdup, context_, debug, (CRTVersion >= 140)); return pcrtxxd_wcsdup(src); } @@ -547,8 +548,8 @@ void* CrtPatch::crtd__aligned_malloc_dbg (size_t size, _aligned_malloc_dbg_t pcrtxxd__aligned_malloc_dbg = (_aligned_malloc_dbg_t)data.pcrtd__aligned_malloc_dbg; assert(pcrtxxd__aligned_malloc_dbg); - CaptureContext cc((void*)pcrtxxd__aligned_malloc_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__aligned_malloc_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__aligned_malloc_dbg(size, alignment, type, file, line); } @@ -580,8 +581,8 @@ void* CrtPatch::crtd__aligned_offset_malloc_dbg (size_t _aligned_offset_malloc_dbg_t pcrtxxd__malloc_dbg = (_aligned_offset_malloc_dbg_t)data.pcrtd__aligned_offset_malloc_dbg; assert(pcrtxxd__malloc_dbg); - CaptureContext cc((void*)pcrtxxd__malloc_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__malloc_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__malloc_dbg(size, alignment, offset, type, file, line); } @@ -615,8 +616,8 @@ void* CrtPatch::crtd__aligned_realloc_dbg (void *mem, _aligned_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_realloc_dbg_t)data.pcrtd__aligned_realloc_dbg; assert(pcrtxxd__realloc_dbg); - CaptureContext cc((void*)pcrtxxd__realloc_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__realloc_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__realloc_dbg(mem, size, alignment, type, file, line); } @@ -651,8 +652,8 @@ void* CrtPatch::crtd__aligned_offset_realloc_dbg (void _aligned_offset_realloc_dbg_t pcrtxxd__realloc_dbg = (_aligned_offset_realloc_dbg_t)data.pcrtd__aligned_offset_realloc_dbg; assert(pcrtxxd__realloc_dbg); - CaptureContext cc((void*)pcrtxxd__realloc_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__realloc_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__realloc_dbg(mem, size, alignment, offset, type, file, line); } @@ -689,8 +690,8 @@ void* CrtPatch::crtd__aligned_recalloc_dbg (void *mem, _aligned_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_recalloc_dbg_t)data.pcrtd__aligned_recalloc_dbg; assert(pcrtxxd__recalloc_dbg); - CaptureContext cc((void*)pcrtxxd__recalloc_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__recalloc_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__recalloc_dbg(mem, num, size, alignment, type, file, line); } @@ -728,8 +729,8 @@ void* CrtPatch::crtd__aligned_offset_recalloc_dbg (void _aligned_offset_recalloc_dbg_t pcrtxxd__recalloc_dbg = (_aligned_offset_recalloc_dbg_t)data.pcrtd__aligned_offset_recalloc_dbg; assert(pcrtxxd__recalloc_dbg); - CaptureContext cc((void*)pcrtxxd__recalloc_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd__recalloc_dbg, context_, debug, (CRTVersion >= 140)); return pcrtxxd__recalloc_dbg(mem, num, size, alignment, offset, type, file, line); } @@ -751,8 +752,8 @@ void* CrtPatch::crtd__aligned_malloc (size_t size, size_t ali _aligned_malloc_t pcrtxxd_malloc = (_aligned_malloc_t)data.pcrtd_aligned_malloc; assert(pcrtxxd_malloc); - CaptureContext cc((void*)pcrtxxd_malloc, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_malloc, context_, debug, (CRTVersion >= 140)); return pcrtxxd_malloc(size, alignment); } @@ -774,8 +775,8 @@ void* CrtPatch::crtd__aligned_offset_malloc (size_t size, siz _aligned_offset_malloc_t pcrtxxd_malloc = (_aligned_offset_malloc_t)data.pcrtd_aligned_offset_malloc; assert(pcrtxxd_malloc); - CaptureContext cc((void*)pcrtxxd_malloc, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_malloc, context_, debug, (CRTVersion >= 140)); return pcrtxxd_malloc(size, alignment, offset); } @@ -799,8 +800,8 @@ void* CrtPatch::crtd__aligned_realloc (void *mem, size_t size _aligned_realloc_t pcrtxxd_realloc = (_aligned_realloc_t)data.pcrtd_aligned_realloc; assert(pcrtxxd_realloc); - CaptureContext cc((void*)pcrtxxd_realloc, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_realloc, context_, debug, (CRTVersion >= 140)); return pcrtxxd_realloc(mem, size, alignment); } @@ -824,8 +825,8 @@ void* CrtPatch::crtd__aligned_offset_realloc (void *mem, size _aligned_offset_realloc_t pcrtxxd_realloc = (_aligned_offset_realloc_t)data.pcrtd_aligned_offset_realloc; assert(pcrtxxd_realloc); - CaptureContext cc((void*)pcrtxxd_realloc, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_realloc, context_, debug, (CRTVersion >= 140)); return pcrtxxd_realloc(mem, size, alignment, offset); } @@ -851,8 +852,8 @@ void* CrtPatch::crtd__aligned_recalloc (void *mem, size_t num _aligned_recalloc_t pcrtxxd_recalloc = (_aligned_recalloc_t)data.pcrtd_aligned_recalloc; assert(pcrtxxd_recalloc); - CaptureContext cc((void*)pcrtxxd_recalloc, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_recalloc, context_, debug, (CRTVersion >= 140)); return pcrtxxd_recalloc(mem, num, size, alignment); } @@ -878,8 +879,8 @@ void* CrtPatch::crtd__aligned_offset_recalloc (void *mem, siz _aligned_offset_recalloc_t pcrtxxd_recalloc = (_aligned_offset_recalloc_t)data.pcrtd_aligned_offset_recalloc; assert(pcrtxxd_recalloc); - CaptureContext cc((void*)pcrtxxd_recalloc, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_recalloc, context_, debug, (CRTVersion >= 140)); return pcrtxxd_recalloc(mem, num, size, alignment, offset); } @@ -899,8 +900,8 @@ void* CrtPatch::crtd_scalar_new (size_t size) new_t pcrtxxd_scalar_new = (new_t)data.pcrtd_scalar_new; assert(pcrtxxd_scalar_new); - CaptureContext cc((void*)pcrtxxd_scalar_new, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_scalar_new, context_, debug, (CRTVersion >= 140)); return pcrtxxd_scalar_new(size); } @@ -920,8 +921,8 @@ void* CrtPatch::crtd_vector_new (size_t size) new_t pcrtxxd_vector_new = (new_t)data.pcrtd_vector_new; assert(pcrtxxd_vector_new); - CaptureContext cc((void*)pcrtxxd_vector_new, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pcrtxxd_vector_new, context_, debug, (CRTVersion >= 140)); return pcrtxxd_vector_new(size); } @@ -957,8 +958,8 @@ void* MfcPatch::mfcd__scalar_new_dbg_4p (size_t size, new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); - CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd__new_dbg, context_, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, type, file, line); } @@ -985,8 +986,8 @@ void* MfcPatch::mfcd__scalar_new_dbg_3p (size_t size, new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcd__scalar_new_dbg_3p; assert(pmfcxxd__new_dbg); - CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd__new_dbg, context_, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, file, line); } @@ -1016,8 +1017,8 @@ void* MfcPatch::mfcd__vector_new_dbg_4p (size_t size, new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcd__vector_new_dbg_4p; assert(pmfcxxd__new_dbg); - CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd__new_dbg, context_, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, type, file, line); } @@ -1044,8 +1045,8 @@ void* MfcPatch::mfcd__vector_new_dbg_3p (size_t size, new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcd__vector_new_dbg_3p; assert(pmfcxxd__new_dbg); - CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd__new_dbg, context_, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, file, line); } @@ -1065,8 +1066,8 @@ void* MfcPatch::mfcd_scalar_new (size_t size) new_t pmfcxxd_new = (new_t)data.pmfcd_scalar_new; assert(pmfcxxd_new); - CaptureContext cc((void*)pmfcxxd_new, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd_new, context_, debug, (CRTVersion >= 140)); return pmfcxxd_new(size); } @@ -1086,8 +1087,8 @@ void* MfcPatch::mfcd_vector_new (size_t size) new_t pmfcxxd_new = (new_t)data.pmfcd_vector_new; assert(pmfcxxd_new); - CaptureContext cc((void*)pmfcxxd_new, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd_new, context_, debug, (CRTVersion >= 140)); return pmfcxxd_new(size); } @@ -1117,8 +1118,8 @@ void* MfcPatch::mfcud__scalar_new_dbg_4p (size_t size, new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__scalar_new_dbg_4p; assert(pmfcxxd__new_dbg); - CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd__new_dbg, context_, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, type, file, line); } @@ -1145,8 +1146,8 @@ void* MfcPatch::mfcud__scalar_new_dbg_3p (size_t size, new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcud__scalar_new_dbg_3p; assert(pmfcxxd__new_dbg); - CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd__new_dbg, context_, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, file, line); } @@ -1176,7 +1177,8 @@ void* MfcPatch::mfcud__vector_new_dbg_4p (size_t size, new_dbg_crt_t pmfcxxd__new_dbg = (new_dbg_crt_t)data.pmfcud__vector_new_dbg_4p; assert(pmfcxxd__new_dbg); - CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd__new_dbg, context_, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, type, file, line); } @@ -1204,8 +1206,8 @@ void* MfcPatch::mfcud__vector_new_dbg_3p (size_t size, new_dbg_mfc_t pmfcxxd__new_dbg = (new_dbg_mfc_t)data.pmfcud__vector_new_dbg_3p; assert(pmfcxxd__new_dbg); - CaptureContext cc((void*)pmfcxxd__new_dbg, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd__new_dbg, context_, debug, (CRTVersion >= 140)); return pmfcxxd__new_dbg(size, file, line); } @@ -1225,8 +1227,8 @@ void* MfcPatch::mfcud_scalar_new (size_t size) new_t pmfcxxd_new = (new_t)data.pmfcud_scalar_new; assert(pmfcxxd_new); - CaptureContext cc((void*)pmfcxxd_new, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd_new, context_, debug, (CRTVersion >= 140)); return pmfcxxd_new(size); } @@ -1246,8 +1248,8 @@ void* MfcPatch::mfcud_vector_new (size_t size) new_t pmfcxxd_new = (new_t)data.pmfcud_vector_new; assert(pmfcxxd_new); - CaptureContext cc((void*)pmfcxxd_new, debug, (CRTVersion >= 140)); - + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pmfcxxd_new, context_, debug, (CRTVersion >= 140)); return pmfcxxd_new(size); } diff --git a/src/utility.h b/src/utility.h index 0aff0b30..25b7b64c 100644 --- a/src/utility.h +++ b/src/utility.h @@ -73,20 +73,20 @@ struct context_t // Capture current context #if defined(_M_IX86) -#define CAPTURE_CONTEXT(context, function) \ - CONTEXT _ctx; \ - RtlCaptureContext(&_ctx); \ - context.Ebp = _ctx.Ebp; context.Esp = _ctx.Esp; context.Eip = _ctx.Eip; \ - context.fp = (UINT_PTR)_ReturnAddress(); \ - context.func = (UINT_PTR)(function) +#define CAPTURE_CONTEXT() \ + context_t context_; \ + {CONTEXT _ctx; \ + RtlCaptureContext(&_ctx); \ + context_.Ebp = _ctx.Ebp; context_.Esp = _ctx.Esp; context_.Eip = _ctx.Eip; \ + context_.fp = (UINT_PTR)_ReturnAddress();} #define GET_RETURN_ADDRESS(context) (context.fp) #elif defined(_M_X64) -#define CAPTURE_CONTEXT(context, function) \ - CONTEXT _ctx; \ - RtlCaptureContext(&_ctx); \ - context.Rbp = _ctx.Rbp; context.Rsp = _ctx.Rsp; context.Rip = _ctx.Rip; \ - context.fp = (UINT_PTR)_ReturnAddress(); \ - context.func = (UINT_PTR)(function) +#define CAPTURE_CONTEXT() \ + context_t context_; \ + {CONTEXT _ctx; \ + RtlCaptureContext(&_ctx); \ + context_.Rbp = _ctx.Rbp; context_.Rsp = _ctx.Rsp; context_.Rip = _ctx.Rip; \ + context_.fp = (UINT_PTR)_ReturnAddress();} #define GET_RETURN_ADDRESS(context) (context.fp) #else // If you want to retarget Visual Leak Detector to another processor @@ -111,7 +111,7 @@ enum encoding_e { // through to replacement functions provided by VLD. struct patchentry_t { - LPCSTR importName; // The name (or ordinal) of the imported API being patched. + LPCSTR importName; // The name (or ordinal) of the imported API being patched. LPVOID* original; // Pointer to the original function. LPCVOID replacement; // Pointer to the function to which the imported API should be patched through to. }; diff --git a/src/vld.cpp b/src/vld.cpp index ed26eff8..0ae99816 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -2883,7 +2883,8 @@ int VisualLeakDetector::ResolveCallstacks() return unresolvedFunctionsCount; } -CaptureContext::CaptureContext(void* func, BOOL debug, BOOL ucrt, UINT_PTR fp) : m_fp(fp), m_func(func) { +CaptureContext::CaptureContext(void* func, context_t& context, BOOL debug, BOOL ucrt) : m_context(context) { + context.func = reinterpret_cast(func); m_tls = g_vld.getTls(); if (debug) { @@ -2898,7 +2899,7 @@ CaptureContext::CaptureContext(void* func, BOOL debug, BOOL ucrt, UINT_PTR fp) : if (m_bFirst) { // This is the first call to enter VLD for the current allocation. // Record the current frame pointer. - Capture(); + m_tls->context = m_context; } } @@ -2937,25 +2938,6 @@ CaptureContext::~CaptureContext() { Reset(); } -void CaptureContext::Capture() { - m_tls->context.fp = m_fp; - m_tls->context.func = (UINT_PTR)(m_func); - - CONTEXT _ctx; - RtlCaptureContext(&_ctx); -#if defined(_M_IX86) - m_tls->context.Ebp = _ctx.Ebp; m_tls->context.Esp = _ctx.Esp; m_tls->context.Eip = _ctx.Eip; -#elif defined(_M_X64) - m_tls->context.Rbp = _ctx.Rbp; m_tls->context.Rsp = _ctx.Rsp; m_tls->context.Rip = _ctx.Rip; -#else - // If you want to retarget Visual Leak Detector to another processor - // architecture then you'll need to provide an architecture-specific macro to - // obtain the frame pointer (or other address) which can be used to obtain the - // return address and stack pointer of the calling frame. -#error "Visual Leak Detector is not supported on this architecture." -#endif // _M_IX86 || _M_X64 -} - void CaptureContext::Set(HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size) { m_tls->heap = heap; m_tls->blockWithoutGuard = mem; @@ -2963,9 +2945,9 @@ void CaptureContext::Set(HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size) { m_tls->size = size; if ((m_tls->blockWithoutGuard) && (g_vld.m_options & VLD_OPT_TRACE_INTERNAL_FRAMES)) { - // If VLD_OPT_TRACE_INTERNAL_FRAMES is specified then we capture the frame pointer upto the function that acutally + // If VLD_OPT_TRACE_INTERNAL_FRAMES is specified then we capture the frame pointer upto the function that actually // performs the allocation to the heap being: HeapAlloc, HeapReAlloc, RtlAllocateHeap, RtlReAllocateHeap. - Capture(); + m_tls->context = m_context; } } @@ -2982,7 +2964,7 @@ void CaptureContext::Reset() { } BOOL CaptureContext::IsExcludedModule() { - HMODULE hModule = GetCallingModule(m_fp); + HMODULE hModule = GetCallingModule(m_context.fp); if (hModule == g_vld.m_dbghlpBase) return TRUE; diff --git a/src/vld_hooks.cpp b/src/vld_hooks.cpp index df6fda2f..314e99c7 100644 --- a/src/vld_hooks.cpp +++ b/src/vld_hooks.cpp @@ -158,7 +158,8 @@ LPVOID VisualLeakDetector::_RtlAllocateHeap (HANDLE heap, DWORD flags, SIZE_T si return block; if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls - CaptureContext cc(RtlAllocateHeap); + CAPTURE_CONTEXT(); + CaptureContext cc(RtlAllocateHeap, context_); cc.Set(heap, block, NULL, size); } @@ -176,7 +177,8 @@ LPVOID VisualLeakDetector::_HeapAlloc (HANDLE heap, DWORD flags, SIZE_T size) return block; if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls - CaptureContext cc(HeapAlloc); + CAPTURE_CONTEXT(); + CaptureContext cc(HeapAlloc, context_); cc.Set(heap, block, NULL, size); } @@ -205,12 +207,12 @@ BYTE VisualLeakDetector::_RtlFreeHeap (HANDLE heap, DWORD flags, LPVOID mem) if (!g_DbgHelp.IsLockedByCurrentThread()) // skip dbghelp.dll calls { - context_t context; // Record the current frame pointer. - CAPTURE_CONTEXT(context, RtlFreeHeap); + CAPTURE_CONTEXT(); + context_.func = reinterpret_cast(RtlFreeHeap); // Unmap the block from the specified heap. - g_vld.unmapBlock(heap, mem, context); + g_vld.unmapBlock(heap, mem, context_); } status = RtlFreeHeap(heap, flags, mem); @@ -226,12 +228,12 @@ BOOL VisualLeakDetector::_HeapFree (HANDLE heap, DWORD flags, LPVOID mem) if (!g_DbgHelp.IsLockedByCurrentThread()) // skip dbghelp.dll calls { - context_t context; // Record the current frame pointer. - CAPTURE_CONTEXT(context, m_HeapFree); + CAPTURE_CONTEXT(); + context_.func = reinterpret_cast(m_HeapFree); // Unmap the block from the specified heap. - g_vld.unmapBlock(heap, mem, context); + g_vld.unmapBlock(heap, mem, context_); } status = m_HeapFree(heap, flags, mem); @@ -269,7 +271,8 @@ LPVOID VisualLeakDetector::_RtlReAllocateHeap (HANDLE heap, DWORD flags, LPVOID return newmem; if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls - CaptureContext cc(RtlReAllocateHeap); + CAPTURE_CONTEXT(); + CaptureContext cc(RtlReAllocateHeap, context_); cc.Set(heap, mem, newmem, size); } @@ -287,7 +290,8 @@ LPVOID VisualLeakDetector::_HeapReAlloc (HANDLE heap, DWORD flags, LPVOID mem, S return newmem; if (!g_DbgHelp.IsLockedByCurrentThread()) { // skip dbghelp.dll calls - CaptureContext cc(HeapReAlloc); + CAPTURE_CONTEXT(); + CaptureContext cc(HeapReAlloc, context_); cc.Set(heap, mem, newmem, size); } @@ -382,7 +386,8 @@ LPVOID VisualLeakDetector::_CoTaskMemAlloc (SIZE_T size) pCoTaskMemAlloc = (CoTaskMemAlloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemAlloc"); } - CaptureContext cc((void*)pCoTaskMemAlloc); + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pCoTaskMemAlloc, context_); // Do the allocation. The block will be mapped by _RtlAllocateHeap. return pCoTaskMemAlloc(size); @@ -413,7 +418,8 @@ LPVOID VisualLeakDetector::_CoTaskMemRealloc (LPVOID mem, SIZE_T size) pCoTaskMemRealloc = (CoTaskMemRealloc_t)g_vld._RGetProcAddress(ole32, "CoTaskMemRealloc"); } - CaptureContext cc((void*)pCoTaskMemRealloc); + CAPTURE_CONTEXT(); + CaptureContext cc((void*)pCoTaskMemRealloc, context_); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. return pCoTaskMemRealloc(mem, size); @@ -462,7 +468,8 @@ LPVOID VisualLeakDetector::Alloc (_In_ SIZE_T size) PRINT_HOOKED_FUNCTION(); UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; UINT_PTR iMallocAlloc = cVtablePtr[3]; - CaptureContext cc((void*)iMallocAlloc); + CAPTURE_CONTEXT(); + CaptureContext cc((void*)iMallocAlloc, context_); // Do the allocation. The block will be mapped by _RtlAllocateHeap. assert(m_iMalloc != NULL); @@ -573,7 +580,8 @@ LPVOID VisualLeakDetector::Realloc (_In_opt_ LPVOID mem, _In_ SIZE_T size) PRINT_HOOKED_FUNCTION(); UINT_PTR* cVtablePtr = (UINT_PTR*)((UINT_PTR*)m_iMalloc)[0]; UINT_PTR iMallocRealloc = cVtablePtr[4]; - CaptureContext cc((void*)iMallocRealloc); + CAPTURE_CONTEXT(); + CaptureContext cc((void*)iMallocRealloc, context_); // Do the allocation. The block will be mapped by _RtlReAllocateHeap. assert(m_iMalloc != NULL); diff --git a/src/vldint.h b/src/vldint.h index af4ad48a..05cec209 100644 --- a/src/vldint.h +++ b/src/vldint.h @@ -186,7 +186,7 @@ typedef Map TlsMap; class CaptureContext { public: - CaptureContext(void* func, BOOL debug = FALSE, BOOL ucrt = FALSE, UINT_PTR fp = (UINT_PTR)_ReturnAddress()); + CaptureContext(void* func, context_t& context, BOOL debug = FALSE, BOOL ucrt = FALSE); ~CaptureContext(); __forceinline void Set(HANDLE heap, LPVOID mem, LPVOID newmem, SIZE_T size); private: @@ -195,15 +195,12 @@ class CaptureContext { CaptureContext(const CaptureContext&); CaptureContext& operator=(const CaptureContext&); private: - __forceinline void Capture(); BOOL IsExcludedModule(); void Reset(); private: tls_t *m_tls; BOOL m_bFirst; - BOOL m_bExclude; - UINT_PTR m_fp; - void* m_func; + const context_t& m_context; }; class CallStack; From 9cd63e86d034c6891763d8055338a080e36eeae9 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sun, 3 Jan 2016 19:17:02 +0300 Subject: [PATCH 308/321] Safemode callstack fixed --- src/callstack.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/callstack.cpp b/src/callstack.cpp index e3cbbc2e..70562851 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -715,6 +715,14 @@ VOID SafeCallStack::getStackTrace (UINT32 maxdepth, const context_t& context) push_back(function); } + if (context.IPREG == NULL) + { + return; + } + + count++; + push_back(context.IPREG); + DWORD architecture = X86X64ARCHITECTURE; // Get the required values for initialization of the STACKFRAME64 structure From d04f1bb0bd4163c4ce70ccc495b4cdd6e0b61687 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 8 Jan 2016 02:44:30 +0300 Subject: [PATCH 309/321] VS2008/2010 Release false positive leak fixed --- src/callstack.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/callstack.cpp b/src/callstack.cpp index 70562851..a5404c31 100644 --- a/src/callstack.cpp +++ b/src/callstack.cpp @@ -520,6 +520,10 @@ UINT CallStack::isCrtStartupFunction( LPCWSTR functionName ) const || endWith(functionName, len, L"initterm_e") || beginWith(functionName, len, L"_cinit") || beginWith(functionName, len, L"std::`dynamic initializer for '") + // VS2008 Release + || (wcscmp(functionName, L"std::locale::facet::facet_Register") == 0) + // VS2010 Release + || (wcscmp(functionName, L"std::locale::facet::_Facet_Register") == 0) // VS2012 Release || beginWith(functionName, len, L"std::locale::_Init()") || beginWith(functionName, len, L"std::basic_streambuf<") From c2752308570d948e0ab1a00cb5130bf32131a942 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Fri, 8 Jan 2016 19:30:20 +0300 Subject: [PATCH 310/321] Check callstack added for malloc --- src/tests/basics/Allocs.cpp | 111 ++++++++++++++++++++++++++ src/tests/dynamic_dll/dynamic.vcxproj | 5 ++ 2 files changed, 116 insertions(+) diff --git a/src/tests/basics/Allocs.cpp b/src/tests/basics/Allocs.cpp index 0a6ecec3..81b2df80 100644 --- a/src/tests/basics/Allocs.cpp +++ b/src/tests/basics/Allocs.cpp @@ -6,6 +6,10 @@ #include #include #include +#include +#include + +#include // Name of the debug C Runtime Library DLL on this system #ifdef _DEBUG @@ -75,10 +79,117 @@ typedef void (*allocFunc_t) (bool bFree); static const int recursion = 3; +::testing::AssertionResult AssertCompareCallStacks(const char* actual_expr, + const char* expected_expr, + const wchar_t* actual, + const char* expected) +{ + using namespace ::testing::internal; + bool succeded = true; + std::wistringstream actualStream(actual != NULL ? actual : L""); + std::istringstream expectedStream(expected != NULL ? expected : ""); + std::ostringstream resultStream; + std::string expectedLine; + while (std::getline(expectedStream, expectedLine)) + { + std::wstring wactualLine; + if (!std::getline(actualStream, wactualLine)) + { + return ::testing::AssertionFailure() + << resultStream.str() << actual_expr << " contain less lines than " << expected_expr << ""; + } + std::string actualLine(wactualLine.begin(), wactualLine.end()); + std::transform(actualLine.begin(), actualLine.end(), actualLine.begin(), ::tolower); + if (!RE::FullMatch(actualLine, RE(expectedLine))) + { + if (succeded) + { + succeded = false; + resultStream + << actual_expr << " and " << expected_expr << " lines are not match\n"; + } + resultStream + << "line:\n" << actualLine << "\n and \n" << expectedLine << "\n"; + } + } + return succeded ? ::testing::AssertionSuccess() : (::testing::AssertionSuccess() << resultStream.str()); +} + +#ifdef _WIN64 +static const TCHAR* sVld_dll = _T("vld_x64.dll"); +#else +static const TCHAR* sVld_dll = _T("vld_x86.dll"); +#endif + +typedef const wchar_t*(*VldGetCallstack_func)(void* alloc, BOOL showInternalFrames); +static VldGetCallstack_func VldInternalGetAllocationCallstack = NULL; + +void GetVldFunctions() +{ + if (VldInternalGetAllocationCallstack == NULL) + { + HMODULE vld_module = GetModuleHandle(sVld_dll); + assert(vld_module); + typedef int(*VLDAPI_func)(); + if (vld_module != NULL) + { + VldInternalGetAllocationCallstack = (VldGetCallstack_func)GetProcAddress(vld_module, + "VldInternalGetAllocationCallstack"); + assert(VldInternalGetAllocationCallstack); + } + } +} + __declspec(noinline) void allocMalloc(bool bFree) { + GetVldFunctions(); int* leaked_memory = (int*)malloc(78); + const wchar_t* callstack = VldInternalGetAllocationCallstack(leaked_memory, false); + if (callstack != NULL) + { + const char* expectedCallstack = +#ifdef _DLL +//#ifdef _DEBUG +// "\\s+\\S+.cpp \\(\\d+\\): \\w+\\.dll!malloc\\(\\)\n" +//#else + "\\s+\\w+\\.dll!malloc\\(\\)\n" +//#endif +#else + "\\s+ntdll\\.dll!rtlallocateheap\\(\\)\n" +#ifdef _DEBUG + "\\s+\\S+\\\\heap\\\\malloc\\.cpp \\(\\d+\\): \\w+\\.\\w+!malloc\\(\\) \\+ 0x\\S+ bytes\n" +#else + "\\s+\\S+\\\\heap\\\\malloc_base\\.cpp \\(\\d+\\): \\w+\\.\\w+!_malloc_base\\(\\)\n" +#endif +#endif + "\\s+\\S+\\\\allocs\\.cpp \\(\\d+\\): \\w+\\.\\w+!allocmalloc\\(\\).*\n" + "\\s+\\S+\\\\allocs\\.cpp \\(\\d+\\): \\w+\\.\\w+!allocator<0>::alloc\\(\\) \\+ 0x\\S+ bytes"; + EXPECT_PRED_FORMAT2(AssertCompareCallStacks, callstack, expectedCallstack); + } int* leaked_memory_dbg = (int*)_malloc_dbg(80, _NORMAL_BLOCK, __FILE__, __LINE__); + callstack = VldInternalGetAllocationCallstack(leaked_memory_dbg, false); + if (callstack != NULL) + { + const char* expectedCallstack = +#ifdef _DLL +#ifdef _DEBUG + "\\s+\\w+\\.dll!_?malloc_dbg\\(\\)\n" +// "\\s+\\S+.cpp \\(\\d+\\): \\w+\\.dll!_?malloc_dbg\\(\\)\n" +#else + "\\s+\\w+\\.dll!malloc\\(\\)\n" +#endif +#else + "\\s+ntdll\\.dll!rtlallocateheap\\(\\)\n" +#ifdef _DEBUG + "\\s+\\S+\\\\heap\\\\debug_heap\\.cpp \\(\\d+\\): \\w+\\.\\w+!_malloc_dbg\\(\\) \\+ 0x\\S+ bytes\n" +#else + "\\s+\\S+\\\\heap\\\\malloc_base\\.cpp \\(\\d+\\): \\w+\\.\\w+!_malloc_base\\(\\)\n" +#endif +#endif + "\\s+\\S+\\\\allocs\\.cpp \\(\\d+\\): \\w+\\.\\w+!allocmalloc\\(\\).*\n" + "\\s+\\S+\\\\allocs\\.cpp \\(\\d+\\): \\w+\\.\\w+!allocator<0>::alloc\\(\\) \\+ 0x\\S+ bytes"; + EXPECT_PRED_FORMAT2(AssertCompareCallStacks, callstack, expectedCallstack); + } if (bFree) { free(leaked_memory); diff --git a/src/tests/dynamic_dll/dynamic.vcxproj b/src/tests/dynamic_dll/dynamic.vcxproj index b452292a..295bf9e4 100644 --- a/src/tests/dynamic_dll/dynamic.vcxproj +++ b/src/tests/dynamic_dll/dynamic.vcxproj @@ -327,6 +327,11 @@ Create + + + {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} + + From bb9e0f82a44151e7225a54c539153bb6ec41b1a3 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 9 Jan 2016 01:31:26 +0300 Subject: [PATCH 311/321] Installer updated Removed src from installer --- AUTHORS.txt | 16 ++++++++++++++-- CHANGES.txt | 2 +- setup/build_version.bat | 12 ++++++------ setup/version.h | 6 +++--- setup/vld-setup.iss | 31 +------------------------------ vld.ini | 2 +- 6 files changed, 26 insertions(+), 43 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index b70e762d..c2a92336 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -4,10 +4,22 @@ chrisJohnson http://www.codeplex.com/site/users/view/chrisJohnson Contributors: (listed alphabetically) ------------------------------------------------ -benpmorgan, geordi, jerker_back, Laurent Lessieux (llessieux), snakefoot, VictorKharkov, xpol +akaStiX +benpmorgan +Eric Bissonnette +geordi +ioannis-e +jerker_back +jlddodger +Kristian Paradis +Laurent Lessieux (llessieux) +mnissl +snakefoot +VictorKharkov +xpol Many thanks to everyone who supported development without having -svn write access. +git push access. Based on the original version (C) 2005-2009 by Dan Moulding (e-mail dmoulding@gmail.com) http://sites.google.com/site/dmoulding/vld diff --git a/CHANGES.txt b/CHANGES.txt index 6441ccdc..e897af89 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,7 +3,7 @@ Visual Leak Detector (VLD) Version 2.5.0 Change Log / Release Notes -2.5 (2015) +2.5 (09 January 2016) ---------------------------- Enhancements: + VS2015 support added. diff --git a/setup/build_version.bat b/setup/build_version.bat index 5f54ff21..c2dfaa05 100644 --- a/setup/build_version.bat +++ b/setup/build_version.bat @@ -5,15 +5,15 @@ TITLE Building VLD... SETLOCAL ENABLEDELAYEDEXPANSION REM Check if the needed files are present -IF "%VS100COMNTOOLS%"=="" GOTO :BadPaths +IF "%VS140COMNTOOLS%"=="" GOTO :BadPaths CD %~dp0/.. GOTO :GoodPaths :BadPaths -ECHO: "Not all build dependencies found. To build iZ3D Driver you need:" -ECHO: "* Visual Studio 2010 installed" +ECHO: "Not all build dependencies found. To build VLD you need:" +ECHO: "* Visual Studio 2015 installed" PAUSE GOTO :EndGood @@ -26,7 +26,7 @@ IF "%1"=="" SET BUILDTYPE=/rebuild rem IF "%1"=="build" SET BUILDTYPE= SET ORIGPATH="%CD%" -CALL "%VS100COMNTOOLS%vsvars32.bat" +CALL "%VS140COMNTOOLS%vsvars32.bat" CD %ORIGPATH% :: Store start time @@ -36,9 +36,9 @@ 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_vs10.sln %BUILDTYPE% "Release|Win32" /Project vld +devenv /nologo vld_vs14.sln %BUILDTYPE% "Release|Win32" /Project vld IF %ERRORLEVEL% NEQ 0 GOTO EndBad -devenv /nologo vld_vs10.sln %BUILDTYPE% "Release|x64" /Project vld +devenv /nologo vld_vs14.sln %BUILDTYPE% "Release|x64" /Project vld IF %ERRORLEVEL% NEQ 0 GOTO EndBad if not exist "%ProgFiles%\Inno Setup 5\ISCC.exe" GOTO EndBad diff --git a/setup/version.h b/setup/version.h index a355c08e..9d7149f4 100644 --- a/setup/version.h +++ b/setup/version.h @@ -1,9 +1,9 @@ -#define VLDVERSION L"2.5RC" +#define VLDVERSION L"2.5" #define VERSION_NUMBER 2,5,0,0 #define VERSION_STRING "2.5.0.0" -#define VERSION_COPYRIGHT "Copyright (C) 2005-2014" +#define VERSION_COPYRIGHT "Copyright (C) 2005-2016" #ifndef __FILE__ -!define VLD_VERSION "2.5RC" // NSIS Script +!define VLD_VERSION "2.5" // NSIS Script #endif diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index 411b5c1d..79d3d3c2 100644 --- a/setup/vld-setup.iss +++ b/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.5rc" +#define MyAppVersion "2.5" #define MyAppPublisher "VLD Team" #define MyAppURL "http://vld.codeplex.com/" #define MyAppRegKey "Software\Visual Leak Detector" @@ -52,38 +52,9 @@ Source: "..\src\bin\x64\Release-v140\vld_x64.dll"; DestDir: "{app}\bin\Win64"; F 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 -Source: "version.h"; DestDir: "{app}\src"; Flags: ignoreversion Source: "..\AUTHORS.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "..\CHANGES.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "..\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\src\callstack.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\dllspatches.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\ntapi.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\stdafx.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\utility.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vld.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vld_hooks.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vldapi.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vldheap.cpp"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\callstack.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\criticalsection.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\crtmfcpatch.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\map.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\ntapi.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\resource.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\set.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\stdafx.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\tree.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\utility.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vld.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vld_def.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vldheap.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vldint.h"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vld.dll.dependency.x64.manifest"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vld.dll.dependency.x86.manifest"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vld.rc"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vld.vcxproj"; DestDir: "{app}\src"; Flags: ignoreversion -Source: "..\src\vld.vcxproj.filters"; DestDir: "{app}\src"; Flags: ignoreversion [Tasks] Name: "modifypath"; Description: "Add VLD directory to your environmental path" diff --git a/vld.ini b/vld.ini index 53c19492..d62b4d28 100644 --- a/vld.ini +++ b/vld.ini @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Visual Leak Detector - Initialization/Configuration File -;; Copyright (c) 2005-2015 VLD Team +;; Copyright (c) 2005-2016 VLD Team ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public From 42a10ae61b58c9e825036ffa4cf4f8ee1f90909a Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Sat, 9 Jan 2016 01:53:59 +0300 Subject: [PATCH 312/321] vld.vcxproj fixed for version.h --- src/vld.vcxproj | 2 +- src/vld.vcxproj.filters | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vld.vcxproj b/src/vld.vcxproj index 691bf72f..166a9c2d 100644 --- a/src/vld.vcxproj +++ b/src/vld.vcxproj @@ -189,7 +189,7 @@ - + diff --git a/src/vld.vcxproj.filters b/src/vld.vcxproj.filters index 34a0105d..dc0a38b3 100644 --- a/src/vld.vcxproj.filters +++ b/src/vld.vcxproj.filters @@ -86,15 +86,15 @@ Header Files - - Header Files - Header Files Header Files + + Header Files + From 3ce2a24eadad5bec4fec93e61c2ff81849c3a680 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 9 Jan 2016 02:49:05 +0300 Subject: [PATCH 313/321] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f9d73b5c..7bbfb3cd 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ We encourage developers who've added their own features, or fixed bugs they've f * [Source code at Codeplex](http://vld.codeplex.com/SourceControl/BrowseLatest) * [Source code at GitHub](https://github.com/KindDragon/vld) -Copyright © 2005-2015 VLD Team +Copyright © 2005-2016 VLD Team [1]: http://vld.codeplex.com/discussions [2]: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N3QTYHP9LH6UY&lc=GB&item_name=Visual%20Leak%20Detector¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted From 86a615476e4b5375e01bd0841d32f2d8f5dc7620 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 18 Jan 2016 00:57:35 +0300 Subject: [PATCH 314/321] Vld dll loading order fixed with MFC --- src/tests/basics/basics.vcxproj | 7 ------- src/tests/corruption/corruption.vcxproj | 6 ------ src/tests/dynamic_app/dynamic_app.vcxproj | 6 ------ src/tests/mfc/StdAfx.h | 3 +++ src/tests/mfc/vldmfc.cpp | 3 --- src/tests/mfc/vldmfc.vcxproj | 5 ----- src/tests/suite/testsuite.vcxproj | 7 ------- src/tests/vld_ComTest/ComTest.cpp | Bin 3680 -> 1610 bytes src/tests/vld_ComTest/ComTest.def | Bin 366 -> 155 bytes src/tests/vld_ComTest/ComTest.idl | Bin 1052 -> 431 bytes src/tests/vld_ComTest/ComTest_vs14.vcxproj | 5 ----- src/tests/vld_ComTest/MyMath.cpp | Bin 444 -> 162 bytes src/tests/vld_ComTest/MyMath.h | Bin 2012 -> 605 bytes src/tests/vld_ComTest/Resource.h | Bin 1080 -> 539 bytes src/tests/vld_ComTest/dllmain.cpp | Bin 1342 -> 628 bytes src/tests/vld_ComTest/dllmain.h | Bin 562 -> 254 bytes src/tests/vld_ComTest/stdafx.cpp | Bin 210 -> 21 bytes src/tests/vld_ComTest/stdafx.h | Bin 1708 -> 747 bytes src/tests/vld_ComTest/targetver.h | Bin 364 -> 40 bytes src/tests/vld_main/vld_main_vs14.vcxproj | 5 ----- src/vld.h | 4 ++++ vld_vs14.sln | 8 +++++++- vld_vs14_wo_mfc.sln | 5 ++++- 23 files changed, 18 insertions(+), 46 deletions(-) diff --git a/src/tests/basics/basics.vcxproj b/src/tests/basics/basics.vcxproj index c5cfc640..888387df 100644 --- a/src/tests/basics/basics.vcxproj +++ b/src/tests/basics/basics.vcxproj @@ -338,13 +338,6 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - false - true - diff --git a/src/tests/corruption/corruption.vcxproj b/src/tests/corruption/corruption.vcxproj index e5ebc986..3f810734 100644 --- a/src/tests/corruption/corruption.vcxproj +++ b/src/tests/corruption/corruption.vcxproj @@ -311,12 +311,6 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - false - diff --git a/src/tests/dynamic_app/dynamic_app.vcxproj b/src/tests/dynamic_app/dynamic_app.vcxproj index becf13c6..427c0ac5 100644 --- a/src/tests/dynamic_app/dynamic_app.vcxproj +++ b/src/tests/dynamic_app/dynamic_app.vcxproj @@ -313,12 +313,6 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - false - {3aea2aaf-3e9b-466f-b361-560b95ad88b4} false diff --git a/src/tests/mfc/StdAfx.h b/src/tests/mfc/StdAfx.h index 33d88926..921e06b8 100644 --- a/src/tests/mfc/StdAfx.h +++ b/src/tests/mfc/StdAfx.h @@ -12,6 +12,9 @@ #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers +// Include Visual Leak Detector +#include + #include // MFC core and standard components #include // MFC extensions #include // MFC support for Internet Explorer 4 Common Controls diff --git a/src/tests/mfc/vldmfc.cpp b/src/tests/mfc/vldmfc.cpp index 1565b50f..9b3f8e58 100644 --- a/src/tests/mfc/vldmfc.cpp +++ b/src/tests/mfc/vldmfc.cpp @@ -2,9 +2,6 @@ #include "vldmfc.h" #include "vldmfcdlg.h" -// Include Visual Leak Detector -#include - #ifdef _DEBUG #define new DEBUG_NEW #undef THIS_FILE diff --git a/src/tests/mfc/vldmfc.vcxproj b/src/tests/mfc/vldmfc.vcxproj index 3890ad96..9d2ddad3 100644 --- a/src/tests/mfc/vldmfc.vcxproj +++ b/src/tests/mfc/vldmfc.vcxproj @@ -287,11 +287,6 @@ - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - diff --git a/src/tests/suite/testsuite.vcxproj b/src/tests/suite/testsuite.vcxproj index 632f8a1c..96978851 100644 --- a/src/tests/suite/testsuite.vcxproj +++ b/src/tests/suite/testsuite.vcxproj @@ -290,13 +290,6 @@ {c8f6c172-56f2-4e76-b5fa-c3b423b31be7} - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - false - false - true - false - diff --git a/src/tests/vld_ComTest/ComTest.cpp b/src/tests/vld_ComTest/ComTest.cpp index 4bb6388fcfb6f2f5fbf4c1eab7aa47e0d0a3f514..47df2d734c30fde4617f90f40db82b40e62b66a2 100644 GIT binary patch literal 1610 zcmcIkQE!_t5Pl|7{)3lD6--sz=T2y%gmh?5hyvL-WNFo0eO1Q_{@p_n!JaV@UIiT&4ari zVYIk`oiB4QT;K>TIkM4=@46t?CpbiNWWs?DHVWh5D_|N1C$i!NxWWFA6dBFI>WuH= zi8FN|Mi@DfXFB=rmdH>hlBSa~s~A!L#I!W*9z&fv3TxXc6goRYu_IaSdjVLuO#irL zRY=pa?JEm?)+wQD_>3JKdXUa@n-g$ySt3Mm|C^-JoO@#zhyDohlnI)hBQW@CN!0?+ zz6Jj1BU-OFZ&IgNsTu2pI3U-M3JTfB)T#QKj$W6I3rwfds=0TPZUOvjEyVFueJE=|tef)KaDW1lTkG&Cy$U0Jw(U9H= z;1_Wn_|cN<^mtM5*NSc{yj{nU+kdS@kI_4cIGNeIsPGFR6UNM&Ai(H;zf!_>zlYHr zt;M6e$}la+Uf-=YdoV;k21ywJ0yB%!65!A_T_!x1NIWhC=xR%4y8QVIE(|=Vz%T#@ za8Z5!2d{1mttHrbf>&?H+f)=ZU9B4j&s(tPC{ERQm$})DX6X^S(&Eu*h7;lIYq%Oh zB4>oFylU}q$h#~|$t$9}X@FGJyHD`Ih(dZYR9;$sFli^WS0~+RSsfl6PWH$+#4`vJ RLg#R`Io z3(*t^hiY+5jl|@NQN$S#& zlTwh|IBXflIVy1+w*1I^pIm9Z%)G7dA37)p#GL)IAQj9gOH+!lU`wB}Qk0y`N*mVZ z@r9#VxyIU^;RT+`x6vpmj+d$9J#NEK@jW&^LuAJthM5X;A z<1sThdo=web*gF01el6~fp+TNx@IW_R!1cwS0tvmq=yk$ugDb6GI-CyV*>X(;z$ek z1-u_qe09{-QoPOLYYBYXl9h4zNXkWAv#^_l*Q;_(=xItWxN|PydlcWMfGCYw^WfK( zvpBEdsSQlsksOmVuB8R#)p0ExQ8rTWJRz4|oR(OySpsWZ#fs}q&+o_g3b4}(dE{6N ze2f7zBZ(mPh#Lzdh~SKZiHOq9MP)Um)}sL%1q*jz>@ zXAzr;%$B1#$aVxC%09m*ftS(7fu$g~RQ5CxWkcbhl_8+9W%$!u7}=%;dYtV;!UJS8VLARTqJc9CJ4PPx=-_}rk>N;tU_jXR$;0GA-k(ZaNz{< zLEgwx5L*7rsyLgl(?Gnluo54BPS?Pyktc&-YhA2? zQ}Ruw9X!>*8Q0LPh$Xt_nY*9C?HVzdI_OjlIm(I`24&iQaq6RV!2lQ|Id%YK}tQRE}IRX3bG-BUSp`AV|*=fmo8=m;#h`Sv;E8T4-=ZDMy@7c= zOF1_Y&?qM`nP(ibImM6`3E_+)&a)zP95ZiFPOa*;90qV()Cd;jY=2_efqz+8m|fJC G=Y9huIduI1 literal 1052 zcmZ{jTWb?h6opqr3M2R%9P*TcX)d;DqEESEAq}V%k+w=MBgV!=&83#=o8W^!6#NnX zFzH|LQT_IrIf*5d;mkR6_CEWpwf367e{#wxR9zFj)qx^SHPe=c8fe7+{k2%AFN;un zYN$=@VtiY-sF0J*ejRFX@-_P1**Gf9L+vlKFON?j-F&_=yX>qoe|GN7&p&;8_Txon z4aE!$J#FgyLFy=VVJCleQXg;R{ar&azXSOPFo#OB>L$oNgR~wvRO^}jYcj3&p*s^$ zuctR?(x?92WN)syJDE{I6_r)gJ(YNulvRs&Q&m>m+GVfBs={}boGke@_Ue4)$*Zu} z)DG{>Wo_d!)R@~MIK89?kzT=Rjt(`I>L* znY=076ZL$NO7 z4CGhc+;&k@%k%x;4e{9w?lI>NxMjqRMQ(}RmtL|Cmc9t+fOkO+4!hv5x$c?^%HV4{ zKWw8xoqc26a9*)!3w|YbtE|lvHF8?q67U$xAn9sACnt;%yrw+%C#^afXL?44?W$X> Tqbo06=Zm - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - diff --git a/src/tests/vld_ComTest/MyMath.cpp b/src/tests/vld_ComTest/MyMath.cpp index 9fcfad2b77a1f54f643876a8508a3bbcddec714f..0aa55b2fefbbc0828c2548df50f0f19b3e89ae4c 100644 GIT binary patch literal 162 zcmY$+%uCKGO-WTyDlSP$Osmk#P~zoMh70;u`X-iSfCYKE^z{{-Ap*Qyyj;N{F21fI z9{w(#z5y_CE31&y;u4Lr{LB1_chC7xT7xzx`ZQDC6yz8B5hKSmPM0 z{)m-OoUkTrg*8>=P-Ssys0`S@%!>0vF8Bc%O)+fAcS-d=*YENl?}m2C#Lsi9vf)9z z9W`V2Vs}JBn;VAePw2}!LLK5KB(j$J65FXGoLuqT^qOh=p75L$SSS!lt#c273JDk# ziXSQ^vq)#Ec$)raV2zFZy!V@;I~*o~FFO0%?qEptXOq|`IP@41 zj64SkXIr==bi*(Sd^hl!h_;c(S3q&>1+>Hh(?~?#+U?bhm?;G@Cv53qB1jA}ZXW?) z68l%uMaLRE*Nk$4xmX6V7eY@A0XCSMfS|g9B%6?#}aDHf^rytx7d*RiZ@D zSJ*^1jrFPXtYa`$C|Rp(|7F_0&q%l*5x%0nYt}q*4RHcGXE=^c7cVB*Wfb9UICX_+ R+dR|nZuhm5>9AJ_`wLwUt!e-O literal 2012 zcmb_d&rcIk5FWWLivNI`JW4{^1TE3TLop_$6sW>3>~2BQ*i9{4eprfWyA>r!Vn{S8 zcN0zY5AfpAll}`{ymRp^@u1Oz_|1E}%a&5(!ECnscHhi5-+VLkdh|OXc^xG#bE1F z16CeZY{zk8*oj_>&6qyC{lg041kWMr#>@b3gKUZ1BnK7>HSh_Z>{~%3=2DS3F4l2) zEK-hix<*&!Izw4Xz-}0qputn@*}|a-Xk$Q~f3Z!|3@!ta9I|AzDZDd^P19szl?GlG zw*#wjx`lNHdlufAn}awuY!be*F7&G-?>ZR9fXb>Yb>ui|MeUKidqTE+DI`}VF8_geG4Z2Cs) z=vY?jnfqP8tnalrqrvs|;QSHP==Y1%;S2Ii|ICnZo|EVO4oH7lJn8sL>t z!x9iUPo|(W z8=-~eXTcq0W4>9%5_09v;@PXxO&a-Y433lu*)wwVY#ITZVSJmBlf)Af-R*^)>#$;t zwk3yXmOJ7EoYW|>J^&afkYr!cV=GB;@n+<3MvsFufyXCsFhjLTnB zGG78OuFkX{C8*vwY#E7XUrie4nWi~-ck)wbf)-k_j}32=CSkAUF)P0@BaR)_OL_A? zD|s@K+6_4IQ-fV+&U1)l$cTJmIf%*(_ykaRy01na=r-aXV`~1{XF;7A>mYi<=eFZN86|q&J3!#-soqIL7aRNhALSrRPiC-* OGb4VYhCCCeb;Tb=luz9N diff --git a/src/tests/vld_ComTest/Resource.h b/src/tests/vld_ComTest/Resource.h index b182412e713e6a62f981916481e82b153ff20d6b..86dc9607d6c0fc1b4994c86d3cea53a21322944a 100644 GIT binary patch literal 539 zcmZ{gO>2Wd5Qgu8{D*-a12IV<>D9UmwRLxcyGlJRM#r+nD)`Y4LjHR<9-0{JTn1*I zd3oP)oa2!TP3WF-Lb>Ntc{N&G!5o*e??3uG? zo;mZrv!5S%<@Lr0)l{U4s%r6sE(#T>#_U?}j6)qzo0q4CCK_n2SP9Qq3vxYjiBjEZ z$}G?^!_&P+n(@rZFL)2hO~?$WN|}wAkI77la=&)y!pf@qdUd>5kLr+1;N;*9R@K(m zkz*OjcJt`ELe~*zX>+bi&g0W{l`p%Ef=(El$Zg00+y)()I-MP(I-wyeo#%t$aaSf0V diff --git a/src/tests/vld_ComTest/dllmain.cpp b/src/tests/vld_ComTest/dllmain.cpp index fd44887cd3e1f53a0eec8579479c0f27870c1a99..ce5045a9fb9537402e2773704b421d6b345e0300 100644 GIT binary patch literal 628 zcmZXQ-)e&}7{#v}$U9{9MxpEh+*PVsS4jU*E!(anGm!?;v}hc{=)3Pz+pfB+$T`Qu z?|h!Nxv8Zh)5=LvG|z`AM&4a4RduS%T#e-DbWBy{GCk6zF-M{8NNqrt!ii4CD7yZ= zI?387l2K>+&lij^%8jTha?8;3nS|tAe;J*V=v`Y7F#5r$mqLst-@0_QFl4^jaI&=8 zEp6q5&6OWO;oa8O5!Q@c@M9Knx?|ajB?(=?OSgW2(WQf#v&C{fupYo>Hz0_!bv%fH z^f$B};SLI(zO)5>=n2Cib+^ycg;WKB(j7o;cbkvTB;C&eSQo^9+Lldh%nEMpAG5=4 z@r=Zrx8VrJWHe1_^fn{wJ?8-cO(vysb!o{fK8RnzpMZN literal 1342 zcmaizO-=$q5QSgdVd5P|-AH1@HLgZLG{Jw28W#ll2_%37(2y8+UcjXr&)`M8lKNHm zD8r9qDwFA%e(zP)tM0GQj4}#TSBL1Tsa%?%RWgoT zu)0S)6J@JCN5pd<@>Qqmj_bIh5Kc$&zdNpH^+IT5NDeTO=684dpw<+b%L`$cLyN?fJ=Z|;#$tjuI&l&vN?WEIb3f}G6F6OIB I(ur5~4GP-O9smFU diff --git a/src/tests/vld_ComTest/dllmain.h b/src/tests/vld_ComTest/dllmain.h index 8abc486a83ebfae1b54393017e13a1e74b682579..f2978954ebfdd6235acb34f068199aa119cf8ad8 100644 GIT binary patch literal 254 zcmZvXK?{N~0EN#D_8*3)f&@j)u_Bn;h=Ebeb?7wGJP0cz6$0tMC)pvQ%e%bqJ@^WH zY8u2?ebHspZtHVrOGMDE%WYL4s#8K3Z7sKU?DXmvUPI7B@EH&YCS0(TDq&KYNIre1 z`TVC&nHxqpc0-?fF6I$+ ilYrtF;~?=P{B(xv=Mn-4%12w?uc-LvW(J#4Wk6rgc1v;q literal 562 zcmb7>-Acni5QPukS*x9E)snlSii}^v9q0*j z6k_*Oc9ju7t4%c03ykbnMJf_Z305eA0r!Ih>E5h@cx~>lXR6ewm6!x6$;M==p zbX)X@>5_m_(20)lNE=f)otr;q&Y?CJXc(nqG&;N@(FLl3&M>2z+CCkfss{>Tmc7iG zkPXSSscYHlEnc{;LauhnNAkG$;8eAvCTP#1I{GfigV6+6c|n7($$MCXxNi9q)XJ$R d+PBl2O=WuHA7^@GtIj|6X5M9XGri4H^#?qIS0n%c diff --git a/src/tests/vld_ComTest/stdafx.cpp b/src/tests/vld_ComTest/stdafx.cpp index 46f0d784460405a9b54a924d106b8fa21c594ae5..a27b824da782d355c894b3d323d33c5c72f3bd67 100644 GIT binary patch literal 21 ccmY$+%uCKGO-WTyDlSP$Osmk#P~znR08kAEqW}N^ literal 210 zcmezWPoF`bL4l!|p@boYA(0`Cp@Kn=A(^272o)HtfcRA~Yw(*S_KahJtijqL?Wy1V zTFNHmfoNU^E}&kJZfAykhFpdahE%XQdO*F&3>iRiwwM@yE5DW*V)YlhO(GHMQEkg- xNMgtWs|MKsQC(fr9sbZiKLMl%gq0aG8S;Rp<}j23-I)qht%T<044?=|B>;lFFe?B6 diff --git a/src/tests/vld_ComTest/stdafx.h b/src/tests/vld_ComTest/stdafx.h index 158cc233bdf8ac1e9f79df8f49f884696d30bedd..979ad7bd216f780ea1ef0bd0f808e6fce4c69537 100644 GIT binary patch literal 747 zcmZva%Wi`(5JmTq@((E4haadax!|^zh>dLL(UnEP1WV>2Adk=QK+=-bSIO=iC0&tp3mm9rOB&I=bn(91QKc}Or@t`W&ptlICZ4};fw#A&25UYp&(%f!*IoWJgypFHj-d9LQ3dM-aHKtO@PmWQD;nGRs zI6|318_Cv4l0Z?k#v(=mcE*C?fAmA)eH@X1NEI*&XcI`r#W?+^CCM*mQ;l*afdKWT zcVTVy6PVdU=i=6+g-eURv@T6gMxR{_!jh)Z7q^qQNvY2e<&$0s2|l)`+!cD?D=?8k zXkrt`j1Nn2Z$@Ui2Hx`kkGtUczW4Ohl+2Lb5R4F*OU0-PF__K108+dsLJpDc2o2fp i!TUw4yZYFs;3+KDor>OmC!OPTZ_~Q`Zw0{qYUmFJtmUZy literal 1708 zcma)6&ubGw6#gzMip5*cOLGx~=2}Gxal6$(JKJWPR#6(#WOoxVZP@&%#nMs;coUDJ z|A2pqSN#vXd+;P)MCo;6c!6bfxO0!= zTIb{T&(kkwSG+qrulyfsGEV;8yj;KydW!GjK{@zzwz7Zj-X5*H3ug4UWaT-BRWt7lI#G6C(I9oWvAzJYDnK|z=t3zhzbG6`M2Q^e-b2aDYq)Qt= z_uSXs5+%J;tXp`Fk&bI&iS;*`N5~jMj5$Xdhoy|q^gRt!n85~Q-QuY6YZDF>*9ONU z?l|0EXpl0=s(8;n@dkv)Bn&3I`YvvRWk;-v79F&sRm_lAyG)fw8n zMa5Qiji$?tJzS4p^>g@MS={%CM+CtuB)XH(dh=_$?_YgZ4pxI(4fD#$J56JHKjzc1 z_7+yH>dZ^}JBxl|>63j!jr%;yBfgzq(6UY2kPI)9fmGUJrbTQ!%(chZMQmH-RF@ea z7qT{pHK~j~eT*XKArfd6_4FM^EyetLRDfthG&svUdEcxKh4<@ZmGD!T>ylj#R}XbE zZHwQch{Q9W8FKT0H5vph@+~fJycd@H6 Ulx{8P35K)$^J*S5t9B-@KZI!>5&!@I diff --git a/src/tests/vld_ComTest/targetver.h b/src/tests/vld_ComTest/targetver.h index beac0e63c9ed1154c75c7761cc6c0423e0402718..2b26ce2837148a3d58759432ddae8e9274665048 100644 GIT binary patch literal 40 vcmY!`C`wGvO;pIwOHSqG;^k7#%uCKGO-WU-33l;zaq$jIEz--dnQFoZK?0!>Q+npw_J3{+Pf_aT_c z0M+EC$T{haomPHN{d|LP>5(rLNSYF-QOaG_AIJ0mdpE>25Yr)ULb!(Ke_0$`49E_M z%flHw8T=TG8H^a>f$jmZ{TM=kZt0KS*PT~y<=5D$pURlrQU-Dx&wsN*zL4HPe7;4v aUm5JXWQH7uQlKAGfo9s^2q8OgNCE)p_EE$D diff --git a/src/tests/vld_main/vld_main_vs14.vcxproj b/src/tests/vld_main/vld_main_vs14.vcxproj index d31dfd6d..d1a3e39c 100644 --- a/src/tests/vld_main/vld_main_vs14.vcxproj +++ b/src/tests/vld_main/vld_main_vs14.vcxproj @@ -336,11 +336,6 @@ - - - {0d30ffcb-45da-4d2b-8e3c-81bc145bf2de} - - diff --git a/src/vld.h b/src/vld.h index ee6b60f4..b591ff3e 100644 --- a/src/vld.h +++ b/src/vld.h @@ -32,6 +32,10 @@ typedef void* VLD_HMODULE; #if defined _DEBUG || defined VLD_FORCE_ENABLE +#ifdef __AFXWIN_H__ +#error[VLD COMPILE ERROR] '#include ' should appear before '#include ' in file stdafx.h +#endif + #pragma comment(lib, "vld.lib") // Force a symbolic reference to the global VisualLeakDetector class object from diff --git a/vld_vs14.sln b/vld_vs14.sln index aa6d5cad..cbd2e466 100644 --- a/vld_vs14.sln +++ b/vld_vs14.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" EndProject @@ -47,6 +47,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main_vs14.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_unload", "src\tests\vld_unload\vld_unload_vs14.vcxproj", "{A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}" ProjectSection(ProjectDependencies) = postProject @@ -59,6 +62,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_dll2", "src\tests\vld_dll2\vld_dll2_vs14.vcxproj", "{33F98E06-F44C-4E22-9E16-4C20F8238A95}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComTest", "src\tests\vld_ComTest\ComTest_vs14.vcxproj", "{3719F504-3DF0-45F8-BC7A-4415804AC7C9}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main_test", "src\tests\vld_main_test\vld_main_test_vs14.vcxproj", "{BB99EDE9-D039-4169-B26B-6BFD93C6AF8E}" ProjectSection(ProjectDependencies) = postProject diff --git a/vld_vs14_wo_mfc.sln b/vld_vs14_wo_mfc.sln index 7a86cba1..aae24504 100644 --- a/vld_vs14_wo_mfc.sln +++ b/vld_vs14_wo_mfc.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld", "src\vld.vcxproj", "{0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE}" EndProject @@ -39,6 +39,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libformat", "lib\cppformat\format.vcxproj", "{4ADFD279-56C6-4B1D-BA9E-B815E81C1B17}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_main", "src\tests\vld_main\vld_main_vs14.vcxproj", "{8C732490-DC1A-40C0-923F-1555B9141B80}" + ProjectSection(ProjectDependencies) = postProject + {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} = {0D30FFCB-45DA-4D2B-8E3C-81BC145BF2DE} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vld_unload", "src\tests\vld_unload\vld_unload_vs14.vcxproj", "{A8EEDB38-1E5A-4D6E-A3E0-F15EF1F2E814}" ProjectSection(ProjectDependencies) = postProject From 6d2ee353142f0b3927bfebb319bdde7b8c301214 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 2 Feb 2016 01:12:17 +0300 Subject: [PATCH 315/321] Fix when /Zc:wchar_t is enabled --- src/vld_def.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vld_def.h b/src/vld_def.h index abe88fce..265de49c 100644 --- a/src/vld_def.h +++ b/src/vld_def.h @@ -23,7 +23,9 @@ #pragma once -#include +#ifndef _WCHAR_T_DEFINED +# include +#endif #define VLD_OPT_AGGREGATE_DUPLICATES 0x0001 // If set, aggregate duplicate leaks in the leak report. #define VLD_OPT_MODULE_LIST_INCLUDE 0x0002 // If set, modules in the module list are included, all others are excluded. From e0221e05483297b58a9859e09d5d153bebb77b08 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Tue, 2 Feb 2016 01:15:32 +0300 Subject: [PATCH 316/321] PDB added to installer --- setup/vld-setup.iss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index 79d3d3c2..d1ff585e 100644 --- a/setup/vld-setup.iss +++ b/setup/vld-setup.iss @@ -47,8 +47,10 @@ Source: "dbghelp\x86\dbghelp.dll"; DestDir: "{app}\bin\Win32"; Flags: ignorevers 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\vld.h"; DestDir: "{app}\include"; Flags: ignoreversion Source: "..\src\vld_def.h"; DestDir: "{app}\include"; Flags: ignoreversion Source: "..\vld.ini"; DestDir: "{app}"; Flags: ignoreversion From 03c1412605e6bfeb48cc2959705063c62e093310 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Wed, 24 Feb 2016 02:19:17 +0300 Subject: [PATCH 317/321] Supressible msgboxes in setup with cmdline /silent /suppressmsgboxes --- setup/vld-setup.iss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup/vld-setup.iss b/setup/vld-setup.iss index d1ff585e..43cb32fe 100644 --- a/setup/vld-setup.iss +++ b/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" +#define MyAppVersion "2.5.1" #define MyAppPublisher "VLD Team" #define MyAppURL "http://vld.codeplex.com/" #define MyAppRegKey "Software\Visual Leak Detector" @@ -119,8 +119,8 @@ begin // default return value Result := False; - if MsgBox('VLD is already installed. Uninstall the current version?', - mbConfirmation, MB_YESNO) = IDYES then + if SuppressibleMsgBox('VLD is already installed. Uninstall the current version?', + mbConfirmation, MB_YESNO, IDYES) = IDYES then begin regPath := RemoveQuotes(regPath); if Exec(regPath, params,'', SW_HIDE, ewWaitUntilTerminated, iResultCode) then @@ -457,5 +457,5 @@ begin Result := True; if CurPageID = wpReady then - Msgbox('Please close Visual Studio before starting the installation.', mbInformation, MB_OK); + SuppressibleMsgBox('Please close Visual Studio before starting the installation.', mbInformation, MB_OK, IDOK); end; \ No newline at end of file From e2577d829adf91c59c7233a6a059c077594df75c Mon Sep 17 00:00:00 2001 From: ioannis Date: Fri, 2 Sep 2016 01:22:32 +0300 Subject: [PATCH 318/321] Fix ntdll loader patch for Windows 10 (1607) Anniversary Update causing crashes because EntryPoint is called through __guard_dispatch_icall_fptr() --- src/vld.cpp | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/vld.cpp b/src/vld.cpp index 0ae99816..a0103bea 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -122,10 +122,10 @@ PBYTE NtDllFindParamAddress(const PBYTE pAddress) PBYTE ptr = pAddress; // Test previous 32 bytes to find the begining address we need to patch // for 32bit find => push [ebp][14h] => parameters are pushed to stack - // for 64bit find => mov r8,... => parameters are moved to registers r8, rdx, rcx + // for 64bit find => mov r8,... => parameters are moved to registers r8, edx, rcx while (pAddress - --ptr < 0x20) { #ifdef _WIN64 - if (((ptr[0] & 0x4D) == ptr[0]) && (ptr[1] == 0x8B) && ((ptr[2] & 0xC7) == ptr[2])) { + if (((ptr[0] & 0x4D) >= 0x4C) && (ptr[1] == 0x8B) && ((ptr[2] & 0xC7) == ptr[2])) { #else if ((ptr[0] == 0xFF) && (ptr[1] == 0x75) && (ptr[2] == 0x14)) { #endif @@ -198,9 +198,26 @@ BOOL NtDllPatch(const PBYTE pReturnAddress, NTDLL_LDR_PATCH &NtDllPatch) memset(NtDllPatch.pDetourAddress, 0x90, NtDllPatch.nDetourSize); #ifdef _WIN64 // Copy original param instructions - memcpy(&NtDllPatch.pDetourAddress[0], NtDllPatch.pPatchAddress, nParamSize); + memcpy(NtDllPatch.pDetourAddress, NtDllPatch.pPatchAddress, nParamSize); + + BYTE reg = 0x00; + + LPBYTE icall = NtDllPatch.pPatchAddress + nParamSize - (3 /*instruction size*/ + sizeof(DWORD)); + if ((*(LPDWORD)icall & 0x000D8B4C) == 0x000D8B4C) { + // From Windows 10 (1607) calls to the EntryPoint are dispatched through + // __guard_dispatch_icall_fptr. In such case correct the relative address. + DWORD fptr = *(LPDWORD)(icall + 3) + (3 /*instruction size*/ + sizeof(DWORD)) - (DWORD)(NtDllPatch.pDetourAddress - NtDllPatch.pPatchAddress); + memcpy(NtDllPatch.pDetourAddress + nParamSize - sizeof(DWORD), &fptr, sizeof(DWORD)); + + // Additionally in such case the EntryPoint is held in another register + // that was moved to rax. In such case identify the correct register + // holding the EntryPoint + reg = ((*(icall - 3) & 0xF1) == 0x41 ? 0x08 : 0x00) + (*(icall - 1) & 0x07); + } else { + reg = ((pCallAddress[0] & 0xF1) == 0x41 ? 0x08 : 0x00) + (pCallAddress[pReturnAddress - pCallAddress - 1] & 0x07); + } + // Copy the register that holds the EntryPoint to r9 - BYTE reg = ((pCallAddress[0] & 0xF1) == 0x41 ? 0x08 : 0x00) + (pCallAddress[pReturnAddress - pCallAddress - 1] & 0x07); ptr[0] = 0x4C + ((reg & 0x08) ? 0x01 : 0x00); ptr[2] = 0xC8 + (reg & 0x07); memcpy(&NtDllPatch.pDetourAddress[nParamSize], &ptr, _countof(ptr)); From 0fbf335bab5cfdde85cdfacee9ba9a20bb986017 Mon Sep 17 00:00:00 2001 From: Arkadiy Shapkin Date: Mon, 30 Jan 2017 20:19:03 +0300 Subject: [PATCH 319/321] Vld version 2.5.1 --- .gitignore | 1 + CHANGES.txt | 12 ++++++++++- README.md | 2 +- setup/version.h | 10 ++++----- src/vld.cpp | 56 ++++++++++++++++++++++++------------------------- src/vld.vcxproj | 1 + vld.ini | 2 +- 7 files changed, 48 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index fbfae2dd..ccfba2e0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ src/bin/vld.ini /src/tests/vld_ComTest/ComTest_p.c /src/tests/vld_ComTest/ComTest_i.c *.VC.opendb +*.VC.db diff --git a/CHANGES.txt b/CHANGES.txt index e897af89..0a820a8a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,8 +1,18 @@ -Visual Leak Detector (VLD) Version 2.5.0 +Visual Leak Detector (VLD) Version 2.5.1 Change Log / Release Notes +2.5.1 (30 January 2017) +---------------------------- + Enhancements: + + PDB added to installer. + + Bugs Fixed: + + Fix ntdll loader patch for Windows 10 (1607) Anniversary Update causing crashes (thanks to ioannis-e). + + Vld dll loading order fixed with MFC. + + Supressible msgboxes in setup with cmdline /silent /suppressmsgboxes. + 2.5 (09 January 2016) ---------------------------- Enhancements: diff --git a/README.md b/README.md index 7bbfb3cd..592aa1a3 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ We encourage developers who've added their own features, or fixed bugs they've f * [Source code at Codeplex](http://vld.codeplex.com/SourceControl/BrowseLatest) * [Source code at GitHub](https://github.com/KindDragon/vld) -Copyright © 2005-2016 VLD Team +Copyright © 2005-2017 VLD Team [1]: http://vld.codeplex.com/discussions [2]: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=N3QTYHP9LH6UY&lc=GB&item_name=Visual%20Leak%20Detector¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted diff --git a/setup/version.h b/setup/version.h index 9d7149f4..ef96d44f 100644 --- a/setup/version.h +++ b/setup/version.h @@ -1,9 +1,9 @@ -#define VLDVERSION L"2.5" -#define VERSION_NUMBER 2,5,0,0 -#define VERSION_STRING "2.5.0.0" -#define VERSION_COPYRIGHT "Copyright (C) 2005-2016" +#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" #ifndef __FILE__ -!define VLD_VERSION "2.5" // NSIS Script +!define VLD_VERSION "2.5.1" // NSIS Script #endif diff --git a/src/vld.cpp b/src/vld.cpp index a0103bea..d19295ff 100644 --- a/src/vld.cpp +++ b/src/vld.cpp @@ -351,27 +351,27 @@ VisualLeakDetector::VisualLeakDetector () wcsncpy_s(m_reportFilePath, MAX_PATH, VLD_DEFAULT_REPORT_FILE_NAME, _TRUNCATE); m_status = 0x0; - HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); - if (ntdll) - { - if (!IsWindows8OrGreater()) - { - LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); - } else - { - LdrLoadDllWin8 = (LdrLoadDllWin8_t)GetProcAddress(ntdll, "LdrLoadDll"); - ldrLoadDllPatch[0].replacement = _LdrLoadDllWin8; - } - RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); - RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); - RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); - - LdrGetDllHandle = (LdrGetDllHandle_t)GetProcAddress(ntdll, "LdrGetDllHandle"); - LdrGetProcedureAddress = (LdrGetProcedureAddress_t)GetProcAddress(ntdll, "LdrGetProcedureAddress"); - LdrUnloadDll = (LdrUnloadDll_t)GetProcAddress(ntdll, "LdrUnloadDll"); - LdrLockLoaderLock = (LdrLockLoaderLock_t)GetProcAddress(ntdll, "LdrLockLoaderLock"); - LdrUnlockLoaderLock = (LdrUnlockLoaderLock_t)GetProcAddress(ntdll, "LdrUnlockLoaderLock"); - } + HMODULE ntdll = GetModuleHandleW(L"ntdll.dll"); + if (ntdll) + { + if (!IsWindows8OrGreater()) + { + LdrLoadDll = (LdrLoadDll_t)GetProcAddress(ntdll, "LdrLoadDll"); + } else + { + LdrLoadDllWin8 = (LdrLoadDllWin8_t)GetProcAddress(ntdll, "LdrLoadDll"); + ldrLoadDllPatch[0].replacement = _LdrLoadDllWin8; + } + RtlAllocateHeap = (RtlAllocateHeap_t)GetProcAddress(ntdll, "RtlAllocateHeap"); + RtlFreeHeap = (RtlFreeHeap_t)GetProcAddress(ntdll, "RtlFreeHeap"); + RtlReAllocateHeap = (RtlReAllocateHeap_t)GetProcAddress(ntdll, "RtlReAllocateHeap"); + + LdrGetDllHandle = (LdrGetDllHandle_t)GetProcAddress(ntdll, "LdrGetDllHandle"); + LdrGetProcedureAddress = (LdrGetProcedureAddress_t)GetProcAddress(ntdll, "LdrGetProcedureAddress"); + LdrUnloadDll = (LdrUnloadDll_t)GetProcAddress(ntdll, "LdrUnloadDll"); + LdrLockLoaderLock = (LdrLockLoaderLock_t)GetProcAddress(ntdll, "LdrLockLoaderLock"); + LdrUnlockLoaderLock = (LdrUnlockLoaderLock_t)GetProcAddress(ntdll, "LdrUnlockLoaderLock"); + } // Load configuration options. configure(); @@ -390,11 +390,11 @@ VisualLeakDetector::VisualLeakDetector () } else { - if (kernelBase) - { - m_GetProcAddress = (GetProcAddress_t)GetProcAddress(kernelBase, "GetProcAddress"); - m_GetProcAddressForCaller = (GetProcAddressForCaller_t)GetProcAddress(kernelBase, "GetProcAddressForCaller"); - } + if (kernelBase) + { + m_GetProcAddress = (GetProcAddress_t)GetProcAddress(kernelBase, "GetProcAddress"); + m_GetProcAddressForCaller = (GetProcAddressForCaller_t)GetProcAddress(kernelBase, "GetProcAddressForCaller"); + } assert(m_patchTable[0].patchTable == m_kernelbasePatch); m_patchTable[0].exportModuleName = "kernelbase.dll"; } @@ -2168,7 +2168,7 @@ FARPROC VisualLeakDetector::_GetProcAddress (HMODULE module, LPCSTR procname) FARPROC VisualLeakDetector::_RGetProcAddress(HMODULE module, LPCSTR procname) { - return m_GetProcAddress(module, procname); + return m_GetProcAddress(module, procname); } // _GetProcAddress - Calls to GetProcAddress are patched through to this @@ -2237,7 +2237,7 @@ FARPROC VisualLeakDetector::_GetProcAddressForCaller(HMODULE module, LPCSTR proc FARPROC VisualLeakDetector::_RGetProcAddressForCaller(HMODULE module, LPCSTR procname, LPVOID caller) { - return m_GetProcAddressForCaller(module, procname, caller); + return m_GetProcAddressForCaller(module, procname, caller); } // _LdrLoadDll - Calls to LdrLoadDll are patched through to this function. This diff --git a/src/vld.vcxproj b/src/vld.vcxproj index 166a9c2d..37727b1b 100644 --- a/src/vld.vcxproj +++ b/src/vld.vcxproj @@ -42,6 +42,7 @@ $(ProjectDir)obj\$(Platform)\$(Configuration)-v$(PlatformToolsetVersion)\$(ProjectName)\ NativeRecommendedRules.ruleset $(ProjectName)_$(NumericPlatform) + false false diff --git a/vld.ini b/vld.ini index d62b4d28..fa501129 100644 --- a/vld.ini +++ b/vld.ini @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Visual Leak Detector - Initialization/Configuration File -;; Copyright (c) 2005-2016 VLD Team +;; Copyright (c) 2005-2017 VLD Team ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public From 3be4332a83a7a0d35ba5d5b51831dcdae211b28a Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Sat, 25 Nov 2017 01:32:27 +0300 Subject: [PATCH 320/321] Update README.md --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 592aa1a3..c116bb3f 100644 --- a/README.md +++ b/README.md @@ -16,17 +16,16 @@ Visual Leak Detector is [licensed][3] free of charge as a service to the Windows ## Documentation -Read the documentation at [http://vld.codeplex.com/documentation](http://vld.codeplex.com/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 at Codeplex](http://vld.codeplex.com/SourceControl/BrowseLatest) -* [Source code at GitHub](https://github.com/KindDragon/vld) +* [Source code](https://github.com/KindDragon/vld) Copyright © 2005-2017 VLD Team - [1]: http://vld.codeplex.com/discussions + [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¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted - [3]: http://vld.codeplex.com/license + [3]: https://github.com/KindDragon/vld/blob/master/COPYING.txt From dbae0369389b0f283406b35ee92a6a885a5fc872 Mon Sep 17 00:00:00 2001 From: Arkady Shapkin Date: Mon, 22 May 2023 16:25:47 +0300 Subject: [PATCH 321/321] Update README.md to indicate project status and call for maintainers --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index c116bb3f..ec0e6239 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,11 @@ # 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) PayPal donate button +## ⚠️ Project Status: Inactive ⚠️ + +**This project is currently not in active development. The author is focusing on Linux development and is not maintaining this project at the moment.** + +**🔍 Seeking Maintainers: If you are interested in becoming a maintainer and contributing to this project, please feel free to reach out. Your contributions would be greatly appreciated!** + ## Introduction Visual C++ provides built-in memory leak detection, but its capabilities are minimal at best. This memory leak detector was created as a free alternative to the built-in memory leak detector provided with Visual C++. Here are some of Visual Leak Detector's features, none of which exist in the built-in detector:

^lQ`J4+09OAGq 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⪚;$o4dtyBdNMd`p#PncODp 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�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≻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 A-~a#s literal 0 HcmV?d00001 diff --git a/setup/dbghelp/x86/dbghelp.dll b/setup/dbghelp/x86/dbghelp.dll new file mode 100644 index 0000000000000000000000000000000000000000..62d850863e6a377d5c2534142f07bd528f9d524f GIT binary patch literal 1080656 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%0A|sOOlgKTuHx^Z=?E2=D&f@5eOj zpzIvqaXwIg0G_LUogZ4`;Q0)lFbO;hCWD9bg@yKt?G?57{lCiB!0A8;(5vedHCap9 z6=LPXj;3^`6WYG#-%8uACi(4|S8%FlQs^h#_&4U0yERZx$fOwwh)Hk?yoJ`BC4#h( zcAc9>aq6w;cVGxt68&vInuT{5@?%fepD(meJX(fvoW^L-DMbX}!}o{Q!!~31TA$0@ zJGmjEz1>}kyE>4X9A9S8$eFr;+1 z0^PF9Iz*zvbBg^n%W7X7tNBHd9PI6MD@7&zq7pu9`x=rP=74wBE8qT^0ghoOfV-J= zhwB_oywRkDkW5mA(y=&qLtyY8@bkE~$IE^UC&`Qe8i&+jO6Jaub>0?4jiyY-2T0Q_ z-0Dw4)(3`paVqUK`I+-DUFOO+YRjHO0y7u)U{#rJl}1VOC0Nt!O?4>~Pj99!7Mtga zS33W5`7}R6QiL02y46CC;|p5nH{GB$7j&#T1#L?vxlKUl#i74umWE>T&~9ZMjZ+2s zW%=61+kNeB?Jc&=Q;Gv4fkBlwZSnOONcF@3!IyL+^R?^F0g}RLL{APPI(VEbs<%)^WoRcP$CS4AW^2 z@qa@hK4RNu#LHQ=c{i!>zaTspjh88)Q334)SPzABRtJ8dJ`dGIpXmN9mEw9Z8m~~| zc}m=1rS3NTMAAvUq>{UM`V{E;r&~p}tYw(v%!x?INNJigRwVe*CJGGt_nbX0?w=P$ ztuAw+{}Jctf7hsINdOu`(PR&Arp!7-!HK6Qg~;mkc06b-)^El8uAvq8Sv{q+_(@k! zDV?eCCTmAV?VtfF6FT!plrMH)QPd7iQ5SJNqH^Xt>2*bo$W3K5f4|;jAEvP1{=l*E zBCn|hhUxQ5)~|DPuIm@SknU0%aj}*#_Qf$+(*LwHTI^$-w`olliWaDYauIwh&&L zlc+eKr1Pu@?+q3(*zEl!;Fw&T)Qc9)8}*`<*m?`GHAQj5t-aLOu~ba9O?>a~Rsi~t zwK3AM>`K^)1^<XrrvfYo<&W8*IK8Nt#Pkq0*XoNrL%e)Ta+a=Dgm?I}iCBUf(c=A;z*i!P zozTEnzi-0|oa`@G@c!g3Sf{Y=ba47=@_Cwf1$Yj|spy+|Khl!198F#W^9^D=qUFU}Sx^X4Fz*-8LR)W88?lZ}8eMJR{P>27tL!_=Mv&jX0eUT zA^{^hrFF(9)=}Ir%o!1Xf;<Oe$|>(wTl?o! zGSU>EjlBVuFNatQ$h>v)*sL;+H;4m8w=8Ce?2ma$yFaEO${({Y4Hh{1>(;76tl3?w zv?ms(2whtE1F~Smi1v~$qf=@o=j|HKW*mFaTH#SLryFBGPs9ef@a5-r;mcsH4v_S7e#6~_lUZHH zX}M8(HX1EPo|_(+KJvuz=hCDPaXOG;#Ia2V$K@b_nivq$g*x4u$Z~8}+`6uPhGOz< zgC%G`MI*_wc=PF4GYuTl`6=d=d{SSn=2M}g_gCV($L)W1>>WYcGnU~WY~0R%Xz4Df zdB79V#l^}c%Ws4eHF<}=Yn`+|wnLF?uM`RHZ1$cEf{(FuLzZHVKGRqoU7l$?)(k$- zna+jQH!B;GFt5Dzinj!t(Z_595OvluCl$u0k#u<`wu7c~3ibmydxB`DWS0A)Dl=PMXIWl+3iT90z3jXKxff>nyke}0gEm=%}h&ml&*^K#1n6N2;F;i6(H zD5hW;lPf-9)=v|Z2h`B${<1dC)M0SMA=}5+auD(;{lx*_hp5H?|0Fe-dBhHFa(cI0 z^*xDAJ*xgDS3TH!s|AEr2*;^>sYWh~pwHAf@JVHv~?-c0Pe%8)P-{OrRuSiBRJfxBiNG& zI=4=wnoWlt>V2x2Z`JB)R5MSX8GSmcd7UDX`WEQ=GOAHPZBmIvH8uQAXY~BvqZ;;g zw=wwH@S2a7hPRfuH@-rO%{3T_>HX2>Vt` z^<|x;1hw5ttWFB^H=We;f3cI6PVA(k-z({)N~=~+>!dP$X7uSg=@sOcL{i@ZU0>Eo z3aCvgu{udYPCBFK|6V6~3x?r5$&XV-;%Pn0+VG317e;y;fAYL`s^1_NnU~Ne@3iWQpGkeXj{Bt|>|3qZmvx*H)OIVeI?m&7I;rRXUdJKH8Yh-8Yop1) zi_>h!*W650+sDo#D*@K98;Ekk*Dj~*ugKkl=-7H~tcA1i(0HnKSK3@IbJ~rW*E}@$ z9j}^B5uCPsc(tv8cCKt~WM9r!ILK3O-IhRujYpCq`Ox1_sL(xWT-1a9SZQV4t%>NjrtpwgR`%YTZ+bsx(6s;YtL#tWSjsxLAa>#guMWO7>1^FI|_1DIZLBhI8;Rrc0D_6aO zX37^%al}}-TX{I~BBtqV`HdtzZ2M#Yz_p<3=Avf8#mYJ^G8>M{Zz@-FR@5DEH>FL< zebcRy#%&^4``%-#a_zg%lK>CoO&)6Lu`~_#6>@A8j@1p_J4eEHpa^L8b{w=3>~LMN zxc8=FRfR3VeEe0jlV83LF<-l;Xt_WPcK_Fj*oaW| zYje{yQrkEzH%)ZIAUPbGM|C!I)KG&$1iyEYb=QJ4bHQ>ie(dD(7i^6_c>^6zN?d&8 z!{j(i0j?pq#UvX(F&Ay*P!+GZOIdcW)HId3osdnjLdM$HF}M_gv!IXhl`CeS=iW0O za(T0RcUOC?twg1XSO^Nx+dg5;V7{NgHX%_gWI)_i7ol-FH;@Gn zpdu**cRXjEf~rY%=2Nc?g3YKfAAGF~#*aR!ou1{f-qJA;tflqWZ*L7k^Mv*qyncJt zgi>YF5$-}@Th?z@CSxh2<&pl(-xIyxsGugl8+wTkNnxuzpeKJ^*sx>(ycT*1OC;sI z);Mwr-&qro%Z>61=aUPzHb3G+onE9?%A>^K@izxqMcL-y8;t2h(`W1&s|vwwcA-hi zow2suy*;QOWRsu^tz1*L<^jE^%T>6_&kv=g9 zN7P|IGbp=*^|(`T*Z{#|gF&ZbJ|%-LHc}fK7Jrf{A2}R<5*FoxPI?iBN?mJs-8?sX zXm^h(pek7qRph40)SDqzmHS=^DjodRjec1g_$tfx0ddJ`Ll~xBTv|o$2b5M93sdqE zPNRr7x@;Wjf;VcD*P4d`mwnhIIxY7@LBTr54&zPMosPbRNAG#YosG@+g2jAS8N3dE zuaQx?^OQOkb3V{fa`cJoR=kopd1Lz-nu=&LfWh=j&=ZWeMWy4-+0aNA4Sif^>&CV_ zeBH8f=S;V@OIo~__8Bj5VQve>d-jJ?*BYh1Qw=Q1u+nAlw_Chlu&RXlP*K7T+Ld9G zZ=bmc+(`VzdyXW4&)m6jkK-G~h&6n548}|Oql5n_`Q2nv3i@uiTnl&HB=;(T^}*+! zHRizn8B`F0rTXaf`;xqXTKI4_PoZeyFa8?ywWgwfChMnk^FOVQmPWtFj-X`kF zsLbY!UE$T@Eexu%>Om9-jxtuwvu!tEs!iG!f6Fjq;p9{SE%8H$xPH-sp~?H}FbvhI-<9e790x4OQS`SaZ=;r+|W;q~QKagoT&<=8kCMufwk z?C()O+r%Z_sSU`PcX29hB>MP$hyGh9t&@BB(}TOgQ0}sx@VohQNzX!kUDz`Ko#jw9 zA~$3JAn3)ZJxy36<6HC2EsUIE&~481 z;m1BL%q2LuJq~YOIW6274Zz|wSf`6|0)J0qAEwocm3XukZ6s#XVz(jQek8p zQK7FC7y617I;H)sg#z30MWx+xYNbc7A(q@&)^OOX0D^FKvmc9?!+n_XlbXMYcDDiSd zJ4=T={3I<)cr!I0T^NguLzlys{6$P&pfNa3N{JiJW}8rrz9rv3*sa4~>t}byMmKL7 z9cruM`RlebdH$yD+}wiP#iV9q5d@v)5VWs;b{Vz=MTpq9Vm927+A9h$7I&)g^JWGM zWC}|gW$$-t^!_Cx{>D+PVwZ-dgrbkPM*2>MAjwQ+>#-ZkLfNy4Cr>2Ne|4rZHl(1C z1+nq}auy#gx#w{NBXxz5I6Y`$v9# z{C>+XAUJHNv^ds;*?O%_6~_Cv5lpo`fs z8_}QagX6Mkj;#`C<1#CJxgYKuGX%Hoe7I1__iT=y_lNWQAW(T(j-5}(w$Dm%Nl1Ld zja-#k?tS5XY`yJ`Fsbj+7O2mV2aF+it~#$Yz@!Gpq1Q*AC+5RN$Dyxmx5* zwfZDy9c9lm@#4jJitX5R^gAFUdjD~CNbD$b){Zl$AV6le@W*AYfwQR0zo$%awzYMv zv$-aFTnpUsf>x)J7y%(;m0?NZD2fXNLVYK6J_kPNM49Q&kq+@F`}v}BY65|6c}Y2( zBX;EsS~=1__~m?WEMHEuD+fk78%?C({cn~yRI)WT)>%J0dl~Tr{wIMs#r{Muw-nPr z;$%hppE5AVE|Tae&%`T;jy~ReE{?C2<*O<%7T(%8*4c0_!oTU9LhW&eeB zuav3k?z7vkR)&s~T@=l&XHNcQ^>aElK99k!ba-f(RTo14RNL+5SS)_KRPACx%Ct*K z_=B#-y_KDUl>E->FYx%Jl&1^8R??wzJf{seST4&fS(5YGP~P`)C36rS>g5HO(-_)j z_AqIAfHzQO0?mL4G@UD)z*?`BLWy)kJzvD&3i{R*{u|fbeI7^dLzrZlH393avql8k zfTk1ea06@?nteM!G~k+bqY5e18GT$b4-?rOf2^sQhP!j3Nu6`<*fhKbQfH_XGED;8 zlmcvsa|0&M4X9VI>ZOr3Oi$oj%O8~oT5RxS`-r20gUwWc%M>SuxluoUkUu2PTzITj zXN2V@-tbUbS0)m>?md*u#Wf&$xQX}N2aNzujHsrQM|rki23Wr_smEYze?36`hS{_g z)ytO*e+44Alv;DBmaQ8}@*6j$rYlXzFr6g&Zer>Bv)kv=_2_Qtho?{_6qCq*q6(6* z<4`MN3dnBxxRiTHnWrGG@pDz@r5Xw-0e*&nXF{bslzRwL!{Bot4UZ;kAvAi*1ki!; z0;u&!lj<@L@v##{reVbdIi3d3R~Co+pB4A>3FnE3Yw_Gt?FhUq9yKxKXNi-QR^4&P z3GjbLHyw4|l)ax00j(qnS(0xSlJxsM`B4`?#p3^_5byc%?{x95ihB$3!+!i5Tzt9Z zzo`&E>c?vYzmwpg8)w?+zd|7z$j#+_Co5rq+>Dd^V9&w%Tq=}nK+WMQ0 z6TL=fdUD+_U4?)~F`4UDxXmBe|E`MX(Jc9;^o>;7H17o?OOvA*Bill-rYncI-R};5u zeV@y}uYPX1bHX7}X|84(FwHnCUL#qD{e#N@g91nr;fFMFa$4J&v}_DIn&UdrE&P1A z&NjHp#p4ec7RCJRC3xs5>yuZEqy^nqb#ui!HX_5wlf>L9bYdSb+y&|BJsYT>xF z3B6W8F9nbtM9mGw2AoV941E^JeJ3zL^ylxnqxt#Uh4p36U{xAa?j)7fzkw|Hqh6Whj&$OHX5c!0)^Ke#!65=~F^2ktv~@`27vPuk!mHzqg$+CG>uN zALX~6-$s5<@(b1zud#kwyj`MdZCV3o*#kcIyTTpve=eBl7ai*My1k8UO7V| zWpV+3tS?VzHzV8cC@$SFjUAip^OhKM*ZR|0M`pjJPaBJ;_nkZqQnM;0szNA8GN&`s zFuNinRkls%Ii+obqkbd2X}*@_7FM@LOw;9yMk9Ngn>LvU0>$k{SKze1mrpa%NNTyz zT^F-OKQ_O+0f?RYx3$NH%Da1D$7Q*9_Sj%p&IuIXIv;E`ewJYLCo1CY5TLR{5$gXMtwD#I*Biu zy!=z=`Y&yZc!BBkw#C2{=ES*=5HO!4ZIRsjdX|5H#q@DX=~<{Zt<`&K^rpV+snnbL zw#Q?+m3>lghx8_ACp|rS`?B61*4zKl+YY^n$FXJm7+as{750@cVuQ~FJ8jkPE89Sz zX?aG2wILc7|0Y&QF}(g=^h2LFr!)2vJ=J#{_esz~>r07~r{AlY>7_*P^%T)5%WPL{ zZk7vPG%omItFNrbAem%O*ZM=9P7gOUK^fx|Iu?&Ur%DM>$5kO*viAOsRMM3Yd=;E) zEvGrSY)A(=-LWjk4#y5LF4WNDbNi0xv-UfVr+lt7+(4r-Y(Kq6y_;JlSF}}m(J67V zN_tv%clKgi$W2nypOQ)c|LzGz#3sz|!pl1JF7I@u!7G-m zKPS%N(Ox22yic>D3k+Ov$;O1@KyBn%Q{5;)2BAoHIA;A4D>~dhpNzj;eFo$ z^)P{4qYALgw(6aR3f7|FRSVaj>l!Ml>nmDFaxiEGt74eXB|=L*q!|u%C=d0^S!!t! zDJ$6^$Asw|wN=M*g?1QPT$9>-3NDekzff1x6zwmlJ3JLY~$l z`8`Wizhe0T2hRTbm7jxYSnPH7Cg^VfYb=u@`|IQR*xM~ku^TN+POvvqhy~ka zwtNI7bZie|RLDZ7F#>=ka=U2=YFJJR?Zg$IHwH8NH}57w|G?V*j>p_P_z3U6uP69W zvOU2E$yVH`52dNU#okD;{8oEY?8og*v2FR-4MA+j7QOM$s_1m@AcQKm1s{TBNAMv? zb_O3xwk!BhGIg{5jo(lU_)TKNb)1i-ZHc>YC~MbFP~x8J%A!fFYN#}^fzW#`I<9nz zzP*gqx}xG`?H{%%Lf&Ul8#&UasGiNLlaq@ocVk)mm5P1J1un7#8pldZf+y8EW$hPO z8VhfCg;+SJU|~qT*+Zl;GcIJ}DrLwmG%qdkhY5j>&Dw#v3cH7%S*=uA+_WAI`D{0- zDZIsdgRe0Xk6lOzd@E(cA#wM@vNqYHB%Zkr?y2<(2RLlK($-+XaTk11KKL>V-spnQ z%m+)S-tmlD;bMl_p?B*Zm@^h_{3y>ZM9JDZRlDp$!{0Z73QzDXDj#xxvJH+~sqNP*L9ViEa;x-=|QuVBzS4w(t(>Sf+dx0iU*hB}7} zHIwMwm^7FkW#&y8BOrH>ESgWYpQJ#qf(1Iq%dB9%YcV;hSj{D72lEjtVza8aC3p;uk9!=e6Df5-;zAjp$N?&b$>KI&EUa+T2 zR>C{6aZUCzOwhbJ+XxC`(jPmFR&)K#xMTyWZ1Gm3^U11wY+;n%oU69YjDJ#dtdw@O zN+3ZjKEfl@9j0)GL?o2d2_}k{({nAp#tvPj6zi*8;mZ3f6n?o6VRSQ(Ozyg)wklV& zI`xpEud!Ob4DsS4j}jA4>#5xojrrXCbho~#P%~UcGYEqO$pkZPMc|?m$t0sDV?p$` z9nSEiFqgUUX!a86PD3@8d)E7!txXu1L!VG)U2}LHH`zi`RHcNdk}b7fFiGU4)uZB>0d@J5ky0_o%w;d~Cxxx~lbn zq@{vgWdN~{Zx}zKyiuF;YU_tpLYgQFsVbx^t93hQ1-#cfi$)4^3noM2gYKM!d#(T z(uip?1y0Dng;2LFYaCfuXPsP~ zUR7BazVlKwtYV5Th9t$Z6_xAfC|ZhIzV!-2WR=Y8aH_eIs%m4^eIuxxs#4{SLW>-i z`5o@}_iF#fP*IqP+^NRi{q6=jji9Hts7u@4Dzb`kz1B;g*k~ygoUVQVkMO$9q-~bn z^jE2)(lErm0&Q>ZKg4eLD!--ShGZ@U3}dJ+Bip^{<&kWa>Eq!ycQ6=(t5~E-h^^Hy1oy|pG|TV=E#|kB z3?W;x;3`)kHfx(D2maQr{7rjM!{SKaB$-!GC1hXb!Tr~*hf;EUzenE0519{qkt^4p ztztp9$GNGqYY#D)JBXM2R9H7f>@j`e9=j6pKpBM5c=V+opZ9Fy_)k0f=0hs@2hQ%G z0$peZ8b=@jGm8ZeJ#rdPWjX^3pAGK)Q}`j(++%QHi(A#sU8+aa%xt5IQs<4T^Hy>m zA|2^siNk5cjbh2AQ2-z50u3F{^pY92qqFfKZjABbUlXwD3PaOF#3%YI+c_bB#BEo6 zgEZNHXXIx&x-I<3K|F_Jk7ni3h+;bWRA{qTfuU9O@k6*nS!T3kMI8^fpC6a*g3?>O zJ6wI)Ppdd_lj7p`YFa5=`AggS>*}vuXEf@wzIhZTMF-_Kc^CMF)vGWWrR9Vjal-7I z`O0vHQ$DIQZnw*a(!lU+JMW0xz;Bvn`r+*FX+m0?^#gYK#{gU;`WH?EHjrM~J%pLG z9OAcc6lPyDf!>Av<{w3%(|rQX-IBX$QquH9AcOx?(#+1L%MzOg#_*orI3y*X#OCZO z9vz!(Bt*AJazIK%5W9)}MgXeuE47d$KoK~t-% zx(7D%{3B(}Wxo{m_ELa`H~24+HTPPNNWLtQHA{Gu8S(jiF2$7*VhCHvA&~j3>@sB} zS0E`&mtE{lMeegy0v>Xwj#P)<#RavvsVrrJ?6Oi4YXztlfR3chd4D?An=;13RRfxx z3s$qi?Cjg4CIhtTbbqN?Tcg4JRmd%{P)vtI57vL)**_C418lrn} zKQ)eJFCY&0%3ReNJ80M1;uQ@^Ezhz`+3N&Nk>k3{N;O3v87v+V5`&60MX+Cg+Olm5 zt^}FLvX?Q^vvLk29)c!rk1iaUVN(jPBhuxK%5){R$E_TEmMw?>ds6?GxA%dM^Q!K= z#~L}2Z6%t-au7s-AWqg)4w%|)ZRCI~JgwqbbVgW-SqyPolMaeoTze)_QoBeQDfQ&Z zv`!nf;oa=kEQY2_y0~2f3XQ2`Oyp!;>I8Q&t=m<)>h4TNFBL^EOk4%M-`}~qj^I*rGYYM+RFa2`7`IiU~^?JPd?c~X? z1H^nQKb6e%C#re#J%97My!qR&SbKSbWwBA@r?R@gG2RU4(<}_c$0a(4$2eJ<-Q6Zv zI(#RYT}pEzAKLY{Xaolf$uYAE{qI(=2aKCc*jh3noN&o|TZOmv!MI86mo$omX1<`TjVb3w5PiZr;6L_vX)6?YaFfxYuN*Xzlm}_UUrF2IR~vySY@&=r3sNdpkc_1hNFkJ( z$L%2{NSXr33s4h}IqCPNq*?BI)=A|)RqNW7XEQarg&lf6W8%o!N^T!z1)I%(Qry0w zlG~dzx3=5HU>XLm)u@Q)KMDTCbyselF)Yeaem?P8h_)* zqY?VL$y8;&=C~qxOG%%g(d{9)UYW;JW#>BT37g7PO$!VwY&r_3O08zWJvOf-%NlPC z*u1ev!Ct}UEv<^p3;ux3>-maoe)e_PeAOn*m&Y4R2R&wcuXV9x=c@s(P1;tpzp$NM zJbNo~K)rQnfX4}6sM7o*ri?{tikNAXky*lvfH+ZI| z)iAK~F_b?&Jbxb^tUx||yZvcth!$mMx=#3l=yTD6k;H?$Ldgw=^6jEHPU+-_ln3K1&E^9~t5_~!1YfFtl|tI&wIC6fR5@)Qy|{ImtK zl)HgEPfbK0(6?x#W9D24AVMECs^l=Pj@3fBzTol@Po<6!P=qQMnYor+J#+u^A4G-H zN(7Qd<;*=^F>|Fz4QB3f+en--D38=KGdzCao=6e8S@^hZn}}YbZ5;ErXqF*IM8|`* zX;kNLx<<+E)~4gOpdF`+#u=Kppn2ZfbSA%=X8e81jIB*Yubo3Ev&I9S_8G^sRvu|+ zRJ|gA45Te6o@Og&gIV-95a(ta1Fa`PJ1c)amoDyF$I!wU=M3>i*5V>i%ls3YF zPjHkQ)20fA@=t03{(XMfB&MI&u|=j#IA7o!Gqu2msFs8!`M*{r)|jeJzxr;uozJFU zz}3W+knvTupFyF(D9&GQQy+vM6mY9anH*?q@z^VJ!7ySUrF8fO~JPGT%~2sJrJ zqU=!T^ASK>|56GOh910D*@mk|UPT+q=t#f1K6SHj@fE{`F{0bPN!6(aSWO}Q>XOt| zbgZVJ?%|nw-Ym7}1x(lZw$9D_w^P`A=olr^6Q#9W`_5nH6c55z{uddK{KxnyyaQx1 zqU~rs+z#8H(D@H2%lr7rM$fXqPqDx&GE(IN|7H_e9UU&uYX!?M;|Gsg?Nv4W7i@w5 zI{?w;QaiF!c6@(UD?e(Es!g3H_99vbORm;B{73e?WoAK7tF#WxcKU8If-YGuX&qn| zEc3=J3ilNDFe8|cy5sJ+Q~<0~JYLkMZbF+nymipBay zd+qYq*w*fXwswdJ(PI8>*iQ0aXZ!~aS#u48+7<&!`hi_oPN#(pDN}cck_2Lhm+#JW zjR7v5L! z*X~cU&*UnyvHVK8U^kmDL8E^njhEeiw1fTY{}pUCiG{g}q$0 zt5E#&#V1shrUuW)$>b!c<*A*Lpl%xlBdIQU*7wq{CR1DaIGw)q(Nr5Bzn?CCB=wVg zLbB>jy-Si6{2I4kZfP#YQ%!vNe+FL7sRHDyo=XFl#MT3N{wL2~^oIbG-Ld3a&K12b za58uaxPeQe#MIq_FI{X&-6`mB;`|UF{}Bj&mJib~?)Q`a{ef4%rp$oZ^TUBl!dL1R zzW+!H`nQsy=r3G&mG-=f3v>#W9lfM80**2|94>WoBh&)gGcl&A2*^^}t5W{nXeG!q zz6Is9cKG^1n%M_pFtk=&&4egP?7?HI zw>B4ELp`Sr(se+ZC4^+wP67CLZ+*_TofZ9AZvC0DsGKvkY>3TJVqPa)s#}{Ek>NL2 zqq{(6Zb%()-_!Y8DVDSr$oI&v{0rAgHmRumkA)%!DD%G#v{J@3VH}~qGDS6pw}}Di zf`_sj%O@*PbesBr070XS4VHI@f4?DPD?05_(UhqHbee&6t%Pn}?9}P7_7}Gp)|~aC zf{cRgNMK(>A2tgB^a&2;lU2juqe}7VD)57ae>!)nz{R*X08c#_c-8u`u>zVmKKQx$ zgP%)m__z)JRjwNj7T?)&vaCElGPDPKpHt*73=q-G&B6!}*~3i}tSN_9CQi~7eq z*jcF~=45t=rKmg!lD|@kx%8{y`N)&gU~?!FGE^ z0b>bv5os9)=s%!^+WZ~M1()W;m^o&nacg)eqj9itS>}$iqb_I|I$)#Y=7#gru1y^( zkztk&rhe5gl`ig0{i36e<>|lwK>E_^)Q6Sx>zx=qVHL;SH5Yn(gSm-T%p~wEpfvDtzNm^;yaE;t-i@{iBGyVj>Am@=X zC2&?R(c;*_kKSQi&5qG77@Z{xN2j)7NMc05xq{IlvVhMd3?b`Fqq8T4-9vLX7#%IQ zrP0yS03)|!w3Ptc?@ zV-Enb2!Mi7R#66nRs(`7`8S!o)yA1>gAJ5-m>8pD?Er z&pIT0@vRQw9|!D;*;1S0>N2qaW=cjKdB5xBvh=HaISOc9T%InjPRVc6_J-og3mGzN zyOSZ7u*SLWjO95*vLyMhM@*yhh-ozOgzMX1He25+A(YN(!K%R;TCwu~ACLtks@ROQ z2jE+LMhcSlO4uq^=0A}Fu!?bo6&s%+>!`aetr25nG=R$nE*T|qeos6cRXJ;0ZL3>x zY71Mc$Nj3*y3)80s1{tdsHJn+z^hh^yK*6dJ4vfmrJckri-3ZAM+GSUasnu)Rj0q4 z2$ZnxG_;)DV@$GAez;27K{bvTYp|dlRHe&qvszFFKzXc2?D9}%V-2s(zeAN&5pp=C z`=}iu8(Po_sZKg%y2U2d`SlJ}5Y~0qXm09#)oG>lAXxk!87O7sS}h=#6<%U?c$)%S zA-yySd&61SZn?r@7c1 zR))5E!aQAO3#im1k8~_M96iy0=tOI>j^B4DZz%XP-Zu02)k!W>2tAWjU~?fkx6My8 znSsqNdS-J>IP!bZrD6TMrekTiZxiR8_}BhE&aJU`ng8!3`DXcd@cm1}-)LJJ&V6uc z_+$Kgo-(D4od00@fq^NlbR`qm;XCgdAKJ~Hn?#V0{_klXGFk5Wn0qez+Yk(D$$g=u zTv35t28x8Tb?%e3X*fo<^hy1Ol5g{d^Z@c?b|R{{y(y45sfF(*EBjVlOs6Di+vZKY~695MHlb%IYF|fg$I~Y&j+cRAzc#;sq90O<`0&WF^qtW+xRl=bwuO|xUJDe;nMKd zp^+$3ak`INFNS_g*aJhpF_|shVw!79Msw|-UXl7e_W~N(p-w^0fBxx}ja22k%-JU? z`F#ELYCid1b0@7-s&Ra12gS|g_1{=X@-OmJz(?QAd9FM<)nVl}4eK+@Xepbz=vf6n z_`H|Zr+~|jq#vveF?wiUQAk)Rwn!+lM_fL0sqm~?^tfni)0;wUSg<&}4`YOb1-Y?3 zzYQ?Zef>7`*F1%Mzp+T_%?TZ+v(bCyd5xaH&)-OP2o5Kh5kj#G)}Hh7#~ac!J_FJV zzt@3&=psP#3DVl2jC^4~H)1y!^^6D(*v!ayJ2f&YS%pt(EuM=u2xmVqZceJD?`+t9#Cq1Tj7H#$`NN(qo*J4?7jvB1Jq9C$&w zY(l%XH$_j-<0wHlfk$4S7Yf(-UV}!L7r5Ags^tkXtOt%jWbC1Btl{CGp_Ko9`w({V z$5B0HdYF|PH!>8yyNlxh)lAB_n=isjv|ls75?Bd_x_Dj2mFH#<;}^JG#p--ka-_sc zj4wDtI;F5Oh?QXcgHu>39CT4*fW1zTCX>zupT!`b{1JqjJ}GRP;S4XgiTq9(&VFBp zGn-vvat(w3Rru{Hj^&%Bg?g{i=vzgjw>YBq172Q(78}L;bybN^k*F2EYf_9XC$BUH zgj;nP5N_4&nlXb@QTi0)OU^QzeqbL;G~Fn|Xrv!Z`rbI5$&9UEn(=P!!&sMeH<-&V zgR!o!t#j{zUsDF(4@V4q5o4VtW32PXQ?&gTr!}6zlBqk3s$Fqh)1nla=^Ul_Cc8zJ z+MUMk+yb5%UI&r|RL4HI0(&l{WWn3#4OtdzBe3K3G25vnv!%~ph>>M5MFs~9nJK+t$s4|D&+vZt$Gxt@m^lVNvB1nx5^Ku#4&+N* zxTkccLt%nslPVv*AxvRv8R1s6mA%imUj3?(&2b%oTVbQ6!j-~_n z7qz$%=sX^pz#Fk6dyTxnyYckY7;TMYRP!dxUmC zhB!*1TvtxJuVuIBN}oLlz14T%xOhr+9!#lG^Yjb!j!RR&z+mDVaE6+0lko!GY|z~0 z-4YON%Gdi&JGlGsPGrSqam;bxzht$NZg!S>p??I`qGs-_k34)aY;c{0g9!lAX1fzH z>6~hE39KVT40A??DsL>`-xig$yB|*b6%L9R7y>?CJNJ@?E`iS4VwlekjLA^90PjC1 zrFNq$I=fWJTrm8r$zlgTC_FoGN|wL*?a);e!2JbwD~%ipN*r|XKSkmd;dk*db;cwD zp(A6m>%#R%hHUn0*o6rNBBe7&U&LkD1EIlfg5%g-^UxTZtVRkI@YHAHfswgU8UW-s zR1WB@SD~{`!I;R_B#~4OhfV(04mQ@L_WZ0;Z#N8nUZdo(=7H*CN`12JFPP%Um^Mb2Jzry( zgy4PjX;BdRni%2Wk~g^NU$Thg|H;tc(EQfL^Zl~?GPPBs*U(WT6jKq|co}Py>#SKu zXY)suQ)_}DmO+McW3_GZrUQs=rMJfY8$`vbP>8LfJ^Vum!%)JVn8&xj4t{PgaPXsP zd`TH~S`D}~ zOqn+OI(g34AHhw@2Dy`Q$~F#Ij6Rm3POy@#eMFljP1RE7DU<~2o#mL$Zhb_jTc+cQ z(cQ)k{_S$jCKx3vPbVGM-neL|Jc=y9OyLZ_x~=iyFCx4L1Z!yQnT8SXXCFd8r`tN4 z_SY1?A%1_3=5!NmHNOWj=cw0sMXnL46JA_X_#LY;5=wStIa0$(GomQ@4BNU9nR|(& zi^vS`%yu24tm?jCb>}Aj()c0=v!7xS2o=_;557NDjciIZw=~mrEclMpL)}*+kQPHY>=lI{)1P9})R-_f@ zKu>8kDy>z--_U*+J>Y_`zN?zT7MZjYxSvm8!k713<`G-ks+TJ;aICfG>Fm~3C)9_5 zF)dp0+#Mfxp(cb@m2%z+W<8T~jhwg&D(k={EpQD(|4pex))+w%sQ;#aL+6PHp7CEJ z2bbqRtZmGPY#Rf7=fZ&>A=`bRI4VMo>End-SpqDBX~)}&@Z{dOGinI zGE_!Qt(Vz`0>ZR(oQ>0MAcBP<4dYEx7g)-kIoDRsqtf)SZS zsjCsGVq_H~qJd7Fbs+q^rGk~k_?QLMIhNn8?a3xq7OiCsgMX@?SJgh7glaf+(TJ5F zR;@!9yvGtxx(c_s3hC4LC|XEqFv?UhL*bs8wjLE0>CK4rX1WszSNNJzVMUaY&sk-M zCzEJhCfm9i33n*0P714&@x(e;_*|`Zh11ygS3^9N`~?K)w&<)PTTI0hbuRx=m!DRU zhoP?YX|5^_jQJncbKyk zlQ*1~LTWpUoXK2r?8A)X3sU&AEJ?0Zx$7K{cnM(!HjAGkYnQ6p)KSa%_TSa{_FqA& zF;7=FcrU&}R3FKZowcnm*y`!zxVK4;!-t23VYZdsv`#OvN=3X_t-Vg$D=S;={WA1J zlYn~wv3r^hnLWfF41(FVxN@OZ=kDar+5`A5%WeT%ks}x657b(C@pEwSyLh7xT~~vy z!Y>qB@N5bpCtapT1i3TWN0+NtNKqLJQ|c;Os*0d2dQnd=HpQz@;@mS!do?}y`?Y2O zPfv^nK~FBwJ)sWkf~g1@xAFFvI&A{tRb0uO>1vd^wlPrGvQy8*oa>y)XTC#A?nX}g zFq1h|89MYflrG)5SN{v_Cb9V!;2=wKI!UGJOW;-f)fgd!ZJFD^80Wi@wdKJ8+8WIf zO^lY#lTC{S8S308NpH48m=*(Dl6%-{UF`%;ch{1!!}lXdR?Dq^{{ety=RI#1tS;_> zf+F07{~ec!fClR4^7)1}`fgDeENB8}Z)elbv@_>*asyxWuj#o~=fY>xBYIw{h>kNr zW7IOkU)b=Bvnkj(`1=2PvXn%=;%AQ&H|!>E`&pX*BT8hmMTxj3_2G<%G@p8BVkh`Z zX#1QU($`pSc9&bM70?N(2N5v>)MELw*K`cq}r=H-!^>Ak_cRMc&;#YYgE4akA z!s^RCFyDJj5#f4viHT^%)ml9o-bL)Y=Z-J+tYKh{q}2+{v^`N92f$ zU6n0Xvwdk?|2*(!I$AQ@WasfZn_R7(YcjF5wl=i*Mb>4uY_KA${URGP+csN~HGYxy zOl)hZo5Aoq{#hFTZ#e{|PuY@~9*x9uf2Jgjf0G;kmhRkBO49hRcH_S;o^zq19A;vf zZR>(D@5^l48ayA&Z0j@-ciQkfaCh4?5&(Ee*z;z4-e=G4dVZ+ifsom<-Ci}q_7y7Q ztA^HIcP#9kzdqP_2$3=sgSLB6J>MfWt-X11IDg$@g~5_PKVYseak$=mu8kXBV>ew& zDbf2kua&PGbNL6RCIPC<4^5IAQlv)<`={HX;l%K~TX1GKzJvd?omoM0ScgCf@5>CY zCW|*@zghb|(oYR5jN)ZGjd(T%+_CmQX~}(-$}&UEl*+gOKqvLA`I}mmKH0)EPVN#% z451tX&t?S$3n7X4?1$M{z?2d#Y&LSqJ6^+xv^&=D)oY&RVlKuWme5s~+x~|%!ckM7 z2Rzr_vSj`9>D!LNd_xVxW8SK#Vg2qXTg{3WK6{LG7fiQy#TjqaQ>Bk}`lvTz`lKf! zD^N#L`+opf@0zWDs0LT`C$suBsq1vn5u*IU+LNVKM@%pIZq&`tweZtk5w!{;CB)nd&l~Tg6o8 z-4``5CB5JHkS#-WDVyC+2$S5=xBu9L`c!@IUAb@n+3Z~YE6@@|h&h|@0wlYGhx8$i zki04P{oCRBJuT4Y_|Ptr&)vN=T);A`=XJeH!>)c&WBL&1H{O&RRe`S6_(EWQCsSy* zE1>7tyaJq7c~kDUt%YW0!uZfmG96J1sNVIw`;$w<=|da`c~dT7^{&B+F+Q}1PZQLo zY{7G|-a<$9-MJUozo6|^(8=!r+rXi^?Z9Z!WM#zh7h*|*xlg|;Ys9n`Yke8kQ+J}j zUb*%OXcuTojHf$0Bpk+azy74Cyp!kjN&SXWKjmdrFgHLQ+@DPv+oHIW8G>RiOFZ{6 zfD1}nyU9jmBx~5KahW_cHbK==+{S!aA@?F-MO?gDVmN8kS6_C$_UWU&iEK`e2pF!> z&%o4i`sj-b+3XI&=;YFGtssuCJOgnI1jMnE??xQE^neOv)hJU^RFYcBD3EC6;Eu?0 z!DF-~W2qtweW)3p0JZR}0oNUy&D=6?pVru?y*%51Q|}rskGD^= zx}#SSnf?}>_=BxzDtShvrx=FPJ!jfMSgGhJo_Y~p9N*CUrKGbA@s+PM#SN9jzN-65N*nj@n`MjbLj#A7$ z{2xoLqZv$I3k?vmC&DMMX6_sjx*SXmk1rT!8$a%o^rd3I!-ApVVG}Q+^*7HoXhp)g zGxRl_+(WJB&_DuHTXgyWipC}>41CoL8(wsyS!7wa!Kx4mS3QoP3ThjqyHwO56TS=U z0hEvnNcl*>>t6~ZLPR4gPjQ`41_syF$axcE=uNHY1$vtDzX*r-qRsS-jlPrItHexy zeXH1x{luGo%z75cl|H>5K~Yj#&t}Jm_AzrcXA}K=(0bNK0(vi$LK1}S`(Zw1v&!jK zk01os?JYmnLK^X`5O++Iqi~hNHzTRoIi&w_yW_h75W(aL)??)?gIMv^U$4_sY#|Yr z!I5H_AghBl)HkMwo&nX~z|)LT+e7-@f1~10xzwjDRloNwO`n<5hP6m(MvOZE7%UWe z-VrPMm=%4iVnw)AEBcrfEniT$VEPC9RmQ??>!3U-Z--GR`a82^L*lDoHutArh6fxn z9)R@m__9)lhM}_+Q%$F=P&!M)*(nX(zxxBjZhdcEZl7vsqXzBZ6C?D>CeJde0{_bK zA?0|pYa>1KEEOo8BDr&eyI<2*QFq*FyN>cuU*oyWF5OmH)ljb*#ODQq0xBvS3nQvt z9zOY!wJLW3rAt8(e6m<-QVm=F`gr0+w4LC(JNE-$DAEEO$s86+WzI6Z+p61?Iegp_ z>GUYYZ>9NuD2M2hBqu`mE)Dy=4X|RZ3IZ+|ZM;4dX46QY#`}-_97XxhzN@MLDm|Ct zg;(m4{Q2Lkkg7?Y;cC#8mF8S)>K8|K{)N0h1l)VtBB}MLlo+Thyhl`Q#bIT)y#9rvtZNnGPKjQ1 zMY8D(@V@qm0pp#&gcVjnB?G54*5>cRRm_~qwz1}pVWWftEdj+#NMJg~a(@D^hYnHs z6uGGTq+3%f+t$SP@m=RL+J9l=TNX6F!8HyViv;@xaQ!!KY(Y=jGZnda*sb^PC_GuF zkXP`xglgy%!`*GMe6Z7 zV{KhiI5RNkJ7TEe3mhJ%5|NfwG68|PO8zb#ozz9}f2WJ!dnQ|ZCRE7ff`?i}IS?Vg)iqL>+VMjbS*=0B>EYp~1+qR=LF)z11q^Gd1Fh5xv>q~4+aW|XU zqm1VLpyC9YWek~%K5gOV7M)pYM63vnTv4u@6@>O^vCX(^Lplrk6ku4ITtPb1oqHr> zB2Z0X3?f?*ZAzk*pK%j6n3|26n$yA5Y)aM?hG~i(N|l2;;^-}Krre7t_e>!3*AGrm zH!IJ;n7#`w-MNo(#T7z-E$hAkr7NoNK^r<2;2|D|8J%+<*Q3-y~CQKcs}d6wJpN}$ft+gXR#3lz`#JCb_{f0P+K1!8y_1JQ}O-F zSU60~VR|MYWrt&sZ>uzb8jing(t!woV2+YG23{#G4aM|`*6vVpBLhaDW}c{LzKZ_Bmqz~{b zUrXibPt1ls?Cq?*)7w{fmv^YXwXfc5k30h=!mY24&DDgz@7<6c9MOCDyTs?{sml%^ z6NZPLe<0lO)iJ;#YCvCi_lI*|KZtN#%p9s4noCA|LwDVoJF1lFp&zDNd+R=uJ#^s* zU!+0&&px{w?KXj*R#R){V-u{kKVv=$OXtoNZoMn_F^XkUb%l54evYSf@i&rJ-!?|p z)Q9QM+?~1GNu>;jnDK_Go71IAvxthJ!g`zRx6Y-CbE&%A?{g5^Jg5BL8|7eBS9ninV zw{xHIbClToHuV&fzXUno+K#fzM3tg6a78LIUcz=D(iX4Zf16BV@D@T;*X>8ENf7gh z6s)sh;w$~J8Q+b&#`@8ldKz!S)eAp%oMyYuujsm9Wqyt_wk~Z}paQpW zNMRq?8S0$X&fLXVU3vA+cpb^Pa}2O1>eZBIQ`*&R+ocvQ^GqcdeRj7tQtnC-1>1oT z8y-HdJp-m(Ta@~6!eVP>QZ2WVtl@BOD7904OToZ7+Fn#{yuALN73D0U69*2RRZ@yb z21cs4;vJxypj&61it3v2B!;T5kK8{7+MAJSycX^~o!9nkkAJ;s&V= zqB*%#D3l5^@n*&~eI|lLoEgwFr6>!I)?icrM|+yY=iwi$CIqVlp21X=9!qTMnrIjl z{SvWo;1xL@WO^>*o6n@|n(%rq5{!qypFrEzd2oNL46D3jSnb=7e0|Xm=@*@8>qzeZ z1YZ@v2REaA`*$kv4<`yZEr0>uw7C1bSfP|O-FCR2hH!GHsfP~pC?dNUen_d_?+o%Q zQahgMIRQDgMNiznQlvKB)^+><)6%+DSekD`AdsOlb)9LaF_=U4v0Pmfm54J=h2y&e z32wKP2duzNQXVvBqD}cGkjRj0T`Oz00{$os$9N%|tTW}2&C z+5$^wRHV{C*@B^$?WqYmh%Y~u`VDGApo-2Os8QT=;**7uW223N15Yvb;!Uku%bN8-(iWP!P|nuCY6@=k==d6@&}LgFs$lZq<7hP|=CrVY$GP@~Fl;S|2_v zs|I(4Up-YH?}D378gtEAh%Y9VBh2@dJD~+(wy?%(+!tmBvpmH1+3UfuI>zfk_>*e7 z&T-X6q+NeKjzgXXyLGBn8X)3o?6W@Z4PN)!>%msJ(D3!3h;0FSg7Ip0L5UWcZgYQD z(Fbu%Q`?&2oHzP|dy2Fd=$tfDSV~~A#;6(|)>(FZx`G)6TeBI(j>vZCOrprZn5Gj$ zA27Sc8F^osN>TZLD~(mSiEOm7R{TqJGzE<7pASP@Ju~8pZsEzb;*J!}D}gE=Z31u$JI8>yv}vyY4`pG(@ydBf@#M^oAak#e1kvdVjIB6ViXndQzO2u)$L=i zrTz9Rwf~wF-@XUOV(o7Y+TVKR_F=f#c0Yx@`Qn7l(rLSsUK7QwKTZmA(TjWwER)}& zYPX%?#DmyU{wU)uS9`6(A{jXRE(6e9P@HDx(^}m}IRZH?V)RGej_w+xH95qXtSbZ0 zcHTybnJY8dVgca@nV*q_s?Ckf2i?E#Z@`vOQ{Y$dVITkU)z~ZUCJqtHNc}q#mYSH? zP8){pRl}gwOf;)0h0XUqRMxCxwpU~r3=DDb8OMF&F;`b67K0;;3`!7Gw9iuN+TT^( z{tjz@=at(3p}DGEzWrT6`@1gFeuD9*rbt&G8z)&wW!A)3IBL5zg|^z%?{*Ep3=#* zSsjZ-aCq8#>x^HJTdNkI{(g}M+ zPOXy#`$vBbTAmh!v3;%aKCeA_3+{%q+37^#4qT`Tu(BZ&&Ewfg`aHGsxG6LqqO|49Df;6(&%ARLwe828NnPeP=OhL6o}Ri_Mu zhNrAmz(;CD-~@TdR?iyn%_hM!s|N11beX! zb`1ls8x;XOwwVi7te$pV9}?Tjme5{1Ialh%=sSBBGQ-;@yx0yT3bq98SvwZsPoZBk z+Hsfw>r-I8-ZYA0SizRn@I5dkx%AGvY}W70boGmA^n*`$f~F?(anB5B9ZG5ga#Fu| z-+A`xt}?Nl0r!9@!aWc+2VttV86RvITy0E-0s4uaO8jo0du=Yi+_=Z!K;Cxi*@M*Y z^$d!E40`VEG28DM5BVa-NHX9%VEG=~$nH;|LT-%StoX*FaDE;t!WgN#-R^OsF8L8x zN&10Uh#Sr9qptZ&Zn5KKu7UWDZg0qn87_Qw(0EyVNb_Gl`c?&gEe%>#>Asz6&^{`h zD-BBj=Qpz}?!(!!vpk1BhxvQ)j-6%f)L@anoFR6gLVbrlTwZ$~4N@YRt|LLcNbZmO z_`?~EW5!=rsq}Nr&*0Y*${sq(VR>mvIJaxn#UU`ruc%G5pR!97Xd}S^Wq;4kmO?O$ zN2lDMY5l=^+;zCjM?bn?fH(&$ih?}<0uA~4QI2tz3DoBY8^sSs`mvIX(e0$JuVIIuKBYaf zPn)~V5!$uSggjrkOX>h}=e%t?imEp(K$4^`%4tnj#EXOyG%50exE+Tma%GY@!c}rX zf2_W%^FIqBtJtcKzwPvEX}|gb2FSwFV>kLAB#FLon!CW6%@E*!7XfuRY z5OcwrPDtA5necAk+wi4rP2sK+1erzib^?6aQVkNXPQP4qcx=@TR2O?&ve8j7GKSx@ z8TH=vtn6jr*9!RFmc$bd^hNi4jY978;L$-rbrW8^nX#CUl!|(Nq#&duVu{_ZazQ~| zlxp;@k9)e2Q0MTt6yQ^S&$iIBjwaVY%at3zfGDgp@DtuPigh-{6RTgR6L5r_afF5Z zpsB=aX6R^0PEj*vl%CnJF>g6f+Clhp{TNq9 z`8$Y1%*|q9H5tb{>cwB#RuJ`>9zb59d@oZre;Yqq&&!O@-_!c@cXg@1##8-}qa{Xr zk%|B)GTy#%ot`9vF?WlAWAaV0VX)ceOfitqG3DY5Ws`ZbQbPX=pfE({m|($&T3K4_ zKu1{e27GEV5PNEHyzF9ci6s?jXp)_Kr5GNTz7#oSGLZS}a6!d{{546wp=6T~D^G%H zwS_v=Bw~|n)RT7WNePIE@=wBw;$BR*&iaV{=U=41Wq?|AJY_Qd!0r$i4cc8Ye!etq zR^)5f<-QXJ_(a|=AAk);a~U1-f^!hZb-R{=t{kMg(e^>pV}B3b%-904&O{wTbgy%- zwvTqN6Jrxs;aCr!&1`8G@tFg2SYAYt%z)_7R;|9UL~Qc(+3Vi0R7bq-t>WHi19=#K zG=ELCRo>LI)FiQMpRs0q`Z0RUGz@-SEktL0!v~n15e)x zV=Q;=AJQJ@S9WZ{vtkyJi4)YI4p#xqz@2G-!?Dvi`tEyQf`SPl%PSrpJ53iOhy#U& zo*kfNBd@{7+mHBuQ4HRA|7q|L(MWQ4>A)Et^dHcqzt++K7sIqHDD`Xu z#S~Ks#zuFOMl$YARG_jr1C7WcA|#gi zX_;f;y1n&@+!d&z(I?)LTC>D3eR$kB?P2)B+jeLcYBYBm5XJ^&NS+;f={}GkbuXK* z^`=?J^udY)s)}LVSHdXEhAB$L%Davj0QANVnc{IcQ(@(uaaP{K(fJti;emiz3ah4e z!{DINO)$OLwgl6=XzdwTYZ*W^C!D_JJ68l&X#$I7O`xw+`3r8oAv@vVao#yh{dBJA zE~AWjkMz3)e?j{!dGo(Q{quQx37I_j@NWpV@6P)Z)iO68$?l)in&cA%b@H zjOA$3vG?0BgrLp%EQ_T)8m7`(GGT{0Azv8*iCl%{~yKQPsa0IH~>Bh;pr#)qEupJ-Ee z@0hyc=W9h-m`F3jvwSviYBSj)&*MWOdS*aMpRq49G^!l(_}I58tLKKnT_WRQJrBHM zn#N%@;<=o48O!Ba8Y@p`xRwe%gF{>XY@J@&^$*uqq;sMxqE}Z_M`LEFQLkC67}eTv zlU~29*OGSaWHV_f*!-$v#DlA-Vh3>*E2`L;8Q!T^Kl83kc2_yG=`k}yr>Q-g)o(mI zEM&Mvu0@R3>u8n}P^#U*lpaf?vk<}EoTwX>qP&@;7;iBgN zHFLom8?yKMRUkvbZb`HFl@)O-2x|)yyML07?Ea8zXg$x6)*;F$XcJ zQQQD6wI@-Na*Yq2DLtL_pR&XH3KEO_(IofczV@ei?nQYNrcYW{_L;YM!+J!ut!fwn zqtae>B|iJu{%erN5!W*3R%q{vEnk_+D_dUeWz{m&u9g8n^#ZKFkUyTHUEKGavboHd ze10U8Q|Ua^Y4{ST6FQ`S&31i@(4uF%v(XoLKI3K?>lD&&o#%Tf4V|Ds`lNnC?47cD zh$oI-VXARlN}2L+(G2LRd!%FA;pkr)Za3mlXRL0sS?rk7Tg^ETv~MtF3FnOLw8fi=i)U_4@vI>(R)WJH^t=8$Yep3W*Z|afoU*e*HEP}7jV1NHT%(X6U;eII zIZXtI&#iRl$I8Pte?5s*j^C_9hKoaCD6Non3>i8qnm*|cjDie3#1m()j0|Ned=!Su z-|k%P?+3`3;T>d*Z)w`d5J2c|B@WwZVLoJxbCl98=2}IfWy^Fl!%OU}+*hx!>Z?zm znyw}K}T(6 z&SZ63o%|k=58MfOT`$KW=R1PxYs=MluFcp%cFVsmGbEASvGo2hei z#sWZ(8xn*N!;0T~A-1U`b65_{qSf@|$7`(KUnCP{*{yPK@kX{0 zH^BAY$QI&z``}VpNtXes+xT-nHF3@c8uZ6MTWy$orvb9&DF=x6*bzN& zvN1;Gk&Js4SnQu^dyUn#*1&?i*Jk7qCOG`{WovF8EL#OjWsY~+h3Ia#YtX*aa#Wz7 zJ&v;|)5+VXxz$LK4X0fj#KNq^1 zWrYmmrch%P1^;;e86NbXVmw#r=lqQNR%!$`oYd_%=?5dBiao&%`^XcB0H0ylsLG4? zL44sOkE%Qv=T*G(Ft1}1ju!SB()R)e&P+UqP5-V#aiS%g`CGPHRh!8Zjp?s@gz9opGMP4(x~2<;=k2{Fc=Gw%?Mus&s5>wymf6fFd_Beek+v zTN>W6M3$_=Ut1G~H#Ol17v-dcKEcmc^)czr+^7&BF!?@UNk6zZbU$`8{A~I{_pM3P zeZuwulIECF5J`pAuip6s_FIKyV2fAdf`A~r<97{q_6j?3jgYeq@fsemRy9fCl@7}Z zdHwP%%`xMrvCMQP4NAr@nb~qs&+(+y*~i9S3e}^uo3ZGIZl7A=8SL{z>|+!)5Wfa2qcnKe(FVNx`J)bUr$()EjzKbuVAot6aKwU znWCP=5__&NN(|eKU91gf@Z#$nKx+Yrq8rn>b{C7~pVOmt@CcT_qw~2+LHt3K!BI^@ zhtr*QS9)`-mwOs1@+D$t%`bZq?qyim>tIX>ZI#4N?CGV{LvMTLmp!VoXdj+=+HY69OwWd< z$F$0H_d-3Cee?XXdt6yBzQ*-#b-b5&5YUF`}z5D07jPd*G~9wLj{NRYz;hgoTnJuH)rg%Ea zD*B%mJ>t)a>&de*QMt)lof-B~MPbQE9hnttx=++3C0)B=8EW1$6s zzL(KkmIOJl(|F($hQG|Mm97w9{0^=V9||xS@jxG4cKFm=9dEM^igus~^I4K5Jv4M*PGhrNr)_vy*$^y%6j@7~(X-qp1_s2KA;$jSlI z388ol#D(sM$_Sx&l*c*N%cgs5z5Jl9lpnUmVOh*SbL6j=OT>IW$Rto1@5A-(riHRK zZym`c3!srawms?U?|?}ei|{@OgV23HtYLQgZF&BWn92EL{8Veiy*nWNZ?#tXN=^S2 zzEX$C={&%l9^3;|H2!zkq9@>O(K{%OziXj`BP%s%{V;s{1}uzcvBZR1cvP+tsH((+ zro67X$jdmJ{}cKo%fbD+K4C{s&(i(x!FNUKfW+t(s;IY9`}wm%RF@2l&{+B<85@`Z zz3Z~k;|}I}YrE_ggB{=z34I%XT5w=u)Eg&5%dkB&}|b2J>;e8pQ-0>_N25~KlnT$!uU%<=nd%PEUU4zTWQM` z2vn+4tfI$}B<^(APTRYsX+=kKvd>q*;yGaI&CKu#W%PBk_8e)uF14>JMFH(=Q@eca zI%L|{bQXbqP3i9~ zq0RIK?lybU8aS%oFF&r|p(m^vrL<-By#GNCdk!mK+pu!%@Ad0(+UrO-P6ujNZfVAz zN0s7Hsd{fy_&1uo+iO>Ts5$+QOVZyBWriQ6Y-Z?)eoqeSH+z_0Z&)d9!+PG|NJ~S? z*EXaa_vzgHu0Tr;QDIIako`?Ba`C8BnRhtL%pRJ)>6Ar-vBf#it8-OaEq5kd9^Lb` zq^0Er`_|(8bEIhtXG4CK6K|MxqO+z{_C1uvR%bNH%WQR~%vLWXUYD(Ygeg$PR<|YA zk7D$LgW=v6K2w!$giRf_6(w>@#r~z`E%a=IphAE zb$>?P9}^$Pqmp6BX#&o8RMHS{CMt2c*ovNK8PVwR710w7Llc_MYWjUF>L|ti(=xlx z!IPg@!MC2{D|$}Im*rWV_gyDT=LqM0@4tnbGClpI%l*CUc&pBLoVc;)S(u`6#3wk~ zQux(uv>y@RS(d_)Zt+CcVX?hBadxMNHlFUf+&*w8LaJXKa zr^EI0{|M8`-(Z}nKiu^MPWdZ)p5*X?dHs$MrxyrBw47X)H}El{|AJ8h5k-$FboC8h z*HLMmmV{Cqqdv;l7G&_H`E#(`w5+f1v0eyElXgVpqSy1pik>HlEBwde%F+IC^a-zP zaAnt%c<*xbdf?C`=?$rOo7c*kM4#)xqWs=pgV)jpyf7^AQ!afDKOWJ^xVgzQdLiz< zaBlecFgn+EI|k6!Q#|l9&UGH`L&hB4y=ZbNR&!fdaX+@>CkVi2AD<+Q9}kN8s02YnxIh2N%PK9C-N!HY zh3R=X$uG1$q`DVh4&89CHG_8~(Rl^*uvwhQH(+w{dd`J)(b)Nw(I>Gq*tL0QYym!N zC8MMMILA@})fmxRL8D=%eIQ<+24 z!9*L{3E-}qyGl>7($kL8Q)lUEd+DjY^t83~w6XNGx%9NI^t2&(y3(|bj;x4k+IAgZ z(Z#g=6r75Q)SXMevvS&g{w&k><*WH-)0=7A^=w<0o3=e8Z9ST{P^fT(_xm7|yOrAm zqbF{RJ`3d;**(EIiNd~YSAS{#X{w@ncS4w(yymR_`V+VA^(O9518V+rwZPl;uQ_qQ z#q66maa-*WLV4nTkt_=*ZqkH7Xh2#q-Kx5lY6=GnT@AeWc*A z&i$Nvcu^5fEstKgl#t&rEBDZL9#+EpEhS^G`7}r!U|$5x`)^4!yS^>D@*+Y^* z8Q|b5K0btpt@w}?AF|@5`SR;mR>N?+va?7GZRJ7hgr#Kc)iWrxU>FEmGb|<2gh=kw zY#Ua3s?QBdc*y!<^6T}SX&csS>UJ-Bwrxmh+}x410m}+NE)(Q; z<*6MyN`W*BLt6E zUqZn0OLerI^q&w-Ozffms>Mm(tzV;vFM0P=R;;>W)TstQ+`&13FmOb2`XI1yPjU!a zoM|yr3Lmmlt%!Ik%~l;t#2vWTV~Lmw8)f0ky3z(j>5m-+|M1`RSgAmUhoMy?!Q)B~4 zru*s6ebOb3o0}K%WGHJ2qL^RAU~Lgyak_BsCFl1g4N{2hn^8`*exR?DY5jrw-jdKJ zGI#eFj_yNJ80F=zmVdX6nyg0Lf8@sC$(10_R7L5NQWAx9SGh`Div}_O8c^h=C^Zc) zKALi7D>}l+lhl2+lfDP4v5X?ijO#j@f%9s zjL((wCT5*1e;M{p^aRKHVErPz&pF9X_OH@?6A=ydr3kE+UHe#wv;=_I=WX(M7wB z5IJiqWf>#6-c?}@ay9!I`-g!efiw=?nlDpDjY9fDSM~}ZxJV0Yt_oL_dVM$^wE_+f z->u4~yP0ReVTBzCSr&ZM8%D1P$|grMP)Q8(VFJLTw_x2}_SSx4?I?0 zn@pd4=Urww@=|p~p8Ub*@Ba7#e<5Vb$T%I*7Kd1|3JLh19Lr2Uuq&2q19<}v?hG92bO_71g-g-(Y| zXEmI}iS3ASk+RKwZH0Wab>~t#h~SPWr2OxHt?yWR`#30bJ6uT}} z;T2>>FR)X5y=1Oe>q%$lwD zUV#=gTfd^cn0lhqf7<83@9%%B|B!6uK`yn)8+aJi!+Q&DJnmsWC*M+7N6X_|)^4T| z?x|Ho>$U6j%py)q>$R)(j4n}mn)U35r|NKRrcZ6xV5CR4x$bnTJLywfUE*e!xX~qU zP-3;GW5=5Lot?Q7;j6RHYc*9HJ6#()TpO_kcx=@5Gf-lzc0bF}zi6I(ENE-@BA_?< z_3y6Lu`_(`ch~vzcXvE-;Y!_b^EVV!zGsojwIm4mJ)z{gsGQR_rtq!1Y0Dl?dZ;&h zY&Q#UAu8w|p96?@?deWD>l$C2!d>HONW{i%uR~vA0s2}Df`JF@9yw-@fFM4>6Rz$> zxunls{*CG;l=1_6QPzktsp#HVV(;r0ouYvHJ+^NFJga?-?3?pB=DrHHw~tx!`WW|b zX7xIDr*jqzDm^i>)Yc?o_ixz+oaqO5vdbMaZU(8Y!33&{=>7R*56Pb*C74e$HlKdJ z@JpoGe0q0bC)JF1>@aSn8MG67L#Xg;^lE&|jy{9}`@ZvCO63S4Id=3JyW#uJ>y#RG zH88<6MAQ&bD*TJlUDKUd`}(8%c~>;uw~yZZo?fghr_lyDh3NOj9>g7{gWgP+xx;jc zI|zb(8pwhuWqiv%(QRR?!RXR4qgWp5Euj5=qfiFx>4N*6_R-k*&`}l!AO{64DA$T} zx|N|No;VK=!po_rnJa~K+h0t#&Y$)vZ@rk3^7EH7@m(zgFP}X0V?5ehxa$eGIpQYq z^$Q0{iniG2tF$XvFAo-~YqZ)Brr()3?3&?n7kpre-?7C4aQJ48vtVF+=y4yw@u4S5 zPsakFA*k$Ays$E5hM(30zH~#!^*}&aJCeXbHiTgN)Ev0+w{Q@OlySRhOuZks%go%< zTEux!L)uyLD2-mR<*Hd?hkfMMZIr@cA3cli%wCHMlGkrfNS$F0-|0hZLrHcqYjv3G zv_Y_z6*`kW!?P?RN>lwDK=Gfl!|F|UZj+7_4n4_p`lNm>6qO$GUuF2SL&_D)g^9G0 z&1wXh#;d!770&?uZ{hlTA@MZX)@Mx_#p z<@p*_^cwg{pES~eZ+5ldZ%KIfVI{D)Lq244UtQJ47SNbg?eUT#*7>%JFswLJM6)$$P__i5`OSL^9D zbO=`jJygNPt;N;jmSv;v8Q&Ywjnf|su3YL0){p|1^T^GR8fYOT^Z&HgftaxfiXm$0<* zK)v~&=8B(QDv`c`Picjw>$4o85gMuvojdtrz36H4vvSoa zMS=BmZ~u&T9cR;r&W2LkoXhX|SngezV1m>QS+lRV2r;xmnL7+NSLTMS1!kbkaJi=B z^8DY>37ZghlzVWPS3*1}tdvfEHNk1KOf zN4pm_B?%;EJ6~%zSz9<*co2tz&!BcD4oF7s&ZF)HO=+ZXvqDRE)Y_e>K?ax7UR#lk zvy|tAZ@2*MF!@Z0tpI17t)#CmyuwAEZ42C;`%+Qk0t}e?krI8#xPi@#SuBpkgV2wq z5V(Sr3re}*QV7#V%6X-ncPZd~nXM;sH7L_kw(w;VvcytQ6d|Opd4*X<_p3C`y!W8Ix10T4(3w>8>Jn> zTG=(l9O2q~AikLbdX(zVSs1+dA@QVn)lQBZkdyWJLWtt%GpnWjgXh@Ep;MV021Nm?CFnQZ$S zwQnWh!1X~ZxC>2tJFctExC@drD}6^ZlOKt#B5XC)Ugp5KweM?CtC}amTUqN--t_wU0W!Hl zDnaH?vNB&#-*^alfiVRRl)X!mYosx#OFv&D>4{h`RG>pMtbuH_wbf6bX`z=HwC8jH z+iQz`p^59#FSJuQ6Jhs0zQpXpmIbYDiW|bX2{!%0^)?)|mVSU!(o~2eaQX}*5h+*b znsWJDg8WXwjfkb~KCCzWd^?2|(8pH^S$_tm+7S=Q5X-s)v*HZ7>sb5fhwOY(rjq?`+&?cS$mN)|J&fcd_%Be7vLWM$v{T z8^%<*e`r}fa$+NdSJriDR4e+I4UY6`4WWPU)iPS$zo-2%y==e$+u&66FE~ZsXksbw z`;BBR$bj1M+~Gmfc~^Io6BCYWBx0_!%DjNI8|f^&XCxi2uka7jYXX+~TebWJ{dK3u zxO}Of9)*(r@J+eyrJotJR2T=lM?Y4AIJMBtfJyUfkmJWBk-(j{zKRT{?sp`Tdyuu1 ziTVacR&^QfGZtgQALt~K(ix4oPW?*_4guS#e?1F6O)fJnWbAa5hRW~G+Y)__88|lJ zh@=#95Jq3;Uxf@gl(%X&$$feV@DoIe_$R-;%MLs$vMRzZ4Lpt)h(5M4k~Cx(a)g%K z$vuc*$Q@Bv@BG=7T{P%I6>$hT5~S=V(?yYEnt2z4B0%U*R4zq{V^`ppO}?vXnNJ5C zuwuSkks6%3k!ifz&GpKD??zUq-(1!ULfrfhC{3QH?|y~6C!*@BpOQUR$8zfQ2SId%$%P5X*OMjM3>Y%`g<_usF8|O*LK?7ac7zYKi4zpqAQ+1{ z>*9u^%9@gQSR{M)BlzCoH!mQpLam{lNUgED?!=B?G4aarQnwN<3y!BWW4WYI{vH7_ zBp?VVq3fY0h+QkW?Lv3%8^5h_Ij>;JsrM%y0&BUWpOg7kB`X_hzCuHd`3dIVxRueU zu+wk&s-nJ~Cr)4!Vzo8`4THKC-nZiV`#c@}x+o78b}~Jb>9}fB^x}cdB;Nb{ny`hx ztCrGp>(z^)r}<5v)UWmq_Ua%me2E4S5ay)BoMKDC!K)j z`UPC{D_w1Qfqe$2S|Nj~>J+(#x{Y%Hr-hl%cle8xz8(e?DIOpfGm?(>1*(BMCe75#8U`^(-+L{`M~+ z2v)2rfyeP9+5fs`b6+AqjA16E`}K{u86)+@}IV=TBS4iGeZYV$V%v zO>tT#FBqAipSq-k(6+M6D?+0dPc|AGue$LiSb8l)j*rgUt^RqIuufURn3LR`HmKdH zo({c(D{a5<2d~X-icTh1_15J6FaH_0*hwHcmqI?9AZ`O3B2-vqJG$=N5Mbk+HQrvw z{HOg%AC|<%Pr;Ue4_>*z!i}svfge{!v9Gn5q|b1^U?MZ{gzM+H?0sSsllqgtw2Yts zhaaC!JJK@;>X_^_6PuQ#h&4Mg-r*C5B6r({4vf_mS^&>Ku3bg4JFIL*!6m?DW5&*; zS`VArY1S%S9i~^5PmfBKM09Q6z}#;0xpD#|>;}HomZ>iN0!zw7CdLGr2tq6Wxl)d( zhq}bu9dV>ye>sUk1VFjRu%{@~^VXPMr2$L+8km>Fu!11>AkhjE-7Dnq?G^xsbw=JD zUWX48m$S~U(VNI9(gr=ARIrUQd}Af}0=z$jxgyVP(W0t>2iC}NlR|MY&8bbK5*?P} zMr)bGq0l4ri%wk-G)wz=!E+?1&Je9wY3b43LSTAqXJro;2}jehr`*$fD#+=~uf7gB z#lgCU+Q+(2T@yh->c0XO7ac3;-si5Sd;ftSBP%~pM#JDAvR(2|2xWWDyJ4xCV3lkC zLu{qw@Z-;=p&b;~LfSC6ji-bh$Zf2?gaTRs*fBz(!$qBK7`&QnHVDV4h(j6U(X*XA zS;<~eo@dbz;<<0W;3Ph22X%wtHWVs~wd%BXaLanv8sVxuE`9NZ1ADBEC!QAeoCagT zKDC8Q90llsKB*hI#$ZHmtp6?2(Hd?f z?)_MvD{;Mzs=m8f9CSo`{&VJU18+$TUZEq+ z)g5WRTt`q&yy1>CSw{%8vsg!(OC4#_liv}Ss*YGHy>}ym{ZJhdBcUU^-*`t>U#=sl z+TUN*U>cu;dx_vazBgE>#_|)KW(_ zyN+yh9T|P&9oc%hj$nj;!yRe2j%;1LBU?)yX|L#rOI1fKwbYTVt|K^#YK}a9rH+Uz za7G4IPCu!`^>+Jv^~%>A2mC^bhM-1~8$A%^c6FM0-5Mq6j{{}9gT zj!~r_qos5oPUH8|cKU(HT=M<%Fy3JjW&NflM9-FnV4)&=VuOC^#%XrjwIThQQ0DQN%8Pw3=80br zjkIzhLF0`tpm-sWjKA-D>8OK@YR}haToEux@H@`dR_X`d*s`~V_o{y_oWbZxecMFu(WVmpe)!Z`91LWLotck z(UE~eBjy^k+J9&m{4QAG#oU7sNk&EyHxa_*YVg$=T-qADTktjwwzu7MWu zp5|#%m*+*#@I3)`y3a-NO^Au&t#u+7VbpLuR+sH z(!~sN%~^t`Clbskt0ln}PFo(8u9EXRq~mmrx>@M2L0NMQIGa8tpwH^26sspfJr_xl ztSk9l{uhf8`o>bN$q)Iv+MfbDZWVx^H6t1WRsa}>H<%;tu2{{Q9eeW2s2 zu6uu3l8wLvGY}aRP(Z;VabuG>m?jo7L3S+aI98C1W$eTdzdqNUsN~hLXKX|4V0o;> z!!Rv=#VzS0Eoq=H?T@aIUr8_&68|eQ#3iy(5;r)FNY%VMjG8DxjYXoz{661(?!7Z3 zjSXF^>t`04d++(T&p!L?v(Mi9>~k#lXRuw@Cu92T^0x)aw7zF!|mkynd!#0}}ikO{AiX}j@;JpFB*)TK=LTiR3i@%|-i z>`AHX^yJhmKLN>Mc--NY-io`Wb{&#REqN!q@hK=rrRL-0okD|cBf!Zp2g#=3EG+2eaThK&EraH9Vk*n41xxv}OIhyD-x^8n ze4uJ8m&M<&t3}D+-~Cf3>j9Wvs*(2{!gtR!5u@j^0I{J*D=1} zd=08?l|i{6iEUWqzta02C!PA+j|pO5O`D&K(1NF=PW1p>QLk$uh^2arL8^Xczn(J1 z4~R8Kp@8HL|F{IbeR`Qpa?8$zUXffg`t{te7-0;ez$9qtQ_#`6=$?P!3ukgjlR*Kr z94}e|L~l$G&Miz;E44|j6z%&-(B6 zF^>NX>ixd2aea@wrtqDnQySs^CH@Q_kdJHo0G&B4Y9_lc)lHY>rn`y0rgfyJTsw}e zRBoR$DzMW9E4|;Greu30WHDgL2jdl`NCx%6@a4Q0_Xc zAEM>TbHXZ-F_cexiT$E8N51y_6=5DV_pySmCAqV;y?IO29XfnxcKjIzIH2#5$Bu>c+Q zhK`1GCxQgnX*53Cl0-PvfXkS4tJ4%itQS9*6o>6Y$xWcm<+ zlbl2Y{0TB{<BR|Bm9#98UcQNEE?wg_-MK@VNm{Zay?8s%L8Rlsv>!s(YTLJmX43cXQv2~6A>lpb*O43(uA&J=*34;hc7UsviR@O^}0b_+CXvy?5!m zkS}QwoYsjXDr_n4l%(aZzWS8wG8Q5bkZ1#))Cc`%PKo|cSp}S+i$}JcUCx5CPvvIS zfj|r|kONQPG%(RY6)}BqhK|#m>Ks)Qm7>ot*<=QHoCzQ=#TLY5Kf2QUuGI3P8ZMVT zz0y;_aeHml?aAIRg48A(+GZk9Mf<)@*?5(y)9K8I2>9*`+0i|ZShdIK+40UED4B7Q z9mj0`CF@Nr#8J}0(=2$jUWkh4WG-ORbA2!2)0SfrAn))Sf77Cmyt}v zgE~3K_mtHwXkXoIcvN%s25-qNXy8$5b^yK*fCECUs%5YHFkR_yKMDlk@u((uVBxC> zeQ1fWL5}vVq4TA3o)17|u8Vp%HMA)W!l2a8KRkI>X!;o>Z+NjCk@ z1a^pnC3Xn;J^NtQ5YJ3@h@(bMC4L*B9m0AqJH$a^pV^v3!=WAG8M8w?lZUY%4DApH zOY9H_`vW@!=|;mYgqkX02o5?s#3|JG=jaGJ*3yoIc8JLx!4C13JA(QQ7(zQlc}E&W zBtX}{q(M(~ubqy#uj;6M4LhPeCLPgkijFLL>m3R05R*HCQ1_NQ(qtV8?GWW1X%0Km zRMHXmRUNUfVMk<#pd+$F(2@GL-jUD_F}WkyA>MLFnBt5`Xoo28h;N5rMCO!q#J5Ax z5&If;M0N-|B6)z0c-pU@WsXcDtiX)Ec7`>KxE*RUh9Logz;L(q}+=jwkFJf_$QDvb6Hn zvI8N;#;!kokoA26SXtfw1U=TZRr_M!O#QIBM4N2#uiek`CgpFXd`Y=U?W5oH1TAu4 z0Cf4q$_gkGT&j#D7+k76qUqG-t;XFY|B|Wwx0{MLk~*}#rDH5H8z0l&SBKeMnOEnS z`Z(qsIN3B8RP3Y)?Qy%KIf7EErCr51^qYGKP|_V9Rp6~A#j#u`*mf+#BtS6`yLXpm zp~mp4-Z4x)xM6tBcEw5nr%77Ghkng((3c-S#+0RbUutaA8>Wlh5|&*zdJpMYJ$VOU z*e#AhALL>}AO7G)s{9_6q@FSgz!0M<^z3l6oD6(&xo^}9+rW?x{PAOLlGv=fDdc5& zly3P7DIJIL1Fx8Nc7kZZ(bSj8kmc@BCqs%vQ2&bMqprmW=*oh+bt#ztZcbKVWcHL~Y)7Wd=-8XeLOV|qGak%{@jv=w7#*xhr z3Wme;=LhMPlG{f`B_G-D?f4t*9^!vi!_J}8d+{Ii)>F&l+jwLcvU{rUr;Kf9Mp7+R zI>24Xqb$IQhz zTqm!wXQSE?tOGjI%h@$=Ws%DM_Wb}N9Mj(#5YRsMw!?UO%CV3Oez?J+0n}+um|>EL z#h^LuZc^bRd~je!F8hwd@7g2322fYC80#_n zEPqBwnSxCcSK$eCqMsKVw^6l?@R#1JQFY=!d(tuHyFX{QO!&H++yO(^De$RP4!i=u zi00D#zb>6iyUFLzrG6AMrE}>t`aORxopy7H8y}CRwQ?TSp2NbBySZfV;aocH&!y9v zOF+Q8xp19kqv(KfW5H031Y_ZFpTmz624l|rr8+gApWey&i6Q!>k?ZuH(=haHs1(+v_Ib3 z{?)Au&|GK%?dA-7e9t*l3x3#x!|*j7RRlsNNquY^nww+lCmwS8VWM=`r(TWGCG$iS zrJ3F)COybWSj@xe?neku-P%6rZWn&IwPQfH3wwY}FA1S%(@j2a)G}zHd*QqzSt32S z8wtI+@`4z-qT{&K>QK}%TWl(LE$-e0NTK>5v7%VVz+7EMGI&J?`>oKlS5Xx*sSXf# zD)$VGDYer-==C*T{E<9{-asQMcx{A^Z@W|@S>M`yYzvGWY|!fQG)FWDpxHgL`BDwU z0JoRJY$zo+J*MX%*aJUq8rOp#o5sJRc9^=|uxw|?cAR2%_p#YRvNyMb_D8N@Y8yAN zIib1QwZkUy_Lp9j69I}%7V}pXMXm4o=;xmnXDD60zV%n7GcJZ<-=A^aPpI)oCRn|m zNwJxZ?lIQV@eD>EdE7sv)rL2om(+>%o(@^>!F2agrWavf2?30zgwEr_!ZzZeOkHb- zw+*s6+S+}5TLg3w^0WOIH$Rj0bXq~rA4DSM%+I#>QGj>Wx%zFhncBk96=HPwl%8l2h?``Hb@h$p`k&I)X|Wyr2w4; zp25wRYk+`fU~`OSY=Gb^gUZ2WC;z~te!F?!0|eJ(pH`T4c^~9{gbm2K<@0x1f}=n~ z5UDiy$dB7GKENIX8*mlBujhO2PDC>$QsF1Hf3H=4jToD5KSJ zs_vKq%CRDJ?N9c!g0|gt375d2K6`|*&5I0hZC$_EXSk2h6$NXjIHO294h5OvL`c{v|nuXnZSN4RwLmEW0PL1exaiyPjtuSkZ45)>VjuZHNn+#f`hFQ)M;*I!G^}@*PS;pcGrbDNXJAbo&Q)=p?}lV zzdF_X1)gk2vmPMX(O{=syrxr2rQg3xEA=mi%mLew%wcx`&fNO|@J080)@BACY3oct ztc!kaG4&!y?^ZfD#A`#)MeV^R?ErjWQg21)T&k`K#nyI{jy3I>ZS|h+eN~6eZQ~&E zMF+Nq0u%SN=$>)mi2Z}_5zrLf^HY7n#etAv&c6#0gHNza?Pib|lB^O#Vn55*N58gg zy={wX_6o|(E`h8i&MoW=>3a5n1EA?RY)88MN@fo8oU(H*iFru1@jC(0>tYMsqpE%P%9mk2u1UQ;{ZPX4yIjPxf0L zYk>GRPhf5s zNxiVtj8daGMpVOjMnfnu|0Fn!KSDSHlOjfSB#tZ{9J?K zl-cbg(LH~!=Z>M-9itrj;92K3ws9rE09OKhK6vNslceH%v~_t*4;-H4>WuEkGVPDi zxhLq{<12eu;{DCW#xc=`>k_xop-Ax@Vmf+su*xIo?6nltGWWP3WSM(B-Tj1pl59O7 z(fW|Pog>#ngRXQmEImEQ~wnqxd$br^bZ`)-d?Ae#=P+O#4_lz~jK(zT<1Esdp zJN7N3J-m{M6&C?p1uK_dMFu1^22l=OniB9bsnpZU5sn*yb4v6Vx)!bowZUn*TGoop zw9E^c&P3s4S+r$;{W^fJ&#p-czKmo2IWUdRPW8Q27MJeIS6CkXbXPuDbNs69$I7QH zzNf(LLa#VsT}5dVZ|RswtU&_rebrQpI%ggX;&`UIwLOwtnC%#4n=|Sw*6JbT1|}Ti zCGI5E>{KMIE1YBm|2!PQGO$bgGuhX;*k8Gpo&#U0kvYLs;_S8eRR%Cvtg;G=Wmt%+xpeO$uyIT6ohXSrW_#HYBO zQsu_P29z7SNkgZ^U(k(~+?ZB}m===(F&xPZwV%^$Pb6Rq6Q+Y5bLL!MRlS?V)eknY zlQZMcgcN122hk zz5PSA)1!8>G1}?Mgw1t&w|~RBIup-g^@(u%({tlUF4_GN1F27+363BDDX38woSoj$ zgCX(mydW1*6X)^Aof6n3OlFNlx|V9c>Zqx6sr$&v=Yk$)To^0tix&Nm%a*9$ee`cg z@3Sx2I=-j(KCEgDu-?O3Ff&$)z+P6a_mF+FDpA_zEc{dng>6RWD;a3b!1pl&iv!)Y z-VO9kGw93>{K3VVcG;wHSrre#Ky&jH<|+oYc4d4hX>{hejvMatJ4vwsw823CjB^9I z9DjVaqG{BbEs0=N!daxFEgkZ8XBqOxT*HpGCNsU<4z;+AKUtg5jGSUlt;|@sDTY%+ zNDC(FJI+8rVegO_j$CD$=YAVe;v`QU9jptruSM@H3NkkZb(h z%gus=$%$-s5KtZ0ibE2Q|Ax2h{sBI&%=RgI7axa|CAmx@Ctlhq0_tAjK>_6>33MR4VE^q85QA)Hg zNqw#cF|y@%o_Qs0*L|ej1-9;vT6_L_lXnvi^QoV(4cU5$^9_D+okRHbs>QzzMA5lY zLqs{zwHf{;9hv=t*euMIFzEA8M#L@GQc_sphZQc?l@Pwt>l&mA?On6#Fg;a=>As;o zK6(zRqA~YJVm}UTrCjk_I`!c*z6~XeZ-e{joMwpv4W2Xm?XP&>V|um9+{bhmp}4Gr zStX^H&2jxr9p<}ziMi~lL(P5(_}wC?*~kN{JzAa3ps+~X+5L}bY_ok2@&iph%nt*8 zzdn|7C8OdJRfkw=NL|sse^a+L-2d@-Dd)WG6K>e1(`HWos%Kdu;hgU^5b-g5#^Lvz zOJsg~cK<^HG1DjT87YC!NC|vCKHxs87j#B!)v>K7Q3kNLT@Vb#`jVkoPatIS_a2hS zM^$2lI61HMenQ{4Ei||dm1%Tc?@n8(nNOzTa1(r&1H2;3ulH3hx^SD&TvHbGhYg+P z%+KYDMK1i;tWD{@`+&>I9M7#q4Po!WPUi`}z(VtvJO1b<-FHumfvFnmMOq@ll3ozo zBtwoNlbyep@1=6D+n)$Br!0_sDKQVLHC~~$RuG3-loL=vgp|_42+UT#cjRGIjG;Wo zh8Ce-eIxpk=A{BSuGd4K{`yfgwsEnmy*{O!y0QJ(c3V6vl7Met%pz0Z*1BKSE;!i9 z*%YHtphi}*TgQnrn(kYNP9gQI{#K#!$m)TiRiTyf2VEJ$BZB;F?I~|9$Mjr#l~-oJy>B92q@GoKRmpcuo^y{|BW$VeCs(iK+PHD! zjIGyH&geMj1Glly`lN)Gtg0m{mt%6L|3;LR028Ta^|vaC>?45?W|qL3*MDEb-0lUYEKHvV-?`7AEt8F z&{7?~OE}I~t@m0=-b)K~xy##&N)IvZayK{rb~Q7>4cmt$=6r}h4m1CCU_`GuvY<=zJ%#L#+=G|)4uAi-l7(Azp{`%WY|JdKR2^d82{e5x&DVx1haK%rtP-OQD zM%GUyLeBc>^6AQ_HfiLb>M4`!v5=s(eKUf7l1W)4=zqR7Bo00h^ga_&eplgT<4vgK{w;Fp78b zG)MVtnCBV`{Nhvka^`h#Nh%j*@|O>8{vg68BLIHs8Ko7eunaOi`Q@rPV1 zXIlh=db_-NkAU_`tDajP+|tF)0#x2PO)1gAVJu*B86uL+LfG_d^dh6H0f7RrocI1rO12-nYmwU;UE30EWKBJFv<+RlHNR55LS4cjl z50jX-I4p05G3=w2$+4&pclw9(w_Ohf7n-x9ADmHRQB3mJScsGSl@`1tf0;!z$;S@t z0T=o65A1>RinkJF3eQmPr~H4)|JCye{y)P1KlZ=9z;B?G59MuZKUVcQDejmM8#C1# zb#haYS`fO4%t8h*kvc>$mq_19)X4;YDNS!+~NozGME-1fQ?p(O4|Kyusf&mAIF)O^R;e zc2>|*ms#3dPq~RqGLl~UVpDq6i_Q7(o7>VPqnpFG?4a0pZW49LzH^L8pwciR8S+)5 z?Qw`#s;R}9$a?)KWfE5_)~9-gRF7qvW>jK;) zw_Zt&qEbP)_p7K8_G0bUEYXS3x1GpjRR{JJk)%_+OrnC~0RAWXiz~a@*E+WzKWXx?$ohO75 zoty~mc4j{-XD%TTwJq(jZ7y33XMFAyEls4jdFT_B*u;IS z!)Csyy0lXPe%yRcZI4wY8ZmESRkK-&;T@51JTol~?Vyg?KpI{T3T`bA3&NJwRS|o= zW88ZQ0HfbL*7tl;cv<9<&G`@V5YM+ z`ZYj4ti6v_@u@G0bgY$R?R5urgD8V%-Qnm7XNLr^RtHf7nBbm8x`K@^hWPar zzczN;~s+j-!_{e7~!Lu-ay5jdm@uL;L zx7qSvGA+yL0skf)qvXI2(;QbmpT$HuAI+?NJ2ZvkhL)01Bd^jSD$)}?#iU@;rT#Uk5!l$6t|BSS+7Z)baN}Lxl7A#Ga)aXcOvyioixjf>))!{& zC4cluc3|Es9KN&yTC*1FJ`cG)N^=npPp;JZWOH>iw&_~B+AQ>w<(3j+|?^mV% z{hQ>UDolmzsYz=Mlk%7ORRjYN)^7o}N;>XmuypS0XqyxdFLiYIT*2@r1Sxol{*?kL z-adpIG4Auat6bh0+P`aMW=_I%Vdq2XYLgq`udI zz#dC)y5zz467v%{N`t%3hLU>;z|y2%yZ)M#VU8iGL&RUfn#UP{Do=N+1S`*_j2`mC zG~KU9z>CFfK_usrS4)+$TP2aso@u4`6)KvLycDhfa!+*22)6?)T%1hAlS@eMy{q>3 z{zu|d$q!Ij@7;C(eR0Rq z%FEL-(EIFRDsw2Gztk5%6Arg)uXkjKibDI@cskom&VDmMJw%FciYm++fmtEhZ;0zF z7u=X_r_1}~ov5C4@s&(552%0{Wwh!kUC@pgn1@iu7z|$FT ze7g9O8=($xi(Z>I(HfS-b$W!@V$QfCTCC5QX&_y5#h6=30fV6RyE-o zP-^%)`7AviSvO!owz@HL z4^;_JIjoKJxX})Sy9MLdJ8~4N4##IAon6W_>+f5}UqwI4+7q>{F~Aa6KobDIj%0*j zyrX9POtaDg1~^-q4N`W!Iv5Vp{HcTVVygzJje0al`gMb3Uzn556|$$0%}RA`mmU>n z#T|AkRCkY6x5%$fzpgs_VsY-I%>B1dIW&|nbfx^GcjSRme0ZqnsmoYh4S#DSj_y*& z3$vO5#^)3Xy!6MpY`lT8uB)l>?a{ttWHuftCYjBONp|&UAvUI5n6=5e6aAxy{d_&e zCa_14n^qbj?x2;=s+B|%%NJ>>yRPR-QeV)>zti`BR4KO5R@mjsbX_lhV!OI5F{gLu zsDRmmazLR`W59#KM}-7vh+)kDlC|K(R(e;D(46f29KjebBr8n0sv9(#+o?yRsb7bF zJ>@<_gE-Ci8PwYmKSHQ4hrwGD!e{{Q!XmgVtDHZp=YXT-(=jRBKmR1J5rMEFum%aa zD0lD!h@=)4l7v&%=NO--(%i>e1ZBd9QojyLJ>|X=3<5DBrGOuY$2kV2(?t*ZTc;^2&AOYtz6 zm?pWvDR!CZFVPfajBqLzf*;%H2)@#aS<3IJX%Mi=76eQ09cjY481e`B_b}>`Y~L92 zYo~ven4HVPQ7p`Qz;W^lRPw_Qs%t}3pswlHVM$Lp@r~YRRj-Z;Z8^W^O7CyUpT8$- zUTj_2{c2~W_vq|!T~9__B-!1{cN+%a5h{W+>n2k!8UvBW)|)c>+w=%gH)pb=qIB3g3igo3d#(EsQ693q>GK_q?rJPdV*_&L4$wsck_ z6>I?P#d{~a@xY)0O^@U@Nj9*-O&zd}DQ?jcN^-X;!3w4B+Fq4-U&h8g_4FTnS6k>gv~dcY;fS10Z(sJ*@vET`J*QB4XoP zkuttjiFn6^O0J)9Te4af$#Y*t)bDX#5*-3HPsO~`UDhANTZkO+94)1l!r~? zHAmIr2rNl9WG?oN#Ka*x=)5$G5l*M;;*V$@SCwv1?2c0P&gGj$+~w<&(WgvXn)EU| z8(w=<(|HJR==e}o0>)@_JOBQv%zdVIZp~i={zC83!KPHlHYJ(M%pg z0jJX;BcH^1{WLsb=y$=^)a^!5K0Ht@afuwI(n5)TAxtmd2HJcu`5WC7@k;AMNxM5# zxB9yOF7CRArE8wnD~t>M9v2ewbHaXK?4CNkN4Z{)18hRnnDyB0z1e;PVW}KGiJuu~ zEERym^ujE3o#J)nyZkWSE$@kn{Lt4&!Y?;fOrLbV0(nZldc8Yi+6@E|WB-J%_S=z* zo2sTkdH&%GS)J~r*7Cy^M9GPm!c7>Y0S&R*6I`+srL0oInD9cZi3Os&09|sLE+-994}5R>gp({Pq;62GSFG z`c$eNfAsT2h+qwlTvOmEwtDkQ)zjKj&E+iSDErmc_R%fq2pTv!suP-{b{&I9lUZXq zqrfK#%bltY7tQ%%+Q|yD;4kM3-eJvxVF&N9CIu$e@f!cwaJjAL_<2q5oJIgj$fumppRkl>Hsa4k(dt9GT5jHeWg}^o3`SR zNTZV|$kW10?OYq^;%c7F5yfcG)jR~{`h>yWt-YWJ#fXFX;@?FC zX0n+u;?t=Y^kbx?A7mM!=*;$!7;=(6^M*hb=65maU9*sqa3x`d@0%ccRffZ{e$bJo@bg)I9*`#ce4*}9d-BLm}4U3%Yr)&LshNZLggP|K3d z^v}S1*d7CYQ>6{7KcAYJE--~gD|k9}z-mceleJ(2r!%|nCxM|ko!KW)v3Q>LRuWWO z(#>pLwqZ%iL-dL0(jr@yHKHU`l>AC~-P38}l9WMJHH$#*x0Bl_Q1J^T9xSfrYH3W`5W z<5kJ#Y*q;fT~@UpTEex{)g(D?0>oR3?y947c98s>J>f4hla=!O?W$PPETPTJdeJ?9 zMjH;e%sw?}4)!YJymm5u!&C!Xkph<0&(+YU7W~TcDHPf4h8|@0B?i25U zaQYsk1ufC~bxX9KETS3Hu?vjl*)jl6uARTRwh|Q1DM8`95QSHUIlP}}{QHgrV(MA_ zwG*9s$h}U5{e2J9k~;%r<8VOTHash#GM?u+JYSu)!idp^RiES>ikHok$n0Y^Lyf_J zsd~i+u`=miy=MBJps7h%P2C-@N?>+(f zo!-Y^E)>q3y5it9e^VI0XSy?iloGG)^bXxd^Q?>I!bc$gNd5~c{cQ5Fc5%r!uViyu4zEUp{**?0^Y;Tq zef$4CPyE7$*Bxv9HM3HyQtrc#L z1cNq)u$8t$)c%MUYcBtOrJ8dr&NE!8P;KrC$O2=TeS%a@2rQ?(sor$VA+>y{%g56J zj3EHon8VDq1XcGhA6tdrcTx!i`6a|$=cOcm=!S%sD>P6=WdFXC=D85Cl!>P zi8~OYO&!XBWwUz$iz!-9X4`|S6wE`=B1%XZ?gN*67h_?dNF{8=)L6(z5&gI&48ZrR zEUG(czwPwV`Kf1B{j`K{^fYC#4h)^TmFy)G-S9g}{|o-49P|~c0sb0xmg)E>;jdb2 zmD|tCT8nC7zto`g&j`V(fyIB{*|Id6cpk=^q-@p)uUMQCCJz%KQbLwe5qd2;kzk&F@J-MPdw5~xQMBFQba87o= z0q?sWoUQ6gdZUB0wdP3!qcu;zZq3tEj$mh1@d>F`Om~|x|601bLgZnzn0i*DUX{Eh z+~|cH-i=nXlsc+ezgDv;NH{pc`=nauNuz4I>bz~eMgH*-S}z!BrJWl4S(Vh)kJd}) z)C<)W3&SCxu|!unjXBQj{)Y3J;ZP7LAggQLUr`D{uY?PX1L;MrYal zeWq{!G?NHz(x6+HUst28(dH5bza;Eaq_rcGe91nbff>`dSJJ@DzFLxO$zEBzSvEMf zeJn1MK0I7gqO{cZhLG*=q2dZ4!NMDgEIc#{RM`D~`JIBm>Ar3FkVV@^E#L**hdt=k za0i$wab&ngE%5Dg>x4JRNHImldrM}!zkcmT<3!_nweS2-<#_0&HQ4d+)2KKyh2z*Wg~A>L$~- z$h|iEnjEK>`K?V8A z%@pgWcFp4sscd!F@Gi|?9bZp16m?EanrFa}Uc7=&{Y#cwm%wJ*QV?3yp-qOTQ}8@e z4$mrsXH`Xbp1G z&H~fA{0;F(+I<|!c`JlzL;Svq-{S`Bx)9cNWw2^mPsZP!!29olcj4#C#&nax%blz9 zr;h3ND=XvhPCNb(Z=xnj6Hl)ckF5`FF&JDt+(WC13|CCW!;Y4^~Xt zOOoN{P99jApsPEl;HCsW5lk$`VI+gyFNv&mpTx=NZmCt_JiQ0>y7WHIpIq+Fm;CNK z{x7T5SlR@<>kj4~RYpm9$~b+D6;b@5W8zcK%R$b>LlXd*{_rTIHrzr?YJ)xd5@!;V zq%WXegwTZV=dG#{zj$}9ih`)#46sa+y)&YxKy@uBr%9zXuRpbnudh8CX0WJWW9fU9 z`SEF}?2Fvr=)**aj)?bjn40Kh^;nqmu`_b5@+Bbkf0DJ;nJxLMV`n*r$c>w zA^HB0H&oD|{=xO&t!PN1R%>0t5qZ7X;Y^|Xzh-mLVkz$IO%~3IT)6pJ@vh(&inL$mUXxN zV=~e-uIS5bt#|c81)AkJvzO8d&M_i};8u{52@;M6$=>@^SmV9!KR@19u3^`-O6O5_GAh(aiar$Ax( zk%#f8Qcy;14#&t8Y#=WRD6mU3-b7Ztw(9%djQHm2eqLpDI7;oLFa1t(PSdZ$RG{inbRy zP|Xl(P$?|wB-+*~vx&ejcoI%SeA3M#ecvhiW;9AAxspLBc`TOKyhuzb=hDm0$8kUg zH47*GP_tlg;=&PlW+$ApPRBqvcG-rbD$^0>h8yS-eAgDsQo-B3OD^BL822Fee8t|y zay;XEW=UguF-98q+>~D26g)Sl7o+fV-{+(k&k3IAr59sGsmms~n;X;1+rqacye$demh!eVe7l*qo5QzdydiU|c4}G9+j94Y zUuk;zir~33y}UDcUZqG-K0IsE%aLjQ((5R_E_}O#w>u00>!p|CfYAE%@(tFD4KiO5 z$t0fcyi+~xibIQZwQEy)al(q+=@;3aUcQ5@mT6OPd8K)uP$qoEj=YY>k^giatD8P9 znbFcdz6II^^Rd>hi0oEyO(=Y#W_hedq38LadvO@4InKV)h{O#^x@I)M(aFXMN_-+0NFA4Y>NEPip;aXkDDxtkYhrqEE^a*^pT=usz^L zb_&dWM{U}WS#@GZI>wy=5lp-sIcU&2-?a+sI0FaN#!?|kgqenw-pyL5Sd^wJRLk4% z6}1`&9}hsdZ@|dW=ZS*irV=O~I3X&1>wrAVNS6T;;L{dSIC5R;l{eBIbQZ8_* zyf_#>{;STz+@oPHl~2BPL?5P{hmrim@rN~>cTOFxrH|=pQx;xzhJS9nTz}+^lpv~5 zi8hC6HQ5bGV}^VP(Z&M#uo8Yv$tKdMU@!5{o5r7k*1Q)urxQ#!j-2|^F-YxV3|ZSv z^+HAju?itu9sE-nvSSFTMK2WSkcJqYGlLts1CpeIcR#T$z6kj$flr z)#<{Wi?d5(;0;w%XvXrVnm?X(PEYOKNVvp6{$SRkKkP)57RVD0i|XuL*Vg_1@Y&vH2p(*0hhc^y$M^LU8Ff(?#r3d$7-~?aJ3NQPVNjV(D8|k9;Jb zx=xjSLs_%W%DGVtGE00 zRmIA{LH~mq={}u#Ab2i+s}k?ZWL3PiV`3}ULQT|kkG1UAhb@HZ(eGD;F8m+v^$T#c zd%9sz@L5fArqZJmBhZ3#Tzv0Ub)K((3+ElYYmJS`d@mtUyDUo$U`dD3<^#sG7 z8MTZbp}z~ByQ8F$Vs&o*B0ub!B0r3tU49UIH8%M_s2Z67m&+xm_F?w9&bv|dr=GP|xP4%$ixgmaEy^w9H^h{$l(!+X-=ntH{RgQc zfetDFH5j_fjmg+~yUA$|&Z^JB;MD=SZ^r))Tc>Mn4X@^c%en0#AeHy1XeZ%kH*Zp_ za?+@GoMI+sKWHHw=ILUEYE9@V_{W;C2V|!OTf99WsFc|66)=ynZ z$%6I^hM46d-K&o!splP#0#z4q6oqsvFrOJ|YBxC_R-4btZ@yi)XS(TID-W0BCzI^| z_*==O?wpNlH5~&-;-a&$Tz^?r`CC=VG<(eqDSc%^m(o|iPU)+s-2LkLqe!aj=$)bX6!?@JLL}yqZdVR^Kbt3;BPJzI< znpxhP=vSj{P^3N#;N&&3AjZ%BNh9-H81o#jW ziXQ|V?{eluAg@Z_())@Q8M=*Wnwgr%k?I^$tJUY`JNpk*@s3|y^DOAm{$u^F$^3$7 z4ZUhu|CGfp8?YC#m1Fi@=px(k;6>R6f)`~Q3|^G&RPdr~r-K(|8wy^OO){$fS)-nN z7TWrEjRY^sCS>ZLWvdNdl&vm!Q8v4HFUV&1?&(F@8iQ<((FB}v3V&t4W!Ne5N0a33 z`Y+Zh^D0o90hDlQdM-_~wscqWL}s_1A%LkaM~q^-#^W6P*7zS}{deRGh(Y?=+%A+S z@m&OE2<*#K_*rz%VH%DV#4sBDG|cjj3o&bM&`8zBeeX52YilNfJ+-EmgB7zW!{f znnv+uXG_(*GBy?((tQ5)Ut=HnL!_ZH`QSr;uMZXEgE_=6Abf*q6i_l3B`PlTnIa!( zcex9Us=$GxJcK?vpO%sV?&0>B{q3id9mY{$#J{YPrH_j?Sp$bNo!diObP`?d zs8sO{=2fayew3l}i0q+@@!ZXpTIDM=gu>B|sWhhR>}?M31&{ z74eOf6JHw(7V`PIiEp?v@fGRsdflPwD_^3Hry?tNptg zf|ritsi(9MR3$JB9nb96vjojC9Rve)+<3-JWzdUlw?i;t(G3FFFIum1gWR} zckVpG%s*s&M<-r&!|YzA6;3DsMi1nFe7Y(X0h`bm90p2sT7Q;Hs3lv+@!ms%ggmFI zMMnuAV81{Ri#e9>>HssEfkWk(Ap*ffZ33=i0O#izO7$$1dQ|N?3EOdFB6!y61z^G8 z{d$jnZJ(Ow=#f}hbk9e4Aw6}#&=cL$qIV&}FcjVMTmJhoh2Q(SKGJIIZsm^dj_9?0 z1SpT2tI%_W1VbH(_I*{) z)W1)8)4Hvl3x)^%yGvy@8Zfibfa>E;ZG&vfLPZ{K!Q7?m$M3GKLe;`%bWkfrXI*Po z-4<@A9YnXJin|AE_NiaQF3x}5P<1N3S2Sfc4$d`NvF?brf{%jci%$u=XI|%9dbeoJ zP499^w?y6z&X1Ptcab$uU}OknP1|~*%ayrf+&eE4R9Ut*s7B*=zJ4Kf!022DzyK$w z17H$=_o)vH4sJ{@VFM%eJF>Apr4DK>!I-j)@Z{mwOqFpdx1IEJvI&>j+MI}dj5K5j zuVkJ^Rz0y{GRy67o#|5URsF4dg{RHf`0U$W8#hbIOXur=0Kl4FM@uUC@k2*fQ;~IIC00p>Q$-cIvUduxG)g9IO zyY$`Z4f7p6*Lgo1o8WrY(d1&+X762*O}MmezRrQ1v2M#d!XQld3PSeTWp2XAj%)SV zheuiDNnw3X->cW$Z=@%ZkT&+OB+^fZ;J#K4>DAi-~L| zM~FV%+N7yRpr$AE$h0I-(*ZpqK{aIhp7Aq`uqiQ>t-E@t61E+^l}J#&{KR@c8cOBb z4OPWY+ZK+Qwl`H?Q*&tCJ2^nduS=tjg8VMErPw zp(h`482TDXNUW)+BtKfl%k_pupmwTI9zB<2(PBi+6Ij!bT zH(DD)jKqjC#F*47A*%vnTqgv3u@gFh8lPwS1BUsRUvZsKNP6ppxS8ujZ7|GY@RK|7 zo{~mq@=A;O#*>!faNi zAV|O+4%4EJ1(wWgzOwdf`>(!d$mNIn(eiC0Hk9C*go!sn3 zg6UB!Rw*_xOsB0(F*BYpF}b+N*O&kb+5JnYjCDt#cqWz*$}pSlq~0bs}@BRnZ7um1>Tev?WQxo?lr2#T6EWmxw@C=tF@@x#aJZ`x_SC) zFl+q_U{-v0$0{d#>-F>G(^D#C(}e9?H(dl zDM}(15`ryoDvL!J%LvSo`ZV(F?@iH!OBqaNBHJ#GaU84-uIy?j)+mhH#ruQU&nus2B_l@DO*^>xucca}r$a@DEv zo1%UDsSjGfk*YTJYu@|xE^1shgZ#<6WX$kRdz> zA0!`jMpEM+PR@0CE=v7+oq1)Yyo-c|)S-(+;9P#S();|iCRA}}9TKl68JJ`UQjPVv zG<7KSr3mGBv-g<2@xVbKtxDXa=ySq_qBEZY7tohJ*Q@dv zUd~w@X9wGASBhBC`l?2*+$rA=<1%IQMF)I(mcAyGm&O3h90i($b@{Ii*{+zdF2SzY zUz8I!IK7$Ht+CFY>B_n9nEC}3j`Z#vf$bkmu%e7q?c_|$h)<5=`6YQpi_)PRMR3){ z=|kG#P&_=$?Vn|2D)t@{vqaD8R~X&1(HuDx8BLTCDp$qI;fce9P1%A$cdQ0Ym-Go< zrfX?ycOAiS+dYLGN_;S0m4ZN(uxO>XkVVwR-)xAFm<;4)mM!Y?nu70Akd9Ad8sy)O z{6?&+WNkjGLpszwT!Yj;oKIWKANGX-BhyBeA@3OSev9p?Nkw?4UnV?F#-~O0vNd+H zb~hZKMaFOZ2mq;_jnW7x7L7-Tb><_w=S#3MIIKQIci%6*CSHM-;b>}mTUDY3l|kyz zB7i!YS<fHMcdha-zdP=f1>F?3I^2gl!<@{vZkK?1yT(Y)zt0rCl5Z#lbNEU7(Qttt=5@3#I z_NwZ_2_J&)Q|Tr1q<7yw@9t>d7bzkB;>}hS!PJy*L8Ij}2> zrq)1e=RnntVAPr%gs58vY=Rkd^UuDvu&^|#5!Qj8Ce!*dXkt%b-&#N&>sn}*o5N40 z$&PX6hf-K|Uax)I#l0`=q5=?DM_{sIOwrVO=B2me-y;*q@D9 zoTH#KQzvhczb-`o><33QCFQv4itf3oM$=bb^1scK&&MoI`L&wWTe+%Bp;eC?Z#-Ta z3eov_!IwrweZ4#FC%WeZ6JH8;$A=Ub$mc^+^Quv)+U-uT=zU)#ZxG>M6lZE7qo>Ft#_Z!R4YdGnCk9tALOq^^By#9?V!@z2V1MRpg)P>kZOMagR-=( z7^s~KScr1gZE$d^hV?CY@35jPUT_yXjnR2U%=+IDVQagmtFyehwk{6W*iCJ*8kFeX zpI=;tom+n52Es>Hn|syH1!3~y`~`G)p8J;jTfhc^wKjm4`Q>gi?6DS<4B!XC0mNx# zAX7cJo%EQ3JbI~DYhe<@D7>I6yjp6zyz|Qe`qnEBpqq>qnx&cFdL<=WyX&`c@WG>; zj0!{}9zaSj8RtG%(AxIWbzf% zQU^>0lpxTaRv{+0-peMp@qn_)J!%KWg2^2SeI@%P=gJQ~d;O=`upqEk$0SwAXJnx` z7yn4@?_CtUFcko`Y}-^)AO0g&UOpmL-uDC1Gd-{92eR`=v|PILF6lp_2HXpFh2&&= z`v3I(7N4B#Z}+o5p*hzJA0d8w@as{OEMCV!$vUn%*z$x6X+_-X?Hf#F8BN_44fm#D5syh6cU5NzwI zsZU)EyM26$5~y#32_t=9V6fZ@kGK#jdw%vWqUVy36&)iWGd`CFy_2N1v`-|W@t?xG zy(8{5c|p(l-jh}g#yILV0*BfOS{*e>deoPsEoRYZzxBY##ZJ<6j~{v!4fSaHeo>Cw zw+BSy<6Gx-jhT*T?ApQBeaafBwH^}XX|wUL9<YK;^c#9k)0YOI`@DFO+k#4 zCjSKzrc?+{q|E&X0ss}3ayG2AA!kGK6Q3Ss5!DK*0MT+NkjY>)byyw+MFVlNg1({e zWl_>G=^KujzM=hCZnw!CV_LGV^fr*e0&ZKRm@Nfoc|#WpP?%A-I>O8!k8YAgQO}wTZ3XvfsAGodt}Pz zz@Dr!#fk!r&_2FuC@^_xD3oa>dulaed+Jauug!lV-`2Zx0FmS%_s6TV%523H&mb^g z8x#za67??}O_Q8hVGoP7qIUA@itf46IKJO2SRJ!Qp`9BMq5u&u68yO{F9H^GE>?;C@yHXDCHOP*q?_Ua->bcGTbni0v+TU9rfG>xKhTuiS z*ciP07r0M|HTnikrcNYnF*nPZZ#jRNNF5M}=H0?io?8nrR$C`Hmb|=K)-0^V`j9%< zMq;|x67^99b%Uus>e;mu2pPu7+#jFc$I~4TXWAc59k3af;2hY)neK-(HUV3W(gUlx z*`i6c1%Z=5rZ0S~vu9bh<8kOwnwp1wEmYvKQE6U`{Xi4)AKenBcz$wF?l@-XH^A$-_X0$-3-Kq6F6qCpdPO` zTNH1~4iYYVT?sCd2c2h{j^;m`zl$mq>2`~&LalipvMQXXTuBw<-tYZ~swllzVkEyX zk1S8);)7nTl{AA=qNL=QH}j-QIwPfP+$#}M4IKym`<71+wY1kIFXVtwr}qb_#n!I9 z{Rn5GoExWQT1|u;{IsGRf{A4=;>w%q!im&#wXMm>=8-%6jPYHxKx`Tg&aC~)>8mcT z`N}E&P@=l+NUDj!D5>w(1qWB(*3uqHzN=;WagKI44* z`$y>^+5ti>eTb(GnG1oiDzmoMk*Xx9xGpA)-G!4sk(J_;Rm$;e?&~C z!}{_7_4ZVM5-ITfo~yhMa~WK|C4Tx6&KV8zr+>QAX{5@V0jpfQRu-hYd5RAx%YFRu zYACZdeWNliczJEh?U7_1&CFUsgDvmy_?l>p>&N?)5J^LzHFjGeSx0aQJ{PRJ`E6xz z_DpktzH0ELxPa;cpnFsm&Qa`V4{mqtN+*+7b z1#qcrl%XnhjY?Fl?WtPrdPIl7i9lR%u!rKdFP{l?(FiiSnJlV)yXe4F-$8h$>HdpuY+)Qb5u=~<`_gsaqs)& zEwAA;HGH&k4Sz@tfKMe1zA6y}-ghq(lPd+{6jjtsslw5gq-ufFrw~=tB!$50)vD(U z)Prg`=*b|J9KjX2*b{6y6Vt=&I#E-SeSqu_lxGi+Hji?cqg^uuUn#b6oI;;0FVvEZ z=nA7qO|)+pWhixw9@~6D=Fr*)GF9o?<|Eh2uGd$U&snj; zHLUYU1jT*J7%V2A?O=i@Kl`HI~5pcLOiIdL(mr!AZgE zmB3rLW}*ZK;-;<#g=>aOo(F?xgQa(5fawz+>7L*QAJCl6p4Q*}r}XzrgZldoSM^CYO~i-yUyuX&W+~6D`qy6tnN)e-q&TV`jh^*6~2TVG3FD0a+c^!c@| zuO+7QvWb~sZzP&qkL;Yi_evg@?=w(oxFLdz@x|nobT-W*rT})2y;&1z1ygjn@rVrnGoA<(d11J;k zZhda&yB0jZF&&-KOKaR)7dHFJPq3)d%iFwr!}7_4soxZm-#%wAb$lMcOMBTx2kKVe zwxE#SInnxKELmb09g)`WCTF(njJZ`Lf4&~~>?WyYXMOU#mYogB?fL2aBtFx!vr!+K zlE1GHO^Nj_JDZcMTXxP#uHMzUE;(!0XQ!=8Mt6O-`ljUhyFOd9E?JX0!jaFm%xk+o zgg?--n_K(0{l~5k-H=?+`dz8NV>MCJ5B5~ws)fRPiY0?#%-%6A-=JFm7S1LKAom0Q zP^1P8`8#*k?P{&cyp~uK{nm_5@BX*BmA&TX{H6EKSoFTcg^SiD&R_Iit&w&4n(XJM z-Avobm--5ccU#D|cVznK9%*TBh<<(-m3Gpw$k6+cYdZ5|i)g`uUh|xosjdoK-g;#7 z&1MO_OeLGPE?23hLbB1TbEQ%{n|+=3++$>yML{_FQ_$ZTgp< z@6F~D!=8CA|DKke6Ul$;xq2ATz0yFWhP(=F7pvZ3-r# z=DeGP&$0-)S)n=Da(gWCayZ3Sduy+J2Max3lu5>5J+*rq@;}TBEWA8XyX2PS zcaKhJV1B^pb`T z@aj-KKWO;vG<@RT8GEZ~>`1Y(w|ft%sNdM33XP#*3EHC%FCpr|J}>bzw!Tz^;ns2( zt`A}Oo?!S+qRtR-dH(yE!wVY{wQW8EQm+@1QLs?gCM;YH7V__C{m#})!cTR#B&HWS z>XSbctFPYM0Fru{FqDEqdph^7t1hg`DN4lN%f0Wijq*E_OY*5Wo<8N=rb;vv<=uF# z*p2&CMR5#2&8tJ@_f)iY@0Ix%uwH-&J)RICndj)h1$1Bu9k@~*czgI-0r*TA@G}5@ zyMVvayQBzwes>Y_)ne=meid-?GMaZR`T6mH=06EXZb_EX{B7R9&v7*W+|E}*zCKt+ z_D>ZX%VGd6lKqYfWDhlnQMdj8l-(X_{qeRdy|uJ&D6^^V-Qd8!mn*3Gkj}y7*lQXz}b@AexZ{7(1sQGB}XA2I(H~x{#UbU+ADf7`H zh@!{I5d7dw83YG-wLz;0!CBgTNp1d-D)QU>`(m5n`lOX727ocd1Ai7ge}s;lXR8$~ zprag;_Xd#UzX#P&Ix(~L2M!xG`I9)IA3?)*$Htb0iSufnD|AdG$KZ{LAtRAXqfcJI zEy^{|)qH;=Ys~wUJd&S7C0iTIlP)01O_Kj30HKA|c!Vch61;x(8s zz+wYGBj2w%<9B>U{yYA(sdwFIYg@8JJ$x6#pMPihx4MtIj^&CSLqO=$U9yw=^)dQ& zhxKcQ_Z-TQpkEvKRvb$4Z6lw4B%_^?ZB5>vEAORi4gAb6(skZle6TL$a;ys2ITyU# zQ+)>jHbtL2Uw}4b{so~b`gu7=gXx|dYMxtbBPFxHr3+iZ~j?3~f`+SRE__>-FRXC5!52*`q z)8EJxoVzjg>-Q#_Eax>n@BO%%dCo66Yf?#N+N$VLnu^oBN5+Jq+;kyQKm|hX{6iLt4I5MURIf{3%unr2$qV?IA-Sv{NZK-IHnv=uIB(g_ zH@6V^T%5IH!nBg?Cq{})7Fovq={#L?n*lG>23v!s>)nTj@I#~f&=h`P6Qd$? z{14v$!br!ODpAeE7DTn}d~$PmUd!zzqS}?KgAV+&i8h=gm8j<0HUjd6wd10lRn4)? z(&qZiispvym7QH(@v);bYBm&pn?Crv(4*<4&2<~n*XRpb=V#W`k$c{Pw`Vp*Qg6JG zXr+$pQ@?&AQQP{1C1BXE_LWJU&f2oe$S}zeId{N&>lFYG*^3 zk8k*6XJ}XH9{hQs(4C1l6gEW)n_`7c$lOc{ zJQHrWJai*neE@m7>PR=$)Mb9F@R`QKXBrBhnd8m!GvW~1z52FWGaQ3i@bZF_3x2hr zP&n}kt;U&GGr!0j>Y3)<0*IFSJn4nPPrEZCAW4pI@&EOYGitiLS=Uxo*?QHTxwE-$ zWmh55T<<+$yRGsFT*jVLBN$}r*f!O#&TOe$F#op93>~h@AiHJNUNE~cExHG<+wsgP?HXU)wUhX0O_>?m zGoK5FG5RZ0sqg2R|0lreT_{y^^0!hq4oN?mXo~CCYqJeaE!2jyS*&LoPPO`u&n7(A z`xQVop|}gt0zv)d_FmL z=C#ZywKtH1sdnb4H77P-)Jnc>b(_y?UD_PkI_+Z|$9nFL(l&2ZR=+vTP&B$UBQSp< zRa3sxnv2m~L|-R0cTAnx$Df$r7S{;UCKA#hkonV=(i62`YI{7#*grjIqdX6g=-!P^*)7b9t@s)>f>!6M1%GZ(CwF{!A6~# z8h85O!mJ%+Tbu799`sf0^wy?+Zz9a}Wofk37AT(QA0}`?4n=`1~o(m17&oA1W~EdmeOg;+ftYT+$E53XVzRUvkfiT;uc%1 z*ro5XyR_v`v|J*8`l3sf*1)FSJ5Js-m3`j32V^o-XYNY3+?Cfw&v* z3nJ-q>bPBoYsO1=fWUV6cXk?`;-^jNdS`T)UqG?;81A&k4LZ(N=l$f#$QKVeYXOif zps%h7B=J|-3!-Sb%p02VvoL(*Wn(lTw5kW~as21K2;-WSI?Y{O4?e0WNnPI1z~h({ zqG$U5EUPdR~5}w9C)U2l2D}>!VEk7(v(5 zXXMxObT59BLGRQ3{FY1EyGBjLJN2(mG4km?sPel;oyK#F$JNm_>I~k1b!suz6Q{v$ zJjK@Qi8FZRnU$I7YNRwlCo;46%6!&ohU~;S2(j1ue1s=CBYl|)a+aeniv0Z^4kKSA z@c@lEp@>NOo-5KDlD85eZvltAk>vP=JF`4K>T_-RPkXCV=Iy)p_^LtR2aI1tXJ}jCPyc4jvVzg+Y1`b{ zkk|ORxel4{Ms92rh!$F#^>Ju6etzIC^FbC1%it}isLB!uTTB1coDv_U!P*rpGkA4h zJXjX>X#b<6{M}$#(~01jDbb>a!V|$?-n4A#iFu>We4^p1pZ+E8wmtL9vWhxzu@l!I zw|2Y)8q7yx;C46Df8OYZNhgY2%S5C9s96K^to%uU12VZ*i#CQWp79n~&k{1Q{;EIv z<1|s#KP+}3(DAvoalCOGVA!(W((yx16DC#Uv{(PrW>Yr+d^7-pw@Eat>cs~iY@7n^ z+SM$WTdUA<|LWJm(UJh}N&bs~0y>VznNtj&NE(jxA6q^hri;Pb2KTic5D zL$axJNVa(naj!-{#I2f^zr0TXW0h7|AkKf z;U><1t=BK^hs0s$mpjJz561(u5Z-BGyN4xf8LvN1NxPxwp{is4$Csj*Y(-+mo1@)Y zlKny5`CU;R?Lmayb#^XwGqRyp%`A^D)J$wV!ah7YrM5OY5nuj<3(;DVpz@{)op(>_ zU2IOO@PgDkcyE?8O~9tqTTWDA>gRZGI{$GT1S`_IJXI&G5s({H{mCCXDLwB!$@Znb zix5L%zua+^|Am*Z-r}k-iHaji4O9v=L`t19qEzWvF;sj*B}wK^8K+X}=+Vk(18Ue)_Rs^57pPxaz` zn|sbDW7lB+V`gmp-F7AbCiNmB=gg3(TP5llf;GDZZP~}DmHzl1{(i|H-^Jgr`s1zq zjX~V!??!*TiNDMI@s0S^1;6}5_tL=4L2|x4G|b zk+67&KVFL>E|YF4(xt9J9C0GE(*N~Im{tDx7xC0G_xr#82aGVr(1>$?&pGOQ#$VcR`JEdrY^Nyor^Sfyw`BiOF`0Nak0#u^W_!tX^N z_8;+rk1h0X-Hs7Zy(Q}Uk90;q0iRht@4YrR{;EIz6~r2Ey!RU4KZkey5c~V8sVCXj zR1<2@kMdPTq`r!Prfb--Bt|rzb zHYG*I10JZYQr|+gvGGmkzZmKXYWc)Y*Ps)85#dL{h*^eUaFrb5k0hD`@a+@UZ)SZxPx2LxxUPm$N zx^N7JE5)l(e?Z#{f8uXhaF=IadGs39^nGCG{6D>CDD5G#KaswAUp2ZLbw7c1>ot`` z)mj~$T=mA5Yc_%YuNx2f^flLeZ|1scA#5uk`KFPH70!4|JIcXwHNr18Uu00P)r4BU zCq!fT02^J!FUCgSAYKQOu|FD;DJyg!(XnMTqoX&2KSxnGa}LJj-=K)qI;U&rXX{UL zkd2J-=H}7vB%#?d?%wp#WblubC+1rX0~{>74H@9*XMrO{#w$&;r$?7&lR`4&d7@x? zb^6W)s}MfAx*8^0gOxIfuV&Iyg~sHjk{Z`^(SoK~a9qK(e^O~xMcPr)1%P}Nx~{Mv zu)g&N5G!z=Lk-o<>C$}#_D5y9cwb?3yovz1!&5%X4@=12R@=1oO0rADI$sXbo zkxYvJn947@Im<0;A>GLyT0F zByq*mHLT|-bGsgl9ZKJzC0TtoU78iP%aFma+LZnypE?+n)Ctpun7v9f)VC44alI`C z>G4T8pbwkZLq#BhT-0N{n07Z@T=vMrj(lG0d$*H<;6@07w`tX$i_ZbZu8m_2?<)Nk z%~j|>@=6+~qRXj4e0f#X%dr52jEKeBcr<_Z#cWZ&Yz7JN0VA_{@={1o>;}ZcUFf`a zS57>9G+&r|_ii6Vw+u$%Zy+2NL8D(#l%7LDa`Puq27DJxM;XS8=3MqJ5??vD89~q|~?Uj7}^6ZdjJDiyXOB7D1{!S){=WY2+b@BM62F5`Tm+ z$rSk?-+*!;i~Qs_lttJlbT+>`sRx0+t&~M-DT~akJQl40%T*!^+Kq@E z)5hefDR|YAeD$P0=$J zNeWSfL8(rJz&j0IDLNdnL=lPlKBDxa>{sgBcCk}N6w6qDa+4G*5J;_&0{Na_pp;UN zD0V!vAX=woBGGCs193#lKpeRpQL0NKj#T0kyK}2!)cAXxP@kn%e3($ z$R|&#H%KVoRBw<`boB;?c?;h3qeKqSI6RYrYsT-p5~uLR16meq$m%PSHM2)`&`>IjYAX2d)h1UuK)w5-2l8GTi>WKk7Em7knUj4~0q42H* z;Vz;^CqCaxu)|8!IELa>LFK8#c+bVfimY%$Dj>xj^;5zL`1G!nP_B^5cz8&ElJ)xI zJ3$N*Z$ZLPt3Ly^XE-ZyV-7zOS^wYdN1AP;DU^K=Z%~MV;MuZV!TkBz1k=wx%IBtk zPi;mTkwxZaQE(fyJ3e2a~tRP;XV4P7IFIa)Lsy_ z6A7Aexw2TypT`SUWC9QE*hs2(+?VKR^n)WtSh{GHE|K~0)eo_8ss8|XFVjHP1I_Q} zAfyZvQL2zmLG*GW%5{jfMU?S)ho%BgiYRP-suAVuN2MbYky?#_JjmuaWr!$Y#EFO! z1A_SDpaC>xZ;e?G&9{Mv-&X7^h%CeX*pKy?sd~!36FWd6TUWD562_dWGlLQMA5k(pb zXy`&D)O?9PA|lF(rdiXY_h*wFD>Y(@lALf&PtOsWq_iHn_#9zQkGXG^2H^yfOd=cm zW2FrEs~J@bxNj5*`D7h>ZwTQ7xGR->;%T@!Jr1IYr=c=E8d6C~LpiK$k{rse1ff8P z8HalCRw-1Y@(@GyL+t53kxWkG4eAm+mqId`B<4+!Oqk4gQbn>j5GkfHKY|2mEWHnk zY(khoHo1Q(WfMvAnurzP@=qbk729M8w4g;_YY2GM@&QF7qJNYux87eEMf>^AclM&5kzhgLFBIWH!1#k##^$NV6m>+&jBY9L{d9|6iLrr*jm1lH1chT zeluQzf&kLUi#TDnN?)}3Vk7n(`ZnE%eT93g{=6O+$Bs(}DU!eeNN-DN7S7qnQ?9w+ z)KQ0$N^Vpl3*+s`)lMYN{`!>6@~CYIeSh6gTA&9@7h5m1I?zAu)$jJ`U-s44g_k|} znFk++MM}0u2`1SoEm$_y4qbLiJny~9ewTfvI!XmlLoGunx?{}uJ-BZxw~8ohbW!#0 z((d(@%N_%!4JMg$aNts01p<5vE}S_DIP9Q&B6Jb#$Z02QoZdX_EfE=Qs1 zf%oS7yeRU4=wrrwuW@Ixwm=_e+*?|iSy1(7{a(-J2@hb~3nec?$rv!6Tn+-X*xrjy zrkTnlW8w-#8Qog%^hBbLk#Z}2$(J$p0M_dBH#c0Xm|Furt%uZpTj9%nV15CMzDW@~#UMJ zB?I%zT+Wp9n6lhSSuH6Un4fYPQ%+;bnNG?{l9GWcWxGIW2~$RxGVG-62UnM!!a$Ys zFOo9MlxvuBrIYfQq-3B%02~%dAlxrm= z1M|zA#*{0V()YNHOSO`cfhy$-f=g4Gaye6$IVnFZDH*6zsxhiy$}m$-b5hbcFFS>S z`DK!nR11ba=oNvph_7P$d@ps zk11C(rHm#ItK%r6o${#w(twK_O-DH(fw#46$N9~P(?JMdl%iz)ko9)PTlZ~T1jQ9~ zcuC*&ubwwNE$(1o+oanAvC{Z!(ZIH)1-FL_V!rwFtE=O$#eM_Bfl-q?w9^nK8b>7` z%ce(dE=oRFQ1$1==c@kvNMlhucnf$ahF#(+!&CbxjwR<`b4w$2WBwfXiRksXjM-OJ z8(lZaSkk>Q@mh48F|T_Qj5PFuq~}%=-hfsPeJCy|&G$PaHqJPM6{hwqikmIG@XP&x z`CTwF#z5lT=qzJ?g}Wj8xy4`>UZ!L0kb8*pZE?IkEdDz|MX1QwgkP~0=JL1AR8{Yy$+Cdce#H)46-oz zz0vUeiJ9i>F<1!4ekK;o0d?G)MyCL3a?YQ&BgO3NW1oUmn{gXQH~WTh8oaq5cF<#E zVd@4Pk{>xsB&6|B4i^GMPFHp=F07rDq(g=f` zyhUI(m`|m|wl2EQGHzok^D_{l=p(WYf#KA>cnYdDY_#vfw4L(ig;*nNhk#W%R;CUO z=LcD?eq>N`WYHdkU!%F`nENx?-i9rzE|lZ=e6FKYqce>RLcWMUdXWaI*W*1@NJhb*z#Cx7h}7uRh@R$7rPL6G#}Y%w$5_+ z-LP?)eMdH5oi;DaPvF3QnLR_9cDfDzW%h8v60jVDE`!PQ+j;MF>tKg(&wH=MdwU$z zCXP09ZGf<(tla~;3}hVl^*=9791>Gr8WN6#UmGkm7#%G&+GJ&2M^6~Z5GJl78W>i z4d5Q?^>ky)cBMy?+K9s(IJ;XLz&wC|7jT+ZJfxXd&nh=0pfcvGxPKL#D6f&CdC)2y z4p3l04exLxyhuv>>qwvE0%Ulw<)tUNE1=+N888GtimK@3Z4*qQhv26tHi0)W!0!{v zUNRT=7pIHT>O$J#m00lc;_R1l7Kb+Gys(>%fM#AN#MP9d`U^xiC+*$61-D4<2r%F(@h`T_z%L&l8E}TqzryzGAhKstq z&1do2(R`lI*iEqSZa#-L{Z7X<8^HmNA~u@3b;u~eUQ*L^V{@aI_B3lhgqI_5KCmHx z6zwX-e*B~#MnnJ#pS5G~@_oFlzZx%@k6U>@UTNjot@5A>SNfw?o0_5+@Kf7a3_OOM zYQhT~(!v2Ss%Ju{BXr+ZC?`m0qYj_M`gpklp$eiPq<4~h7~IoAB6hsws$`N}1OasH z6=UGGOS~YWH}KKK3Qbi97ORhAaADK|rV|$K&V5=YaHAjINy{-&KwhO1@%iFUyp61I z{HhAzg-PGXt9D1(HL$by$DhDQ(z?hA#}crTnJ9pfFz??Y7l6U(_8D=|-3uq7QgZ`j z^fPn=2{&(x&2NB;q_2a$H2p(HHUctE^US{onF5Z|`6YZx!nte*+((^+<5)SSRR6LT z?BRranG-J9QyDx7{SLg*hK|FHV|uD{i%G`uR7MY{bPx&V3->%b9RF0S z^NS+OGf71EaJ(flN)nL&2R8boT|on zT%3aYjd7z)$j4h^0=OIn7Z<^&SJ}EbIa`aa(!;O{a&HZt+3yx>T{>s@6+Jk7+2|$&LH>9uo(qX zB2wM{#%o+?l0Hjc2p7`oeU83xj(T5Z)K;(37gjr8HTbG=zUJX;p7S*yU-O->T71XuB3qk?E^6TFqIzo_pBCZ6 zbzUIH9i;z2$G|$kc!(vP7IKxBuyaIYEuA*8Ds zw1opZ)HT;9Z$ja1e!;;{m0$MB;h7emNa@iJ9^vRibBOmQ3>jl^HAGE7E{4coAnf%; z`K#1A=;#Zs`uwj9guFRkLy5RE=tO zFw<3?-|UgVv)d2zc~3*H5hPW(#~9Nkyfe*lg15^>7qhg6q4`XpAHp z`c45n8PoINCV1e1OVxnkX@=9Y49+*}o>%lGuXxg@0T3BM+Y_xCLN&h?{JLBxzrpo_ zsKD9G5%JNsfa4d?YcQt~Rif9GNK~m_TPjgydJQHoqRREUa*3+YYvGz3xu)thn6ntY z=^VYTxie)DImEL##9cLWoRO}UD5jm~B&wA+;=u~ObycsF049n^z+5UL>87u%W{m{Y zL?wV(HcCMCCJ8{6W}>ltAh~$YlMi_7yaxbAE6wl1Ek?r{x;PvfwF{A9GYAO}d=R_P zOckEwP&injm`7(OjD#o3yB^6&FR>!Q9sW?A`3U^N6F`^;`Tl90`|Ab%`R>|=`Fqng z*1B+Hjga7KRg|N;}IuASTmLW^@q0A z2U_YD;l=zY`VE?Lnd$vO>MwKZhab9HU@xw`+i^tkk5Z_`k_&(Y-x{)!jj3_&l}{0z zVXc3eWdlMB_LWaFP!H{vi%JMCocTj@aqi3w;urKyIHrT6p%d-hMxA#tu8%d3Kpk&U zHY2#3r;uyQ*4@zXRr8g{#ce0zh-OU6tp?mXk~;22(e=BHnld!F2e3O0*zw+x-Npj1 zx!z#DGvq7$@psW4J3ivw3Ab$Ui^#fJ7f$6}U58TO$m}>6r5xkS%D#)rtYTs}G2lBT z*y8Sp2KfG?U&C2vXm{1zvUT8`&JfvEH3@GZC%3cO^2XdREW(kM$L}W(RxM*X9pjWXTn(DeVd#(e(uMAxf-)iWtIVeMyI)>39FMk>A-qqq@cl1uJ@uUliB-}Mx-@6WMWUpNP z)>CILl!k-&^WKXdltcfQyvBk^Z!XCz;~~^h6)KJ5&a)o9exDKC7d8ifB;B@iMO;_F zK`bX{;BzytyC2DLxc1^gXAASXf_u=Pd~|b5l08@-S6avHNWU(*1T1fTv#y3#gwCc( z*80B$s@yG8&14yy!04LQ!+&q{rkwhaxkwy>g zH|qBrg;l`=FAO5+k>JP@sBC`}F0-p<>1eAZS&>-J|f^^}nQ11~MBV=_FV4MEd zzT?o}=Kj3^?Ik3bjD|n{pE4JrhuGfSxcv`6?hVtd7k~U-#NmVbSXk7c419FRM+-hu z>c*Gtl!0*5EW!~D-44unE!WBL-3Mt1moi)>3t396?r}F5FNcWql1AJM*;~n+C{W3q zfEQgso8~v*tX2=UQ0!!NprtK(sNX^&x%grrRe`!u!-#rDqi8HED5az>vJ4F~e}j9! zK%S5pU&ztxQb)Bhz09kiD$s**)K{Jzj9@#*)_4+2QvB?$vJf3cJ z^ME9`Dk}A$qDHCcG;*V5sOU7dre*X(r_CSY_^zJV1bUjjs!M*QI(fq?;?#HsHKsqu ztJSD%k%JTF6e+g{X|S%L+#Z(8%LGC_=1YStccWDqZoBaFbD*3ij6AH;xeMMnUKzD(`0HGD_X1?;IJsyIsjUOGVHiB z>qp`IwXg_Qix+L~w8nM^n(gLy=F(kZ#Ofb^rGH7j=^=Y9HR_)SH093BODh_~iUjF@ zh_S=61fUd2MF*UU4ww_6&(ae-GDlqGud0Y|dg!1H$ohk<=)1&z2ndN4h}Dkr>54w0 zUN{Z*Aa6v_|4ylLAF_L;%6+U-&~%^qqsgptIWn_K{z{c?eADaq+f@el6HOmdX#ZOv zgdW_3I57Zd+~btD$9(PgEN_`r9)DGNe1qp_r@Xy+Xy1<{sUB(CNTNaK(h))T$E4C- zD1bI?TH`LK(p~0tZ?n=RR;Bz!5|`1&H@zM_twQ(UZdTeLqcavySJdL=zY-A~pCnbZ zA~{}AMXOUqt9koBu!^u%1%Fi)eADZ9I#ujs6;`p=(DglTQkI*baBXiH+}`WssYV#K zdgfmwsKgnyUfB0(Q#d9~$(Z#(8C&+HpqL^Fh9r8TW>Eo)#l>{hdI8ooeXduZ3nvZ~ zgF0{>6E4=#p(_egozyiq%%)qB%km=iFcOyN;Zi*e$r1@gmII;es@Vi&qp$+aYiAQ) z^J;hm3(O{H|&s&EcA$dilqfO zYKrHRZHyQ=Qw$?7)8q1bYerCE5 zk{|KfV;DQAIsy3r%Eu6vt07d-=IwOMtDwF23ec`dFOlp3&Rnac3cQx9LTBPtVM86X zYX!qfU3rC4XA(X0XP!d9{P~SOHe$wMytMZ1fV|;5<f;QeO2q`jQ2 z>_NY>S%@nj>D&bHRpFxa$NwHl)m<3gR8!Hqdt@0;){r?t+|8Sfg6L+-CP zvBaOU#tFDgU2b{}_2R@6_~@$oz73yVi#cUh1$#HlCDSabJ#Xb!$rbWV-o}gwbXx#} z&eZ(+Ga`p-jioN4A9NKZTyfGLx%|X~>PYC-0x#wo0ILKThs;{kW`w>tz;4t`6K&Rs zxr+*bANjgnX3C?7&}I&8t6S6(4q<#wR4*d9ttF^y?h^EXUFfP=#<#ATICtG%6_9!y;85)l!jyu;yaZK)sXSE6_tN5>Q+wfK`MRCMm@ZV z;@QZiN*|r}f=2t+TFdw6sm1ptW_{D|=Im`gM&%?Xr>&*DX|KQnx-4xU2EY9FOdZx9T#;h6$7^X#zo{y?T%p!{g;?7U zUp-p;9<)gA{J~FZEn0#NLUrR)^Em`H;W7xg^l93IcWfmL;10S}0`JZ~E@T^(r>6z-kHJZo=*woUmM_(*20($RVMctq1WDHnttWj|33E`>~b+ zzp=kz?;ONd=d@1!Mhi358LiBO@$Kg-hO#VrlfVAlhGiRDshxZ5;!j3dVXe@(QqfFdgxb7<4mo#%Nn}w~4l1eNqWWEA!T>fI7+M{q2 zQI}O7(Ym#ILT zn$T^cQCAZwB;QDLa_hvUMX3B(pt_Jj6kdf;G)7K8$Bh|Zow@v>KhqY*4|t)MdZ7hd zjuzmR-;+FefPZ(=L6wtfZp0ZkEGxHIFaG#*kP68Iq{d?b!l;G)k4sQ}#(#M0@zNqU zjwnX(gAB8f(;r`t4EUHWA4~C(+9pMSZ2$w|!R8Ze+psaLg2_~Pflj&Lbxdsq`*Oj{ z^MV7p;9y>GNiO&kdBLT*;A?Wha$yo#+JFwB!;_+ZN0<|@q3%xts};}-!Dpq;GKws# z*VwTWpeF$d=;JX(QoLf+YHSM$N?w8glvg0BOs*C5%4TI!pr z(_oUg3JTqxQKO5zW3DRpjh!@UoPW}P?_Xg2)e|O7Dw(LJvOI-8V87Uz&jF#Lq{q#T zgZ8YJ7k~U?G7$!~cgADggvAGD^+y;K9P}S<$xP;~PVUAJa;jNv0%P!@X7&HVN9x@i z4q;Qj)|2WV9^g&AH9WwVqIIw}?#vQM(fMg!KuK!f@PJbBPLfL@lQyLdOVrYeK}?BD z6Gb&pbPK0x>fzz(I6qVO3=iYPOwAY`wufQY4-ebRu;SrioQA3Q@W^W)Ct&J7hKF(L zrG7pzzMmsq1QgWF@E{szyr4LWnfzR|t2q$1}yts4HoE6~& z>VX+CmEpo8pg2x3Dyh|ss?Cexq{21!!Hfu&dJRQMT8!D>6e>Am?C)}YVTDtYHDdxU zBl|Dc7P>&U>oGaxFGF3F|U4#FVTk+>*DGC~Axb)0Lo3Li(@*HgS;L(60nD zQmY7-vSCzbgrRe|bPc!W`)X8xmUjh-q9A4+>W9U-8m2d3PqVwu-1RNRJ3)Ey*HbU9 zgN+Y*Jyj3wP1d*Pw@_3D`?SV=t{65C51?^AwgHWynSdTtQJ+i(4+1bwmuIodDr#hx ztJ!6Vf~XhVm%155rYlHXhN|g#IAZAv?l}mJ50Prme!N(S{B<0r!zF&|ioFA!Iru z?!$t8yE}Nm9o!2R9@{n8bVKtVwbu`?(aI?cyPv9;*Da7{c+7VO*~ne?3dIEB$Q-Ld zyU?IrPJ`4cgkhFaIy_b->KZ`@#*4DAVeR`cMid6R+y`_(?9IN4y*|C(mp+*ccIN}X zGza{NN$k+);TyL70DP2E1wZ@a^2QQ7kQ`$*Bv2YF+T$@lBpuqB40WLK+}veNJBj~0 zEy+X;C9rp2`U~)5s=WluVced2(B*GC=0AK4_AH&futOPWKAXjiD(*%sx1;DU+8VoN z;VKq~ll2{_fJ#+02eAA*Fzlnf2jS>-quGtm5Em{9S+h>Hu^ zSVs$LwXfVN?vA6b zTO>*gi`+fj1ERYMw>eW z!g&no+X5()03qi=5A{YEPiNNG#BHFdBArEBI~a?}9$@ z27KGuyQ*ue(d0C=Z;+~(ga0r-In|0aK4SU~iN9SE#YUxm!h|6Bb@Q}y9#}5qRdE1S zrZJVRHg;93N|AWSY2?DCv;pL8K7)6yhlN07vXpPs8J=8AGeHTgkFfcrKQTokHeS$U!fP>ZtiYgQ`DwZY#!^4*xgu%Do}lg$ zQv%S3hJpr9gBNWHL{6dua^q;EpG$#gvj@y||DLnq3Jr7>v@@=Lp!ryU{1_%-xE2%# z#(^>|LIdVj*lZ)jq)Sb3JtAB~`7wM)%ib1oP&Nmz%h~6>fNc&A1ZH@?eclJ?A6nSu zVw-Ko90c=Offi+T+^^2}u-Q2H7h0+*O~8P85uG01;vD9xCJ$@xU!lve$pX!@Rnq9h zn=Iq9vOi0Z{91n*jsO_JKJH`mSsK$mV@EeYE5^BfM$0L_Q_I|EY(36*!V+m1j?Jt- z^Vnx>v2AK3{`YDxFrd~wCrA=4-k zR9KtH{OlHAV0b+)k9uks3UF&Ws%TM>b%=Zir1cy~>oHtoN~<08f$hYJFW!o27vw)u z>+3v=Ev!C$8>6M2=t3Y?E-jo#t54iy+h;!ZX+l#t!cCs^z3D{=^dGJZfq(xPa%t@X zA)5RH+^QKhXoiVq^r9Kv+Ictas{70p_e(*zI~5<_yw54spP;D5TCvjf2@{8Mm2%pj zn9ew4_#U@LkcORQgY|8&dy|lw6};+s;Y#fn{M2id8F`=9u>y$JXFhSG6repzbaBN# z9$BeIA7x=2P$3io7$?P(K`rKIhCI$!}-N!x3&d&~kZpG$GCbLSgI0j2;*~Hi(nWsd`RJ}wh84{hl4I9psy?Rxf_keEA_ffgdt8bwXj*SyQRKN)mF}w*lm(}pi0&E z(Z~Qu0yx(z*N4l((4K0o6X!bmcrpR|I5vTIC|4dm(E4Tn2-`&PuZ=CAL8@H~ifcSH zGsaG*&mFrRTrU>^h{P0v@VmD2W%A7uQxqCm@6N*VEj# zG1jj+ewN`4R4xE`ZukE`-zJxnr#~mRXEbJ-yGX2`1%u}@Vx@n4M%rK+K@;{`MxeOP z1O60z7XY8pWlW_5fF*{g50X=H%}m~)0e#PONTYfyAu3Jng()RW6RoC#pn{_>$Lgv# zb6B}y2F%B9y;wOzsVqC};f)5j*f-^(r$WNQCSiAmgPJjW!MyS$EUBl>eOmMq`V>G{ zS#FK&{SWebFB5$M#VZR^@k8`w~{!YOk_y@M6AZ%rA{>-v(AH2sxu;Y?{Sl_;)nnMQ@Jt z6K4mWlSbg?88oql?^OKZ!g;nrZ{5jMu)`3|HM^HHribDH8jh{(H~)3X79ihLQ%5eq zR(rvZ5qoWDTwsZE4W3!t2TCW=i z5EfLZt)2|GdUn5pu?7^KX)-rlT(cy)9BGLcHDSG30KIsLE?Qrt)!KW}e^(R?5WvQF zDO%sbKI(FcAbl+}Z#}~}Zr1D4e|;N=JAJp*C-V*yaPG3=n&r{Ivg=!B*SFlR&)e0+ zfFR0{e8HCjo+D-Ch=9OP&I@4a{~eAR3R`Al5U5iAf{SAgTx$7GlG)2x9&s5~ z-p}pw*fGh)@&pYj zu8pT@hO}ciO@jhJSV7}i-ns`d+%`4EIeyRDJ2qTJt}f`UDqMSu;GY+VaEK=v_ju^& zCUomKjY|^itE%tcFpm4@-m0Lv!2|nT8VhKhoC4|ATSZ>W4Yc&Xx!(g2S!^`6<6$h2 zEa6I&kY|&?6sPdu9$4*(Hh7doJP0y95H?g|EQ$Z}5O>-7wZ?u?1N5iVHo_1aI-qry z8L>g_4LC=}@o;!e3-For@Oj9~>e?7m)y8)bXA(?Tm0${pGq@c2waU=Ib`A&XB74h)xvqjL_v0AtQ6{|}Er^z?_q+J+Q;qp?J?=#Rlm*ey zfL^-{i>Mx6ZX9J}@>a6sAr^zhOn?vajA6!_5i)T#^aVIJybS)@_HxvF{1>((d0W8B zunb&bzz~zX5(|SwviI`*6*p|TYYYRoXKC$+uT?iK90x~`h=R$R*q@iep^S&%a`=@@XlYJolxiA<-x#sz;(i zc-=&zkg0W!A{DRqY441p&Z_9vj?~vM+>*8!M9_cOtKq@`hChgKE;GlF5=@6rGe^OT zlca={+>ff8FPP|=B&N1pE~ldk&du{bL!62sGgfTWmvv!6g398m5^N@C5ELrwDxm03 zqCAAzhM-_sm&?l_*8NMoh=PaozJUBO6yUJx-lx ztU9TsnWQzAyU0VaO08oQPDkhk2MUCNv0OUx3dQ1jn`h zOTeGvKojuLJm@i4DwvpwgHUn|fO1H^_1%sT`Cr%HVbpgx^>^geKM(acj7bJhk0{o> z15^c=M6@eM8n}Hq-F!Yf1#gLG*sI{17BK_G7Tv2w#?TzluBH5SyhwD$15Y$4|@QXW0Z(?`g zto57P`EYC|BHz+3tc+D6^2{AiF|r(yzf8OoD@EL|60gMqhrYkE zv=IclTn`X)Lwz8lKi({4)OLq*3B4k}gF?N4>?HDAzDq14K~lP0RI31uVV0>*-jfFi zgHl-`pb;ZN0+)o84-e5^2A)bG!?}oD3mtw1?c)JxX!9DCKeN zu$UJ?W1kN*->TRPg>exS#@aa?`)5M!Z06EbxN-C>>P0G)2tsO=2uUfIRx-Z?9gV6$ zeS)2q&k>p^iylG$G>E1EPt|E~<`L5ZlFVv3)7dW?Cy@Dp4b#Cc)n_o-*TGsafHexM z4T(&h&;R)EfO2agFe5BeRqOR@zd`_aJ!-t2y^sQ70$zcpz~mSXw*ftWT(&+4!0FO; z-*9+zR`sm=8{miqcR=YJpmYoq+sd&xa@x`v42sTRkc7k0834fO%XENNDy>NRS_BXk zz?Fap2`z$BdeC0E0UhAsxz=224t1uM!F1Q$giQQ8Xpwb(oEpH zP(&0toeXcz4#{F=!yfmt!M6+29z5B+w`H1vFSn-I+xgQBxhF9< zN<{7e@I$-ciK2jCNddoN0l)fxpQpp8k(!~oNjB7JD&LI$Z^6~Pnx3NtqtLUT4xgLN zXSa|N%6z1s4{Qqg4|k&roo9Ur6)-{3T@3CqcVNOo84F*i|G@fRu#PL4m_Ndqm$xN! z5j6f{=Y`QwkZKp)u_@^KMXk3;%fN{&#{whfavdm0{Ud&a`JzWK=21|KVYAj(D1{~v z0gAA#wxA^hrFMO`^Mcz-d*KxV2M9KaaYN4G4;-n`de6)m5AjGI&D%1mMCM-Naqv4VBrMdqATIaA({kj}i zLz!AfnP?JF0yiJAg{ZbQYrNse@m-?nQ%S+!$f37kn(P{E-8ogRE^xG$MF)U__inq8#Ku=N$-{;c+h;J6z}559@Vf*GdM&H z>ri*9!AIunI2wST41c(Dgw@Gb{9!9MDaQyQV6sm005(s7SfCx7(Jz`CtMJ+k8U*o~ zOU!%hF_$6vBtGXp;Rpy!dVUC&B<&?^`!G!ergl`FUZLH%DPm7DotiSkEU?VRZV>o3mf&PbtT%l_YfoNDnCI{*)}WWc}xeuW&kBd z)~IGVV0Q*Qrvn$2RYz4#$>f)y)0K(mL8pwG5_p>Bw1eR-s0miM4!`ycPLV-a5ft^_M7PbRs2l)xp4qugdXCI%xst#AIvi+@pr=}-I&W3RMs=)yWE zWEFgVXF~%TX52iERR}d_m}IF+()@B0b6PMX^0~z{27;hfYh>R00{+|e#&UZi!3!=Dz ziKj+=XdKTk^4)`XL*CGV<8_g~Zvmk_#uYH9B-Km^a=^x7z_bgaW9vW+Pu;=bSOiUa zz4^Q}V>v`4cl{f1{{VPnrgf%39;FqLyjJjCTG7TgjQ{bl-3kY7o%!YL;FYBQQiN87 zdOA~MwX@e_|0(u2fWWEd3j&R=qD8OYK`AY^(*Hu}4YZ{4)yp)5XGLvr@Le^8Zy&rN z0*+im1RQLLz~hU#hCrWtyfXBLh>VWL7_IC&IS29P_P&Q!%J zE#&Q7_H7~37Qq|8IMPAvydt>`q$v01%@TC;R)i=(80>K3MyAN&Z=pZ2UjgFO9V!70 z9u*!FgZzmko{Bb(6}t+HHrk{G-on%*qnN|-T#k`L9j;-AgeBDG;d1>ehN$F_bPra- z_wQnQWq$wGE@e|Y&%43jYv(;N_-4T-nGiqOyr`-zSvNzqUhA$#Q$g1w@%NqPzSM3R zC}*1Et_NDn$y6sm{E2^-&(Q1I`Dy;d9{H$$LpyhucA>(bXvMdK1XvO5A?JPyn*>Ez z4s{5$WqCm3JMx19@=X>eD0!HE3UMO0JRt~<@+_ELfm{Sqvi+Q!r5=BxTeTQ7Rdt8T zCeBt|*5gn7lYE5U(9Yhaokw@R&F>fL|6K;lW3MHG4bEDE#S$Kmu2sG6OpURK-IBbH z@f{^ur>%i5o#!BjkT_yNWX~WHJIsft&hD8r;hioz3wa=gGvve3dF$J3EP7(kYjpM` zg03{L_X+a>J}I`~|0DcKEAl^Z8LArw6l|)?cSUvi_Q9#{MNZ<-aV_NmK_%taF4V^` zG1Njs*vF<3Wv~iD;+FX)t`21Y!LC>##PQtx!$OHQtpM9<&eVZC=HQ*0JgTy=e|xh6 z^C>O!z!n&dh&})aaF=R?OvfVl-<15$)JvCJ0U)^a>WQn?*c9ztW*8+vK+)pJ3N=ly zK==bGo|E9D)H2I4_qnw`obdsVEfu_6tvYJYeFv4C(w)T>!cFLuc7EBW&8n}DZi(dp zGRJ8@eTxn&8hx`mQ-oy$J+L7mN*o8T!EzVXMdrLO2?8U29Cofip!9_Fc!%ae*rAiTiy9c<%`0+ms)lX&+#>gS#JP&_ub_}m{NwQorGsx7R;Z;D0*A)`Qf`pBlL+{|4K*r zJOEc{N(|g>)UAYlIgN7giUo4_Fa^4$G?^oF7YSBWLU}!RLB#|Jxr7!*LTfqAl>?b3sL;G78-yYM``za{uD+-Yp^C&f;iUcR~k z=-re*QI36j7uw%PXq5gu;tm3oyB$z5xihyhIE0S)XlsKJ_ISC1>iEF8aieVM*?b?)Bqs?bkq+0 zE=%7?oR4Ib6nfdAgjcI>*CtH+-RPAo4W(N*^a)Uh!UYUbFLWFz_QDq~hhi3f(KrAL zkGC@eImX=*1lnWuIa>q`+_w5`OZ{LI^m@^8coszO#j`N_U>f2flyT6+VQ(fBfL3NA z#?B`?wNbq9bYK)40~#c5sbMIPo|Wca4f2e_gaWp>(jQ6Rh|F-u4Q|)JvjeMWdICye zzy%fHv0b3#bj&&G%SZDVVkSIPb6vI`T-fv-viF>Y;cVA4R>7n(Q6R%Rh`nHcf{SxfcJwUEG$@5Rt?~|8gARcXd$Fegdn}q_4Ep1wz_Q}{ zw6mCMu$18s)t_FwXai{Q z8SHqjuaN>)iNkI%TJNoU7`jlZ)4c?_lmIJ>5PV$WsK#+U){Xg573y9)6D82`-tn~` zSIbubCJ`2iu=|ovB1)jK{A&8k>cCMzcC!CVc!~xuXN+7G%EVCFU{(DPeRFfIL}jbr zr!uHVWpg<<))szZKL;B4(k^rlqgGAa;dZ4`?LH!d1k}Q&J}C^0XmN_*a4j@pxJf!7 zyQ8-w4KldbQX>tL273dOxM^A?x&7ayo_jIy(_~v=Fk66Cw%>dUyL>QnfMG&ar<6p* zQDu0I7W?TWHti<`QqJlJqR1f5q%hQochgwM4#2Vm#4F~Ef(`< zpEduQ`>7hRS%^d&dm>BqWHo+JBJQB&3q1QKc>y}SHP@decGve}lZjSK_5D1}08xpo zAMBvY!ypM|Xb^S|0vro!mD#jN`;)SqsgkMkmMZe8WjUPC%hpur)Qs0~Q$=Oa`vPW2 zb~4;cCugC0y=@MkiRpYEnu({8WJpz#?`vD4_2X3;&q^8S0_+yrSgGDN z4NoH>&!jwCPXn06JI>(gj}PIgnx`kGGG$VpZSrjHVM;l;;g7$@l+q(TS;3TT@}xr+ zDQYWEac-Dss7U%`VLkq>vdbs{&=ciSgFHcWcAR34#oP;9+}glc1U>|7BD>#rh+&>oVYGFiSh$o(5T$Trz8(1IN^SB3mZ6iK zG$K0Lm1svCf?e43Y~wo(?c@c>1Zy@xL3`Dr$SOfq{Yk&}hL1zX^hP|v);|GtE`Id3 zD8q=3(>vesP_$el8)DNft=H$UaFtDn-1EsWpTL>Ewh-Kf+! zU~4kjf&kd7Fm?HzY{;$y5bl1I|LS$J*qF0I~_=%D}TC0x>5+yR5A&wFn9Xf znksc2x*06P0w01E6fkUdlEWLj3mTTik?E>`4m_QKb(FdRaWL%Fu_nU4gX8&g;8}W9 z>a#pnBpI#aRQ~uM(K&mNc&f@DKZ}rtKr*ocRYH3!W11?2W*^^*(Yds0G5V4-e*VN$ z$e&CuM`{Zr02G!50W3j0G1|7{IpNi?MN-x2IrFP0{{o`$JfgIteBzQq3y5tjOK&4! z)wsac9BYTFBH|@Du<=lh=*y#bNqT&<6j|YNRpWTv!(3%$p12cRkPCBem(;KuPv94a z9-C=n)L@K?mI28m41x*yOe@^K^*`|8Kb+i*^v&nFxcd`52uil?LkN1!^3YBe4p0nl zpyMlt;?6%H7w4+c#qeOKsxfCL&g>d^Aw zehi{|-x$IYgwp{Do${$|u`O{9m?MD z`wWv}XztKfi;PBs&yg)qgM2qmE-SAra9x%u4h>Oa!Vw}I(*T<_l)4rjN=?KAX4l1` zK`VAZVh6$XT2okRAn&W@35*&)KF#VEEw@xRhBY2E_jSf_Ui#R`q&)NIr3xNCFQ@)D z=4HR^<6&N20olJi<^LVo{8zOPT_1}c4A=>X1%dmC{KA4RyEC1 zBmLk0V031HOBOb@JZhi(L(-+w#lbVNFXk_VYaf)+J1ygL#zD+zwEx zG^~ZhpGeDmVK!_k{t6$sV;vvBRfg3)M+T!(N=wEkZpy_#%9fR&vQrVy$uEO;DvYj! zK2|8DKi)#Tl?9Q7V(yXPs^S($b`uz$D^d7Tg|@}ATKVG%PEZJzNiRw<+TBS*I)T+N3O4%Nx$ZzQ_HnG%)*a z+1Ekg)O^*RqiPQF()Tzctu+saT0xsz83M=b&I%^9*-|oo1lK5zq|F339jsTpZ;N0G zGlI9i8!bxTkVl)L%CdQmQK=^}vr@ZcdI<-3Z$9F4I$_x!`iBoTog5BOVff2}D80qO zzSskRr`Z4d#Q4%$%`t&+t3%|>2P_^pSnx=vJzKww;#0o@ZFuljioD4e1K z6ul{~?}H1J;6QP3koKgYNquYYqh@LVS3;~0;@l;?>#BksY;xEkhsRP}MlT6QpF=SI zhSi8uGg&mEK_PWb9}svWNZlt`nDPcddWXVb$8M9dD|K1W>oi5TGZ5Vr0L}uPQ!ffm zo5eU)fQt)F@DU%dnD=hKKv~ygVp@cSKCE9PG#pK429_-L#$Ds$W3V}7J7EtLi{R#1_5iF|;`utn} z72zA89w@B}dHq|Tl2ifh9UyB71YfL@M((1dks=j^0W7MLZ0{NiU zsT3?;4|i+M-Xt>Na$IPL&7&Ukmh0@58s~%pP$0|>o?3gSa_)3$aU}j7p#YK>+nJPm z9F`sSh~-qpp~5m7_NfAy`vJ{_CZYsPIDF&7)xD^V4{o^AI>C2f!%WZx0S#2^BS5nc ze(Jeh7Tart_Em-UP~*D4s(x?u!#LGa%KiuYY3CP!&>JkF%U&GI@ukZ^MIfWJP7}fBb|D8MKrbiXO9bGT{v~27jDJ9iqMjUPy;v4{YH_ za2GZ#_4-ylw$ljistUHoK98Nas?g5Z!{|7+oS{ga9asyR4V4OtuI#)6BByJeEMF25 zj!aigSB+K!=+GIkALV3iENMn&b9w>xcyJ$~sCsd{1a7HUG3rN4!g)P;iPy1pxTCY#N&0X=+AuiW5C1lWKT#Qq0c zL1h&U24f((EUz3@l??p8}(B$8j;f$fUw<- zJqYY}=WS47?;`a*j8Eji6%uh)7Kh5B7=x*p_N0wvpc+(4vl&pNgIDAF2YolzzYKl1 z=Ff~lu@OMlL1xV$E0k>&5K3`iV`|>SSwg{~-EMPO7B5Y@NIW?_8^ZV-jJ$&lWB8pX)D%GDeYIP#$TAB1Ty!%lQa zZ{>UXbJ7N&F3WE|$2P!lgU1ySP@;CC!46Zs8I@91EjX9W>;b@lz9v+1+|Z~tEYXJA zjnWlqgB86(Zi}-JSP2 zPjBtW`&_QK9?bi!)?1&?`<$boeiS=0qGk?j~+7&M5Dah>U^g)ns7mu#ce z>0*gY%9S*zl6JyqhBD8+v@+YKU#?)$j?#FRC%M(lEE}5Tt`%0cZh^XPW#c;Qc=M@J z9B+nQ_8D%cPgIec?8qaG#8mI4k8R8YE6*MV-)J?BCi24?C(tpM4+$gTxGA#W>jT{N zGHzCv%sVH;pyaY`dj(J#fflKt zpoP&kl@-*V#_kng;N~PboiE@$+Ga}B0V6R>qV{8ROrlOg#Fi*%&ub;B+ej{wsN+T( zt^M@+y@p&wgR7$yX6vDShM*u0mM9DYuL4nKNhwdW218c>YBgC7_XYV8N{0?jZF8ey+P?qlp$ zc0Ds*0_j($W6yqw);i)xDRv)^@rvCB?rNPK>H*(}L^6-Hj_TRLo((rQH=ZJe-B1B$ z5~e3$0o~kg!!Cn5^7@TjaqxMA_PJ932M^07qGJ?titJ}NvR5JRu%pZNy^rAEPNDeZ zysN-DcI(ZG$aljKN71ZT@Z#$6I=&e1(1$dWcYWb0;Z1 zT8tj;M@E`u!N6rmd3ERUW%G4R)nPf|cc|OgLAbV4H@WJj;2-=)y4|k=PS#368<}ov zoeOp=KL(eMp~df%`TUIR>QSgTvJ zf1?Had29A>Qo;Xnn%f$rmLkPwezf%DA{WF!=_TSb?#$ts3wvD;_?zH|**4B79@4nGE z?sWrX;ShDd`NhW_Uv$a(-9P}u*e=MJ$f%D~oUo7a!#gN%fr5A*iW_wsD`Dg_chh9Z z0d1Q&rGibo6mG-Jwb(6TKz75&MkGYWJs9rYxXg6F*?`Ke5~Fja+^Zv#z%H2u6G&V( zq5zx_1Dh?ch8%O!L-xH-EW!L+%+BD>)Mn)3cP+FjTBaa2mLFAc(EuZ%br4Bf3#;?) zu-tDRkbJGF`BuJx@3JNP*jw@00yKy_Hf?d+rtQog#s3OO2!K5Px3nv`3)l!Dg9q>T z8GzhA=(1+=#J_FK12-VuEW(EBh$3K11<=A=Ev`K`#911JDF!O%`-rpBP=ehW=|EZZ z4C0_Gwg@pn$UOxqFL9OD6^Pd$eo zOMCjzUt;1YYCt#=z|`kWIZ{&pd_Hi)^arbYHJ|%m3F5C8Q7*=KPwnnv7 zL0+ao&fcw*_HMgyPvVt(vrDgU$!q=>;%t5k=J(3n?VJwNkY}=zCS0~>sdh3VR2Mb!XKusrd$mZq%sM>S^pheOlZF~gxjd)FgSR8++IBu zAzgE)NiviO5|OiN$~9Rn^CUztcgNgjW@7naa~ymf=nH3pBY6=io#9m zI#z@t#Do=!uRe1YwwKiw@Fy6728w71;~*qmi!(Av%-7~lYF1GA>}{O;>!(MSC=jth z_OLiQF{lLk%)g*Lsek6<`*=iVUNJq2QL+zm>T|`H7cq!+X&uDuD?k>SEU}Oi&y7U^ zhntB_vj)PVR(2K6K)mI5(kh-wxsSFds5SqfuYuPW9vrn#1P>YkP$PrhX5KqJnU<|2 z0XfH877392&HXLtJyfFc6TyoGCxWnY36c@RIAE1f!#a;Nl}>g8G3Y$v21mFs3SSLa zr_`|Ch~VaSz87*>F@xgf(N~=r6v6&8f~?u+kAEGjv@Er1+FKJBp$Ee^bBv0Ro#;B`njU-tdaGF(ezX9Am z$o;jj0;`hyL`X>D<{LOUZV{5tvO01YdEFjsIU#{QX%gL4i0Li16+qC$bwwI{A{I2} z059Dk{kXe>%iKU`%0rur_+-RkjkV4k&Ht}~<&J(dGW}^qS%i5RvHoFNzyUh>;q<(b z?X-Px(-p!;Bbo0>DJs9>5c4Kia6s!Whvt^W(OHPo<1k&$+HOaxy6M8xsxU9n2yAfk z6xHzIw;jfSzLui|bruw@79jBOWDHEB)rNFwGIT~RUCKiW^A=cDUWzJ89l}Ao#j~k~`UC{1s6=M+)R8CrmbrXGMGa$pVp1R0B zHC}3@*q1!Ub$Y55Xg>U&g|1)^!W6QyASh*fX1rV3Ir$BBT85^s5`S8I86E^rCxd6g zT(9Ehr;ZRe?e?KXY@2Ek+osyfA{R&2TmgyHm@|hSI*$gUwHo}NM|2fbaCBy)n>OiQpK(f-MU-^4Z{r(eF6;FH18J_^|Cz@t1fll zPy6zVX!1@mHfNQ}hb3+<;MpV9x&KSu`@qLpU3cD+Mz$xGV8&R05*$##G*0CtPH+;4 zOtBSDE4)@KIi5fg+PGVnst(&yBLPkAU}-c#j~`DX6RQm=P5kbMHngEBbSW_@E|TNe zj_d5oV8CfykR3Of@n{=`Xt8h<{C2FSvGXH`*}aFK{L&1vzkB^)uw>hLM@M_J%3~Mr1BC zGtv7A-tJ3%mA(5-ws-$BQq`BOhvIRFfoRudZ^yaSE<2xk+Rmr?yw+_+H#Ro>sSzA3 z^?B)S5k&w`-2Y*q-U5ztU$S+#u{zWg^R;q1|Inb!w^ z%#>~VDo*OAg2Xo#OvE?jLUaCh(NnJDt#rKg%Q;}a-A{dast@eM4#l2u z`W&4w4rZ5J z=Mq1ostbDgD&Fhejkj$y+82)Uugxiq^1Jt^(B_Ck?zAi&C!OpB77>1@v6ni=^Q(;K z2hQy#l&!0E0M`yIZi}h?E2)8i#~DU13IlhiiQO65I}QYbnxWM-8Ld4W2$jN3mgFOL zMI0Oh5z4ODAa7r5#IDWV6-fPS#UMmjA zBg%S1I*!RcHTUWD4XtsjGjOvr!wt*;9^H51+C{}ZT*OFLZM?%yn>bl==dfdT4y910 z=vWjsWxQ+EhAQXslmq1|&TyP1H2`x2x@(s0jot~8C)rW}N7oh1^Pk^1$YZB2;Qkz^ zd`gx#)+*TzMV@%nqvZSlJf_hlO!soHN&iZtUT?=QNL!LeLZ z>e$BL#u9_9tw%S0QnN{VlzIpZBgtvkoopt_PsA9;Bo`*-8|*o6QiI%XSD2@tm0_GG>TY26+A}6m@+5L;JHk_@T1< z&D71FTp)`8(5nH|w_MJAxA1mVZgmcwdK<1QJTs#8%?dV?zl0d})R@_=&&7%RpJJop z=kx=oJPq5;DNmd)=$KpQb}uw02X0(KsvgQ;iQ$35GXU4N2(JF{X$o9huMu3z22AYYa2uA1G-+HDpdq`dPg*k3_lJ9?!0Hb4Af+;H@TPgA=6g{#$VPtHGLQR$k7Av$!}MN*v%_<-0p%tA}w1P&d3L|CiHpJJUh43w3x-4!xF) zwT^;kEu>;%hE7McoM+6cFsl{%CEHHduPx!zlz#ogJJc`b@&}Zo@FW(nPeJt+sAr)M z)T;H@XCAiCFY>PrRfVPASgY9kk`QXdTE~SuX7tWYcioMjfCjXsj zZ$h+PT0)yESACFkI#mD`3k4+Q5UlrH2zOtiL!Mn+^X!frn6}$aLwT&Ou5xBz{@Nje zrB@HN<(C;Siw(>reEN3T?YwyXo7XK|EO_lCv%~AX;nNhn{#JwVs$Bknauj}}tOE|O zgYOew7x6N{YvTQ3g1b+r?WUXXCz3;F;IN~OxFj15(STc;QN!q0Y0KS`^XzsVxW*mC zvuoP(zi!BApb7V822>2#+qxllG0y`tAwlCSh_#Pee#Ppqw^|kmTs9MKlz%?$O*k<4 zgbax~XXR>#eRl^B8ZW#Zqga>o@F_0Mvsv;6>ZrGSw>}l=B+)w;5_G>m$`e!n*(xD) z7a4}~HP@=pjXDKQWWP`T5G4_1lmQUUsx4OuO|{hE4J7$2QO2b+P{!5PwNh?pNAKB9 z6Fj+FEsyaTVyn(~mr(MB_i7a5YTy!o;8DKUFH^ObB_wf8FNUJqv zv}$ift19h5IU!sTUu&`^My-i4H4*W(pGi1n z@E10H!7+W5a~dzJyAj^NNr7|0G5u8ov6R~%uxBJ+H?c;NLldaWM{{-E8t8Z~EAnj% zR+nh3zxtYu_0s*>_2CF-JHn?aWBu#cIAR-NW33#;Pli}8o1ivtJYik)Nmws@?NzA5 z?lodCa+^{I*6|shh&h3;!YbEW>@f6Mb~uWovX}bIoVwVvn~|B_`iYeJTR?!>7C#bC_H{mJ5s+`= ztBiJ^=H<+5?-*@6dE4Ct6YW~=86~I(=y-YVa!K4VRnOgOHmQ6_q)fzfyBX8SWpMG# zE4T;n1m7-WxMl>mr!mRVySDtt4XoA5XA(9hg*HDipHhZ3`M5z+%HX>e^JS}uiItuf z)i%|`qFT6~_5Tfp?;YfJ!}Z1RY07Y2#OdsmO~Gxd)nRRl@GU&fBz$W=N5Z#Jql9mJ zC>Oq=oNXZh+5Yfp3Mf673l!xF_5p{rs@oKH;(F$_s!r;8Bf&X(xqM0bcca9}y zkn!IOz5-Vh14~sjS_}Vm+M5t<1 zsw|B!GJ+vqYn=4hea1vSuu8)3kxW5&(QSFqx6PA)uidvRfgy26l9M;k6Tv48X|VZfR=R~WEfg~EW5A=<$& z{UjvAJ1Fj^*PY?h6f$g^FEUiFK=AuY*-(}t-tlP317g~e2Uy+Axn8_b$vxt5h*94d z5P|yU4;BiuNs2&+w#NE_`sN$a8+RuinPRdA}GKe&HqI*T~Vm`(ctBDz^M;*Sx^BR^daW7wiPult)f5 z$-H(I(IHLU6Ye6r&xl8K!D>~ku@bi^V5LpWIlie!FuKfG_h*WHGwtqH; z`wO97b5`Lg2_#eSc}eHZAwJ)h8Mz4;?48$7#o~P2pH3M_eCTmD7ogDX^%Vgd68VJ5 zJ2t!~o|aGgP@;sVp@c;C^Li5urW4Ox(Hh%3cl}-nhZYHAvCo~j#^m76kA}tE zmfIC`Yl%b?|L^T{**#RhZ033&lUrJ;@45Y3oOh1ur z)XxBck{c9K_tLPCBS^Yz2H*iHo&&sds1mYCWEKa#(@PrM(Mos+UUx9br$?CN^Qo24 zatAVt<&IXui=m71+*q-zq%7jCkYpADOdb=%Nr~EXJ9v-0Y1HnBoYUOjDQd~Uw@hk; zgPNc{TL28JUiAy!>KCS<)B5t<$m!v0jD$V=EPN0NA?%#?D(3z8&)*dOHbzJvGDXUi z!B6x`=k%uVxA-DqM9Yvju>KA4_ur@GcFWXM{Gr!1R)Jo3WICV7zx$Lh=gj!Z1h|nk z`Mch()$cZefRc8kEx#v9aBge3dmRc9C^JAjDv{r-74&Nj`dd{L0dB-piVF?W(wh*? zWi!B)lK`ipZ*Btg3hh%Sz%L}Szh5>MqS4H2qWCg0%$$MZ?dY$J;scU!1d-_dMJfp~ zf)?=nH2j$w^?9}RxlMgWKWw=Jk;*7O(hn~%43%BQ8)x|$BBb7vkK(%*dLZ}TZ){nMlb)&z+I_E1D_)fSjWu_ zSli{;X0t`vfW3UQW}G^#NLaRTk5C~mIdM(b7HYYJBFj)vpE?;V7_1Rq_Ax5OLd@3w zFrA|Z+vyb-O+P`p*f-By!RxmmeRu<^K~jKKbx(_3VYEc(J6c5k?%#mjHea3{L_~6# z2@-WW{3_d;6+cnL8k?(-=hXApKTtiLhOm42oLbKz9afcXg^HIKl*VYn1%8xP#1yz|HfWZ^S%bbvnCP5k(E3ErOehF)5 z5N3K4?s+G5Z4^sNY6z`84~6%Q77-$ql9DTRsYLb(|H1LFUAMxc_hdBtg>vzkrWy6Zcgt*@$gFB>8f9noC$Th1o`xvW9k9P)< zv9YF`5QtM^v70S_=nXTVC)d6xbt3=q>Fuo#Yw5r=&R=tff)I!CraO~?lp46Al||DS z0I`1<*H;;+uRBm{@SGuvBM7v*;2HefKbT7Ap#nC5Z=u~M$FhSP-0KLm=HE=D@;WNn z-@E`J0h9OIio~`SMkFK|+Vbmce#lR!TnJ2mdkLyeW`j(5wC5T3 z+Ha+o-iq78Rp&|!ef*x)s>&w}m+S^Ewi@OClN!%?I~ctc7O=!^UdPn;R;>@I?@BZL zS*xo2{x-hW!}#g%mO2tX>0O-&G?G8)8hd~ro6q)dguH* zjJf(cy!JaZ7&6!D@K)XFFTcZUo*oB#8hv5EWClMi>$F>LTklRs%pm@dA6b9%$T%J< znc_h&7BDXRD}YL8xJRpCQa4p#BZ10(0O-ob6(2$z+VFbwpnwzHvM-+@AmFd|~x~oM&TT z@E7ivn&*b4AznsI%^k9=T6Kq6U>y?YI^;MPO|H4UqEWhy9+zyGP^Ct@ICVbS)H*`^JDl^RPZA}O z`YQ@L54Om8-FW9_)k;`Ql(3J`6irHpwkH3(m#C*t%f-T>Py_V$F3q>AT@K|BT>#~9 z4jXRMA9-6vmr5z&!-fqrA4mZQA~fW+-0QV%0t&Bn7gmwjm2xMkre!^b<+yioc33Uz z6myw=J>fU6S62hC`|mHpw#NywM<3dkV?**3qz`1PLxQPCSm!BgJfr1y|L3mzN{-&2H3bqWB2wBzK-HkGN#%wPk_@qE9! z4cje`d|j%KeAicCLM2ZjsC}4FbMqIggf5)v-!w?d;K?ELi^g+EW3#( zD;|9O`g~&?$!p9%13-xz1*Ni}0NXW*Lhbp7Dti}JI=B$Znpd+_mw{3~;U zTvo99!N=?KFNaB1aMpv5C-aBGBr7=k!N=qIr@|yFIOjoYYM=k&r+#CKq*c}*2?^=i zb2~$pGJI)u>K@u6%p`HQLRipt=qK*MGumps_FBI!>9r^QaE^z7ZI++t6ERoFTQ_89d%Z0xE`MgBy$-df6;6< zCwoD0IW1}gtUuT*e#~kDlXXq=5-G)tsAqZg zjGi~wQeEcW+KR4ggtK}MquFOSy%m%E$=kUe$Q2CbAI%hQ((B^ODll{+7S@Gu z7LRq0X`kx(~wF%buVJFCYY zwmW0!-!-zwG@6kdRa^Y5z{ghkEx=iqnW*h*2n)EZR$u9=c5Sh><55@P%WJ&WtoD9P{bQB2&E9D1OZDd+V9YVeyM9 zDCS<-jAcwzXXbdr>F-_fozvfI@96srHx5T_9F9&Ihq^*q5YuG$i4mIbJ~PN?*RQ#z zudlf^%!T%&>D^#rfv%H97M*vK%=ocXFtf9R#8`k;H^(JOvQ2@$Bn9|$aZXTtzPL^d z*7!Jn+ZuI$Cf?M2Jr&*a%dVL1a2LC0l<10wem7F|vCIwDyJIxwH7_P%-->G1reg{Z zax7}T_&>HXL8eJA#=pBqd)ZW$EVxjH#N0&h3)OVcl5D9N)?=09*m z5AAC^uBUh|`xr$yB2!7feJwYH+rnQcg@5Z=J2rpIb%WPETUa_v$7;%N$L}iPoVDS8 zL3OgrQX6d@!;S)iI&oZOmFwzP=sbt3Q1HUsPO9M4j?Y-){%(!OfPN5}ckF2{0kn>y z^bp6`F5}C`=j1zo{`y%sbP_(sq0@aZ1gVczS7=@)7@vJ-k15%a{SBkC~&4s1*mPgvHV|7zJ50G%rKWE=t!MbC9)+Mb$ z>B;P~pVhjQ4Av#RopkHcB;Ij?#?)_bYXjO^e~Yl>^(-_;0eJF!EtcqArv`(p+8}yc zM+`1)LcJd665jPVu9WUUy?wwOdu`vVXU#Ht+@h-c?-UNa)q3vh)N@dCgVlVm)x6MZ z-lXRMmrIntJ1Gz!SgPmkb$S*)^olJypO3#Q|0h3todEE}gRgkJD*wGRud`l`)^uOb z%bM-WRL=A#8Xg3OfrlUz;uG+Ri)4Kc*t4OysYfex*OgP>2<=ThTD23s8ej0496BD; z4X4^zpRMUzY)$6|73Tpv)Ie^VHPf#KvP$v$G=@!<-c?VW3Z?Z})mi0A^!`uLFX53-l|1P+SQ{m$1Mk z)Vl-%9bxS3I7Yte1HxlEiHO90pRPTwVvVmjBEMo-L-m*;qF*R5l0fXWlyL{_yoGx1tJSj!BZaREz0h5ccui(7Nx&ODD29ww#~pVntGS*G039&y z!-4LfeAk%SY%#Oq282=TNXHY7Te)nkni1QIWHJ;jwC4y|qzkQ{nkb{yck_du)pXbM zvS#}NJ_A}ckaawh=Xhq%X|ln|>nbkWH79ms@Ylxo6k#`%uZZVFMdIpl?2Pwk`zD;> z(!T5!{N|`?0c=kb-?6>Dc(rwibtr|wq=4&-nGx7a>JX&BUwUtD**HQablfDM5xbSWd<+3mlLs@nnl68&&a=TxJkHJ-dfs146 zmX*+n80tl?JgLD!!dwYUcxLl*ZDiY*ZQ-+GU-o8w?a!{&7yk$-9X#P_SP?MUmvKe7 ztL}=QG^XQ(sq**uFFanIuV%zJ4U2KG@>ijThlL|u2ZPGL8d5-PZ2lSV?{B3>W*^OS zZp(8=1p^?<H$nX2=+j%1~qcnp1|o0o&+7J5sgPMmqeoCdpi2wFc;QQs+>+C+KGr`IsLvNC-S>1 z=?ESva%^jAPhayajU+qoYjXqQ8O+(SaLnCw%df$*rqB9Yye7o9F0(qq2r^xSPZ^g9 zhp1}PI*5@y&xN%J^Y9|SPoe_{>Og~MB0Ud0p=Z4^(KFX?uf(lcTzTG?`Uf#}FM9{| z;CGZy0v6)M1>*Jx^fMg!0FH0VG}H1WzR@1X2T7v$%UVLSi|8DZgA2NoYyB3COS}id z(wm`t)wM9poA5A-OGsQ!?FA9&AZ;-6J9S8r6>JWwkZoOJ8+sQ2 zEL)93`)nn<#JI{=uuU`&??M@cn-j9)7#X|_6=Ht&F@AC-fY1B~UlGS5igZO^>RUE0 zcQQ->r76|lX$$ZIuTP1d{e*(Q_2A>R`PQFkeOpk|tyeYMEhnC%?WgB{+Hh&tof-ML z8=~7$IWfYpsPsRur}`i^wTvhMA*=B-vB-_D-<&iL4Kc&NLoZ>7%SOYMV&`VVUU-fvF_*BlZ@FPW6Q@ zc9|upfH*S|>-snd@OOMyeIP`R?0nDOl=#LT)(IB)T2gUDt1o1lT<^g?$PR00n;PVFWeTN}C%8l(T9)R{-@!tcGa+{QO^YHAhE7?x-9FCd++{s#Af@j;ejWXUm#|-A=lkL^8 znneNAXkm8;tBqN6m}LRhR6ZMwnXOr#q1=s#xn)*%Q^YJFEQ?5Sz&@=S93_dp^vDq| zQ8|P68q6lc$i_`?IMi<$`oA>P#W{|XR1}e0#5XFss&E%%EaY&37^5T=HlgbaS#Ygq z42N`+~F2X7-kGwbZa_)5O*45}6-USsCkkNI#9C zWFcn+$CWeFm^n&g^cQRp6Jy0tr zMmCq>6>hp0wkXkUSA5sZ9f^gd2(eQ?Bvka%{VLLz(POB4{Kh})3@nR)U z^sdoQo4uJo1g9t}#r_w;>q7RA*Wbkb@3L%$)**0YXnodZe($%-Gixz^webMH%?xw6 zGNz}HvdxY2N+ZAYj{#QCT{|u$j(oLHE{<4(Gs`WXosv;2r@Q=r-Lv`smVf>1>EYAQ zLcG_QIC9NQ(uv72urUheyD4#DS*Dy4uJ&z-KYS`&>NWJX&(uTVQ{_W0*2BdoEi`_> zdd`vZ6nSQ=NyElLg505W^92=U7w_aBQ*gL-2nXKcv)bUBTJZrX6dzxjUr%Q;BjUv9 zDkZjUKf))%FBLHfv?*p1i2Cz?^^KotJ1BX`xk1A5I#j`~O?zVrQQL;4&_pRqDb9tY z(R3maYJt7E>Ti>LmgBDlQ;)wclBDU*z)J9K6?`}&tiW!Q9`{H~;cb;-l7?o`TA2Fs z0li1b`}rT4)&d=Ewv#p!&*a=!`cUIR)VpXdQU|hwpKZL|w->h~NZsza$MfhizMFW) zsu~)JsRRDwV}REvr7z!C>=F7b$+HA?Lz@<5^0u0e%G82hk91V%O+dzXFNBQjIxyB|TPtGgC-=Hk+%dE_ntI>*=J}_d`k)S? z%2QXg=kfbQM@ArJ|?5Qs*+y<;rUgBi1&Q6IC=_8aegnSPnXjCDCBQEyE@APmlz zIj_Y*7N>o7BG@{*FZBvUY)98-ciPnFP6a&<7VH#7CtN5Ix7JnmrC*882?KipE5cNM z#rE+xZh^YG<`n<7@XM5DpZiMpaUE-QzqV5^@H)b&jOt@W;z-8p)^p))mN)$hQCpPv z%wsNZcp_QeQsLi_yR13wwr|{}oYzQy*}gEdCx$2ld@(zzRP|@iqUu$q`^;0* zt2g5W>qz1AVf7j-C9yPh{MN{{eWc9b~Uo}V)!fks9o(NW@PTmC1EW?<>DUB(D@9v{D<-%haD zr_^Tta3P-5qycSCa?YQt>yu6w<5g+*C%pE$g6vYKHuaE51k)Le6{OMyX9V1;FI;|3 z#=ER_!4w{$>HO>lJ3mW&u1_6*Qa$bIL((-{1devw{s zEnRU4yj){hSCrSda{O+8$*|6;|DY@9N;nWAiI%w;CX9uY9L|iN zo^NJA4jeBYyCiYHn@GnXhhaw!2hJgfiGK;mVM6XOf7;fu^8)bI70l|c?7(<*P5#NC z2F)HL9kWonVXH_d9J~~R*Y`yYo{X~WT)s41*X-$fS7|7r6OC<+&J1q%+AtoF85elh zrJd5?&5XZr@MeCCu~fSVX-(M487ZJn?!+AuW_({;_`VS&9LQLLu4;B+h=s|6F`7MM z37)Zpj$1E)%vuW!Qa;$KuIs*Y2D&)oKu3w3Qknh4sWK200o;LrE!)=gslIs(ZV{(x zomX~Te<7IcVE$8z@DlY$ERLDJbZhDrcL3dg%i%e(B7b}MJM=7fh%2jNm1Y0k{@k3{ zSNWqm`Uf3E|4%vM2-b(SUhC6=N@QQ^B^27H#Ye*B;=sPtk5Grecb0IPf(3A_b!_Xr zzVr+9=mlE?G81T-do)FGo-B0=)+z^L=sv6ZQa_B+82A@5C*~YJLAf7Zy9Kz0Cg#)( zbKr55G58^;CtNyn?#T|c<&Xcf_VObQcU>83V_ToL1OKPZU^+a&c3e%q4o9S3A|&Ol zf9;G(o;G6=D^t>f5Y|r!39RSP|D>^H#Vl$P7lj;s|0C~ke}B|u`v1xg&4nl1XJH`0 zJtw9`+Z2}9`G>*Ws6Ln(fy0@(BUju~BeB$|sX7tlgDkZNxvyDsz^o|ZUhQx&%SzJ@ z4*HAXRKvn-p=MiYik{0+3HXA+#Hc!b_%-CQqlNdf9%-CXSZORx+`n03UTL&Qwh|bY zw7$@Ne1zUPgPufoC(jz4?h{v0MPK?QM(CxX5oZ2WPC&_*P&Qov!R(ht5ox4ZOOG06 z6;JV^yOya&u-dsuXOnOf!&v43B7uI&u>&WbS|Tu|Tc}k+1rAU2rCuujec|hp_YCTi zWRY<3i)N;?A7YfiB?Rht;aaWIhk0!Mp|gY=dTmb45cSF?OpUa4EN~r~k-lUg@zT(7 z0Vb_#%@8<|M)f@XTpRXtd3is}Iyq7z3&TT1796HKvcQQnGYEjwFC9L^SQP)f@O4mX zeUY$qqhzH-)~zhzT>N4A=$1MfO}UzbeXTE31%G{;+$zAkmosN(cM;q-^+QZCzUO9MD{D{ed<6= zR$3THi7JO)tL|$(?f9OVY$k9jq#*3d-HF)M@ePu=>O=(6_QV5@I z1lG4=wkASzZ4H?)cwT{or=M*aiYMD=ujx4YS5AO3W|%fs7YR^xh0k*N2z)r^Y$9zU zy8{^2_ssER=T(j_5`F2@WW!j{YPAKwuWfemtu9{zwfHnJT)AW?Jcc4Iv$?*YnJ(Bo z?l9niJIHbRpRaiK^gplZc;bR^zF@lm;1mLH91(19cXsZ-gGPNnGNp*X-&1Ody-q4dDzU zbC9K0q^0|@=?SL~M^_r;sUFIV#59Z%qo=;9OTxd8hnpz-a(l-PhbA|Wjt@m^R$bw5 znUv@0<3A7+Mtg~WS09m0{y*qr=LP%tPYiyv_W!H-d!Hygsl;$Nhh3sG={?Y%AGF_j z*?b0j0ub49fkx_!zZ*n1%4M_v6QK~F>?{|-qeb0CmfY+auCzs<|TS#ZF0@jSCYt`CD*U|md2Mx^og z!~egT1&>^)kHsa?sGay9)}_);Xh!KI+QA^uxh2i^Lhmxd!m-R)xc?#4w|3f77mC{A zt+q<2`@g7({>uKXvS2Q~M*9K?pa0e%FHHX2%t77_VhdNN)A3ouw zhqtC)U0m6hdbPN7U+P8Hy4II6$FJ(VUBD7_sPkruyeN59%Z83OyFL_vHdN(6a~aUM z)R$Hf@&`)@6~5@?Uh=(kcm#B8ZGCY|p|Y>_#p3pTspqw*oz9#{bbgWyr!yn*&R+r* z)RxiimfawIYJJ{yGn${s)!Pore$=)a)bPBdt!=|f61EQ?M?~40etyd-^m@-1A1eGQ zJ4EUS+nq}zOn1JE2KFuI5=|?YU);qSH*U7wCRGA(;geQ2{Uc1cv%jVT-)IdI_V+bY zK2^JaxhwBB5>ALB*{KyIRQsl4YHV)cHmHu{rPd=tsxScJG2?l4ez0fbZ7SIFAWt{7 z4kj{3jh*7V_$f4X6{mlK;{P&}zz%8W`2rUpO_n}XoC_{qU>y%Pt%GFuQjcafKf1j0 zs_xB?ZsB*Lx5y_y2JOdRg0sR#W5oegb-j&RUd0&rl8`tcxWmUG>*DwIW=+Sv7vRxJ z2H;iO?L9X_H)~9$<9-zA7wyT?b?wj{;KnEFK}bZw&yd{1w{pb+^}C|ykl4zh4ii(< zplEF6!H($w7alZ<5QW9N7EsUgDDvyJwmxqZ_&mKiefR_uR~<_|-`2720&`s*d)`DU zr}slFG`(Nns@W0KVGtayx7*!@&^5Qk;|#!6$qrf^D8nnSX}W7b|C=^_`tO8xt}GD z;_VQ3D|iDa;?=@)H2z6iD)Cn(Ivx<;Cwct!5!iZ8r0C-zzXM)-U3*qqpx{w2`& zR98m-ed*;nvEBT2ADp#_}JTKh^(8FZ(VQopS#p9XlBtS*eb3jkSi;j{Mz+I3?T5US@26PlNFV)5Nep z=iF-yo%Z@tw90ZXB_)+r={$qm8pr%3moRuQKC?Mru?cNuzVKz*x2V6h z3XGUTK}7caYl{?Zi9q@ zBdOzgx}zjiqRk!9iMQ&G;Af9n^^>yIO#0Ku_V+9yv;OVxSsFZ1|9Juc2mQl;hHjHO zsm)oRup1#tFMCBf-TCY_e8xUog~MtBxBOu>VO6wS`Al_11AzvsuNy4Bqo_~(Sx;as zl&kx$bTW1+5PjJsS8JhMqpuQbOZ1T$eM5gPw`fjsTSKEZ#-0C~_N7El(@oE1v91qm zDV17h6o&1uYN%;h$V+@Oer9ouKz8a^9z$#dcYnq5n&y?nx6&Qh)iDA=-%>GWOX1z( z6zO`z`Z|UTuRUf(F2bA0pSn_Vk<@jH#E!EU(}zdSULF#|HfJw_;iLtIIqA=>X{jc# zBgh-y?B(G5&q|w$;)4q_~>_OfJ zufIYhaq~j2ubPMAVypS6&m}0#j@p*jw6Bz%g{ygan0uwm&Cp%g>q~g`o_q5EuG>PT zB8$#GJEJEUH?SpoVv9Jl_neQHA=LcAq)T`GU4y5s!N5n%wTAEiGcPeEq6^?_lmDPy zPzFQ1EB{V|NP0sX;?crAq6aOJyL_8Xfe(=fG@qOs5s}_tgUD!T`8oH~mzx5mbywyo zV>&3bx^{K%6H8K!-&EpLi`J8$7%=~4@s4IqLF8ZKGBAB;{BoxyW%-^?S%DdJafEaD6a!G2)gO+yEZJ! zr3az=;Kl^tVJtJ}7sP9ycFpJYC1(|RQ|2;}aHxR3kP7m%?pi`MH+3$`Y<{}>uB#>P zBjhsEI=?&Ubq?R^um0{{Z}sqPys&NO)5TrI1sfU+dAEZ4ac0^Wt?y#5kl&6}8B$hs zm)yq7{70zbNn?@cc+as$dDrIk_W`Vb^IETO8xQ7(VrtCKDfC&F$#dQOshwm!{S%!r zrY8wMiDJ%fgAsy!~jk|5Aur-Ed7U1LU`9D62Nl7}HTUk|p$GSvqhr;{+ zae|9ZbZ<^RLQ{zzX#uIjPBlYjGZ`9LGU0B~`qVn%b&FD%c^M;_imvNmKT}MXO1!GP zc>UDkA>mXg*$78R0`Kqsp*CRtnrf_qYxYTinnp+5nq;8y1Az}V8usu}P+j~0aP2p^ zC@gjsP-Us|i>%tIm4z#FYGRgVL0kS`_S(X1_5)KKGq~~A?3@hHwQ*_54M^CUH4(Ce zcE$q#5}FoV5w&%`c#$x*C0z1FvcXj3ID69nJHzYd$?pAvCYXxF`UuL&0Ll+JD4m(Z z6fmP94(O@D*3WS($0Axf?I}%`$ytfapBv65$`-Qvn)U@2lGJ6`hreA1-KA6q3HvXrMEqaj}pS4qi#WW4% zsk4`IBPV78)p+-w3W$?(9b?jfvqc=Y4L>1w%dQ`z>CzG;*Ba~~kze_hw9wvlUYmPa z@3nBR1}lL&d)wf(pcPx_wJq>d3u(In7O?;paqe2uvCB2gHFcUqeknhWUo2^(q2yO2 z9I#-#B6%a2bsY=8<~o7&0<3r(E9-<@Uue6h{otf7v^Z%Xu}#J;(ALoLSvEZ5V!0+( z!qxn)alg0niy*M3_p*ohO7!Y1CCU!Z;w~-Tn(PX4-ei}P{$lBC`<=#PZZv+(# zIwWz@-;wOot9gn0wJre3(8w%CUemU9gyVmiu1bs?(G~FC${otwT%G9YAvcz)$Pf}d zj?zTGUd8W5g2capR^XtfuDJhnrCv7vQc%GazlPO>gf5$xamE@j+@^@%uhFwBHpesDdWebNdta$(x@eB)?GJ5C}SZj zVR%QS=B}m*KJdmg{5vXpEv44N{8blsxj=tY{YsSa7dq}gwumB`ACCFE7V|($es_Z& zwlCz9%YHu}l$l*{F?BgVoL`?wZ{s@eGt5u6WB3Y_*ygo$_@2ZzuSJN}E4K{ez-x;w z!_A%6|B^4msQrsvMh@UJfs@wfMS0WF_<2Kf-BO7XoY{wKl;zu6Dcw}^sXp*>Kp27Yg zk$oF;LHA~S?&LLZB6R(|?va^!go`WeoD_;X$Sy&8tWe9O;%)a(lCtf&^f=R;ssk@# zijb!IT94#^v`-@Vh=<`#dZZ?Ok`S|mIMhiM`n{2+_H|v$Wm4RFvZ-Z#*9QcFML^^- zqg+-I$*~)EMfl1!bDZl)V|(1?lt5-;Y+l9!tb_L4BXBSs=oGh z_-;A^MnDX1tiHedb#B14Tmb4ibw&g77z!|s8GM5CuIOko1a{#h)g|1~WOvdTKEtoq z`iPf)nE2#=>%)HAolS;ThA&9yY}!6`_yXh$Sg&oJ@2Nvx%X-7(x=cRluUbzCUE#0! zUT@W=aIh?Yzh+xdq|fG@2FT{zR-1FjZO&2F5;130{-DKk=e|07?%a3X@_Qx(Shu$5 z{sWVG-mXoB-nvBli7jk~7zgGe0BcyxRi5cOYI#ImzV)43zMmowmwcJ^st$8ln+sQ9X>i1Q+~~Jk z*mdI;bY*K?DO;58_0;kywZNvEDZ=@%oWP;OElpnL%GFpDSvXq-k3W(bT4z&v8B&Hy zk|+{i4x?AAE11AzrKq*xY8|W(Z$^JqiT_%ZKO2%Ahamrs)l7npai|jB$kZLn$111l zj|TN_n*K;71O1V)r2GfJX<{lX6SC2pQW?4R1?hEHCG*`GPnCKTt#=C}=N*&s)jUnJ z)IBsNjwt2Pp&0l^3(eM45sOC)|E9@};2>SdF-(=o$olX1>pV^j5<9?MlRU>d7w1|> zU@gbG_b3y*^_a;v=#>ID{&nKVR(02VuKSKgC9z{DxB4yB0WUrY;;aVk2|xPB@>=Nj z$jA(%#SYAtUd2m#;3V+l{2agbbtH2Pt&e%#2H18xB_y9q8xf4#Px5IbKnT`jc)6Ik z-RsGdW*RW(UhtT?7sM^fYVF}#C%Hm@-!4|O(5qkxqrrMrs~y9H#1d`Y#^t)m`~f>f zPi+h@ji%_y8un&Z^i*C{QuLT!;*%wpzSpT-pyff<>)xZT_?2FjzoOb}uJ%{pcr5PU zjEeAgfc<4MekLZKJiY5ghfce{tIq3I6r0tEy6 zvj)TkH^4JP%1b^?4YF#GJ2v#fT6xbrk{(otg2rSo+cw9Apts>MM*DGk+U#sRNn z$bzfn<;T5b?Kqh~4K|@1+{ecEFTWQoG4`18VS+Ml{=Tt{8JETZV--Zq@yNpi@?fm9 zQKsmDn=O+@%%m4-1ahX*T7(8kiJBtgEasTkv~Q@k#&2Z~gnEvXqUqnq4U0oiB$EdC zsY9J8pS*;APK}0G%5Z~bMno0oAqWRv+XCl+GpHVHkc0Y{NArK!V<{KiLg#~ideG=L zB-a%-El^d~a>KbBJRy>$kI)Se9$d-X%cRafxwSMojZ5e_17ROerottQ!7=Rhv@I2~ z<+02maIYayRY;t32&69~HLWKlQjC(>M2b-rD`?;0oc@cYo>MmDC0B2loohV+=Q#bge(}4J{pmpsQnB+2O_KaA^~4Z=iJa z>yMtZ_`JzA#^4G4sb0l^Knt>Rzq8b%qn{l|z5-qN6EX+~CWMHk^ll(=DTZRQ&97&!_(<#O68r|M{Bo=>J0% z{{h3*xmpDFxA{4ER1E-iD*iuH=19daPq63l=kDCLYxlpkjlS7LJ_(D1`27`2YMPgJ zBK%0V&wAkXwh~Iv%_yRnqJ^!oJAx9afkM^aCoShbtBkS}M3~iSP=b2ma z;_u{ACX7T|#Zjvw?8u09rjj zn*7)J!L!$`RJ{iCI+{8AtO2=>q;PD3d0m-L<&n^*@<`?>6=pMOr|rc*a6Rd4rpFxo z{i0lKcU_vINJvhP z>}y^PnT=%3-SS9&bmbIx%OSowNzKU>Vafu`LxEbMz>=28&NzNl`BDXD5g9 zakTG5+>#G)VwqQ>`F#$Xa#Po>VELR3EGf$090sORuOxvb*G=+>91JU)O@{V?IUa9 zHhtWpLS1!FX};$+Kf>t@masWD3|vXpLsN4y(eo+zS}u2lpOP#FlnyyEmF}YgNyGr~ ze%0mjsJZ6lZTX?3*r9W{Zk|qNtfQ$^$G>4z>*~PBXl&%7?$;`Yw?Ii$$PGTVk3UGV z7akMoT4UYEFSd*qkL|3auVoqME90L~V_~~KHkTEt*pj@My0;|bUGFa|;tm&>B9E|5 z4Z8J7m2K05$cP|QT*4AH^JShwdpFCzQpDx)|B7BbKu zP#3ySR4k|YGknIoHsxSe;M9=Lon5M-{Y8`r+E;up$n{!AC~+ena|w>dNx|_k_L|+V zCC|RMvg^Gwb>Ux8%mr0^ktzyz=;L?z(3~5mqKe}0g&m2i=6b(DSYG>zTzYa15E?aP z^3|f`_Wb9lDX9Ji9&Ngmb!%=x`s2cBKBD%58X!=s%8@eYtSEdRTa3(ZqwLO$95Hr1 z;%}}KJu*2QA$wWQCJ0EbPc3bCi|BUKKrY9bly1K34P==ls)%9n1TO;^2YA#Qoa446 z@48%dHsipu*0;FDjR!pY_N|Eru^ox+8Ja+-N7p=&IVG3Aa52JF)LAtX{WmBtVWrx8E1&C(PR17bdj}Dp%D=ZOx zBKtv+T3MxU&5X=}+b4SehTfMd!+CUR%>C2>pvdgjXT>H$`0Amo>6;QX zJ$ThDC@E_><*`Z+#eWJ4Z5D2S(_kioq05!4?ePb!CfCbru?MWkt*&I@W$&>wvu6po zA9K{9^YZ}nSE!b@*4YW2X|Vc0D;%#>q!Sq?YrLaevt zucoQOZ%N%)R&_;%%{5FG6WQMsM$51*PO6!tql$kL`XV@)yGd2!_1b`yUJT_ghrwsY zD)}55xxBokvuE!+EBpSi1EqIEr|J>=Gq2!|h)W8n^hyJclI3-sL{50yjCQ8J6L=t{ zqLVrMu%?R5^r$#wE*~}U;nSt*_}Ansc9j|zUg^sWU`@w(Ss6L0dA+=h_*;bOh)-@Q zHG3V+7Jlexutd%yH_n02j=XzTA`2LA4#D+WK^L4Km?9AlqM4*x<%2jNn$nx0QTYN)B6bIKImlTRu``+atygMbMN)la-zGF7k=~g-il?o=55`%f5kF@)=>J*%bZrE+=sr~zf{{1 za45{=_y5t)&IbO~rb`Hx-*UIsnZ)5_je+tK=hUAW1u>XGE|)QHMZ_WcI<)I zK~WYS92QpVEAITHr3Cy3B}QwUuqm12iNnX?vrbHU?jXDFLJlGzuW>(D6omwpRhw07 zW`dhgAa3Y5>-6~HQ#JVcA1{2|l`(db8A&F3jZnfSIO6dYx^RqLq_e*^b`u{u#VLM5 zzIoBm>3~vty4i{QePOnB^z6difqC&5O1FlM$ewP!tC5ndb?iB8kH?F@J^h{3Xk*Xi zkyna0+dKAH;D{i zDO4XoTy^I791cOTC7FHCIu1K=0DRJcT47$}1;vP<_=swiylz)89GhIr$zh zmbY)Mi{*0WiZf=(2Txujr4eJ~)~s5uuDkG7<-s!K+&2tyWQGLO63c;jy3PXS^_SyL0IhZ~0td$o`ql?74K$z8l`2M zIQ?uRcN@b#aPD5)Q@jaE2UrF=Sg9H+ZQTwsqA$5Ka|Q!}$M{M4|Lh%!c#o+swgYW;$caFcW@;Aia_xbx@{3RfO z#r&<}Z*baQ2fy#*?+g4r%AeChls<#~Z!Ih!oV9h~tWC1TkqE9$%}@cGex!$I46n(6 zKi(3O7bpD$EMOu@TusGVz`qeBK# zWH`RH#x)r;IQ3BBa;nCnAw7QjpWzYAlA-)%AW1A_qMDwHdrdG-%ztu=8aiP>wL_;k zMF)^%uC`yRJmX7!lWwGuE&hz-_h2mg!ot=IL|zKJUL^h6{+Ny-N-1=zn6{?e{7Vvp z7P^_BjY+qnu5dLAU+=SwZ?f75SJU^(W%z2a{^S3gRVp_ZhS%Ca@QG zxa8Uxd8FR1m3S|1H`aIj>QSi)=`kEGziyDNRYk?}#EwDZx{B;DUA|(h ztcs+oB5741G1OWW-~v{TrDVPvEBlIyb@zNacu4gA9@OQ2EV<`{!9$|=YEos9pXe3Q zxMakrA4NYJ61_UtD7=lWk$b&7(ffMzx-HQgql&`MqS_z3XRXWkSfW>3K0$8e%|xeEPm zlrom+Rfv+pEqrJzt__hpqDciQvTJcE+KEU3S<3T{Af=QiVJRqnqf$QyZmEJxd5V^T zU>D{2UXW7Cv)@u^>mor_O8?t1UFy%W8nj6_g)`|0ceU0cWqA%;Dc)Vm&{>ut0;8C= zwyr8=o4KC%Skq0`kJh=LN8TTAaxjnFfclH>SThD|y> zRhlmG&y|2XrsJ=BlG5zW>%=I;#KY`9 zrM=0Fkb-bF+}L_jC*efN_)NS4T^wp21zG9OZ0@h@jPqI5SyRN={0Qm+TLX`1F_d9U zdRu1mw#v?Ve8xI|jnC@Nb%h>Y2HjyEHl>JnSa?C2g~QThU~$ztOv+xRJfoC!EiTXQ zmQdQ18omc?9-)GYBJ2|;%O>S@ZaQMC)rgf9Lclwz+93hOioJZo0Is&aVicKgOh4gq zOo;3BMDGe_EKkI?_>et~pd=S*v2is;FA^&~-31H;q`D!!E0NjGTU@%3?|zP{(++f!ld44u8{+ATd1Lmj8;-Fj3t#ubY-Bi@4LOW{Rlv;H!iCtNS&$g=@)I zXy8MOfBVYJi3ZKDhty~;wUdL99bn`k>Kvr=`Nq~-e%3mnQ*;}c)%d{%W<6@T68 zt2eWcIvsv@4f@re^QyNOKcZjlODP;{OY-csFD2@aTIY0s(1~J$e#=rfj^F#S4n6go zEU{GxFN0po(!yP!T0P7Ep@>t zqi6%gTy>0|+rjs$gROgGEnJ}5OY=;+Dp{!=%iLRkkqn=>)Kw?oYWs=MTKtx+?n0%E zaj=jG(WJh`y;N^zbFZPP*U;4K&=gcc32HVp)%}UKd>_%Tsl5hG%FUWN=$86Hzj-Nx z%JxL@%Vl5Cyp$}l6=;$Nz2>EbjY1PAb9wU=AenVAvutZM+E6ODpMLFDuSLq5^x*zx zr>sdaYK+h_FKIG^nemrwOv+hiz%S$Q%ZZLJB+x-%R3UxpcNq)W_SE8q8XKAwuqK_| zkZsqFL@YRt7R?3jk`R49Jt#d`W>aM~%;1mQSY|%V_EZKdAOsS0$hOp`?{NtJy_Q$-FtrJmIgdOrHK8WXN24E-wVw`I>8qk-BDe zvW~ar!>%?%v^D@KtE*msgna`S^#Y{4XUpUM>Us5c?+N*X5GTw!kCMSdm^MFmdcxUFeWL-9~Gd*o(rn^L6fB4$(ol zU(0M}HL5DEr%naqnkZuIL(o7wN$6~n>XFpRZyw~I^p_keRs#;EQk*VwHGtdax)Gp@ z4p8X$ntbmAvdpV4K1GH5mkSJ-TRgbA$if|(d06}1qY|JZ69>~E(O;r=dD*;916mgZ zzP7n*5O_dOjj2wP(M=JcYmmv!??E5M9M(RyuHV~{yPnyD6u*CEw%>s;w!b$wMwKrO z{>wKt-5XqW!Y;-v*->5rN=0V3o+`R7lh~5z{hD#v32q!E?*EFOQN5;*{N77#18cF=HWRZansVyZMx-iax{K|TJ@!OXdi?IW z4h91@wZ$EDblcfT6>#0Rtn}PTpdTG@WC~TDd$4SuP24}Bh29Q7@PRY>&UozX!t5Yl zuB@cz&Kumb7NtaQy%_MfRH*d`{pf?a_QI1EwC8`%`q~iV%)P;@EPO?I%)Y6Q_r2s@ zuqJ;7tvat`*hDvYRfRuNp45@j`wb|f%ie#I_i)if=O+^=o*}0pc&FHu9?0(o`S)$-!#8fnzG3)hAxrJbR$F z+zzXkb5Ol;TzGLIQXl+-DoNAkfVElpe}YQ4Wd+UY!@7Kx?nMP}z@>Wq);@o2uHRdm z?Jsn>yw)3?Y4^F_h#aHd^p$!O^)$PQ9GTtvtk`@p&ggkK{XHDF^KG5B3~q4d3GwM@ zaH<@*+Lm!nM?}wFj)k^BdH@D8Cvq$2R(V48; z+f(N(cWiClk&JCeRNlZ+;m(e_UH1{oCBEiPQd}Z|WL~7P@y4uDP*=c+3_p*lZcWjf z0@g(DGn;bI=OQ{E5T|qiZxx0eF#P>q{VUGY<*ea;mm60?CoJXL1( zqPWu4A{s#%==^1QY4B2CsRF&6Q`tMgE}I5i#~T!uD6&>!p&2b_q$pTW@jtJL$L1}J z$3DPcn!l!N}XM9Fh&7B*oo@@VR&3516=bZ52Jm2y2q`%qZ zx0qNGu1A5Q*Tj*zwwMW*cW5BCXjEA55w_~uHgIBv@budtkafo{v5q67pbE3K!48HW<~*z$Q|W{2|JhKBq_zAeF8a#*q5oj6k@eOQ+ZCcU{HHozD?WBt1->8+~s zR@Hl}kiTr3CRlWkW+p$JS`ZxBUa@pfQDcVffpcJDU=SZmp3fZH&A0B+_2m8-K~(ATe&cg+ z{w-WUowbt}&eq0n#ZTkCoK*%iw=ero6%V~1-k0&Ku?VxaeywjlaPtutXN z{CbU+PBn@vgR1t9PFFH25Oosk)0PEi4-+@UHyH6gS#<*ePcyTz&H}yucBv$YB`b9Z zgg6;yTe(VhR>9A$D_6~0m`FS+3-ie}9jo6E&IS=uPVjAAyJFUs6O`TK7J0X@&%OHw zDo38yD!-;<;Tu+1S5VY~!WDc>se15Kby)kOR24y-c#;m>faBbrV;JH2Ikn^E#Epo6 z%jew0{k!yHKtDJDUwi|HC8>pepYR|bX8pno8v^2SWL?eqT-^|(DKU5$$Zc%6(D3z7 za1X$lrUe6eV=0rGUDGjv={eet3yf=hVFlw+Sf)V@5Gq?(qCL0G% zAv7HwEqr4&TR67sy9IGYC(a>CJ9#%8iEpf3K^Vs*$K5*3gojUXGfh0VbwY8{7RIa@ ze~Y>=Z#fISt=4Xj5(>R)*YJ_6{dSy`H&I5Wiw?f6EwL@fA%(;0BOWW39`+tn<^I~k z)t+@M$~Rc3wyZ-#Bh|2!h5qBps3;PGLs29adY0r_LZN7a^Lctp&`PZ-;u!VpZ-{w@ zBI->H?Q^&OhYYP8(iVPGA1OhpRTIlTmgI1ECP z2VF&K-d$llsvf_TvJqufA{+ycb^9hi!>9E2`|oFJMxd6(m3;WeKHe zGL3dPARBj+0OEA^oBLN*27Rjx`xbUS7FvalGfr4!M~tKEW9RlQyek#(#W%w^;_6mR zA3w4UY9NzMp)QCC9kQF_B}(F)d3;0CQPPD5;ZXWqK>s%e;Zu-M;S>7!CEM2ipAQ1S z8!w`FF(WZBJPs9&mCc0248TX3-uz7Xuc$Z*f36Rm7&QcD@{oGu(Z9INH=O~# zq8AM$VlgaP#6?vlk;8<{-TJKL?BkLU@uiJR;YS?B2Xe~1!BepRLTXvR130^badmXt6_X%f_Yd&k;0Bo3li z7gx>Lt+&%Hce|mzW9b{#6I?nm&3Z#cfBk#ovHkqrv?Lz8i@&4%efE9v*!Ay6w{l%P zc8tI5(s-=-1Jmp^x<^j}d35D;l%38pB+XpviMCwsR-W27EYA&e@L&gF^}3sdt{+Ut z84qQ}?A?7gC%H79T~AVGw?3r_w4a3^vDhfkceLeULyRF}x{ff9oQ-AGP9$`B19lR+ zTb~tO?ED*8s{{U(^gWF(SEdU+;wu9x$zGxIhSc7>F7plGty5-5XN&eXR;5B+bq?R_ zz0Y4eyovCpQM=QGxCZ}y2yiQ^CA~Fx@8b-na4C)D(od|(8K`ZbBqx-xeO9P&uF6HE zo;8%PTG{vcQF4TxQK;H8u;qyVhVTwd3XWP;tcj*{@sQ0~*Li034Xt}O zrZlOuLYmOk$#(Sp{>q_EQsX$Zw8x@Nh!a-N?WYch*%A>EO!V!|b>cNu1l@J`W(}@F*A$1f<5>4{!Zr>4R9Tx;J8!_8RPEMh^~SY?80R7JWIXd)3!X#<+^^=!8>KA6 zlZcfR&b!a-RSLn^l|{w^_TcBNx&jXJb07t|~Lp()BA*U6tKux?Sx- z<1JO)uLZRm0GT~=2;)w5e%5Nw&++WRLI}Cq@yhhy)yn|Bc`hbd=1fZ>D+lypw^}N@ zU(4}3k=?1(pnGU_=deu*3%6Gh;YPt7p6=X?H9tc zyy_`_)D^DU*b;(KW#Jl#`BOHgm0`ciD&+j3yh6^ctimeXPyGfp@6WF06X+uF-VwEM z%u4ilWG<_>z*}b+;u3SjJ>2skrPMlZKe_1kHYHLst#C_z&?LF(ePL&GRM7jKR_ut0@!4SX6L`ib&9 zHQtm}8lyGCvN5Hq`@-?!hFCOSA{HXx1^8~M%)EB34v(VtSGhv5jVnTGa1%x><2_+L z?XV21XhBp_Rp$8hnb#W10m$q&;!N~zWc$R(hdjjCp5r9OnJN=K+az>GK%USHHQvz~ zQC;=Mbx~U|5o3qH8c~Ub!i<@g%`LU_S*D5AY3spOt-Y@BdHG~b)XuT8XSWAJJK95K^Z$bHy|Z_|EGUFd-gXt%fY40=zno8WfqjV8MX7R?$L!H&&wTS_iBe`gn1s(vkqPQ3re6KqxtZx|yThcmS4fwhe3+ z1w{TsH~#GGQ@~u2{Z1nLc8x3|333Z(m8FwFXC)Y%S1!igBvgTb5cEnrPn^j84b@@% z&uLnYNQ)*qn2YwQekgG)NuRI9Ig)A9kS}J)F1~-b{_k-gypi6|0L??g+8IY^)>uwm0J+sM6vaRBx#57)I^bvHo*>^uw!ckKHLTbiy_@Qvj;$oPG-OWk%M%&9mF(>n&frxp-$274Q@0~ryn@d&MCZmUxEZUj zFkZo(qVzW#uRu1f>%6UT@zv$)@e-&9%uzYsY42di>#exMeq!s|;dMVE{<7u{Z~LQq zIA4H*fIhJ6#)Jk7S?P^My}6Z_phf1~LYghPFqzmIA1rXBgVOA9=0r6nG+1eH9w{>b zXGI!P{2*dh zu~ggw8%yOKk@uWd9O*PDZUN^-R&6_R3(V?EaSNUh7@Tup{C7TAN2S;2i#ia{M^dLg z#xo}JA1~`Y*V8A99KDNXa8fBR`(reVR>q7#ix)@tHv*$jV$k;U9s@4FU&i@0tz$K^ z-imvc?pdN^1)+(lV`RZ+0FO*uqlJSJNl%Aqv8@HTNxsut)!;Ah^qM(^gu&vIsV#^$ zux70bH890?!RmMR6VULazg@#*9#1t)=JC`Bv`<6gt?KZ%Xh^(fW}YdDdxU;(#hv~G zLO+%fFy(T;UIF~e{=M#h<&ej*Xk4cX6x5{x4L%!svb{Mz)d_IdvcO-ki{Y{+bT+(Q z#gYD0oJAlwIDkbj!TOcOQTKyH)?S8tkZ z8z_Epm&6tzrkpppA&~XcgHa)4kXn(h3=A_LhU_h(Pr<` zJ7euqZyd5VcXYG2J>MsvMO)#|z9TobGzaRSWf>Y)5C9a=jf@}boC8nS zF`m@4u@QD7^9U}-_qigUzG7c<-}}t7Lvwnm)Kv)rxN{j6?nQ*kEK(5 zC0eqsz}V(%!Eso6R+tV|w+k>P*)TnDK%&-($Q^qy>fwA)RaV@M41!tH8+65`NtODb zjk$H8a0H)xAyzaE}VxW`Ps@JXWlHDEI zah!^g4}>I=DS@-qxu7`DDX2tw_#r%0V~hd0*fCOQhUQ?}VXE8=xdY|qeSo-xbh!y} z`&p*sG?9x67@!j>t4W{~QfLM`^#VvMBg`XatxXin%U)g%J(JK#6B+U)cnM1l5=>M0 zR6|B)wKSO<`JJ;;)1Yj!spqF6clU-4@-ZOSCKJ5WoKv{X)HeT$@SB|>x} z6&ss$?i^sW(I^vY-GM!jSeS@p6x-L!!U`hT8$ceGjn|lA4l@&`*`|}YD%ung1Y%DS zD!uJt6Kc1gXgtd*eRp1iMo}hoV0LjnhgdmYO4gzU*Nc-emST!$BAw&&@C7jOKZ%rx z*D+D6PKI#H$rb*IOvxXApr72W{Nbzgl~wvfvT6}4DY@rWKF;Vl6X85YRd?k4cpQdi zTqXrW!TZwd=cP>M=s+5m8>mm5!7+9Oc_BW z`}{=o)zVK+&<2j%{xFtdl@vNtVpyP?hyw;O9{ml>zvW~vS*+KK4RhJ}^!9sQ%L>)+nr^sIF#8Hc#1s}ep|`X5;i3YjB#jf_}^E7ui;a0H`N(wJs`t@J(8 zgnPW8BbRqj$J3F^FMQI;MMm7pnCLl-xtR}@g^#S|y`~^CVm%(V=Wf8&qUuZTm2DP( zR%4whdQR%Yudzb9)!%S8E+kr5@3Iy7Jk0073mBQ25uRy|(Qk0+U<~6NQ)Awqt&6}d zb=5A^Xs|*3+LIGSr&QG;J#HEl0wrvRSt8LNA+Z?zBLs7MUUfZlWXM=%F^b1P$$p#?mTM(aBZ=gMhhoJZ zC)vhl5aN8DbZCtFtWmZ$8}~4iM{yw}BXwzKlPniC0|ci?B#>yg+JrabLaCGRSq%7S zIRe_U9%1D)W;Kxe%@KU5RgZp^9R55Gj*5&SgasF9=91or87F9t;D=f!^z9X>S&66j zKteAU9aqo`CjWexWKt2u;mOz)T7h&Fc_~KG#VfE&Qpu}9IW#klBKbCBkTK+E+AkqRI!SrP8f;cBaH z$SyO&7YMg4L93BoWdvgZ$M7NkzCOFqryjUP=X^S{ptY_h=?ArI8SAG9Vd`yg11w2C zKDboap@3U-L))l@7I+-2lgiK9)Jn1vvX=*%x1d_te^BO8@}TaKr1Zh}f#=3h9#NTJ zwIq{562;V4W_lSaA1_J;zeOUl06NuBnK1e^q=@gk)nt6vn}=@+Hf)&%QLAY~3cJL!W0Tu1#AZj$Go)nH+6uYfI1l{yMk(cKfi?fr%jO?BQW zRDpL&spk;`Y%tcQ(Da)%fp?(%G46+uA`>=Ca}_51HK$fVhY=FZu5WecS0vT*WvAJ* znNJ1srcW$d^N^~BkOJBJYSriCGzC~UFG0e@AG-Qau9W65)^3Yb!<*nFj1f~7`` zmquGsdv4>1h6Gv=$uy|mLz4*>U~Gn38Mlwn8FTw1`jCWQ1I=xCB2TJ6Kw8w28-<_3 zjrmc`F(*HjfN!IiwVNC>WfYG9^9GY+*izyN6PS$^JGmhM+99G}y%OScenSr%GrUg2 zYeToRY+INX?11jsQ7pGtUkBToooWJjRm%O^U1@+G2e9UeS`iq`$Bou(s#WJ{z>k2G z0DhlGthU8YX3QF7%N?B z_QSD<;qZ9px82>aDiY4i81cf*MNLZ@-)qVO=z=Gm`41O*!};?w(hl9fcwZgAj)p)qpbY;`A$d*qx@tyGtldmZbe75Ibp zr`jS^n>0Q>J6yngnZ>l){J0$Dos;-u+sx%F8Ot(k=K z5s|-m`}@p7|3EWnYzz{JJ=bqEHfpyc8t+%%fjg((0`%1zb>9C2sMuY&!0PIGhBoKU zpc)AxqD@uPZkM|V!vhw;&oZ;QipVm_;TAS)`i;TjOau2(iAS;WTRpEiqgy>9JlUq z8#La9%0?pH>QVQHNQ)nJXVn(EyIM1EWME{YkDpq2HPqyYerV+@&gh#2HDE^hf<4Y| zM#Zy~owL<>(_AQ{e;Sp}w#=YwLiU~NPpA~LQ{Bz>vQw?m&1UQp7UrO6Vyz)rghqU9 zoMcVTi*CFXdCgYihiZ5v0}gLf8)0G~lAgI3jdF%yt@7wdH`$SH)sZ$fDeUSla^bmv9xv^>77?V#9pB;M$0C`Nl5t=tk+*{F;t4hKFR42ruj``y>;a{iEU z#XwqbL9azf>@?zMi8O}8d*S-%!&D56h*!iEr;DLxM)X4~T_r;UYqo*`OmX+1Ian*& zWMdOzm3aJdzLZDw)&@-VV|2Y4cWI-jB-uV@DdQ9~PqH!AbFf@;bltC_e4jEI<$ z`$vl`7X*2N8r5v+}yle z*WVD|(A?Z%!w@XrhrfpWj{dSQXP4_Y5&6zy-uTM`4|)0<-!{4m;d>D|ETRNh5;{`2 z#_oi`y2Vtv!+cs4vXuI@R&()v(y@*FAMOtt!Hl?2-z0>+9 z`zuVAz(DEWQ zS1Rj3^V4{Dv;Z7Ff#wGg5_oQe^kH{|FhV`%yRcJv)`@M%oU8MWc}3|Y)JBjAd{1vn zt?sJA`cX5GyVSxGh+N>g%7f^N6){TVHBn4wP(QxL`d)?aMAJqK9j`!3%+XFx-^%_T ziBij(qU((hN+SB9m4V{}Yt|4@rgUOu%aogG-b9OWvkS?d+@kP8yQVNB8D6R@`_LGZ z8sXAp)$R(aXM2!er;5TsASJpNMu(jMyjh7JboWA{s z-1uBjOl85?2E+Lqv-y?-BE`#eK`Id6a+5?ki?tR}WWJ)h1+5QCQl$&@W89=bKZT(e z_s53;H6*nKXfPo*Ad|qtuq3nxA$pmoq0yJ~0DjNkfQ2~Bj_uzeqDX20rXy9y^cWDN@C z)wy)-ZHP}vPh&0iitLlddZe)yY3x#4kOrX4nhiKb4<1sf*g5lsLNU&Hk2T|xKJ&sZ zv2h6c5{`?M28BEoXc`n>ualr>BtF+w+?mVIPr(OQVfzeDH~Xbm-Cc$5d#CxYR0XS< zvg{4p=10OfV^AA$9oOlEKeTJdZqs5nf}5R;BoF%&ojDfxS_}NY0d951u_-C`^*I?> zfGTuabgF$R%EHqgswa(_vB!?J%$BC+i$b_&6T3diE}7EDJ=S8jIq_O6QESO)wB{*Q zgLWfG=T(%OR-Pb4*}kY%*(_B66ay)W+{ovEWx(S?2gQ+@1GqrL#CjIb$189yhj-r_%WQb`MEeM)qU z2D!%4EcxvLl6KIy87EceN~fbuox!_aaUlulj^rau0NuWbBoK|VPpGcHiY?T$>T2A# zw|o^rDH)<(bB3MlHfST`unlY}!9!4;_#v)VV!6=N@ni8#oLIH$u@6$;VlddPX#Yfk z(IgDfUiqxRbCMqhHLZZtZtiI#o+5ghzKh-;})Hd zrfw3GSV4b^!^Iy=#^waeCS$~4s3k47c9GTjQoHI?ZI<+?UxEbsOcBXT=EUw-Uj;>N zWQ;@eaPm^RoHg7m-L(Dc8JLu@qk&i|b_v!~S$JzcJ|%;+Vp`1yjI<5iOkr2LBm`QX zAhFn3d^Z6uoOGpd#7&Lx9Cre0kNV&`60@^^&+#^6#WwLAZ-cjBzd8yz#3x$L;-?5+ z+c1y#V_Bw}sSTY^(FzDU*SRC#?~eTFY*nBm|Iv;-g^`cLez58SdB3KG;v1NyszO5B&=2gq&8h z8!qJSGqel2-|2$3eZcuh4ht%&AwAI`y)pwYRKj^oKY=0Mg4uyJcc8~$+TMcRW#T;E zjT`b0s?WKk914k>BBt05*0oliHn%l|Xo5gQF47_rn~3=F$J`*3b2tQNDuW*;1Goopl;&>sP+w*cw8sAMx?Au-6Zd! zyBfb7tz0d1-7JD;jSZ>OXxbx1F7;nmvwCe!Q{aWVCgamH!v1xY-&$L_dVA%!&WwAv zSFS!&AMxm$-FRbEmaQQ*_}lcv{p%sjK=_))ax1X#=AP0p17!57%`#EWAnGy~2L8(b z1yj$RB}{!4n7XBbYR%Hp0pMvl=K32KNn5INjH!)qlKCyoAF*wybylg7s0g1UTu)=t z%33pi3tNVus=Pw5{u~*S6ea-Ullwr>lC-t?Xbtg-1wkQ>U4;wG*{F02)a(0E9~+C1 z{%rLpbjPe^zC`e+kYeU@G6C+gZ25Mi$SE!|ldGwfvxKUbPu35Yugs2*kBYl|w(`9v zB)SSItKRF70=$>p_WW`sUO@`GD`#go*78=J!_z(lfMznZQX>lCm!Dy((gKr)EoTe_*94*a!Ij}q*i17G*B-`q;mUWTl~+$_`C)M#Y2gYQ3$DCtT;&M|h0|Am zxRQ>tpt~$+-Ziv51zIj~pvzG!73$MUQGTbX+A4V{j$&(iwW|niCrq`<`-5u2WzvrJ zsMi)#naZZ?&+&5t<_nTtl}sGj8qWdf*V-aYs;TIETf7!s{( zo~=%qN$mABRp`H(^=Q`ps#yD&-qwzv9#y;mT7_fg=OeoMm(VGEW<%3vYGE4sAb_fc z_Om=So@$`hsixWRd#{BTeK});PNVU{SvTrx%)wAC6+-JPRj+=iQupZOFJzk6Y58GF&xLBGNsVeOj4jklw-6dB3Ij(2IPu&R43$$PuPe<)n6>^d`xs>iB!g) zr%S;*)dS#qjxW&)fxq7lJ_RPBS`Dc}ckeQl&=03+)@Mf&qn8B&amKMI8~lrCheg}e z==5xR0AD5e&kzD+V_5)+u~zVl2&Q14iY@`ne9VLBQOD`$Q`AXCqumASbXM3$E8R82?%#oK8r#_thT5>BbN04F!d@bn==R18$_mI!)dgjxx}(o z-D;=x);tvV8C^Xt~GFw$@%4|_ZK>SEd_B>PU%VZ2TT6s+u^ev3;7IX#} zt-OL8SAa8)l;N{Xp>Ku^Hd=W_I%`?93}IhNT`Rj(aY92hx`||F*cKK#T8SQ|Y`!UB zSmnsD-NA;Nse)x!?^?A7)CEJGt9v*9)VEXhZLhwK#Z6eC7+fdrt4z7bXx}!mIQ^&y zh8wNCVhiwe6)~AM^L<30lY1K$OOx^t-h=7_jp04$&IlGigmD%h(QuX3j{Knxjfylu z(G3ER*#RAP+^-=n2KP5Eld`w0l>|>KLQ0JjqR}SCS671%L4i^m<^mdjU)+E{b(jJ& z92=dnfRIq%YN0m_v(PGTDESpD}2-FboU^b{BKH+#NdLbyR z4Iq)qftrPOfl9iS#86w&>>_aoY_( zh}LZpMequFBH{(fWWcmX{hLf9eA)!nKT%V1IohXBJq-vrR%W4b2;ur^1oFi?VSmLY zpabp@J&e6k(8vPlLeH%N!;HC8^@CG2%)Nx^0Re2u3gfU6HiXRR5S!=lWnyW_w2YQ{ zQnZ->hCl>a>o9UQE+!pFpQ%uR;DC?yZ5?mGYcliL;LZcSL#(xa8X$&an_Sjln(cf)yw*JbGygU zL}*~nyT)9eLV<=?EX)JIJU-b;D9pnUVJ&KDSq28fcsX}2^{Lz$n!h*`(TRUJ)>_Vt z`za>FaTW&ANn@>LjPEKY-;GvYp~mj*kFa)8?MezU1r(KcT~v7r_f=jtq)nt-ElA!q zq&$U+scf|Mu(6tgs?M2iDXjU>)bX*TOf*_fVOE>Zw?18jPmUVtzw>o7Gwi2vVz|-D zD++xR6q@=N`htGDSuP!LI8(iWsrFUm3^rPM^@Qg2skcl;eghK$6?xZ+oKKz*<_dxq z+sHH@hF?1-cj77{FWIZhaE zwDRh3JyJ$<1W^jrImA0mr!UA<`&KN2v6GP`iX+HUWC!D5ZYP?BhArZpoQ(Pksyorv zNn`s!5R5hNJk3}+18FB_5rKY$nc>(&OE9=8RmYgP)IGip^eWxKkr{UXtC<3p4ff}4 z;y0s}SB%~Yn>{6LHbL0zMQJh7LjE28QSqi8iCh)Tt1r12Y_#&~3Eh$@2ZAjOnkHZ^ zPN{Mxa;%QVT4pC4J!t8K^PADiD-nhcXn2SSM~g)f9AzVXE)jkN38pC1uPbIcv+9Q% z8E&-l>Ip4!3SB5T5nsnGH`SE@aCLk+3^!VNrTh}ldj-!z!E=eNu%h%@f3bj0apkbs zl>@_#R$kKtbTXs61(X3sE3cl=scQNZ@}9+_YlTJgg+<>4QwocIO5de$G`8UZ?&Rg= z6456Se{M&79TCYgY@cof;bAm!8cS-d(eb|;UCa86crSuKwXPSdzsk{xtLv2^AbWhq zHFPsGuznoGBsGS2b>KVP7{DIK%jSGiEVoUc!=h7el9Vy<&b@ z+q-&S@?CTku_5`2L}4KMOX{x5Uh&nU=|JrFlK)610Rs)g1*KR$S*LI|G~y(G%pPVh zM_sul4u_2wVlM_BCA!}iD#tZHbX)8`k1IiVhLGS4bmEO28*CLsL;yyC~S_ z8hcW6oOC`Dz&RoDg92Mc=s+|}|{5P4XvJ*4>6v~LAwmC(;LD1fyi@HzZp{QSBQBkKr zB=$!J3RxLXS7}r9)Hp}=lm@xw|lcTM1 zYn)ZU?IbvggzJiJ!vkx6&dR9UhNT#@?qf+>rsI|Yu0p8q*zxejWek_61Z(ngXQ>)i zhE7{`o{gQJ_8Og)|GJ*crzRjR6oDmu8MA1~5oDw`Fb7vz31`KRNt0;RgJZN}4bY;*d(Lg))~ex}5jt67I<|P(#UW5*nwN94(zK2NY0C8ry8a`mu;M;$T+m2g0V)YJ`7A*CwT^g+>&L>fUaHNSJ$pL>(&Ft?RCIEIm0 zkF2UI2IYjzloN;E_{~z2qVg8ACVS&oYp!4{ry;J=kcbAz1`T;m3i4JBS*#%$YlmkU z!q|kT+OT*v&IYy>By?A}Fhi*zDhFuekMD8$r=oR7c1b2F%tC7k$^4Q;y%B z4f_7Fb^jIadH48oMtskgGamN`5$D(VCGdM0zxVJPh48iaLZpTs`7g^AMX$AR1>|6) zdx-0OsBc39@?DMJ2l!tNy+(=Pmp`!!M5CNVIC>@jD+s z_qe$IY|RHN#0h%sr;7!cP!rBh2|v{4O%Bm;mSYBCMYg%a-ejJ;s?G@=gX_7W@$qx4 zc~}W`I`|HIj`0bYGbS^wFPjOEZnLy`3*;fcmjXVEaZLFoieVXK}{$cG@7IUr+mP2P!xw z0Z2WLB7*^~ndLuY_&GZJHaq)H&MC*@#3ESR$oPNZ{J`xBJO4W5Z%-kQq1cw~-FMEF zMW6f>I)Uams==vKv7dW0sug27{=k}N5Dx~vN`Nuc`={tm>pB9%X67lM+?ve4^e*&| zU`9RqBQc}a;?|g@LKCd+#6;9)d>)S1yWS2N%aE!@uL{~BLl`opF-Kiwhx{)YLXe8Q>5MJ3ALVJViBzyxwdY9(~AA@THrb()PU=}P*F^31*;vbnJDjo97r?v zB-2ixJx5lXey*@ufrumV`qCK^KfW@44A)FFtc9Q26Nq~g^0Y~< zkB+}Mu;zg*z}M~J!s8!{wVQYl_5&ykdT@x~52s4{Vp=wAu(Zfeffxrq&(ytNSqz>~ zd&OzbbzWE>dm3V-TcQk(0wCz%{`3ht?bC>Z%XTjbO||f>&ccEVbZq@NP*Nx|-9qOR z6x*JDUww{FW*4$VfH2u{81qDeuN0ZjzhRx3Sr)c!W-u zBAOP1vzqj#O6qwGgt9_zN{@g#Rw^I3qK+9?c1_ti8t+nyDzAnrbrJe{C)#3`bm$$frQjgg=8(u^@RrodF z7s2mM{05S4Dv^GkF!9V5dy5~7gJ{=C#PwrW-COgz9T9!Pit|UrA@8ZT_yB=;8Z_n#yvOVcCPG?A90l!A z9$Jj+)uE%~cM8iw+W)94DfTTJ!e$!vtCMU*_da1Ey7zt}in%phm&p89(bYqx@olTF zb&F}IVGDVK^|e@Y!cAvsPC#$nMx#o{NNc&%n`va3;f zpm{F>96>P>R|lG3MM%H%&p%`HX-O(JM+!9G<4%k_q;xMkOXj1WmQj;v)Uc$DyJe{c zs5mGI%zuUvf!$RlJuLO%Z0|j&Zzu>XR^&m^g62f*n3Rw?)dGD1bdSub##yCSf@=_@ zw|D4Ke}F9z7fYZ=UCH!wV@deg?13Nucp+v#luM)E1e-uGH?DKj#@>1&wGf8;rVD#ZRUWieq9qnsH2j@PSo0aVyk-N6v_%(bJ#HWdm?Ihc5FZ;RS^0K?g=B?N zLx~mg97A?6PLUPzC_^?gq`(UK9z&=}8vIsB6GJE<4IV4xYYbVt$t{SFaGbJ{THJe?mY3&kT>!#vi>s?c< zW91`OLr;;eJ_R9;&&bI0`C8SDNJu52F17N!G9%B|PSmNrggSwcCj%|}Q5M!tq;kDk zv)+hZ62W!FdT>w_U(f-DUEz5`?22xX8;RF8>}S!rAY&7nf64DHBD6@%r#(WKr)t$b z_Q&7y66D>NPG_xM*Jwpf49i?HVP4I!-b1WW+F8`Uu%#0JtBYtpNB7@(s~PY zidODHS#W%E-LBc{r$-ZHm-?p=Fg&8+6)t>0z%4LUxPF}U1RJPkTaBhY5cjm z(>|m#1aTHT>dW~$eyj1j2fxSg`x1UL@Y{^vcKjwXtzlpMr!(?;u_eI}E2eMgP&4@l z!2UOW3cu5TigeIp*Z=zNrjQMs0*E8=vfx_8s#Aji(@C) zT)Y`OaYt3{gwq8pMATH$&u#=Gb+2eiYO}U7!ii%w^oh?8toa$i>fjUq)>A(d8CZ{- zrK{|90S!NeZXi2kTf+4;fEw->h0&!h1XIRuY`E8YJ(I8X4ePDf6Zm>*LzDHI&)2C9 zw_2}Rd_7HlI#zr>(x!fnw1W)|i~x33XB7$Wcd2?rWrMsB0n+Ycu2YxHb(+pEWa&o; z$~cWMBkb1ng%l@wJsX~Z0R9=jzv0(|--#$~4t}HXyBt3cdFKDee=seL>LhVV%=gxiF~ z3H2Zh$oNGK&s(qG;piQi>oz>%-?{w8ePi0qhe z#LkY??8h)z9#mf4e(=-Hzyc!^H{j;dso4GET5zxER0DZY84gr2LrC?R%1&||}LTBpah4*bW4sssANks9OE z^Oox!8pH^lwzAkEJobXH*Ta5Yn^Up%X`mmR2X|J2#_-G1*#LjVIBPeMvFMIi99hoNY;XsMRjvB%?_fP* z0x|c6`urHA-KqWyjfDU{2*5aYKid!Q1@{u2^xD}Db+Ax597rRd-H-NI zCE)-uycxjN@&R-(TU4PJAJoeQmLXEPDX3}!mR2YrCZnR*XirVE!yY<=lz?l?8@gN_ z7%gCD>9vm=&_+Fk{Q^S~*Wx$r1XeQvOxot^=Gp2Je3f*E5i7K~x1+SM1twxXtDJerkF}V_ zs?RZ1_n-*}sc)vAhILem)Eb>h)RkyhBeHk`b9InD=h(=yICUI~p-;Et)T7D#MztbO z5joQWMaOE!9ITdR))j~m)C<$Fe6iL&*Cd*rE=jwP#tXte+GldSg{vNXjyvnRmGnL9VJcD zN5#OLdV?5Kk-VxIL0b-@bS-^am||budvtiuNSwF)C>QfhTj`SfMd6!a*cC|U_$MqZ z>g9jX4x(OgoJGERRX=0MJzst6BnkK1p1pmjXNLbg6$f-ksFx8gMlu_L1?WVQb00?? z#Lw5h7|D@4V{@M|RR*5MdeDN>HsjONFl$p+yVO7n{zJmuiq$L?r)Z(373rbYVK z4ogc(7IuT0+q1H`ont~(fL}7SW{esPscrX+*BLu~;Mi_{5gp5&bJb*=9cx#4ZC11* zAC^;(4P$xcu+?nVoo8X1Ix>5UG^^_=Z3}`ZU1|&3WzZP5G`>BFrV1|!^$aiqZdfVK zw_Ru&B=|=NwwaInS@#(^IHqx--h?!very9RVdV)X!-a96E5njQ*t5B`eI z2zVczyj>!13pEn43-eNibdoB4!$`~w-2W1`mpArJG+sJ-;>)lhu$D{x*C;kMUFtiy zcU11ll6q6_MIYYKaeDPfZs<1s;0s`g2)&(L#8y>D5sy%hD^` zKg(5P*gc6~FJa@+sqV)OW!kH9P^TDQ7@~fwsb3%sq&igHpi}Kq$1&t;b+41;UUi?Hq)%Na z(XibT8yT+g->ZJ8lRSW%ykD)8^r?|HqMZ;>IvV!?S7^sQp3pZkn8m3BZb6(;o#?z@ zig8e!Jgfp55me_ZQk|?1YNM}t2V9-ZKG1Rz_#;hTF)DaMV9oV8R7g0V16_Z0{YWw| z_Cdhb1Z2hAbpf}jZ=g6V_-a^zpfr|2!6T{9xgb@V5qq0zhKd5AFSLOw1gJ~R(m)W? zZ2-ENjS7I|EE2%syN1iP;rvu?*cSc0{6O;|Azz`#Hs>A^YseS-I?;XsCnCHNx-D9{ z&EEM5b9^xO_(!@HwyBrs|FXpf%m}=R!c|1UTDPbkd`6o5H9$g2aW`PNOT#vf_F0YS zFgwB9`0+$rSHQ6c+kma_Y&93j2>d^xAW{*+;zr!2dP)V(_! zOrAYln0y}gfH(H}vD^`Lh;@y)`r+uFVXR0IW{m|`4>%IUTHj|k;!j{bJnH7*Vyl!- zKqbbD(K|5q`i+F2>j5VT?N-UcdDP}9z*zFl=444wco#b)axyOLGsv`*b}@Sa#4gK< z^@_wQlC(zKu`WO?A{%J=J?fLq*;Ldc-R5^&?@HdoXr&8Okv#KM2fylu9!JGtHVqfK zZByN(<8fkV7e{3uTS(PBTd4$vz!xjj!XEwM?VWK^5vPQOE{gO6~rE`%GcxPAvTJJ zy(UmJuIEEf4G4p6yYPbZ7<4(i*u(BrkFmIbJ3oG|80T>Crr`&>FoQXQl7- z^d_Y&Huo_UPKUWa`wjg()OfxpbhX3tMq*xgRtDpOCX{0{8}csvH!S&{Y=CGU3)#@GHlw179N!iFAVlxg!TR?X#@SM ztNRmLK;Xn$Riv~58%2V#ZY01i=4N7qqJ2kG-*zwdsH4axGBXO!WO%EfVb9_QfzNX% zUNl1L7rz9fAxG#0^~<4>}2~q4rr{3~OhWR?*n7;i4 z45Mk<`FEjde0ux>CdPJ$b)lEsgE-L;LewY{xl=u